projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0abc652
)
ipv6: Add checks for 6LOWPAN ARP type
author
Jukka Rissanen
<jukka.rissanen@linux.intel.com>
Wed, 11 Dec 2013 15:05:36 +0000
(17:05 +0200)
committer
Marcel Holtmann
<marcel@holtmann.org>
Wed, 11 Dec 2013 20:57:55 +0000
(12:57 -0800)
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>
net/ipv6/addrconf.c
patch
|
blob
|
history
diff --git
a/net/ipv6/addrconf.c
b/net/ipv6/addrconf.c
index 12c97d8aa6bbb31ff1519459b89b7b9fb33817f5..d125fcdefb74097b5f6eed867d8ff60428a1d63a 100644
(file)
--- 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;
}