From: Ben Pfaff Date: Wed, 14 Aug 2013 23:26:05 +0000 (-0700) Subject: ofproto: Remove obsolete comment and assertion. X-Git-Tag: sliver-openvswitch-2.0.90-1~18^2~4 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a69553be4250a8a40d603d8f3123ec532d5fb390;p=sliver-openvswitch.git ofproto: Remove obsolete comment and assertion. At one time, the ofproto-dpif implementation of the 'rule_execute' member function required, indirectly, at least struct(ofp10_packet_in) bytes of headroom in the packet passed into it. (This allowed constructing an OFPT_PACKET_IN without allocating and copying a new ofpbuf.) This restriction has long been lifted, but rule_execute() had not yet caught up. This commit updates it. Signed-off-by: Ben Pfaff --- diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index e5ad442a2..85fad04fb 100644 --- a/ofproto/ofproto.c +++ b/ofproto/ofproto.c @@ -2272,8 +2272,7 @@ ofoperation_has_out_port(const struct ofoperation *op, ofp_port_t out_port) } /* Executes the actions indicated by 'rule' on 'packet' and credits 'rule''s - * statistics appropriately. 'packet' must have at least sizeof(struct - * ofp10_packet_in) bytes of headroom. + * statistics appropriately. * * 'packet' doesn't necessarily have to match 'rule'. 'rule' will be credited * with statistics for 'packet' either way. @@ -2285,8 +2284,6 @@ rule_execute(struct rule *rule, ofp_port_t in_port, struct ofpbuf *packet) struct flow flow; union flow_in_port in_port_; - ovs_assert(ofpbuf_headroom(packet) >= sizeof(struct ofp10_packet_in)); - in_port_.ofp_port = in_port; flow_extract(packet, 0, 0, NULL, &in_port_, &flow); return rule->ofproto->ofproto_class->rule_execute(rule, &flow, packet);