diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-27 06:04:46 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-27 06:04:46 (GMT) |
| commit | c68cb23dde29fb107575656effa46f7b9440ac04 (patch) | |
| tree | 081c24059c57d8b6b4e6b6781f741878069e5edc /include | |
| parent | b50fd73b9d8ee1f999e8d625074872eb8fb88439 (diff) | |
| parent | a6c05c3d064dbb83be88cba3189beb5db9d2dfc3 (diff) | |
| download | linux-fsl-qoriq-c68cb23dde29fb107575656effa46f7b9440ac04.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
[IPV4]: Fix ip command line processing.
[VETH]: move veth.h to include/linux
[NET] tc_nat: header install
[TUNTAP]: Fix wrong debug message.
[NETFILTER]: nf_conntrack_ipv4: fix module parameter compatibility
mac80211: warn when receiving frames with unaligned data
mac80211: round station cleanup timer
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/Kbuild | 1 | ||||
| -rw-r--r-- | include/linux/tc_act/Kbuild | 1 | ||||
| -rw-r--r-- | include/linux/veth.h (renamed from include/net/veth.h) | 0 | ||||
| -rw-r--r-- | include/net/netfilter/nf_conntrack.h | 1 |
4 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index 9abf5a8..f30fa92 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild @@ -153,6 +153,7 @@ header-y += toshiba.h header-y += ultrasound.h header-y += un.h header-y += utime.h +header-y += veth.h header-y += video_decoder.h header-y += video_encoder.h header-y += videotext.h diff --git a/include/linux/tc_act/Kbuild b/include/linux/tc_act/Kbuild index 78dfbac..6dac0d7 100644 --- a/include/linux/tc_act/Kbuild +++ b/include/linux/tc_act/Kbuild @@ -2,3 +2,4 @@ header-y += tc_gact.h header-y += tc_ipt.h header-y += tc_mirred.h header-y += tc_pedit.h +header-y += tc_nat.h diff --git a/include/net/veth.h b/include/linux/veth.h index 3354c1e..3354c1e 100644 --- a/include/net/veth.h +++ b/include/linux/veth.h diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h index 90fb66d..4ac5ab1 100644 --- a/include/net/netfilter/nf_conntrack.h +++ b/include/net/netfilter/nf_conntrack.h @@ -249,6 +249,7 @@ static inline int nf_ct_is_untracked(const struct sk_buff *skb) return (skb->nfct == &nf_conntrack_untracked.ct_general); } +extern int nf_conntrack_set_hashsize(const char *val, struct kernel_param *kp); extern unsigned int nf_conntrack_htable_size; extern int nf_conntrack_checksum; extern atomic_t nf_conntrack_count; |