From: Simon Horman <simon.horman@netronome.com>
To: David Miller <davem@davemloft.net>
Cc: Tom Herbert <tom@herbertland.com>,
netdev@vger.kernel.org, Simon Horman <simon.horman@netronome.com>
Subject: [PATCH net-next v2 4/4] mpls: allow routes on ipip and sit devices
Date: Thu, 7 Jul 2016 07:56:15 +0200 [thread overview]
Message-ID: <1467870975-28003-5-git-send-email-simon.horman@netronome.com> (raw)
In-Reply-To: <1467870975-28003-1-git-send-email-simon.horman@netronome.com>
Allow MPLS routes on IPIP and SIT devices now that they
support forwarding MPLS packets.
Signed-off-by: Simon Horman <simon.horman@netronome.com>
Reviewed-by: Dinan Gunawardena <dinan.gunawardena@netronome.com>
---
net/mpls/af_mpls.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c
index e9beaa58573c..5c161e7759b5 100644
--- a/net/mpls/af_mpls.c
+++ b/net/mpls/af_mpls.c
@@ -1009,10 +1009,12 @@ static int mpls_dev_notify(struct notifier_block *this, unsigned long event,
unsigned int flags;
if (event == NETDEV_REGISTER) {
- /* For now just support Ethernet and IPGRE devices */
+ /* For now just support Ethernet, IPGRE, SIT and IPIP devices */
if (dev->type == ARPHRD_ETHER ||
dev->type == ARPHRD_LOOPBACK ||
- dev->type == ARPHRD_IPGRE) {
+ dev->type == ARPHRD_IPGRE ||
+ dev->type == ARPHRD_SIT ||
+ dev->type == ARPHRD_TUNNEL) {
mdev = mpls_add_dev(dev);
if (IS_ERR(mdev))
return notifier_from_errno(PTR_ERR(mdev));
--
2.7.0.rc3.207.g0ac5344
next prev parent reply other threads:[~2016-07-07 5:56 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-07 5:56 [PATCH net-next v2 0/4] net: support MPLS in IPv4 and UDP Simon Horman
2016-07-07 5:56 ` [PATCH net-next v2 1/4] tunnels: support MPLS over IPv4 tunnels Simon Horman
2016-07-07 5:56 ` [PATCH net-next v2 2/4] sit: support MPLS over IPv4 Simon Horman
2016-07-07 5:56 ` [PATCH net-next v2 3/4] ipip: " Simon Horman
2016-07-07 5:56 ` Simon Horman [this message]
2016-07-07 9:30 ` [PATCH net-next v2 0/4] net: support MPLS in IPv4 and UDP Thomas Morin
2016-07-08 11:25 ` Manish Chopra
2016-07-09 21:47 ` David Miller
2016-07-10 0:12 ` Simon Horman
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=1467870975-28003-5-git-send-email-simon.horman@netronome.com \
--to=simon.horman@netronome.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=tom@herbertland.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).