Merge branch 'RFC-2863-Testing-Oper-status' (b785b06c) · Commits · 戴 / test

Documentation/ABI/testing/sysfs-class-net

+13 −0

Original line number	Diff line number	Diff line
		@@ -124,6 +124,19 @@ Description:
		authentication is performed (e.g: 802.1x). 'link_mode' attribute
		will also reflect the dormant state.

		What: /sys/class/net/<iface>/testing
		Date: April 2002
		KernelVersion: 5.8
		Contact: netdev@vger.kernel.org
		Description:
		Indicates whether the interface is under test. Possible
		values are:
		0: interface is not being tested
		1: interface is being tested

		When an interface is under test, it cannot be expected
		to pass packets as normal.

		What: /sys/clas/net/<iface>/duplex
		Date: October 2009
		KernelVersion: 2.6.33

+41 −0

Original line number	Diff line number	Diff line
		@@ -288,6 +288,7 @@ enum netdev_state_t {
		__LINK_STATE_NOCARRIER,
		__LINK_STATE_LINKWATCH_PENDING,
		__LINK_STATE_DORMANT,
		__LINK_STATE_TESTING,
		};


		@@ -3907,6 +3908,46 @@ static inline bool netif_dormant(const struct net_device *dev)
		}


		/**
		* netif_testing_on - mark device as under test.
		* @dev: network device
		*
		* Mark device as under test (as per RFC2863).
		*
		* The testing state indicates that some test(s) must be performed on
		* the interface. After completion, of the test, the interface state
		* will change to up, dormant, or down, as appropriate.
		*/
		static inline void netif_testing_on(struct net_device *dev)
		{
		if (!test_and_set_bit(__LINK_STATE_TESTING, &dev->state))
		linkwatch_fire_event(dev);
		}

		/**
		* netif_testing_off - set device as not under test.
		* @dev: network device
		*
		* Device is not in testing state.
		*/
		static inline void netif_testing_off(struct net_device *dev)
		{
		if (test_and_clear_bit(__LINK_STATE_TESTING, &dev->state))
		linkwatch_fire_event(dev);
		}

		/**
		* netif_testing - test if device is under test
		* @dev: network device
		*
		* Check if device is under test
		*/
		static inline bool netif_testing(const struct net_device *dev)
		{
		return test_bit(__LINK_STATE_TESTING, &dev->state);
		}


		/**
		* netif_oper_up - test if device is operational
		* @dev: network device

+1 −0

Original line number	Diff line number	Diff line
		@@ -178,6 +178,7 @@ enum {
		enum {
		IF_LINK_MODE_DEFAULT,
		IF_LINK_MODE_DORMANT, /* limit upward transition to dormant */
		IF_LINK_MODE_TESTING, /* limit upward transition to testing */
		};

		/*

+5 −0

Original line number	Diff line number	Diff line
		@@ -9136,6 +9136,11 @@ void netif_stacked_transfer_operstate(const struct net_device *rootdev,
		else
		netif_dormant_off(dev);

		if (rootdev->operstate == IF_OPER_TESTING)
		netif_testing_on(dev);
		else
		netif_testing_off(dev);

		if (netif_carrier_ok(rootdev))
		netif_carrier_on(dev);
		else

+10 −2

Original line number	Diff line number	Diff line
		@@ -34,6 +34,9 @@ static DEFINE_SPINLOCK(lweventlist_lock);

		static unsigned char default_operstate(const struct net_device *dev)
		{
		if (netif_testing(dev))
		return IF_OPER_TESTING;

		if (!netif_carrier_ok(dev))
		return (dev->ifindex != dev_get_iflink(dev) ?
		IF_OPER_LOWERLAYERDOWN : IF_OPER_DOWN);
		@@ -55,11 +58,15 @@ static void rfc2863_policy(struct net_device *dev)
		write_lock_bh(&dev_base_lock);

		switch(dev->link_mode) {
		case IF_LINK_MODE_TESTING:
		if (operstate == IF_OPER_UP)
		operstate = IF_OPER_TESTING;
		break;

		case IF_LINK_MODE_DORMANT:
		if (operstate == IF_OPER_UP)
		operstate = IF_OPER_DORMANT;
		break;

		case IF_LINK_MODE_DEFAULT:
		default:
		break;
		@@ -74,7 +81,8 @@ static void rfc2863_policy(struct net_device *dev)
		void linkwatch_init_dev(struct net_device *dev)
		{
		/* Handle pre-registration link state changes */
		if (!netif_carrier_ok(dev) \|\| netif_dormant(dev))
		if (!netif_carrier_ok(dev) \|\| netif_dormant(dev) \|\|
		netif_testing(dev))
		rfc2863_policy(dev);
		}