]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
[SK_BUFF] bonding: Set skb->nh.raw relative to skb->mac.raw
authorArnaldo Carvalho de Melo <acme@redhat.com>
Sat, 10 Mar 2007 23:09:45 +0000 (20:09 -0300)
committerDavid S. Miller <davem@sunset.davemloft.net>
Thu, 26 Apr 2007 05:24:56 +0000 (22:24 -0700)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/bonding/bond_3ad.c
drivers/net/bonding/bond_alb.c

index e3c9e2e56d14852616b59071c1e75f07b46f08e7..05c870d6f6c3b07b5f1bd4d85e68256284b6e559 100644 (file)
@@ -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);
index 36b8e860107e00baa089ac4e71fe257cbafea523..5c2a12c2b9975051c524c86c4988ab6c1e10e0a2 100644 (file)
@@ -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;