From: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
To: "David S. Miller" <davem@davemloft.net>,
Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Haishuang Yan <yanhaishuang@cmss.chinamobile.com>,
William Tu <u9012063@gmail.com>
Subject: [PATCH 2/2] erspan: fix error handling for erspan tunnel
Date: Mon, 10 Sep 2018 22:19:48 +0800 [thread overview]
Message-ID: <1536589188-27550-2-git-send-email-yanhaishuang@cmss.chinamobile.com> (raw)
In-Reply-To: <1536589188-27550-1-git-send-email-yanhaishuang@cmss.chinamobile.com>
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@gmail.com>
Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
---
net/ipv4/ip_gre.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 85a714d..8cce0e9 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -178,6 +178,9 @@ static void ipgre_err(struct sk_buff *skb, u32 info,
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);
--
1.8.3.1
next prev parent reply other threads:[~2018-09-10 14:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-10 14:19 [PATCH 1/2] erspan: return PACKET_REJECT when the appropriate tunnel is not found Haishuang Yan
2018-09-10 14:19 ` Haishuang Yan [this message]
2018-09-10 15:52 ` [PATCH 2/2] erspan: fix error handling for erspan tunnel William Tu
2018-09-12 6:52 ` David Miller
2018-09-10 15:53 ` [PATCH 1/2] erspan: return PACKET_REJECT when the appropriate tunnel is not found William Tu
2018-09-12 6:52 ` David Miller
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=1536589188-27550-2-git-send-email-yanhaishuang@cmss.chinamobile.com \
--to=yanhaishuang@cmss.chinamobile.com \
--cc=davem@davemloft.net \
--cc=kuznet@ms2.inr.ac.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=u9012063@gmail.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).