diff options
| author |   Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-04-10 20:46:21 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@sunset.davemloft.net> | 2007-04-25 22:24:47 -0700 |
| commit | e2d1bca7e6134671bcb19810d004a252aa6a644d (patch) | |
| tree | 5d8ee962cd69cd886aaedff8ac253590a985dd1c /net/ipv4/xfrm4_mode_beet.c | |
| parent | [SK_BUFF]: Introduce skb_reset_network_header(skb) (diff) | |
| download | linux-dev-e2d1bca7e6134671bcb19810d004a252aa6a644d.tar.xz linux-dev-e2d1bca7e6134671bcb19810d004a252aa6a644d.zip | |
[SK_BUFF]: Use skb_reset_network_header in skb_push cases
skb_push updates and returns skb->data, so we can just call
skb_reset_network_header after the call to skb_push.
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_beet.c')
| -rw-r--r-- | net/ipv4/xfrm4_mode_beet.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/xfrm4_mode_beet.c b/net/ipv4/xfrm4_mode_beet.c index d419e15d9803..eaaf3565f3b2 100644 --- a/net/ipv4/xfrm4_mode_beet.c +++ b/net/ipv4/xfrm4_mode_beet.c @@ -40,7 +40,8 @@ static int xfrm4_beet_output(struct xfrm_state *x, struct sk_buff *skb) if (unlikely(optlen)) hdrlen += IPV4_BEET_PHMAXLEN - (optlen & 4); - skb->nh.raw = skb_push(skb, x->props.header_len + hdrlen); + skb_push(skb, x->props.header_len + hdrlen); + skb_reset_network_header(skb); top_iph = skb->nh.iph; skb->h.raw += sizeof(*iph) - hdrlen; |