summaryrefslogtreecommitdiffstats
path: root/net/mpls
diff options
context:
space:
mode:
authorMartin Varghese <martin.varghese@nokia.com>2020-07-27 13:09:19 +0530
committerDavid S. Miller <davem@davemloft.net>2020-07-27 11:40:47 -0700
commit350e7ab92da8420fe97e1edf040db8c9bab750f8 (patch)
treece650fdc25c1e361b65e8807aa2f456502235c77 /net/mpls
parent73cb11933c414b744193d9de660010082bc0a944 (diff)
downloadlinux-stable-350e7ab92da8420fe97e1edf040db8c9bab750f8.tar.gz
linux-stable-350e7ab92da8420fe97e1edf040db8c9bab750f8.tar.bz2
linux-stable-350e7ab92da8420fe97e1edf040db8c9bab750f8.zip
net: Removed the device type check to add mpls support for devices
MPLS has no dependency with the device type of underlying devices. Hence the device type check to add mpls support for devices can be avoided. Signed-off-by: Martin Varghese <martin.varghese@nokia.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mpls')
-rw-r--r--net/mpls/af_mpls.c17
1 files changed, 3 insertions, 14 deletions
diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c
index fd30ea61336e..6fdd0c9f865a 100644
--- a/net/mpls/af_mpls.c
+++ b/net/mpls/af_mpls.c
@@ -1584,21 +1584,10 @@ static int mpls_dev_notify(struct notifier_block *this, unsigned long event,
unsigned int flags;
if (event == NETDEV_REGISTER) {
+ mdev = mpls_add_dev(dev);
+ if (IS_ERR(mdev))
+ return notifier_from_errno(PTR_ERR(mdev));
- /* For now just support Ethernet, IPGRE, IP6GRE, SIT and
- * IPIP devices
- */
- if (dev->type == ARPHRD_ETHER ||
- dev->type == ARPHRD_LOOPBACK ||
- dev->type == ARPHRD_IPGRE ||
- dev->type == ARPHRD_IP6GRE ||
- dev->type == ARPHRD_SIT ||
- dev->type == ARPHRD_TUNNEL ||
- dev->type == ARPHRD_TUNNEL6) {
- mdev = mpls_add_dev(dev);
- if (IS_ERR(mdev))
- return notifier_from_errno(PTR_ERR(mdev));
- }
return NOTIFY_OK;
}