From: Ben Pfaff <blp@nicira.com>
Date: Mon, 27 Dec 2010 23:21:29 +0000 (-0800)
Subject: datapath: Fix type of actions_len_left in modify_vlan_tci().
X-Git-Tag: v1.1.0~583
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4faaba2b90979e1106b8c9b0430481f2cc62364d;p=sliver-openvswitch.git

datapath: Fix type of actions_len_left in modify_vlan_tci().

The sparse checker reported that the type of the pointer passed to
nla_next(), as &actions_len_left, was incorrect: whereas the parameter
has type "int *", &actions_len_left is an "unsigned int *".  This fixes
the problem.  It is not a bug fix since the code is equally correct (or
incorrect) either way, but it gets the types right anyhow.

I don't know why GCC was not reporting this as an error.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
---

diff --git a/datapath/actions.c b/datapath/actions.c
index 32053f01f..639b87078 100644
--- a/datapath/actions.c
+++ b/datapath/actions.c
@@ -137,7 +137,7 @@ static struct sk_buff *modify_vlan_tci(struct datapath *dp, struct sk_buff *skb,
 		 * groups configured). */
 		if (skb_is_gso(skb)) {
 			const struct nlattr *actions_left;
-			u32 actions_len_left;
+			int actions_len_left;
 			struct sk_buff *segs;
 
 			segs = skb_gso_segment(skb, 0);