diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-03-10 19:59:16 -0300 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-25 22:24:55 -0700 |
| commit | 7f5c0cb05f158ee91414e1f99d3fe18349a80371 (patch) | |
| tree | 0578eb3f70af3535bb1dc786162d59c8f66feeb7 | |
| parent | 1ced98e81d1c2f1ce965ecf8d0032e02ffa07bf0 (diff) | |
| download | talos-obmc-linux-7f5c0cb05f158ee91414e1f99d3fe18349a80371.tar.gz talos-obmc-linux-7f5c0cb05f158ee91414e1f99d3fe18349a80371.zip | |
[SK_BUFF] xfrm4: use skb_reset_network_header
Setting it to skb->h.raw, which is valid, in the (to become) old pointer based
world order and in the new world of offset based layer headers.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv4/xfrm4_mode_transport.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv4/xfrm4_mode_transport.c b/net/ipv4/xfrm4_mode_transport.c index 290c0f2e7c29..a820dde2c862 100644 --- a/net/ipv4/xfrm4_mode_transport.c +++ b/net/ipv4/xfrm4_mode_transport.c @@ -50,8 +50,10 @@ static int xfrm4_transport_input(struct xfrm_state *x, struct sk_buff *skb) { int ihl = skb->data - skb->h.raw; - if (skb->h.raw != skb->nh.raw) - skb->nh.raw = memmove(skb->h.raw, skb->nh.raw, ihl); + if (skb->h.raw != skb->nh.raw) { + memmove(skb->h.raw, skb->nh.raw, ihl); + skb->nh.raw = skb->h.raw; + } skb->nh.iph->tot_len = htons(skb->len + ihl); skb->h.raw = skb->data; return 0; |
