Commit eec517cd authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

net: Add IF_OPER_TESTING 



RFC 2863 defines the operational state testing. Add support for this
state, both as a IF_LINK_MODE_ and __LINK_STATE_.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 749d22e8

include/linux/netdevice.h

+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

include/uapi/linux/if.h

+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 */

};



/*

net/core/dev.c

+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

net/core/link_watch.c

+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);

}

net/core/rtnetlink.c

+8 −1
Original line number Diff line number Diff line
@@ -829,11 +829,18 @@ static void set_operstate(struct net_device *dev, unsigned char transition) 
	switch (transition) {

	case IF_OPER_UP:

		if ((operstate == IF_OPER_DORMANT ||

		     operstate == IF_OPER_TESTING ||

		     operstate == IF_OPER_UNKNOWN) &&

		    !netif_dormant(dev))

		    !netif_dormant(dev) && !netif_testing(dev))

			operstate = IF_OPER_UP;

		break;



	case IF_OPER_TESTING:

		if (operstate == IF_OPER_UP ||

		    operstate == IF_OPER_UNKNOWN)

			operstate = IF_OPER_TESTING;

		break;



	case IF_OPER_DORMANT:

		if (operstate == IF_OPER_UP ||

		    operstate == IF_OPER_UNKNOWN)