Florian Westphal df4a902509 netfilter: nf_conncount: merge lookup and add functions ... 'lookup' is always followed by 'add'. Merge both and make the list-walk part of nf_conncount_add(). This also avoids one unneeded unlock/re-lock pair. Extra care needs to be taken in count_tree, as we only hold rcu read lock, i.e. we can only insert to an existing tree node after acquiring its lock and making sure it has a nonzero count. As a zero count should be rare, just fall back to insert_tree() (which acquires tree lock). This issue and its solution were pointed out by Shawn Bohrer during patch review. Reviewed-by: Shawn Bohrer <sbohrer@cloudflare.com> Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>		2018-12-29 02:45:20 +01:00
..
6lowpan	6lowpan: convert to DEFINE_SHOW_ATTRIBUTE	2018-12-19 00:28:05 +01:00
9p	Merge branch 'work.afs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2018-11-03 10:35:52 -07:00
802
8021q	net: core: dev: Add extack argument to dev_change_flags()	2018-12-06 13:26:07 -08:00
appletalk
atm	Revert "net: simplify sock_poll_wait"	2018-10-23 10:57:06 -07:00
ax25
batman-adv	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-11-19 10:55:00 -08:00
bluetooth	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2018-12-27 13:53:32 -08:00
bpf	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next	2018-12-10 18:00:43 -08:00
bpfilter	net: bpfilter: Set user mode helper's command line	2018-10-22 19:37:36 -07:00
bridge	net: convert bridge_nf to use skb extension infrastructure	2018-12-19 11:21:37 -08:00
caif	Revert "net: simplify sock_poll_wait"	2018-10-23 10:57:06 -07:00
can	net: Revert recent Spectre-v1 patches.	2018-12-23 16:01:35 -08:00
ceph	libceph: fall back to sendmsg for slab pages	2018-11-19 17:59:47 +01:00
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2018-12-27 13:04:52 -08:00
dcb
dccp	net: dccp: fix kernel crash on module load	2018-12-24 15:27:56 -08:00
decnet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2018-12-27 13:04:52 -08:00
dns_resolver	dns: Allow the dns resolver to retrieve a server set	2018-10-04 09:40:52 -07:00
dsa	net: dsa: ksz: Add STP multicast handling	2018-12-16 14:23:33 -08:00
ethernet	net: ethernet: provide nvmem_get_mac_address()	2018-12-03 15:40:30 -08:00
hsr
ieee802154	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-12-24 16:19:56 -08:00
ife
ipv4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-12-24 16:19:56 -08:00
ipv6	ipv6/route: Add a missing check on proc_dointvec	2018-12-27 16:18:03 -08:00
iucv	iucv: Remove SKB list assumptions.	2018-11-10 16:55:11 -08:00
kcm	Revert "kcm: remove any offset before parsing messages"	2018-09-17 18:43:42 -07:00
key	af_key: fix indentation on declaration statement	2018-11-15 18:09:32 +01:00
l2tp	ppp: Move PFC decompression to PPP generic layer	2018-12-20 16:49:30 -08:00
l3mdev	l3mdev: add function to retreive upper master	2018-12-03 14:15:26 -08:00
lapb
llc	llc: do not use sk_eat_skb()	2018-10-22 19:59:20 -07:00
mac80211	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2018-12-27 13:53:32 -08:00
mac802154	mac802154: Remove VLA usage of skcipher	2018-09-28 12:46:07 +08:00
mpls	net/mpls: Handle kernel side filtering of route dumps	2018-10-16 00:14:07 -07:00
ncsi	net/ncsi: Add NCSI Mellanox OEM command	2018-11-27 16:37:20 -08:00
netfilter	netfilter: nf_conncount: merge lookup and add functions	2018-12-29 02:45:20 +01:00
netlabel	netlabel: check for IPV4MASK in addrinfo_get	2018-09-21 18:58:34 -07:00
netlink	net: netlink: rename NETLINK_DUMP_STRICT_CHK -> NETLINK_GET_STRICT_CHK	2018-12-14 11:44:31 -08:00
netrom
nfc	net: Revert recent Spectre-v1 patches.	2018-12-23 16:01:35 -08:00
nsh
openvswitch	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-12-09 21:43:31 -08:00
packet	packet: validate address length if non-zero	2018-12-22 15:12:04 -08:00
phonet	net: Revert recent Spectre-v1 patches.	2018-12-23 16:01:35 -08:00
psample
qrtr
rds	rds: Fix warning.	2018-12-19 20:53:18 -08:00
rfkill	rfkill: gpio: Remove unused include	2018-12-18 13:13:56 +01:00
rose
rxrpc	rxrpc: Fix life check	2018-11-15 11:35:40 -08:00
sched	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2018-12-27 13:04:52 -08:00
sctp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-12-20 11:53:36 -08:00
smc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-12-20 11:53:36 -08:00
strparser	bpf, sockmap: convert to generic sk_msg interface	2018-10-15 12:23:19 -07:00
sunrpc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-12-20 11:53:36 -08:00
switchdev	net: switchdev: Add extack to switchdev_handle_port_obj_add() callback	2018-12-12 16:34:22 -08:00
tipc	tipc: fix a missing check of genlmsg_put	2018-12-27 16:26:09 -08:00
tls	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-12-21 15:06:20 -08:00
unix	Revert "net: simplify sock_poll_wait"	2018-10-23 10:57:06 -07:00
vmw_vsock	VSOCK: Send reset control packet when socket is partially bound	2018-12-18 11:53:42 -08:00
wimax
wireless	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2018-12-27 13:53:32 -08:00
x25	net/x25: handle call collisions	2018-11-29 14:25:36 -08:00
xdp	xsk: simplify AF_XDP socket teardown	2018-12-19 21:45:17 +01:00
xfrm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-12-20 11:53:36 -08:00
compat.c
Kconfig	net: convert bridge_nf to use skb extension infrastructure	2018-12-19 11:21:37 -08:00
Makefile
socket.c	socket: do a generic_file_splice_read when proto_ops has no splice_read	2018-11-17 21:34:11 -08:00
sysctl_net.c