diff options
author | Fabian Frederick <fabf@skynet.be> | 2014-11-17 16:23:17 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-11-18 15:27:32 -0500 |
commit | 54aeba7f06323e04d59a6053ee3c6023079667b2 (patch) | |
tree | db38301b57da00bfaf6337d76fd8dd48ab023d7c | |
parent | e56f735913c8d3c417c65c7e7fcdd65011f8d96f (diff) |
dev_ioctl: use sizeof(x) instead of sizeof x
Also remove spaces after cast.
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/core/dev_ioctl.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c index 72e899a3efda..b94b1d293506 100644 --- a/net/core/dev_ioctl.c +++ b/net/core/dev_ioctl.c | |||
@@ -142,10 +142,12 @@ static int dev_ifsioc_locked(struct net *net, struct ifreq *ifr, unsigned int cm | |||
142 | 142 | ||
143 | case SIOCGIFHWADDR: | 143 | case SIOCGIFHWADDR: |
144 | if (!dev->addr_len) | 144 | if (!dev->addr_len) |
145 | memset(ifr->ifr_hwaddr.sa_data, 0, sizeof ifr->ifr_hwaddr.sa_data); | 145 | memset(ifr->ifr_hwaddr.sa_data, 0, |
146 | sizeof(ifr->ifr_hwaddr.sa_data)); | ||
146 | else | 147 | else |
147 | memcpy(ifr->ifr_hwaddr.sa_data, dev->dev_addr, | 148 | memcpy(ifr->ifr_hwaddr.sa_data, dev->dev_addr, |
148 | min(sizeof ifr->ifr_hwaddr.sa_data, (size_t) dev->addr_len)); | 149 | min(sizeof(ifr->ifr_hwaddr.sa_data), |
150 | (size_t)dev->addr_len)); | ||
149 | ifr->ifr_hwaddr.sa_family = dev->type; | 151 | ifr->ifr_hwaddr.sa_family = dev->type; |
150 | return 0; | 152 | return 0; |
151 | 153 | ||
@@ -265,7 +267,8 @@ static int dev_ifsioc(struct net *net, struct ifreq *ifr, unsigned int cmd) | |||
265 | if (ifr->ifr_hwaddr.sa_family != dev->type) | 267 | if (ifr->ifr_hwaddr.sa_family != dev->type) |
266 | return -EINVAL; | 268 | return -EINVAL; |
267 | memcpy(dev->broadcast, ifr->ifr_hwaddr.sa_data, | 269 | memcpy(dev->broadcast, ifr->ifr_hwaddr.sa_data, |
268 | min(sizeof ifr->ifr_hwaddr.sa_data, (size_t) dev->addr_len)); | 270 | min(sizeof(ifr->ifr_hwaddr.sa_data), |
271 | (size_t)dev->addr_len)); | ||
269 | call_netdevice_notifiers(NETDEV_CHANGEADDR, dev); | 272 | call_netdevice_notifiers(NETDEV_CHANGEADDR, dev); |
270 | return 0; | 273 | return 0; |
271 | 274 | ||