mwl8k: fix MCS bitmap size in SET_RATE command

[deliverable/linux.git] / drivers / net / wireless / mwl8k.c

diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index 2ebfee4da3faa564de07a7feff1df57a8acdc902..f93eddda9c0fe26b7e5371ab7a3772c4867fd1b4 100644 (file)
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -400,6 +400,9 @@ static int mwl8k_request_firmware(struct mwl8k_priv *priv)
        return 0;
 }
 
+MODULE_FIRMWARE("mwl8k/helper_8687.fw");
+MODULE_FIRMWARE("mwl8k/fmimage_8687.fw");
+
 struct mwl8k_cmd_pkt {
        __le16  code;
        __le16  length;
@@ -631,7 +634,6 @@ struct ewc_ht_info {
 #define MWL8K_PEER_TYPE_ACCESSPOINT    2
 
 #define MWL8K_IEEE_LEGACY_DATA_RATES   13
-#define MWL8K_MCS_BITMAP_SIZE          16
 
 struct peer_capability_info {
        /* Peer type - AP vs. STA.  */
@@ -652,7 +654,7 @@ struct peer_capability_info {
        __u8    legacy_rates[MWL8K_IEEE_LEGACY_DATA_RATES];
 
        /* HT rate table. Intersection of our rates and peer rates.  */
-       __u8    ht_rates[MWL8K_MCS_BITMAP_SIZE];
+       __u8    ht_rates[16];
        __u8    pad[16];
 
        /* If set, interoperability mode, no proprietary extensions.  */
@@ -2635,8 +2637,8 @@ struct mwl8k_cmd_update_rateset {
        __u8    legacy_rates[MWL8K_RATE_INDEX_MAX_ARRAY];
 
        /* Bitmap for supported MCS codes.  */
-       __u8    mcs_set[MWL8K_IEEE_LEGACY_DATA_RATES];
-       __u8    reserved[MWL8K_IEEE_LEGACY_DATA_RATES];
+       __u8    mcs_set[16];
+       __u8    reserved[16];
 } __attribute__((packed));
 
 static int mwl8k_update_rateset(struct ieee80211_hw *hw,
@@ -2814,7 +2816,7 @@ static int mwl8k_start(struct ieee80211_hw *hw)
        struct mwl8k_priv *priv = hw->priv;
        int rc;
 
-       rc = request_irq(priv->pdev->irq, &mwl8k_interrupt,
+       rc = request_irq(priv->pdev->irq, mwl8k_interrupt,
                         IRQF_SHARED, MWL8K_NAME, hw);
        if (rc) {
                printk(KERN_ERR "%s: failed to register IRQ handler\n",
@@ -3479,7 +3481,7 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
        iowrite32(0, priv->regs + MWL8K_HIU_A2H_INTERRUPT_CLEAR_SEL);
        iowrite32(0xffffffff, priv->regs + MWL8K_HIU_A2H_INTERRUPT_STATUS_MASK);
 
-       rc = request_irq(priv->pdev->irq, &mwl8k_interrupt,
+       rc = request_irq(priv->pdev->irq, mwl8k_interrupt,
                         IRQF_SHARED, MWL8K_NAME, hw);
        if (rc) {
                printk(KERN_ERR "%s: failed to register IRQ handler\n",