lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Conflicts:

	net/mac80211/tx.c
This commit is contained in:
David S. Miller
2008-06-19 16:00:04 -07:00
parent dad9b335c6 ef3a62d272
commit 0344f1c66b
20 changed files with 311 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/netfilter/nf_conntrack_extend.h
View File

@@ -15,6 +15,7 @@ enum nf_ct_ext_id
/* Extensions: optional stuff which isn't permanently in struct. */
struct nf_ct_ext {
struct rcu_head rcu;
u8 offset[NF_CT_EXT_NUM];
u8 len;
char data[0];