diff options
Diffstat (limited to 'net/ipv6/ip6_input.c')
-rw-r--r-- | net/ipv6/ip6_input.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c index aecc74da0721..9c3c787a21c1 100644 --- a/net/ipv6/ip6_input.c +++ b/net/ipv6/ip6_input.c | |||
@@ -96,7 +96,7 @@ int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt | |||
96 | if (unlikely(!pskb_may_pull(skb, sizeof(*hdr)))) | 96 | if (unlikely(!pskb_may_pull(skb, sizeof(*hdr)))) |
97 | goto err; | 97 | goto err; |
98 | 98 | ||
99 | hdr = skb->nh.ipv6h; | 99 | hdr = ipv6_hdr(skb); |
100 | 100 | ||
101 | if (hdr->version != 6) | 101 | if (hdr->version != 6) |
102 | goto err; | 102 | goto err; |
@@ -116,7 +116,7 @@ int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt | |||
116 | IP6_INC_STATS_BH(idev, IPSTATS_MIB_INHDRERRORS); | 116 | IP6_INC_STATS_BH(idev, IPSTATS_MIB_INHDRERRORS); |
117 | goto drop; | 117 | goto drop; |
118 | } | 118 | } |
119 | hdr = skb->nh.ipv6h; | 119 | hdr = ipv6_hdr(skb); |
120 | } | 120 | } |
121 | 121 | ||
122 | if (hdr->nexthdr == NEXTHDR_HOP) { | 122 | if (hdr->nexthdr == NEXTHDR_HOP) { |
@@ -183,7 +183,7 @@ resubmit: | |||
183 | 183 | ||
184 | skb_postpull_rcsum(skb, skb_network_header(skb), | 184 | skb_postpull_rcsum(skb, skb_network_header(skb), |
185 | skb->h.raw - skb->nh.raw); | 185 | skb->h.raw - skb->nh.raw); |
186 | hdr = skb->nh.ipv6h; | 186 | hdr = ipv6_hdr(skb); |
187 | if (ipv6_addr_is_multicast(&hdr->daddr) && | 187 | if (ipv6_addr_is_multicast(&hdr->daddr) && |
188 | !ipv6_chk_mcast_addr(skb->dev, &hdr->daddr, | 188 | !ipv6_chk_mcast_addr(skb->dev, &hdr->daddr, |
189 | &hdr->saddr) && | 189 | &hdr->saddr) && |
@@ -234,7 +234,7 @@ int ip6_mc_input(struct sk_buff *skb) | |||
234 | 234 | ||
235 | IP6_INC_STATS_BH(ip6_dst_idev(skb->dst), IPSTATS_MIB_INMCASTPKTS); | 235 | IP6_INC_STATS_BH(ip6_dst_idev(skb->dst), IPSTATS_MIB_INMCASTPKTS); |
236 | 236 | ||
237 | hdr = skb->nh.ipv6h; | 237 | hdr = ipv6_hdr(skb); |
238 | deliver = likely(!(skb->dev->flags & (IFF_PROMISC|IFF_ALLMULTI))) || | 238 | deliver = likely(!(skb->dev->flags & (IFF_PROMISC|IFF_ALLMULTI))) || |
239 | ipv6_chk_mcast_addr(skb->dev, &hdr->daddr, NULL); | 239 | ipv6_chk_mcast_addr(skb->dev, &hdr->daddr, NULL); |
240 | 240 | ||