Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 855304af authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NETFILTER]: ipt_recent: fix sparse warnings 



net/ipv4/netfilter/ipt_recent.c:215:17: warning: symbol 't' shadows an earlier one
net/ipv4/netfilter/ipt_recent.c:179:22: originally declared here
net/ipv4/netfilter/ipt_recent.c:322:13: warning: context imbalance in 'recent_seq_start' - wrong count at exit
net/ipv4/netfilter/ipt_recent.c:354:13: warning: context imbalance in 'recent_seq_stop' - unexpected unlock

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dc64d02b

net/ipv4/netfilter/ipt_recent.c

+4 −2
Original line number Diff line number Diff line
@@ -212,11 +212,11 @@ recent_mt(const struct sk_buff *skb, const struct net_device *in, 
		recent_entry_remove(t, e);

		ret = !ret;

	} else if (info->check_set & (IPT_RECENT_CHECK | IPT_RECENT_UPDATE)) {

		unsigned long t = jiffies - info->seconds * HZ;

		unsigned long time = jiffies - info->seconds * HZ;

		unsigned int i, hits = 0;



		for (i = 0; i < e->nstamps; i++) {

			if (info->seconds && time_after(t, e->stamps[i]))

			if (info->seconds && time_after(time, e->stamps[i]))

				continue;

			if (++hits >= info->hit_count) {

				ret = !ret;
@@ -320,6 +320,7 @@ struct recent_iter_state { 
};



static void *recent_seq_start(struct seq_file *seq, loff_t *pos)

	__acquires(recent_lock)

{

	struct recent_iter_state *st = seq->private;

	const struct recent_table *t = st->table;
@@ -352,6 +353,7 @@ static void *recent_seq_next(struct seq_file *seq, void *v, loff_t *pos) 
}



static void recent_seq_stop(struct seq_file *s, void *v)

	__releases(recent_lock)

{

	spin_unlock_bh(&recent_lock);

}