Commit 660ca531 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [TCP]: H-TCP maxRTT estimation at startup
  [NETFILTER]: nf_nat: add symbolic dependency on IPv4 conntrack
  [NETFILTER]: ctnetlink: return EEXIST instead of EINVAL for existing nat'ed conntracks
  [NETFILTER]: ipt_recent: avoid a possible NULL pointer deref in recent_seq_open()
  [NET] net/core/utils: fix sparse warning
  [NetLabel]: add missing rcu_dereference() calls in the LSM domain mapping hash table
  [PATCH] mac80211: don't allow scanning in monitor mode
  [PATCH] mac80211: Fix sparse error for sta_last_seq_ctrl_read
  [PATCH] mac80211: use do { } while (0) for multi-line macros
  [PATCH] mac80211: missing dev_put in ieee80211_master_start_xmit
parents e7bc15a9 f34d1955

include/net/netfilter/ipv4/nf_conntrack_ipv4.h

+2 −0
Original line number Diff line number Diff line
@@ -21,4 +21,6 @@ extern struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp; 
extern int nf_conntrack_ipv4_compat_init(void);

extern void nf_conntrack_ipv4_compat_fini(void);



extern void need_ipv4_conntrack(void);



#endif /*_NF_CONNTRACK_IPV4_H*/

net/core/utils.c

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/random.h>

#include <linux/percpu.h>

#include <linux/init.h>

#include <net/sock.h>



#include <asm/byteorder.h>

#include <asm/system.h>

net/ipv4/netfilter/ipt_recent.c

+6 −1
Original line number Diff line number Diff line
@@ -387,12 +387,17 @@ static int recent_seq_open(struct inode *inode, struct file *file) 
	st = kzalloc(sizeof(*st), GFP_KERNEL);

	if (st == NULL)

		return -ENOMEM;



	ret = seq_open(file, &recent_seq_ops);

	if (ret)

	if (ret) {

		kfree(st);

		goto out;

	}



	st->table    = pde->data;

	seq          = file->private_data;

	seq->private = st;

out:

	return ret;

}

net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c

+6 −0
Original line number Diff line number Diff line
@@ -509,3 +509,9 @@ static void __exit nf_conntrack_l3proto_ipv4_fini(void) 


module_init(nf_conntrack_l3proto_ipv4_init);

module_exit(nf_conntrack_l3proto_ipv4_fini);



void need_ipv4_conntrack(void)

{

	return;

}

EXPORT_SYMBOL_GPL(need_ipv4_conntrack);

net/ipv4/netfilter/nf_nat_standalone.c

+1 −1
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ static int __init nf_nat_standalone_init(void) 
{

	int ret = 0;



	need_conntrack();

	need_ipv4_conntrack();



#ifdef CONFIG_XFRM

	BUG_ON(ip_nat_decode_session != NULL);

CRA Git | Maintained and supported by SUSTech CRA and CCSE