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/hostapd/hostapd_cli.c 1 --- a/hostapd/hostapd_cli.c
2 +++ b/hostapd/hostapd_cli.c 2 +++ b/hostapd/hostapd_cli.c
3 @@ -385,7 +385,6 @@ static int hostapd_cli_cmd_disassociate( -  
4 } -  
5 -  
6 -  
7 -#ifdef CONFIG_TAXONOMY -  
8 static int hostapd_cli_cmd_signature(struct wpa_ctrl *ctrl, int argc, -  
9 char *argv[]) -  
10 { -  
11 @@ -398,7 +397,6 @@ static int hostapd_cli_cmd_signature(str -  
12 os_snprintf(buf, sizeof(buf), "SIGNATURE %s", argv[0]); -  
13 return wpa_ctrl_command(ctrl, buf); -  
14 } -  
15 -#endif /* CONFIG_TAXONOMY */ -  
16 -  
17 -  
18 #ifdef CONFIG_IEEE80211W -  
19 @@ -417,7 +415,6 @@ static int hostapd_cli_cmd_sa_query(stru 3 @@ -417,7 +417,6 @@ static int hostapd_cli_cmd_sa_query(stru
20 #endif /* CONFIG_IEEE80211W */ 4 #endif /* CONFIG_IEEE80211W */
Line 21... Line 5...
21 5
22 6
23 -#ifdef CONFIG_WPS 7 -#ifdef CONFIG_WPS
24 static int hostapd_cli_cmd_wps_pin(struct wpa_ctrl *ctrl, int argc, 8 static int hostapd_cli_cmd_wps_pin(struct wpa_ctrl *ctrl, int argc,
25 char *argv[]) 9 char *argv[])
26 { 10 {
27 @@ -643,7 +640,6 @@ static int hostapd_cli_cmd_wps_config(st 11 @@ -643,7 +642,6 @@ static int hostapd_cli_cmd_wps_config(st
28 ssid_hex, argv[1]); 12 ssid_hex, argv[1]);
29 return wpa_ctrl_command(ctrl, buf); 13 return wpa_ctrl_command(ctrl, buf);
Line 30... Line 14...
30 } 14 }
31 -#endif /* CONFIG_WPS */ 15 -#endif /* CONFIG_WPS */
32 -  
33 -  
34 static int hostapd_cli_cmd_disassoc_imminent(struct wpa_ctrl *ctrl, int argc, -  
35 @@ -1510,15 +1506,12 @@ static const struct hostapd_cli_cmd host -  
36 { "disassociate", hostapd_cli_cmd_disassociate, -  
37 hostapd_complete_stations, -  
38 "<addr> = disassociate a station" }, -  
39 -#ifdef CONFIG_TAXONOMY -  
40 { "signature", hostapd_cli_cmd_signature, hostapd_complete_stations, 16
41 "<addr> = get taxonomy signature for a station" }, 17
42 -#endif /* CONFIG_TAXONOMY */ 18 static int hostapd_cli_cmd_disassoc_imminent(struct wpa_ctrl *ctrl, int argc,
43 #ifdef CONFIG_IEEE80211W 19 @@ -1518,7 +1516,6 @@ static const struct hostapd_cli_cmd host
44 { "sa_query", hostapd_cli_cmd_sa_query, hostapd_complete_stations, 20 { "sa_query", hostapd_cli_cmd_sa_query, hostapd_complete_stations,
45 "<addr> = send SA Query to a station" }, 21 "<addr> = send SA Query to a station" },
46 #endif /* CONFIG_IEEE80211W */ 22 #endif /* CONFIG_IEEE80211W */
47 -#ifdef CONFIG_WPS 23 -#ifdef CONFIG_WPS
48 { "wps_pin", hostapd_cli_cmd_wps_pin, NULL, 24 { "wps_pin", hostapd_cli_cmd_wps_pin, NULL,
49 "<uuid> <pin> [timeout] [addr] = add WPS Enrollee PIN" }, 25 "<uuid> <pin> [timeout] [addr] = add WPS Enrollee PIN" },
50 { "wps_check_pin", hostapd_cli_cmd_wps_check_pin, NULL, 26 { "wps_check_pin", hostapd_cli_cmd_wps_check_pin, NULL,
51 @@ -1543,7 +1536,6 @@ static const struct hostapd_cli_cmd host 27 @@ -1543,7 +1540,6 @@ static const struct hostapd_cli_cmd host
52 "<SSID> <auth> <encr> <key> = configure AP" }, 28 "<SSID> <auth> <encr> <key> = configure AP" },