diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-04-11 00:21:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:26:20 -0400 |
| commit | b0e380b1d8a8e0aca215df97702f99815f05c094 (patch) | |
| tree | 95f402ca155f5211150178811669ebf0a88e8e00 /net/ipv6/ah6.c | |
| parent | cfe1fc7759fdacb0c650b575daed1692bf3eaece (diff) | |
[SK_BUFF]: unions of just one member don't get anything done, kill them
Renaming skb->h to skb->transport_header, skb->nh to skb->network_header and
skb->mac to skb->mac_header, to match the names of the associated helpers
(skb[_[re]set]_{transport,network,mac}_header).
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ah6.c')
| -rw-r--r-- | net/ipv6/ah6.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c index d2af4fe3725b..b696c8401200 100644 --- 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) | |||
| 316 | * | 316 | * |
| 317 | * To erase AH: | 317 | * To erase AH: |
| 318 | * Keeping copy of cleared headers. After AH processing, | 318 | * Keeping copy of cleared headers. After AH processing, |
| 319 | * Moving the pointer of skb->nh.raw by using skb_pull as long as AH | 319 | * Moving the pointer of skb->network_header by using skb_pull as long |
| 320 | * header length. Then copy back the copy as long as hdr_len | 320 | * as AH header length. Then copy back the copy as long as hdr_len |
| 321 | * If destination header following AH exists, copy it into after [Ext2]. | 321 | * If destination header following AH exists, copy it into after [Ext2]. |
| 322 | * | 322 | * |
| 323 | * |<>|[IPv6][Ext1][Ext2][Dest][Payload] | 323 | * |<>|[IPv6][Ext1][Ext2][Dest][Payload] |
| @@ -384,9 +384,9 @@ static int ah6_input(struct xfrm_state *x, struct sk_buff *skb) | |||
| 384 | } | 384 | } |
| 385 | } | 385 | } |
| 386 | 386 | ||
| 387 | skb->nh.raw += ah_hlen; | 387 | skb->network_header += ah_hlen; |
| 388 | memcpy(skb_network_header(skb), tmp_hdr, hdr_len); | 388 | memcpy(skb_network_header(skb), tmp_hdr, hdr_len); |
| 389 | skb->h.raw = skb->nh.raw; | 389 | skb->transport_header = skb->network_header; |
| 390 | __skb_pull(skb, ah_hlen + hdr_len); | 390 | __skb_pull(skb, ah_hlen + hdr_len); |
| 391 | 391 | ||
| 392 | kfree(tmp_hdr); | 392 | kfree(tmp_hdr); |