diff options
| author | Jiri Pirko | 2012-07-20 04:28:49 +0200 |
|---|---|---|
| committer | David S. Miller | 2012-07-20 20:07:00 +0200 |
| commit | df4ab5b3c295050da09153fa9760042e4de3ffff (patch) | |
| tree | 64b8f47eafefe107e2f9f9618e49fd365a6b6fdd /drivers/net/bonding/bond_main.c | |
| parent | rtnl: allow to specify number of rx and tx queues on device creation (diff) | |
| download | kernel-qcow2-linux-df4ab5b3c295050da09153fa9760042e4de3ffff.tar.gz kernel-qcow2-linux-df4ab5b3c295050da09153fa9760042e4de3ffff.tar.xz kernel-qcow2-linux-df4ab5b3c295050da09153fa9760042e4de3ffff.zip | |
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/bond_main.c')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 6 |
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, skb->dev = slave_dev; BUILD_BUG_ON(sizeof(skb->queue_mapping) != - sizeof(qdisc_skb_cb(skb)->bond_queue_mapping)); - skb->queue_mapping = qdisc_skb_cb(skb)->bond_queue_mapping; + sizeof(qdisc_skb_cb(skb)->slave_dev_queue_mapping)); + skb->queue_mapping = qdisc_skb_cb(skb)->slave_dev_queue_mapping; if (unlikely(netpoll_tx_running(slave_dev))) 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) /* * Save the original txq to restore before passing to the driver */ - qdisc_skb_cb(skb)->bond_queue_mapping = skb->queue_mapping; + qdisc_skb_cb(skb)->slave_dev_queue_mapping = skb->queue_mapping; if (unlikely(txq >= dev->real_num_tx_queues)) { do { |