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

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

Merge branch 'master' of git://1984.lsi.us.es/nf-next 



Pablo Neira Ayuso says:

====================
The following patchset contains Netfilter/IPVS updates for
your net-next tree, they are:

* Better performance in nfnetlink_queue by avoiding copy from the
  packet to netlink message, from Eric Dumazet.

* Remove unnecessary locking in the exit path of ebt_ulog, from Gao Feng.

* Use new function ipv6_iface_scope_id in nf_ct_ipv6, from Hannes Frederic Sowa.

* A couple of sparse fixes for IPVS, from Julian Anastasov.

* Use xor hashing in nfnetlink_queue, as suggested by Eric Dumazet, from
  myself.

* Allow to dump expectations per master conntrack via ctnetlink, from myself.

* A couple of cleanups to use PTR_RET in module init path, from Silviu-Mihai
  Popescu.

* Remove nf_conntrack module a bit faster if netns are in use, from
  Vladimir Davydov.

* Use checksum_partial in ip6t_NPT, from YOSHIFUJI Hideaki.

* Sparse fix for nf_conntrack, from Stephen Hemminger.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f5a03cf4 dece40e8

include/net/ip_vs.h

+1 −1
Original line number Diff line number Diff line
@@ -459,7 +459,7 @@ struct ip_vs_estimator { 
struct ip_vs_stats {

	struct ip_vs_stats_user	ustats;		/* statistics */

	struct ip_vs_estimator	est;		/* estimator */

	struct ip_vs_cpu_stats	*cpustats;	/* per cpu counters */

	struct ip_vs_cpu_stats __percpu	*cpustats;	/* per cpu counters */

	spinlock_t		lock;		/* spin lock */

	struct ip_vs_stats_user	ustats0;	/* reset values */

};

include/net/netfilter/nf_conntrack_core.h

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ extern unsigned int nf_conntrack_in(struct net *net, 


extern int nf_conntrack_init_net(struct net *net);

extern void nf_conntrack_cleanup_net(struct net *net);

extern void nf_conntrack_cleanup_net_list(struct list_head *net_exit_list);



extern int nf_conntrack_proto_pernet_init(struct net *net);

extern void nf_conntrack_proto_pernet_fini(struct net *net);

net/bridge/netfilter/ebt_ulog.c

+1 −2
Original line number Diff line number Diff line
@@ -319,12 +319,11 @@ static void __exit ebt_ulog_fini(void) 
	for (i = 0; i < EBT_ULOG_MAXNLGROUPS; i++) {

		ub = &ulog_buffers[i];

		del_timer(&ub->timer);

		spin_lock_bh(&ub->lock);



		if (ub->skb) {

			kfree_skb(ub->skb);

			ub->skb = NULL;

		}

		spin_unlock_bh(&ub->lock);

	}

	netlink_kernel_release(ebtulognl);

}

net/bridge/netfilter/ebtable_broute.c

+1 −3
Original line number Diff line number Diff line
@@ -64,9 +64,7 @@ static int ebt_broute(struct sk_buff *skb) 
static int __net_init broute_net_init(struct net *net)

{

	net->xt.broute_table = ebt_register_table(net, &broute_table);

	if (IS_ERR(net->xt.broute_table))

		return PTR_ERR(net->xt.broute_table);

	return 0;

	return PTR_RET(net->xt.broute_table);

}



static void __net_exit broute_net_exit(struct net *net)

net/ipv4/netfilter/arptable_filter.c

+1 −3
Original line number Diff line number Diff line
@@ -48,9 +48,7 @@ static int __net_init arptable_filter_net_init(struct net *net) 
	net->ipv4.arptable_filter =

		arpt_register_table(net, &packet_filter, repl);

	kfree(repl);

	if (IS_ERR(net->ipv4.arptable_filter))

		return PTR_ERR(net->ipv4.arptable_filter);

	return 0;

	return PTR_RET(net->ipv4.arptable_filter);

}



static void __net_exit arptable_filter_net_exit(struct net *net)