From 0984253939b82ac1fecb22885f5486e9a840a578 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Wed, 2 Mar 2011 10:38:14 -0800 Subject: [PATCH] datapath: Remove unneeded modify_vlan_tci() parameters. These parameters were once needed but they are no longer used. Signed-off-by: Ben Pfaff Acked-by: Jesse Gross --- datapath/actions.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/datapath/actions.c b/datapath/actions.c index c44e00c4..a2a572e3 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: -- 2.30.2