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/xfrm6_mode_tunnel.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/xfrm6_mode_tunnel.c')
| -rw-r--r-- | net/ipv6/xfrm6_mode_tunnel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/xfrm6_mode_tunnel.c b/net/ipv6/xfrm6_mode_tunnel.c index 21d65df7479e..a6c0cdf46ad6 100644 --- a/net/ipv6/xfrm6_mode_tunnel.c +++ b/net/ipv6/xfrm6_mode_tunnel.c | |||
| @@ -55,8 +55,8 @@ static int xfrm6_tunnel_output(struct xfrm_state *x, struct sk_buff *skb) | |||
| 55 | 55 | ||
| 56 | skb_reset_network_header(skb); | 56 | skb_reset_network_header(skb); |
| 57 | top_iph = ipv6_hdr(skb); | 57 | top_iph = ipv6_hdr(skb); |
| 58 | skb->h.raw = skb->nh.raw + sizeof(struct ipv6hdr); | 58 | skb->transport_header = skb->network_header + sizeof(struct ipv6hdr); |
| 59 | skb->nh.raw += offsetof(struct ipv6hdr, nexthdr); | 59 | skb->network_header += offsetof(struct ipv6hdr, nexthdr); |
| 60 | 60 | ||
| 61 | top_iph->version = 6; | 61 | top_iph->version = 6; |
| 62 | if (xdst->route->ops->family == AF_INET6) { | 62 | if (xdst->route->ops->family == AF_INET6) { |