datapath: Remove unneeded modify_vlan_tci() parameters.
authorBen Pfaff <blp@nicira.com>
Wed, 2 Mar 2011 18:38:14 +0000 (10:38 -0800)
committerBen Pfaff <blp@nicira.com>
Wed, 2 Mar 2011 22:34:11 +0000 (14:34 -0800)
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>
datapath/actions.c

index c44e00c..a2a572e 100644 (file)
@@ -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: