diff options
Diffstat (limited to 'net/ipv6/ip6_input.c')
-rw-r--r-- | net/ipv6/ip6_input.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c index bc1a920c34a1..c3a07d75b5f5 100644 --- a/net/ipv6/ip6_input.c +++ b/net/ipv6/ip6_input.c | |||
@@ -48,7 +48,7 @@ | |||
48 | 48 | ||
49 | inline int ip6_rcv_finish( struct sk_buff *skb) | 49 | inline int ip6_rcv_finish( struct sk_buff *skb) |
50 | { | 50 | { |
51 | if (skb->dst == NULL) | 51 | if (skb_dst(skb) == NULL) |
52 | ip6_route_input(skb); | 52 | ip6_route_input(skb); |
53 | 53 | ||
54 | return dst_input(skb); | 54 | return dst_input(skb); |
@@ -91,7 +91,7 @@ int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt | |||
91 | * arrived via the sending interface (ethX), because of the | 91 | * arrived via the sending interface (ethX), because of the |
92 | * nature of scoping architecture. --yoshfuji | 92 | * nature of scoping architecture. --yoshfuji |
93 | */ | 93 | */ |
94 | IP6CB(skb)->iif = skb->dst ? ip6_dst_idev(skb->dst)->dev->ifindex : dev->ifindex; | 94 | IP6CB(skb)->iif = skb_dst(skb) ? ip6_dst_idev(skb_dst(skb))->dev->ifindex : dev->ifindex; |
95 | 95 | ||
96 | if (unlikely(!pskb_may_pull(skb, sizeof(*hdr)))) | 96 | if (unlikely(!pskb_may_pull(skb, sizeof(*hdr)))) |
97 | goto err; | 97 | goto err; |
@@ -161,7 +161,7 @@ static int ip6_input_finish(struct sk_buff *skb) | |||
161 | int nexthdr, raw; | 161 | int nexthdr, raw; |
162 | u8 hash; | 162 | u8 hash; |
163 | struct inet6_dev *idev; | 163 | struct inet6_dev *idev; |
164 | struct net *net = dev_net(skb->dst->dev); | 164 | struct net *net = dev_net(skb_dst(skb)->dev); |
165 | 165 | ||
166 | /* | 166 | /* |
167 | * Parse extension headers | 167 | * Parse extension headers |
@@ -169,7 +169,7 @@ static int ip6_input_finish(struct sk_buff *skb) | |||
169 | 169 | ||
170 | rcu_read_lock(); | 170 | rcu_read_lock(); |
171 | resubmit: | 171 | resubmit: |
172 | idev = ip6_dst_idev(skb->dst); | 172 | idev = ip6_dst_idev(skb_dst(skb)); |
173 | if (!pskb_pull(skb, skb_transport_offset(skb))) | 173 | if (!pskb_pull(skb, skb_transport_offset(skb))) |
174 | goto discard; | 174 | goto discard; |
175 | nhoff = IP6CB(skb)->nhoff; | 175 | nhoff = IP6CB(skb)->nhoff; |
@@ -242,8 +242,8 @@ int ip6_mc_input(struct sk_buff *skb) | |||
242 | struct ipv6hdr *hdr; | 242 | struct ipv6hdr *hdr; |
243 | int deliver; | 243 | int deliver; |
244 | 244 | ||
245 | IP6_UPD_PO_STATS_BH(dev_net(skb->dst->dev), | 245 | IP6_UPD_PO_STATS_BH(dev_net(skb_dst(skb)->dev), |
246 | ip6_dst_idev(skb->dst), IPSTATS_MIB_INMCAST, | 246 | ip6_dst_idev(skb_dst(skb)), IPSTATS_MIB_INMCAST, |
247 | skb->len); | 247 | skb->len); |
248 | 248 | ||
249 | hdr = ipv6_hdr(skb); | 249 | hdr = ipv6_hdr(skb); |