git.openwrt.org Git - openwrt/staging/nbd.git/blob

   1 From 0d4900ccd1c7ec5c5ffecf5040f9c07a6a32deef Mon Sep 17 00:00:00 2001
   2 From: Daniel Golle <daniel@makrotopia.org>
   3 Date: Thu, 3 May 2018 13:12:35 +0200
   4 Subject: [PATCH 2/2] Revert "wpa_supplicant: Rename wpas_event_*() to
   5  wpas_ap_event_*()"
   6
   7 This reverts commit 2dd5fbbff884af488870a37e339b4817c83954de.
   8 ---
   9  wpa_supplicant/ap.c     | 20 ++++++++++----------
  10  wpa_supplicant/ap.h     | 18 +++++++++---------
  11  wpa_supplicant/events.c | 13 ++++++-------
  12  3 files changed, 25 insertions(+), 26 deletions(-)
  13
  14 --- a/wpa_supplicant/ap.c
  15 +++ b/wpa_supplicant/ap.c
  16 @@ -1537,8 +1537,8 @@ int wpas_ap_pmksa_cache_add_external(str
  17
  18
  19  #ifdef NEED_AP_MLME
  20 -void wpas_ap_event_dfs_radar_detected(struct wpa_supplicant *wpa_s,
  21 -                                     struct dfs_event *radar)
  22 +void wpas_event_dfs_radar_detected(struct wpa_supplicant *wpa_s,
  23 +                                  struct dfs_event *radar)
  24  {
  25         if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0])
  26                 return;
  27 @@ -1550,8 +1550,8 @@ void wpas_ap_event_dfs_radar_detected(st
  28  }
  29
  30
  31 -void wpas_ap_event_dfs_cac_started(struct wpa_supplicant *wpa_s,
  32 -                                  struct dfs_event *radar)
  33 +void wpas_event_dfs_cac_started(struct wpa_supplicant *wpa_s,
  34 +                               struct dfs_event *radar)
  35  {
  36         if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0])
  37                 return;
  38 @@ -1562,8 +1562,8 @@ void wpas_ap_event_dfs_cac_started(struc
  39  }
  40
  41
  42 -void wpas_ap_event_dfs_cac_finished(struct wpa_supplicant *wpa_s,
  43 -                                   struct dfs_event *radar)
  44 +void wpas_event_dfs_cac_finished(struct wpa_supplicant *wpa_s,
  45 +                                struct dfs_event *radar)
  46  {
  47         if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0])
  48                 return;
  49 @@ -1574,8 +1574,8 @@ void wpas_ap_event_dfs_cac_finished(stru
  50  }
  51
  52
  53 -void wpas_ap_event_dfs_cac_aborted(struct wpa_supplicant *wpa_s,
  54 -                                  struct dfs_event *radar)
  55 +void wpas_event_dfs_cac_aborted(struct wpa_supplicant *wpa_s,
  56 +                               struct dfs_event *radar)
  57  {
  58         if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0])
  59                 return;
  60 @@ -1586,8 +1586,8 @@ void wpas_ap_event_dfs_cac_aborted(struc
  61  }
  62
  63
  64 -void wpas_ap_event_dfs_cac_nop_finished(struct wpa_supplicant *wpa_s,
  65 -                                       struct dfs_event *radar)
  66 +void wpas_event_dfs_cac_nop_finished(struct wpa_supplicant *wpa_s,
  67 +                                    struct dfs_event *radar)
  68  {
  69         if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0])
  70                 return;
  71 --- a/wpa_supplicant/ap.h
  72 +++ b/wpa_supplicant/ap.h
  73 @@ -89,16 +89,16 @@ int wpas_ap_pmksa_cache_list_mesh(struct
  74                                   char *buf, size_t len);
  75  int wpas_ap_pmksa_cache_add_external(struct wpa_supplicant *wpa_s, char *cmd);
  76
  77 -void wpas_ap_event_dfs_radar_detected(struct wpa_supplicant *wpa_s,
  78 -                                     struct dfs_event *radar);
  79 -void wpas_ap_event_dfs_cac_started(struct wpa_supplicant *wpa_s,
  80 +void wpas_event_dfs_radar_detected(struct wpa_supplicant *wpa_s,
  81                                    struct dfs_event *radar);
  82 -void wpas_ap_event_dfs_cac_finished(struct wpa_supplicant *wpa_s,
  83 -                                   struct dfs_event *radar);
  84 -void wpas_ap_event_dfs_cac_aborted(struct wpa_supplicant *wpa_s,
  85 -                                  struct dfs_event *radar);
  86 -void wpas_ap_event_dfs_cac_nop_finished(struct wpa_supplicant *wpa_s,
  87 -                                       struct dfs_event *radar);
  88 +void wpas_event_dfs_cac_started(struct wpa_supplicant *wpa_s,
  89 +                               struct dfs_event *radar);
  90 +void wpas_event_dfs_cac_finished(struct wpa_supplicant *wpa_s,
  91 +                                struct dfs_event *radar);
  92 +void wpas_event_dfs_cac_aborted(struct wpa_supplicant *wpa_s,
  93 +                               struct dfs_event *radar);
  94 +void wpas_event_dfs_cac_nop_finished(struct wpa_supplicant *wpa_s,
  95 +                                    struct dfs_event *radar);
  96
  97  void ap_periodic(struct wpa_supplicant *wpa_s);
  98
  99 --- a/wpa_supplicant/events.c
 100 +++ b/wpa_supplicant/events.c
 101 @@ -4220,25 +4220,24 @@ void wpa_supplicant_event(void *ctx, enu
 102  #ifdef NEED_AP_MLME
 103         case EVENT_DFS_RADAR_DETECTED:
 104                 if (data)
 105 -                       wpas_ap_event_dfs_radar_detected(wpa_s,
 106 -                                                        &data->dfs_event);
 107 +                       wpas_event_dfs_radar_detected(wpa_s, &data->dfs_event);
 108                 break;
 109         case EVENT_DFS_CAC_STARTED:
 110                 if (data)
 111 -                       wpas_ap_event_dfs_cac_started(wpa_s, &data->dfs_event);
 112 +                       wpas_event_dfs_cac_started(wpa_s, &data->dfs_event);
 113                 break;
 114         case EVENT_DFS_CAC_FINISHED:
 115                 if (data)
 116 -                       wpas_ap_event_dfs_cac_finished(wpa_s, &data->dfs_event);
 117 +                       wpas_event_dfs_cac_finished(wpa_s, &data->dfs_event);
 118                 break;
 119         case EVENT_DFS_CAC_ABORTED:
 120                 if (data)
 121 -                       wpas_ap_event_dfs_cac_aborted(wpa_s, &data->dfs_event);
 122 +                       wpas_event_dfs_cac_aborted(wpa_s, &data->dfs_event);
 123                 break;
 124         case EVENT_DFS_NOP_FINISHED:
 125                 if (data)
 126 -                       wpas_ap_event_dfs_cac_nop_finished(wpa_s,
 127 -                                                          &data->dfs_event);
 128 +                       wpas_event_dfs_cac_nop_finished(wpa_s,
 129 +                                                       &data->dfs_event);
 130                 break;
 131  #endif /* NEED_AP_MLME */
 132  #endif /* CONFIG_AP */