netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Nikolay Aleksandrov <nikolay@redhat.com>
To: Eric Dumazet <eric.dumazet@gmail.com>
Cc: netdev@vger.kernel.org, davem@davemloft.net, andy@greyhouse.net,
	fubar@us.ibm.com, vfalico@redhat.com
Subject: Re: [PATCH net-next v4 1/3] flow_dissector: factor out the ports extraction in skb_flow_get_ports
Date: Thu, 26 Sep 2013 18:35:33 +0200	[thread overview]
Message-ID: <52446255.6040108@redhat.com> (raw)
In-Reply-To: <1380213202.3165.195.camel@edumazet-glaptop>

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

  reply	other threads:[~2013-09-26 16:40 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-26 16:13 [PATCH net-next v4 0/3] bonding: modify the current and add new hash functions Nikolay Aleksandrov
2013-09-26 16:13 ` [PATCH net-next v4 1/3] flow_dissector: factor out the ports extraction in skb_flow_get_ports Nikolay Aleksandrov
2013-09-26 16:33   ` Eric Dumazet
2013-09-26 16:35     ` Nikolay Aleksandrov [this message]
2013-10-01 21:47       ` David Miller
2013-09-26 16:13 ` [PATCH net-next v4 2/3] bonding: modify the old and add new xmit hash policies Nikolay Aleksandrov
2013-09-26 16:13 ` [PATCH net-next v4 3/3] bonding: document the new xmit policy modes and update the changed ones Nikolay Aleksandrov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=52446255.6040108@redhat.com \
    --to=nikolay@redhat.com \
    --cc=andy@greyhouse.net \
    --cc=davem@davemloft.net \
    --cc=eric.dumazet@gmail.com \
    --cc=fubar@us.ibm.com \
    --cc=netdev@vger.kernel.org \
    --cc=vfalico@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).