6lowpan: revert 'reuse eth_mac_addr()'

This reverts the commit cdf49c283e2e105da86ca575ad35b453f5ff24ea which
replaces lowpan '.ndo_set_mac_address' method by ethernet's one.

Accorind to the IEEE 802.15.4 standard, device has 8-byte length address,
so this hook loses the last 2 bytes which may rise a compatibility problems
with other IEEE 802.15.4 standard implementations.

Signed-off-by: Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
index cd5007f3a5695cf5290827fa777dbd9d6704efc6..f4070e54d1a1098def2f0456fb4a58d0821d8917 100644 (file)
--- a/net/ieee802154/6lowpan.c
+++ b/net/ieee802154/6lowpan.c
@@ -55,7 +55,6 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/netdevice.h>
-#include <linux/etherdevice.h>
 #include <net/af_ieee802154.h>
 #include <net/ieee802154.h>
 #include <net/ieee802154_netdev.h>
@@ -936,6 +935,19 @@ drop:
        return -EINVAL;
 }
 
+static int lowpan_set_address(struct net_device *dev, void *p)
+{
+       struct sockaddr *sa = p;
+
+       if (netif_running(dev))
+               return -EBUSY;
+
+       /* TODO: validate addr */
+       memcpy(dev->dev_addr, sa->sa_data, dev->addr_len);
+
+       return 0;
+}
+
 static int lowpan_get_mac_header_length(struct sk_buff *skb)
 {
        /*
@@ -1078,7 +1090,7 @@ static struct header_ops lowpan_header_ops = {
 
 static const struct net_device_ops lowpan_netdev_ops = {
        .ndo_start_xmit         = lowpan_xmit,
-       .ndo_set_mac_address    = eth_mac_addr,
+       .ndo_set_mac_address    = lowpan_set_address,
 };
 
 static struct ieee802154_mlme_ops lowpan_mlme = {