diff options
Diffstat (limited to 'drivers/net/tun.c')
-rw-r--r-- | drivers/net/tun.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 6daea0c91862..64c7fc7ff08d 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c | |||
@@ -883,7 +883,6 @@ static int tun_chr_ioctl(struct inode *inode, struct file *file, | |||
883 | void __user* argp = (void __user*)arg; | 883 | void __user* argp = (void __user*)arg; |
884 | struct ifreq ifr; | 884 | struct ifreq ifr; |
885 | int ret; | 885 | int ret; |
886 | DECLARE_MAC_BUF(mac); | ||
887 | 886 | ||
888 | if (cmd == TUNSETIFF || _IOC_TYPE(cmd) == 0x89) | 887 | if (cmd == TUNSETIFF || _IOC_TYPE(cmd) == 0x89) |
889 | if (copy_from_user(&ifr, argp, sizeof ifr)) | 888 | if (copy_from_user(&ifr, argp, sizeof ifr)) |
@@ -1011,8 +1010,8 @@ static int tun_chr_ioctl(struct inode *inode, struct file *file, | |||
1011 | 1010 | ||
1012 | case SIOCSIFHWADDR: | 1011 | case SIOCSIFHWADDR: |
1013 | /* Set hw address */ | 1012 | /* Set hw address */ |
1014 | DBG(KERN_DEBUG "%s: set hw address: %s\n", | 1013 | DBG(KERN_DEBUG "%s: set hw address: %pM\n", |
1015 | tun->dev->name, print_mac(mac, ifr.ifr_hwaddr.sa_data)); | 1014 | tun->dev->name, ifr.ifr_hwaddr.sa_data); |
1016 | 1015 | ||
1017 | rtnl_lock(); | 1016 | rtnl_lock(); |
1018 | ret = dev_set_mac_address(tun->dev, &ifr.ifr_hwaddr); | 1017 | ret = dev_set_mac_address(tun->dev, &ifr.ifr_hwaddr); |