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>

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index f41ddc2d48be71d649f8b178466f46767f5921d1..6fae5f3ec7f6d646e4efc79aac1a0449ca5bde21 100644 (file)
--- 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 {

diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index 9d7d54a00e63f28feb80942bcaf7afb7ee68cd5c..d9611e03241873fd5cb4140cf0d9c5e3ae7a2486 100644 (file)
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -220,7 +220,7 @@ struct tcf_proto {
 
 struct qdisc_skb_cb {
        unsigned int            pkt_len;
-       u16                     bond_queue_mapping;
+       u16                     slave_dev_queue_mapping;
        u16                     _pad;
        unsigned char           data[20];
 };