From: Jukka Rissanen Date: Wed, 11 Dec 2013 15:05:36 +0000 (+0200) Subject: ipv6: Add checks for 6LOWPAN ARP type X-Git-Tag: v3.14-rc1~94^2~3^2^2~67^2~28 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e74bccb8a598c37840b547a7d606bd8c959cc2e4;p=platform%2Fkernel%2Flinux-stable.git ipv6: Add checks for 6LOWPAN ARP type Signed-off-by: Jukka Rissanen Acked-by: David S. Miller Signed-off-by: Marcel Holtmann --- diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 12c97d8..d125fcd 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -1816,6 +1816,7 @@ static int ipv6_generate_eui64(u8 *eui, struct net_device *dev) return addrconf_ifid_sit(eui, dev); case ARPHRD_IPGRE: return addrconf_ifid_gre(eui, dev); + case ARPHRD_6LOWPAN: case ARPHRD_IEEE802154: return addrconf_ifid_eui64(eui, dev); case ARPHRD_IEEE1394: @@ -2658,7 +2659,8 @@ static void addrconf_dev_config(struct net_device *dev) (dev->type != ARPHRD_INFINIBAND) && (dev->type != ARPHRD_IEEE802154) && (dev->type != ARPHRD_IEEE1394) && - (dev->type != ARPHRD_TUNNEL6)) { + (dev->type != ARPHRD_TUNNEL6) && + (dev->type != ARPHRD_6LOWPAN)) { /* Alas, we support only Ethernet autoconfiguration. */ return; }