diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2006-09-27 21:43:50 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-09-28 21:02:27 -0400 |
commit | 23f33c2d4fd5986243b67a2bf5e63ebae1a76ffa (patch) | |
tree | 17c3315cd4d8f4aa86a45b9e069b57d9f9c46299 | |
parent | fb99c848e5ae6b8b2bc11f0f90c9e2bb3d702c0d (diff) |
[IPV4]: struct inet_timewait_sock annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/net/inet_timewait_sock.h | 8 | ||||
-rw-r--r-- | net/ipv4/tcp_ipv4.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/net/inet_timewait_sock.h b/include/net/inet_timewait_sock.h index 600cb543550d..5794bc6bf0bf 100644 --- a/include/net/inet_timewait_sock.h +++ b/include/net/inet_timewait_sock.h | |||
@@ -120,10 +120,10 @@ struct inet_timewait_sock { | |||
120 | unsigned char tw_rcv_wscale; | 120 | unsigned char tw_rcv_wscale; |
121 | /* Socket demultiplex comparisons on incoming packets. */ | 121 | /* Socket demultiplex comparisons on incoming packets. */ |
122 | /* these five are in inet_sock */ | 122 | /* these five are in inet_sock */ |
123 | __u16 tw_sport; | 123 | __be16 tw_sport; |
124 | __u32 tw_daddr __attribute__((aligned(INET_TIMEWAIT_ADDRCMP_ALIGN_BYTES))); | 124 | __be32 tw_daddr __attribute__((aligned(INET_TIMEWAIT_ADDRCMP_ALIGN_BYTES))); |
125 | __u32 tw_rcv_saddr; | 125 | __be32 tw_rcv_saddr; |
126 | __u16 tw_dport; | 126 | __be16 tw_dport; |
127 | __u16 tw_num; | 127 | __u16 tw_num; |
128 | /* And these are ours. */ | 128 | /* And these are ours. */ |
129 | __u8 tw_ipv6only:1; | 129 | __u8 tw_ipv6only:1; |
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 89f3cf94685a..c83938b8fcb1 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
@@ -1763,7 +1763,7 @@ static void get_tcp4_sock(struct sock *sp, char *tmpbuf, int i) | |||
1763 | 1763 | ||
1764 | static void get_timewait4_sock(struct inet_timewait_sock *tw, char *tmpbuf, int i) | 1764 | static void get_timewait4_sock(struct inet_timewait_sock *tw, char *tmpbuf, int i) |
1765 | { | 1765 | { |
1766 | unsigned int dest, src; | 1766 | __be32 dest, src; |
1767 | __u16 destp, srcp; | 1767 | __u16 destp, srcp; |
1768 | int ttd = tw->tw_ttd - jiffies; | 1768 | int ttd = tw->tw_ttd - jiffies; |
1769 | 1769 | ||