rpms/kernel/devel kernel.spec, 1.629, 1.630 linux-2.6-wireless.patch, 1.34, 1.35 linux-2.6-wireless-pending-too.patch, 1.6, NONE

John W. Linville (linville) fedora-extras-commits at redhat.com
Fri May 9 17:55:47 UTC 2008


Author: linville

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7188

Modified Files:
	kernel.spec linux-2.6-wireless.patch 
Removed Files:
	linux-2.6-wireless-pending-too.patch 
Log Message:
Regroup wireless patches as prep for 2.6.26 and F10 cycles


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.629
retrieving revision 1.630
diff -u -r1.629 -r1.630
--- kernel.spec	9 May 2008 15:22:55 -0000	1.629
+++ kernel.spec	9 May 2008 17:55:06 -0000	1.630
@@ -615,7 +615,6 @@
 
 Patch680: linux-2.6-wireless.patch
 Patch681: linux-2.6-wireless-pending.patch
-Patch682: linux-2.6-wireless-pending-too.patch
 Patch683: linux-2.6-rt2x00-configure_filter.patch
 Patch690: linux-2.6-at76.patch
 
@@ -1152,11 +1151,10 @@
 # Allow selinux to defer validation of contexts, aka: rpm can write illegal labels
 ApplyPatch linux-2.6-selinux-deffered-context-mapping.patch
 
-# wireless patches headed for 2.6.25
-#ApplyPatch linux-2.6-wireless.patch
 # wireless patches headed for 2.6.26
-ApplyPatch linux-2.6-wireless-pending.patch
-ApplyPatch linux-2.6-wireless-pending-too.patch
+ApplyPatch linux-2.6-wireless.patch
+# wireless patches headed for 2.6.27
+#ApplyPatch linux-2.6-wireless-pending.patch
 # rt2x00 configure_filter fix to avoid endless loop on insert for USB devices
 ApplyPatch linux-2.6-rt2x00-configure_filter.patch
 
