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

Commit 0a5f14ce authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: dsa: tag_brcm: Indicate to master netdevice port + queue 



We need to tell the DSA master network device doing the actual
transmission what the desired switch port and queue number is for it to
resolve that to the internal transmit queue it is mapped to.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 60724d4b

include/net/dsa.h

+5 −0
Original line number Diff line number Diff line
@@ -516,4 +516,9 @@ static inline int call_dsa_notifiers(unsigned long val, struct net_device *dev, 
}

#endif



/* Broadcom tag specific helpers to insert and extract queue/port number */

#define BRCM_TAG_SET_PORT_QUEUE(p, q)	((p) << 8 | q)

#define BRCM_TAG_GET_PORT(v)		((v) >> 8)

#define BRCM_TAG_GET_QUEUE(v)		((v) & 0xff)



#endif

net/dsa/tag_brcm.c

+6 −0
Original line number Diff line number Diff line
@@ -86,6 +86,12 @@ static struct sk_buff *brcm_tag_xmit(struct sk_buff *skb, struct net_device *dev 
		brcm_tag[2] = BRCM_IG_DSTMAP2_MASK;

	brcm_tag[3] = (1 << p->dp->index) & BRCM_IG_DSTMAP1_MASK;



	/* Now tell the master network device about the desired output queue

	 * as well

	 */

	skb_set_queue_mapping(skb, BRCM_TAG_SET_PORT_QUEUE(p->dp->index,

							   queue));



	return skb;

}