Merge remote-tracking branch 'asoc/topic/tlv320aic31xx' into asoc-next

[cascardo/linux.git] / net / netfilter / xt_hashlimit.c

diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c
index 05fbc2a..1786968 100644 (file)
--- a/net/netfilter/xt_hashlimit.c
+++ b/net/netfilter/xt_hashlimit.c
@@ -789,7 +789,6 @@ static void dl_seq_stop(struct seq_file *s, void *v)
 static int dl_seq_real_show(struct dsthash_ent *ent, u_int8_t family,
                                   struct seq_file *s)
 {
-       int res;
        const struct xt_hashlimit_htable *ht = s->private;
 
        spin_lock(&ent->lock);
@@ -798,33 +797,32 @@ static int dl_seq_real_show(struct dsthash_ent *ent, u_int8_t family,
 
        switch (family) {
        case NFPROTO_IPV4:
-               res = seq_printf(s, "%ld %pI4:%u->%pI4:%u %u %u %u\n",
-                                (long)(ent->expires - jiffies)/HZ,
-                                &ent->dst.ip.src,
-                                ntohs(ent->dst.src_port),
-                                &ent->dst.ip.dst,
-                                ntohs(ent->dst.dst_port),
-                                ent->rateinfo.credit, ent->rateinfo.credit_cap,
-                                ent->rateinfo.cost);
+               seq_printf(s, "%ld %pI4:%u->%pI4:%u %u %u %u\n",
+                          (long)(ent->expires - jiffies)/HZ,
+                          &ent->dst.ip.src,
+                          ntohs(ent->dst.src_port),
+                          &ent->dst.ip.dst,
+                          ntohs(ent->dst.dst_port),
+                          ent->rateinfo.credit, ent->rateinfo.credit_cap,
+                          ent->rateinfo.cost);
                break;
 #if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
        case NFPROTO_IPV6:
-               res = seq_printf(s, "%ld %pI6:%u->%pI6:%u %u %u %u\n",
-                                (long)(ent->expires - jiffies)/HZ,
-                                &ent->dst.ip6.src,
-                                ntohs(ent->dst.src_port),
-                                &ent->dst.ip6.dst,
-                                ntohs(ent->dst.dst_port),
-                                ent->rateinfo.credit, ent->rateinfo.credit_cap,
-                                ent->rateinfo.cost);
+               seq_printf(s, "%ld %pI6:%u->%pI6:%u %u %u %u\n",
+                          (long)(ent->expires - jiffies)/HZ,
+                          &ent->dst.ip6.src,
+                          ntohs(ent->dst.src_port),
+                          &ent->dst.ip6.dst,
+                          ntohs(ent->dst.dst_port),
+                          ent->rateinfo.credit, ent->rateinfo.credit_cap,
+                          ent->rateinfo.cost);
                break;
 #endif
        default:
                BUG();
-               res = 0;
        }
        spin_unlock(&ent->lock);
-       return res;
+       return seq_has_overflowed(s);
 }
 
 static int dl_seq_show(struct seq_file *s, void *v)