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/ap/hostapd.c 1 --- a/src/ap/hostapd.c
2 +++ b/src/ap/hostapd.c 2 +++ b/src/ap/hostapd.c
3 @@ -103,6 +103,25 @@ static void hostapd_reload_bss(struct ho 3 @@ -90,6 +90,25 @@ static void hostapd_reload_bss(struct ho
4 #endif /* CONFIG_NO_RADIUS */ 4 #endif /* CONFIG_NO_RADIUS */
Line 5... Line 5...
5 5
6 ssid = &hapd->conf->ssid; 6 ssid = &hapd->conf->ssid;
7 + 7 +
Line 24... Line 24...
24 + } 24 + }
25 + 25 +
26 if (!ssid->wpa_psk_set && ssid->wpa_psk && !ssid->wpa_psk->next && 26 if (!ssid->wpa_psk_set && ssid->wpa_psk && !ssid->wpa_psk->next &&
27 ssid->wpa_passphrase_set && ssid->wpa_passphrase) { 27 ssid->wpa_passphrase_set && ssid->wpa_passphrase) {
28 /* 28 /*
29 @@ -200,6 +219,7 @@ int hostapd_reload_config(struct hostapd 29 @@ -168,6 +187,7 @@ int hostapd_reload_config(struct hostapd
30 struct hostapd_data *hapd = iface->bss[0]; 30 struct hostapd_data *hapd = iface->bss[0];
31 struct hostapd_config *newconf, *oldconf; 31 struct hostapd_config *newconf, *oldconf;
32 size_t j; 32 size_t j;
33 + int i; 33 + int i;
Line 34... Line 34...
34 34
35 if (iface->config_fname == NULL) { 35 if (iface->config_fname == NULL) {
36 /* Only in-memory config in use - assume it has been updated */ 36 /* Only in-memory config in use - assume it has been updated */
37 @@ -250,21 +270,20 @@ int hostapd_reload_config(struct hostapd 37 @@ -189,21 +209,20 @@ int hostapd_reload_config(struct hostapd
38 } 38 oldconf = hapd->iconf;
Line 39... Line 39...
39 iface->conf = newconf; 39 iface->conf = newconf;
40 40
41 + for (i = 0; i < iface->num_hw_features; i++) { 41 + for (i = 0; i < iface->num_hw_features; i++) {