]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
nl80211: Keep QCA vendor extensions together
authorDmitry Shmidt <dimitrysh@google.com>
Mon, 27 Jun 2016 22:54:56 +0000 (15:54 -0700)
committerJouni Malinen <j@w1.fi>
Wed, 29 Jun 2016 21:25:31 +0000 (00:25 +0300)
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
src/drivers/driver_nl80211.c

index d3e4cfb00f57ed6708eb66cc0113952f351dabef..1afb99a8fba3bed641dc4e7c019f70d91778c275 100644 (file)
@@ -9338,9 +9338,6 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
        .vendor_cmd = nl80211_vendor_cmd,
        .set_qos_map = nl80211_set_qos_map,
        .set_wowlan = nl80211_set_wowlan,
-#ifdef CONFIG_DRIVER_NL80211_QCA
-       .roaming = nl80211_roaming,
-#endif /* CONFIG_DRIVER_NL80211_QCA */
        .set_mac_addr = nl80211_set_mac_addr,
 #ifdef CONFIG_MESH
        .init_mesh = wpa_driver_nl80211_init_mesh,
@@ -9355,6 +9352,7 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
        .del_tx_ts = nl80211_del_ts,
        .get_ifindex = nl80211_get_ifindex,
 #ifdef CONFIG_DRIVER_NL80211_QCA
+       .roaming = nl80211_roaming,
        .do_acs = wpa_driver_do_acs,
        .set_band = nl80211_set_band,
        .get_pref_freq_list = nl80211_get_pref_freq_list,