aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/eql.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-13 13:24:59 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-13 13:24:59 -0400
commit6aa20a2235535605db6d6d2bd850298b2fe7f31e (patch)
treedf0b855043407b831d57f2f2c271f8aab48444f4 /drivers/net/eql.c
parent7a291083225af6e22ffaa46b3d91cfc1a1ccaab4 (diff)
drivers/net: Trim trailing whitespace
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/eql.c')
-rw-r--r--drivers/net/eql.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/net/eql.c b/drivers/net/eql.c
index 815436c6170f..a93700e5661a 100644
--- a/drivers/net/eql.c
+++ b/drivers/net/eql.c
@@ -8,7 +8,7 @@
8 * 8 *
9 * This software may be used and distributed according to the terms 9 * This software may be used and distributed according to the terms
10 * of the GNU General Public License, incorporated herein by reference. 10 * of the GNU General Public License, incorporated herein by reference.
11 * 11 *
12 * The author may be reached as simon@ncm.com, or C/O 12 * The author may be reached as simon@ncm.com, or C/O
13 * NCM 13 * NCM
14 * Attn: Simon Janes 14 * Attn: Simon Janes
@@ -23,7 +23,7 @@
23 * Inspirations: 23 * Inspirations:
24 * The Harried and Overworked Alan Cox 24 * The Harried and Overworked Alan Cox
25 * Conspiracies: 25 * Conspiracies:
26 * The Alan Cox and Mike McLagan plot to get someone else to do the code, 26 * The Alan Cox and Mike McLagan plot to get someone else to do the code,
27 * which turned out to be me. 27 * which turned out to be me.
28 */ 28 */
29 29
@@ -138,7 +138,7 @@ static void eql_timer(unsigned long param)
138{ 138{
139 equalizer_t *eql = (equalizer_t *) param; 139 equalizer_t *eql = (equalizer_t *) param;
140 struct list_head *this, *tmp, *head; 140 struct list_head *this, *tmp, *head;
141 141
142 spin_lock_bh(&eql->queue.lock); 142 spin_lock_bh(&eql->queue.lock);
143 head = &eql->queue.all_slaves; 143 head = &eql->queue.all_slaves;
144 list_for_each_safe(this, tmp, head) { 144 list_for_each_safe(this, tmp, head) {
@@ -159,7 +159,7 @@ static void eql_timer(unsigned long param)
159 add_timer(&eql->timer); 159 add_timer(&eql->timer);
160} 160}
161 161
162static char version[] __initdata = 162static char version[] __initdata =
163 "Equalizer2002: Simon Janes (simon@ncm.com) and David S. Miller (davem@redhat.com)\n"; 163 "Equalizer2002: Simon Janes (simon@ncm.com) and David S. Miller (davem@redhat.com)\n";
164 164
165static void __init eql_setup(struct net_device *dev) 165static void __init eql_setup(struct net_device *dev)
@@ -182,12 +182,12 @@ static void __init eql_setup(struct net_device *dev)
182 dev->do_ioctl = eql_ioctl; 182 dev->do_ioctl = eql_ioctl;
183 dev->hard_start_xmit = eql_slave_xmit; 183 dev->hard_start_xmit = eql_slave_xmit;
184 dev->get_stats = eql_get_stats; 184 dev->get_stats = eql_get_stats;
185 185
186 /* 186 /*
187 * Now we undo some of the things that eth_setup does 187 * Now we undo some of the things that eth_setup does
188 * that we don't like 188 * that we don't like
189 */ 189 */
190 190
191 dev->mtu = EQL_DEFAULT_MTU; /* set to 576 in if_eql.h */ 191 dev->mtu = EQL_DEFAULT_MTU; /* set to 576 in if_eql.h */
192 dev->flags = IFF_MASTER; 192 dev->flags = IFF_MASTER;
193 193
@@ -223,7 +223,7 @@ static void eql_kill_one_slave(slave_queue_t *queue, slave_t *slave)
223} 223}
224 224
225static void eql_kill_slave_queue(slave_queue_t *queue) 225static void eql_kill_slave_queue(slave_queue_t *queue)
226{ 226{
227 struct list_head *head, *tmp, *this; 227 struct list_head *head, *tmp, *this;
228 228
229 spin_lock_bh(&queue->lock); 229 spin_lock_bh(&queue->lock);
@@ -244,7 +244,7 @@ static int eql_close(struct net_device *dev)
244 244
245 /* 245 /*
246 * The timer has to be stopped first before we start hacking away 246 * The timer has to be stopped first before we start hacking away
247 * at the data structure it scans every so often... 247 * at the data structure it scans every so often...
248 */ 248 */
249 249
250 del_timer_sync(&eql->timer); 250 del_timer_sync(&eql->timer);
@@ -264,7 +264,7 @@ static int eql_g_master_cfg(struct net_device *dev, master_config_t __user *mc);
264static int eql_s_master_cfg(struct net_device *dev, master_config_t __user *mc); 264static int eql_s_master_cfg(struct net_device *dev, master_config_t __user *mc);
265 265
266static int eql_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 266static int eql_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
267{ 267{
268 if (cmd != EQL_GETMASTRCFG && cmd != EQL_GETSLAVECFG && 268 if (cmd != EQL_GETMASTRCFG && cmd != EQL_GETSLAVECFG &&
269 !capable(CAP_NET_ADMIN)) 269 !capable(CAP_NET_ADMIN))
270 return -EPERM; 270 return -EPERM;
@@ -300,15 +300,15 @@ static slave_t *__eql_schedule_slaves(slave_queue_t *queue)
300 head = &queue->all_slaves; 300 head = &queue->all_slaves;
301 list_for_each_safe(this, tmp, head) { 301 list_for_each_safe(this, tmp, head) {
302 slave_t *slave = list_entry(this, slave_t, list); 302 slave_t *slave = list_entry(this, slave_t, list);
303 unsigned long slave_load, bytes_queued, priority_Bps; 303 unsigned long slave_load, bytes_queued, priority_Bps;
304 304
305 /* Go through the slave list once, updating best_slave 305 /* Go through the slave list once, updating best_slave
306 * whenever a new best_load is found. 306 * whenever a new best_load is found.
307 */ 307 */
308 bytes_queued = slave->bytes_queued; 308 bytes_queued = slave->bytes_queued;
309 priority_Bps = slave->priority_Bps; 309 priority_Bps = slave->priority_Bps;
310 if ((slave->dev->flags & IFF_UP) == IFF_UP) { 310 if ((slave->dev->flags & IFF_UP) == IFF_UP) {
311 slave_load = (~0UL - (~0UL / 2)) - 311 slave_load = (~0UL - (~0UL / 2)) -
312 (priority_Bps) + bytes_queued * 8; 312 (priority_Bps) + bytes_queued * 8;
313 313
314 if (slave_load < best_load) { 314 if (slave_load < best_load) {
@@ -336,13 +336,13 @@ static int eql_slave_xmit(struct sk_buff *skb, struct net_device *dev)
336 336
337 skb->dev = slave_dev; 337 skb->dev = slave_dev;
338 skb->priority = 1; 338 skb->priority = 1;
339 slave->bytes_queued += skb->len; 339 slave->bytes_queued += skb->len;
340 dev_queue_xmit(skb); 340 dev_queue_xmit(skb);
341 eql->stats.tx_packets++; 341 eql->stats.tx_packets++;
342 } else { 342 } else {
343 eql->stats.tx_dropped++; 343 eql->stats.tx_dropped++;
344 dev_kfree_skb(skb); 344 dev_kfree_skb(skb);
345 } 345 }
346 346
347 spin_unlock(&eql->queue.lock); 347 spin_unlock(&eql->queue.lock);
348 348
@@ -596,7 +596,7 @@ static int __init eql_init_module(void)
596 return -ENOMEM; 596 return -ENOMEM;
597 597
598 err = register_netdev(dev_eql); 598 err = register_netdev(dev_eql);
599 if (err) 599 if (err)
600 free_netdev(dev_eql); 600 free_netdev(dev_eql);
601 return err; 601 return err;
602} 602}