Merge branch 'for-4.2/writeback' of git://git.kernel.dk/linux-block

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

diff --git a/include/net/nl802154.h b/include/net/nl802154.h
index 0badebd1de7fbe179542a440f31e9042821a2e3d..b0ab530d28cde08478beb19881965c9a24e030cc 100644 (file)
--- a/include/net/nl802154.h
+++ b/include/net/nl802154.h
@@ -102,6 +102,8 @@ enum nl802154_attrs {
 
        NL802154_ATTR_WPAN_PHY_CAPS,
 
+       NL802154_ATTR_SUPPORTED_COMMANDS,
+
        /* add attributes here, update the policy in nl802154.c */
 
        __NL802154_ATTR_AFTER_LAST,
@@ -185,7 +187,7 @@ enum nl802154_wpan_phy_capability_attr {
  * @NL802154_CCA_ENERGY_CARRIER: Carrier sense with energy above threshold
  * @NL802154_CCA_ALOHA: CCA shall always report an idle medium
  * @NL802154_CCA_UWB_SHR: UWB preamble sense based on the SHR of a frame
- * @NL802154_CCA_UWB_MULTIPEXED: UWB preamble sense based on the packet with
+ * @NL802154_CCA_UWB_MULTIPLEXED: UWB preamble sense based on the packet with
  *     the multiplexed preamble
  * @__NL802154_CCA_ATTR_AFTER_LAST: Internal
  * @NL802154_CCA_ATTR_MAX: Maximum CCA attribute number
@@ -197,7 +199,7 @@ enum nl802154_cca_modes {
        NL802154_CCA_ENERGY_CARRIER,
        NL802154_CCA_ALOHA,
        NL802154_CCA_UWB_SHR,
-       NL802154_CCA_UWB_MULTIPEXED,
+       NL802154_CCA_UWB_MULTIPLEXED,
 
        /* keep last */
        __NL802154_CCA_ATTR_AFTER_LAST,