Skip to contentSkip to conversation

cls_u32: fix sparse warnings

PATCH In review Stephen Hemminger 2 participants 4 messages Feb 21, 2011 – Feb 24, 2011

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 net/sched/cls_u32.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
net/sched/cls_u32.c +6 -6
@@ -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) >>
#2 lore raw
Quoted 11 lines · On Wed, 23 Feb 2011 07:35:42 -0500 jamal <[email protected]> wrote:
Quoted 4 lines · Stephen Hemminger

The variable _data is used in asm-generic to define sections which causes sparse warnings, so just rename the variable.

Hey, while you are sparsing away you may wanna fix br_fdb_cleanup() as well ;-> /me runs

With current sparse and net-next it comes up clean.

#3 lore raw
Quoted 1 line · Stephen Hemminger

With current sparse and net-next it comes up clean.

weird. So _data has to be defined on the stack for sparse to complain?
Another one is act_pedit.c

cheers,
jamal