Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mt76: mt7915: make second phy mac unique when overridden #817

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

mt76: mt7915: make second phy mac unique when overridden #817

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions mt7915/init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,16 +661,18 @@ mt7915_register_ext_phy(struct mt7915_dev *dev, struct mt7915_phy *phy)

memcpy(mphy->macaddr, dev->mt76.eeprom.data + MT_EE_MAC_ADDR2,
ETH_ALEN);
if (!is_valid_ether_addr(mphy->macaddr))
memcpy(mphy->macaddr, dev->mt76.eeprom.data + MT_EE_MAC_ADDR,
ETH_ALEN);
mt76_eeprom_override(mphy);

/* Make the secondary PHY MAC address local without overlapping with
* the usual MAC address allocation scheme on multiple virtual interfaces
*/
if (!is_valid_ether_addr(mphy->macaddr)) {
memcpy(mphy->macaddr, dev->mt76.eeprom.data + MT_EE_MAC_ADDR,
ETH_ALEN);
if (ether_addr_equal(mphy->macaddr, dev->mt76.phy.macaddr)) {
mphy->macaddr[0] |= 2;
mphy->macaddr[0] ^= BIT(7);
}
mt76_eeprom_override(mphy);

/* init wiphy according to mphy and phy */
mt7915_init_wiphy(phy);
Expand Down