datapath: Drop allocation of memory for ODP_PACKET_ATTR_TYPE.
authorJesse Gross <jesse@nicira.com>
Sun, 30 Jan 2011 19:32:30 +0000 (11:32 -0800)
committerJesse Gross <jesse@nicira.com>
Sun, 30 Jan 2011 20:34:19 +0000 (12:34 -0800)
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>
datapath/datapath.c

index 544f8cd..89b0d7f 100644 (file)
@@ -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)