1 files changed, 15 insertions, 14 deletions

diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c
index b15321a2228c..093c191d4fc2 100644
--- a/net/openvswitch/flow.c
+++ b/net/openvswitch/flow.c
@@ -590,10 +590,10 @@ out:
  *    - skb->network_header: just past the Ethernet header, or just past the
  *      VLAN header, to the first byte of the Ethernet payload.
  *
- *    - skb->transport_header: If key->dl_type is ETH_P_IP or ETH_P_IPV6
+ *    - skb->transport_header: If key->eth.type is ETH_P_IP or ETH_P_IPV6
  *      on output, then just past the IP header, if one is present and
  *      of a correct length, otherwise the same as skb->network_header.
- *      For other key->dl_type values it is left untouched.
+ *      For other key->eth.type values it is left untouched.
  */
 int ovs_flow_extract(struct sk_buff *skb, u16 in_port, struct sw_flow_key *key,
                  int *key_lenp)
@@ -618,6 +618,9 @@ int ovs_flow_extract(struct sk_buff *skb, u16 in_port, struct sw_flow_key *key,
         memcpy(key->eth.dst, eth->h_dest, ETH_ALEN);
 
         __skb_pull(skb, 2 * ETH_ALEN);
+        /* We are going to push all headers that we pull, so no need to
+         * update skb->csum here.
+         */
 
         if (vlan_tx_tag_present(skb))
                 key->eth.tci = htons(skb->vlan_tci);
@@ -1122,10 +1125,8 @@ int ovs_flow_from_nlattrs(struct sw_flow_key *swkey, int *key_lenp,
 
 /**
  * ovs_flow_metadata_from_nlattrs - parses Netlink attributes into a flow key.
- * @priority: receives the skb priority
- * @mark: receives the skb mark
- * @in_port: receives the extracted input port.
- * @key: Netlink attribute holding nested %OVS_KEY_ATTR_* Netlink attribute
+ * @flow: Receives extracted in_port, priority, tun_key and skb_mark.
+ * @attr: Netlink attribute holding nested %OVS_KEY_ATTR_* Netlink attribute
  * sequence.
  *
  * This parses a series of Netlink attributes that form a flow key, which must
@@ -1133,15 +1134,15 @@ int ovs_flow_from_nlattrs(struct sw_flow_key *swkey, int *key_lenp,
  * get the metadata, that is, the parts of the flow key that cannot be
  * extracted from the packet itself.
  */
-int ovs_flow_metadata_from_nlattrs(u32 *priority, u32 *mark, u16 *in_port,
-                               const struct nlattr *attr)
+int ovs_flow_metadata_from_nlattrs(struct sw_flow *flow,
+                                   const struct nlattr *attr)
 {
         const struct nlattr *nla;
         int rem;
 
-        *in_port = DP_MAX_PORTS;
-        *priority = 0;
-        *mark = 0;
+        flow->key.phy.in_port = DP_MAX_PORTS;
+        flow->key.phy.priority = 0;
+        flow->key.phy.skb_mark = 0;
 
         nla_for_each_nested(nla, attr, rem) {
                 int type = nla_type(nla);
@@ -1152,17 +1153,17 @@ int ovs_flow_metadata_from_nlattrs(u32 *priority, u32 *mark, u16 *in_port,
 
                         switch (type) {
                         case OVS_KEY_ATTR_PRIORITY:
-                                *priority = nla_get_u32(nla);
+                                flow->key.phy.priority = nla_get_u32(nla);
                                 break;
 
                         case OVS_KEY_ATTR_IN_PORT:
                                 if (nla_get_u32(nla) >= DP_MAX_PORTS)
                                         return -EINVAL;
-                                *in_port = nla_get_u32(nla);
+                                flow->key.phy.in_port = nla_get_u32(nla);
                                 break;
 
                         case OVS_KEY_ATTR_SKB_MARK:
-                                *mark = nla_get_u32(nla);
+                                flow->key.phy.skb_mark = nla_get_u32(nla);
                                 break;
                         }
                 }