diff mbox

nl80211: Keep QCA vendor extensions together

Message ID CAH7ZN-zy2-VNf8GqMwcnwyj=XkRfz1P8aQXOJCU_+JwF-JBcGQ@mail.gmail.com
State Accepted
Headers show

Commit Message

Dmitry Shmidt June 27, 2016, 10:58 p.m. UTC 
To: hostap@lists.infradead.org

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
---
 src/drivers/driver_nl80211.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Jouni Malinen July 3, 2016, 8:31 p.m. UTC | #1 
Thanks, applied.
diff mbox

Patch

diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index c89665b..d1c28aa 100644
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -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,