|
@@ -559,6 +559,11 @@ static inline struct inet6_dev *ipv6_skb_idev(struct sk_buff *skb)
|
|
|
return skb_dst(skb) ? ip6_dst_idev(skb_dst(skb)) : __in6_dev_get(skb->dev);
|
|
|
}
|
|
|
|
|
|
+static inline struct net *ipv6_skb_net(struct sk_buff *skb)
|
|
|
+{
|
|
|
+ return skb_dst(skb) ? dev_net(skb_dst(skb)->dev) : dev_net(skb->dev);
|
|
|
+}
|
|
|
+
|
|
|
/* Router Alert as of RFC 2711 */
|
|
|
|
|
|
static int ipv6_hop_ra(struct sk_buff *skb, int optoff)
|
|
@@ -580,8 +585,8 @@ static int ipv6_hop_ra(struct sk_buff *skb, int optoff)
|
|
|
static int ipv6_hop_jumbo(struct sk_buff *skb, int optoff)
|
|
|
{
|
|
|
const unsigned char *nh = skb_network_header(skb);
|
|
|
+ struct net *net = ipv6_skb_net(skb);
|
|
|
u32 pkt_len;
|
|
|
- struct net *net = dev_net(skb_dst(skb)->dev);
|
|
|
|
|
|
if (nh[optoff + 1] != 4 || (optoff & 3) != 2) {
|
|
|
LIMIT_NETDEBUG(KERN_DEBUG "ipv6_hop_jumbo: wrong jumbo opt length/alignment %d\n",
|