cfg80211: Extend support for IEEE 802.11r Fast BSS Transition
PATCH 1/1 cfg80211: Extend support for IEEE 802.11r Fast BSS Transition
Add NL80211_CMD_UPDATE_FT_IES to support update of FT IEs to the WLAN driver and NL80211_CMD_FT_EVENT to send FT events from the WLAN driver. This will carry the target AP's MAC address along with the relevant Information Elements. This event is used to report received FT IEs (MDIE, FTIE, RSN IE, TIE, RICIE). These changes allow FT to be supported with drivers that use an internal SME instead of user space option (like FT implementation in wpa_supplicant with mac80211-based drivers).
--- include/net/cfg80211.h | 41 +++++++++++++++++++++++++ include/uapi/linux/nl80211.h | 19 ++++++++++++ net/wireless/mlme.c | 10 ++++++ net/wireless/nl80211.c | 69 ++++++++++++++++++++++++++++++++++++++++++ net/wireless/nl80211.h | 3 ++ 5 files changed, 142 insertions(+)
include/net/cfg80211.h +41 -0
@@ -1722,6 +1722,21 @@ struct cfg80211_gtk_rekey_data { };/** +* struct cfg80211_update_ft_ies_params - FT IE Information +* +* This structure provides information needed to update the fast transition IE +* +* @md: The Mobility Domain ID, 2 Octet value +* @ie: Fast Transition IEs +* @ie_len: Length of ft_ie in octets +*/ +struct cfg80211_update_ft_ies_params { +u16 md; +u8 *ie; +size_t ie_len; +}; + +/** * struct cfg80211_ops - backend description for wireless configuration * * This struct is registered by fullmac card drivers and/or wireless stacks
@@ -2168,6 +2183,8 @@ struct cfg80211_ops {int (*start_radar_detection)(struct wiphy *wiphy,struct net_device *dev,struct cfg80211_chan_def *chandef); +int (*update_ft_ies)(struct wiphy *wiphy,struct net_device *dev, +struct cfg80211_update_ft_ies_params *ftie); };/*
@@ -4002,6 +4019,30 @@ u32 cfg80211_calculate_bitrate(struct rate_info *rate);void cfg80211_unregister_wdev (struct wireless_dev *wdev);/** +* struct cfg80211_ft_event - FT Information Elements +* @ies: FT IEs +* @ies_len: length of the FT IE in bytes +* @target_ap: target AP's MAC address +* @ric_ies: RIC IE +* @ric_ies_len: length of the RIC IE in bytes +*/ +struct cfg80211_ft_event_params { +u8 *ies; +size_t ies_len; +u8 *target_ap; +u8 *ric_ies; +size_t ric_ies_len; +}; + +/** +* cfg80211_ft_event - notify userspace about FT IE and RIC IE +* @dev: network device +* @ft_event: IE information +*/ +int cfg80211_ft_event (struct net_device *dev, +struct cfg80211_ft_event_params *ft_event); + +/** * cfg80211_get_p2p_attr - find and copy a P2P attribute from IE buffer * @ies: the input IE buffer * @len: the input length
include/uapi/linux/nl80211.h +19 -0
@@ -611,6 +611,14 @@* %NL80211_ATTR_RADAR_EVENT is used to inform about the type of the * event. * +* @NL80211_CMD_UPDATE_FT_IES: Pass down the most up-to-date Fast Transition +* Information Element to the WLAN driver +* +* @NL80211_CMD_FT_EVENT: Send a Fast transition event from the WLAN driver +* to the supplicant. This will carry the target AP's MAC address along +* with the relevant Information Elements. This event is used to report +* received FT IEs (MDIE, FTIE, RSN IE, TIE, RICIE). +* * @NL80211_CMD_MAX: highest used command number * @__NL80211_CMD_AFTER_LAST: internal use */
@@ -765,6 +773,9 @@ enum nl80211_commands {NL80211_CMD_RADAR_DETECT , +NL80211_CMD_UPDATE_FT_IES , + NL80211_CMD_FT_EVENT, +/* add new commands above here */ /* used to define NL80211_CMD_MAX below */
@@ -1368,6 +1379,11 @@ enum nl80211_commands {* advertised to the driver, e.g., to enable TDLS off channel operations * and PU-APSD. * +* @NL80211_ATTR_MDID: Mobility Domain Identifier +* +* @NL80211_ATTR_IE_RIC: Resource Information Container Information +* Element +* * @NL80211_ATTR_MAX: highest attribute number currently defined * @__NL80211_ATTR_AFTER_LAST: internal use */
@@ -1654,6 +1670,9 @@ enum nl80211_attrs {NL80211_ATTR_STA_CAPABILITY ,NL80211_ATTR_STA_EXT_CAPABILITY , +NL80211_ATTR_MDID , +NL80211_ATTR_IE_RIC , +/* add attributes here, update the policy in nl80211.c */ __NL80211_ATTR_AFTER_LAST,
net/wireless/mlme.c +10 -0
@@ -1107,3 +1107,13 @@ void cfg80211_cac_event(struct net_device *netdev,nl80211_radar_notify (rdev, &chandef, event, netdev, gfp); }EXPORT_SYMBOL (cfg80211_cac_event); + +int cfg80211_ft_event (struct net_device *dev, +struct cfg80211_ft_event_params *ft_event) +{ +struct wiphy *wiphy = dev->ieee80211_ptr->wiphy; +struct cfg80211_registered_device *rdev =wiphy_to_dev (wiphy); + +return nl80211_ft_event (rdev, dev, ft_event); +} +EXPORT_SYMBOL (cfg80211_ft_event);
net/wireless/nl80211.c +69 -0
93 lines not on this page · raw message
net/wireless/nl80211.h +3 -0
@@ -141,5 +141,8 @@ bool nl80211_unexpected_frame(struct net_device *dev, const u8 *addr, gfp_t gfp);bool nl80211_unexpected_4addr_frame (struct net_device *dev,const u8 *addr,gfp_t gfp); +int nl80211_ft_event (struct cfg80211_registered_device *rdev, +struct net_device *netdev, +struct cfg80211_ft_event_params *ft_event);#endif /* __NET_WIRELESS_NL80211_H */
Signature · 5 lines
1.7.10.4 -- Jouni Malinen PGP id EFC895FA
Johannes Berg
maintainerinclude/net/cfg80211.h u32 cfg80211_calculate_bitrate(struct rate_info *rate); · line 4043
Quoted 2 lines · Jouni Malinen
include/net/cfg80211.h +2
-0+int cfg80211_ft_event (struct net_device *dev, +struct cfg80211_ft_event_params *ft_event);
Is the return value really very useful?
Quoted 6 lines
net/wireless/nl80211.c +6
-0+static int nl80211_update_ft_ies (struct sk_buff *skb,struct genl_info *info) +{ +struct cfg80211_registered_device *rdev = info->user_ptr[0 ]; +struct cfg80211_update_ft_ies_params ft_params; +struct net_device *dev = info->user_ptr[1 ]; +
net/wireless/nl80211.c static int nl80211_stop_p2p_device(struct sk_buff *skb, struct genl_info *info) · line 7844
Quoted 10 lines
net/wireless/nl80211.c +10
-0+if (!rdev->ops->update_ft_ies) +return -EOPNOTSUPP ; + +if (!info->attrs[NL80211_ATTR_MDID ] || !info->attrs[NL80211_ATTR_IE ]) +return -EINVAL ; + +memset (&ft_params,0 ,sizeof (ft_params)); + ft_params.md =nla_get_u16 (info->attrs[NL80211_ATTR_MDID ]); + ft_params.ie =nla_data (info->attrs[NL80211_ATTR_IE ]); + ft_params.ie_len =nla_len (info->attrs[NL80211_ATTR_IE ]);
Should this use is_valid_ie_attr()?
net/wireless/mlme.c void cfg80211_cac_event(struct net_device *netdev, · line 1119
Quoted 9 lines
net/wireless/mlme.c +9
-0+int cfg80211_ft_event (struct net_device *dev, +struct cfg80211_ft_event_params *ft_event) +{ +struct wiphy *wiphy = dev->ieee80211_ptr->wiphy; +struct cfg80211_registered_device *rdev =wiphy_to_dev (wiphy); + +return nl80211_ft_event (rdev, dev, ft_event); +} +EXPORT_SYMBOL (cfg80211_ft_event);
FWIW, I don't really see the need to have separate functions. I know we have a whole bunch like that, but I think I'm just going to remove them now. There's really no point, nl80211 and cfg80211 are two sides of the same thing, I'd just put the cfg80211_ function into nl80211.c
net/wireless/nl80211.c static struct notifier_block nl80211_netlink_notifier = { · line 10130
Quoted 10 lines
net/wireless/nl80211.c +10
-0+ hdr =nl80211hdr_put (msg,0 ,0 ,0 ,NL80211_CMD_FT_EVENT ); +if (!hdr) { +nlmsg_free (msg); +return -ENOMEM ; + } + +nla_put_u32 (msg,NL80211_ATTR_WIPHY , rdev->wiphy_idx); +nla_put_u32 (msg,NL80211_ATTR_IFINDEX , netdev->ifindex); +if (ft_event->target_ap) +nla_put (msg,NL80211_ATTR_MAC ,ETH_ALEN , ft_event->target_ap);
Would that really be valid without a new BSSID? That seems a bit odd.
johannes
PATCH v2 1/1 cfg80211: Extend support for IEEE 802.11r Fast BSS Transition
Add NL80211_CMD_UPDATE_FT_IES to support update of FT IEs to the WLAN driver and NL80211_CMD_FT_EVENT to send FT events from the WLAN driver. This will carry the target AP's MAC address along with the relevant Information Elements. This event is used to report received FT IEs (MDIE, FTIE, RSN IE, TIE, RICIE). These changes allow FT to be supported with drivers that use an internal SME instead of user space option (like FT implementation in wpa_supplicant with mac80211-based drivers).
--- include/net/cfg80211.h | 41 +++++++++++++++++++++++ include/uapi/linux/nl80211.h | 19 +++++++++++ net/wireless/nl80211.c | 74 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 134 insertions(+)
v2 - Updates based on comments from Johannes:
- Remove return value from cfg80211_ft_event() (caller cannot do much with it)
- add is_valid_ie_attr() validation
- merge cfg80211_ft_event() into nl80211_ft_event()
- require target_ap in ft_event
include/net/cfg80211.h +41 -0
@@ -1722,6 +1722,21 @@ struct cfg80211_gtk_rekey_data { };/** +* struct cfg80211_update_ft_ies_params - FT IE Information +* +* This structure provides information needed to update the fast transition IE +* +* @md: The Mobility Domain ID, 2 Octet value +* @ie: Fast Transition IEs +* @ie_len: Length of ft_ie in octets +*/ +struct cfg80211_update_ft_ies_params { +u16 md; +u8 *ie; +size_t ie_len; +}; + +/** * struct cfg80211_ops - backend description for wireless configuration * * This struct is registered by fullmac card drivers and/or wireless stacks
@@ -2168,6 +2183,8 @@ struct cfg80211_ops {int (*start_radar_detection)(struct wiphy *wiphy,struct net_device *dev,struct cfg80211_chan_def *chandef); +int (*update_ft_ies)(struct wiphy *wiphy,struct net_device *dev, +struct cfg80211_update_ft_ies_params *ftie); };/*
@@ -4002,6 +4019,30 @@ u32 cfg80211_calculate_bitrate(struct rate_info *rate);void cfg80211_unregister_wdev (struct wireless_dev *wdev);/** +* struct cfg80211_ft_event - FT Information Elements +* @ies: FT IEs +* @ies_len: length of the FT IE in bytes +* @target_ap: target AP's MAC address +* @ric_ies: RIC IE +* @ric_ies_len: length of the RIC IE in bytes +*/ +struct cfg80211_ft_event_params { +u8 *ies; +size_t ies_len; +u8 *target_ap; +u8 *ric_ies; +size_t ric_ies_len; +}; + +/** +* cfg80211_ft_event - notify userspace about FT IE and RIC IE +* @netdev: network device +* @ft_event: IE information +*/ +void cfg80211_ft_event (struct net_device *netdev, +struct cfg80211_ft_event_params *ft_event); + +/** * cfg80211_get_p2p_attr - find and copy a P2P attribute from IE buffer * @ies: the input IE buffer * @len: the input length
include/uapi/linux/nl80211.h +19 -0
@@ -611,6 +611,14 @@* %NL80211_ATTR_RADAR_EVENT is used to inform about the type of the * event. * +* @NL80211_CMD_UPDATE_FT_IES: Pass down the most up-to-date Fast Transition +* Information Element to the WLAN driver +* +* @NL80211_CMD_FT_EVENT: Send a Fast transition event from the WLAN driver +* to the supplicant. This will carry the target AP's MAC address along +* with the relevant Information Elements. This event is used to report +* received FT IEs (MDIE, FTIE, RSN IE, TIE, RICIE). +* * @NL80211_CMD_MAX: highest used command number * @__NL80211_CMD_AFTER_LAST: internal use */
@@ -765,6 +773,9 @@ enum nl80211_commands {NL80211_CMD_RADAR_DETECT , +NL80211_CMD_UPDATE_FT_IES , + NL80211_CMD_FT_EVENT, +/* add new commands above here */ /* used to define NL80211_CMD_MAX below */
@@ -1368,6 +1379,11 @@ enum nl80211_commands {* advertised to the driver, e.g., to enable TDLS off channel operations * and PU-APSD. * +* @NL80211_ATTR_MDID: Mobility Domain Identifier +* +* @NL80211_ATTR_IE_RIC: Resource Information Container Information +* Element +* * @NL80211_ATTR_MAX: highest attribute number currently defined * @__NL80211_ATTR_AFTER_LAST: internal use */
@@ -1654,6 +1670,9 @@ enum nl80211_attrs {NL80211_ATTR_STA_CAPABILITY ,NL80211_ATTR_STA_EXT_CAPABILITY , +NL80211_ATTR_MDID , +NL80211_ATTR_IE_RIC , +/* add attributes here, update the policy in nl80211.c */ __NL80211_ATTR_AFTER_LAST,
net/wireless/nl80211.c +74 -0
98 lines not on this page · raw message
Signature · 4 lines
1.7.9.5 -- Jouni Malinen PGP id EFC895FA
Johannes Berg
maintainerHmm, I forgot something:
include/net/cfg80211.h u32 cfg80211_calculate_bitrate(struct rate_info *rate); · line 4033
Quoted 9 lines
include/net/cfg80211.h +8
-0+struct cfg80211_update_ft_ies_params { +u16 md; +u8 *ie; +struct cfg80211_ft_event_params { +u8 *ies; +size_t ies_len; +u8 *target_ap; +u8 *ric_ies;
The pointers should probably be const, but I actually made that change.
net/wireless/nl80211.c static int nl80211_stop_p2p_device(struct sk_buff *skb, struct genl_info *info) · line 7847
Quoted 1 line
net/wireless/nl80211.c +1
-0+return rdev->ops->update_ft_ies (&rdev->wiphy, dev, &ft_params);
However what I think you should still do is add tracing here and in the event below:
net/wireless/nl80211.c static struct notifier_block nl80211_netlink_notifier = { · line 10111
Quoted 2 lines
net/wireless/nl80211.c +2
-0+void cfg80211_ft_event (struct net_device *netdev, +struct cfg80211_ft_event_params *ft_event)
johannes
PATCH v3 1/1 cfg80211: Extend support for IEEE 802.11r Fast BSS Transition
Add NL80211_CMD_UPDATE_FT_IES to support update of FT IEs to the WLAN driver and NL80211_CMD_FT_EVENT to send FT events from the WLAN driver. This will carry the target AP's MAC address along with the relevant Information Elements. This event is used to report received FT IEs (MDIE, FTIE, RSN IE, TIE, RICIE). These changes allow FT to be supported with drivers that use an internal SME instead of user space option (like FT implementation in wpa_supplicant with mac80211-based drivers).
--- include/net/cfg80211.h | 41 +++++++++++++++++++++++ include/uapi/linux/nl80211.h | 19 +++++++++++ net/wireless/nl80211.c | 76 ++++++++++++++++++++++++++++++++++++++++++ net/wireless/rdev-ops.h | 13 ++++++++ net/wireless/trace.h | 46 +++++++++++++++++++++++++ 5 files changed, 195 insertions(+)
v3:
- use const
- add tracing
include/net/cfg80211.h +41 -0
@@ -1722,6 +1722,21 @@ struct cfg80211_gtk_rekey_data { };/** +* struct cfg80211_update_ft_ies_params - FT IE Information +* +* This structure provides information needed to update the fast transition IE +* +* @md: The Mobility Domain ID, 2 Octet value +* @ie: Fast Transition IEs +* @ie_len: Length of ft_ie in octets +*/ +struct cfg80211_update_ft_ies_params { +u16 md; +const u8 *ie; +size_t ie_len; +}; + +/** * struct cfg80211_ops - backend description for wireless configuration * * This struct is registered by fullmac card drivers and/or wireless stacks
@@ -2168,6 +2183,8 @@ struct cfg80211_ops {int (*start_radar_detection)(struct wiphy *wiphy,struct net_device *dev,struct cfg80211_chan_def *chandef); +int (*update_ft_ies)(struct wiphy *wiphy,struct net_device *dev, +struct cfg80211_update_ft_ies_params *ftie); };/*
@@ -4002,6 +4019,30 @@ u32 cfg80211_calculate_bitrate(struct rate_info *rate);void cfg80211_unregister_wdev (struct wireless_dev *wdev);/** +* struct cfg80211_ft_event - FT Information Elements +* @ies: FT IEs +* @ies_len: length of the FT IE in bytes +* @target_ap: target AP's MAC address +* @ric_ies: RIC IE +* @ric_ies_len: length of the RIC IE in bytes +*/ +struct cfg80211_ft_event_params { +const u8 *ies; +size_t ies_len; +const u8 *target_ap; +const u8 *ric_ies; +size_t ric_ies_len; +}; + +/** +* cfg80211_ft_event - notify userspace about FT IE and RIC IE +* @netdev: network device +* @ft_event: IE information +*/ +void cfg80211_ft_event (struct net_device *netdev, +struct cfg80211_ft_event_params *ft_event); + +/** * cfg80211_get_p2p_attr - find and copy a P2P attribute from IE buffer * @ies: the input IE buffer * @len: the input length
include/uapi/linux/nl80211.h +19 -0
@@ -611,6 +611,14 @@* %NL80211_ATTR_RADAR_EVENT is used to inform about the type of the * event. * +* @NL80211_CMD_UPDATE_FT_IES: Pass down the most up-to-date Fast Transition +* Information Element to the WLAN driver +* +* @NL80211_CMD_FT_EVENT: Send a Fast transition event from the WLAN driver +* to the supplicant. This will carry the target AP's MAC address along +* with the relevant Information Elements. This event is used to report +* received FT IEs (MDIE, FTIE, RSN IE, TIE, RICIE). +* * @NL80211_CMD_MAX: highest used command number * @__NL80211_CMD_AFTER_LAST: internal use */
@@ -765,6 +773,9 @@ enum nl80211_commands {NL80211_CMD_RADAR_DETECT , +NL80211_CMD_UPDATE_FT_IES , + NL80211_CMD_FT_EVENT, +/* add new commands above here */ /* used to define NL80211_CMD_MAX below */
@@ -1368,6 +1379,11 @@ enum nl80211_commands {* advertised to the driver, e.g., to enable TDLS off channel operations * and PU-APSD. * +* @NL80211_ATTR_MDID: Mobility Domain Identifier +* +* @NL80211_ATTR_IE_RIC: Resource Information Container Information +* Element +* * @NL80211_ATTR_MAX: highest attribute number currently defined * @__NL80211_ATTR_AFTER_LAST: internal use */
@@ -1654,6 +1670,9 @@ enum nl80211_attrs {NL80211_ATTR_STA_CAPABILITY ,NL80211_ATTR_STA_EXT_CAPABILITY , +NL80211_ATTR_MDID , +NL80211_ATTR_IE_RIC , +/* add attributes here, update the policy in nl80211.c */ __NL80211_ATTR_AFTER_LAST,
net/wireless/nl80211.c +76 -0
100 lines not on this page · raw message
net/wireless/rdev-ops.h +13 -0
@@ -887,4 +887,17 @@ static inline int rdev_set_mac_acl(struct cfg80211_registered_device *rdev,trace_rdev_return_int (&rdev->wiphy, ret); return ret; } + +static inline int rdev_update_ft_ies (struct cfg80211_registered_device *rdev, +struct net_device *dev, +struct cfg80211_update_ft_ies_params *ftie) +{ +int ret; + +trace_rdev_update_ft_ies (&rdev->wiphy, dev, ftie); + ret = rdev->ops->update_ft_ies (&rdev->wiphy, dev, ftie); +trace_rdev_return_int (&rdev->wiphy, ret); +return ret; +} +#endif /* __CFG80211_RDEV_OPS */
net/wireless/trace.h +46 -0
58 lines not on this page · raw message
Signature · 4 lines
1.7.9.5 -- Jouni Malinen PGP id EFC895FA
Quoted 7 lines · Jouni Malinen
Add
NL80211_CMD_UPDATE_FT_IESto support update of FT IEs to the WLAN driver andNL80211_CMD_FT_EVENTto send FT events from the WLAN driver. This will carry the target AP's MAC address along with the relevant Information Elements. This event is used to report received FT IEs (MDIE, FTIE, RSN IE, TIE, RICIE). These changes allow FT to be supported with drivers that use an internal SME instead of user space option (like FT implementation inwpa_supplicantwith mac80211-based drivers).
Applied.
johannes
Quoted 7 lines · Jouni Malinen
Add
NL80211_CMD_UPDATE_FT_IESto support update of FT IEs to the WLAN driver andNL80211_CMD_FT_EVENTto send FT events from the WLAN driver. This will carry the target AP's MAC address along with the relevant Information Elements. This event is used to report received FT IEs (MDIE, FTIE, RSN IE, TIE, RICIE). These changes allow FT to be supported with drivers that use an internal SME instead of user space option (like FT implementation inwpa_supplicantwith mac80211-based drivers).
Applied.
johannes
Johannes Berg
maintainerQuoted 10 lines · Johannes Berg
Quoted 7 lines · Jouni Malinen
Add
NL80211_CMD_UPDATE_FT_IESto support update of FT IEs to the WLAN driver andNL80211_CMD_FT_EVENTto send FT events from the WLAN driver. This will carry the target AP's MAC address along with the relevant Information Elements. This event is used to report received FT IEs (MDIE, FTIE, RSN IE, TIE, RICIE). These changes allow FT to be supported with drivers that use an internal SME instead of user space option (like FT implementation inwpa_supplicantwith mac80211-based drivers).Applied.
Only once ... oops.
johannes