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

Commit 89697f1d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (25 commits)
  [XFRM]: Fix OOPSes in xfrm_audit_log().
  [TCP]: cleanup of htcp (resend)
  [TCP]: Use read mostly for CUBIC parameters.
  [NETFILTER]: nf_conntrack_tcp: make sysctl variables static
  [NETFILTER]: ip6t_mh: drop piggyback payload packet on MH packets
  [NETFILTER]: Fix whitespace errors
  [NETFILTER]: Kconfig: improve dependency handling
  [NETFILTER]: xt_mac/xt_CLASSIFY: use IPv6 hook names for IPv6 registration
  [NETFILTER]: nf_conntrack: change nf_conntrack_l[34]proto_unregister to void
  [NETFILTER]: nf_conntrack: properly use RCU for nf_conntrack_destroyed callback
  [NETFILTER]: ip_conntrack: properly use RCU for ip_conntrack_destroyed callback
  [NETFILTER]: nf_conntrack: fix invalid conntrack statistics RCU assumption
  [NETFILTER]: ip_conntrack: fix invalid conntrack statistics RCU assumption
  [NETFILTER]: nf_conntrack: properly use RCU API for nf_ct_protos/nf_ct_l3protos arrays
  [NETFILTER]: ip_conntrack: properly use RCU API for ip_ct_protos array
  [NETFILTER]: nf_nat: properly use RCU API for nf_nat_protos array
  [NETFILTER]: ip_nat: properly use RCU API for ip_nat_protos array
  [NETFILTER]: nf_log: minor cleanups
  [NETFILTER]: nf_log: switch logger registration/unregistration to mutex
  [NETFILTER]: nf_log: make nf_log_unregister_pf return void
  ...
parents fd19e44f 13fcfbb0

include/linux/netfilter.h

+2 −2
Original line number Diff line number Diff line
@@ -172,8 +172,8 @@ struct nf_logger { 


/* Function to register/unregister log function. */

int nf_log_register(int pf, struct nf_logger *logger);

int nf_log_unregister_pf(int pf);

void nf_log_unregister_logger(struct nf_logger *logger);

void nf_log_unregister(struct nf_logger *logger);

void nf_log_unregister_pf(int pf);



/* Calls the registered backend logging function */

void nf_log_packet(int pf,

include/linux/netfilter_ipv4/ip_conntrack.h

+6 −0
Original line number Diff line number Diff line
@@ -301,6 +301,12 @@ extern unsigned int ip_conntrack_htable_size; 
extern int ip_conntrack_checksum;

 

#define CONNTRACK_STAT_INC(count) (__get_cpu_var(ip_conntrack_stat).count++)

#define CONNTRACK_STAT_INC_ATOMIC(count)		\

do {							\

	local_bh_disable();				\

	__get_cpu_var(ip_conntrack_stat).count++;	\

	local_bh_enable();				\

} while (0)



#ifdef CONFIG_IP_NF_CONNTRACK_EVENTS

#include <linux/notifier.h>

include/net/netfilter/nf_conntrack.h

+6 −0
Original line number Diff line number Diff line
@@ -257,6 +257,12 @@ extern int nf_conntrack_max; 


DECLARE_PER_CPU(struct ip_conntrack_stat, nf_conntrack_stat);

#define NF_CT_STAT_INC(count) (__get_cpu_var(nf_conntrack_stat).count++)

#define NF_CT_STAT_INC_ATOMIC(count)			\

do {							\

	local_bh_disable();				\

	__get_cpu_var(nf_conntrack_stat).count++;	\

	local_bh_enable();				\

} while (0)



/* no helper, no nat */

#define	NF_CT_F_BASIC	0

include/net/netfilter/nf_conntrack_l3proto.h

+2 −2
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ extern struct nf_conntrack_l3proto *nf_ct_l3protos[AF_MAX]; 


/* Protocol registration. */

extern int nf_conntrack_l3proto_register(struct nf_conntrack_l3proto *proto);

extern int nf_conntrack_l3proto_unregister(struct nf_conntrack_l3proto *proto);

extern void nf_conntrack_l3proto_unregister(struct nf_conntrack_l3proto *proto);



extern struct nf_conntrack_l3proto *

nf_ct_l3proto_find_get(u_int16_t l3proto);
@@ -106,7 +106,7 @@ __nf_ct_l3proto_find(u_int16_t l3proto) 
{

	if (unlikely(l3proto >= AF_MAX))

		return &nf_conntrack_l3proto_generic;

	return nf_ct_l3protos[l3proto];

	return rcu_dereference(nf_ct_l3protos[l3proto]);

}



#endif /*_NF_CONNTRACK_L3PROTO_H*/

include/net/netfilter/nf_conntrack_l4proto.h

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ extern void nf_ct_l4proto_put(struct nf_conntrack_l4proto *p); 


/* Protocol registration. */

extern int nf_conntrack_l4proto_register(struct nf_conntrack_l4proto *proto);

extern int nf_conntrack_l4proto_unregister(struct nf_conntrack_l4proto *proto);

extern void nf_conntrack_l4proto_unregister(struct nf_conntrack_l4proto *proto);



/* Generic netlink helpers */

extern int nf_ct_port_tuple_to_nfattr(struct sk_buff *skb,