diff options
author | Danny Kukawka <danny.kukawka@bisect.de> | 2012-02-21 21:36:39 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-02-22 14:46:37 -0500 |
commit | cdf49c283e2e105da86ca575ad35b453f5ff24ea (patch) | |
tree | 186381fd86070e7e4b832becfdd607ca02049737 /net/ieee802154 | |
parent | b049aadca3f2535bea245cb0bba1393d9a60c7a4 (diff) |
net/ieee802154/6lowpan.c: reuse eth_mac_addr()
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>
Diffstat (limited to 'net/ieee802154')
-rw-r--r-- | net/ieee802154/6lowpan.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c index e4ecc1eef98c..368515885368 100644 --- a/net/ieee802154/6lowpan.c +++ b/net/ieee802154/6lowpan.c | |||
@@ -55,6 +55,7 @@ | |||
55 | #include <linux/module.h> | 55 | #include <linux/module.h> |
56 | #include <linux/moduleparam.h> | 56 | #include <linux/moduleparam.h> |
57 | #include <linux/netdevice.h> | 57 | #include <linux/netdevice.h> |
58 | #include <linux/etherdevice.h> | ||
58 | #include <net/af_ieee802154.h> | 59 | #include <net/af_ieee802154.h> |
59 | #include <net/ieee802154.h> | 60 | #include <net/ieee802154.h> |
60 | #include <net/ieee802154_netdev.h> | 61 | #include <net/ieee802154_netdev.h> |
@@ -924,19 +925,6 @@ drop: | |||
924 | return -EINVAL; | 925 | return -EINVAL; |
925 | } | 926 | } |
926 | 927 | ||
927 | static int lowpan_set_address(struct net_device *dev, void *p) | ||
928 | { | ||
929 | struct sockaddr *sa = p; | ||
930 | |||
931 | if (netif_running(dev)) | ||
932 | return -EBUSY; | ||
933 | |||
934 | /* TODO: validate addr */ | ||
935 | memcpy(dev->dev_addr, sa->sa_data, dev->addr_len); | ||
936 | |||
937 | return 0; | ||
938 | } | ||
939 | |||
940 | static int lowpan_get_mac_header_length(struct sk_buff *skb) | 928 | static int lowpan_get_mac_header_length(struct sk_buff *skb) |
941 | { | 929 | { |
942 | /* | 930 | /* |
@@ -1062,7 +1050,7 @@ static struct header_ops lowpan_header_ops = { | |||
1062 | 1050 | ||
1063 | static const struct net_device_ops lowpan_netdev_ops = { | 1051 | static const struct net_device_ops lowpan_netdev_ops = { |
1064 | .ndo_start_xmit = lowpan_xmit, | 1052 | .ndo_start_xmit = lowpan_xmit, |
1065 | .ndo_set_mac_address = lowpan_set_address, | 1053 | .ndo_set_mac_address = eth_mac_addr, |
1066 | }; | 1054 | }; |
1067 | 1055 | ||
1068 | static void lowpan_setup(struct net_device *dev) | 1056 | static void lowpan_setup(struct net_device *dev) |