aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding
diff options
context:
space:
mode:
authorDavid Decotigny <decot@google.com>2011-04-13 11:22:29 -0400
committerDavid S. Miller <davem@davemloft.net>2011-04-15 01:00:31 -0400
commitd30ee670f25ea8f265a2804e2a0a53804cac5185 (patch)
tree7a8d3b92f26cb3e9570df2989a0b8ea462027a1a /drivers/net/bonding
parentef9c7ab4a97d53d9cb4912d13e142f52a30ecd54 (diff)
net-bonding: Fix minor sparse complaints
This gets rid of minor sparse complaints: drivers/net/bonding/bond_main.c:4361:4: warning: do-while statement is not a compound statement drivers/net/bonding/bond_main.c:243:12: warning: symbol 'bond_mode_name' was not declared. Should it be static? Signed-off-by: David Decotigny <decot@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding')
-rw-r--r--drivers/net/bonding/bond_main.c4
-rw-r--r--drivers/net/bonding/bond_procfs.c2
-rw-r--r--drivers/net/bonding/bonding.h1
3 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index b51e021354b5..94a371c12d70 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -4357,9 +4357,9 @@ static u16 bond_select_queue(struct net_device *dev, struct sk_buff *skb)
4357 u16 txq = skb_rx_queue_recorded(skb) ? skb_get_rx_queue(skb) : 0; 4357 u16 txq = skb_rx_queue_recorded(skb) ? skb_get_rx_queue(skb) : 0;
4358 4358
4359 if (unlikely(txq >= dev->real_num_tx_queues)) { 4359 if (unlikely(txq >= dev->real_num_tx_queues)) {
4360 do 4360 do {
4361 txq -= dev->real_num_tx_queues; 4361 txq -= dev->real_num_tx_queues;
4362 while (txq >= dev->real_num_tx_queues); 4362 } while (txq >= dev->real_num_tx_queues);
4363 } 4363 }
4364 return txq; 4364 return txq;
4365} 4365}
diff --git a/drivers/net/bonding/bond_procfs.c b/drivers/net/bonding/bond_procfs.c
index c32ff55a34c1..c97307ddd1c9 100644
--- a/drivers/net/bonding/bond_procfs.c
+++ b/drivers/net/bonding/bond_procfs.c
@@ -4,8 +4,6 @@
4#include "bonding.h" 4#include "bonding.h"
5 5
6 6
7extern const char *bond_mode_name(int mode);
8
9static void *bond_info_seq_start(struct seq_file *seq, loff_t *pos) 7static void *bond_info_seq_start(struct seq_file *seq, loff_t *pos)
10 __acquires(RCU) 8 __acquires(RCU)
11 __acquires(&bond->lock) 9 __acquires(&bond->lock)
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 90736cb4d975..3ca503e50718 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -416,6 +416,7 @@ void bond_destroy_debugfs(void);
416void bond_debug_register(struct bonding *bond); 416void bond_debug_register(struct bonding *bond);
417void bond_debug_unregister(struct bonding *bond); 417void bond_debug_unregister(struct bonding *bond);
418void bond_debug_reregister(struct bonding *bond); 418void bond_debug_reregister(struct bonding *bond);
419const char *bond_mode_name(int mode);
419 420
420struct bond_net { 421struct bond_net {
421 struct net * net; /* Associated network namespace */ 422 struct net * net; /* Associated network namespace */