torvalds/linux
3
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-03-31 11:47:42 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
1702ad79d31ef236adcd9999fae7617e8eda515d
linux/net
History
Florian Westphal 1702ad79d3 netfilter: conntrack: proc: rename stat column 
Rename 'searched' column to 'clashres' (same len).

conntrack(8) using the old /proc interface (ctnetlink not available) shows:

cpu=0  entries=4784 clashres=2292 [..]

Another alternative is to add another column, but this increases the
number of always-0 columns.

Fixes: bc92470413 ("netfilter: conntrack: add clash resolution stat counter")
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
2020-09-22 01:33:35 +02:00
..
6lowpan
treewide: replace '---help---' in Kconfig files with 'help'
2020-06-14 01:57:21 +09:00
9p
treewide: Use fallthrough pseudo-keyword
2020-08-23 17:36:59 -05:00
802
…
8021q
treewide: Use fallthrough pseudo-keyword
2020-08-23 17:36:59 -05:00
appletalk
appletalk: Fix atalk_proc_init() return path
2020-08-03 15:48:32 -07:00
atm
net: atm: delete duplicated words
2020-09-18 14:12:43 -07:00
ax25
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2020-07-25 17:49:04 -07:00
batman-adv
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2020-09-04 21:28:59 -07:00
bluetooth
net: bluetooth: delete duplicated words
2020-09-18 14:12:43 -07:00
bpf
treewide: Use fallthrough pseudo-keyword
2020-08-23 17:36:59 -05:00
bpfilter
bpf: Add kernel module with user mode driver that populates bpffs.
2020-08-20 16:02:36 +02:00
bridge
net: bridge: delete duplicated words
2020-09-18 14:12:43 -07:00
caif
caif: Remove duplicate macro SRVL_CTRL_PKT_SIZE
2020-09-05 15:57:05 -07:00
can
can: remove "WITH Linux-syscall-note" from SPDX tag of C files
2020-09-21 10:13:16 +02:00
ceph
treewide: Use fallthrough pseudo-keyword
2020-08-23 17:36:59 -05:00
core
net-sysfs: add backlog len and CPU id to softnet data
2020-09-21 13:56:37 -07:00
dcb
dcb_doit: remove redundant skb check
2020-06-23 20:27:09 -07:00
dccp
ip: pass tos into ip_build_and_send_pkt()
2020-09-10 13:15:40 -07:00
decnet
treewide: Use fallthrough pseudo-keyword
2020-08-23 17:36:59 -05:00
dns_resolver
…
dsa
net: dsa: tag_sja1105: add compatibility with hwaccel VLAN tags
2020-09-20 19:01:34 -07:00
ethernet
…
ethtool
ethtool: Add 100base-FX link mode entries
2020-09-19 16:54:35 -07:00
hsr
net: hsr: Convert to DEFINE_SHOW_ATTRIBUTE
2020-09-17 17:05:10 -07:00
ieee802154
treewide: Use fallthrough pseudo-keyword
2020-08-23 17:36:59 -05:00
ife
…
ipv4
nexthop: Only emit a notification when nexthop is actually deleted
2020-09-15 16:31:25 -07:00
ipv6
net: ipv6: delete duplicated words
2020-09-18 14:12:43 -07:00
iucv
treewide: Use fallthrough pseudo-keyword
2020-08-23 17:36:59 -05:00
kcm
net: pass a sockptr_t into ->setsockopt
2020-07-24 15:41:54 -07:00
key
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2020-08-02 01:02:12 -07:00
l2tp
l2tp: fix up inconsistent rx/tx statistics
2020-09-18 14:36:54 -07:00
l3mdev
net: Fix some comments
2020-08-27 07:55:59 -07:00
lapb
treewide: replace '---help---' in Kconfig files with 'help'
2020-06-14 01:57:21 +09:00
llc
net: pass a sockptr_t into ->setsockopt
2020-07-24 15:41:54 -07:00
mac80211
mac80211: Unsolicited broadcast probe response support
2020-09-18 14:06:20 +02:00
mac802154
mm, treewide: rename kzfree() to kfree_sensitive()
2020-08-07 11:33:22 -07:00
mpls
treewide: Use fallthrough pseudo-keyword
2020-08-23 17:36:59 -05:00
mptcp
mptcp: fix integer overflow in mptcp_subflow_discard_data()
2020-09-17 18:04:48 -07:00
ncsi
treewide: Use fallthrough pseudo-keyword
2020-08-23 17:36:59 -05:00
netfilter
netfilter: conntrack: proc: rename stat column
2020-09-22 01:33:35 +02:00
netlabel
netlabel: Fix some kernel-doc warnings
2020-09-08 20:04:27 -07:00
netlink
netlink: add spaces around '&' in netlink_recv/sendmsg()
2020-09-17 16:53:47 -07:00
netrom
treewide: Use fallthrough pseudo-keyword
2020-08-23 17:36:59 -05:00
nfc
NFC: digital: Remove two unused macroes
2020-09-05 16:01:52 -07:00
nsh
treewide: replace '---help---' in Kconfig files with 'help'
2020-06-14 01:57:21 +09:00
openvswitch
net: openswitch: reuse the helper variable to improve the code readablity
2020-09-18 14:24:08 -07:00
packet
net/packet: Fix a comment about network_header
2020-09-19 16:40:48 -07:00
phonet
treewide: Use fallthrough pseudo-keyword
2020-08-23 17:36:59 -05:00
psample
…
qrtr
net: qrtr: fix usage of idr in port assignment to socket
2020-08-17 15:00:41 -07:00
rds
RDS: drop double zeroing
2020-09-20 19:09:11 -07:00
rfkill
…
rose
treewide: Use fallthrough pseudo-keyword
2020-08-23 17:36:59 -05:00
rxrpc
rxrpc: Fix an overget of the conn bundle when setting up a client conn
2020-09-14 16:18:59 +01:00
sched
net: sched: skip an unnecessay check
2020-09-08 19:34:36 -07:00
sctp
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2020-09-04 21:28:59 -07:00
smc
net/smc: fix double kfree in smc_listen_work()
2020-09-17 18:03:56 -07:00
strparser
…
sunrpc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2020-09-04 21:28:59 -07:00
switchdev
net: switchdev: kerneldoc fixes
2020-07-13 17:20:40 -07:00
tipc
net: tipc: Supply missing udp_media.h include file
2020-09-18 14:56:44 -07:00
tls
net/tls: Implement getsockopt SOL_TLS TLS_RX
2020-09-01 11:47:12 -07:00
unix
net: unix: remove redundant assignment to variable 'err'
2020-09-21 14:51:37 -07:00
vmw_vsock
vsock: fix potential null pointer dereference in vsock_poll()
2020-08-12 12:56:06 -07:00
wimax
…
wireless
nl80211: Unsolicited broadcast probe response support
2020-09-18 14:06:20 +02:00
x25
treewide: Use fallthrough pseudo-keyword
2020-08-23 17:36:59 -05:00
xdp
xsk: Add shared umem support between devices
2020-08-31 21:15:04 +02:00
xfrm
treewide: Use fallthrough pseudo-keyword
2020-08-23 17:36:59 -05:00
compat.c
net/scm: Fix typo in SCM_RIGHTS compat refactoring
2020-08-07 12:43:25 -07:00
devres.c
net: devres: rename the release callback of devm_register_netdev()
2020-06-30 15:57:34 -07:00
Kconfig
net: ethtool: Remove PHYLIB direct dependency
2020-07-07 15:41:05 -07:00
Makefile
…
socket.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2020-09-04 21:28:59 -07:00
sysctl_net.c
…