]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
rtl8187: remove setting of beacon/atim registers from initialization
authorHerton Ronaldo Krzesinski <herton@mandriva.com.br>
Tue, 2 Nov 2010 00:59:32 +0000 (22:59 -0200)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 15 Nov 2010 18:25:39 +0000 (13:25 -0500)
On 8187B path, we set a initial value for beacon interval and atim
window on initialization. But this isn't needed, since same setup is
done on rtl8187_config.

Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/rtl818x/rtl8187_dev.c

index 3dbf3053c09fad66868f7212b4dd066a5f9fc81a..30c2120dd3028b85932fe4ecdfe31953bce53ae3 100644 (file)
@@ -779,8 +779,6 @@ static int rtl8187b_init_hw(struct ieee80211_hw *dev)
        rtl818x_iowrite16_idx(priv, (__le16 *)0xFFE0, 0x0FFF, 1);
        rtl818x_iowrite8_idx(priv, (u8 *)0xFFE2, 0x00, 1);
 
-       rtl818x_iowrite16(priv, &priv->map->BEACON_INTERVAL, 100);
-       rtl818x_iowrite16(priv, &priv->map->ATIM_WND, 2);
        rtl818x_iowrite16_idx(priv, (__le16 *)0xFFD4, 0xFFFF, 1);
 
        rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD,