summaryrefslogtreecommitdiffstats
path: root/net/ipv4/xfrm4_mode_transport.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2007-04-10 20:46:21 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-25 22:24:47 -0700
commite2d1bca7e6134671bcb19810d004a252aa6a644d (patch)
tree5d8ee962cd69cd886aaedff8ac253590a985dd1c /net/ipv4/xfrm4_mode_transport.c
parentc1d2bbe1cd6c7bbdc6d532cefebb66c7efb789ce (diff)
downloadop-kernel-dev-e2d1bca7e6134671bcb19810d004a252aa6a644d.zip
op-kernel-dev-e2d1bca7e6134671bcb19810d004a252aa6a644d.tar.gz
[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_transport.c')
-rw-r--r--net/ipv4/xfrm4_mode_transport.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/xfrm4_mode_transport.c b/net/ipv4/xfrm4_mode_transport.c
index 92676b7..290c0f2 100644
--- a/net/ipv4/xfrm4_mode_transport.c
+++ b/net/ipv4/xfrm4_mode_transport.c
@@ -32,7 +32,9 @@ static int xfrm4_transport_output(struct xfrm_state *x, struct sk_buff *skb)
ihl = iph->ihl * 4;
skb->h.raw += ihl;
- skb->nh.raw = memmove(skb_push(skb, x->props.header_len), iph, ihl);
+ skb_push(skb, x->props.header_len);
+ skb_reset_network_header(skb);
+ memmove(skb->nh.raw, iph, ihl);
return 0;
}
OpenPOWER on IntegriCloud