Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9e43303 authored by Gabor Juhos's avatar Gabor Juhos Committed by John W. Linville
Browse files

rt2x00: rt2x00dev: defer operational mode detection 



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: default avatarGabor Juhos <juhosg@openwrt.org>
Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0879f875

drivers/net/wireless/rt2x00/rt2x00dev.c

+17 −17
Original line number Diff line number Diff line
@@ -1300,23 +1300,6 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev) 
	rt2x00dev->hw->wiphy->addr_mask[ETH_ALEN - 1] =

		(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.

	 */
@@ -1347,6 +1330,23 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev) 
	if (retval)

		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.

	 */