Skip to content

Commit

Permalink
Revert "mt76x2: drop wiphy->addresses"
Browse files Browse the repository at this point in the history
This reverts commit 9de77e1.
  • Loading branch information
nbd168 committed Dec 17, 2017
1 parent 860b185 commit bcd576e
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
2 changes: 2 additions & 0 deletions mt76x2.h
Expand Up @@ -84,6 +84,8 @@ struct mt76x2_calibration {
struct mt76x2_dev {
struct mt76_dev mt76; /* must be first */

struct mac_address macaddr_list[8];

struct mutex mutex;

const u16 *beacon_offsets;
Expand Down
16 changes: 15 additions & 1 deletion mt76x2_init.c
Expand Up @@ -797,7 +797,7 @@ int mt76x2_register_device(struct mt76x2_dev *dev)
struct wiphy *wiphy = hw->wiphy;
void *status_fifo;
int fifo_size;
int ret;
int i, ret;

fifo_size = roundup_pow_of_two(32 * sizeof(struct mt76x2_tx_status));
status_fifo = devm_kzalloc(dev->mt76.dev, fifo_size, GFP_KERNEL);
Expand All @@ -819,6 +819,20 @@ int mt76x2_register_device(struct mt76x2_dev *dev)
hw->sta_data_size = sizeof(struct mt76x2_sta);
hw->vif_data_size = sizeof(struct mt76x2_vif);

for (i = 0; i < ARRAY_SIZE(dev->macaddr_list); i++) {
u8 *addr = dev->macaddr_list[i].addr;

memcpy(addr, dev->mt76.macaddr, ETH_ALEN);

if (!i)
continue;

addr[0] |= BIT(1);
addr[0] ^= ((i - 1) << 2);
}
wiphy->addresses = dev->macaddr_list;
wiphy->n_addresses = ARRAY_SIZE(dev->macaddr_list);

wiphy->iface_combinations = if_comb;
wiphy->n_iface_combinations = ARRAY_SIZE(if_comb);

Expand Down

0 comments on commit bcd576e

Please sign in to comment.