Johannes Berg says: ==================== For the next cycle, we have the following: * the biggest change is Michał's work on integrating FQ/codel with the mac80211 internal software queues * cfg80211 connect result gets clarified for the "no connection at all" case * advertisement of per-interface type capabilities, in case they differ (which makes a lot of sense for some capabilities) * most of the nl80211 & hwsim unprivileged namespace operation changes * human-readable VHT capabilities in debugfs * some other cleanups, like spelling ====================
Showing the changes to include/uapi/linux (2 of 21 files). Show all
Unified · Split
| @@ -493,7 +493,12 @@ · 492 unmodified lines | ||
| 493 | 493 | * This attribute is ignored if driver does not support roam scan. |
| 494 | 494 | * It is also sent as an event, with the BSSID and response IEs when the |
| 495 | 495 | * connection is established or failed to be established. This can be |
| 496 | − * determined by the STATUS_CODE attribute. | |
| 496 | + * determined by the %NL80211_ATTR_STATUS_CODE attribute (0 = success, | |
| 497 | + * non-zero = failure). If %NL80211_ATTR_TIMED_OUT is included in the | |
| 498 | + * event, the connection attempt failed due to not being able to initiate | |
| 499 | + * authentication/association or not receiving a response from the AP. | |
| 500 | + * Non-zero %NL80211_ATTR_STATUS_CODE value is indicated in that case as | |
| 501 | + * well to remain backwards compatible. | |
| 497 | 502 | * @NL80211_CMD_ROAM: request that the card roam (currently not implemented), |
| 498 | 503 | * sent as an event when the card/driver roamed by itself. |
| 499 | 504 | * @NL80211_CMD_DISCONNECT: drop a given connection; also used to notify |
| @@ -1819,6 +1824,11 @@ enum nl80211_commands { · 1319 unmodified lines | ||
| 1819 | 1824 | * |
| 1820 | 1825 | * @NL80211_ATTR_PAD: attribute used for padding for 64-bit alignment |
| 1821 | 1826 | * |
| 1827 | + * @NL80211_ATTR_IFTYPE_EXT_CAPA: Nested attribute of the following attributes: | |
| 1828 | + * %NL80211_ATTR_IFTYPE, %NL80211_ATTR_EXT_CAPA, | |
| 1829 | + * %NL80211_ATTR_EXT_CAPA_MASK, to specify the extended capabilities per | |
| 1830 | + * interface type. | |
| 1831 | + * | |
| 1822 | 1832 | * @NUM_NL80211_ATTR: total number of nl80211_attrs available |
| 1823 | 1833 | * @NL80211_ATTR_MAX: highest attribute number currently defined |
| 1824 | 1834 | * @__NL80211_ATTR_AFTER_LAST: internal use |
| @@ -2201,6 +2211,8 @@ enum nl80211_attrs { · 376 unmodified lines | ||
| 2201 | 2211 | |
| 2202 | 2212 | NL80211_ATTR_PAD, |
| 2203 | 2213 | |
| 2214 | + NL80211_ATTR_IFTYPE_EXT_CAPA, | |
| 2215 | + | |
| 2204 | 2216 | /* add attributes here, update the policy in nl80211.c */ |
| 2205 | 2217 | |
| 2206 | 2218 | __NL80211_ATTR_AFTER_LAST, |
| @@ -670,8 +670,7 @@ · 669 unmodified lines | ||
| 670 | 670 | /* |
| 671 | 671 | * Generic format for most parameters that fit in an int |
| 672 | 672 | */ |
| 673 | −struct iw_param | |
| 674 | −{ | |
| 673 | +struct iw_param { | |
| 675 | 674 | __s32 value; /* The value of the parameter itself */ |
| 676 | 675 | __u8 fixed; /* Hardware should not use auto select */ |
| 677 | 676 | __u8 disabled; /* Disable the feature */ |
| @@ -682,8 +681,7 @@ struct iw_param · 4 unmodified lines | ||
| 682 | 681 | * For all data larger than 16 octets, we need to use a |
| 683 | 682 | * pointer to memory allocated in user space. |
| 684 | 683 | */ |
| 685 | −struct iw_point | |
| 686 | −{ | |
| 684 | +struct iw_point { | |
| 687 | 685 | void __user *pointer; /* Pointer to the data (in user space) */ |
| 688 | 686 | __u16 length; /* number of fields or size in bytes */ |
| 689 | 687 | __u16 flags; /* Optional params */ |
| @@ -698,8 +696,7 @@ struct iw_point · 8 unmodified lines | ||
| 698 | 696 | * of 10 to get 'm' lower than 10^9, with 'm'= f / (10^'e')... |
| 699 | 697 | * The power of 10 is in 'e', the result of the division is in 'm'. |
| 700 | 698 | */ |
| 701 | −struct iw_freq | |
| 702 | −{ | |
| 699 | +struct iw_freq { | |
| 703 | 700 | __s32 m; /* Mantissa */ |
| 704 | 701 | __s16 e; /* Exponent */ |
| 705 | 702 | __u8 i; /* List index (when in range struct) */ |
| @@ -709,8 +706,7 @@ struct iw_freq · 3 unmodified lines | ||
| 709 | 706 | /* |
| 710 | 707 | * Quality of the link |
| 711 | 708 | */ |
| 712 | −struct iw_quality | |
| 713 | −{ | |
| 709 | +struct iw_quality { | |
| 714 | 710 | __u8 qual; /* link quality (%retries, SNR, |
| 715 | 711 | %missed beacons or better...) */ |
| 716 | 712 | __u8 level; /* signal level (dBm) */ |
| @@ -725,8 +721,7 @@ struct iw_quality · 8 unmodified lines | ||
| 725 | 721 | * is already pretty exhaustive, and you should use that first. |
| 726 | 722 | * This is only additional stats... |
| 727 | 723 | */ |
| 728 | −struct iw_discarded | |
| 729 | −{ | |
| 724 | +struct iw_discarded { | |
| 730 | 725 | __u32 nwid; /* Rx : Wrong nwid/essid */ |
| 731 | 726 | __u32 code; /* Rx : Unable to code/decode (WEP) */ |
| 732 | 727 | __u32 fragment; /* Rx : Can't perform MAC reassembly */ |
| @@ -738,16 +733,14 @@ struct iw_discarded · 5 unmodified lines | ||
| 738 | 733 | * Packet/Time period missed in the wireless adapter due to |
| 739 | 734 | * "wireless" specific problems... |
| 740 | 735 | */ |
| 741 | −struct iw_missed | |
| 742 | −{ | |
| 736 | +struct iw_missed { | |
| 743 | 737 | __u32 beacon; /* Missed beacons/superframe */ |
| 744 | 738 | }; |
| 745 | 739 | |
| 746 | 740 | /* |
| 747 | 741 | * Quality range (for spy threshold) |
| 748 | 742 | */ |
| 749 | −struct iw_thrspy | |
| 750 | −{ | |
| 743 | +struct iw_thrspy { | |
| 751 | 744 | struct sockaddr addr; /* Source address (hw/mac) */ |
| 752 | 745 | struct iw_quality qual; /* Quality of the link */ |
| 753 | 746 | struct iw_quality low; /* Low threshold */ |
| @@ -765,8 +758,7 @@ struct iw_thrspy · 11 unmodified lines | ||
| 765 | 758 | * Especially, scan results are required to include an entry for the |
| 766 | 759 | * current BSS if the driver is in Managed mode and associated with an AP. |
| 767 | 760 | */ |
| 768 | −struct iw_scan_req | |
| 769 | −{ | |
| 761 | +struct iw_scan_req { | |
| 770 | 762 | __u8 scan_type; /* IW_SCAN_TYPE_{ACTIVE,PASSIVE} */ |
| 771 | 763 | __u8 essid_len; |
| 772 | 764 | __u8 num_channels; /* num entries in channel_list; |
| @@ -827,8 +819,7 @@ struct iw_scan_req · 54 unmodified lines | ||
| 827 | 819 | * RX_SEQ_VALID for SIOCGIWENCODEEXT are optional, but can be useful for |
| 828 | 820 | * debugging/testing. |
| 829 | 821 | */ |
| 830 | −struct iw_encode_ext | |
| 831 | −{ | |
| 822 | +struct iw_encode_ext { | |
| 832 | 823 | __u32 ext_flags; /* IW_ENCODE_EXT_* */ |
| 833 | 824 | __u8 tx_seq[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */ |
| 834 | 825 | __u8 rx_seq[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */ |
| @@ -841,8 +832,7 @@ struct iw_encode_ext · 6 unmodified lines | ||
| 841 | 832 | }; |
| 842 | 833 | |
| 843 | 834 | /* SIOCSIWMLME data */ |
| 844 | −struct iw_mlme | |
| 845 | −{ | |
| 835 | +struct iw_mlme { | |
| 846 | 836 | __u16 cmd; /* IW_MLME_* */ |
| 847 | 837 | __u16 reason_code; |
| 848 | 838 | struct sockaddr addr; |
| @@ -855,16 +845,14 @@ struct iw_mlme · 6 unmodified lines | ||
| 855 | 845 | |
| 856 | 846 | #define IW_PMKID_LEN 16 |
| 857 | 847 | |
| 858 | −struct iw_pmksa | |
| 859 | −{ | |
| 848 | +struct iw_pmksa { | |
| 860 | 849 | __u32 cmd; /* IW_PMKSA_* */ |
| 861 | 850 | struct sockaddr bssid; |
| 862 | 851 | __u8 pmkid[IW_PMKID_LEN]; |
| 863 | 852 | }; |
| 864 | 853 | |
| 865 | 854 | /* IWEVMICHAELMICFAILURE data */ |
| 866 | −struct iw_michaelmicfailure | |
| 867 | −{ | |
| 855 | +struct iw_michaelmicfailure { | |
| 868 | 856 | __u32 flags; |
| 869 | 857 | struct sockaddr src_addr; |
| 870 | 858 | __u8 tsc[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */ |
| @@ -872,8 +860,7 @@ struct iw_michaelmicfailure · 1 unmodified line | ||
| 872 | 860 | |
| 873 | 861 | /* IWEVPMKIDCAND data */ |
| 874 | 862 | #define IW_PMKID_CAND_PREAUTH 0x00000001 /* RNS pre-authentication enabled */ |
| 875 | −struct iw_pmkid_cand | |
| 876 | −{ | |
| 863 | +struct iw_pmkid_cand { | |
| 877 | 864 | __u32 flags; /* IW_PMKID_CAND_* */ |
| 878 | 865 | __u32 index; /* the smaller the index, the higher the |
| 879 | 866 | * priority */ |
| @@ -884,8 +871,7 @@ struct iw_pmkid_cand · 4 unmodified lines | ||
| 884 | 871 | /* |
| 885 | 872 | * Wireless statistics (used for /proc/net/wireless) |
| 886 | 873 | */ |
| 887 | −struct iw_statistics | |
| 888 | −{ | |
| 874 | +struct iw_statistics { | |
| 889 | 875 | __u16 status; /* Status |
| 890 | 876 | * - device dependent for now */ |
| 891 | 877 | |
| @@ -897,7 +883,7 @@ struct iw_statistics · 5 unmodified lines | ||
| 897 | 883 | |
| 898 | 884 | /* ------------------------ IOCTL REQUEST ------------------------ */ |
| 899 | 885 | /* |
| 900 | − * This structure defines the payload of an ioctl, and is used | |
| 886 | + * This structure defines the payload of an ioctl, and is used | |
| 901 | 887 | * below. |
| 902 | 888 | * |
| 903 | 889 | * Note that this structure should fit on the memory footprint |
| @@ -906,8 +892,7 @@ struct iw_statistics · 2 unmodified lines | ||
| 906 | 892 | * You should check this when increasing the structures defined |
| 907 | 893 | * above in this file... |
| 908 | 894 | */ |
| 909 | −union iwreq_data | |
| 910 | −{ | |
| 895 | +union iwreq_data { | |
| 911 | 896 | /* Config - generic */ |
| 912 | 897 | char name[IFNAMSIZ]; |
| 913 | 898 | /* Name : used to verify the presence of wireless extensions. |
| @@ -944,15 +929,14 @@ union iwreq_data · 30 unmodified lines | ||
| 944 | 929 | * convenience... |
| 945 | 930 | * Do I need to remind you about structure size (32 octets) ? |
| 946 | 931 | */ |
| 947 | −struct iwreq | |
| 948 | −{ | |
| 932 | +struct iwreq { | |
| 949 | 933 | union |
| 950 | 934 | { |
| 951 | 935 | char ifrn_name[IFNAMSIZ]; /* if name, e.g. "eth0" */ |
| 952 | 936 | } ifr_ifrn; |
| 953 | 937 | |
| 954 | 938 | /* Data part (defined just above) */ |
| 955 | − union iwreq_data u; | |
| 939 | + union iwreq_data u; | |
| 956 | 940 | }; |
| 957 | 941 | |
| 958 | 942 | /* -------------------------- IOCTL DATA -------------------------- */ |
| @@ -965,8 +949,7 @@ struct iwreq · 6 unmodified lines | ||
| 965 | 949 | * Range of parameters |
| 966 | 950 | */ |
| 967 | 951 | |
| 968 | −struct iw_range | |
| 969 | −{ | |
| 952 | +struct iw_range { | |
| 970 | 953 | /* Informative stuff (to choose between different interface) */ |
| 971 | 954 | __u32 throughput; /* To give an idea... */ |
| 972 | 955 | /* In theory this value should be the maximum benchmarked |
| @@ -1069,9 +1052,8 @@ struct iw_range · 96 unmodified lines | ||
| 1069 | 1052 | /* |
| 1070 | 1053 | * Private ioctl interface information |
| 1071 | 1054 | */ |
| 1072 | − | |
| 1073 | −struct iw_priv_args | |
| 1074 | −{ | |
| 1055 | + | |
| 1056 | +struct iw_priv_args { | |
| 1075 | 1057 | __u32 cmd; /* Number of the ioctl to issue */ |
| 1076 | 1058 | __u16 set_args; /* Type and number of args */ |
| 1077 | 1059 | __u16 get_args; /* Type and number of args */ |
| @@ -1088,8 +1070,7 @@ struct iw_priv_args · 10 unmodified lines | ||
| 1088 | 1070 | /* |
| 1089 | 1071 | * A Wireless Event. Contains basically the same data as the ioctl... |
| 1090 | 1072 | */ |
| 1091 | −struct iw_event | |
| 1092 | −{ | |
| 1073 | +struct iw_event { | |
| 1093 | 1074 | __u16 len; /* Real length of this stuff */ |
| 1094 | 1075 | __u16 cmd; /* Wireless IOCTL */ |
| 1095 | 1076 | union iwreq_data u; /* IOCTL fixed payload */ |