Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df4ab5b3 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

net: rename bond_queue_mapping to slave_dev_queue_mapping 



As this is going to be used not only by bonding.

Signed-off-by: default avatarJiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 76ff5cc9

drivers/net/bonding/bond_main.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -395,8 +395,8 @@ int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, 
	skb->dev = slave_dev;

	skb->dev = slave_dev;





	BUILD_BUG_ON(sizeof(skb->queue_mapping) !=

	BUILD_BUG_ON(sizeof(skb->queue_mapping) !=

		     sizeof(qdisc_skb_cb(skb)->bond_queue_mapping));

		     sizeof(qdisc_skb_cb(skb)->slave_dev_queue_mapping));

	skb->queue_mapping = qdisc_skb_cb(skb)->bond_queue_mapping;

	skb->queue_mapping = qdisc_skb_cb(skb)->slave_dev_queue_mapping;





	if (unlikely(netpoll_tx_running(slave_dev)))

	if (unlikely(netpoll_tx_running(slave_dev)))

		bond_netpoll_send_skb(bond_get_slave_by_dev(bond, slave_dev), skb);

		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

	 * 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)) {

	if (unlikely(txq >= dev->real_num_tx_queues)) {

		do {

		do {

include/net/sch_generic.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -220,7 +220,7 @@ struct tcf_proto { 




struct qdisc_skb_cb {

struct qdisc_skb_cb {

	unsigned int		pkt_len;

	unsigned int		pkt_len;

	u16			bond_queue_mapping;

	u16			slave_dev_queue_mapping;

	u16			_pad;

	u16			_pad;

	unsigned char		data[20];

	unsigned char		data[20];

};

};