diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-05-30 23:59:19 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-30 23:59:19 -0400 |
| commit | 8fa76f7e61ef4e5bc97207143ea4e198b22487bc (patch) | |
| tree | 266c42b6687e68e4febb72d8c031e5facd899a1c /include/net/ip.h | |
| parent | a41a7b91772da2c77ac0da74285fd8ebd86a85ba (diff) | |
| parent | 67a3e12b05e055c0415c556a315a3d3eb637e29e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/net/ip.h')
| -rw-r--r-- | include/net/ip.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/ip.h b/include/net/ip.h index 63548f0a44b1..452f229c380a 100644 --- a/include/net/ip.h +++ b/include/net/ip.h | |||
| @@ -358,11 +358,11 @@ enum ip_defrag_users { | |||
| 358 | IP_DEFRAG_LOCAL_DELIVER, | 358 | IP_DEFRAG_LOCAL_DELIVER, |
| 359 | IP_DEFRAG_CALL_RA_CHAIN, | 359 | IP_DEFRAG_CALL_RA_CHAIN, |
| 360 | IP_DEFRAG_CONNTRACK_IN, | 360 | IP_DEFRAG_CONNTRACK_IN, |
| 361 | __IP_DEFRAG_CONNTRACK_IN_END = IP_DEFRAG_CONNTRACK_IN + USHORT_MAX, | 361 | __IP_DEFRAG_CONNTRACK_IN_END = IP_DEFRAG_CONNTRACK_IN + USHRT_MAX, |
| 362 | IP_DEFRAG_CONNTRACK_OUT, | 362 | IP_DEFRAG_CONNTRACK_OUT, |
| 363 | __IP_DEFRAG_CONNTRACK_OUT_END = IP_DEFRAG_CONNTRACK_OUT + USHORT_MAX, | 363 | __IP_DEFRAG_CONNTRACK_OUT_END = IP_DEFRAG_CONNTRACK_OUT + USHRT_MAX, |
| 364 | IP_DEFRAG_CONNTRACK_BRIDGE_IN, | 364 | IP_DEFRAG_CONNTRACK_BRIDGE_IN, |
| 365 | __IP_DEFRAG_CONNTRACK_BRIDGE_IN = IP_DEFRAG_CONNTRACK_BRIDGE_IN + USHORT_MAX, | 365 | __IP_DEFRAG_CONNTRACK_BRIDGE_IN = IP_DEFRAG_CONNTRACK_BRIDGE_IN + USHRT_MAX, |
| 366 | IP_DEFRAG_VS_IN, | 366 | IP_DEFRAG_VS_IN, |
| 367 | IP_DEFRAG_VS_OUT, | 367 | IP_DEFRAG_VS_OUT, |
| 368 | IP_DEFRAG_VS_FWD | 368 | IP_DEFRAG_VS_FWD |