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

Commit 58bf2dbc authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'pablo/nf-2.6-updates' of git://1984.lsi.us.es/net-2.6

parents 86e4ca66 c74c0bfe

include/linux/netfilter/ipset/ip_set_ahash.h

+2 −2
Original line number Diff line number Diff line
@@ -839,7 +839,7 @@ type_pf_tdel(struct ip_set *set, void *value, u32 timeout) 
	struct htable *t = h->table;

	const struct type_pf_elem *d = value;

	struct hbucket *n;

	int i, ret = 0;

	int i;

	struct type_pf_elem *data;

	u32 key;
@@ -850,7 +850,7 @@ type_pf_tdel(struct ip_set *set, void *value, u32 timeout) 
		if (!type_pf_data_equal(data, d))

			continue;

		if (type_pf_data_expired(data))

			ret = -IPSET_ERR_EXIST;

			return -IPSET_ERR_EXIST;

		if (i != n->pos - 1)

			/* Not last one */

			type_pf_data_copy(data, ahash_tdata(n, n->pos - 1));

include/linux/netfilter/ipset/ip_set_timeout.h

+10 −8
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ ip_set_timeout_test(unsigned long timeout) 
{

	return timeout != IPSET_ELEM_UNSET &&

	       (timeout == IPSET_ELEM_PERMANENT ||

		time_after(timeout, jiffies));

		time_is_after_jiffies(timeout));

}



static inline bool
@@ -53,7 +53,7 @@ ip_set_timeout_expired(unsigned long timeout) 
{

	return timeout != IPSET_ELEM_UNSET &&

	       timeout != IPSET_ELEM_PERMANENT &&

	       time_before(timeout, jiffies);

	       time_is_before_jiffies(timeout);

}



static inline unsigned long
@@ -64,7 +64,7 @@ ip_set_timeout_set(u32 timeout) 
	if (!timeout)

		return IPSET_ELEM_PERMANENT;



	t = timeout * HZ + jiffies;

	t = msecs_to_jiffies(timeout * 1000) + jiffies;

	if (t == IPSET_ELEM_UNSET || t == IPSET_ELEM_PERMANENT)

		/* Bingo! */

		t++;
@@ -75,7 +75,8 @@ ip_set_timeout_set(u32 timeout) 
static inline u32

ip_set_timeout_get(unsigned long timeout)

{

	return timeout == IPSET_ELEM_PERMANENT ? 0 : (timeout - jiffies)/HZ;

	return timeout == IPSET_ELEM_PERMANENT ? 0 : 

		jiffies_to_msecs(timeout - jiffies)/1000;

}



#else
@@ -89,14 +90,14 @@ static inline bool 
ip_set_timeout_test(unsigned long timeout)

{

	return timeout == IPSET_ELEM_PERMANENT ||

	       time_after(timeout, jiffies);

	       time_is_after_jiffies(timeout);

}



static inline bool

ip_set_timeout_expired(unsigned long timeout)

{

	return timeout != IPSET_ELEM_PERMANENT &&

	       time_before(timeout, jiffies);

	       time_is_before_jiffies(timeout);

}



static inline unsigned long
@@ -107,7 +108,7 @@ ip_set_timeout_set(u32 timeout) 
	if (!timeout)

		return IPSET_ELEM_PERMANENT;



	t = timeout * HZ + jiffies;

	t = msecs_to_jiffies(timeout * 1000) + jiffies;

	if (t == IPSET_ELEM_PERMANENT)

		/* Bingo! :-) */

		t++;
@@ -118,7 +119,8 @@ ip_set_timeout_set(u32 timeout) 
static inline u32

ip_set_timeout_get(unsigned long timeout)

{

	return timeout == IPSET_ELEM_PERMANENT ? 0 : (timeout - jiffies)/HZ;

	return timeout == IPSET_ELEM_PERMANENT ? 0 :

		jiffies_to_msecs(timeout - jiffies)/1000;

}

#endif /* ! IP_SET_BITMAP_TIMEOUT */

include/net/ip_vs.h

+2 −1
Original line number Diff line number Diff line
@@ -797,7 +797,8 @@ struct netns_ipvs { 
	struct list_head	rs_table[IP_VS_RTAB_SIZE];

	/* ip_vs_app */

	struct list_head	app_list;



	/* ip_vs_ftp */

	struct ip_vs_app	*ftp_app;

	/* ip_vs_proto */

	#define IP_VS_PROTO_TAB_SIZE	32	/* must be power of 2 */

	struct ip_vs_proto_data *proto_data_table[IP_VS_PROTO_TAB_SIZE];

net/bridge/netfilter/ebtables.c

+4 −2
Original line number Diff line number Diff line
@@ -1883,14 +1883,13 @@ static int compat_mtw_from_user(struct compat_ebt_entry_mwt *mwt, 
	struct xt_target *wt;

	void *dst = NULL;

	int off, pad = 0;

	unsigned int size_kern, entry_offset, match_size = mwt->match_size;

	unsigned int size_kern, match_size = mwt->match_size;



	strlcpy(name, mwt->u.name, sizeof(name));



	if (state->buf_kern_start)

		dst = state->buf_kern_start + state->buf_kern_offset;



	entry_offset = (unsigned char *) mwt - base;

	switch (compat_mwt) {

	case EBT_COMPAT_MATCH:

		match = try_then_request_module(xt_find_match(NFPROTO_BRIDGE,
@@ -1933,6 +1932,9 @@ static int compat_mtw_from_user(struct compat_ebt_entry_mwt *mwt, 
		size_kern = wt->targetsize;

		module_put(wt->me);

		break;



	default:

		return -EINVAL;

	}



	state->buf_kern_offset += match_size + off;

net/netfilter/ipset/ip_set_core.c

+1 −1
Original line number Diff line number Diff line
@@ -815,7 +815,7 @@ ip_set_flush(struct sock *ctnl, struct sk_buff *skb, 
	ip_set_id_t i;



	if (unlikely(protocol_failed(attr)))

		return -EPROTO;

		return -IPSET_ERR_PROTOCOL;



	if (!attr[IPSET_ATTR_SETNAME]) {

		for (i = 0; i < ip_set_max; i++)