[PATCH 19/24] RT2x00: Simplify *_reset() functions
From Ivo van Doorn [EMAIL PROTECTED]
The reset function can be greatly simplified.
when a reset is required the best thing to do,
is to switch the radio off and on again.
Signed-off-by: Ivo van Doorn [EMAIL PROTECTED]
---
diff -rU3 wireless-dev-suspend/drivers/net/wireless/d80211/rt2x00/rt2400pci.c
wireless-dev-reset/drivers/net/wireless/d80211/rt2x00/rt2400pci.c
--- wireless-dev-suspend/drivers/net/wireless/d80211/rt2x00/rt2400pci.c
2006-07-25 23:27:17.0 +0200
+++ wireless-dev-reset/drivers/net/wireless/d80211/rt2x00/rt2400pci.c
2006-07-26 10:41:21.0 +0200
@@ -1905,42 +1905,9 @@
static int rt2400pci_reset(struct net_device *net_dev)
{
struct rt2x00_dev *rt2x00dev = ieee80211_dev_hw_data(net_dev);
- u32 reg;
-
- /*
-* Cancel RX and TX.
-*/
- rt2x00_register_read(rt2x00dev, TXCSR0, reg);
- rt2x00_set_field32(reg, TXCSR0_ABORT, 1);
- rt2x00_register_write(rt2x00dev, TXCSR0, reg);
-
- rt2x00_register_read(rt2x00dev, RXCSR0, reg);
- rt2x00_set_field32(reg, RXCSR0_DISABLE_RX, 1);
- rt2x00_register_write(rt2x00dev, RXCSR0, reg);
-
- /*
-* Clear interrupts.
-*/
- rt2x00_register_read(rt2x00dev, CSR7, reg);
- rt2x00_register_write(rt2x00dev, CSR7, reg);
- /*
-* Clear all rings, and reinitialize.
-*/
- rt2400pci_init_rxdesc(rt2x00dev, rt2x00dev-ring[RING_RX]);
- rt2400pci_init_txdesc(rt2x00dev, rt2x00dev-ring[RING_TX]);
- rt2400pci_init_txdesc(rt2x00dev, rt2x00dev-ring[RING_ATIM]);
- rt2400pci_init_txdesc(rt2x00dev, rt2x00dev-ring[RING_PRIO]);
- rt2400pci_init_txdesc(rt2x00dev, rt2x00dev-ring[RING_BEACON]);
-
- /*
-* Enable RX again.
-*/
- rt2x00_register_read(rt2x00dev, RXCSR0, reg);
- rt2x00_set_field32(reg, RXCSR0_DISABLE_RX, 0);
- rt2x00_register_write(rt2x00dev, RXCSR0, reg);
-
- return 0;
+ rt2400pci_disable_radio(rt2x00dev);
+ return rt2400pci_enable_radio(rt2x00dev);
}
static int rt2400pci_add_interface(struct net_device *net_dev,
diff -rU3 wireless-dev-suspend/drivers/net/wireless/d80211/rt2x00/rt2500pci.c
wireless-dev-reset/drivers/net/wireless/d80211/rt2x00/rt2500pci.c
--- wireless-dev-suspend/drivers/net/wireless/d80211/rt2x00/rt2500pci.c
2006-07-25 23:27:54.0 +0200
+++ wireless-dev-reset/drivers/net/wireless/d80211/rt2x00/rt2500pci.c
2006-07-26 10:41:32.0 +0200
@@ -2040,42 +2040,9 @@
static int rt2500pci_reset(struct net_device *net_dev)
{
struct rt2x00_dev *rt2x00dev = ieee80211_dev_hw_data(net_dev);
- u32 reg;
-
- /*
-* Cancel RX and TX.
-*/
- rt2x00_register_read(rt2x00dev, TXCSR0, reg);
- rt2x00_set_field32(reg, TXCSR0_ABORT, 1);
- rt2x00_register_write(rt2x00dev, TXCSR0, reg);
-
- rt2x00_register_read(rt2x00dev, RXCSR0, reg);
- rt2x00_set_field32(reg, RXCSR0_DISABLE_RX, 1);
- rt2x00_register_write(rt2x00dev, RXCSR0, reg);
-
- /*
-* Clear interrupts.
-*/
- rt2x00_register_read(rt2x00dev, CSR7, reg);
- rt2x00_register_write(rt2x00dev, CSR7, reg);
- /*
-* Clear all rings, and reinitialize.
-*/
- rt2500pci_init_rxdesc(rt2x00dev, rt2x00dev-ring[RING_RX]);
- rt2500pci_init_txdesc(rt2x00dev, rt2x00dev-ring[RING_TX]);
- rt2500pci_init_txdesc(rt2x00dev, rt2x00dev-ring[RING_ATIM]);
- rt2500pci_init_txdesc(rt2x00dev, rt2x00dev-ring[RING_PRIO]);
- rt2500pci_init_txdesc(rt2x00dev, rt2x00dev-ring[RING_BEACON]);
-
- /*
-* Enable RX again.
-*/
- rt2x00_register_read(rt2x00dev, RXCSR0, reg);
- rt2x00_set_field32(reg, RXCSR0_DISABLE_RX, 0);
- rt2x00_register_write(rt2x00dev, RXCSR0, reg);
-
- return 0;
+ rt2500pci_disable_radio(rt2x00dev);
+ return rt2500pci_enable_radio(rt2x00dev);
}
static int rt2500pci_add_interface(struct net_device *net_dev,
diff -rU3 wireless-dev-suspend/drivers/net/wireless/d80211/rt2x00/rt2500usb.c
wireless-dev-reset/drivers/net/wireless/d80211/rt2x00/rt2500usb.c
--- wireless-dev-suspend/drivers/net/wireless/d80211/rt2x00/rt2500usb.c
2006-07-25 23:28:54.0 +0200
+++ wireless-dev-reset/drivers/net/wireless/d80211/rt2x00/rt2500usb.c
2006-07-26 10:42:02.0 +0200
@@ -1738,28 +1738,12 @@
return NETDEV_TX_OK;
}
-static inline void rt2500usb_reset_ring(struct data_ring *ring)
-{
- unsigned int i;
-
- for (i = 0; i ring-stats.limit; i++)
- usb_kill_urb(ring-entry[i].urb);
-}
-
static int rt2500usb_reset(struct net_device *net_dev)
{
struct rt2x00_dev *rt2x00dev = ieee80211_dev_hw_data(net_dev);
- rt2500usb_reset_ring(rt2x00dev-ring[RING_RX]);
- rt2500usb_reset_ring(rt2x00dev-ring[RING_TX]);
- rt2500usb_reset_ring(rt2x00dev-ring[RING_ATIM]);
- rt2500usb_reset_ring(rt2x00dev-ring[RING_PRIO]);
-
Re: [PATCH 19/24] RT2x00: Simplify *_reset() functions
From Ivo van Doorn [EMAIL PROTECTED]
The reset function can be greatly simplified.
when a reset is required the best thing to do,
is to switch the radio off and on again.
Signed-off-by: Ivo van Doorn [EMAIL PROTECTED]
diff -rU3 wireless-dev-suspend/drivers/net/wireless/d80211/rt2x00/rt2400pci.c
wireless-dev-reset/drivers/net/wireless/d80211/rt2x00/rt2400pci.c
--- wireless-dev-suspend/drivers/net/wireless/d80211/rt2x00/rt2400pci.c
2006-07-25 23:27:17.0 +0200
+++ wireless-dev-reset/drivers/net/wireless/d80211/rt2x00/rt2400pci.c
2006-07-26 10:41:21.0 +0200
@@ -1905,42 +1905,9 @@
static int rt2400pci_reset(struct net_device *net_dev)
{
struct rt2x00_dev *rt2x00dev = ieee80211_dev_hw_data(net_dev);
- u32 reg;
-
- /*
-* Cancel RX and TX.
-*/
- rt2x00_register_read(rt2x00dev, TXCSR0, reg);
- rt2x00_set_field32(reg, TXCSR0_ABORT, 1);
- rt2x00_register_write(rt2x00dev, TXCSR0, reg);
-
- rt2x00_register_read(rt2x00dev, RXCSR0, reg);
- rt2x00_set_field32(reg, RXCSR0_DISABLE_RX, 1);
- rt2x00_register_write(rt2x00dev, RXCSR0, reg);
-
- /*
-* Clear interrupts.
-*/
- rt2x00_register_read(rt2x00dev, CSR7, reg);
- rt2x00_register_write(rt2x00dev, CSR7, reg);
- /*
-* Clear all rings, and reinitialize.
-*/
- rt2400pci_init_rxdesc(rt2x00dev, rt2x00dev-ring[RING_RX]);
- rt2400pci_init_txdesc(rt2x00dev, rt2x00dev-ring[RING_TX]);
- rt2400pci_init_txdesc(rt2x00dev, rt2x00dev-ring[RING_ATIM]);
- rt2400pci_init_txdesc(rt2x00dev, rt2x00dev-ring[RING_PRIO]);
- rt2400pci_init_txdesc(rt2x00dev, rt2x00dev-ring[RING_BEACON]);
-
- /*
-* Enable RX again.
-*/
- rt2x00_register_read(rt2x00dev, RXCSR0, reg);
- rt2x00_set_field32(reg, RXCSR0_DISABLE_RX, 0);
- rt2x00_register_write(rt2x00dev, RXCSR0, reg);
-
- return 0;
+ rt2400pci_disable_radio(rt2x00dev);
+ return rt2400pci_enable_radio(rt2x00dev);
}
static int rt2400pci_add_interface(struct net_device *net_dev,
diff -rU3 wireless-dev-suspend/drivers/net/wireless/d80211/rt2x00/rt2500pci.c
wireless-dev-reset/drivers/net/wireless/d80211/rt2x00/rt2500pci.c
--- wireless-dev-suspend/drivers/net/wireless/d80211/rt2x00/rt2500pci.c
2006-07-25 23:27:54.0 +0200
+++ wireless-dev-reset/drivers/net/wireless/d80211/rt2x00/rt2500pci.c
2006-07-26 10:41:32.0 +0200
@@ -2040,42 +2040,9 @@
static int rt2500pci_reset(struct net_device *net_dev)
{
struct rt2x00_dev *rt2x00dev = ieee80211_dev_hw_data(net_dev);
- u32 reg;
-
- /*
-* Cancel RX and TX.
-*/
- rt2x00_register_read(rt2x00dev, TXCSR0, reg);
- rt2x00_set_field32(reg, TXCSR0_ABORT, 1);
- rt2x00_register_write(rt2x00dev, TXCSR0, reg);
-
- rt2x00_register_read(rt2x00dev, RXCSR0, reg);
- rt2x00_set_field32(reg, RXCSR0_DISABLE_RX, 1);
- rt2x00_register_write(rt2x00dev, RXCSR0, reg);
-
- /*
-* Clear interrupts.
-*/
- rt2x00_register_read(rt2x00dev, CSR7, reg);
- rt2x00_register_write(rt2x00dev, CSR7, reg);
- /*
-* Clear all rings, and reinitialize.
-*/
- rt2500pci_init_rxdesc(rt2x00dev, rt2x00dev-ring[RING_RX]);
- rt2500pci_init_txdesc(rt2x00dev, rt2x00dev-ring[RING_TX]);
- rt2500pci_init_txdesc(rt2x00dev, rt2x00dev-ring[RING_ATIM]);
- rt2500pci_init_txdesc(rt2x00dev, rt2x00dev-ring[RING_PRIO]);
- rt2500pci_init_txdesc(rt2x00dev, rt2x00dev-ring[RING_BEACON]);
-
- /*
-* Enable RX again.
-*/
- rt2x00_register_read(rt2x00dev, RXCSR0, reg);
- rt2x00_set_field32(reg, RXCSR0_DISABLE_RX, 0);
- rt2x00_register_write(rt2x00dev, RXCSR0, reg);
-
- return 0;
+ rt2500pci_disable_radio(rt2x00dev);
+ return rt2500pci_enable_radio(rt2x00dev);
}
static int rt2500pci_add_interface(struct net_device *net_dev,
diff -rU3 wireless-dev-suspend/drivers/net/wireless/d80211/rt2x00/rt2500usb.c
wireless-dev-reset/drivers/net/wireless/d80211/rt2x00/rt2500usb.c
--- wireless-dev-suspend/drivers/net/wireless/d80211/rt2x00/rt2500usb.c
2006-07-25 23:28:54.0 +0200
+++ wireless-dev-reset/drivers/net/wireless/d80211/rt2x00/rt2500usb.c
2006-07-26 10:42:02.0 +0200
@@ -1738,28 +1738,12 @@
return NETDEV_TX_OK;
}
-static inline void rt2500usb_reset_ring(struct data_ring *ring)
-{
- unsigned int i;
-
- for (i = 0; i ring-stats.limit; i++)
- usb_kill_urb(ring-entry[i].urb);
-}
-
static int rt2500usb_reset(struct net_device *net_dev)
{
struct rt2x00_dev *rt2x00dev = ieee80211_dev_hw_data(net_dev);
- rt2500usb_reset_ring(rt2x00dev-ring[RING_RX]);
- rt2500usb_reset_ring(rt2x00dev-ring[RING_TX]);
- rt2500usb_reset_ring(rt2x00dev-ring[RING_ATIM]);
- rt2500usb_reset_ring(rt2x00dev-ring[RING_PRIO]);
-
