|
@@ -70,7 +70,7 @@
|
|
|
#include <net/sock.h>
|
|
|
#include <net/snmp.h>
|
|
|
|
|
|
-#include <net/af_ieee802154.h>
|
|
|
+#include <net/6lowpan.h>
|
|
|
#include <net/firewire.h>
|
|
|
#include <net/ipv6.h>
|
|
|
#include <net/protocol.h>
|
|
@@ -1947,9 +1947,9 @@ static void addrconf_leave_anycast(struct inet6_ifaddr *ifp)
|
|
|
|
|
|
static int addrconf_ifid_eui64(u8 *eui, struct net_device *dev)
|
|
|
{
|
|
|
- if (dev->addr_len != IEEE802154_ADDR_LEN)
|
|
|
+ if (dev->addr_len != EUI64_ADDR_LEN)
|
|
|
return -1;
|
|
|
- memcpy(eui, dev->dev_addr, 8);
|
|
|
+ memcpy(eui, dev->dev_addr, EUI64_ADDR_LEN);
|
|
|
eui[0] ^= 2;
|
|
|
return 0;
|
|
|
}
|
|
@@ -2041,7 +2041,6 @@ static int ipv6_generate_eui64(u8 *eui, struct net_device *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:
|
|
|
return addrconf_ifid_ieee1394(eui, dev);
|
|
@@ -3066,7 +3065,6 @@ static void addrconf_dev_config(struct net_device *dev)
|
|
|
(dev->type != ARPHRD_FDDI) &&
|
|
|
(dev->type != ARPHRD_ARCNET) &&
|
|
|
(dev->type != ARPHRD_INFINIBAND) &&
|
|
|
- (dev->type != ARPHRD_IEEE802154) &&
|
|
|
(dev->type != ARPHRD_IEEE1394) &&
|
|
|
(dev->type != ARPHRD_TUNNEL6) &&
|
|
|
(dev->type != ARPHRD_6LOWPAN)) {
|