Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

[firefly-linux-kernel-4.4.55.git] / include / net / nl802154.h

diff --git a/include/net/nl802154.h b/include/net/nl802154.h
index 3121ed047c1e775698c6fc05d0c9323a024d8ec7..b23548e0409848530b1c7f94fb805601c46e583c 100644 (file)
--- 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