Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86fce3ba authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

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: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent db62983a

net/sched/cls_u32.c

+6 −6
Original line number Diff line number Diff line
@@ -134,12 +134,12 @@ static int u32_classify(struct sk_buff *skb, struct tcf_proto *tp, struct tcf_re 


		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 @@ static int u32_classify(struct sk_buff *skb, struct tcf_proto *tp, struct tcf_re 
		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 @@ static int u32_classify(struct sk_buff *skb, struct tcf_proto *tp, struct tcf_re 
		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) >>