David S. Miller
1080746110
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf ...
Pablo Neira Ayuso says:
====================
Netfilter/IPVS fixes for net
The following patchset contains Netfilter/IPVS fixes for your net tree,
they are:
1) Fix SCTP connection setup when IPVS module is loaded and any scheduler
is registered, from Xin Long.
2) Don't create a SCTP connection from SCTP ABORT packets, also from
Xin Long.
3) WARN_ON() and drop packet, instead of BUG_ON() races when calling
nf_nat_setup_info(). This is specifically a longstanding problem
when br_netfilter with conntrack support is in place, patch from
Florian Westphal.
4) Avoid softlock splats via iptables-restore, also from Florian.
5) Revert NAT hashtable conversion to rhashtable, semantics of rhlist
are different from our simple NAT hashtable, this has been causing
problems in the recent Linux kernel releases. From Florian.
6) Add per-bucket spinlock for NAT hashtable, so at least we restore
one of the benefits we got from the previous rhashtable conversion.
7) Fix incorrect hashtable size in memory allocation in xt_hashlimit,
from Zhizhou Tian.
8) Fix build/link problems with hashlimit and 32-bit arches, to address
recent fallout from a new hashlimit mode, from Vishwanath Pai.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-09-08 11:35:55 -07:00
9p: Implement show_options
2017-07-11 06:08:58 -04:00
Bluetooth: make baswap src const
2017-09-01 22:49:47 +02:00
netfilter: nat: Revert "netfilter: nat: convert nat bysrc hash to rhashtable"
2017-09-08 18:55:50 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2017-09-03 17:08:42 -07:00
NFC: Add nfc_dbg() macro
2017-04-05 10:15:20 +02:00
sctp: fix some indents in sm_make_chunk.c
2017-08-11 10:02:44 -07:00
net: sched: add couple of goto_chain helpers
2017-08-23 20:44:32 -07:00
6lowpan: Fix IID format for Bluetooth
2017-04-12 22:02:36 +02:00
net/sched: Change act_api and act_xxx modules to use IDR
2017-08-30 14:38:51 -07:00
ipv6: fix NULL dereference in ip6_route_dev_notify()
2017-08-15 17:06:34 -07:00
rxrpc: Allow failed client calls to be retried
2017-08-29 10:55:20 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-07-21 03:38:43 +01:00
VSOCK: Add vsockmon tap functions
2017-04-24 12:35:56 -04:00
net: convert neighbour.refcnt from atomic_t to refcount_t
2017-07-01 07:39:07 -07:00
net, ax25: convert ax25_cb.refcount from atomic_t to refcount_t
2017-07-04 22:35:19 +01:00
bonding: Prevent duplicate userspace notification
2017-05-27 18:51:41 -04:00
bonding: require speed/duplex only for 802.3ad, alb and tlb
2017-08-11 14:21:42 -07:00
net: fix compilation when busy poll is not enabled
2017-08-11 14:59:24 -07:00
net, calipso: convert calipso_doi.refcount from atomic_t to refcount_t
2017-07-04 22:35:16 +01:00
nl80211: add authorized flag to ROAM event
2017-06-13 11:04:37 +02:00
csum: eliminate sparse warning in remcsum_unadjust()
2017-01-20 12:12:13 -05:00
net, ipv4: convert cipso_v4_doi.refcount from atomic_t to refcount_t
2017-07-04 01:29:04 -07:00
devlink: Add IPv6 header for dpipe
2017-08-31 14:42:19 -07:00
net, decnet: convert dn_fib_info.fib_clntref from atomic_t to refcount_t
2017-07-04 22:35:15 +01:00
net: dsa: Allow switch drivers to indicate number of TX queues
2017-09-05 11:53:34 -07:00
ipv4: convert dst_metrics.refcnt from atomic_t to refcount_t
2017-08-18 15:14:07 -07:00
net: store port/representator id in metadata_dst
2017-06-25 11:42:01 -04:00
net: add confirm_neigh method to dst_ops
2017-02-07 13:07:46 -05:00
gre: introduce native tunnel support for ERSPAN
2017-08-22 14:29:30 -07:00
esp6: Reorganize esp_output
2017-04-14 10:06:42 +02:00
net: Add module reference to FIB notifiers
2017-09-01 20:33:42 -07:00
net: fib_rules: Implement notification logic in core
2017-08-03 15:35:59 -07:00
net: Extend struct flowi6 with multipath hash
2017-08-24 18:21:17 -07:00
flow_dissector: Cleanup control flow
2017-09-05 11:40:08 -07:00
fq.h: Port memory limit mechanism from fq_codel
2016-09-30 13:29:21 +02:00
fq.h: Port memory limit mechanism from fq_codel
2016-09-30 13:29:21 +02:00
net_sched: gen_estimator: complete rewrite of rate estimators
2016-12-05 15:21:59 -05:00
genetlink: remove ops_list from genetlink header.
2017-06-05 10:54:55 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-08-18 01:17:32 -04:00
gro_cells: move to net/core/gro_cells.c
2017-02-08 14:38:18 -05:00
wireless: radiotap: rewrite the radiotap header file
2017-01-25 16:00:33 +01:00
net, ipv6: convert ifacaddr6.aca_refcnt from atomic_t to refcount_t
2017-07-04 01:29:04 -07:00
net: Introduce ife encapsulation module
2017-02-03 15:16:45 -05:00
inet: drop ->bind_conflict
2017-01-18 13:04:28 -05:00
net: ipv6: add second dif to inet6 socket lookups
2017-08-07 11:39:22 -07:00
net: Work around lockdep limitation in sockets that use sockets
2017-03-09 18:23:27 -08:00
tcp: ULP infrastructure
2017-06-15 12:12:40 -04:00
ipv6: suppress sparse warnings in IP6_ECN_set_ce()
2016-08-13 15:08:00 -07:00
Revert "net: fix percpu memory leaks"
2017-09-03 11:01:05 -07:00
net: ipv4: add second dif to inet socket lookups
2017-08-07 11:39:21 -07:00
net/tcp-fastopen: Add new API support
2017-01-25 14:04:38 -05:00
ipv4: Namespaceify tcp_tw_recycle and tcp_max_tw_buckets knob
2016-12-29 11:38:31 -05:00
inetpeer: remove AVL implementation in favor of RB tree
2017-07-17 08:59:01 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-08-21 17:06:42 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-09-01 17:42:05 -07:00
ipv6: Use rt6i_idev index for echo replies to a local address
2017-08-29 15:32:25 -07:00
ip6_tunnel: Allow policy-based routing through tunnels
2017-04-21 13:21:30 -04:00
net: fib_rules: Implement notification logic in core
2017-08-03 15:35:59 -07:00
gre: add collect_md mode to ERSPAN tunnel
2017-08-28 15:04:52 -07:00
ipvs: remove unused function ip_vs_set_state_timeout
2017-04-28 12:00:10 +02:00
net, ipv6: convert ipv6_txoptions.refcnt from atomic_t to refcount_t
2017-07-04 01:29:03 -07:00
net, ipx: convert ipx_route.refcnt from atomic_t to refcount_t
2017-07-04 22:35:17 +01:00
wext: uninline stream addition functions
2017-01-13 09:38:42 +01:00
kcm: Use stream parser
2016-08-17 19:36:23 -04:00
net: ipv4: Do not drop to make_route if oif is l3mdev
2016-10-13 12:05:26 -04:00
net, lapb: convert lapb_cb.refcnt from atomic_t to refcount_t
2017-07-04 22:35:16 +01:00
net, llc: convert llc_sap.refcnt from atomic_t to refcount_t
2017-07-04 22:35:15 +01:00
net: add extack arg to lwtunnel build state
2017-05-30 11:55:32 -04:00
mac80211: fix VLAN handling with TXQs
2017-09-05 11:28:43 +02:00
openvswitch: use mpls_hdr
2016-10-03 02:00:22 -04:00
net: mpls: Increase max number of labels for lwt encap
2017-04-01 20:21:44 -07:00
net/ncsi: fix ncsi_vlan_rx_{add,kill}_vid references
2017-09-05 09:11:45 -07:00
net: convert neighbour.refcnt from atomic_t to refcount_t
2017-07-01 07:39:07 -07:00
Now that IPC and other changes have landed, enable manual markings for
2017-07-19 08:55:18 -07:00
net: core: Make the FIB notification chain generic
2017-08-03 15:35:59 -07:00
net: convert netlbl_lsm_cache.refcount from atomic_t to refcount_t
2017-07-01 07:39:09 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2017-09-03 17:08:42 -07:00
net, netrom: convert nr_node.refcount from atomic_t to refcount_t
2017-07-04 22:35:17 +01:00
net: add NSH header structures and helpers
2017-08-29 15:16:52 -07:00
net: sched: remove cops->tcf_cl_offload
2017-08-11 13:47:01 -07:00
net: sched: Add helpers to identify classids
2017-08-11 13:47:00 -07:00
pptp: Refactor the struct and macros of PPTP codes
2016-08-15 10:55:53 -07:00
net: Add sysctl to toggle early demux for tcp and udp
2017-03-24 13:17:07 -07:00
net: Introduce psample, a new genetlink channel for packet sampling
2017-01-24 13:44:28 -05:00
net: ipv4: add second dif to raw socket lookups
2017-08-07 11:39:21 -07:00
net: ipv6: add second dif to raw socket lookups
2017-08-07 11:39:22 -07:00
ktime: Get rid of the union
2016-12-25 17:21:22 +01:00
net: convert sock.sk_refcnt from atomic_t to refcount_t
2017-07-01 07:39:08 -07:00
ipv4: Don't override return code from ip_route_input_noref()
2017-09-03 10:54:27 -07:00
rtnetlink: add RTNL_FLAG_DOIT_UNLOCKED
2017-08-09 16:57:38 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-09-01 17:42:05 -07:00
sched/headers: Prepare to remove <linux/cred.h> inclusion from <linux/sched.h>
2017-03-02 08:42:31 +01:00
tcp: Namespaceify sysctl_tcp_timestamps
2017-06-08 10:53:29 -04:00
ipv6: sr: add support for ip4ip6 encapsulation
2017-08-25 17:10:23 -07:00
ipv6: sr: add core files for SR HMAC support
2016-11-09 20:40:06 -05:00
smc: netlink interface for SMC sockets
2017-01-09 16:07:41 -05:00
neigh: increase queue_len_bytes to match wmem_default
2017-08-29 16:10:50 -07:00
strparser: initialize all callbacks
2017-08-24 21:57:50 -07:00
net: switchdev: Remove bridge bypass support from switchdev
2017-08-07 14:48:48 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-09-01 17:42:05 -07:00
tls: kernel TLS support
2017-06-15 12:12:40 -04:00
net: define the TSO header size in net/tso.h
2017-08-23 20:42:09 -07:00
vxlan: factor out VXLAN-GPE next protocol
2017-08-29 15:16:52 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-09-01 17:42:05 -07:00
net: add infrastructure to un-offload UDP tunnel port
2017-07-24 13:52:59 -07:00
udp: use a separate rx queue for packet reception
2017-05-16 15:41:29 -04:00
vxlan: factor out VXLAN-GPE next protocol
2017-08-29 15:16:52 -07:00
dev_ioctl: copy only the smaller struct iwreq for wext
2017-06-14 13:52:44 +02:00
net, x25: convert x25_neigh.refcnt from atomic_t to refcount_t
2017-07-04 22:35:18 +01:00
xfrm: Add support for network devices capable of removing the ESP trailer
2017-08-31 09:04:03 +02:00
1080746110