diff options
Diffstat (limited to 'net/ipv6/icmp.c')
| -rw-r--r-- | net/ipv6/icmp.c | 6 | 
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index bd59c343d35f..2772004ba5a1 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c @@ -447,8 +447,10 @@ static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info,  	if (__ipv6_addr_needs_scope_id(addr_type))  		iif = skb->dev->ifindex; -	else -		iif = l3mdev_master_ifindex(skb->dev); +	else { +		dst = skb_dst(skb); +		iif = l3mdev_master_ifindex(dst ? dst->dev : skb->dev); +	}  	/*  	 *	Must not send error if the source does not uniquely  | 
