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

Browse source

* 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

...

This commit is contained in:

Linus Torvalds 2007-01-10 08:30:22 -08:00

parent b3277dfaf0 483479ecc5

commit 8edf51a5ee

8 changed files with 11 additions and 7 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

include/linux/netfilter/nf_conntrack_tcp.h

View file

1

include/linux/netfilter_arp/arp_tables.h

View file

2

net/ipv4/af_inet.c

View file

3

net/ipv4/devinet.c

View file

2

net/ipv4/netfilter/nf_nat_standalone.c

View file

2

net/ipv6/af_inet6.c

View file

2

net/ipv6/netfilter/nf_conntrack_reasm.c

View file

4

net/sctp/sm_make_chunk.c

View file