Bug#570116: hostapd: diff for NMU version 1:0.6.10-1.1

2010-02-24 Thread Kel Modderman
On Tuesday 23 February 2010 20:05:31 Jan Dittberner wrote:
 tags 570116 + patch
 thanks
 
 Hello pkg-wpa Maintainers,
 
 I got the same problem after an update from 2.6.32-trunk (squeeze) to 2.6.32-2
 (sid) this morning. I applied the patch mentioned in this bug report and got
 hostapd working again. I use an ath9k based card if this matters.

Thanks for feedback.

 
 Here is the lspci output:
 
 03:07.0 Network controller: Atheros Communications Inc. AR922X Wireless 
 Network Adapter (rev 01)
 Subsystem: D-Link System Inc Device 3a78
 Flags: bus master, 66MHz, medium devsel, latency 168, IRQ 21
 Memory at fdce (32-bit, non-prefetchable) [size=64K]
 Capabilities: [44] Power Management version 2
 Kernel driver in use: ath9k
 
 I've prepared an NMU for hostapd (versioned as 1:0.6.10-1.1) but did not 
 upload
 it. Please tell me if it is ok to upload it or whether one of you wants to
 upload it.

I'd like to fix some other bugs in the next upload too. If we have not acted
in the next 7 days feel free to NMU.

Are you interested in co-maintaining hostapd?

Thanks, Kel.



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#570116: hostapd: diff for NMU version 1:0.6.10-1.1

2010-02-23 Thread Jan Dittberner
tags 570116 + patch
thanks

Hello pkg-wpa Maintainers,

I got the same problem after an update from 2.6.32-trunk (squeeze) to 2.6.32-2
(sid) this morning. I applied the patch mentioned in this bug report and got
hostapd working again. I use an ath9k based card if this matters.

Here is the lspci output:

03:07.0 Network controller: Atheros Communications Inc. AR922X Wireless Network 
Adapter (rev 01)
Subsystem: D-Link System Inc Device 3a78
Flags: bus master, 66MHz, medium devsel, latency 168, IRQ 21
Memory at fdce (32-bit, non-prefetchable) [size=64K]
Capabilities: [44] Power Management version 2
Kernel driver in use: ath9k

I've prepared an NMU for hostapd (versioned as 1:0.6.10-1.1) but did not upload
it. Please tell me if it is ok to upload it or whether one of you wants to
upload it.

Regards.

-- 
Jan Dittberner - Debian Developer
GPG-key: 4096R/558FB8DD 2009-05-10
 B2FF 1D95 CE8F 7A22 DF4C  F09B A73E 0055 558F B8DD
http://ddportfolio.debian.net/ - http://people.debian.org/~jandd/
diff -u hostapd-0.6.10/debian/control hostapd-0.6.10/debian/control
--- hostapd-0.6.10/debian/control
+++ hostapd-0.6.10/debian/control
@@ -6,7 +6,8 @@
  Kel Modderman k...@otaku42.de
 Build-Depends: debhelper (= 7.3.7~),
  libssl-dev,
- libnl-dev (= 1.1)
+ libnl-dev (= 1.1),
+ quilt
 Standards-Version: 3.8.4
 Homepage: http://w1.fi/
 Vcs-Svn: svn://svn.debian.org/pkg-wpa/hostapd/trunk
diff -u hostapd-0.6.10/debian/changelog hostapd-0.6.10/debian/changelog
--- hostapd-0.6.10/debian/changelog
+++ hostapd-0.6.10/debian/changelog
@@ -1,3 +1,18 @@
+hostapd (1:0.6.10-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * add patch from upstream git (Closes: #570116)
+  * debian/control: add quilt to Build-Depends
+  * debian/rules: add --with quilt
+  * add debian/patches/series and debian/patches/move-dtim-period-
+configuration-into-beacon-set-operation-fix-570116.patch with cherry
+picked and refreshed commit from
+http://hostap.epitest.fi/gitweb/gitweb.cgi?p=hostap-
+06.git;a=commitdiff_plain;h=eb1f7446b5b86cceb1508f060f5e66e5dd791a4d
+;hp=816bce98e1b77966559efb09b513de763bdb6290
+
+ -- Jan Dittberner ja...@debian.org  Tue, 23 Feb 2010 10:53:07 +0100
+
 hostapd (1:0.6.10-1) unstable; urgency=low
 
   * New upstream release.
diff -u hostapd-0.6.10/debian/rules hostapd-0.6.10/debian/rules
--- hostapd-0.6.10/debian/rules
+++ hostapd-0.6.10/debian/rules
@@ -42 +42 @@
-	dh $@
+	dh --with quilt $@
only in patch2:
unchanged:
--- hostapd-0.6.10.orig/debian/patches/move-dtim-period-configuration-into-beacon-set-operation-fix-570116.patch
+++ hostapd-0.6.10/debian/patches/move-dtim-period-configuration-into-beacon-set-operation-fix-570116.patch
@@ -0,0 +1,44 @@
+From: Jouni Malinen jouni.mali...@atheros.com
+Date: Thu, 12 Mar 2009 19:57:08 + (+0200)
+Subject: Move DTIM period configuration into Beacon set operation
+X-Git-Tag: hostap_0_7_0~455
+X-Git-Url: http://hostap.epitest.fi/gitweb/gitweb.cgi?p=hostap-06.git;a=commitdiff_plain;h=eb1f7446b5b86cceb1508f060f5e66e5dd791a4d;hp=816bce98e1b77966559efb09b513de763bdb6290
+
+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.
+---
+
+--- a/hostapd/beacon.c
 b/hostapd/beacon.c
+@@ -434,6 +434,10 @@
+ 	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);
+--- a/hostapd/hostapd.c
 b/hostapd/hostapd.c
+@@ -1376,12 +1376,6 @@
+ 		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,
only in patch2:
unchanged:
--- hostapd-0.6.10.orig/debian/patches/series
+++ hostapd-0.6.10/debian/patches/series
@@ -0,0 +1 @@
+move-dtim-period-configuration-into-beacon-set-operation-fix-570116.patch


signature.asc
Description: Digital signature