Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 171455
b: refs/heads/master
c: 547810e
h: refs/heads/master
i:
  171453: c3c051a
  171451: 49233d3
  171447: 1193c92
  171439: 2166f7f
  171423: 87a6414
  171391: 02402d3
v: v3
  • Loading branch information
Lennert Buytenhek authored and John W. Linville committed Nov 6, 2009
1 parent 07f3b9a commit 91a3ce8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 54bc3a0d7a0c9a13da31183609c42cf7786138e1
refs/heads/master: 547810e3af15cf9efc3b3ebaa7b006ef606fc892
4 changes: 3 additions & 1 deletion trunk/drivers/net/wireless/mwl8k.c
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ struct mwl8k_device_info {
char *helper_image;
char *fw_image;
struct rxd_ops *rxd_ops;
u16 modes;
};

struct mwl8k_rx_queue {
Expand Down Expand Up @@ -3016,6 +3017,7 @@ static struct mwl8k_device_info di_8687 = {
.helper_image = "mwl8k/helper_8687.fw",
.fw_image = "mwl8k/fmimage_8687.fw",
.rxd_ops = &rxd_8687_ops,
.modes = BIT(NL80211_IFTYPE_STATION),
};

static DEFINE_PCI_DEVICE_TABLE(mwl8k_pci_id_table) = {
Expand Down Expand Up @@ -3122,7 +3124,7 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,

hw->queues = MWL8K_TX_QUEUES;

hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION);
hw->wiphy->interface_modes = priv->device_info->modes;

/* Set rssi and noise values to dBm */
hw->flags |= IEEE80211_HW_SIGNAL_DBM | IEEE80211_HW_NOISE_DBM;
Expand Down

0 comments on commit 91a3ce8

Please sign in to comment.