diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-04-27 14:16:19 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-04-27 14:16:19 -0400 |
| commit | d1da4e50e5d09f02c340927a4fcb7f54202fa033 (patch) | |
| tree | 7f98317bdd45dbdb7644e9179891c5af6a3a8ef1 /include/linux/in.h | |
| parent | 78ab67da1002d954ea4c3e2b441e2483c41f94e8 (diff) | |
| parent | a205752d1ad2d37d6597aaae5a56fc396a770868 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/mtd/Kconfig
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include/linux/in.h')
| -rw-r--r-- | include/linux/in.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/in.h b/include/linux/in.h index 1912e7c0bc26..3975cbf52f20 100644 --- a/include/linux/in.h +++ b/include/linux/in.h | |||
| @@ -83,6 +83,7 @@ struct in_addr { | |||
| 83 | #define IP_PMTUDISC_DONT 0 /* Never send DF frames */ | 83 | #define IP_PMTUDISC_DONT 0 /* Never send DF frames */ |
| 84 | #define IP_PMTUDISC_WANT 1 /* Use per route hints */ | 84 | #define IP_PMTUDISC_WANT 1 /* Use per route hints */ |
| 85 | #define IP_PMTUDISC_DO 2 /* Always DF */ | 85 | #define IP_PMTUDISC_DO 2 /* Always DF */ |
| 86 | #define IP_PMTUDISC_PROBE 3 /* Ignore dst pmtu */ | ||
| 86 | 87 | ||
| 87 | #define IP_MULTICAST_IF 32 | 88 | #define IP_MULTICAST_IF 32 |
| 88 | #define IP_MULTICAST_TTL 33 | 89 | #define IP_MULTICAST_TTL 33 |