On Wed, May 1, 2013 at 5:17 PM, Gabor Juhos <juhosg@xxxxxxxxxxx> wrote: > Only do it after the queues are allocated. This > will allow to use the 'rt2x00dev->bcn->limit' > instead of 'rt2x00dev->ops->bcn->entry_num'. > > Signed-off-by: Gabor Juhos <juhosg@xxxxxxxxxxx> Acked-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx> > --- > drivers/net/wireless/rt2x00/rt2x00dev.c | 34 +++++++++++++++---------------- > 1 file changed, 17 insertions(+), 17 deletions(-) > > diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c > index b287467..6a20172 100644 > --- a/drivers/net/wireless/rt2x00/rt2x00dev.c > +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c > @@ -1301,23 +1301,6 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev) > (rt2x00dev->ops->max_ap_intf - 1); > > /* > - * Determine which operating modes are supported, all modes > - * which require beaconing, depend on the availability of > - * beacon entries. > - */ > - rt2x00dev->hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION); > - if (rt2x00dev->ops->bcn->entry_num > 0) > - rt2x00dev->hw->wiphy->interface_modes |= > - BIT(NL80211_IFTYPE_ADHOC) | > - BIT(NL80211_IFTYPE_AP) | > -#ifdef CONFIG_MAC80211_MESH > - BIT(NL80211_IFTYPE_MESH_POINT) | > -#endif > - BIT(NL80211_IFTYPE_WDS); > - > - rt2x00dev->hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN; > - > - /* > * Initialize work. > */ > rt2x00dev->workqueue = > @@ -1348,6 +1331,23 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev) > goto exit; > > /* > + * Determine which operating modes are supported, all modes > + * which require beaconing, depend on the availability of > + * beacon entries. > + */ > + rt2x00dev->hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION); > + if (rt2x00dev->ops->bcn->entry_num > 0) > + rt2x00dev->hw->wiphy->interface_modes |= > + BIT(NL80211_IFTYPE_ADHOC) | > + BIT(NL80211_IFTYPE_AP) | > +#ifdef CONFIG_MAC80211_MESH > + BIT(NL80211_IFTYPE_MESH_POINT) | > +#endif > + BIT(NL80211_IFTYPE_WDS); > + > + rt2x00dev->hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN; > + > + /* > * Initialize ieee80211 structure. > */ > retval = rt2x00lib_probe_hw(rt2x00dev); > -- > 1.7.10 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- --- Gertjan -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
