Pull networking fixes from David Miller: 1) Need to access netdev->num_rx_queues behind an accessor in netvsc driver otherwise the build breaks with some configs, from Arnd Bergmann. 2) Add dummy xfrm_dev_event() so that build doesn't fail when CONFIG_XFRM_OFFLOAD is not set. From Hangbin Liu. 3) Don't OOPS when pfkey_msg2xfrm_state() signals an erros, from Dan Carpenter. 4) Fix MCDI command size for filter operations in sfc driver, from Martin Habets. 5) Fix UFO segmenting so that we don't calculate incorrect checksums, from Michal Kubecek. 6) When ipv6 datagram connects fail, reset destination address and port. From Wei Wang. 7) TCP disconnect must reset the cached receive DST, from WANG Cong. 8) Fix sign extension bug on 32-bit in dev_get_stats(), from Eric Dumazet. 9) fman driver has to depend on HAS_DMA, from Madalin Bucur. 10) Fix bpf pointer leak with xadd in verifier, from Daniel Borkmann. 11) Fix negative page counts with GFO, from Michal Kubecek. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (41 commits) sfc: fix attempt to translate invalid filter ID net: handle NAPI_GRO_FREE_STOLEN_HEAD case also in napi_frags_finish() bpf: prevent leaking pointer via xadd on unpriviledged arcnet: com20020-pci: add missing pdev setup in netdev structure arcnet: com20020-pci: fix dev_id calculation arcnet: com20020: remove needless base_addr assignment Trivial fix to spelling mistake in arc_printk message arcnet: change irq handler to lock irqsave rocker: move dereference before free mlxsw: spectrum_router: Fix NULL pointer dereference net: sched: Fix one possible panic when no destroy callback virtio-net: serialize tx routine during reset net: usb: asix88179_178a: Add support for the Belkin B2B128 fsl/fman: add dependency on HAS_DMA net: prevent sign extension in dev_get_stats() tcp: reset sk_rx_dst in tcp_disconnect() net: ipv6: reset daddr and dport in sk if connect() fails bnx2x: Don't log mc removal needlessly bnxt_en: Fix netpoll handling. bnxt_en: Add missing logic to handle TPA end error conditions. ...
Showing the changes to include (1 of 42 files). Show all
Unified · Split
| @@ -1850,8 +1850,9 @@ static inline struct xfrm_offload *xfrm_offload(struct sk_buff *skb) · 1849 unmodified lines | |||
| 1850 | } | 1850 | } |
| 1851 | #endif | 1851 | #endif |
| 1852 | 1852 | ||
| 1853 | #ifdef CONFIG_XFRM_OFFLOAD | ||
| 1854 | void __net_init xfrm_dev_init(void); | 1853 | void __net_init xfrm_dev_init(void); |
| 1854 | |||
| 1855 | #ifdef CONFIG_XFRM_OFFLOAD | ||
| 1855 | int validate_xmit_xfrm(struct sk_buff *skb, netdev_features_t features); | 1856 | int validate_xmit_xfrm(struct sk_buff *skb, netdev_features_t features); |
| 1856 | int xfrm_dev_state_add(struct net *net, struct xfrm_state *x, | 1857 | int xfrm_dev_state_add(struct net *net, struct xfrm_state *x, |
| 1857 | struct xfrm_user_offload *xuo); | 1858 | struct xfrm_user_offload *xuo); |
| @@ -1877,10 +1878,6 @@ static inline void xfrm_dev_state_free(struct xfrm_state *x) · 19 unmodified lines | |||
| 1877 | } | 1878 | } |
| 1878 | } | 1879 | } |
| 1879 | #else | 1880 | #else |
| 1880 | static inline void __net_init xfrm_dev_init(void) | ||
| 1881 | { | ||
| 1882 | } | ||
| 1883 | |||
| 1884 | static inline int validate_xmit_xfrm(struct sk_buff *skb, netdev_features_t features) | 1881 | static inline int validate_xmit_xfrm(struct sk_buff *skb, netdev_features_t features) |
| 1885 | { | 1882 | { |
| 1886 | return 0; | 1883 | return 0; |