projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[SK_BUFF]: unions of just one member don't get anything done, kill them
[linux-2.6-block.git]
/
net
/
ipv6
/
ah6.c
diff --git
a/net/ipv6/ah6.c
b/net/ipv6/ah6.c
index d2af4fe3725b7b9fdb8030a4a08fe3a2ce9c78b9..b696c8401200b64c7775f85c511bad6e026d292b 100644
(file)
--- a/
net/ipv6/ah6.c
+++ b/
net/ipv6/ah6.c
@@
-316,8
+316,8
@@
static int ah6_input(struct xfrm_state *x, struct sk_buff *skb)
*
* To erase AH:
* Keeping copy of cleared headers. After AH processing,
*
* To erase AH:
* Keeping copy of cleared headers. After AH processing,
- * Moving the pointer of skb->n
h.raw by using skb_pull as long as AH
- * header length. Then copy back the copy as long as hdr_len
+ * Moving the pointer of skb->n
etwork_header by using skb_pull as long
+ *
as AH
header length. Then copy back the copy as long as hdr_len
* If destination header following AH exists, copy it into after [Ext2].
*
* |<>|[IPv6][Ext1][Ext2][Dest][Payload]
* If destination header following AH exists, copy it into after [Ext2].
*
* |<>|[IPv6][Ext1][Ext2][Dest][Payload]
@@
-384,9
+384,9
@@
static int ah6_input(struct xfrm_state *x, struct sk_buff *skb)
}
}
}
}
- skb->n
h.raw
+= ah_hlen;
+ skb->n
etwork_header
+= ah_hlen;
memcpy(skb_network_header(skb), tmp_hdr, hdr_len);
memcpy(skb_network_header(skb), tmp_hdr, hdr_len);
- skb->
h.raw = skb->nh.raw
;
+ skb->
transport_header = skb->network_header
;
__skb_pull(skb, ah_hlen + hdr_len);
kfree(tmp_hdr);
__skb_pull(skb, ah_hlen + hdr_len);
kfree(tmp_hdr);