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 f8b5bc997959f7ba171258bd31852c696873bc21..b0ab530d28cde08478beb19881965c9a24e030cc 100644 (file)
--- a/include/net/nl802154.h
+++ b/include/net/nl802154.h
@@ -100,6 +100,10 @@ enum nl802154_attrs {
 
        NL802154_ATTR_EXTENDED_ADDR,
 
+       NL802154_ATTR_WPAN_PHY_CAPS,
+
+       NL802154_ATTR_SUPPORTED_COMMANDS,
+
        /* add attributes here, update the policy in nl802154.c */
 
        __NL802154_ATTR_AFTER_LAST,
@@ -119,6 +123,61 @@ enum nl802154_iftype {
        NL802154_IFTYPE_MAX = NUM_NL802154_IFTYPES - 1
 };
 
+/**
+ * enum nl802154_wpan_phy_capability_attr - wpan phy capability attributes
+ *
+ * @__NL802154_CAP_ATTR_INVALID: attribute number 0 is reserved
+ * @NL802154_CAP_ATTR_CHANNELS: a nested attribute for nl802154_channel_attr
+ * @NL802154_CAP_ATTR_TX_POWERS: a nested attribute for
+ *     nl802154_wpan_phy_tx_power
+ * @NL802154_CAP_ATTR_MIN_CCA_ED_LEVEL: minimum value for cca_ed_level
+ * @NL802154_CAP_ATTR_MAX_CCA_ED_LEVEL: maxmimum value for cca_ed_level
+ * @NL802154_CAP_ATTR_CCA_MODES: nl802154_cca_modes flags
+ * @NL802154_CAP_ATTR_CCA_OPTS: nl802154_cca_opts flags
+ * @NL802154_CAP_ATTR_MIN_MINBE: minimum of minbe value
+ * @NL802154_CAP_ATTR_MAX_MINBE: maximum of minbe value
+ * @NL802154_CAP_ATTR_MIN_MAXBE: minimum of maxbe value
+ * @NL802154_CAP_ATTR_MAX_MINBE: maximum of maxbe value
+ * @NL802154_CAP_ATTR_MIN_CSMA_BACKOFFS: minimum of csma backoff value
+ * @NL802154_CAP_ATTR_MAX_CSMA_BACKOFFS: maximum of csma backoffs value
+ * @NL802154_CAP_ATTR_MIN_FRAME_RETRIES: minimum of frame retries value
+ * @NL802154_CAP_ATTR_MAX_FRAME_RETRIES: maximum of frame retries value
+ * @NL802154_CAP_ATTR_IFTYPES: nl802154_iftype flags
+ * @NL802154_CAP_ATTR_LBT: nl802154_supported_bool_states flags
+ * @NL802154_CAP_ATTR_MAX: highest cap attribute currently defined
+ * @__NL802154_CAP_ATTR_AFTER_LAST: internal use
+ */
+enum nl802154_wpan_phy_capability_attr {
+       __NL802154_CAP_ATTR_INVALID,
+
+       NL802154_CAP_ATTR_IFTYPES,
+
+       NL802154_CAP_ATTR_CHANNELS,
+       NL802154_CAP_ATTR_TX_POWERS,
+
+       NL802154_CAP_ATTR_CCA_ED_LEVELS,
+       NL802154_CAP_ATTR_CCA_MODES,
+       NL802154_CAP_ATTR_CCA_OPTS,
+
+       NL802154_CAP_ATTR_MIN_MINBE,
+       NL802154_CAP_ATTR_MAX_MINBE,
+
+       NL802154_CAP_ATTR_MIN_MAXBE,
+       NL802154_CAP_ATTR_MAX_MAXBE,
+
+       NL802154_CAP_ATTR_MIN_CSMA_BACKOFFS,
+       NL802154_CAP_ATTR_MAX_CSMA_BACKOFFS,
+
+       NL802154_CAP_ATTR_MIN_FRAME_RETRIES,
+       NL802154_CAP_ATTR_MAX_FRAME_RETRIES,
+
+       NL802154_CAP_ATTR_LBT,
+
+       /* keep last */
+       __NL802154_CAP_ATTR_AFTER_LAST,
+       NL802154_CAP_ATTR_MAX = __NL802154_CAP_ATTR_AFTER_LAST - 1
+};
+
 /**
  * enum nl802154_cca_modes - cca modes
  *
@@ -128,7 +187,7 @@ enum nl802154_iftype {
  * @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
@@ -140,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,
@@ -162,4 +221,26 @@ enum nl802154_cca_opts {
        NL802154_CCA_OPT_ATTR_MAX = __NL802154_CCA_OPT_ATTR_AFTER_LAST - 1
 };
 
+/**
+ * enum nl802154_supported_bool_states - bool states for bool capability entry
+ *
+ * @NL802154_SUPPORTED_BOOL_FALSE: indicates to set false
+ * @NL802154_SUPPORTED_BOOL_TRUE: indicates to set true
+ * @__NL802154_SUPPORTED_BOOL_INVALD: reserved
+ * @NL802154_SUPPORTED_BOOL_BOTH: indicates to set true and false
+ * @__NL802154_SUPPORTED_BOOL_AFTER_LAST: Internal
+ * @NL802154_SUPPORTED_BOOL_MAX: highest value for bool states
+ */
+enum nl802154_supported_bool_states {
+       NL802154_SUPPORTED_BOOL_FALSE,
+       NL802154_SUPPORTED_BOOL_TRUE,
+       /* to handle them in a mask */
+       __NL802154_SUPPORTED_BOOL_INVALD,
+       NL802154_SUPPORTED_BOOL_BOTH,
+
+       /* keep last */
+       __NL802154_SUPPORTED_BOOL_AFTER_LAST,
+       NL802154_SUPPORTED_BOOL_MAX = __NL802154_SUPPORTED_BOOL_AFTER_LAST - 1
+};
+
 #endif /* __NL802154_H */