]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
net/ieee802154/6lowpan.c: reuse eth_mac_addr()
authorDanny Kukawka <danny.kukawka@bisect.de>
Wed, 22 Feb 2012 02:36:39 +0000 (02:36 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 22 Feb 2012 19:46:37 +0000 (14:46 -0500)
Use eth_mac_addr() for .ndo_set_mac_address, remove
lowpan_set_address since it do currently the same as
eth_mac_addr(). Additional advantage: eth_mac_addr() already
checks if the given address is valid

Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de>
Acked-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ieee802154/6lowpan.c

index e4ecc1eef98c3b2aca2b583de283bc7bc7b2f44c..36851588536861bb5fe67f61c69829807e599fb4 100644 (file)
@@ -55,6 +55,7 @@
 #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>
@@ -924,19 +925,6 @@ 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)
 {
        /*
@@ -1062,7 +1050,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    = lowpan_set_address,
+       .ndo_set_mac_address    = eth_mac_addr,
 };
 
 static void lowpan_setup(struct net_device *dev)