Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-13 16:40:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

6lowpan: revert 'reuse eth_mac_addr()'

Browse Source 
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>
This commit is contained in:
alex.bluesman.smirnov@gmail.com 2012-07-01 19:58:46 +00:00 committed by David S. Miller
parent 0979e465c5
commit 42c3629551
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
net/ieee802154/6lowpan.c
View File

@ -55,7 +55,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <net/af_ieee802154.h> #include <net/af_ieee802154.h>
#include <net/ieee802154.h> #include <net/ieee802154.h>
#include <net/ieee802154_netdev.h> #include <net/ieee802154_netdev.h>
@ -936,6 +935,19 @@ drop:
return -EINVAL; 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) 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 = { static const struct net_device_ops lowpan_netdev_ops = {
.ndo_start_xmit = lowpan_xmit, .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 = { static struct ieee802154_mlme_ops lowpan_mlme = {