Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aca7305b authored Mar 28, 2011 by Helmut Schaa Committed by John W. Linville Apr 04, 2011

rt2x00: Remove DRIVER_SUPPORT_WATCHDOG flag



We can simply check if the driver registered the watchdog callback.
There's no need to have an additional flag for that.

Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent f78987cf

drivers/net/wireless/rt2x00/rt2500usb.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1796,7 +1796,6 @@ static int rt2500usb_probe_hw(struct rt2x00_dev *rt2x00dev)
	__set_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags);		__set_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags);
	__set_bit(DRIVER_REQUIRE_COPY_IV, &rt2x00dev->flags);		__set_bit(DRIVER_REQUIRE_COPY_IV, &rt2x00dev->flags);
	}		}
	__set_bit(DRIVER_SUPPORT_WATCHDOG, &rt2x00dev->flags);
	__set_bit(DRIVER_REQUIRE_SW_SEQNO, &rt2x00dev->flags);		__set_bit(DRIVER_REQUIRE_SW_SEQNO, &rt2x00dev->flags);

	/*		/*

drivers/net/wireless/rt2x00/rt2800usb.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -564,7 +564,6 @@ static int rt2800usb_probe_hw(struct rt2x00_dev *rt2x00dev)
	if (!modparam_nohwcrypt)		if (!modparam_nohwcrypt)
	__set_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags);		__set_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags);
	__set_bit(DRIVER_SUPPORT_LINK_TUNING, &rt2x00dev->flags);		__set_bit(DRIVER_SUPPORT_LINK_TUNING, &rt2x00dev->flags);
	__set_bit(DRIVER_SUPPORT_WATCHDOG, &rt2x00dev->flags);
	__set_bit(DRIVER_REQUIRE_HT_TX_DESC, &rt2x00dev->flags);		__set_bit(DRIVER_REQUIRE_HT_TX_DESC, &rt2x00dev->flags);

	/*		/*

drivers/net/wireless/rt2x00/rt2x00.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -674,7 +674,6 @@ enum rt2x00_flags {
	DRIVER_SUPPORT_CONTROL_FILTER_PSPOLL,		DRIVER_SUPPORT_CONTROL_FILTER_PSPOLL,
	DRIVER_SUPPORT_PRE_TBTT_INTERRUPT,		DRIVER_SUPPORT_PRE_TBTT_INTERRUPT,
	DRIVER_SUPPORT_LINK_TUNING,		DRIVER_SUPPORT_LINK_TUNING,
	DRIVER_SUPPORT_WATCHDOG,

	/*		/*
	* Driver configuration		* Driver configuration

drivers/net/wireless/rt2x00/rt2x00link.c

+5 −6

Original line number	Original line	Diff line number	Diff line
	@@ -413,12 +413,11 @@ void rt2x00link_start_watchdog(struct rt2x00_dev *rt2x00dev)
	{		{
	struct link *link = &rt2x00dev->link;		struct link *link = &rt2x00dev->link;

	if (!test_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags) \|\|		if (test_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags) &&
	!test_bit(DRIVER_SUPPORT_WATCHDOG, &rt2x00dev->flags))		rt2x00dev->ops->lib->watchdog)
	return;

	ieee80211_queue_delayed_work(rt2x00dev->hw,		ieee80211_queue_delayed_work(rt2x00dev->hw,
	&link->watchdog_work, WATCHDOG_INTERVAL);		&link->watchdog_work,
			WATCHDOG_INTERVAL);
	}		}

	void rt2x00link_stop_watchdog(struct rt2x00_dev *rt2x00dev)		void rt2x00link_stop_watchdog(struct rt2x00_dev *rt2x00dev)

drivers/net/wireless/rt2x00/rt73usb.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2209,7 +2209,6 @@ static int rt73usb_probe_hw(struct rt2x00_dev *rt2x00dev)
	if (!modparam_nohwcrypt)		if (!modparam_nohwcrypt)
	__set_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags);		__set_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags);
	__set_bit(DRIVER_SUPPORT_LINK_TUNING, &rt2x00dev->flags);		__set_bit(DRIVER_SUPPORT_LINK_TUNING, &rt2x00dev->flags);
	__set_bit(DRIVER_SUPPORT_WATCHDOG, &rt2x00dev->flags);

	/*		/*
	* Set the rssi offset.		* Set the rssi offset.