Commit 5cbf830e authored by Ivo van Doorn's avatar Ivo van Doorn Committed by David S. Miller
Browse files

[PATCH] rt2x00: Pass dev_state to rt2x00lib_toggle_rx 



Directly pass a value from the enum dev_state with rt2x00lib_toggle_rx,
this will save us a ? : statement, and it is clearer then passing a 1 0
argument.

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent dd9fa2d2

drivers/net/wireless/rt2x00/rt2x00dev.c

+6 −7
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ int rt2x00lib_enable_radio(struct rt2x00_dev *rt2x00dev) 
	/*

	 * Enable RX.

	 */

	rt2x00lib_toggle_rx(rt2x00dev, 1);

	rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON);



	/*

	 * Start the TX queues.
@@ -151,7 +151,7 @@ void rt2x00lib_disable_radio(struct rt2x00_dev *rt2x00dev) 
	/*

	 * Disable RX.

	 */

	rt2x00lib_toggle_rx(rt2x00dev, 0);

	rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_OFF);



	/*

	 * Disable radio.
@@ -159,14 +159,12 @@ void rt2x00lib_disable_radio(struct rt2x00_dev *rt2x00dev) 
	rt2x00dev->ops->lib->set_device_state(rt2x00dev, STATE_RADIO_OFF);

}



void rt2x00lib_toggle_rx(struct rt2x00_dev *rt2x00dev, int enable)

void rt2x00lib_toggle_rx(struct rt2x00_dev *rt2x00dev, enum dev_state state)

{

	enum dev_state state = enable ? STATE_RADIO_RX_ON : STATE_RADIO_RX_OFF;



	/*

	 * When we are disabling the RX, we should also stop the link tuner.

	 */

	if (!enable)

	if (state == STATE_RADIO_RX_OFF)

		rt2x00lib_stop_link_tuner(rt2x00dev);



	rt2x00dev->ops->lib->set_device_state(rt2x00dev, state);
@@ -174,7 +172,8 @@ void rt2x00lib_toggle_rx(struct rt2x00_dev *rt2x00dev, int enable) 
	/*

	 * When we are enabling the RX, we should also start the link tuner.

	 */

	if (enable && is_interface_present(&rt2x00dev->interface))

	if (state == STATE_RADIO_RX_ON &&

	    is_interface_present(&rt2x00dev->interface))

		rt2x00lib_start_link_tuner(rt2x00dev);

}

drivers/net/wireless/rt2x00/rt2x00lib.h

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
 */

int rt2x00lib_enable_radio(struct rt2x00_dev *rt2x00dev);

void rt2x00lib_disable_radio(struct rt2x00_dev *rt2x00dev);

void rt2x00lib_toggle_rx(struct rt2x00_dev *rt2x00dev, int enable);

void rt2x00lib_toggle_rx(struct rt2x00_dev *rt2x00dev, enum dev_state state);

void rt2x00lib_reset_link_tuner(struct rt2x00_dev *rt2x00dev);



/*

drivers/net/wireless/rt2x00/rt2x00mac.c

+2 −2
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ int rt2x00mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf) 
		if (!conf->radio_enabled)

			rt2x00lib_disable_radio(rt2x00dev);

		else

			rt2x00lib_toggle_rx(rt2x00dev, 0);

			rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_OFF);

	}



	rt2x00lib_config(rt2x00dev, conf, 0);
@@ -281,7 +281,7 @@ int rt2x00mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf) 
	 * Reenable RX only if the radio should be on.

	 */

	if (test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags))

		rt2x00lib_toggle_rx(rt2x00dev, 1);

		rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON);

	else if (conf->radio_enabled)

		return rt2x00lib_enable_radio(rt2x00dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE