This reverts commit 8c3ed7aa2b9ef666195b789e9b02e28383243fa8. As Jouni points out, there's really no need for this, since the RSN pre-authentication frames are normal data frames, not port control frames (locally). We can still revert this now since it hasn't actually gone beyond -next.
Showing the changes to include/uapi/linux (1 of 7 files). Show all
Unified · Split
| @@ -1039,14 +1039,11 @@ · 1038 unmodified lines | |||
| 1039 | * a control port frame and as a notification that a control port frame | 1039 | * a control port frame and as a notification that a control port frame |
| 1040 | * has been received. %NL80211_ATTR_FRAME is used to specify the | 1040 | * has been received. %NL80211_ATTR_FRAME is used to specify the |
| 1041 | * frame contents. The frame is the raw EAPoL data, without ethernet or | 1041 | * frame contents. The frame is the raw EAPoL data, without ethernet or |
| 1042 | * 802.11 headers. An optional %NL80211_ATTR_SRC_MAC can be used to send | 1042 | * 802.11 headers. |
| 1043 | * pre-auth frames to STAs on behalf of other APs. | ||
| 1044 | * When used as an event indication %NL80211_ATTR_CONTROL_PORT_ETHERTYPE, | 1043 | * When used as an event indication %NL80211_ATTR_CONTROL_PORT_ETHERTYPE, |
| 1045 | * %NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT and %NL80211_ATTR_MAC are added | 1044 | * %NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT and %NL80211_ATTR_MAC are added |
| 1046 | * indicating the protocol type of the received frame; whether the frame | 1045 | * indicating the protocol type of the received frame; whether the frame |
| 1047 | * was received unencrypted and the MAC address of the peer respectively. | 1046 | * was received unencrypted and the MAC address of the peer respectively. |
| 1048 | * %NL80211_ATTR_DST_MAC can be used to forward pre-auth frames in | ||
| 1049 | * userspace while using AP mode. | ||
| 1050 | * | 1047 | * |
| 1051 | * @NL80211_CMD_RELOAD_REGDB: Request that the regdb firmware file is reloaded. | 1048 | * @NL80211_CMD_RELOAD_REGDB: Request that the regdb firmware file is reloaded. |
| 1052 | * | 1049 | * |
| @@ -2412,9 +2409,6 @@ enum nl80211_commands { · 1359 unmodified lines | |||
| 2412 | * %NL80211_ATTR_AKM_SUITES are default capabilities if AKM suites not | 2409 | * %NL80211_ATTR_AKM_SUITES are default capabilities if AKM suites not |
| 2413 | * advertised for a specific interface type. | 2410 | * advertised for a specific interface type. |
| 2414 | * | 2411 | * |
| 2415 | * @NL80211_ATTR_SRC_MAC: MAC address used in control port over nl80211 transmit | ||
| 2416 | * @NL80211_ATTR_DST_MAC: MAC address used in control port over nl80211 receive | ||
| 2417 | * | ||
| 2418 | * @NUM_NL80211_ATTR: total number of nl80211_attrs available | 2412 | * @NUM_NL80211_ATTR: total number of nl80211_attrs available |
| 2419 | * @NL80211_ATTR_MAX: highest attribute number currently defined | 2413 | * @NL80211_ATTR_MAX: highest attribute number currently defined |
| 2420 | * @__NL80211_ATTR_AFTER_LAST: internal use | 2414 | * @__NL80211_ATTR_AFTER_LAST: internal use |
| @@ -2883,9 +2877,6 @@ enum nl80211_attrs { · 462 unmodified lines | |||
| 2883 | 2877 | ||
| 2884 | NL80211_ATTR_IFTYPE_AKM_SUITES, | 2878 | NL80211_ATTR_IFTYPE_AKM_SUITES, |
| 2885 | 2879 | ||
| 2886 | NL80211_ATTR_SRC_MAC, | ||
| 2887 | NL80211_ATTR_DST_MAC, | ||
| 2888 | |||
| 2889 | /* add attributes here, update the policy in nl80211.c */ | 2880 | /* add attributes here, update the policy in nl80211.c */ |
| 2890 | 2881 | ||
| 2891 | __NL80211_ATTR_AFTER_LAST, | 2882 | __NL80211_ATTR_AFTER_LAST, |
| @@ -5548,10 +5539,6 @@ enum nl80211_feature_flags { · 2656 unmodified lines | |||
| 5548 | * feature, which prevents bufferbloat by using the expected transmission | 5539 | * feature, which prevents bufferbloat by using the expected transmission |
| 5549 | * time to limit the amount of data buffered in the hardware. | 5540 | * time to limit the amount of data buffered in the hardware. |
| 5550 | * | 5541 | * |
| 5551 | * @NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211_MAC_ADDRS: The driver | ||
| 5552 | * can use src and dst MAC addresses with control port over nl80211 rx | ||
| 5553 | * and tx operations. | ||
| 5554 | * | ||
| 5555 | * @NUM_NL80211_EXT_FEATURES: number of extended features. | 5542 | * @NUM_NL80211_EXT_FEATURES: number of extended features. |
| 5556 | * @MAX_NL80211_EXT_FEATURES: highest extended feature index. | 5543 | * @MAX_NL80211_EXT_FEATURES: highest extended feature index. |
| 5557 | */ | 5544 | */ |
| @@ -5599,7 +5586,6 @@ enum nl80211_ext_feature_index { · 41 unmodified lines | |||
| 5599 | NL80211_EXT_FEATURE_SAE_OFFLOAD, | 5586 | NL80211_EXT_FEATURE_SAE_OFFLOAD, |
| 5600 | NL80211_EXT_FEATURE_VLAN_OFFLOAD, | 5587 | NL80211_EXT_FEATURE_VLAN_OFFLOAD, |
| 5601 | NL80211_EXT_FEATURE_AQL, | 5588 | NL80211_EXT_FEATURE_AQL, |
| 5602 | NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211_MAC_ADDRS, | ||
| 5603 | 5589 | ||
| 5604 | /* add new features before the definition below */ | 5590 | /* add new features before the definition below */ |
| 5605 | NUM_NL80211_EXT_FEATURES, | 5591 | NUM_NL80211_EXT_FEATURES, |