Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76dc4441 authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723au: Clean up namespace clashes with rtl8188eu driver 



Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 987bc3fe

drivers/staging/rtl8723au/os_dep/os_intfs.c

+9 −9
Original line number Diff line number Diff line
@@ -65,10 +65,10 @@ static int rtw_acm_method;/* 0:By SW 1:By HW. */ 
static int rtw_wmm_enable = 1;/*  default is set to enable the wmm. */

static int rtw_uapsd_enable;



static int rtw_ht_enable23A = 1;

static int rtw_ht_enable = 1;

/* 0 :diable, bit(0): enable 2.4g, bit(1): enable 5g */

static int rtw_cbw40_enable23A = 3;

static int rtw_ampdu_enable23A = 1;/* for enable tx_ampdu */

static int rtw_cbw40_enable = 3;

static int rtw_ampdu_enable = 1;/* for enable tx_ampdu */

/*  0: disable, bit(0):enable 2.4g, bit(1):enable 5g, default is set to enable

 * 2.4GHZ for IOT issue with bufflao's AP at 5GHZ

 */
@@ -129,9 +129,9 @@ module_param(rtw_wmm_enable, int, 0644); 
module_param(rtw_vrtl_carrier_sense, int, 0644);

module_param(rtw_vcs_type, int, 0644);

module_param(rtw_busy_thresh, int, 0644);

module_param(rtw_ht_enable23A, int, 0644);

module_param(rtw_cbw40_enable23A, int, 0644);

module_param(rtw_ampdu_enable23A, int, 0644);

module_param(rtw_ht_enable, int, 0644);

module_param(rtw_cbw40_enable, int, 0644);

module_param(rtw_ampdu_enable, int, 0644);

module_param(rtw_rx_stbc, int, 0644);

module_param(rtw_ampdu_amsdu, int, 0644);
@@ -202,9 +202,9 @@ static uint loadparam(struct rtw_adapter *padapter, struct net_device *pnetdev) 
	 /* UAPSD */

	registry_par->wmm_enable = (u8)rtw_wmm_enable;

	registry_par->uapsd_enable = (u8)rtw_uapsd_enable;

	registry_par->ht_enable = (u8)rtw_ht_enable23A;

	registry_par->cbw40_enable = (u8)rtw_cbw40_enable23A;

	registry_par->ampdu_enable = (u8)rtw_ampdu_enable23A;

	registry_par->ht_enable = (u8)rtw_ht_enable;

	registry_par->cbw40_enable = (u8)rtw_cbw40_enable;

	registry_par->ampdu_enable = (u8)rtw_ampdu_enable;

	registry_par->rx_stbc = (u8)rtw_rx_stbc;

	registry_par->ampdu_amsdu = (u8)rtw_ampdu_amsdu;

	registry_par->lowrate_two_xmit = (u8)rtw_lowrate_two_xmit;