tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  netfilter: replace old NF_ARP calls with NFPROTO_ARP
  netfilter: fix compilation error with NAT=n
  netfilter: xt_recent: use proc_create_data()
  netfilter: snmp nat leaks memory in case of failure
  netfilter: xt_iprange: fix range inversion match
  netfilter: netns: use NFPROTO_NUMPROTO instead of NUMPROTO for tables array
  netfilter: ctnetlink: remove obsolete NAT dependency from Kconfig
  pkt_sched: sch_generic: Fix oops in sch_teql
  dccp: Port redirection support for DCCP
  tcp: Fix IPv6 fallout from 'Port redirection support for TCP'
  netdev: change name dropping error codes
  ipvs: Update CONFIG_IP_VS_IPV6 description and help text
This commit is contained in:
Linus Torvalds
2008-10-20 09:06:35 -07:00
parent 2be508d847 fdc9314cbe
commit 5fdf11283e
17 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/net/netns/x_tables.h
+2 -2
View File
@@ -2,9 +2,9 @@
#define __NETNS_X_TABLES_H
#include <linux/list.h>
#include <linux/net.h>
#include <linux/netfilter.h>
struct netns_xt {
struct list_head tables[NPROTO];
struct list_head tables[NFPROTO_NUMPROTO];
};
#endif