Pull networking fixes from David Miller: 1) Various VTI tunnel (mark handling, PMTU) bug fixes from Alexander Duyck and Steffen Klassert. 2) Revert ethtool PHY query change, it wasn't correct. The PHY address selected by the driver running the PHY to MAC connection decides what PHY address GET ethtool operations return information from. 3) Fix handling of sequence number bits for encryption IV generation in ESP driver, from Herbert Xu. 4) UDP can return -EAGAIN when we hit a bad checksum on receive, even when there are other packets in the receive queue which is wrong. Just respect the error returned from the generic socket recv datagram helper. From Eric Dumazet. 5) Fix BNA driver firmware loading on big-endian systems, from Ivan Vecera. 6) Fix regression in that we were inheriting the congestion control of the listening socket for new connections, the intended behavior always was to use the default in this case. From Neal Cardwell. 7) Fix NULL deref in brcmfmac driver, from Arend van Spriel. 8) OTP parsing fix in iwlwifi from Liad Kaufman. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (26 commits) vti6: Add pmtu handling to vti6_xmit. Revert "net: core: 'ethtool' issue with querying phy settings" bnx2x: Move statistics implementation into semaphores xen: netback: read hotplug script once at start of day. xen: netback: fix printf format string warning Revert "netfilter: ensure number of counters is >0 in do_replace()" net: dsa: Properly propagate errors from dsa_switch_setup_one tcp: fix child sockets to use system default congestion control if not set udp: fix behavior of wrong checksums sfc: free multiple Rx buffers when required bna: fix soft lock-up during firmware initialization failure bna: remove unreasonable iocpf timer start bna: fix firmware loading on big-endian machines bridge: fix br_multicast_query_expired() bug via-rhine: Resigning as maintainer brcmfmac: avoid null pointer access when brcmf_msgbuf_get_pktid() fails mac80211: Fix mac80211.h docbook comments iwlwifi: nvm: fix otp parsing in 8000 hw family iwlwifi: pcie: fix tracking of cmd_in_flight ip_vti/ip6_vti: Preserve skb->mark after rcv_cb call ...
Showing the changes to include (2 of 32 files). Show all
Unified · Split
| @@ -98,7 +98,8 @@ struct inet_connection_sock { · 97 unmodified lines | |||
| 98 | const struct tcp_congestion_ops *icsk_ca_ops; | 98 | const struct tcp_congestion_ops *icsk_ca_ops; |
| 99 | const struct inet_connection_sock_af_ops *icsk_af_ops; | 99 | const struct inet_connection_sock_af_ops *icsk_af_ops; |
| 100 | unsigned int (*icsk_sync_mss)(struct sock *sk, u32 pmtu); | 100 | unsigned int (*icsk_sync_mss)(struct sock *sk, u32 pmtu); |
| 101 | __u8 icsk_ca_state:7, | 101 | __u8 icsk_ca_state:6, |
| 102 | icsk_ca_setsockopt:1, | ||
| 102 | icsk_ca_dst_locked:1; | 103 | icsk_ca_dst_locked:1; |
| 103 | __u8 icsk_retransmits; | 104 | __u8 icsk_retransmits; |
| 104 | __u8 icsk_pending; | 105 | __u8 icsk_pending; |
| @@ -354,7 +354,7 @@ enum ieee80211_rssi_event_data { · 353 unmodified lines | |||
| 354 | }; | 354 | }; |
| 355 | 355 | ||
| 356 | /** | 356 | /** |
| 357 | * enum ieee80211_rssi_event - data attached to an %RSSI_EVENT | 357 | * struct ieee80211_rssi_event - data attached to an %RSSI_EVENT |
| 358 | * @data: See &enum ieee80211_rssi_event_data | 358 | * @data: See &enum ieee80211_rssi_event_data |
| 359 | */ | 359 | */ |
| 360 | struct ieee80211_rssi_event { | 360 | struct ieee80211_rssi_event { |
| @@ -388,7 +388,7 @@ enum ieee80211_mlme_event_status { · 27 unmodified lines | |||
| 388 | }; | 388 | }; |
| 389 | 389 | ||
| 390 | /** | 390 | /** |
| 391 | * enum ieee80211_mlme_event - data attached to an %MLME_EVENT | 391 | * struct ieee80211_mlme_event - data attached to an %MLME_EVENT |
| 392 | * @data: See &enum ieee80211_mlme_event_data | 392 | * @data: See &enum ieee80211_mlme_event_data |
| 393 | * @status: See &enum ieee80211_mlme_event_status | 393 | * @status: See &enum ieee80211_mlme_event_status |
| 394 | * @reason: the reason code if applicable | 394 | * @reason: the reason code if applicable |
| @@ -401,9 +401,10 @@ struct ieee80211_mlme_event { · 6 unmodified lines | |||
| 401 | 401 | ||
| 402 | /** | 402 | /** |
| 403 | * struct ieee80211_event - event to be sent to the driver | 403 | * struct ieee80211_event - event to be sent to the driver |
| 404 | * @type The event itself. See &enum ieee80211_event_type. | 404 | * @type: The event itself. See &enum ieee80211_event_type. |
| 405 | * @rssi: relevant if &type is %RSSI_EVENT | 405 | * @rssi: relevant if &type is %RSSI_EVENT |
| 406 | * @mlme: relevant if &type is %AUTH_EVENT | 406 | * @mlme: relevant if &type is %AUTH_EVENT |
| 407 | * @u: union holding the above two fields | ||
| 407 | */ | 408 | */ |
| 408 | struct ieee80211_event { | 409 | struct ieee80211_event { |
| 409 | enum ieee80211_event_type type; | 410 | enum ieee80211_event_type type; |