git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'origin/master' into next
[pandora-kernel.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
b2f384d
..
4352fee
100644
(file)
--- a/
include/linux/netfilter/nf_conntrack_tcp.h
+++ b/
include/linux/netfilter/nf_conntrack_tcp.h
@@
-15,7
+15,8
@@
enum tcp_conntrack {
TCP_CONNTRACK_LAST_ACK,
TCP_CONNTRACK_TIME_WAIT,
TCP_CONNTRACK_CLOSE,
- TCP_CONNTRACK_LISTEN,
+ TCP_CONNTRACK_LISTEN, /* obsolete */
+#define TCP_CONNTRACK_SYN_SENT2 TCP_CONNTRACK_LISTEN
TCP_CONNTRACK_MAX,
TCP_CONNTRACK_IGNORE
};