Merge branch '4.6.11'

This commit is contained in:
Tom Eastep 2015-07-12 15:12:07 -07:00
commit 30a5488a8a

View File

@ -1012,7 +1012,6 @@ show_command() {
case "$1" in
connections)
show_connections
if [ $g_family -eq 4 ]; then
if [ -d /proc/sys/net/netfilter/ ]; then
local count