Pull networking fixes from David Miller: 1) Various netfilter fixlets from Pablo and the netfilter team. 2) Fix regression in IPVS caused by lack of PMTU exceptions on local routes in ipv6, from Julian Anastasov. 3) Check pskb_trim_rcsum for failure in DSA, from Zhouyang Jia. 4) Don't crash on poll in TLS, from Daniel Borkmann. 5) Revert SO_REUSE{ADDR,PORT} change, it regresses various things including Avahi mDNS. From Bart Van Assche. 6) Missing of_node_put in qcom/emac driver, from Yue Haibing. 7) We lack checking of the TCP checking in one special case during SYN receive, from Frank van der Linden. 8) Fix module init error paths of mac80211 hwsim, from Johannes Berg. 9) Handle 802.1ad properly in stmmac driver, from Elad Nachman. 10) Must grab HW caps before doing quirk checks in stmmac driver, from Jose Abreu. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (81 commits) net: stmmac: Run HWIF Quirks after getting HW caps neighbour: skip NTF_EXT_LEARNED entries during forced gc net: cxgb3: add error handling for sysfs_create_group tls: fix waitall behavior in tls_sw_recvmsg tls: fix use-after-free in tls_push_record l2tp: filter out non-PPP sessions in pppol2tp_tunnel_ioctl() l2tp: reject creation of non-PPP sessions on L2TPv2 tunnels mlxsw: spectrum_switchdev: Fix port_vlan refcounting mlxsw: spectrum_router: Align with new route replace logic mlxsw: spectrum_router: Allow appending to dev-only routes ipv6: Only emit append events for appended routes stmmac: added support for 802.1ad vlan stripping cfg80211: fix rcu in cfg80211_unregister_wdev mac80211: Move up init of TXQs mac80211_hwsim: fix module init error paths cfg80211: initialize sinfo in cfg80211_get_station nl80211: fix some kernel doc tag mistakes hv_netvsc: Fix the variable sizes in ipsecv2 and rsc offload rds: avoid unenecessary cong_update in loop transport l2tp: clean up stale tunnel or session in pppol2tp_connect's error path ...
Showing the changes to include/uapi/linux (3 of 82 files). Show all
Unified · Split
| @@ -112,7 +112,7 @@ enum ip_conntrack_status { · 111 unmodified lines | ||
| 112 | 112 | IPS_EXPECTED | IPS_CONFIRMED | IPS_DYING | |
| 113 | 113 | IPS_SEQ_ADJUST | IPS_TEMPLATE | IPS_OFFLOAD), |
| 114 | 114 | |
| 115 | − __IPS_MAX_BIT = 14, | |
| 115 | + __IPS_MAX_BIT = 15, | |
| 116 | 116 | }; |
| 117 | 117 | |
| 118 | 118 | /* Connection tracking event types */ |
| @@ -266,7 +266,7 @@ enum nft_rule_compat_attributes { · 265 unmodified lines | ||
| 266 | 266 | * @NFT_SET_INTERVAL: set contains intervals |
| 267 | 267 | * @NFT_SET_MAP: set is used as a dictionary |
| 268 | 268 | * @NFT_SET_TIMEOUT: set uses timeouts |
| 269 | − * @NFT_SET_EVAL: set contains expressions for evaluation | |
| 269 | + * @NFT_SET_EVAL: set can be updated from the evaluation path | |
| 270 | 270 | * @NFT_SET_OBJECT: set contains stateful objects |
| 271 | 271 | */ |
| 272 | 272 | enum nft_set_flags { |
| @@ -981,18 +981,18 @@ · 980 unmodified lines | ||
| 981 | 981 | * only the %NL80211_ATTR_IE data is used and updated with this command. |
| 982 | 982 | * |
| 983 | 983 | * @NL80211_CMD_SET_PMK: For offloaded 4-Way handshake, set the PMK or PMK-R0 |
| 984 | − * for the given authenticator address (specified with &NL80211_ATTR_MAC). | |
| 985 | − * When &NL80211_ATTR_PMKR0_NAME is set, &NL80211_ATTR_PMK specifies the | |
| 984 | + * for the given authenticator address (specified with %NL80211_ATTR_MAC). | |
| 985 | + * When %NL80211_ATTR_PMKR0_NAME is set, %NL80211_ATTR_PMK specifies the | |
| 986 | 986 | * PMK-R0, otherwise it specifies the PMK. |
| 987 | 987 | * @NL80211_CMD_DEL_PMK: For offloaded 4-Way handshake, delete the previously |
| 988 | 988 | * configured PMK for the authenticator address identified by |
| 989 | − * &NL80211_ATTR_MAC. | |
| 989 | + * %NL80211_ATTR_MAC. | |
| 990 | 990 | * @NL80211_CMD_PORT_AUTHORIZED: An event that indicates that the 4 way |
| 991 | 991 | * handshake was completed successfully by the driver. The BSSID is |
| 992 | − * specified with &NL80211_ATTR_MAC. Drivers that support 4 way handshake | |
| 992 | + * specified with %NL80211_ATTR_MAC. Drivers that support 4 way handshake | |
| 993 | 993 | * offload should send this event after indicating 802.11 association with |
| 994 | − * &NL80211_CMD_CONNECT or &NL80211_CMD_ROAM. If the 4 way handshake failed | |
| 995 | − * &NL80211_CMD_DISCONNECT should be indicated instead. | |
| 994 | + * %NL80211_CMD_CONNECT or %NL80211_CMD_ROAM. If the 4 way handshake failed | |
| 995 | + * %NL80211_CMD_DISCONNECT should be indicated instead. | |
| 996 | 996 | * |
| 997 | 997 | * @NL80211_CMD_CONTROL_PORT_FRAME: Control Port (e.g. PAE) frame TX request |
| 998 | 998 | * and RX notification. This command is used both as a request to transmit |
| @@ -1029,9 +1029,9 @@ · 30 unmodified lines | ||
| 1029 | 1029 | * initiated the connection through the connect request. |
| 1030 | 1030 | * |
| 1031 | 1031 | * @NL80211_CMD_STA_OPMODE_CHANGED: An event that notify station's |
| 1032 | − * ht opmode or vht opmode changes using any of &NL80211_ATTR_SMPS_MODE, | |
| 1033 | − * &NL80211_ATTR_CHANNEL_WIDTH,&NL80211_ATTR_NSS attributes with its | |
| 1034 | − * address(specified in &NL80211_ATTR_MAC). | |
| 1032 | + * ht opmode or vht opmode changes using any of %NL80211_ATTR_SMPS_MODE, | |
| 1033 | + * %NL80211_ATTR_CHANNEL_WIDTH,%NL80211_ATTR_NSS attributes with its | |
| 1034 | + * address(specified in %NL80211_ATTR_MAC). | |
| 1035 | 1035 | * |
| 1036 | 1036 | * @NL80211_CMD_MAX: highest used command number |
| 1037 | 1037 | * @__NL80211_CMD_AFTER_LAST: internal use |
| @@ -2218,7 +2218,7 @@ enum nl80211_commands { · 1180 unmodified lines | ||
| 2218 | 2218 | * @NL80211_ATTR_EXTERNAL_AUTH_ACTION: Identify the requested external |
| 2219 | 2219 | * authentication operation (u32 attribute with an |
| 2220 | 2220 | * &enum nl80211_external_auth_action value). This is used with the |
| 2221 | − * &NL80211_CMD_EXTERNAL_AUTH request event. | |
| 2221 | + * %NL80211_CMD_EXTERNAL_AUTH request event. | |
| 2222 | 2222 | * @NL80211_ATTR_EXTERNAL_AUTH_SUPPORT: Flag attribute indicating that the user |
| 2223 | 2223 | * space supports external authentication. This attribute shall be used |
| 2224 | 2224 | * only with %NL80211_CMD_CONNECT request. The driver may offload |
| @@ -3491,7 +3491,7 @@ enum nl80211_sched_scan_match_attr { · 1266 unmodified lines | ||
| 3491 | 3491 | * @NL80211_RRF_AUTO_BW: maximum available bandwidth should be calculated |
| 3492 | 3492 | * base on contiguous rules and wider channels will be allowed to cross |
| 3493 | 3493 | * multiple contiguous/overlapping frequency ranges. |
| 3494 | − * @NL80211_RRF_IR_CONCURRENT: See &NL80211_FREQUENCY_ATTR_IR_CONCURRENT | |
| 3494 | + * @NL80211_RRF_IR_CONCURRENT: See %NL80211_FREQUENCY_ATTR_IR_CONCURRENT | |
| 3495 | 3495 | * @NL80211_RRF_NO_HT40MINUS: channels can't be used in HT40- operation |
| 3496 | 3496 | * @NL80211_RRF_NO_HT40PLUS: channels can't be used in HT40+ operation |
| 3497 | 3497 | * @NL80211_RRF_NO_80MHZ: 80MHz operation not allowed |
| @@ -5643,11 +5643,11 @@ enum nl80211_nan_func_attributes { · 2145 unmodified lines | ||
| 5643 | 5643 | * @NL80211_NAN_SRF_INCLUDE: present if the include bit of the SRF set. |
| 5644 | 5644 | * This is a flag. |
| 5645 | 5645 | * @NL80211_NAN_SRF_BF: Bloom Filter. Present if and only if |
| 5646 | − * &NL80211_NAN_SRF_MAC_ADDRS isn't present. This attribute is binary. | |
| 5646 | + * %NL80211_NAN_SRF_MAC_ADDRS isn't present. This attribute is binary. | |
| 5647 | 5647 | * @NL80211_NAN_SRF_BF_IDX: index of the Bloom Filter. Mandatory if |
| 5648 | − * &NL80211_NAN_SRF_BF is present. This is a u8. | |
| 5648 | + * %NL80211_NAN_SRF_BF is present. This is a u8. | |
| 5649 | 5649 | * @NL80211_NAN_SRF_MAC_ADDRS: list of MAC addresses for the SRF. Present if |
| 5650 | − * and only if &NL80211_NAN_SRF_BF isn't present. This is a nested | |
| 5650 | + * and only if %NL80211_NAN_SRF_BF isn't present. This is a nested | |
| 5651 | 5651 | * attribute. Each nested attribute is a MAC address. |
| 5652 | 5652 | * @NUM_NL80211_NAN_SRF_ATTR: internal |
| 5653 | 5653 | * @NL80211_NAN_SRF_ATTR_MAX: highest NAN SRF attribute |