datapath: Drop padding from struct odp_flow_key.

[openvswitch] / datapath / actions.c

diff --git a/datapath/actions.c b/datapath/actions.c
index b75aecdace46d3e7c659918f0bcb9bd0acb81b54..050e3735c6bc59c1d813569f2a19a7c793f81ff1 100644 (file)
--- a/datapath/actions.c
+++ b/datapath/actions.c
@@ -75,15 +75,8 @@ static struct sk_buff *modify_vlan_tci(struct datapath *dp, struct sk_buff *skb,
                                       const union odp_action *a, int n_actions,
                                       gfp_t gfp)
 {
-       u16 tci, mask;
-
-       if (a->type == ODPAT_SET_VLAN_VID) {
-               tci = ntohs(a->vlan_vid.vlan_vid);
-               mask = VLAN_VID_MASK;
-       } else {
-               tci = a->vlan_pcp.vlan_pcp << VLAN_PCP_SHIFT;
-               mask = VLAN_PCP_MASK;
-       }
+       __be16 mask = a->dl_tci.mask;
+       __be16 tci = a->dl_tci.tci;
 
        skb = make_writable(skb, VLAN_HLEN, gfp);
        if (!skb)
@@ -100,7 +93,7 @@ static struct sk_buff *modify_vlan_tci(struct datapath *dp, struct sk_buff *skb,
                vh = vlan_eth_hdr(skb);
                old_tci = vh->h_vlan_TCI;
 
-               vh->h_vlan_TCI = htons((ntohs(vh->h_vlan_TCI) & ~mask) | tci);
+               vh->h_vlan_TCI = (vh->h_vlan_TCI & ~mask) | tci;
 
                if (OVS_CB(skb)->ip_summed == OVS_CSUM_COMPLETE) {
                        __be16 diff[] = { ~old_tci, vh->h_vlan_TCI };
@@ -156,7 +149,7 @@ static struct sk_buff *modify_vlan_tci(struct datapath *dp, struct sk_buff *skb,
                                /* GSO can change the checksum type so update.*/
                                compute_ip_summed(segs, true);
 
-                               segs = __vlan_put_tag(segs, tci);
+                               segs = __vlan_put_tag(segs, ntohs(tci));
                                err = -ENOMEM;
                                if (segs) {
                                        err = execute_actions(dp, segs,
@@ -186,7 +179,7 @@ static struct sk_buff *modify_vlan_tci(struct datapath *dp, struct sk_buff *skb,
                 * e.g. vconfig(8)), so call the software-only version
                 * __vlan_put_tag() directly instead.
                 */
-               skb = __vlan_put_tag(skb, tci);
+               skb = __vlan_put_tag(skb, ntohs(tci));
                if (!skb)
                        return ERR_PTR(-ENOMEM);
 
@@ -205,7 +198,6 @@ static struct sk_buff *strip_vlan(struct sk_buff *skb, gfp_t gfp)
        skb = make_writable(skb, 0, gfp);
        if (skb)
                vlan_pull_tag(skb);
-
        return skb;
 }
 
@@ -398,32 +390,6 @@ error:
        kfree_skb(skb);
 }
 
-/* Never consumes 'skb'.  Returns a port that 'skb' should be sent to, -1 if
- * none.  */
-static int output_group(struct datapath *dp, __u16 group,
-                       struct sk_buff *skb, gfp_t gfp)
-{
-       struct dp_port_group *g = rcu_dereference(dp->groups[group]);
-       int prev_port = -1;
-       int i;
-
-       if (!g)
-               return -1;
-       for (i = 0; i < g->n_ports; i++) {
-               struct dp_port *p = rcu_dereference(dp->ports[g->ports[i]]);
-               if (!p || OVS_CB(skb)->dp_port == p)
-                       continue;
-               if (prev_port != -1) {
-                       struct sk_buff *clone = skb_clone(skb, gfp);
-                       if (!clone)
-                               return -1;
-                       do_output(dp, clone, prev_port);
-               }
-               prev_port = p->port_no;
-       }
-       return prev_port;
-}
-
 static int output_control(struct datapath *dp, struct sk_buff *skb, u32 arg,
                          gfp_t gfp)
 {
@@ -492,11 +458,6 @@ int execute_actions(struct datapath *dp, struct sk_buff *skb,
                        prev_port = a->output.port;
                        break;
 
-               case ODPAT_OUTPUT_GROUP:
-                       prev_port = output_group(dp, a->output_group.group,
-                                                skb, gfp);
-                       break;
-
                case ODPAT_CONTROLLER:
                        err = output_control(dp, skb, a->controller.arg, gfp);
                        if (err) {
@@ -509,8 +470,7 @@ int execute_actions(struct datapath *dp, struct sk_buff *skb,
                        OVS_CB(skb)->tun_id = a->tunnel.tun_id;
                        break;
 
-               case ODPAT_SET_VLAN_VID:
-               case ODPAT_SET_VLAN_PCP:
+               case ODPAT_SET_DL_TCI:
                        skb = modify_vlan_tci(dp, skb, key, a, n_actions, gfp);
                        if (IS_ERR(skb))
                                return PTR_ERR(skb);