diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
| commit | 9cdf083f981b8d37b3212400a359368661385099 (patch) | |
| tree | aa15a6a08ad87e650dea40fb59b3180bef0d345b /include/linux/ip.h | |
| parent | e499e01d234a31d59679b7b1e1cf628d917ba49a (diff) | |
| parent | a8b3485287731978899ced11f24628c927890e78 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/ip.h')
| -rw-r--r-- | include/linux/ip.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ip.h b/include/linux/ip.h index ecee9bb27d0e..1d36b971a8b5 100644 --- a/include/linux/ip.h +++ b/include/linux/ip.h | |||
| @@ -98,7 +98,7 @@ struct iphdr { | |||
| 98 | __be16 frag_off; | 98 | __be16 frag_off; |
| 99 | __u8 ttl; | 99 | __u8 ttl; |
| 100 | __u8 protocol; | 100 | __u8 protocol; |
| 101 | __be16 check; | 101 | __sum16 check; |
| 102 | __be32 saddr; | 102 | __be32 saddr; |
| 103 | __be32 daddr; | 103 | __be32 daddr; |
| 104 | /*The options start here. */ | 104 | /*The options start here. */ |