@@ -1808,6 +1806,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Fri May 09 2008 John W. Linville <linville at redhat.com> 2.6.25.2-7
+- Regroup wireless patches as prep for 2.6.26 and F10 cycles
+
 * Fri May 09 2008 Eric Paris <eparis at redhat.com>
 - support deffered context validation in selinux.  aka rpm can lay down illegal labels. (won't upstream until .27 opens)
 

linux-2.6-wireless.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.34 -r 1.35 linux-2.6-wireless.patch
Index: linux-2.6-wireless.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-wireless.patch,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- linux-2.6-wireless.patch	15 Apr 2008 20:27:37 -0000	1.34
+++ linux-2.6-wireless.patch	9 May 2008 17:55:06 -0000	1.35
@@ -1,860 +1,95931 @@
-commit b358492cd2a9c67bff352c5a60d86e7fc9627477
-Author: Masakazu Mokuno <mokuno at sm.sony.co.jp>
-Date:   Mon Apr 14 18:07:21 2008 +0900
+commit 099714934d80100624829f1e2961b9dccaef3280
+Author: Roland Dreier <rdreier at cisco.com>
+Date:   Wed Apr 23 16:22:13 2008 -0700
 
-    PS3: gelic: fix the oops on the broken IE returned from the hypervisor
+    iwlwifi: Don't unlock priv->mutex if it isn't locked
     
-    This fixes the bug that the driver would try to over-scan the memory
-    if the sum of the length field of every IEs does not match the length
-    returned from the hypervisor.
+    Commit b716bb91 ("iwlwifi: Cancel scanning upon association") moved the
+    test of priv->vif in iwl{3945,4964}_mac_config_interface() outside of
+    where priv->mutex is held, but still tries to do mutex_unlock() on
+    return.  This is clearly wrong and triggers a nasty lockdep warning when
+    this codepath is triggered.  Fix this by removing the mutex_unlock().
     
-    Signed-off-by: Masakazu Mokuno <mokuno at sm.sony.co.jp>
+    Signed-off-by: Roland Dreier <rolandd at cisco.com>
     Signed-off-by: John W. Linville <linville at tuxdriver.com>
 
-commit dc4ae1f46dbbcd08b3b5e23ad5ef87bf4bb41adf
-Author: Stefano Brivio <stefano.brivio at polimi.it>
-Date:   Mon Apr 14 00:59:49 2008 +0200
+commit 4d381ffb02701c3fc976091473aead7c03523133
+Author: Roel Kluin <12o3l at tiscali.nl>
+Date:   Wed Apr 23 22:10:29 2008 +0200
 
-    b43legacy: fix DMA mapping leakage
+    wireless: rndis_wlan: modparam_workaround_interval is never below 0.
     
-    This fixes a DMA mapping leakage in the case where we reject a DMA buffer
-    because of its address.
-    The patch by Michael Buesch has been ported to b43legacy.
+    priv->param_workaround_interval is unsigned, modparam_workaround_interval not.
+    the former is never < 0.
     
-    Signed-off-by: Stefano Brivio <stefano.brivio at polimi.it>
-    Cc: Christian Casteyde <casteyde.christian at free.fr>
+    Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 8ba82e969f71d088f718f93d64985d5fcdd9c171
+Author: Roel Kluin <12o3l at tiscali.nl>
+Date:   Wed Apr 23 21:56:49 2008 +0200
+
+    prism54: prism54_get_encode() test below 0 on unsigned index
+    
+    previously in this function:
+    
+    u32 index = (dwrq->flags & IW_ENCODE_INDEX) - 1;
+    
+    index is unsigned, so if -1, the original test (below) didn't work.
+    
+    Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit d619ee08490ca78c9571dca133cd0d0527a60839
+Author: Luis Carlos Cobo <luisca at cozybit.com>
+Date:   Wed Apr 23 12:34:59 2008 -0700
+
+    mac80211: update mesh EID values
+    
+    This patch updates mesh EID values, some of which where conflicting with
+    already-approved 11h EIDs (pointed out by Tomas Winkler). I wanted to use the
+    values suggested in the last available 802.11 draft (2.0) but it assigns 50 to
+    MESH_CONFIG, the same value than EXT_SUPP_RATES. Using the values proposed in
+    the draft incremented by one.
+    
+    Signed-off-by: Luis Carlos Cobo <luisca at cozybit.com>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 0da926f05748d273e7b2b673b0de21629ae9acdd
+Author: Ron Rindjunsky <ron.rindjunsky at intel.com>
+Date:   Wed Apr 23 13:45:12 2008 +0300
+
+    mac80211: fix use before check of Qdisc length
+    
+    This patch fixes use of Qdisc length in requeue function, before we checked
+    the reference is valid. (Adrian Bunk's catch)
+    
+    Signed-off-by: Ron Rindjunsky <ron.rindjunsky at intel.com>
+    Signed-off-by: Adrian Bunk <bunk at kernel.org>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 13d8fd2d15fdd492078bedb9fde87c901a4e4df0
+Author: Adrian Bunk <bunk at kernel.org>
+Date:   Wed Apr 23 12:51:28 2008 +0300
+
+    net/mac80211/rx.c: fix off-by-one
+    
+    This patch fixes an off-by-one in net/mac80211/rx.c introduced by
+    commit 8318d78a44d49ac1edf2bdec7299de3617c4232e
+    (cfg80211 API for channels/bitrates, mac80211 and driver conversion)
+    and spotted by the Coverity checker.
+    
+    Signed-off-by: Adrian Bunk <bunk at kernel.org>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 1ebebea8e844d01c80b93b8ee4d696ee7c0cbc27
+Author: Pavel Emelyanov <xemul at openvz.org>
+Date:   Wed Apr 23 11:47:15 2008 +0400
+
+    mac80211: Fix race between ieee80211_rx_bss_put and lookup routines.
+    
+    The put routine first decrements the users counter and then
+    (if it is zero) locks the sta_bss_lock and removes one from
+    the list and the hash.
+    
+    Thus, any of ieee80211_sta_config_auth, ieee80211_rx_bss_get
+    or ieee80211_rx_mesh_bss_get can race with it by finding a
+    bss that is about to get kfree-ed.
+    
+    Using atomic_dec_and_lock in ieee80211_rx_bss_put takes care
+    of this race.
+    
+    Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 4503183aa32e6886400d82282292934fa64a81b0
+Author: Larry Finger <Larry.Finger at lwfinger.net>
+Date:   Sat Apr 19 17:52:12 2008 +0200
+
+    ssb: Fix all-ones boardflags
+    
+    In the SSB SPROM a field set to all ones means the value
+    is not defined in the SPROM.
+    In case of the boardflags, we need to set them to zero
+    to avoid confusing drivers. Drivers will only check the
+    flags by ANDing.
+    
+    Signed-off-by: Larry Finger <Larry.Finger at lwfinger.net>
+    Signed-off-by: Gabor Stefanik <netrolller.3d at gmail.com>
+    Signed-off-by: Michael Buesch <mb at bu3sch.de>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 9fc38458355525f801cd2ab403ac89850489a05e
+Author: Michael Buesch <mb at bu3sch.de>
+Date:   Sat Apr 19 16:53:00 2008 +0200
+
+    b43: Add more btcoexist workarounds
+    
+    This adds more workarounds for devices with broken BT bits.
+    
+    Signed-off-by: Michael Buesch <mb at bu3sch.de>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit a259d6a45b915e00e8c6085e35fea7b61e3008a8
+Author: Michael Buesch <mb at bu3sch.de>
+Date:   Fri Apr 18 21:06:37 2008 +0200
+
+    b43: Fix HostFlags data types
+    
+    The HostFlags are a bitmask of 48bit. So we must use an u64 datatype
+    to hold all bits.
+    
+    Signed-off-by: Michael Buesch <mb at bu3sch.de>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 1855ba7812dbd294fcfc083dc7d3b14d3b1f38db
+Author: Michael Buesch <mb at bu3sch.de>
+Date:   Fri Apr 18 20:51:41 2008 +0200
+
+    b43: Workaround invalid bluetooth settings
+    
+    This adds a workaround for invalid bluetooth SPROM settings
+    on ASUS PCI cards.
+    This will stop the microcode from poking with the BT GPIO line.
+    This fixes data transmission on this device, as the BT GPIO line
+    is used for something TX related on this device
+    (probably the power amplifier or the radio).
+    This also adds a modparam knob to help debugging this in the future,
+    as more devices with this bug may show up.
+    
+    Signed-off-by: Michael Buesch <mb at bu3sch.de>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 0f48d7e1cf2341148dcafc19a098ca22e184bee9
+Author: Johannes Berg <johannes at sipsolutions.net>
+Date:   Thu Apr 17 19:36:28 2008 +0200
+
+    mac80211: MAINTAINERS update
+    
+    This updates the mac80211 maintainers entry to
+     1) remove Jiri
+     2) put me first
+    
+    Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
+    Cc: Michael Wu <flamingice at sourmilk.net>
[...96280 lines suppressed...]
++!Pinclude/net/mac80211.h Frame filtering
++!Finclude/net/mac80211.h ieee80211_filter_flags
++    </chapter>
++  </part>
++
++  <part id="advanced">
++    <title>Advanced driver interface</title>
++    <partintro>
++      <para>
++       Information contained within this part of the book is
++       of interest only for advanced interaction of mac80211
++       with drivers to exploit more hardware capabilities and
++       improve performance.
++      </para>
++    </partintro>
++
++    <chapter id="hardware-crypto-offload">
++      <title>Hardware crypto acceleration</title>
++!Pinclude/net/mac80211.h Hardware crypto acceleration
++<!-- intentionally multiple !F lines to get proper order -->
++!Finclude/net/mac80211.h set_key_cmd
++!Finclude/net/mac80211.h ieee80211_key_conf
++!Finclude/net/mac80211.h ieee80211_key_alg
++!Finclude/net/mac80211.h ieee80211_key_flags
++    </chapter>
++
++    <chapter id="qos">
++      <title>Multiple queues and QoS support</title>
++      <para>TBD</para>
++!Finclude/net/mac80211.h ieee80211_tx_queue_params
++!Finclude/net/mac80211.h ieee80211_tx_queue_stats_data
++!Finclude/net/mac80211.h ieee80211_tx_queue
++    </chapter>
++
++    <chapter id="AP">
++      <title>Access point mode support</title>
++      <para>TBD</para>
++      <para>Some parts of the if_conf should be discussed here instead</para>
++      <para>
++        Insert notes about VLAN interfaces with hw crypto here or
++        in the hw crypto chapter.
++      </para>
++!Finclude/net/mac80211.h ieee80211_get_buffered_bc
++!Finclude/net/mac80211.h ieee80211_beacon_get
++    </chapter>
++
++    <chapter id="multi-iface">
++      <title>Supporting multiple virtual interfaces</title>
++      <para>TBD</para>
++      <para>
++        Note: WDS with identical MAC address should almost always be OK
++      </para>
++      <para>
++        Insert notes about having multiple virtual interfaces with
++        different MAC addresses here, note which configurations are
++        supported by mac80211, add notes about supporting hw crypto
++        with it.
++      </para>
++    </chapter>
++
++    <chapter id="hardware-scan-offload">
++      <title>Hardware scan offload</title>
++      <para>TBD</para>
++!Finclude/net/mac80211.h ieee80211_scan_completed
++    </chapter>
++  </part>
++
++  <part id="rate-control">
++    <title>Rate control interface</title>
++    <partintro>
++      <para>TBD</para>
++      <para>
++       This part of the book describes the rate control algorithm
++       interface and how it relates to mac80211 and drivers.
++      </para>
++    </partintro>
++    <chapter id="dummy">
++      <title>dummy chapter</title>
++      <para>TBD</para>
++    </chapter>
++  </part>
++
++  <part id="internal">
++    <title>Internals</title>
++    <partintro>
++      <para>TBD</para>
++      <para>
++       This part of the book describes mac80211 internals.
++      </para>
++    </partintro>
++
++    <chapter id="key-handling">
++      <title>Key handling</title>
++      <sect1>
++        <title>Key handling basics</title>
++!Pnet/mac80211/key.c Key handling basics
++      </sect1>
++      <sect1>
++        <title>MORE TBD</title>
++        <para>TBD</para>
++      </sect1>
++    </chapter>
++
++    <chapter id="rx-processing">
++      <title>Receive processing</title>
++      <para>TBD</para>
++    </chapter>
++
++    <chapter id="tx-processing">
++      <title>Transmit processing</title>
++      <para>TBD</para>
++    </chapter>
++
++    <chapter id="sta-info">
++      <title>Station info handling</title>
++      <sect1>
++        <title>Programming information</title>
++!Fnet/mac80211/sta_info.h sta_info
++!Fnet/mac80211/sta_info.h ieee80211_sta_info_flags
++      </sect1>
++      <sect1>
++        <title>STA information lifetime rules</title>
++!Pnet/mac80211/sta_info.c STA information lifetime rules
++      </sect1>
++    </chapter>
++
++    <chapter id="synchronisation">
++      <title>Synchronisation</title>
++      <para>TBD</para>
++      <para>Locking, lots of RCU</para>
++    </chapter>
++  </part>
++</book>
+diff -up linux-2.6.25.noarch/Documentation/DocBook/Makefile.orig linux-2.6.25.noarch/Documentation/DocBook/Makefile
+--- linux-2.6.25.noarch/Documentation/DocBook/Makefile.orig	2008-05-09 11:14:28.000000000 -0400
++++ linux-2.6.25.noarch/Documentation/DocBook/Makefile	2008-05-09 13:37:00.000000000 -0400
+@@ -11,7 +11,8 @@ DOCBOOKS := wanbook.xml z8530book.xml mc
+ 	    procfs-guide.xml writing_usb_driver.xml networking.xml \
+ 	    kernel-api.xml filesystems.xml lsm.xml usb.xml \
+ 	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
+-	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml
++	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
++	    mac80211.xml
  
