diff options
author | Lennert Buytenhek <buytenh@wantstofly.org> | 2009-10-22 14:21:05 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-11-06 16:54:38 -0500 |
commit | 04b147b19303724aac5ee8e56f113f1935a5c255 (patch) | |
tree | 4e8d83ce12a0509bf422609709dcc6d9de3dbec7 /drivers/net/wireless | |
parent | 547810e3af15cf9efc3b3ebaa7b006ef606fc892 (diff) |
mwl8k: rename mwl8k_cmd_get_hw_spec() to mwl8k_cmd_get_hw_spec_sta()
As the AP version of the command uses a different format.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/mwl8k.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c index 11669ed8829d..90bf19cb6bf4 100644 --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c | |||
@@ -1538,9 +1538,9 @@ static int mwl8k_post_cmd(struct ieee80211_hw *hw, struct mwl8k_cmd_pkt *cmd) | |||
1538 | } | 1538 | } |
1539 | 1539 | ||
1540 | /* | 1540 | /* |
1541 | * GET_HW_SPEC. | 1541 | * CMD_GET_HW_SPEC (STA version). |
1542 | */ | 1542 | */ |
1543 | struct mwl8k_cmd_get_hw_spec { | 1543 | struct mwl8k_cmd_get_hw_spec_sta { |
1544 | struct mwl8k_cmd_pkt header; | 1544 | struct mwl8k_cmd_pkt header; |
1545 | __u8 hw_rev; | 1545 | __u8 hw_rev; |
1546 | __u8 host_interface; | 1546 | __u8 host_interface; |
@@ -1559,10 +1559,10 @@ struct mwl8k_cmd_get_hw_spec { | |||
1559 | __le32 total_rxd; | 1559 | __le32 total_rxd; |
1560 | } __attribute__((packed)); | 1560 | } __attribute__((packed)); |
1561 | 1561 | ||
1562 | static int mwl8k_cmd_get_hw_spec(struct ieee80211_hw *hw) | 1562 | static int mwl8k_cmd_get_hw_spec_sta(struct ieee80211_hw *hw) |
1563 | { | 1563 | { |
1564 | struct mwl8k_priv *priv = hw->priv; | 1564 | struct mwl8k_priv *priv = hw->priv; |
1565 | struct mwl8k_cmd_get_hw_spec *cmd; | 1565 | struct mwl8k_cmd_get_hw_spec_sta *cmd; |
1566 | int rc; | 1566 | int rc; |
1567 | int i; | 1567 | int i; |
1568 | 1568 | ||
@@ -3211,7 +3211,7 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev, | |||
3211 | iowrite32(MWL8K_A2H_EVENTS, priv->regs + MWL8K_HIU_A2H_INTERRUPT_MASK); | 3211 | iowrite32(MWL8K_A2H_EVENTS, priv->regs + MWL8K_HIU_A2H_INTERRUPT_MASK); |
3212 | 3212 | ||
3213 | /* Get config data, mac addrs etc */ | 3213 | /* Get config data, mac addrs etc */ |
3214 | rc = mwl8k_cmd_get_hw_spec(hw); | 3214 | rc = mwl8k_cmd_get_hw_spec_sta(hw); |
3215 | if (rc) { | 3215 | if (rc) { |
3216 | printk(KERN_ERR "%s: Cannot initialise firmware\n", | 3216 | printk(KERN_ERR "%s: Cannot initialise firmware\n", |
3217 | wiphy_name(hw->wiphy)); | 3217 | wiphy_name(hw->wiphy)); |