b43: HT-PHY: replace radio routing magic numbers

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/b43/phy_ht.c b/drivers/net/wireless/b43/phy_ht.c
index f09bb6e6307f65399ffccbd54551282a3a4f5950..8df92e12799a8a456f8da50dd91bfe65d0ffd3e9 100644 (file)
--- a/drivers/net/wireless/b43/phy_ht.c
+++ b/drivers/net/wireless/b43/phy_ht.c
@@ -57,7 +57,7 @@ static void b43_radio_2059_channel_setup(struct b43_wldev *dev,
        b43_radio_write(dev, 0x98, e->radio_syn98);
 
        for (i = 0; i < 2; i++) {
-               routing = i ? 0x800 : 0x400;
+               routing = i ? R2059_RXRX1 : R2059_TXRX0;
                b43_radio_write(dev, routing | 0x4a, e->radio_rxtx4a);
                b43_radio_write(dev, routing | 0x58, e->radio_rxtx58);
                b43_radio_write(dev, routing | 0x5a, e->radio_rxtx5a);

diff --git a/drivers/net/wireless/b43/radio_2059.h b/drivers/net/wireless/b43/radio_2059.h
index c2874b145266e1b39afa12e8ee230fd110d3cf43..e4d69e55e9fe84ac748f47e33b9d9a038886f74a 100644 (file)
--- a/drivers/net/wireless/b43/radio_2059.h
+++ b/drivers/net/wireless/b43/radio_2059.h
@@ -5,6 +5,11 @@
 
 #include "phy_ht.h"
 
+#define R2059_SYN                      0x000
+#define R2059_TXRX0                    0x400
+#define R2059_RXRX1                    0x800
+#define R2059_ALL                      0xC00
+
 /* Values for various registers uploaded on channel switching */
 struct b43_phy_ht_channeltab_e_radio2059 {
        /* The channel frequency in MHz */