aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstephen hemminger <shemminger@vyatta.com>2011-02-20 11:14:23 -0500
committerDavid S. Miller <davem@davemloft.net>2011-02-22 14:22:33 -0500
commit86fce3ba1e731cf6d97a4157a192ffa60dc7ec0b (patch)
treefceed07dcb1b16fdeed6d21543d6eff83d8741e0
parentdb62983a1e4b2af9e79c97af768f0c8b80bd93f0 (diff)
cls_u32: fix sparse warnings
The variable _data is used in asm-generic to define sections which causes sparse warnings, so just rename the variable. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/sched/cls_u32.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c
index 966920c14e7a..3b93fc0c8955 100644
--- a/net/sched/cls_u32.c
+++ b/net/sched/cls_u32.c
@@ -134,12 +134,12 @@ next_knode:
134 134
135 for (i = n->sel.nkeys; i > 0; i--, key++) { 135 for (i = n->sel.nkeys; i > 0; i--, key++) {
136 int toff = off + key->off + (off2 & key->offmask); 136 int toff = off + key->off + (off2 & key->offmask);
137 __be32 *data, _data; 137 __be32 *data, hdata;
138 138
139 if (skb_headroom(skb) + toff > INT_MAX) 139 if (skb_headroom(skb) + toff > INT_MAX)
140 goto out; 140 goto out;
141 141
142 data = skb_header_pointer(skb, toff, 4, &_data); 142 data = skb_header_pointer(skb, toff, 4, &hdata);
143 if (!data) 143 if (!data)
144 goto out; 144 goto out;
145 if ((*data ^ key->val) & key->mask) { 145 if ((*data ^ key->val) & key->mask) {
@@ -187,10 +187,10 @@ check_terminal:
187 ht = n->ht_down; 187 ht = n->ht_down;
188 sel = 0; 188 sel = 0;
189 if (ht->divisor) { 189 if (ht->divisor) {
190 __be32 *data, _data; 190 __be32 *data, hdata;
191 191
192 data = skb_header_pointer(skb, off + n->sel.hoff, 4, 192 data = skb_header_pointer(skb, off + n->sel.hoff, 4,
193 &_data); 193 &hdata);
194 if (!data) 194 if (!data)
195 goto out; 195 goto out;
196 sel = ht->divisor & u32_hash_fold(*data, &n->sel, 196 sel = ht->divisor & u32_hash_fold(*data, &n->sel,
@@ -202,11 +202,11 @@ check_terminal:
202 if (n->sel.flags & (TC_U32_OFFSET | TC_U32_VAROFFSET)) { 202 if (n->sel.flags & (TC_U32_OFFSET | TC_U32_VAROFFSET)) {
203 off2 = n->sel.off + 3; 203 off2 = n->sel.off + 3;
204 if (n->sel.flags & TC_U32_VAROFFSET) { 204 if (n->sel.flags & TC_U32_VAROFFSET) {
205 __be16 *data, _data; 205 __be16 *data, hdata;
206 206
207 data = skb_header_pointer(skb, 207 data = skb_header_pointer(skb,
208 off + n->sel.offoff, 208 off + n->sel.offoff,
209 2, &_data); 209 2, &hdata);
210 if (!data) 210 if (!data)
211 goto out; 211 goto out;
212 off2 += ntohs(n->sel.offmask & *data) >> 212 off2 += ntohs(n->sel.offmask & *data) >>