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

Commit e7dd65da authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files

[SK_BUFF] bonding: Set skb->nh.raw relative to skb->mac.raw 



Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7f5c0cb0

drivers/net/bonding/bond_3ad.c

+2 −2
Original line number Diff line number Diff line
@@ -885,7 +885,7 @@ static int ad_lacpdu_send(struct port *port) 


	skb->dev = slave->dev;

	skb_reset_mac_header(skb);

	skb->nh.raw = skb->data + ETH_HLEN;

	skb->nh.raw = skb->mac.raw + ETH_HLEN;

	skb->protocol = PKT_TYPE_LACPDU;

	skb->priority = TC_PRIO_CONTROL;
@@ -929,7 +929,7 @@ static int ad_marker_send(struct port *port, struct marker *marker) 


	skb->dev = slave->dev;

	skb_reset_mac_header(skb);

	skb->nh.raw = skb->data + ETH_HLEN;

	skb->nh.raw = skb->mac.raw + ETH_HLEN;

	skb->protocol = PKT_TYPE_LACPDU;



	marker_header = (struct marker_header *)skb_put(skb, length);

drivers/net/bonding/bond_alb.c

+1 −1
Original line number Diff line number Diff line
@@ -896,7 +896,7 @@ static void alb_send_learning_packets(struct slave *slave, u8 mac_addr[]) 
		memcpy(data, &pkt, size);



		skb_reset_mac_header(skb);

		skb->nh.raw = data + ETH_HLEN;

		skb->nh.raw = skb->mac.raw + ETH_HLEN;

		skb->protocol = pkt.type;

		skb->priority = TC_PRIO_CONTROL;

		skb->dev = slave->dev;