tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Arnaldo Carvalho de Melo and committed by
David S. Miller e7dd65da 7f5c0cb0

+3 -3
+2 -2
drivers/net/bonding/bond_3ad.c
··· 885 885 886 886 skb->dev = slave->dev; 887 887 skb_reset_mac_header(skb); 888 - skb->nh.raw = skb->data + ETH_HLEN; 888 + skb->nh.raw = skb->mac.raw + ETH_HLEN; 889 889 skb->protocol = PKT_TYPE_LACPDU; 890 890 skb->priority = TC_PRIO_CONTROL; 891 891 ··· 929 929 930 930 skb->dev = slave->dev; 931 931 skb_reset_mac_header(skb); 932 - skb->nh.raw = skb->data + ETH_HLEN; 932 + skb->nh.raw = skb->mac.raw + ETH_HLEN; 933 933 skb->protocol = PKT_TYPE_LACPDU; 934 934 935 935 marker_header = (struct marker_header *)skb_put(skb, length);
+1 -1
drivers/net/bonding/bond_alb.c
··· 896 896 memcpy(data, &pkt, size); 897 897 898 898 skb_reset_mac_header(skb); 899 - skb->nh.raw = data + ETH_HLEN; 899 + skb->nh.raw = skb->mac.raw + ETH_HLEN; 900 900 skb->protocol = pkt.type; 901 901 skb->priority = TC_PRIO_CONTROL; 902 902 skb->dev = slave->dev;