projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-33' of git://repo.or.cz/linux-kbuild
[linux-2.6-block.git]
/
include
/
net
/
ip.h
diff --git
a/include/net/ip.h
b/include/net/ip.h
index e6b9d12d5f620ba939a814c14d8c25ce53aed569..85108cfbb1ae85e09bc762f29665545d87b1a5db 100644
(file)
--- a/
include/net/ip.h
+++ b/
include/net/ip.h
@@
-337,6
+337,7
@@
enum ip_defrag_users {
IP_DEFRAG_CALL_RA_CHAIN,
IP_DEFRAG_CONNTRACK_IN,
IP_DEFRAG_CONNTRACK_OUT,
+ IP_DEFRAG_CONNTRACK_BRIDGE_IN,
IP_DEFRAG_VS_IN,
IP_DEFRAG_VS_OUT,
IP_DEFRAG_VS_FWD