diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2007-10-14 14:40:59 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-14 15:41:52 -0400 |
commit | 9df7c98a0f7e0b7f4b547761ab64f39a13f20355 (patch) | |
tree | 2c8d95eebc0b58c51a12082757207990664898e1 | |
parent | d9a19d200f00533b56fb109b6c538b6ea2961ab2 (diff) |
inet_lro: trivial endianness annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | include/linux/inet_lro.h | 6 | ||||
-rw-r--r-- | net/ipv4/inet_lro.c | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/include/linux/inet_lro.h b/include/linux/inet_lro.h index e1fc1d16d3cd..bb1c8773a1a1 100644 --- a/include/linux/inet_lro.h +++ b/include/linux/inet_lro.h | |||
@@ -52,14 +52,14 @@ struct net_lro_desc { | |||
52 | struct tcphdr *tcph; | 52 | struct tcphdr *tcph; |
53 | struct vlan_group *vgrp; | 53 | struct vlan_group *vgrp; |
54 | __wsum data_csum; | 54 | __wsum data_csum; |
55 | u32 tcp_rcv_tsecr; | 55 | __be32 tcp_rcv_tsecr; |
56 | u32 tcp_rcv_tsval; | 56 | __be32 tcp_rcv_tsval; |
57 | u32 tcp_ack; | 57 | u32 tcp_ack; |
58 | u32 tcp_next_seq; | 58 | u32 tcp_next_seq; |
59 | u32 skb_tot_frags_len; | 59 | u32 skb_tot_frags_len; |
60 | u16 ip_tot_len; | 60 | u16 ip_tot_len; |
61 | u16 tcp_saw_tstamp; /* timestamps enabled */ | 61 | u16 tcp_saw_tstamp; /* timestamps enabled */ |
62 | u16 tcp_window; | 62 | __be16 tcp_window; |
63 | u16 vlan_tag; | 63 | u16 vlan_tag; |
64 | int pkt_aggr_cnt; /* counts aggregated packets */ | 64 | int pkt_aggr_cnt; /* counts aggregated packets */ |
65 | int vlan_packet; | 65 | int vlan_packet; |
diff --git a/net/ipv4/inet_lro.c b/net/ipv4/inet_lro.c index 4545b64e2815..7f22474b52c4 100644 --- a/net/ipv4/inet_lro.c +++ b/net/ipv4/inet_lro.c | |||
@@ -77,7 +77,7 @@ static int lro_tcp_ip_check(struct iphdr *iph, struct tcphdr *tcph, | |||
77 | 77 | ||
78 | /* check tcp options (only timestamp allowed) */ | 78 | /* check tcp options (only timestamp allowed) */ |
79 | if (tcph->doff == TCPH_LEN_W_TIMESTAMP) { | 79 | if (tcph->doff == TCPH_LEN_W_TIMESTAMP) { |
80 | u32 *topt = (u32 *)(tcph + 1); | 80 | __be32 *topt = (__be32 *)(tcph + 1); |
81 | 81 | ||
82 | if (*topt != htonl((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16) | 82 | if (*topt != htonl((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16) |
83 | | (TCPOPT_TIMESTAMP << 8) | 83 | | (TCPOPT_TIMESTAMP << 8) |
@@ -103,14 +103,14 @@ static void lro_update_tcp_ip_header(struct net_lro_desc *lro_desc) | |||
103 | { | 103 | { |
104 | struct iphdr *iph = lro_desc->iph; | 104 | struct iphdr *iph = lro_desc->iph; |
105 | struct tcphdr *tcph = lro_desc->tcph; | 105 | struct tcphdr *tcph = lro_desc->tcph; |
106 | u32 *p; | 106 | __be32 *p; |
107 | __wsum tcp_hdr_csum; | 107 | __wsum tcp_hdr_csum; |
108 | 108 | ||
109 | tcph->ack_seq = lro_desc->tcp_ack; | 109 | tcph->ack_seq = lro_desc->tcp_ack; |
110 | tcph->window = lro_desc->tcp_window; | 110 | tcph->window = lro_desc->tcp_window; |
111 | 111 | ||
112 | if (lro_desc->tcp_saw_tstamp) { | 112 | if (lro_desc->tcp_saw_tstamp) { |
113 | p = (u32 *)(tcph + 1); | 113 | p = (__be32 *)(tcph + 1); |
114 | *(p+2) = lro_desc->tcp_rcv_tsecr; | 114 | *(p+2) = lro_desc->tcp_rcv_tsecr; |
115 | } | 115 | } |
116 | 116 | ||
@@ -150,7 +150,7 @@ static void lro_init_desc(struct net_lro_desc *lro_desc, struct sk_buff *skb, | |||
150 | u16 vlan_tag, struct vlan_group *vgrp) | 150 | u16 vlan_tag, struct vlan_group *vgrp) |
151 | { | 151 | { |
152 | int nr_frags; | 152 | int nr_frags; |
153 | u32 *ptr; | 153 | __be32 *ptr; |
154 | u32 tcp_data_len = TCP_PAYLOAD_LENGTH(iph, tcph); | 154 | u32 tcp_data_len = TCP_PAYLOAD_LENGTH(iph, tcph); |
155 | 155 | ||
156 | nr_frags = skb_shinfo(skb)->nr_frags; | 156 | nr_frags = skb_shinfo(skb)->nr_frags; |
@@ -166,7 +166,7 @@ static void lro_init_desc(struct net_lro_desc *lro_desc, struct sk_buff *skb, | |||
166 | lro_desc->ip_tot_len = ntohs(iph->tot_len); | 166 | lro_desc->ip_tot_len = ntohs(iph->tot_len); |
167 | 167 | ||
168 | if (tcph->doff == 8) { | 168 | if (tcph->doff == 8) { |
169 | ptr = (u32 *)(tcph+1); | 169 | ptr = (__be32 *)(tcph+1); |
170 | lro_desc->tcp_saw_tstamp = 1; | 170 | lro_desc->tcp_saw_tstamp = 1; |
171 | lro_desc->tcp_rcv_tsval = *(ptr+1); | 171 | lro_desc->tcp_rcv_tsval = *(ptr+1); |
172 | lro_desc->tcp_rcv_tsecr = *(ptr+2); | 172 | lro_desc->tcp_rcv_tsecr = *(ptr+2); |
@@ -190,7 +190,7 @@ static void lro_add_common(struct net_lro_desc *lro_desc, struct iphdr *iph, | |||
190 | struct tcphdr *tcph, int tcp_data_len) | 190 | struct tcphdr *tcph, int tcp_data_len) |
191 | { | 191 | { |
192 | struct sk_buff *parent = lro_desc->parent; | 192 | struct sk_buff *parent = lro_desc->parent; |
193 | u32 *topt; | 193 | __be32 *topt; |
194 | 194 | ||
195 | lro_desc->pkt_aggr_cnt++; | 195 | lro_desc->pkt_aggr_cnt++; |
196 | lro_desc->ip_tot_len += tcp_data_len; | 196 | lro_desc->ip_tot_len += tcp_data_len; |
@@ -200,7 +200,7 @@ static void lro_add_common(struct net_lro_desc *lro_desc, struct iphdr *iph, | |||
200 | 200 | ||
201 | /* don't update tcp_rcv_tsval, would not work with PAWS */ | 201 | /* don't update tcp_rcv_tsval, would not work with PAWS */ |
202 | if (lro_desc->tcp_saw_tstamp) { | 202 | if (lro_desc->tcp_saw_tstamp) { |
203 | topt = (u32 *) (tcph + 1); | 203 | topt = (__be32 *) (tcph + 1); |
204 | lro_desc->tcp_rcv_tsecr = *(topt + 2); | 204 | lro_desc->tcp_rcv_tsecr = *(topt + 2); |
205 | } | 205 | } |
206 | 206 | ||