[ovs-dev] [PATCH V2] erspan: fix error handling for erspan tunnel

[Gregory Rose]

On 11/5/2018 11:38 AM, Ben Pfaff wrote:
> On Mon, Nov 05, 2018 at 11:07:17AM -0800, Gregory Rose wrote:
>> On 11/5/2018 7:52 AM, Ben Pfaff wrote:
>>> Where can I find this patch?  It is not in patchwork, nor in my personal
>>> email archive.
>>>
>>> Thanks,
>>>
>>> Ben.
>> Here:
>>
>> From: Haishuang Yan<yanhaishuang at cmss.chinamobile.com>
>>
>> Upstream commit:
>>      commit 51dc63e3911fbb1f0a7a32da2fe56253e2040ea4
>>      Author: Haishuang Yan<yanhaishuang at cmss.chinamobile.com>
>>      Date:   Mon Sep 10 22:19:48 2018 +0800
>>
>>      erspan: fix error handling for erspan tunnel
>>
>>      When processing icmp unreachable message for erspan tunnel, tunnel id
>>      should be erspan_net_id instead of ipgre_net_id.
>>
>>      Fixes: 84e54fe0a5ea ("gre: introduce native tunnel support for ERSPAN")
>>      Cc: William Tu<u9012063 at gmail.com>
>>      Signed-off-by: Haishuang Yan<yanhaishuang at cmss.chinamobile.com>
>>      Acked-by: William Tu<u9012063 at gmail.com>
>>      Signed-off-by: David S. Miller<davem at davemloft.net>
>>
>> Fixes: 8e53509c ("gre: introduce native tunnel support for ERSPAN")
>> Signed-off-by: Greg Rose<gvrose8192 at gmail.com>
>> ---
>>   datapath/linux/compat/ip_gre.c | 3 +++
>>   1 file changed, 3 insertions(+)
>>
>> diff --git a/datapath/linux/compat/ip_gre.c b/datapath/linux/compat/ip_gre.c
>> index b7322c5..6ac2dd9 100644
>> --- a/datapath/linux/compat/ip_gre.c
>> +++ b/datapath/linux/compat/ip_gre.c
>> @@ -312,6 +312,9 @@ static int ipgre_rcv(struct sk_buff *skb, const struct tnl_ptk_info *tpi,
>>   	if (tpi->proto == htons(ETH_P_TEB))
>>   		itn = net_generic(net, gre_tap_net_id);
>> +	else if (tpi->proto == htons(ETH_P_ERSPAN) ||
>> +		 tpi->proto == htons(ETH_P_ERSPAN2))
>> +		itn = net_generic(net, erspan_net_id);
>>   	else
>>   		itn = net_generic(net, ipgre_net_id);
> Thanks, applied to master.

Thank you!  A backport to 2.10 is probably a good idea as well.

- Greg