diff options
author | Jukka Rissanen <jukka.rissanen@linux.intel.com> | 2013-12-11 10:05:36 -0500 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2013-12-11 15:57:55 -0500 |
commit | e74bccb8a598c37840b547a7d606bd8c959cc2e4 (patch) | |
tree | c0b8e136ba677029d72aba79066b55f068da174e /net/ipv6/addrconf.c | |
parent | 0abc652c796dab74d34d60473ec5594cd21620be (diff) |
ipv6: Add checks for 6LOWPAN ARP type
Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/ipv6/addrconf.c')
-rw-r--r-- | net/ipv6/addrconf.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 12c97d8aa6bb..d125fcdefb74 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) | |||
1816 | return addrconf_ifid_sit(eui, dev); | 1816 | return addrconf_ifid_sit(eui, dev); |
1817 | case ARPHRD_IPGRE: | 1817 | case ARPHRD_IPGRE: |
1818 | return addrconf_ifid_gre(eui, dev); | 1818 | return addrconf_ifid_gre(eui, dev); |
1819 | case ARPHRD_6LOWPAN: | ||
1819 | case ARPHRD_IEEE802154: | 1820 | case ARPHRD_IEEE802154: |
1820 | return addrconf_ifid_eui64(eui, dev); | 1821 | return addrconf_ifid_eui64(eui, dev); |
1821 | case ARPHRD_IEEE1394: | 1822 | case ARPHRD_IEEE1394: |
@@ -2658,7 +2659,8 @@ static void addrconf_dev_config(struct net_device *dev) | |||
2658 | (dev->type != ARPHRD_INFINIBAND) && | 2659 | (dev->type != ARPHRD_INFINIBAND) && |
2659 | (dev->type != ARPHRD_IEEE802154) && | 2660 | (dev->type != ARPHRD_IEEE802154) && |
2660 | (dev->type != ARPHRD_IEEE1394) && | 2661 | (dev->type != ARPHRD_IEEE1394) && |
2661 | (dev->type != ARPHRD_TUNNEL6)) { | 2662 | (dev->type != ARPHRD_TUNNEL6) && |
2663 | (dev->type != ARPHRD_6LOWPAN)) { | ||
2662 | /* Alas, we support only Ethernet autoconfiguration. */ | 2664 | /* Alas, we support only Ethernet autoconfiguration. */ |
2663 | return; | 2665 | return; |
2664 | } | 2666 | } |