| Message ID | 1354037225-30237-1-git-send-email-helmut.schaa@googlemail.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
Hi Helmut, On Tue, Nov 27, 2012 at 6:27 PM, Helmut Schaa <helmut.schaa@googlemail.com> wrote: > rt61pci and rt73usb support up to four MAC addresses but only the last > two bits may differ. Hence, tell mac80211 an addr_mask of 0x3. > > Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com> > --- > drivers/net/wireless/rt2x00/rt61pci.c | 3 +++ > drivers/net/wireless/rt2x00/rt73usb.c | 3 +++ > 2 files changed, 6 insertions(+), 0 deletions(-) > > diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c > index d6582a2..ee8b44f 100644 > --- a/drivers/net/wireless/rt2x00/rt61pci.c > +++ b/drivers/net/wireless/rt2x00/rt61pci.c > @@ -2771,6 +2771,9 @@ static int rt61pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev) > rt2x00_eeprom_addr(rt2x00dev, > EEPROM_MAC_ADDR_0)); > > + /* Only the last two bits are variable in rt61pci devices. */ > + rt2x00dev->hw->wiphy->addr_mask[ETH_ALEN - 1] = 0x3; > + > /* > * As rt61 has a global fallback table we cannot specify > * more then one tx rate per frame but since the hw will > diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c > index 24eec66..6014cfe 100644 > --- a/drivers/net/wireless/rt2x00/rt73usb.c > +++ b/drivers/net/wireless/rt2x00/rt73usb.c > @@ -2126,6 +2126,9 @@ static int rt73usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev) > rt2x00_eeprom_addr(rt2x00dev, > EEPROM_MAC_ADDR_0)); > > + /* Only the last two bits are variable in rt73usb devices. */ > + rt2x00dev->hw->wiphy->addr_mask[ETH_ALEN - 1] = 0x3; > + > /* > * Initialize hw_mode information. > */ I think it is possible to collapse your rt2800 related patch and this patch with a single patch only touching generic rt2x00 code. We could use the max_ap_intf field of the rt2x00_ops struct to determine the mask in a generic manner. So, we could have the following statement in generic code (e.g. in rt2x00lib_probe_dev): rt2x00dev->hw->wiphy->addr_mask[ETH_ALEN - 1] = (rt2x00dev->ops->max_ap_intf - 1); --- Gertjan -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, On Wed, Nov 28, 2012 at 8:57 AM, Gertjan van Wingerde <gwingerde@gmail.com> wrote: > I think it is possible to collapse your rt2800 related patch and this > patch with a single patch only touching generic rt2x00 code. > > We could use the max_ap_intf field of the rt2x00_ops struct to > determine the mask in a generic manner. > > So, we could have the following statement in generic code (e.g. in > rt2x00lib_probe_dev): > > rt2x00dev->hw->wiphy->addr_mask[ETH_ALEN - 1] = > (rt2x00dev->ops->max_ap_intf - 1); Good point. I'll change that accordingly. Thanks, Helmut -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c index d6582a2..ee8b44f 100644 --- a/drivers/net/wireless/rt2x00/rt61pci.c +++ b/drivers/net/wireless/rt2x00/rt61pci.c @@ -2771,6 +2771,9 @@ static int rt61pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev) rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0)); + /* Only the last two bits are variable in rt61pci devices. */ + rt2x00dev->hw->wiphy->addr_mask[ETH_ALEN - 1] = 0x3; + /* * As rt61 has a global fallback table we cannot specify * more then one tx rate per frame but since the hw will diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c index 24eec66..6014cfe 100644 --- a/drivers/net/wireless/rt2x00/rt73usb.c +++ b/drivers/net/wireless/rt2x00/rt73usb.c @@ -2126,6 +2126,9 @@ static int rt73usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev) rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0)); + /* Only the last two bits are variable in rt73usb devices. */ + rt2x00dev->hw->wiphy->addr_mask[ETH_ALEN - 1] = 0x3; + /* * Initialize hw_mode information. */
rt61pci and rt73usb support up to four MAC addresses but only the last two bits may differ. Hence, tell mac80211 an addr_mask of 0x3. Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com> --- drivers/net/wireless/rt2x00/rt61pci.c | 3 +++ drivers/net/wireless/rt2x00/rt73usb.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-)