Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 314119
b: refs/heads/master
c: 7b03c30
h: refs/heads/master
i:
  314117: e510068
  314115: e3de603
  314111: 36bccb5
v: v3
  • Loading branch information
Luciano Coelho committed Jun 5, 2012
1 parent ca22d49 commit c7dd812
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 858403ab4434a3acd59eb892a49e1dbea30a2fcf
refs/heads/master: 7b03c306da4a5ae415036a16b1a5844ca42e2778
12 changes: 12 additions & 0 deletions trunk/drivers/net/wireless/ti/wl18xx/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ 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 int pwr_limit_reference_11_abg = -1;

static const u8 wl18xx_rate_to_idx_2ghz[] = {
/* MCS rates are used only with 11n */
Expand Down Expand Up @@ -1190,6 +1191,13 @@ int __devinit wl18xx_probe(struct platform_device *pdev)
priv->conf.phy.high_band_component_type =
high_band_component_type;

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

if (!checksum_param) {
wl18xx_ops.set_rx_csum = NULL;
wl18xx_ops.init_vif = NULL;
Expand Down Expand Up @@ -1270,6 +1278,10 @@ 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_param(pwr_limit_reference_11_abg, uint, S_IRUSR);
MODULE_PARM_DESC(pwr_limit_reference_11_abg, "Power limit reference: u8 "
"(default is 0xc8)");

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

0 comments on commit c7dd812

Please sign in to comment.