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>

2 files changed, 9 insertions, 9 deletions

diff --git a/include/net/ieee802154_netdev.h b/include/net/ieee802154_netdev.h
index 8e7f6903db98..827e3e33c422 100644
--- a/include/net/ieee802154_netdev.h
+++ b/include/net/ieee802154_netdev.h
@@ -200,11 +200,11 @@ struct ieee802154_frag_info {
  */
 struct ieee802154_mac_cb {
         u8 lqi;
-        struct ieee802154_addr_sa sa;
-        struct ieee802154_addr_sa da;
         u8 flags;
         u8 seq;
         struct ieee802154_frag_info frag_info;
+        struct ieee802154_addr source;
+        struct ieee802154_addr dest;
 };
 
 static inline struct ieee802154_mac_cb *mac_cb(struct sk_buff *skb)
@@ -248,16 +248,16 @@ struct ieee802154_mlme_ops {
         /* The following fields are optional (can be NULL). */
 
         int (*assoc_req)(struct net_device *dev,
-                        struct ieee802154_addr_sa *addr,
+                        struct ieee802154_addr *addr,
                         u8 channel, u8 page, u8 cap);
         int (*assoc_resp)(struct net_device *dev,
-                        struct ieee802154_addr_sa *addr,
+                        struct ieee802154_addr *addr,
                         __le16 short_addr, u8 status);
         int (*disassoc_req)(struct net_device *dev,
-                        struct ieee802154_addr_sa *addr,
+                        struct ieee802154_addr *addr,
                         u8 reason);
         int (*start_req)(struct net_device *dev,
-                        struct ieee802154_addr_sa *addr,
+                        struct ieee802154_addr *addr,
                         u8 channel, u8 page, u8 bcn_ord, u8 sf_ord,
                         u8 pan_coord, u8 blx, u8 coord_realign);
         int (*scan_req)(struct net_device *dev,
diff --git a/include/net/nl802154.h b/include/net/nl802154.h
index 3121ed047c1e..b23548e04098 100644
--- a/include/net/nl802154.h
+++ b/include/net/nl802154.h
@@ -22,7 +22,7 @@
 #define IEEE802154_NL_H
 
 struct net_device;
-struct ieee802154_addr_sa;
+struct ieee802154_addr;
 
 /**
  * ieee802154_nl_assoc_indic - Notify userland of an association request.
@@ -37,7 +37,7 @@ struct ieee802154_addr_sa;
  * Note: This is in section 7.3.1 of the IEEE 802.15.4-2006 document.
  */
 int ieee802154_nl_assoc_indic(struct net_device *dev,
-                struct ieee802154_addr_sa *addr, u8 cap);
+                struct ieee802154_addr *addr, u8 cap);
 
 /**
  * ieee802154_nl_assoc_confirm - Notify userland of association.
@@ -65,7 +65,7 @@ int ieee802154_nl_assoc_confirm(struct net_device *dev,
  * Note: This is in section 7.3.3 of the IEEE 802.15.4 document.
  */
 int ieee802154_nl_disassoc_indic(struct net_device *dev,
-                struct ieee802154_addr_sa *addr, u8 reason);
+                struct ieee802154_addr *addr, u8 reason);
 
 /**
  * ieee802154_nl_disassoc_confirm - Notify userland of disassociation