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/ipv6.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/ipv6.h')
| -rw-r--r-- | include/linux/ipv6.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index 4f435c59de06..f8241130f5ea 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h | |||
| @@ -274,7 +274,7 @@ struct ipv6_pinfo { | |||
| 274 | struct in6_addr *saddr_cache; | 274 | struct in6_addr *saddr_cache; |
| 275 | #endif | 275 | #endif |
| 276 | 276 | ||
| 277 | __u32 flow_label; | 277 | __be32 flow_label; |
| 278 | __u32 frag_size; | 278 | __u32 frag_size; |
| 279 | __s16 hop_limit; | 279 | __s16 hop_limit; |
| 280 | __s16 mcast_hops; | 280 | __s16 mcast_hops; |