1 files changed, 5 insertions, 3 deletions

diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
index c10036e7a463..564230dabcb8 100644
--- a/net/ipv4/inet_diag.c
+++ b/net/ipv4/inet_diag.c
@@ -53,11 +53,9 @@ static DEFINE_MUTEX(inet_diag_table_mutex);
 
 static const struct inet_diag_handler *inet_diag_lock_handler(int type)
 {
-#ifdef CONFIG_KMOD
         if (!inet_diag_table[type])
                 request_module("net-pf-%d-proto-%d-type-%d", PF_NETLINK,
                                NETLINK_INET_DIAG, type);
-#endif
 
         mutex_lock(&inet_diag_table_mutex);
         if (!inet_diag_table[type])
@@ -782,11 +780,15 @@ skip_listen_ht:
                 struct sock *sk;
                 struct hlist_node *node;
 
+                num = 0;
+
+                if (hlist_empty(&head->chain) && hlist_empty(&head->twchain))
+                        continue;
+
                 if (i > s_i)
                         s_num = 0;
 
                 read_lock_bh(lock);
-                num = 0;
                 sk_for_each(sk, node, &head->chain) {
                         struct inet_sock *inet = inet_sk(sk);