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

Commit 9b461783 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://1984.lsi.us.es/net

parents cff4c162 44b52bcc

include/linux/netfilter/xt_set.h

+2 −2
Original line number Diff line number Diff line
@@ -58,8 +58,8 @@ struct xt_set_info_target_v1 { 
struct xt_set_info_target_v2 {

	struct xt_set_info add_set;

	struct xt_set_info del_set;

	u32 flags;

	u32 timeout;

	__u32 flags;

	__u32 timeout;

};



#endif /*_XT_SET_H*/

include/net/netfilter/xt_log.h

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static void sb_close(struct sbuff *m) 
	if (likely(m != &emergency))

		kfree(m);

	else {

		xchg(&emergency_ptr, m);

		emergency_ptr = m;

		local_bh_enable();

	}

}

net/netfilter/xt_CT.c

+2 −0
Original line number Diff line number Diff line
@@ -281,8 +281,10 @@ static int xt_ct_tg_check_v1(const struct xt_tgchk_param *par) 
	info->ct = ct;

	return 0;



#ifdef CONFIG_NF_CONNTRACK_TIMEOUT

err4:

	rcu_read_unlock();

#endif

err3:

	nf_conntrack_free(ct);

err2: