Merge commit 'origin/citrix'

1 files changed, 12 insertions, 0 deletions

diff --git a/datapath/datapath.c b/datapath/datapath.c
index 6f96ee40..427391ad 100644
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -1107,6 +1107,7 @@ static int do_execute(struct datapath *dp, const struct odp_execute *executep)
 	struct odp_flow_key key;
 	struct sk_buff *skb;
 	struct sw_flow_actions *actions;
+	struct ethhdr *eth;
 	int err;
 
 	err = -EFAULT;
@@ -1146,6 +1147,17 @@ static int do_execute(struct datapath *dp, const struct odp_execute *executep)
 			   execute.length))
 		goto error_free_skb;
 
+	skb_reset_mac_header(skb);
+	eth = eth_hdr(skb);
+
+    /* Normally, setting the skb 'protocol' field would be handled by a
+     * call to eth_type_trans(), but it assumes there's a sending
+     * device, which we may not have. */
+	if (ntohs(eth->h_proto) >= 1536)
+		skb->protocol = eth->h_proto;
+	else
+		skb->protocol = htons(ETH_P_802_2);
+
 	flow_extract(skb, execute.in_port, &key);
 	err = execute_actions(dp, skb, &key, actions->actions,
 			      actions->n_actions, GFP_KERNEL);