OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 1... Line 1...
1 --- a/src/drivers/driver_nl80211.c 1 --- a/src/drivers/driver_nl80211.c
2 +++ b/src/drivers/driver_nl80211.c 2 +++ b/src/drivers/driver_nl80211.c
3 @@ -2634,10 +2634,15 @@ static int wpa_driver_nl80211_del_beacon 3 @@ -2566,10 +2566,15 @@ static int wpa_driver_nl80211_del_beacon
4 struct nl_msg *msg; 4 struct nl_msg *msg;
5 struct wpa_driver_nl80211_data *drv = bss->drv; 5 struct wpa_driver_nl80211_data *drv = bss->drv;
Line 6... Line 6...
6 6
7 + if (!bss->beacon_set) 7 + if (!bss->beacon_set)
Line 16... Line 16...
16 - msg = nl80211_drv_msg(drv, 0, NL80211_CMD_DEL_BEACON); 16 - msg = nl80211_drv_msg(drv, 0, NL80211_CMD_DEL_BEACON);
17 + msg = nl80211_bss_msg(bss, 0, NL80211_CMD_DEL_BEACON); 17 + msg = nl80211_bss_msg(bss, 0, NL80211_CMD_DEL_BEACON);
18 return send_and_recv_msgs(drv, msg, NULL, NULL); 18 return send_and_recv_msgs(drv, msg, NULL, NULL);
19 } 19 }
Line 20... Line 20...
20 20
21 @@ -4919,7 +4924,7 @@ static void nl80211_teardown_ap(struct i 21 @@ -4835,7 +4840,7 @@ static void nl80211_teardown_ap(struct i
Line 22... Line 22...
22 nl80211_mgmt_unsubscribe(bss, "AP teardown"); 22 nl80211_mgmt_unsubscribe(bss, "AP teardown");
23 23
24 nl80211_put_wiphy_data_ap(bss); 24 nl80211_put_wiphy_data_ap(bss);
25 - bss->beacon_set = 0; 25 - bss->beacon_set = 0;
Line 26... Line 26...
26 + wpa_driver_nl80211_del_beacon(bss); 26 + wpa_driver_nl80211_del_beacon(bss);
27 } 27 }
28 28
29 29
30 @@ -7160,8 +7165,6 @@ static int wpa_driver_nl80211_if_remove( 30 @@ -7040,8 +7045,6 @@ static int wpa_driver_nl80211_if_remove(
31 } else { 31 } else {
32 wpa_printf(MSG_DEBUG, "nl80211: First BSS - reassign context"); 32 wpa_printf(MSG_DEBUG, "nl80211: First BSS - reassign context");
33 nl80211_teardown_ap(bss); 33 nl80211_teardown_ap(bss);
34 - if (!bss->added_if && !drv->first_bss->next) 34 - if (!bss->added_if && !drv->first_bss->next)
35 - wpa_driver_nl80211_del_beacon(bss); 35 - wpa_driver_nl80211_del_beacon(bss);
36 nl80211_destroy_bss(bss); 36 nl80211_destroy_bss(bss);
37 if (!bss->added_if) 37 if (!bss->added_if)
38 i802_set_iface_flags(bss, 0); 38 i802_set_iface_flags(bss, 0);
39 @@ -7540,7 +7543,6 @@ static int wpa_driver_nl80211_deinit_ap( 39 @@ -7415,7 +7418,6 @@ static int wpa_driver_nl80211_deinit_ap(
Line 40... Line 40...
40 if (!is_ap_interface(drv->nlmode)) 40 if (!is_ap_interface(drv->nlmode))
41 return -1; 41 return -1;
42 wpa_driver_nl80211_del_beacon(bss); 42 wpa_driver_nl80211_del_beacon(bss);
43 - bss->beacon_set = 0; 43 - bss->beacon_set = 0;
44 44
45 /* 45 /*
46 * If the P2P GO interface was dynamically added, then it is 46 * If the P2P GO interface was dynamically added, then it is
47 @@ -7560,7 +7562,6 @@ static int wpa_driver_nl80211_stop_ap(vo 47 @@ -7435,7 +7437,6 @@ static int wpa_driver_nl80211_stop_ap(vo