Showing the changes to include/uapi/linux (1 of 3 files). Show all
Unified · Split
| @@ -542,7 +542,8 @@ · 541 unmodified lines | |||
| 542 | * IEs in %NL80211_ATTR_IE, %NL80211_ATTR_AUTH_TYPE, %NL80211_ATTR_USE_MFP, | 542 | * IEs in %NL80211_ATTR_IE, %NL80211_ATTR_AUTH_TYPE, %NL80211_ATTR_USE_MFP, |
| 543 | * %NL80211_ATTR_MAC, %NL80211_ATTR_WIPHY_FREQ, %NL80211_ATTR_CONTROL_PORT, | 543 | * %NL80211_ATTR_MAC, %NL80211_ATTR_WIPHY_FREQ, %NL80211_ATTR_CONTROL_PORT, |
| 544 | * %NL80211_ATTR_CONTROL_PORT_ETHERTYPE, | 544 | * %NL80211_ATTR_CONTROL_PORT_ETHERTYPE, |
| 545 | * %NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT, %NL80211_ATTR_MAC_HINT, and | 545 | * %NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT, |
| 546 | * %NL80211_ATTR_CONTROL_PORT_OVER_NL80211, %NL80211_ATTR_MAC_HINT, and | ||
| 546 | * %NL80211_ATTR_WIPHY_FREQ_HINT. | 547 | * %NL80211_ATTR_WIPHY_FREQ_HINT. |
| 547 | * If included, %NL80211_ATTR_MAC and %NL80211_ATTR_WIPHY_FREQ are | 548 | * If included, %NL80211_ATTR_MAC and %NL80211_ATTR_WIPHY_FREQ are |
| 548 | * restrictions on BSS selection, i.e., they effectively prevent roaming | 549 | * restrictions on BSS selection, i.e., they effectively prevent roaming |
| @@ -1488,6 +1489,15 @@ enum nl80211_commands { · 939 unmodified lines | |||
| 1488 | * @NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT: When included along with | 1489 | * @NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT: When included along with |
| 1489 | * %NL80211_ATTR_CONTROL_PORT_ETHERTYPE, indicates that the custom | 1490 | * %NL80211_ATTR_CONTROL_PORT_ETHERTYPE, indicates that the custom |
| 1490 | * ethertype frames used for key negotiation must not be encrypted. | 1491 | * ethertype frames used for key negotiation must not be encrypted. |
| 1492 | * @NL80211_ATTR_CONTROL_PORT_OVER_NL80211: A flag indicating whether control | ||
| 1493 | * port frames (e.g. of type given in %NL80211_ATTR_CONTROL_PORT_ETHERTYPE) | ||
| 1494 | * will be sent directly to the network interface or sent via the NL80211 | ||
| 1495 | * socket. If this attribute is missing, then legacy behavior of sending | ||
| 1496 | * control port frames directly to the network interface is used. If the | ||
| 1497 | * flag is included, then control port frames are sent over NL80211 instead | ||
| 1498 | * using %CMD_CONTROL_PORT_FRAME. If control port routing over NL80211 is | ||
| 1499 | * to be used then userspace must also use the %NL80211_ATTR_SOCKET_OWNER | ||
| 1500 | * flag. | ||
| 1491 | * | 1501 | * |
| 1492 | * @NL80211_ATTR_TESTDATA: Testmode data blob, passed through to the driver. | 1502 | * @NL80211_ATTR_TESTDATA: Testmode data blob, passed through to the driver. |
| 1493 | * We recommend using nested, driver-specific attributes within this. | 1503 | * We recommend using nested, driver-specific attributes within this. |
| @@ -2647,6 +2657,8 @@ enum nl80211_attrs { · 1153 unmodified lines | |||
| 2647 | NL80211_ATTR_NSS, | 2657 | NL80211_ATTR_NSS, |
| 2648 | NL80211_ATTR_ACK_SIGNAL, | 2658 | NL80211_ATTR_ACK_SIGNAL, |
| 2649 | 2659 | ||
| 2660 | NL80211_ATTR_CONTROL_PORT_OVER_NL80211, | ||
| 2661 | |||
| 2650 | /* add attributes here, update the policy in nl80211.c */ | 2662 | /* add attributes here, update the policy in nl80211.c */ |
| 2651 | 2663 | ||
| 2652 | __NL80211_ATTR_AFTER_LAST, | 2664 | __NL80211_ATTR_AFTER_LAST, |