diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-10-27 18:59:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-10-27 20:06:18 -0400 |
commit | e174961ca1a0b28f7abf0be47973ad57cb74e5f0 (patch) | |
tree | e8f74ecd420a0e380a71670e5aec5c2a0c15640a /drivers/net/tun.c | |
parent | 0c68ae2605dbcf67414d8d1f19af93be44b355fb (diff) |
net: convert print_mac to %pM
This converts pretty much everything to print_mac. There were
a few things that had conflicts which I have just dropped for
now, no harm done.
I've built an allyesconfig with this and looked at the files
that weren't built very carefully, but it's a huge patch.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
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); |