Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e7dd65dafda5737a983c04d652a69ab8da78ee3f
Commit:     e7dd65dafda5737a983c04d652a69ab8da78ee3f
Parent:     7f5c0cb05f158ee91414e1f99d3fe18349a80371
Author:     Arnaldo Carvalho de Melo <[EMAIL PROTECTED]>
AuthorDate: Sat Mar 10 20:09:45 2007 -0300
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Wed Apr 25 22:24:56 2007 -0700

    [SK_BUFF] bonding: Set skb->nh.raw relative to skb->mac.raw
    
    Signed-off-by: Arnaldo Carvalho de Melo <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 drivers/net/bonding/bond_3ad.c |    4 ++--
 drivers/net/bonding/bond_alb.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index e3c9e2e..05c870d 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -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);
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index 36b8e86..5c2a12c 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to