git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
linux
/
netfilter
/
xt_conntrack.h
diff --git
a/include/linux/netfilter/xt_conntrack.h
b/include/linux/netfilter/xt_conntrack.h
index
34f63cf
..
4c2d994
100644
(file)
--- a/
include/linux/netfilter/xt_conntrack.h
+++ b/
include/linux/netfilter/xt_conntrack.h
@@
-42,7
+42,7
@@
struct ip_conntrack_old_tuple
} u;
/* The protocol. */
- u16 protonum;
+
__
u16 protonum;
} dst;
};