[pkg-wpa-devel] r1481 - in /hostapd/trunk/debian: changelog ifupdown.sh patches/ patches/DTIM.patch patches/series source/format

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Wed Feb 24 09:51:14 2010
New Revision: 1481

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1481
Log:
* Switch to source format 3.0 (quilt).
* Add DTIM.patch, cherry picked from upstream, which works around
  problem setting DTIM period too early causing hostapd to bail out
  unceremoniously. (Closes: #570116)
* Fix syntax error in ifupdown.sh. (Closes: #571029)

Added:
    hostapd/trunk/debian/patches/
    hostapd/trunk/debian/patches/DTIM.patch
    hostapd/trunk/debian/patches/series
Modified:
    hostapd/trunk/debian/changelog
    hostapd/trunk/debian/ifupdown.sh
    hostapd/trunk/debian/source/format

Modified: hostapd/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/changelog?rev=1481&op=diff
==============================================================================
--- hostapd/trunk/debian/changelog (original)
+++ hostapd/trunk/debian/changelog Wed Feb 24 09:51:14 2010
@@ -1,3 +1,13 @@
+hostapd (1:0.6.10-2) unstable; urgency=low
+
+  * Switch to source format 3.0 (quilt).
+  * Add DTIM.patch, cherry picked from upstream, which works around
+    problem setting DTIM period too early causing hostapd to bail out
+    unceremoniously. (Closes: #570116)
+  * Fix syntax error in ifupdown.sh. (Closes: #571029)
+
+ -- Kel Modderman <kel at otaku42.de>  Wed, 24 Feb 2010 19:36:11 +1000
+
 hostapd (1:0.6.10-1) unstable; urgency=low
 
   * New upstream release.

Modified: hostapd/trunk/debian/ifupdown.sh
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/ifupdown.sh?rev=1481&op=diff
==============================================================================
--- hostapd/trunk/debian/ifupdown.sh (original)
+++ hostapd/trunk/debian/ifupdown.sh Wed Feb 24 09:51:14 2010
@@ -88,7 +88,7 @@
 	start-stop-daemon --start --oknodo --quiet --exec "$HOSTAPD_BIN" \
 		--pidfile "$HOSTAPD_PIDFILE" -- $HOSTAPD_OPTIONS > "$TO_NULL"
 
-	if [ "$?" -eq 0]; then
+	if [ "$?" -eq 0 ]; then
 		[ "$HOSTAPD_OMIT_PIDFILE" ] && \
 			cat "$HOSTAPD_PIDFILE" > "$HOSTAPD_OMIT_PIDFILE"
 		return 0

Added: hostapd/trunk/debian/patches/DTIM.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/patches/DTIM.patch?rev=1481&op=file
==============================================================================
--- hostapd/trunk/debian/patches/DTIM.patch (added)
+++ hostapd/trunk/debian/patches/DTIM.patch Wed Feb 24 09:51:14 2010
@@ -1,0 +1,46 @@
+commit 8fac32f5efa7a7c3fc6eee8d3723a09e7abe27fa
+Author: Jouni Malinen <jouni.malinen at atheros.com>
+Date:   Thu Mar 12 21:57:08 2009 +0200
+
+    Move DTIM period configuration into Beacon set operation
+    
+    This is needed to make mac80211 work with multi-BSS configuration. The
+    previous design ended up setting DTIM period for secondary BSSes before
+    setting the Beacon and driver_nl80211.c was not really prepared for
+    that. Eventually, the Beacon configuration routines should be combined
+    into a single driver operation, but for now, just moving this call is
+    the simplest workaround.
+    (cherry picked from commit eb1f7446b5b86cceb1508f060f5e66e5dd791a4d)
+
+diff --git a/hostapd/beacon.c b/hostapd/beacon.c
+index 1f82d9c..0a192fe 100644
+--- a/hostapd/beacon.c
++++ b/hostapd/beacon.c
+@@ -434,6 +434,10 @@ void ieee802_11_set_beacon(struct hostapd_data *hapd)
+ 	os_free(tail);
+ 	os_free(head);
+ 
++	if (hostapd_set_dtim_period(hapd, hapd->conf->dtim_period))
++		wpa_printf(MSG_ERROR, "Could not set DTIM period for kernel "
++			   "driver");
++
+ 	if (hostapd_set_cts_protect(hapd, cts_protection))
+ 		wpa_printf(MSG_ERROR, "Failed to set CTS protect in kernel "
+ 			   "driver");
+diff --git a/hostapd/hostapd.c b/hostapd/hostapd.c
+index 3fbd3d0..7ed1720 100644
+--- a/hostapd/hostapd.c
++++ b/hostapd/hostapd.c
+@@ -1376,12 +1376,6 @@ static int hostapd_setup_bss(struct hostapd_data *hapd, int first)
+ 		return -1;
+ 	}
+ 
+-	if (hostapd_set_dtim_period(hapd, hapd->conf->dtim_period)) {
+-		wpa_printf(MSG_ERROR, "Could not set DTIM period for kernel "
+-			   "driver");
+-		return -1;
+-	}
+-
+ 	/* Set SSID for the kernel driver (to be used in beacon and probe
+ 	 * response frames) */
+ 	if (set_ssid && hostapd_set_ssid(hapd, (u8 *) conf->ssid.ssid,

Added: hostapd/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/patches/series?rev=1481&op=file
==============================================================================
--- hostapd/trunk/debian/patches/series (added)
+++ hostapd/trunk/debian/patches/series Wed Feb 24 09:51:14 2010
@@ -1,0 +1,1 @@
+DTIM.patch

Modified: hostapd/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/source/format?rev=1481&op=diff
==============================================================================
--- hostapd/trunk/debian/source/format (original)
+++ hostapd/trunk/debian/source/format Wed Feb 24 09:51:14 2010
@@ -1,1 +1,1 @@
-1.0
+3.0 (quilt)