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

Commit 14ee6742 authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by David S. Miller
Browse files

dsa: fix skb->pkt_type when mac address of slave interface differs 



When a dsa slave interface has a mac address that differs from that
of the master interface, eth_type_trans() won't explicitly set
skb->pkt_type back to PACKET_HOST -- we need to do this ourselves
before calling eth_type_trans().

Signed-off-by: default avatarLennert Buytenhek <buytenh@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5cd33db2

net/dsa/tag_dsa.c

+1 −0
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ static int dsa_rcv(struct sk_buff *skb, struct net_device *dev, 


	skb->dev = ds->ports[source_port];

	skb_push(skb, ETH_HLEN);

	skb->pkt_type = PACKET_HOST;

	skb->protocol = eth_type_trans(skb, skb->dev);



	skb->dev->last_rx = jiffies;

net/dsa/tag_edsa.c

+1 −0
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ static int edsa_rcv(struct sk_buff *skb, struct net_device *dev, 


	skb->dev = ds->ports[source_port];

	skb_push(skb, ETH_HLEN);

	skb->pkt_type = PACKET_HOST;

	skb->protocol = eth_type_trans(skb, skb->dev);



	skb->dev->last_rx = jiffies;

net/dsa/tag_trailer.c

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ static int trailer_rcv(struct sk_buff *skb, struct net_device *dev, 


	skb->dev = ds->ports[source_port];

	skb_push(skb, ETH_HLEN);

	skb->pkt_type = PACKET_HOST;

	skb->protocol = eth_type_trans(skb, skb->dev);



	skb->dev->last_rx = jiffies;