diff options
author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2007-02-09 09:24:35 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-02-11 02:19:23 -0500 |
commit | 9d6f229fc45b6ac268020c0c8eff29e94bb34381 (patch) | |
tree | c8f514f2f13ea563256d97a2627aac9f89c57bf5 /net/bridge/br_ioctl.c | |
parent | 8e87d14255acffeee36873de226dc25c11b5f46d (diff) |
[NET] BRIDGE: Fix whitespace errors.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_ioctl.c')
-rw-r--r-- | net/bridge/br_ioctl.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/net/bridge/br_ioctl.c b/net/bridge/br_ioctl.c index 4c61a7e0a86e..3ab153d3c508 100644 --- a/net/bridge/br_ioctl.c +++ b/net/bridge/br_ioctl.c | |||
@@ -28,7 +28,7 @@ static int get_bridge_ifindices(int *indices, int num) | |||
28 | int i = 0; | 28 | int i = 0; |
29 | 29 | ||
30 | for (dev = dev_base; dev && i < num; dev = dev->next) { | 30 | for (dev = dev_base; dev && i < num; dev = dev->next) { |
31 | if (dev->priv_flags & IFF_EBRIDGE) | 31 | if (dev->priv_flags & IFF_EBRIDGE) |
32 | indices[i++] = dev->ifindex; | 32 | indices[i++] = dev->ifindex; |
33 | } | 33 | } |
34 | 34 | ||
@@ -53,7 +53,7 @@ static void get_port_ifindices(struct net_bridge *br, int *ifindices, int num) | |||
53 | * (limited to a page for sanity) | 53 | * (limited to a page for sanity) |
54 | * offset -- number of records to skip | 54 | * offset -- number of records to skip |
55 | */ | 55 | */ |
56 | static int get_fdb_entries(struct net_bridge *br, void __user *userbuf, | 56 | static int get_fdb_entries(struct net_bridge *br, void __user *userbuf, |
57 | unsigned long maxnum, unsigned long offset) | 57 | unsigned long maxnum, unsigned long offset) |
58 | { | 58 | { |
59 | int num; | 59 | int num; |
@@ -69,7 +69,7 @@ static int get_fdb_entries(struct net_bridge *br, void __user *userbuf, | |||
69 | buf = kmalloc(size, GFP_USER); | 69 | buf = kmalloc(size, GFP_USER); |
70 | if (!buf) | 70 | if (!buf) |
71 | return -ENOMEM; | 71 | return -ENOMEM; |
72 | 72 | ||
73 | num = br_fdb_fillbuf(br, buf, maxnum, offset); | 73 | num = br_fdb_fillbuf(br, buf, maxnum, offset); |
74 | if (num > 0) { | 74 | if (num > 0) { |
75 | if (copy_to_user(userbuf, buf, num*sizeof(struct __fdb_entry))) | 75 | if (copy_to_user(userbuf, buf, num*sizeof(struct __fdb_entry))) |
@@ -91,7 +91,7 @@ static int add_del_if(struct net_bridge *br, int ifindex, int isadd) | |||
91 | dev = dev_get_by_index(ifindex); | 91 | dev = dev_get_by_index(ifindex); |
92 | if (dev == NULL) | 92 | if (dev == NULL) |
93 | return -EINVAL; | 93 | return -EINVAL; |
94 | 94 | ||
95 | if (isadd) | 95 | if (isadd) |
96 | ret = br_add_if(br, dev); | 96 | ret = br_add_if(br, dev); |
97 | else | 97 | else |
@@ -110,7 +110,7 @@ static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) | |||
110 | { | 110 | { |
111 | struct net_bridge *br = netdev_priv(dev); | 111 | struct net_bridge *br = netdev_priv(dev); |
112 | unsigned long args[4]; | 112 | unsigned long args[4]; |
113 | 113 | ||
114 | if (copy_from_user(args, rq->ifr_data, sizeof(args))) | 114 | if (copy_from_user(args, rq->ifr_data, sizeof(args))) |
115 | return -EFAULT; | 115 | return -EFAULT; |
116 | 116 | ||
@@ -143,7 +143,7 @@ static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) | |||
143 | b.tcn_timer_value = br_timer_value(&br->tcn_timer); | 143 | b.tcn_timer_value = br_timer_value(&br->tcn_timer); |
144 | b.topology_change_timer_value = br_timer_value(&br->topology_change_timer); | 144 | b.topology_change_timer_value = br_timer_value(&br->topology_change_timer); |
145 | b.gc_timer_value = br_timer_value(&br->gc_timer); | 145 | b.gc_timer_value = br_timer_value(&br->gc_timer); |
146 | rcu_read_unlock(); | 146 | rcu_read_unlock(); |
147 | 147 | ||
148 | if (copy_to_user((void __user *)args[1], &b, sizeof(b))) | 148 | if (copy_to_user((void __user *)args[1], &b, sizeof(b))) |
149 | return -EFAULT; | 149 | return -EFAULT; |
@@ -275,7 +275,7 @@ static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) | |||
275 | return -ERANGE; | 275 | return -ERANGE; |
276 | 276 | ||
277 | spin_lock_bh(&br->lock); | 277 | spin_lock_bh(&br->lock); |
278 | if ((p = br_get_port(br, args[1])) == NULL) | 278 | if ((p = br_get_port(br, args[1])) == NULL) |
279 | ret = -EINVAL; | 279 | ret = -EINVAL; |
280 | else | 280 | else |
281 | br_stp_set_port_priority(p, args[2]); | 281 | br_stp_set_port_priority(p, args[2]); |
@@ -301,7 +301,7 @@ static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) | |||
301 | } | 301 | } |
302 | 302 | ||
303 | case BRCTL_GET_FDB_ENTRIES: | 303 | case BRCTL_GET_FDB_ENTRIES: |
304 | return get_fdb_entries(br, (void __user *)args[1], | 304 | return get_fdb_entries(br, (void __user *)args[1], |
305 | args[2], args[3]); | 305 | args[2], args[3]); |
306 | } | 306 | } |
307 | 307 | ||
@@ -368,7 +368,7 @@ int br_ioctl_deviceless_stub(unsigned int cmd, void __user *uarg) | |||
368 | case SIOCGIFBR: | 368 | case SIOCGIFBR: |
369 | case SIOCSIFBR: | 369 | case SIOCSIFBR: |
370 | return old_deviceless(uarg); | 370 | return old_deviceless(uarg); |
371 | 371 | ||
372 | case SIOCBRADDBR: | 372 | case SIOCBRADDBR: |
373 | case SIOCBRDELBR: | 373 | case SIOCBRDELBR: |
374 | { | 374 | { |