Commit a72808b6 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

net: dsa: create a helper for locating EtherType DSA headers on TX 



Create a similar helper for locating the offset to the DSA header
relative to skb->data, and make the existing EtherType header taggers to
use it.

Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5d928ff4

net/dsa/dsa_priv.h

+9 −0
Original line number Diff line number Diff line
@@ -521,6 +521,15 @@ static inline void *dsa_etype_header_pos_rx(struct sk_buff *skb) 
	return skb->data - 2;

}



/* On TX, skb->data points to skb_mac_header(skb), which means that EtherType

 * header taggers start exactly where the EtherType is (the EtherType is

 * treated as part of the DSA header).

 */

static inline void *dsa_etype_header_pos_tx(struct sk_buff *skb)

{

	return skb->data + 2 * ETH_ALEN;

}



/* switch.c */

int dsa_switch_register_notifier(struct dsa_switch *ds);

void dsa_switch_unregister_notifier(struct dsa_switch *ds);

net/dsa/tag_dsa.c

+3 −3
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static struct sk_buff *dsa_xmit_ll(struct sk_buff *skb, struct net_device *dev, 
		}



		/* Construct tagged DSA tag from 802.1Q tag. */

		dsa_header = skb->data + 2 * ETH_ALEN + extra;

		dsa_header = dsa_etype_header_pos_tx(skb) + extra;

		dsa_header[0] = (cmd << 6) | 0x20 | tag_dev;

		dsa_header[1] = tag_port << 3;
@@ -184,7 +184,7 @@ static struct sk_buff *dsa_xmit_ll(struct sk_buff *skb, struct net_device *dev, 
		dsa_alloc_etype_header(skb, DSA_HLEN + extra);



		/* Construct untagged DSA tag. */

		dsa_header = skb->data + 2 * ETH_ALEN + extra;

		dsa_header = dsa_etype_header_pos_tx(skb) + extra;



		dsa_header[0] = (cmd << 6) | tag_dev;

		dsa_header[1] = tag_port << 3;
@@ -360,7 +360,7 @@ static struct sk_buff *edsa_xmit(struct sk_buff *skb, struct net_device *dev) 
	if (!skb)

		return NULL;



	edsa_header = skb->data + 2 * ETH_ALEN;

	edsa_header = dsa_etype_header_pos_tx(skb);

	edsa_header[0] = (ETH_P_EDSA >> 8) & 0xff;

	edsa_header[1] = ETH_P_EDSA & 0xff;

	edsa_header[2] = 0x00;

net/dsa/tag_lan9303.c

+2 −1
Original line number Diff line number Diff line
@@ -64,7 +64,8 @@ static struct sk_buff *lan9303_xmit(struct sk_buff *skb, struct net_device *dev) 
	/* make room between MACs and Ether-Type */

	dsa_alloc_etype_header(skb, LAN9303_TAG_LEN);



	lan9303_tag = (__be16 *)(skb->data + 2 * ETH_ALEN);

	lan9303_tag = dsa_etype_header_pos_tx(skb);



	tag = lan9303_xmit_use_arl(dp, skb->data) ?

		LAN9303_TAG_TX_USE_ALR :

		dp->index | LAN9303_TAG_TX_STP_OVERRIDE;

net/dsa/tag_mtk.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static struct sk_buff *mtk_tag_xmit(struct sk_buff *skb, 
		dsa_alloc_etype_header(skb, MTK_HDR_LEN);

	}



	mtk_tag = skb->data + 2 * ETH_ALEN;

	mtk_tag = dsa_etype_header_pos_tx(skb);



	/* Mark tag attribute on special tag insertion to notify hardware

	 * whether that's a combined special tag with 802.1Q header.

net/dsa/tag_qca.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static struct sk_buff *qca_tag_xmit(struct sk_buff *skb, struct net_device *dev) 
	skb_push(skb, QCA_HDR_LEN);



	dsa_alloc_etype_header(skb, QCA_HDR_LEN);

	phdr = (__be16 *)(skb->data + 2 * ETH_ALEN);

	phdr = dsa_etype_header_pos_tx(skb);



	/* Set the version field, and set destination port information */

	hdr = QCA_HDR_VERSION << QCA_HDR_XMIT_VERSION_S |