aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding
diff options
context:
space:
mode:
authorJiri Pirko <jiri@resnulli.us>2012-07-19 22:28:49 -0400
committerDavid S. Miller <davem@davemloft.net>2012-07-20 14:07:00 -0400
commitdf4ab5b3c295050da09153fa9760042e4de3ffff (patch)
tree64b8f47eafefe107e2f9f9618e49fd365a6b6fdd /drivers/net/bonding
parent76ff5cc91935c51fcf1a6a99ffa28b97a6e7a884 (diff)
net: rename bond_queue_mapping to slave_dev_queue_mapping
As this is going to be used not only by bonding. Signed-off-by: Jiri Pirko <jiri@resnulli.us> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding')
-rw-r--r--drivers/net/bonding/bond_main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index f41ddc2d48be..6fae5f3ec7f6 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -395,8 +395,8 @@ int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb,
395 skb->dev = slave_dev; 395 skb->dev = slave_dev;
396 396
397 BUILD_BUG_ON(sizeof(skb->queue_mapping) != 397 BUILD_BUG_ON(sizeof(skb->queue_mapping) !=
398 sizeof(qdisc_skb_cb(skb)->bond_queue_mapping)); 398 sizeof(qdisc_skb_cb(skb)->slave_dev_queue_mapping));
399 skb->queue_mapping = qdisc_skb_cb(skb)->bond_queue_mapping; 399 skb->queue_mapping = qdisc_skb_cb(skb)->slave_dev_queue_mapping;
400 400
401 if (unlikely(netpoll_tx_running(slave_dev))) 401 if (unlikely(netpoll_tx_running(slave_dev)))
402 bond_netpoll_send_skb(bond_get_slave_by_dev(bond, slave_dev), skb); 402 bond_netpoll_send_skb(bond_get_slave_by_dev(bond, slave_dev), skb);
@@ -4184,7 +4184,7 @@ static u16 bond_select_queue(struct net_device *dev, struct sk_buff *skb)
4184 /* 4184 /*
4185 * Save the original txq to restore before passing to the driver 4185 * Save the original txq to restore before passing to the driver
4186 */ 4186 */
4187 qdisc_skb_cb(skb)->bond_queue_mapping = skb->queue_mapping; 4187 qdisc_skb_cb(skb)->slave_dev_queue_mapping = skb->queue_mapping;
4188 4188
4189 if (unlikely(txq >= dev->real_num_tx_queues)) { 4189 if (unlikely(txq >= dev->real_num_tx_queues)) {
4190 do { 4190 do {