Thanks for the review :-)

Pushed to master,

  Jarno

On Mar 21, 2014, at 2:14 PM, Pravin Shelar <pshe...@nicira.com> wrote:

> On Fri, Feb 21, 2014 at 11:41 AM, Jarno Rajahalme <jrajaha...@nicira.com> 
> wrote:
>> The 'output' argument of the ovs_nla_put_flow() is the one from which
>> the bits are written to the netlink attributes.  For SCTP we
>> accidentally used the bits from the 'swkey' instead.  This caused the
>> mask attributes to include the bits from the actual flow key instead
>> of the mask.
>> 
>> Signed-off-by: Jarno Rajahalme <jrajaha...@nicira.com>
> 
> Looks good.
> Acked-by: Pravin B Shelar <pshe...@nicira.com>
> 
>> ---
>> datapath/flow_netlink.c |    8 ++++----
>> 1 file changed, 4 insertions(+), 4 deletions(-)
>> 
>> diff --git a/datapath/flow_netlink.c b/datapath/flow_netlink.c
>> index 40751cb..9d13b7a 100644
>> --- a/datapath/flow_netlink.c
>> +++ b/datapath/flow_netlink.c
>> @@ -1059,11 +1059,11 @@ int ovs_nla_put_flow(const struct sw_flow_key *swkey,
>>                                goto nla_put_failure;
>>                        sctp_key = nla_data(nla);
>>                        if (swkey->eth.type == htons(ETH_P_IP)) {
>> -                               sctp_key->sctp_src = swkey->ipv4.tp.src;
>> -                               sctp_key->sctp_dst = swkey->ipv4.tp.dst;
>> +                               sctp_key->sctp_src = output->ipv4.tp.src;
>> +                               sctp_key->sctp_dst = output->ipv4.tp.dst;
>>                        } else if (swkey->eth.type == htons(ETH_P_IPV6)) {
>> -                               sctp_key->sctp_src = swkey->ipv6.tp.src;
>> -                               sctp_key->sctp_dst = swkey->ipv6.tp.dst;
>> +                               sctp_key->sctp_src = output->ipv6.tp.src;
>> +                               sctp_key->sctp_dst = output->ipv6.tp.dst;
>>                        }
>>                } else if (swkey->eth.type == htons(ETH_P_IP) &&
>>                           swkey->ip.proto == IPPROTO_ICMP) {
>> --
>> 1.7.10.4
>> 
>> _______________________________________________
>> dev mailing list
>> dev@openvswitch.org
>> http://openvswitch.org/mailman/listinfo/dev

_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev

Reply via email to