[pkg-wpa-devel] r1848 - in /wpa/trunk/debian: changelog patches/hostapd_fix-WDS-VLAN-bridge-handling.patch patches/series
slh-guest at users.alioth.debian.org
slh-guest at users.alioth.debian.org
Wed Feb 19 02:07:11 UTC 2014
Author: slh-guest
Date: Wed Feb 19 02:07:11 2014
New Revision: 1848
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1848
Log:
* compress binaries with xz.
* import "hostapd: Fix WDS VLAN bridge handling" by Felix Fietkau
<nbd at openwrt.org> from upstream, thanks to Mark Hindley
<mark at hindley.org.uk> (Closes: #737109).
Added:
wpa/trunk/debian/patches/hostapd_fix-WDS-VLAN-bridge-handling.patch
Modified:
wpa/trunk/debian/changelog
wpa/trunk/debian/patches/series
Modified: wpa/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/changelog?rev=1848&op=diff
==============================================================================
--- wpa/trunk/debian/changelog (original)
+++ wpa/trunk/debian/changelog Wed Feb 19 02:07:11 2014
@@ -1,6 +1,5 @@
-wpa (1.1-1) UNRELEASED; urgency=low
-
- * NOT RELEASED YET
+wpa (1.1-1) unstable; urgency=medium
+
* New upstream release:
- drop 11_wpa_gui_ftbfs_gcc_4_7, applied upstream.
- drop EAP-TLS-server_fix-TLS-Message-length-validation, applied upstream.
@@ -13,6 +12,7 @@
<patrik.flykt at linux.intel.com> (Closes: #690536).
* use the readline6, wpa_cli doesn't link to openssl.
* link with --as-needed.
+ * compress binaries with xz.
* debian/get-orig-source: switch to xz compressed upstream tarballs.
* debian/get-orig-source: adapt for the post 1.x upstream branch.
* debian/get-orig-source: support named snapshots, see debian/README.source
@@ -22,7 +22,6 @@
* debian/README.source: update to match current reality and apply grammar
fixes.
* debian/README.source: drop trailing whitespace.
- * compress binaries with xz.
* fix hardening flags, thanks a lot to Florent Daigniere
<nextgens at freenetproject.org> (Closes: #725865).
* debian/control: fold dependencies.
@@ -45,8 +44,11 @@
on !CONFIG_DRIVER_BSD, while it is actually depending on the target libc
rather than the kernel (Closes: #737465). Thanks to Cyril Brulebois
<kibi at debian.org> and Steven Chamberlain <steven at pyro.eu.org>.
-
- -- Stefan Lippers-Hollmann <s.l-h at gmx.de> Wed, 16 Jan 2013 18:48:22 +0100
+ * import "hostapd: Fix WDS VLAN bridge handling" by Felix Fietkau
+ <nbd at openwrt.org> from upstream, thanks to Mark Hindley
+ <mark at hindley.org.uk> (Closes: #737109).
+
+ -- Stefan Lippers-Hollmann <s.l-h at gmx.de> Wed, 19 Feb 2014 03:05:24 +0100
wpa (1.0-3.1) unstable; urgency=low
Added: wpa/trunk/debian/patches/hostapd_fix-WDS-VLAN-bridge-handling.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/hostapd_fix-WDS-VLAN-bridge-handling.patch?rev=1848&op=file
==============================================================================
--- wpa/trunk/debian/patches/hostapd_fix-WDS-VLAN-bridge-handling.patch (added)
+++ wpa/trunk/debian/patches/hostapd_fix-WDS-VLAN-bridge-handling.patch Wed Feb 19 02:07:11 2014
@@ -0,0 +1,53 @@
+From c34e618d473c2572bf77daedec399e823fe6a262 Mon Sep 17 00:00:00 2001
+From: Felix Fietkau <nbd at openwrt.org>
+Date: Sat, 15 Sep 2012 22:38:14 -0700
+Subject: [PATCH] hostapd: Fix WDS VLAN bridge handling
+
+This patch fixes an issue where removing a WDS VLAN interface also
+removed the main AP interface from the same bridge.
+
+Signed-hostap: Felix Fietkau <nbd at openwrt.org>
+---
+ src/drivers/driver_nl80211.c | 16 +++++++++-------
+ 1 file changed, 9 insertions(+), 7 deletions(-)
+
+--- a/src/drivers/driver_nl80211.c
++++ b/src/drivers/driver_nl80211.c
+@@ -6528,6 +6528,10 @@ static int i802_set_wds_sta(void *priv,
+ linux_set_iface_flags(drv->global->ioctl_sock, name, 1);
+ return i802_set_sta_vlan(priv, addr, name, 0);
+ } else {
++ if (bridge_ifname)
++ linux_br_del_if(drv->global->ioctl_sock, bridge_ifname,
++ name);
++
+ i802_set_sta_vlan(priv, addr, bss->ifname, 0);
+ return wpa_driver_nl80211_if_remove(priv, WPA_IF_AP_VLAN,
+ name);
+@@ -6886,7 +6890,12 @@ static int wpa_driver_nl80211_if_remove(
+ if (ifindex <= 0)
+ return -1;
+
++ nl80211_remove_iface(drv, ifindex);
++
+ #ifdef HOSTAPD
++ if (type != WPA_IF_AP_BSS)
++ return 0;
++
+ if (bss->added_if_into_bridge) {
+ if (linux_br_del_if(drv->global->ioctl_sock, bss->brname,
+ bss->ifname) < 0)
+@@ -6900,13 +6909,6 @@ static int wpa_driver_nl80211_if_remove(
+ "bridge %s: %s",
+ bss->brname, strerror(errno));
+ }
+-#endif /* HOSTAPD */
+-
+- nl80211_remove_iface(drv, ifindex);
+-
+-#ifdef HOSTAPD
+- if (type != WPA_IF_AP_BSS)
+- return 0;
+
+ if (bss != &drv->first_bss) {
+ struct i802_bss *tbss;
Modified: wpa/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/series?rev=1848&op=diff
==============================================================================
--- wpa/trunk/debian/patches/series (original)
+++ wpa/trunk/debian/patches/series Wed Feb 19 02:07:11 2014
@@ -6,3 +6,4 @@
13_human_readable_signal.patch
libnl3-includes.patch
wpa_gui_desktop_add-keywords-entry.patch
+hostapd_fix-WDS-VLAN-bridge-handling.patch
More information about the Pkg-wpa-devel
mailing list