mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-10 16:21:45 -04:00
staging: rtl8192e: Remove constant variable chnl_plan
Remove constant variable chnl_plan and replace it with its constant. Remove equation that limits maximum value of chnl_plan as it is always false. Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> Link: https://lore.kernel.org/r/e46f16227877fe9853c9d15992e7fd27a0ceeae6.1700296319.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
589599d4e9
commit
b6806a4b17
@@ -396,8 +396,6 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)
|
||||
break;
|
||||
}
|
||||
|
||||
priv->chnl_plan = COUNTRY_CODE_WORLD_WIDE_13;
|
||||
|
||||
if (priv->eeprom_vid == 0x1186 && priv->eeprom_did == 0x3304)
|
||||
priv->rtllib->bSupportRemoteWakeUp = true;
|
||||
else
|
||||
|
||||
@@ -795,13 +795,8 @@ static short _rtl92e_get_channel_map(struct net_device *dev)
|
||||
|
||||
struct r8192_priv *priv = rtllib_priv(dev);
|
||||
|
||||
if (priv->chnl_plan >= COUNTRY_CODE_MAX) {
|
||||
netdev_info(dev,
|
||||
"rtl819x_init:Error channel plan! Set to default.\n");
|
||||
priv->chnl_plan = COUNTRY_CODE_FCC;
|
||||
}
|
||||
dot11d_init(priv->rtllib);
|
||||
dot11d_channel_map(priv->chnl_plan, priv->rtllib);
|
||||
dot11d_channel_map(COUNTRY_CODE_WORLD_WIDE_13, priv->rtllib);
|
||||
for (i = 1; i <= 11; i++)
|
||||
(priv->rtllib->active_channel_map)[i] = 1;
|
||||
(priv->rtllib->active_channel_map)[12] = 2;
|
||||
|
||||
@@ -310,7 +310,6 @@ struct r8192_priv {
|
||||
|
||||
bool tx_pwr_data_read_from_eeprom;
|
||||
|
||||
u16 chnl_plan;
|
||||
u8 hw_rf_off_action;
|
||||
|
||||
bool rf_change_in_progress;
|
||||
|
||||
Reference in New Issue
Block a user