hostapd: add patch for setting 4addr mode in multi_ap

[openwrt/staging/hauke.git] / package / network / services / hostapd / patches / 120-reconfigure-wps-credentials.patch

diff --git a/package/network/services/hostapd/patches/120-reconfigure-wps-credentials.patch b/package/network/services/hostapd/patches/120-reconfigure-wps-credentials.patch
index d9489aab367db9f61d6e5255d958489b322dbc96..1826b6685b2e5a044dc9d71c2edb7757ca048ff1 100644 (file)
--- a/package/network/services/hostapd/patches/120-reconfigure-wps-credentials.patch
+++ b/package/network/services/hostapd/patches/120-reconfigure-wps-credentials.patch
@@ -19,11 +19,9 @@ Signed-off-by: Raphaël Mélotte <raphael.melotte@mind.be>
  src/wps/wps_registrar.c | 29 ++++++++++++++
  3 files changed, 118 insertions(+), 3 deletions(-)
 
-diff --git a/src/ap/wps_hostapd.c b/src/ap/wps_hostapd.c
-index dc8aa8f65..ff942a67b 100644
 --- a/src/ap/wps_hostapd.c
 +++ b/src/ap/wps_hostapd.c
-@@ -1375,6 +1375,43 @@ static void hostapd_wps_nfc_clear(struct wps_context *wps)
+@@ -1375,6 +1375,43 @@ static void hostapd_wps_nfc_clear(struct
  #endif /* CONFIG_WPS_NFC */
  }
  
@@ -67,7 +65,7 @@ index dc8aa8f65..ff942a67b 100644
  
  void hostapd_deinit_wps(struct hostapd_data *hapd)
  {
-@@ -1409,11 +1446,54 @@ void hostapd_update_wps(struct hostapd_data *hapd)
+@@ -1409,11 +1446,54 @@ void hostapd_update_wps(struct hostapd_d
        hapd->wps->upc = hapd->conf->upc;
  #endif /* CONFIG_WPS_UPNP */
  
@@ -125,11 +123,9 @@ index dc8aa8f65..ff942a67b 100644
        else
                hostapd_deinit_wps(hapd);
  }
-diff --git a/src/wps/wps.h b/src/wps/wps.h
-index 93888b011..110e3ea52 100644
 --- a/src/wps/wps.h
 +++ b/src/wps/wps.h
-@@ -938,6 +938,12 @@ struct wpabuf * wps_build_nfc_handover_sel_p2p(struct wps_context *ctx,
+@@ -938,6 +938,12 @@ struct wpabuf * wps_build_nfc_handover_s
                                               struct wpabuf *nfc_dh_pubkey,
                                               struct wpabuf *nfc_dev_pw);
  
@@ -142,11 +138,9 @@ index 93888b011..110e3ea52 100644
  /* ndef.c */
  struct wpabuf * ndef_parse_wifi(const struct wpabuf *buf);
  struct wpabuf * ndef_build_wifi(const struct wpabuf *buf);
-diff --git a/src/wps/wps_registrar.c b/src/wps/wps_registrar.c
-index 9e1ee36da..d6b27be28 100644
 --- a/src/wps/wps_registrar.c
 +++ b/src/wps/wps_registrar.c
-@@ -3669,6 +3669,35 @@ int wps_registrar_config_ap(struct wps_registrar *reg,
+@@ -3669,6 +3669,35 @@ int wps_registrar_config_ap(struct wps_r
  }
  
  
@@ -182,6 +176,3 @@ index 9e1ee36da..d6b27be28 100644
  #ifdef CONFIG_WPS_NFC
  
  int wps_registrar_add_nfc_pw_token(struct wps_registrar *reg,
--- 
-2.29.2
-