diff options
| author | Jes Sorensen <Jes.Sorensen@redhat.com> | 2014-07-17 20:59:47 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-18 00:54:08 (GMT) |
| commit | df72ac93ee22daf1595e93b45de9e6804af0afde (patch) | |
| tree | 4bc3e2b792015cf37e1be64df8270f9931f3c5b6 /drivers/staging/rtl8723au/hal/usb_halinit.c | |
| parent | 6ec262733ecbb4578c2bd7d9d586f40fd587f636 (diff) | |
| download | linux-df72ac93ee22daf1595e93b45de9e6804af0afde.tar.xz | |
staging: rtl8723au: Use rtl8723au_set_media_status() to replace _InitNetworkType()
Reduce yet another duplicate implementation of set_media_status()
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8723au/hal/usb_halinit.c')
| -rw-r--r-- | drivers/staging/rtl8723au/hal/usb_halinit.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/staging/rtl8723au/hal/usb_halinit.c b/drivers/staging/rtl8723au/hal/usb_halinit.c index 8a7e644..d8f9f27 100644 --- a/drivers/staging/rtl8723au/hal/usb_halinit.c +++ b/drivers/staging/rtl8723au/hal/usb_halinit.c @@ -338,17 +338,6 @@ static void _InitQueuePriority(struct rtw_adapter *Adapter) _InitNormalChipQueuePriority(Adapter); } -static void _InitNetworkType(struct rtw_adapter *Adapter) -{ - u32 value32; - - value32 = rtl8723au_read32(Adapter, REG_CR); - - /* TODO: use the other function to set network type */ - value32 = (value32 & ~MASK_NETTYPE) | _NETTYPE(NT_LINK_AP); - rtl8723au_write32(Adapter, REG_CR, value32); -} - static void _InitTransferPageSize(struct rtw_adapter *Adapter) { /* Tx page size is always 128. */ @@ -756,7 +745,7 @@ static int rtl8723au_hal_init(struct rtw_adapter *Adapter) _InitInterrupt(Adapter); hw_var_set_macaddr(Adapter, Adapter->eeprompriv.mac_addr); - _InitNetworkType(Adapter);/* set msr */ + rtl8723a_set_media_status(Adapter, MSR_INFRA); _InitWMACSetting(Adapter); _InitAdaptiveCtrl(Adapter); _InitEDCA(Adapter); |