diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-03-19 23:33:04 +0100 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 07:24:41 +0200 |
| commit | 98e399f82ab3a6d863d1d4a7ea48925cc91c830e (patch) | |
| tree | 5f84043aeec1ec27c2e8e6cc25b5d2e6c3d07343 /net/ipv4/xfrm4_mode_tunnel.c | |
| parent | [TCP]: Use skb_set_mac_header in tcp_collapse (diff) | |
| download | linux-98e399f82ab3a6d863d1d4a7ea48925cc91c830e.tar.xz linux-98e399f82ab3a6d863d1d4a7ea48925cc91c830e.zip | |
[SK_BUFF]: Introduce skb_mac_header()
For the places where we need a pointer to the mac header, it is still legal to
touch skb->mac.raw directly if just adding to, subtracting from or setting it
to another layer header.
This one also converts some more cases to skb_reset_mac_header() that my
regex missed as it had no spaces before nor after '=', ugh.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/xfrm4_mode_tunnel.c')
| -rw-r--r-- | net/ipv4/xfrm4_mode_tunnel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/xfrm4_mode_tunnel.c b/net/ipv4/xfrm4_mode_tunnel.c index f09055d3a768..8e123e30cf61 100644 --- a/net/ipv4/xfrm4_mode_tunnel.c +++ b/net/ipv4/xfrm4_mode_tunnel.c @@ -126,9 +126,9 @@ static int xfrm4_tunnel_input(struct xfrm_state *x, struct sk_buff *skb) skb->protocol = htons(ETH_P_IPV6); } #endif - old_mac = skb->mac.raw; + old_mac = skb_mac_header(skb); skb_set_mac_header(skb, -skb->mac_len); - memmove(skb->mac.raw, old_mac, skb->mac_len); + memmove(skb_mac_header(skb), old_mac, skb->mac_len); skb->nh.raw = skb->data; err = 0; |