diff options
author | Phoebe Buckheister <phoebe.buckheister@itwm.fraunhofer.de> | 2014-03-14 16:24:02 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-03-14 22:15:26 -0400 |
commit | ae531b9475f62c5e1863508604cd6b3faf362d56 (patch) | |
tree | c719f25779f44c4241d799e44c8fc2c8c8065957 /net/mac802154/mac_cmd.c | |
parent | e6278d92005e9d6e374f269b4ce39c908a68ad5d (diff) |
ieee802154: use ieee802154_addr instead of *_sa variants
Change all internal uses of ieee802154_addr_sa to ieee802154_addr,
except for those instances that communicate directly with userspace.
Signed-off-by: Phoebe Buckheister <phoebe.buckheister@itwm.fraunhofer.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac802154/mac_cmd.c')
-rw-r--r-- | net/mac802154/mac_cmd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/mac802154/mac_cmd.c b/net/mac802154/mac_cmd.c index f551ef2cdf56..15bac3358889 100644 --- a/net/mac802154/mac_cmd.c +++ b/net/mac802154/mac_cmd.c | |||
@@ -34,16 +34,16 @@ | |||
34 | #include "mac802154.h" | 34 | #include "mac802154.h" |
35 | 35 | ||
36 | static int mac802154_mlme_start_req(struct net_device *dev, | 36 | static int mac802154_mlme_start_req(struct net_device *dev, |
37 | struct ieee802154_addr_sa *addr, | 37 | struct ieee802154_addr *addr, |
38 | u8 channel, u8 page, | 38 | u8 channel, u8 page, |
39 | u8 bcn_ord, u8 sf_ord, | 39 | u8 bcn_ord, u8 sf_ord, |
40 | u8 pan_coord, u8 blx, | 40 | u8 pan_coord, u8 blx, |
41 | u8 coord_realign) | 41 | u8 coord_realign) |
42 | { | 42 | { |
43 | BUG_ON(addr->addr_type != IEEE802154_ADDR_SHORT); | 43 | BUG_ON(addr->mode != IEEE802154_ADDR_SHORT); |
44 | 44 | ||
45 | mac802154_dev_set_pan_id(dev, cpu_to_le16(addr->pan_id)); | 45 | mac802154_dev_set_pan_id(dev, addr->pan_id); |
46 | mac802154_dev_set_short_addr(dev, cpu_to_le16(addr->short_addr)); | 46 | mac802154_dev_set_short_addr(dev, addr->short_addr); |
47 | mac802154_dev_set_ieee_addr(dev); | 47 | mac802154_dev_set_ieee_addr(dev); |
48 | mac802154_dev_set_page_channel(dev, page, channel); | 48 | mac802154_dev_set_page_channel(dev, page, channel); |
49 | 49 | ||