Skip to content

Commit

Permalink
6lowpan: revert 'reuse eth_mac_addr()'
Browse files Browse the repository at this point in the history
This reverts the commit cdf49c2 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>
  • Loading branch information
alex.bluesman.smirnov@gmail.com authored and David S. Miller committed Jul 5, 2012
1 parent 0979e46 commit 42c3629
Showing 1 changed file with 14 additions and 2 deletions.
16 changes: 14 additions & 2 deletions net/ieee802154/6lowpan.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -936,6 +935,19 @@ 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 @@ -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 = {
Expand Down

0 comments on commit 42c3629

Please sign in to comment.