diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-03-10 18:09:45 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:24:56 -0400 |
commit | e7dd65dafda5737a983c04d652a69ab8da78ee3f (patch) | |
tree | bf29c98726ff127de303e23ecf71454f7d0247c4 /drivers/net | |
parent | 7f5c0cb05f158ee91414e1f99d3fe18349a80371 (diff) |
[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>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/bonding/bond_3ad.c | 4 | ||||
-rw-r--r-- | 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 e3c9e2e56d14..05c870d6f6c3 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) | |||
885 | 885 | ||
886 | skb->dev = slave->dev; | 886 | skb->dev = slave->dev; |
887 | skb_reset_mac_header(skb); | 887 | skb_reset_mac_header(skb); |
888 | skb->nh.raw = skb->data + ETH_HLEN; | 888 | skb->nh.raw = skb->mac.raw + ETH_HLEN; |
889 | skb->protocol = PKT_TYPE_LACPDU; | 889 | skb->protocol = PKT_TYPE_LACPDU; |
890 | skb->priority = TC_PRIO_CONTROL; | 890 | skb->priority = TC_PRIO_CONTROL; |
891 | 891 | ||
@@ -929,7 +929,7 @@ static int ad_marker_send(struct port *port, struct marker *marker) | |||
929 | 929 | ||
930 | skb->dev = slave->dev; | 930 | skb->dev = slave->dev; |
931 | skb_reset_mac_header(skb); | 931 | skb_reset_mac_header(skb); |
932 | skb->nh.raw = skb->data + ETH_HLEN; | 932 | skb->nh.raw = skb->mac.raw + ETH_HLEN; |
933 | skb->protocol = PKT_TYPE_LACPDU; | 933 | skb->protocol = PKT_TYPE_LACPDU; |
934 | 934 | ||
935 | marker_header = (struct marker_header *)skb_put(skb, length); | 935 | 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 36b8e860107e..5c2a12c2b997 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[]) | |||
896 | memcpy(data, &pkt, size); | 896 | memcpy(data, &pkt, size); |
897 | 897 | ||
898 | skb_reset_mac_header(skb); | 898 | skb_reset_mac_header(skb); |
899 | skb->nh.raw = data + ETH_HLEN; | 899 | skb->nh.raw = skb->mac.raw + ETH_HLEN; |
900 | skb->protocol = pkt.type; | 900 | skb->protocol = pkt.type; |
901 | skb->priority = TC_PRIO_CONTROL; | 901 | skb->priority = TC_PRIO_CONTROL; |
902 | skb->dev = slave->dev; | 902 | skb->dev = slave->dev; |