diff options
| author | Jukka Rissanen <jukka.rissanen@linux.intel.com> | 2013-12-11 17:05:36 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2013-12-11 12:57:55 -0800 |
| commit | e74bccb8a598c37840b547a7d606bd8c959cc2e4 (patch) | |
| tree | c0b8e136ba677029d72aba79066b55f068da174e /net/ipv6 | |
| parent | 0abc652c796dab74d34d60473ec5594cd21620be (diff) | |
| download | linux-stable-e74bccb8a598c37840b547a7d606bd8c959cc2e4.tar.gz linux-stable-e74bccb8a598c37840b547a7d606bd8c959cc2e4.tar.bz2 linux-stable-e74bccb8a598c37840b547a7d606bd8c959cc2e4.zip | |
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')
| -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) 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; } |