Skip to content

Commit

Permalink
mwl8k: bail out if there is no AP firmware image support for this chip
Browse files Browse the repository at this point in the history
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Lennert Buytenhek authored and John W. Linville committed Jan 5, 2010
1 parent 4113f75 commit 9194223
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions drivers/net/wireless/mwl8k.c
Original file line number Diff line number Diff line change
Expand Up @@ -3361,10 +3361,17 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
mwl8k_release_firmware(priv);


if (priv->ap_fw)
if (priv->ap_fw) {
priv->rxd_ops = priv->device_info->ap_rxd_ops;
else
if (priv->rxd_ops == NULL) {
printk(KERN_ERR "%s: Driver does not have AP "
"firmware image support for this hardware\n",
wiphy_name(hw->wiphy));
goto err_stop_firmware;
}
} else {
priv->rxd_ops = &rxd_sta_ops;
}

priv->sniffer_enabled = false;
priv->wmm_enabled = false;
Expand Down

0 comments on commit 9194223

Please sign in to comment.