- int ssb_dma_set_mask(struct ssb_device *ssb_dev, u64 mask)
- {
--	struct device *dev = ssb_dev->dev;
-+	struct device *dma_dev = ssb_dev->dma_dev;
+ ###
+ # The build process is as follows (targets):
+diff -up linux-2.6.25.noarch/Documentation/feature-removal-schedule.txt.orig linux-2.6.25.noarch/Documentation/feature-removal-schedule.txt
+--- linux-2.6.25.noarch/Documentation/feature-removal-schedule.txt.orig	2008-04-16 22:49:44.000000000 -0400
++++ linux-2.6.25.noarch/Documentation/feature-removal-schedule.txt	2008-05-09 13:37:00.000000000 -0400
+@@ -230,33 +230,6 @@ Who:	Jean Delvare <khali at linux-fr.org>
  
- #ifdef CONFIG_SSB_PCIHOST
--	if (ssb_dev->bus->bustype == SSB_BUSTYPE_PCI &&
--	    !dma_supported(dev, mask))
--		return -EIO;
-+	if (ssb_dev->bus->bustype == SSB_BUSTYPE_PCI)
-+		return dma_set_mask(dma_dev, mask);
- #endif
--	dev->coherent_dma_mask = mask;
--	dev->dma_mask = &dev->coherent_dma_mask;
-+	dma_dev->coherent_dma_mask = mask;
-+	dma_dev->dma_mask = &dma_dev->coherent_dma_mask;
+ ---------------------------
  
- 	return 0;
- }
+-What:	bcm43xx wireless network driver
+-When:	2.6.26
+-Files:	drivers/net/wireless/bcm43xx
+-Why:	This driver's functionality has been replaced by the
+-	mac80211-based b43 and b43legacy drivers.
+-Who:	John W. Linville <linville at tuxdriver.com>
+-
+----------------------------
+-
+-What:	ieee80211 softmac wireless networking component
+-When:	2.6.26 (or after removal of bcm43xx and port of zd1211rw to mac80211)
+-Files:	net/ieee80211/softmac
+-Why:	No in-kernel drivers will depend on it any longer.
+-Who:	John W. Linville <linville at tuxdriver.com>
+-
+----------------------------
+-
+-What:	rc80211-simple rate control algorithm for mac80211
+-When:	2.6.26
+-Files:	net/mac80211/rc80211-simple.c
+-Why:	This algorithm was provided for reference but always exhibited bad
+-	responsiveness and performance and has some serious flaws. It has been
+-	replaced by rc80211-pid.
+-Who:	Stefano Brivio <stefano.brivio at polimi.it>
+-
+----------------------------
+-
+ What (Why):
+ 	- include/linux/netfilter_ipv4/ipt_TOS.h ipt_tos.h header files
+ 	  (superseded by xt_TOS/xt_tos target & match)


--- linux-2.6-wireless-pending-too.patch DELETED ---




More information about the scm-commits mailing list