diff options
author | Arend van Spriel <arend@broadcom.com> | 2013-04-18 09:49:00 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-04-22 09:48:00 -0400 |
commit | 5de17984898c5758fc6ebe08eccea9f4b6548914 (patch) | |
tree | 17aab780c025cfac0bd5a8b010b8ea9c138ff780 /include | |
parent | a36473621c871df14bbf2106ab0721b475aac8e0 (diff) |
cfg80211: introduce critical protocol indication from user-space
Some protocols need a more reliable connection to complete
successful in reasonable time. This patch adds a user-space
API to indicate the wireless driver that a critical protocol
is about to commence and when it is done, using nl80211 primitives
NL80211_CMD_CRIT_PROTOCOL_START and NL80211_CRIT_PROTOCOL_STOP.
There can be only on critical protocol session started per
registered cfg80211 device.
The driver can support this by implementing the cfg80211 callbacks
.crit_proto_start() and .crit_proto_stop(). Examples of protocols
that can benefit from this are DHCP, EAPOL, APIPA. Exactly how the
link can/should be made more reliable is up to the driver. Things
to consider are avoid scanning, no multi-channel operations, and
alter coexistence schemes.
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/net/cfg80211.h | 23 | ||||
-rw-r--r-- | include/uapi/linux/nl80211.h | 39 |
2 files changed, 62 insertions, 0 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index dff96d8cafcd..26b5b692c22b 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h | |||
@@ -2002,6 +2002,12 @@ struct cfg80211_update_ft_ies_params { | |||
2002 | * @update_ft_ies: Provide updated Fast BSS Transition information to the | 2002 | * @update_ft_ies: Provide updated Fast BSS Transition information to the |
2003 | * driver. If the SME is in the driver/firmware, this information can be | 2003 | * driver. If the SME is in the driver/firmware, this information can be |
2004 | * used in building Authentication and Reassociation Request frames. | 2004 | * used in building Authentication and Reassociation Request frames. |
2005 | * | ||
2006 | * @crit_proto_start: Indicates a critical protocol needs more link reliability | ||
2007 | * for a given duration (milliseconds). The protocol is provided so the | ||
2008 | * driver can take the most appropriate actions. | ||
2009 | * @crit_proto_stop: Indicates critical protocol no longer needs increased link | ||
2010 | * reliability. This operation can not fail. | ||
2005 | */ | 2011 | */ |
2006 | struct cfg80211_ops { | 2012 | struct cfg80211_ops { |
2007 | int (*suspend)(struct wiphy *wiphy, struct cfg80211_wowlan *wow); | 2013 | int (*suspend)(struct wiphy *wiphy, struct cfg80211_wowlan *wow); |
@@ -2231,6 +2237,12 @@ struct cfg80211_ops { | |||
2231 | struct cfg80211_chan_def *chandef); | 2237 | struct cfg80211_chan_def *chandef); |
2232 | int (*update_ft_ies)(struct wiphy *wiphy, struct net_device *dev, | 2238 | int (*update_ft_ies)(struct wiphy *wiphy, struct net_device *dev, |
2233 | struct cfg80211_update_ft_ies_params *ftie); | 2239 | struct cfg80211_update_ft_ies_params *ftie); |
2240 | int (*crit_proto_start)(struct wiphy *wiphy, | ||
2241 | struct wireless_dev *wdev, | ||
2242 | enum nl80211_crit_proto_id protocol, | ||
2243 | u16 duration); | ||
2244 | void (*crit_proto_stop)(struct wiphy *wiphy, | ||
2245 | struct wireless_dev *wdev); | ||
2234 | }; | 2246 | }; |
2235 | 2247 | ||
2236 | /* | 2248 | /* |
@@ -4137,6 +4149,17 @@ void cfg80211_report_wowlan_wakeup(struct wireless_dev *wdev, | |||
4137 | struct cfg80211_wowlan_wakeup *wakeup, | 4149 | struct cfg80211_wowlan_wakeup *wakeup, |
4138 | gfp_t gfp); | 4150 | gfp_t gfp); |
4139 | 4151 | ||
4152 | /** | ||
4153 | * cfg80211_crit_proto_stopped() - indicate critical protocol stopped by driver. | ||
4154 | * | ||
4155 | * @wdev: the wireless device for which critical protocol is stopped. | ||
4156 | * | ||
4157 | * This function can be called by the driver to indicate it has reverted | ||
4158 | * operation back to normal. One reason could be that the duration given | ||
4159 | * by .crit_proto_start() has expired. | ||
4160 | */ | ||
4161 | void cfg80211_crit_proto_stopped(struct wireless_dev *wdev, gfp_t gfp); | ||
4162 | |||
4140 | /* Logging, debugging and troubleshooting/diagnostic helpers. */ | 4163 | /* Logging, debugging and troubleshooting/diagnostic helpers. */ |
4141 | 4164 | ||
4142 | /* wiphy_printk helpers, similar to dev_printk */ | 4165 | /* wiphy_printk helpers, similar to dev_printk */ |
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h index 79da8710448e..d1e48b5e348f 100644 --- a/include/uapi/linux/nl80211.h +++ b/include/uapi/linux/nl80211.h | |||
@@ -639,6 +639,13 @@ | |||
639 | * with the relevant Information Elements. This event is used to report | 639 | * with the relevant Information Elements. This event is used to report |
640 | * received FT IEs (MDIE, FTIE, RSN IE, TIE, RICIE). | 640 | * received FT IEs (MDIE, FTIE, RSN IE, TIE, RICIE). |
641 | * | 641 | * |
642 | * @NL80211_CMD_CRIT_PROTOCOL_START: Indicates user-space will start running | ||
643 | * a critical protocol that needs more reliability in the connection to | ||
644 | * complete. | ||
645 | * | ||
646 | * @NL80211_CMD_CRIT_PROTOCOL_STOP: Indicates the connection reliability can | ||
647 | * return back to normal. | ||
648 | * | ||
642 | * @NL80211_CMD_MAX: highest used command number | 649 | * @NL80211_CMD_MAX: highest used command number |
643 | * @__NL80211_CMD_AFTER_LAST: internal use | 650 | * @__NL80211_CMD_AFTER_LAST: internal use |
644 | */ | 651 | */ |
@@ -798,6 +805,9 @@ enum nl80211_commands { | |||
798 | NL80211_CMD_UPDATE_FT_IES, | 805 | NL80211_CMD_UPDATE_FT_IES, |
799 | NL80211_CMD_FT_EVENT, | 806 | NL80211_CMD_FT_EVENT, |
800 | 807 | ||
808 | NL80211_CMD_CRIT_PROTOCOL_START, | ||
809 | NL80211_CMD_CRIT_PROTOCOL_STOP, | ||
810 | |||
801 | /* add new commands above here */ | 811 | /* add new commands above here */ |
802 | 812 | ||
803 | /* used to define NL80211_CMD_MAX below */ | 813 | /* used to define NL80211_CMD_MAX below */ |
@@ -1414,6 +1424,11 @@ enum nl80211_commands { | |||
1414 | * @NL80211_ATTR_IE_RIC: Resource Information Container Information | 1424 | * @NL80211_ATTR_IE_RIC: Resource Information Container Information |
1415 | * Element | 1425 | * Element |
1416 | * | 1426 | * |
1427 | * @NL80211_ATTR_CRIT_PROT_ID: critical protocol identifier requiring increased | ||
1428 | * reliability, see &enum nl80211_crit_proto_id (u16). | ||
1429 | * @NL80211_ATTR_MAX_CRIT_PROT_DURATION: duration in milliseconds in which | ||
1430 | * the connection should have increased reliability (u16). | ||
1431 | * | ||
1417 | * @NL80211_ATTR_MAX: highest attribute number currently defined | 1432 | * @NL80211_ATTR_MAX: highest attribute number currently defined |
1418 | * @__NL80211_ATTR_AFTER_LAST: internal use | 1433 | * @__NL80211_ATTR_AFTER_LAST: internal use |
1419 | */ | 1434 | */ |
@@ -1709,6 +1724,9 @@ enum nl80211_attrs { | |||
1709 | NL80211_ATTR_MDID, | 1724 | NL80211_ATTR_MDID, |
1710 | NL80211_ATTR_IE_RIC, | 1725 | NL80211_ATTR_IE_RIC, |
1711 | 1726 | ||
1727 | NL80211_ATTR_CRIT_PROT_ID, | ||
1728 | NL80211_ATTR_MAX_CRIT_PROT_DURATION, | ||
1729 | |||
1712 | /* add attributes here, update the policy in nl80211.c */ | 1730 | /* add attributes here, update the policy in nl80211.c */ |
1713 | 1731 | ||
1714 | __NL80211_ATTR_AFTER_LAST, | 1732 | __NL80211_ATTR_AFTER_LAST, |
@@ -3682,4 +3700,25 @@ enum nl80211_protocol_features { | |||
3682 | NL80211_PROTOCOL_FEATURE_SPLIT_WIPHY_DUMP = 1 << 0, | 3700 | NL80211_PROTOCOL_FEATURE_SPLIT_WIPHY_DUMP = 1 << 0, |
3683 | }; | 3701 | }; |
3684 | 3702 | ||
3703 | /** | ||
3704 | * enum nl80211_crit_proto_id - nl80211 critical protocol identifiers | ||
3705 | * | ||
3706 | * @NL80211_CRIT_PROTO_UNSPEC: protocol unspecified. | ||
3707 | * @NL80211_CRIT_PROTO_DHCP: BOOTP or DHCPv6 protocol. | ||
3708 | * @NL80211_CRIT_PROTO_EAPOL: EAPOL protocol. | ||
3709 | * @NL80211_CRIT_PROTO_APIPA: APIPA protocol. | ||
3710 | * @NUM_NL80211_CRIT_PROTO: must be kept last. | ||
3711 | */ | ||
3712 | enum nl80211_crit_proto_id { | ||
3713 | NL80211_CRIT_PROTO_UNSPEC, | ||
3714 | NL80211_CRIT_PROTO_DHCP, | ||
3715 | NL80211_CRIT_PROTO_EAPOL, | ||
3716 | NL80211_CRIT_PROTO_APIPA, | ||
3717 | /* add other protocols before this one */ | ||
3718 | NUM_NL80211_CRIT_PROTO | ||
3719 | }; | ||
3720 | |||
3721 | /* maximum duration for critical protocol measures */ | ||
3722 | #define NL80211_CRIT_PROTO_MAX_DURATION 5000 /* msec */ | ||
3723 | |||
3685 | #endif /* __LINUX_NL80211_H */ | 3724 | #endif /* __LINUX_NL80211_H */ |