Re: [PATCH net-next v4 1/3] flow_dissector: factor out the ports extraction in skb_flow_get_ports

[Nikolay Aleksandrov <nikolay@redhat.com>]

On 09/26/2013 06:33 PM, Eric Dumazet wrote:
> On Thu, 2013-09-26 at 18:13 +0200, Nikolay Aleksandrov wrote:
> 
>>  	flow->ip_proto = ip_proto;
>> -	poff = proto_ports_offset(ip_proto);
>> -	if (poff >= 0) {
>> -		__be32 *ports, _ports;
>> -
>> -		nhoff += poff;
>> -		ports = skb_header_pointer(skb, nhoff, sizeof(_ports), &_ports);
>> -		if (ports)
>> -			flow->ports = *ports;
>> -	}
>> -
>> +	flow->ports = skb_flow_get_ports(skb, nhoff, ip_proto);
>>  	flow->thoff = (u16) nhoff;
>>  
>>  	return true;
> 
> 
> 
> The best way is to ask David to apply my fix in net tree, then your
> patch will be on top of it.
> 
> Mixing a fix and a factoring seems not right.
> 
> 
Ah, okay, sorry about that, I'm hurrying again :-)
Dave would you apply Eric's fix in the net-next tree ?
I'll then re-base on it.

Thanks,
 Nik