From: Ben Pfaff <blp@nicira.com>
Date: Wed, 2 Mar 2011 18:38:14 +0000 (-0800)
Subject: datapath: Remove unneeded modify_vlan_tci() parameters.
X-Git-Tag: v1.1.0~199
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0984253939b82ac1fecb22885f5486e9a840a578;p=sliver-openvswitch.git

datapath: Remove unneeded modify_vlan_tci() parameters.

These parameters were once needed but they are no longer used.

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 c44e00c4c..a2a572e3f 100644
--- a/datapath/actions.c
+++ b/datapath/actions.c
@@ -84,11 +84,8 @@ static struct sk_buff *strip_vlan(struct sk_buff *skb)
 	return skb;
 }
 
-static struct sk_buff *modify_vlan_tci(struct datapath *dp, struct sk_buff *skb,
-				       const struct sw_flow_key *key,
-				       const struct nlattr *a, u32 actions_len)
+static struct sk_buff *modify_vlan_tci(struct sk_buff *skb, __be16 tci)
 {
-	__be16 tci = nla_get_be16(a);
 	struct vlan_ethhdr *vh;
 	__be16 old_tci;
 
@@ -327,7 +324,7 @@ static int do_execute_actions(struct datapath *dp, struct sk_buff *skb,
 			break;
 
 		case ODP_ACTION_ATTR_SET_DL_TCI:
-			skb = modify_vlan_tci(dp, skb, key, a, rem);
+			skb = modify_vlan_tci(skb, nla_get_be16(a));
 			break;
 
 		case ODP_ACTION_ATTR_STRIP_VLAN: