datapath: No need to zero cb anymore in odp_packet_cmd_execute().
authorBen Pfaff <blp@nicira.com>
Thu, 28 Apr 2011 23:13:39 +0000 (16:13 -0700)
committerBen Pfaff <blp@nicira.com>
Fri, 29 Apr 2011 17:47:03 +0000 (10:47 -0700)
Before commit 3f19d399f "datapath: Fix mysterious GRE-over-IPSEC problems,"
'packet' in opd_packet_cmd_execute() was an skb cloned from one created by
Netlink, so its cb member wasn't necessarily zeroed.  But that commit
changed 'packet' to be freshly allocated with __dev_alloc_skb(), which
means that cb is zeroed, so we don't have to do it again.

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

index 5ce77cd3485cf6e80afe36c8ad683b40bcfc8ed5..20ae4d82e1b297da6cd9d1cd9d6f704d5d52cb85 100644 (file)
@@ -714,9 +714,6 @@ static int odp_packet_cmd_execute(struct sk_buff *skb, struct genl_info *info)
        else
                packet->protocol = htons(ETH_P_802_2);
 
-       /* Initialize OVS_CB (it came from Netlink so might not be zeroed). */
-       memset(OVS_CB(packet), 0, sizeof(struct ovs_skb_cb));
-
        err = flow_extract(packet, -1, &key, &is_frag);
        if (err)
                goto err_kfree_skb;