diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-03-19 18:30:44 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:24:32 -0400 |
commit | 459a98ed881802dee55897441bc7f77af614368e (patch) | |
tree | b81f76632d8f2e21eb91ec3d885091a98398d93e /net/atm | |
parent | 4c13eb6657fe9ef7b4dc8f1a405c902e9e5234e0 (diff) |
[SK_BUFF]: Introduce skb_reset_mac_header(skb)
For the common, open coded 'skb->mac.raw = skb->data' operation, so that we can
later turn skb->mac.raw into a offset, reducing the size of struct sk_buff in
64bit land while possibly keeping it as a pointer on 32bit.
This one touches just the most simple case, next will handle the slightly more
"complex" cases.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/atm')
-rw-r--r-- | net/atm/br2684.c | 2 | ||||
-rw-r--r-- | net/atm/clip.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/atm/br2684.c b/net/atm/br2684.c index c444f5eda22d..900d42ca8a50 100644 --- a/net/atm/br2684.c +++ b/net/atm/br2684.c | |||
@@ -458,7 +458,7 @@ static void br2684_push(struct atm_vcc *atmvcc, struct sk_buff *skb) | |||
458 | /* FIXME: tcpdump shows that pointer to mac header is 2 bytes earlier, | 458 | /* FIXME: tcpdump shows that pointer to mac header is 2 bytes earlier, |
459 | than should be. What else should I set? */ | 459 | than should be. What else should I set? */ |
460 | skb_pull(skb, plen); | 460 | skb_pull(skb, plen); |
461 | skb->mac.raw = ((char *) (skb->data)) - ETH_HLEN; | 461 | skb->mac.raw = skb->data - ETH_HLEN; |
462 | skb->pkt_type = PACKET_HOST; | 462 | skb->pkt_type = PACKET_HOST; |
463 | #ifdef CONFIG_BR2684_FAST_TRANS | 463 | #ifdef CONFIG_BR2684_FAST_TRANS |
464 | skb->protocol = ((u16 *) skb->data)[-1]; | 464 | skb->protocol = ((u16 *) skb->data)[-1]; |
diff --git a/net/atm/clip.c b/net/atm/clip.c index 8c3825816085..ccba24ffb966 100644 --- a/net/atm/clip.c +++ b/net/atm/clip.c | |||
@@ -213,7 +213,7 @@ static void clip_push(struct atm_vcc *vcc, struct sk_buff *skb) | |||
213 | return; | 213 | return; |
214 | } | 214 | } |
215 | ATM_SKB(skb)->vcc = vcc; | 215 | ATM_SKB(skb)->vcc = vcc; |
216 | skb->mac.raw = skb->data; | 216 | skb_reset_mac_header(skb); |
217 | if (!clip_vcc->encap | 217 | if (!clip_vcc->encap |
218 | || skb->len < RFC1483LLC_LEN | 218 | || skb->len < RFC1483LLC_LEN |
219 | || memcmp(skb->data, llc_oui, sizeof (llc_oui))) | 219 | || memcmp(skb->data, llc_oui, sizeof (llc_oui))) |