git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid
[sfrench/cifs-2.6.git]
/
include
/
linux
/
netfilter
/
nf_conntrack_tcp.h
diff --git
a/include/linux/netfilter/nf_conntrack_tcp.h
b/include/linux/netfilter/nf_conntrack_tcp.h
index 6b01ba297727099dc11bc4f91bea4e5899cf44b2..2f4e98b90cc0d0849f9bf2489cc5ddd183a3fa58 100644
(file)
--- a/
include/linux/netfilter/nf_conntrack_tcp.h
+++ b/
include/linux/netfilter/nf_conntrack_tcp.h
@@
-25,7
+25,7
@@
enum tcp_conntrack {
#define IP_CT_TCP_FLAG_SACK_PERM 0x02
/* This sender sent FIN first */
-#define IP_CT_TCP_FLAG_CLOSE_INIT 0x0
3
+#define IP_CT_TCP_FLAG_CLOSE_INIT 0x0
4
#ifdef __KERNEL__