From: Jesse Gross <jesse@nicira.com>
Date: Sun, 30 Jan 2011 19:32:30 +0000 (-0800)
Subject: datapath: Drop allocation of memory for ODP_PACKET_ATTR_TYPE.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47e0120572fdca82f2e97b82bee5ff2e36b6c93e;p=openvswitch

datapath: Drop allocation of memory for ODP_PACKET_ATTR_TYPE.

When doing an upcall we allocate memory for ODP_PACKET_ATTR_TYPE.
However, ODP_PACKET_ATTR_TYPE does not exist - the type is specified
by the command.

Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/datapath/datapath.c b/datapath/datapath.c
index 544f8cdf..89b0d7f0 100644
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -484,7 +484,6 @@ static int queue_control_packets(struct datapath *dp, struct sk_buff *skb,
 		skb->next = NULL;
 
 		len = sizeof(struct odp_header);
-		len += nla_total_size(4); /* ODP_PACKET_ATTR_TYPE. */
 		len += nla_total_size(skb->len);
 		len += nla_total_size(FLOW_BUFSIZE);
 		if (upcall_info->userdata)