Skip to content

Commit

Permalink
net/ieee802154/6lowpan.c: reuse eth_mac_addr()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Danny Kukawka authored and David S. Miller committed Feb 22, 2012
1 parent b049aad commit cdf49c2
Showing 1 changed file with 2 additions and 14 deletions.
16 changes: 2 additions & 14 deletions net/ieee802154/6lowpan.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -924,19 +925,6 @@ lowpan_process_data(struct sk_buff *skb)
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)
{
/*
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit cdf49c2

Please sign in to comment.