revert mt76_eeprom_override call reordering

This call order is necessary for handling the device MAC address

Signed-off-by: Felix Fietkau <[email protected]>
This commit is contained in:
Felix Fietkau
2017-02-03 14:25:08 +01:00
parent 184e068b6f
commit a5eaeb27d6
5 changed files with 4 additions and 3 deletions
+1
View File
@@ -97,6 +97,7 @@ mt76_eeprom_override(struct mt76_dev *dev)
dev->macaddr);
}
}
EXPORT_SYMBOL_GPL(mt76_eeprom_override);
int
mt76_eeprom_init(struct mt76_dev *dev, int len)
-2
View File
@@ -206,8 +206,6 @@ int mt76_register_device(struct mt76_dev *dev, bool vht,
spin_lock_init(&dev->cc_lock);
INIT_LIST_HEAD(&dev->txwi_cache);
mt76_eeprom_override(dev);
SET_IEEE80211_DEV(hw, dev->dev);
SET_IEEE80211_PERM_ADDR(hw, dev->macaddr);
+1 -1
View File
@@ -314,6 +314,7 @@ void mt76_unregister_device(struct mt76_dev *dev);
struct dentry *mt76_register_debugfs(struct mt76_dev *dev);
int mt76_eeprom_init(struct mt76_dev *dev, int len);
void mt76_eeprom_override(struct mt76_dev *dev);
static inline struct ieee80211_txq *
mtxq_to_txq(struct mt76_txq *mtxq)
@@ -350,6 +351,5 @@ int mt76_get_survey(struct ieee80211_hw *hw, int idx,
void mt76_tx_free(struct mt76_dev *dev);
void mt76_put_txwi(struct mt76_dev *dev, struct mt76_txwi_cache *t);
void mt76_rx_complete(struct mt76_dev *dev, enum mt76_rxq_id q);
void mt76_eeprom_override(struct mt76_dev *dev);
#endif
+1
View File
@@ -157,6 +157,7 @@ int mt7603_eeprom_init(struct mt7603_dev *dev)
ETH_ALEN);
mt7603_apply_cal_free_data(dev, dev->mt76.otp.data);
mt76_eeprom_override(&dev->mt76);
return 0;
}
+1
View File
@@ -637,6 +637,7 @@ int mt76x2_eeprom_init(struct mt76x2_dev *dev)
mt76x2_eeprom_parse_hw_cap(dev);
mt76x2_eeprom_get_macaddr(dev);
mt76_eeprom_override(&dev->mt76);
dev->mt76.macaddr[0] &= ~BIT(1);
return 0;