From 5f4291b1cf4e634ab429b219a312ebacd890acde Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 9 Jul 2011 09:06:24 +0000 Subject: [PATCH 1/1] hostapd: backport fixes from r27569, r27570 git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@27573 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../750-wps_single_auth_enc_type.patch | 25 +++++++++++++++++++ .../patches/760-eapol_qos_high_priority.patch | 13 ++++++++++ 2 files changed, 38 insertions(+) create mode 100644 package/hostapd/patches/750-wps_single_auth_enc_type.patch create mode 100644 package/hostapd/patches/760-eapol_qos_high_priority.patch diff --git a/package/hostapd/patches/750-wps_single_auth_enc_type.patch b/package/hostapd/patches/750-wps_single_auth_enc_type.patch new file mode 100644 index 000000000..4925e9c7f --- /dev/null +++ b/package/hostapd/patches/750-wps_single_auth_enc_type.patch @@ -0,0 +1,25 @@ +--- a/src/ap/wps_hostapd.c ++++ b/src/ap/wps_hostapd.c +@@ -773,11 +773,9 @@ int hostapd_init_wps(struct hostapd_data + + if (conf->rsn_pairwise & WPA_CIPHER_CCMP) + wps->encr_types |= WPS_ENCR_AES; +- if (conf->rsn_pairwise & WPA_CIPHER_TKIP) ++ else if (conf->rsn_pairwise & WPA_CIPHER_TKIP) + wps->encr_types |= WPS_ENCR_TKIP; +- } +- +- if (conf->wpa & WPA_PROTO_WPA) { ++ } else if (conf->wpa & WPA_PROTO_WPA) { + if (conf->wpa_key_mgmt & WPA_KEY_MGMT_PSK) + wps->auth_types |= WPS_AUTH_WPAPSK; + if (conf->wpa_key_mgmt & WPA_KEY_MGMT_IEEE8021X) +@@ -785,7 +783,7 @@ int hostapd_init_wps(struct hostapd_data + + if (conf->wpa_pairwise & WPA_CIPHER_CCMP) + wps->encr_types |= WPS_ENCR_AES; +- if (conf->wpa_pairwise & WPA_CIPHER_TKIP) ++ else if (conf->wpa_pairwise & WPA_CIPHER_TKIP) + wps->encr_types |= WPS_ENCR_TKIP; + } + diff --git a/package/hostapd/patches/760-eapol_qos_high_priority.patch b/package/hostapd/patches/760-eapol_qos_high_priority.patch new file mode 100644 index 000000000..9b1fcbf19 --- /dev/null +++ b/package/hostapd/patches/760-eapol_qos_high_priority.patch @@ -0,0 +1,13 @@ +--- a/src/drivers/driver_nl80211.c ++++ b/src/drivers/driver_nl80211.c +@@ -4413,8 +4413,8 @@ static int wpa_driver_nl80211_hapd_send_ + pos = (u8 *) (hdr + 1); + + if (qos) { +- /* add an empty QoS header if needed */ +- pos[0] = 0; ++ /* Set highest priority in QoS header */ ++ pos[0] = 7; + pos[1] = 0; + pos += 2; + } -- 2.35.1