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

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

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

parents a5e5c374 70e9942f

include/net/netfilter/nf_conntrack_ecache.h

+10 −9
Original line number Diff line number Diff line
@@ -67,18 +67,18 @@ struct nf_ct_event_notifier { 
	int (*fcn)(unsigned int events, struct nf_ct_event *item);

};



extern struct nf_ct_event_notifier __rcu *nf_conntrack_event_cb;

extern int nf_conntrack_register_notifier(struct nf_ct_event_notifier *nb);

extern void nf_conntrack_unregister_notifier(struct nf_ct_event_notifier *nb);

extern int nf_conntrack_register_notifier(struct net *net, struct nf_ct_event_notifier *nb);

extern void nf_conntrack_unregister_notifier(struct net *net, struct nf_ct_event_notifier *nb);



extern void nf_ct_deliver_cached_events(struct nf_conn *ct);



static inline void

nf_conntrack_event_cache(enum ip_conntrack_events event, struct nf_conn *ct)

{

	struct net *net = nf_ct_net(ct);

	struct nf_conntrack_ecache *e;



	if (nf_conntrack_event_cb == NULL)

	if (net->ct.nf_conntrack_event_cb == NULL)

		return;



	e = nf_ct_ecache_find(ct);
@@ -95,11 +95,12 @@ nf_conntrack_eventmask_report(unsigned int eventmask, 
			      int report)

{

	int ret = 0;

	struct net *net = nf_ct_net(ct);

	struct nf_ct_event_notifier *notify;

	struct nf_conntrack_ecache *e;



	rcu_read_lock();

	notify = rcu_dereference(nf_conntrack_event_cb);

	notify = rcu_dereference(net->ct.nf_conntrack_event_cb);

	if (notify == NULL)

		goto out_unlock;
@@ -164,9 +165,8 @@ struct nf_exp_event_notifier { 
	int (*fcn)(unsigned int events, struct nf_exp_event *item);

};



extern struct nf_exp_event_notifier __rcu *nf_expect_event_cb;

extern int nf_ct_expect_register_notifier(struct nf_exp_event_notifier *nb);

extern void nf_ct_expect_unregister_notifier(struct nf_exp_event_notifier *nb);

extern int nf_ct_expect_register_notifier(struct net *net, struct nf_exp_event_notifier *nb);

extern void nf_ct_expect_unregister_notifier(struct net *net, struct nf_exp_event_notifier *nb);



static inline void

nf_ct_expect_event_report(enum ip_conntrack_expect_events event,
@@ -174,11 +174,12 @@ nf_ct_expect_event_report(enum ip_conntrack_expect_events event, 
			  u32 pid,

			  int report)

{

	struct net *net = nf_ct_exp_net(exp);

	struct nf_exp_event_notifier *notify;

	struct nf_conntrack_ecache *e;



	rcu_read_lock();

	notify = rcu_dereference(nf_expect_event_cb);

	notify = rcu_dereference(net->ct.nf_expect_event_cb);

	if (notify == NULL)

		goto out_unlock;

include/net/netns/conntrack.h

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ struct netns_ct { 
	struct hlist_nulls_head	unconfirmed;

	struct hlist_nulls_head	dying;

	struct ip_conntrack_stat __percpu *stat;

	struct nf_ct_event_notifier __rcu *nf_conntrack_event_cb;

	struct nf_exp_event_notifier __rcu *nf_expect_event_cb;

	int			sysctl_events;

	unsigned int		sysctl_events_retry_timeout;

	int			sysctl_acct;

net/ipv4/netfilter.c

+2 −1
Original line number Diff line number Diff line
@@ -64,7 +64,8 @@ int ip_route_me_harder(struct sk_buff *skb, unsigned addr_type) 
	/* Change in oif may mean change in hh_len. */

	hh_len = skb_dst(skb)->dev->hard_header_len;

	if (skb_headroom(skb) < hh_len &&

	    pskb_expand_head(skb, hh_len - skb_headroom(skb), 0, GFP_ATOMIC))

	    pskb_expand_head(skb, HH_DATA_ALIGN(hh_len - skb_headroom(skb)),

				0, GFP_ATOMIC))

		return -1;



	return 0;

net/netfilter/ipset/ip_set_hash_ipport.c

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ hash_ipport4_uadt(struct ip_set *set, struct nlattr *tb[], 
	const struct ip_set_hash *h = set->data;

	ipset_adtfn adtfn = set->variant->adt[adt];

	struct hash_ipport4_elem data = { };

	u32 ip, ip_to, p = 0, port, port_to;

	u32 ip, ip_to = 0, p = 0, port, port_to;

	u32 timeout = h->timeout;

	bool with_ports = false;

	int ret;

net/netfilter/ipset/ip_set_hash_ipportip.c

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ hash_ipportip4_uadt(struct ip_set *set, struct nlattr *tb[], 
	const struct ip_set_hash *h = set->data;

	ipset_adtfn adtfn = set->variant->adt[adt];

	struct hash_ipportip4_elem data = { };

	u32 ip, ip_to, p = 0, port, port_to;

	u32 ip, ip_to = 0, p = 0, port, port_to;

	u32 timeout = h->timeout;

	bool with_ports = false;

	int ret;