diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-16 00:08:53 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-16 00:08:53 -0500 |
| commit | 81e839efc22361e3fa7ee36f99fd57c57d0d1871 (patch) | |
| tree | eac3550c8773ff0e6ccb91c280b930efc50b0e42 /include/net/ip.h | |
| parent | bb5b7c11263dbbe78253cd05945a6bf8f55add8e (diff) | |
| parent | 258c889362aa95d0ab534b38ce8c15d3009705b1 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'include/net/ip.h')
| -rw-r--r-- | include/net/ip.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/ip.h b/include/net/ip.h index e6b9d12d5f62..85108cfbb1ae 100644 --- a/include/net/ip.h +++ b/include/net/ip.h | |||
| @@ -337,6 +337,7 @@ enum ip_defrag_users { | |||
| 337 | IP_DEFRAG_CALL_RA_CHAIN, | 337 | IP_DEFRAG_CALL_RA_CHAIN, |
| 338 | IP_DEFRAG_CONNTRACK_IN, | 338 | IP_DEFRAG_CONNTRACK_IN, |
| 339 | IP_DEFRAG_CONNTRACK_OUT, | 339 | IP_DEFRAG_CONNTRACK_OUT, |
| 340 | IP_DEFRAG_CONNTRACK_BRIDGE_IN, | ||
| 340 | IP_DEFRAG_VS_IN, | 341 | IP_DEFRAG_VS_IN, |
| 341 | IP_DEFRAG_VS_OUT, | 342 | IP_DEFRAG_VS_OUT, |
| 342 | IP_DEFRAG_VS_FWD | 343 | IP_DEFRAG_VS_FWD |