aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/linux/nl802154.h2
-rw-r--r--include/net/ieee802154_netdev.h17
2 files changed, 18 insertions, 1 deletions
diff --git a/include/linux/nl802154.h b/include/linux/nl802154.h
index e110b8c266f5..c8d7f3965fff 100644
--- a/include/linux/nl802154.h
+++ b/include/linux/nl802154.h
@@ -132,7 +132,7 @@ enum {
132 IEEE802154_ADD_IFACE, 132 IEEE802154_ADD_IFACE,
133 IEEE802154_DEL_IFACE, 133 IEEE802154_DEL_IFACE,
134 134
135 IEEE802154_SET_PHYPARAMS, 135 IEEE802154_SET_MACPARAMS,
136 136
137 __IEEE802154_CMD_MAX, 137 __IEEE802154_CMD_MAX,
138}; 138};
diff --git a/include/net/ieee802154_netdev.h b/include/net/ieee802154_netdev.h
index e1717cbf609b..5a719ca892f4 100644
--- a/include/net/ieee802154_netdev.h
+++ b/include/net/ieee802154_netdev.h
@@ -229,6 +229,18 @@ static inline int mac_cb_type(struct sk_buff *skb)
229#define IEEE802154_MAC_SCAN_PASSIVE 2 229#define IEEE802154_MAC_SCAN_PASSIVE 2
230#define IEEE802154_MAC_SCAN_ORPHAN 3 230#define IEEE802154_MAC_SCAN_ORPHAN 3
231 231
232struct ieee802154_mac_params {
233 s8 transmit_power;
234 u8 min_be;
235 u8 max_be;
236 u8 csma_retries;
237 s8 frame_retries;
238
239 bool lbt;
240 u8 cca_mode;
241 s32 cca_ed_level;
242};
243
232struct wpan_phy; 244struct wpan_phy;
233/* 245/*
234 * This should be located at net_device->ml_priv 246 * This should be located at net_device->ml_priv
@@ -255,6 +267,11 @@ struct ieee802154_mlme_ops {
255 int (*scan_req)(struct net_device *dev, 267 int (*scan_req)(struct net_device *dev,
256 u8 type, u32 channels, u8 page, u8 duration); 268 u8 type, u32 channels, u8 page, u8 duration);
257 269
270 int (*set_mac_params)(struct net_device *dev,
271 const struct ieee802154_mac_params *params);
272 void (*get_mac_params)(struct net_device *dev,
273 struct ieee802154_mac_params *params);
274
258 /* The fields below are required. */ 275 /* The fields below are required. */
259 276
260 struct wpan_phy *(*get_phy)(const struct net_device *dev); 277 struct wpan_phy *(*get_phy)(const struct net_device *dev);