cls_u32: fix sparse warnings
authorstephen hemminger <shemminger@vyatta.com>
Sun, 20 Feb 2011 16:14:23 +0000 (16:14 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 22 Feb 2011 19:22:33 +0000 (11:22 -0800)
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>
net/sched/cls_u32.c

index 966920c..3b93fc0 100644 (file)
@@ -134,12 +134,12 @@ next_knode:
 
                for (i = n->sel.nkeys; i > 0; i--, key++) {
                        int toff = off + key->off + (off2 & key->offmask);
-                       __be32 *data, _data;
+                       __be32 *data, hdata;
 
                        if (skb_headroom(skb) + toff > INT_MAX)
                                goto out;
 
-                       data = skb_header_pointer(skb, toff, 4, &_data);
+                       data = skb_header_pointer(skb, toff, 4, &hdata);
                        if (!data)
                                goto out;
                        if ((*data ^ key->val) & key->mask) {
@@ -187,10 +187,10 @@ check_terminal:
                ht = n->ht_down;
                sel = 0;
                if (ht->divisor) {
-                       __be32 *data, _data;
+                       __be32 *data, hdata;
 
                        data = skb_header_pointer(skb, off + n->sel.hoff, 4,
-                                                 &_data);
+                                                 &hdata);
                        if (!data)
                                goto out;
                        sel = ht->divisor & u32_hash_fold(*data, &n->sel,
@@ -202,11 +202,11 @@ check_terminal:
                if (n->sel.flags & (TC_U32_OFFSET | TC_U32_VAROFFSET)) {
                        off2 = n->sel.off + 3;
                        if (n->sel.flags & TC_U32_VAROFFSET) {
-                               __be16 *data, _data;
+                               __be16 *data, hdata;
 
                                data = skb_header_pointer(skb,
                                                          off + n->sel.offoff,
-                                                         2, &_data);
+                                                         2, &hdata);
                                if (!data)
                                        goto out;
                                off2 += ntohs(n->sel.offmask & *data) >>