Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 314995
b: refs/heads/master
c: 42c3629
h: refs/heads/master
i:
  314993: bd64708
  314991: 46df32f
v: v3
  • Loading branch information
alex.bluesman.smirnov@gmail.com authored and David S. Miller committed Jul 5, 2012
1 parent ddb533d commit d59e7d3
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0979e465c5ab205b63a1c1820fe833f396a120f0
refs/heads/master: 42c3629551ab8b1613d27c8d046537f9f5b17cbb
16 changes: 14 additions & 2 deletions trunk/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 d59e7d3

Please sign in to comment.