diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-04-10 21:21:55 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-25 22:26:20 -0700 |
| commit | b0e380b1d8a8e0aca215df97702f99815f05c094 (patch) | |
| tree | 95f402ca155f5211150178811669ebf0a88e8e00 /net/ipv6/ip6_input.c | |
| parent | cfe1fc7759fdacb0c650b575daed1692bf3eaece (diff) | |
| download | linux-stable-b0e380b1d8a8e0aca215df97702f99815f05c094.tar.gz linux-stable-b0e380b1d8a8e0aca215df97702f99815f05c094.tar.bz2 linux-stable-b0e380b1d8a8e0aca215df97702f99815f05c094.zip | |
[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/ip6_input.c')
| -rw-r--r-- | net/ipv6/ip6_input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c index cf0c4406b59e..be0ee8a34f9b 100644 --- a/net/ipv6/ip6_input.c +++ b/net/ipv6/ip6_input.c @@ -101,7 +101,7 @@ int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt if (hdr->version != 6) goto err; - skb->h.raw = skb->nh.raw + sizeof(*hdr); + skb->transport_header = skb->network_header + sizeof(*hdr); IP6CB(skb)->nhoff = offsetof(struct ipv6hdr, nexthdr); pkt_len = ntohs(hdr->payload_len); |