diff options
| author | Larry Finger | 2017-02-07 16:14:21 +0100 |
|---|---|---|
| committer | Kalle Valo | 2017-02-08 16:24:42 +0100 |
| commit | d5efe1535af07223b3ba81823a595be04f96969c (patch) | |
| tree | f4b71d5383575ea6e01e4eac6dab7ccfa543244e /drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c | |
| parent | brcmfmac: merge two remaining brcmf_err macros (diff) | |
| download | kernel-qcow2-linux-d5efe1535af07223b3ba81823a595be04f96969c.tar.gz kernel-qcow2-linux-d5efe1535af07223b3ba81823a595be04f96969c.tar.xz kernel-qcow2-linux-d5efe1535af07223b3ba81823a595be04f96969c.zip | |
rtlwifi: Move items out of rtl_pci_priv and rtl_usb_priv
In commit 6773386f977c ("rtlwifi: rtl8192c-common: Fix "BUG: KASAN:"),
a BUG detected when CONFIG_KASAN=y was fixed by reordering the layouts
of struct rtl_pci_priv, and struct rtl_usb_priv so that the variables
used by both PCI and USB drivers have the same offsets in both structs.
The better fix of relocating the critical variables into struct rtl_priv
was deferred as these changes do not have to be applied to stable
kernels.
This change also removes CamelCase variables with pLed0 => pled0.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c')
| -rw-r--r-- | drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c index 1bd1893bb401..cf28d25c551f 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c @@ -614,19 +614,19 @@ static bool _rtl92de_llt_table_init(struct ieee80211_hw *hw) static void _rtl92de_gen_refresh_led_state(struct ieee80211_hw *hw) { - struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw); + struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw)); - struct rtl_led *pLed0 = &(pcipriv->ledctl.sw_led0); + struct rtl_led *pled0 = &rtlpriv->ledctl.sw_led0; if (rtlpci->up_first_time) return; if (ppsc->rfoff_reason == RF_CHANGE_BY_IPS) - rtl92de_sw_led_on(hw, pLed0); + rtl92de_sw_led_on(hw, pled0); else if (ppsc->rfoff_reason == RF_CHANGE_BY_INIT) - rtl92de_sw_led_on(hw, pLed0); + rtl92de_sw_led_on(hw, pled0); else - rtl92de_sw_led_off(hw, pLed0); + rtl92de_sw_led_off(hw, pled0); } static bool _rtl92de_init_mac(struct ieee80211_hw *hw) |