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

Commit 8edf51a5 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:
  [IPV4] devinet: inetdev_init out label moved after RCU assignment
  [INET]: style updates for the inet_sock->is_icsk assignment fix
  [SCTP]: Fix err_hdr assignment in sctp_init_cause.
  [NETFILTER]: tcp conntrack: fix IP_CT_TCP_FLAG_CLOSE_INIT value
  [NETFILTER]: nf_nat: fix hanging connections when loading the NAT module
  [NETFILTER]: arp_tables: fix userspace compilation
  [NETFILTER]: nf_conntrack_ipv6: fix crash when handling fragments
parents b3277dfa 483479ec

include/linux/netfilter/nf_conntrack_tcp.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ enum tcp_conntrack { 
#define IP_CT_TCP_FLAG_SACK_PERM		0x02



/* This sender sent FIN first */

#define IP_CT_TCP_FLAG_CLOSE_INIT		0x03

#define IP_CT_TCP_FLAG_CLOSE_INIT		0x04



#ifdef __KERNEL__

include/linux/netfilter_arp/arp_tables.h

+1 −0
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ struct arpt_replace 


/* The argument to ARPT_SO_ADD_COUNTERS. */

#define arpt_counters_info xt_counters_info

#define arpt_counters xt_counters



/* The argument to ARPT_SO_GET_ENTRIES. */

struct arpt_get_entries

net/ipv4/af_inet.c

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ static int inet_create(struct socket *sock, int protocol) 
		sk->sk_reuse = 1;



	inet = inet_sk(sk);

	inet->is_icsk = (INET_PROTOSW_ICSK & answer_flags) == INET_PROTOSW_ICSK;

	inet->is_icsk = (INET_PROTOSW_ICSK & answer_flags) != 0;



	if (SOCK_RAW == sock->type) {

		inet->num = protocol;

net/ipv4/devinet.c

+2 −1
Original line number Diff line number Diff line
@@ -174,9 +174,10 @@ struct in_device *inetdev_init(struct net_device *dev) 
	ip_mc_init_dev(in_dev);

	if (dev->flags & IFF_UP)

		ip_mc_up(in_dev);

out:



	/* we can receive as soon as ip_ptr is set -- do this last */

	rcu_assign_pointer(dev->ip_ptr, in_dev);

out:

	return in_dev;

out_kfree:

	kfree(in_dev);

net/ipv4/netfilter/nf_nat_standalone.c

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ nf_nat_fn(unsigned int hooknum, 


	nat = nfct_nat(ct);

	if (!nat)

		return NF_DROP;

		return NF_ACCEPT;



	switch (ctinfo) {

	case IP_CT_RELATED: