Skip to content

Commit

Permalink
wl18xx: export low/high band component values as module params
Browse files Browse the repository at this point in the history
We use hardcoded values for the different board types.  In some cases
we may need to override the defaults, so export the values as module
params.  If not defined, the defaults for the specified board type
will be used.

Signed-off-by: Luciano Coelho <coelho@ti.com>
Signed-off-by: Arik Nemtsov <arik@wizery.com>
  • Loading branch information
Luciano Coelho committed Jun 5, 2012
1 parent 5add82e commit 858403a
Showing 1 changed file with 46 additions and 0 deletions.
46 changes: 46 additions & 0 deletions drivers/net/wireless/ti/wl18xx/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ static int n_antennas_2_param = 1;
static int n_antennas_5_param = 1;
static bool checksum_param = true;
static bool enable_11a_param = true;
static int low_band_component = -1;
static int low_band_component_type = -1;
static int high_band_component = -1;
static int high_band_component_type = -1;

static const u8 wl18xx_rate_to_idx_2ghz[] = {
/* MCS rates are used only with 11n */
Expand Down Expand Up @@ -1160,6 +1164,32 @@ int __devinit wl18xx_probe(struct platform_device *pdev)
goto out_free;
}

/*
* If the module param is not set, update it with the one from
* conf. If it is set, overwrite conf with it.
*/
if (low_band_component == -1)
low_band_component = priv->conf.phy.low_band_component;
else
priv->conf.phy.low_band_component = low_band_component;
if (low_band_component_type == -1)
low_band_component_type =
priv->conf.phy.low_band_component_type;
else
priv->conf.phy.low_band_component_type =
low_band_component_type;

if (high_band_component == -1)
high_band_component = priv->conf.phy.high_band_component;
else
priv->conf.phy.high_band_component = high_band_component;
if (high_band_component_type == -1)
high_band_component_type =
priv->conf.phy.high_band_component_type;
else
priv->conf.phy.high_band_component_type =
high_band_component_type;

if (!checksum_param) {
wl18xx_ops.set_rx_csum = NULL;
wl18xx_ops.init_vif = NULL;
Expand Down Expand Up @@ -1224,6 +1254,22 @@ MODULE_PARM_DESC(checksum, "Enable TCP checksum: boolean (defaults to true)");
module_param_named(enable_11a, enable_11a_param, bool, S_IRUSR);
MODULE_PARM_DESC(enable_11a, "Enable 11a (5GHz): boolean (defaults to true)");

module_param(low_band_component, uint, S_IRUSR);
MODULE_PARM_DESC(low_band_component, "Low band component: u8 "
"(default is 0x01)");

module_param(low_band_component_type, uint, S_IRUSR);
MODULE_PARM_DESC(low_band_component_type, "Low band component type: u8 "
"(default is 0x05 or 0x06 depending on the board_type)");

module_param(high_band_component, uint, S_IRUSR);
MODULE_PARM_DESC(high_band_component, "High band component: u8, "
"(default is 0x01)");

module_param(high_band_component_type, uint, S_IRUSR);
MODULE_PARM_DESC(high_band_component_type, "High band component type: u8 "
"(default is 0x09)");

MODULE_LICENSE("GPL v2");
MODULE_AUTHOR("Luciano Coelho <coelho@ti.com>");
MODULE_FIRMWARE(WL18XX_FW_NAME);

0 comments on commit 858403a

Please sign in to comment.