diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
| commit | 79acbb3ff2d8095b692e1502b9eb2ccec348de26 (patch) | |
| tree | 6ab773e5a8f9de2cd6443362b21d0d6fffe3b35e /include/net/ndisc.h | |
| parent | 19a79859e168640f8e16d7b216d211c1c52b687a (diff) | |
| parent | 2b5f6dcce5bf94b9b119e9ed8d537098ec61c3d2 (diff) | |
Merge branch 'linux-2.6' into for-linus
Diffstat (limited to 'include/net/ndisc.h')
| -rw-r--r-- | include/net/ndisc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/ndisc.h b/include/net/ndisc.h index d3915dabe6de..475b10c575b3 100644 --- a/include/net/ndisc.h +++ b/include/net/ndisc.h | |||
| @@ -66,8 +66,8 @@ struct rs_msg { | |||
| 66 | 66 | ||
| 67 | struct ra_msg { | 67 | struct ra_msg { |
| 68 | struct icmp6hdr icmph; | 68 | struct icmp6hdr icmph; |
| 69 | __u32 reachable_time; | 69 | __be32 reachable_time; |
| 70 | __u32 retrans_timer; | 70 | __be32 retrans_timer; |
| 71 | }; | 71 | }; |
| 72 | 72 | ||
| 73 | struct nd_opt_hdr { | 73 | struct nd_opt_hdr { |