net: Removed the device type check to add mpls support for devices (350e7ab9) · Commits · 戴 / test

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>

net/mpls/af_mpls.c

+3 −14

Original line number	Diff line number	Diff line
		@@ -1584,21 +1584,10 @@ static int mpls_dev_notify(struct notifier_block *this, unsigned long event,
		unsigned int flags;

		if (event == NETDEV_REGISTER) {

		/* 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;
		}

Admin message