diff options
Diffstat (limited to 'sbin/ifconfig/ifmac.c')
| -rw-r--r-- | sbin/ifconfig/ifmac.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/sbin/ifconfig/ifmac.c b/sbin/ifconfig/ifmac.c index 31f4e970951c..278d2e79592f 100644 --- a/sbin/ifconfig/ifmac.c +++ b/sbin/ifconfig/ifmac.c @@ -32,8 +32,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #include <sys/param.h> @@ -52,19 +50,19 @@ #include "ifconfig.h" static void -maclabel_status(int s) +maclabel_status(if_ctx *ctx) { struct ifreq ifr; mac_t label; char *label_text; memset(&ifr, 0, sizeof(ifr)); - strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); + strlcpy(ifr.ifr_name, ctx->ifname, sizeof(ifr.ifr_name)); if (mac_prepare_ifnet_label(&label) == -1) return; ifr.ifr_ifru.ifru_data = (void *)label; - if (ioctl(s, SIOCGIFMAC, &ifr) == -1) + if (ioctl_ctx(ctx, SIOCGIFMAC, &ifr) == -1) goto mac_free; @@ -80,7 +78,7 @@ mac_free: } static void -setifmaclabel(const char *val, int d, int s, const struct afswtch *rafp) +setifmaclabel(if_ctx *ctx, const char *val, int d __unused) { struct ifreq ifr; mac_t label; @@ -92,10 +90,10 @@ setifmaclabel(const char *val, int d, int s, const struct afswtch *rafp) } memset(&ifr, 0, sizeof(ifr)); - strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); + strlcpy(ifr.ifr_name, ctx->ifname, sizeof(ifr.ifr_name)); ifr.ifr_ifru.ifru_data = (void *)label; - error = ioctl(s, SIOCSIFMAC, &ifr); + error = ioctl(ctx->io_s, SIOCSIFMAC, &ifr); mac_free(label); if (error == -1) perror("setifmac"); |