aboutsummaryrefslogtreecommitdiffstats
path: root/net/mpls
diff options
context:
space:
mode:
authorSimon Horman <simon.horman@netronome.com>2016-07-07 07:56:15 +0200
committerDavid S. Miller <davem@davemloft.net>2016-07-09 17:45:56 -0400
commit407f31be9ddfbcc51ae8054c1218db00c08b92e9 (patch)
treede37563bbacba5af1db7c6a040c6a6497cb05f2e /net/mpls
parentipip: support MPLS over IPv4 (diff)
downloadlinux-dev-407f31be9ddfbcc51ae8054c1218db00c08b92e9.tar.xz
linux-dev-407f31be9ddfbcc51ae8054c1218db00c08b92e9.zip
mpls: allow routes on ipip and sit devices
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> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mpls')
-rw-r--r--net/mpls/af_mpls.c6
1 files 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));