rpms/kernel/F-8 linux-2.6-ath5k-use-soft-wep.patch, NONE, 1.1 kernel.spec, 1.285, 1.286 linux-2.6-wireless-pending.patch, 1.16, 1.17

Sat Dec 1 19:44:58 UTC 2007

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6247

Modified Files:
	kernel.spec linux-2.6-wireless-pending.patch 
Added Files:
	linux-2.6-ath5k-use-soft-wep.patch 
Log Message:
Some wireless bits headed for 2.6.25 ; Make ath5k use software WEP

linux-2.6-ath5k-use-soft-wep.patch:

--- NEW FILE linux-2.6-ath5k-use-soft-wep.patch ---
diff -up linux-2.6.23.noarch/drivers/net/wireless/ath5k/base.c.orig linux-2.6.23.noarch/drivers/net/wireless/ath5k/base.c
--- linux-2.6.23.noarch/drivers/net/wireless/ath5k/base.c.orig	2007-12-01 13:00:52.000000000 -0500
+++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/base.c	2007-12-01 13:01:04.000000000 -0500
@@ -2830,7 +2830,6 @@ ath5k_set_key(struct ieee80211_hw *hw, e
 
 	switch(key->alg) {
 	case ALG_WEP:
-		break;
 	case ALG_TKIP:
 	case ALG_CCMP:
 		return -EOPNOTSUPP;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -r1.285 -r1.286
--- kernel.spec	1 Dec 2007 01:08:32 -0000	1.285
+++ kernel.spec	1 Dec 2007 19:44:21 -0000	1.286
@@ -680,6 +680,7 @@
 Patch692: linux-2.6-zd1211rw-mac80211.patch
 Patch693: linux-2.6-rtl8180.patch
 Patch694: linux-2.6-b43-rev-d.patch
+Patch695: linux-2.6-ath5k-use-soft-wep.patch
 Patch700: linux-2.6-cfg80211-extras.patch
 Patch710: linux-2.6-netdev-e1000e-01.patch
 Patch711: linux-2.6-netdev-e1000e-02.patch
@@ -1284,7 +1285,11 @@
 ApplyPatch linux-2.6-ath5k.patch
 ApplyPatch linux-2.6-zd1211rw-mac80211.patch
 ApplyPatch linux-2.6-rtl8180.patch
+
+# Add support for "rev 13" cores in b43
 ApplyPatch linux-2.6-b43-rev-d.patch
+# Make ath5k use software WEP
+ApplyPatch linux-2.6-ath5k-use-soft-wep.patch
 
 # Restore ability to add/remove virtual i/fs to mac80211 devices
 ApplyPatch linux-2.6-cfg80211-extras.patch
@@ -1984,6 +1989,10 @@
 
 
 %changelog
+* Sat Dec 01 2007 John W. Linville <linville at redhat.com>
+- Some wireless bits headed for 2.6.25
+- Make ath5k use software WEP
+
 * Fri Nov 30 2007 Chuck Ebbert <cebbert at redhat.com>
 - ALSA: fix missing controls on some drivers (#370821)
 - ACPI: send initial button state on startup (#275651)

linux-2.6-wireless-pending.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.16 -r 1.17 linux-2.6-wireless-pending.patch
Index: linux-2.6-wireless-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-wireless-pending.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- linux-2.6-wireless-pending.patch	30 Nov 2007 15:53:21 -0000	1.16
+++ linux-2.6-wireless-pending.patch	1 Dec 2007 19:44:21 -0000	1.17
@@ -1,1124 +1,1874 @@
-diff -up linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c.orig linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c
---- linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c.orig	2007-11-30 10:24:28.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c	2007-11-30 10:25:50.000000000 -0500
-@@ -27,6 +27,7 @@ static const struct pci_device_id b43_pc
- 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4321) },
- 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4324) },
- 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4325) },
-+	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4328) },
- 	{ 0, },
+diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/b43legacy/rfkill.h
+--- /dev/null	2007-12-01 09:44:05.571105098 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/rfkill.h	2007-12-01 14:02:43.000000000 -0500
+@@ -0,0 +1,59 @@
++#ifndef B43legacy_RFKILL_H_
++#define B43legacy_RFKILL_H_
++
++struct b43legacy_wldev;
++
++#ifdef CONFIG_B43LEGACY_RFKILL
++
++#include <linux/rfkill.h>
++#include <linux/workqueue.h>
++#include <linux/input-polldev.h>
++
++
++
++struct b43legacy_rfkill {
++	/* The RFKILL subsystem data structure */
++	struct rfkill *rfkill;
++	/* The poll device for the RFKILL input button */
++	struct input_polled_dev *poll_dev;
++	/* Did initialization succeed? Used for freeing. */
++	bool registered;
++	/* The unique name of this rfkill switch */
++	char name[sizeof("b43legacy-phy4294967295")];
++};
++
++/* The init function returns void, because we are not interested
++ * in failing the b43 init process when rfkill init failed. */
++void b43legacy_rfkill_init(struct b43legacy_wldev *dev);
++void b43legacy_rfkill_exit(struct b43legacy_wldev *dev);
++
++char * b43legacy_rfkill_led_name(struct b43legacy_wldev *dev);
++
++
++#else /* CONFIG_B43LEGACY_RFKILL */
++/* No RFKILL support. */
++
++struct b43legacy_rfkill {
++	/* empty */
++};
++
++static inline void b43legacy_rfkill_alloc(struct b43legacy_wldev *dev)
++{
++}
++static inline void b43legacy_rfkill_free(struct b43legacy_wldev *dev)
++{
++}
++static inline void b43legacy_rfkill_init(struct b43legacy_wldev *dev)
++{
++}
++static inline void b43legacy_rfkill_exit(struct b43legacy_wldev *dev)
++{
++}
++static inline char * b43legacy_rfkill_led_name(struct b43legacy_wldev *dev)
++{
++	return NULL;
++}
++
++#endif /* CONFIG_B43LEGACY_RFKILL */
++
++#endif /* B43legacy_RFKILL_H_ */
+diff -up linux-2.6.23.noarch/drivers/net/wireless/b43legacy/leds.h.orig linux-2.6.23.noarch/drivers/net/wireless/b43legacy/leds.h
+--- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/leds.h.orig	2007-12-01 14:02:29.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/leds.h	2007-12-01 14:02:43.000000000 -0500
+@@ -1,30 +1,33 @@
+ #ifndef B43legacy_LEDS_H_
+ #define B43legacy_LEDS_H_
+ 
++struct b43legacy_wldev;
++
++#ifdef CONFIG_B43LEGACY_LEDS
++
+ #include <linux/types.h>
+-#include <linux/timer.h>
++#include <linux/leds.h>
+ 
+ 
++#define B43legacy_LED_MAX_NAME_LEN	31
++
+ struct b43legacy_led {
+-	u8 behaviour;
+-	bool activelow;
+-	/* Index in the "leds" array in b43legacy_wldev */
+-	u8 index;
+ 	struct b43legacy_wldev *dev;
+-	struct timer_list blink_timer;
+-	unsigned long blink_interval;
++	/* The LED class device */
++	struct led_classdev led_dev;
++	/* The index number of the LED. */
++	u8 index;
++	/* If activelow is true, the LED is ON if the
++	 * bit is switched off. */
++	bool activelow;
++	/* The unique name string for this LED device. */
++	char name[B43legacy_LED_MAX_NAME_LEN + 1];
  };
- MODULE_DEVICE_TABLE(pci, b43_pci_bridge_tbl);
-diff -up linux-2.6.23.noarch/drivers/ssb/pci.c.orig linux-2.6.23.noarch/drivers/ssb/pci.c
---- linux-2.6.23.noarch/drivers/ssb/pci.c.orig	2007-11-30 10:24:28.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/pci.c	2007-11-30 10:25:50.000000000 -0500
-@@ -212,29 +212,29 @@ static inline u8 ssb_crc8(u8 crc, u8 dat
- 	return t[crc ^ data];
+ 
+-/* Delay between state changes when blinking in jiffies */
+-#define B43legacy_LEDBLINK_SLOW		(HZ / 1)
+-#define B43legacy_LEDBLINK_MEDIUM	(HZ / 4)
+-#define B43legacy_LEDBLINK_FAST		(HZ / 8)
+-
+-#define B43legacy_LED_XFER_THRES	(HZ / 100)
+-
+ #define B43legacy_LED_BEHAVIOUR		0x7F
+ #define B43legacy_LED_ACTIVELOW		0x80
+-enum { /* LED behaviour values */
++/* LED behaviour values */
++enum b43legacy_led_behaviour {
+ 	B43legacy_LED_OFF,
+ 	B43legacy_LED_ON,
+ 	B43legacy_LED_ACTIVITY,
+@@ -37,20 +40,24 @@ enum { /* LED behaviour values */
+ 	B43legacy_LED_WEIRD,
+ 	B43legacy_LED_ASSOC,
+ 	B43legacy_LED_INACTIVE,
+-
+-	/* Behaviour values for testing.
+-	 * With these values it is easier to figure out
+-	 * the real behaviour of leds, in case the SPROM
+-	 * is missing information.
+-	 */
+-	B43legacy_LED_TEST_BLINKSLOW,
+-	B43legacy_LED_TEST_BLINKMEDIUM,
+-	B43legacy_LED_TEST_BLINKFAST,
+ };
+ 
+-int b43legacy_leds_init(struct b43legacy_wldev *dev);
++void b43legacy_leds_init(struct b43legacy_wldev *dev);
+ void b43legacy_leds_exit(struct b43legacy_wldev *dev);
+-void b43legacy_leds_update(struct b43legacy_wldev *dev, int activity);
+-void b43legacy_leds_switch_all(struct b43legacy_wldev *dev, int on);
++
++#else /* CONFIG_B43EGACY_LEDS */
++/* LED support disabled */
++
++struct b43legacy_led {
++	/* empty */
++};
++
++static inline void b43legacy_leds_init(struct b43legacy_wldev *dev)
++{
++}
++static inline void b43legacy_leds_exit(struct b43legacy_wldev *dev)
++{
++}
++#endif /* CONFIG_B43LEGACY_LEDS */
+ 
+ #endif /* B43legacy_LEDS_H_ */
+diff -up linux-2.6.23.noarch/drivers/net/wireless/b43legacy/main.h.orig linux-2.6.23.noarch/drivers/net/wireless/b43legacy/main.h
+--- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/main.h.orig	2007-12-01 14:02:29.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/main.h	2007-12-01 14:02:43.000000000 -0500
+@@ -3,7 +3,7 @@
+   Broadcom B43legacy wireless driver
+ 
+   Copyright (c) 2005 Martin Langer <martin-langer at gmx.de>,
+-  Copyright (c) 2005 Stefano Brivio <st3 at riseup.net>
++  Copyright (c) 2005 Stefano Brivio <stefano.brivio at polimi.it>
+   Copyright (c) 2005, 2006 Michael Buesch <mb at bu3sch.de>
+   Copyright (c) 2005  Danny van Dyk <kugelfang at gentoo.org>
+   Copyright (c) 2005  Andreas Jaggi <andreas.jaggi at waterwave.ch>
+diff -up linux-2.6.23.noarch/drivers/net/wireless/b43legacy/phy.c.orig linux-2.6.23.noarch/drivers/net/wireless/b43legacy/phy.c
+--- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/phy.c.orig	2007-12-01 14:02:29.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/phy.c	2007-12-01 14:02:43.000000000 -0500
+@@ -3,7 +3,7 @@
+   Broadcom B43legacy wireless driver
+ 
+   Copyright (c) 2005 Martin Langer <martin-langer at gmx.de>,
+-		     Stefano Brivio <st3 at riseup.net>
++		     Stefano Brivio <stefano.brivio at polimi.it>
+ 		     Michael Buesch <mbuesch at freenet.de>
+ 		     Danny van Dyk <kugelfang at gentoo.org>
+      Andreas Jaggi <andreas.jaggi at waterwave.ch>
[...88416 lines suppressed...]
++ * @ampdu_factor: Maximum A-MPDU length factor
++ * @ampdu_density: Minimum A-MPDU spacing
++ * @supp_mcs_set: Supported MCS set as described in 802.11n spec
++ */
++struct ieee80211_ht_info {
++	u8 ht_supported;
++	u16 cap; /* use IEEE80211_HT_CAP_ */
++	u8 ampdu_factor;
++	u8 ampdu_density;
++	u8 supp_mcs_set[16];
++};
++
++/**
++ * struct ieee80211_ht_bss_info - describing BSS's HT characteristics
++ *
++ * This structure describes most essential parameters needed
++ * to describe 802.11n HT characteristics in a BSS
++ *
++ * @primary_channel: channel number of primery channel
++ * @bss_cap: 802.11n's general BSS capabilities (e.g. channel width)
++ * @bss_op_mode: 802.11n's BSS operation modes (e.g. HT protection)
++ */
++struct ieee80211_ht_bss_info {
++	u8 primary_channel;
++	u8 bss_cap;  /* use IEEE80211_HT_IE_CHA_ */
++	u8 bss_op_mode; /* use IEEE80211_HT_IE_ */
++};
++
++/**
+  * struct ieee80211_hw_mode - PHY mode definition
+  *
+  * This structure describes the capabilities supported by the device
+  * in a single PHY mode.
+  *
++ * @list: internal
++ * @channels: pointer to array of supported channels
++ * @rates: pointer to array of supported bitrates
+  * @mode: the PHY mode for this definition
+  * @num_channels: number of supported channels
+- * @channels: pointer to array of supported channels
+  * @num_rates: number of supported bitrates
+- * @rates: pointer to array of supported bitrates
+- * @list: internal
++ * @ht_info: PHY's 802.11n HT abilities for this mode
+  */
+ struct ieee80211_hw_mode {
+ 	struct list_head list;
+@@ -158,6 +195,7 @@ struct ieee80211_hw_mode {
+ 	enum ieee80211_phymode mode;
+ 	int num_channels;
+ 	int num_rates;
++	struct ieee80211_ht_info ht_info;
+ };
+ 
+ /**
+@@ -406,11 +444,12 @@ struct ieee80211_tx_status {
+  *
+  * @IEEE80211_CONF_SHORT_SLOT_TIME: use 802.11g short slot time
+  * @IEEE80211_CONF_RADIOTAP: add radiotap header at receive time (if supported)
+- *
++ * @IEEE80211_CONF_SUPPORT_HT_MODE: use 802.11n HT capabilities (if supported)
+  */
+ enum ieee80211_conf_flags {
+-	IEEE80211_CONF_SHORT_SLOT_TIME	= 1<<0,
+-	IEEE80211_CONF_RADIOTAP		= 1<<1,
++	IEEE80211_CONF_SHORT_SLOT_TIME	= (1<<0),
++	IEEE80211_CONF_RADIOTAP		= (1<<1),
++	IEEE80211_CONF_SUPPORT_HT_MODE	= (1<<2),
+ };
+ 
+ /**
+@@ -434,6 +473,8 @@ enum ieee80211_conf_flags {
+  * @antenna_sel_tx: transmit antenna selection, 0: default/diversity,
+  *	1/2: antenna 0/1
+  * @antenna_sel_rx: receive antenna selection, like @antenna_sel_tx
++ * @ht_conf: describes current self configuration of 802.11n HT capabilies
++ * @ht_bss_conf: describes current BSS configuration of 802.11n HT parameters
+  */
+ struct ieee80211_conf {
+ 	int channel;			/* IEEE 802.11 channel number */
+@@ -452,6 +493,9 @@ struct ieee80211_conf {
+ 	u8 antenna_max;
+ 	u8 antenna_sel_tx;
+ 	u8 antenna_sel_rx;
++
++	struct ieee80211_ht_info ht_conf;
++	struct ieee80211_ht_bss_info ht_bss_conf;
+ };
+ 
+ /**
+@@ -997,6 +1041,8 @@ enum ieee80211_erp_change_flags {
+  * @tx_last_beacon: Determine whether the last IBSS beacon was sent by us.
+  *	This is needed only for IBSS mode and the result of this function is
+  *	used to determine whether to reply to Probe Requests.
++ *
++ * @conf_ht: Configures low level driver with 802.11n HT data. Must be atomic.
+  */
+ struct ieee80211_ops {
+ 	int (*tx)(struct ieee80211_hw *hw, struct sk_buff *skb,
+@@ -1042,6 +1088,7 @@ struct ieee80211_ops {
+ 			     struct sk_buff *skb,
+ 			     struct ieee80211_tx_control *control);
+ 	int (*tx_last_beacon)(struct ieee80211_hw *hw);
++	int (*conf_ht)(struct ieee80211_hw *hw, struct ieee80211_conf *conf);
+ };
+ 
+ /**
+@@ -1410,4 +1457,19 @@ void ieee80211_scan_completed(struct iee
  #define MAC_ARG(x) ((u8*)(x))[0], ((u8*)(x))[1], ((u8*)(x))[2], \
  		   ((u8*)(x))[3], ((u8*)(x))[4], ((u8*)(x))[5]
  
@@ -46715,10 +48894,9 @@
 + *
 + * This function iterates over the interfaces associated with a given
 + * hardware that are currently active and calls the callback for them.
-+ * Must be called under RTNL.
 + *
 + * @hw: the hardware struct of which the interfaces should be iterated over
-+ * @iterator: the iterator function to call
++ * @iterator: the iterator function to call, cannot sleep
 + * @data: first argument of the iterator function
 + */
 +void ieee80211_iterate_active_interfaces(struct ieee80211_hw *hw,
@@ -46728,8 +48906,8 @@
 +
  #endif /* MAC80211_H */
 diff -up linux-2.6.23.noarch/include/linux/ieee80211.h.orig linux-2.6.23.noarch/include/linux/ieee80211.h
---- linux-2.6.23.noarch/include/linux/ieee80211.h.orig	2007-11-30 10:24:30.000000000 -0500
-+++ linux-2.6.23.noarch/include/linux/ieee80211.h	2007-11-30 10:25:50.000000000 -0500
+--- linux-2.6.23.noarch/include/linux/ieee80211.h.orig	2007-12-01 14:02:29.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/ieee80211.h	2007-12-01 14:02:43.000000000 -0500
 @@ -54,6 +54,8 @@
  #define IEEE80211_STYPE_ACTION		0x00D0
  
@@ -46947,8 +49125,8 @@
  #define WLAN_CIPHER_SUITE_USE_GROUP	0x000FAC00
  #define WLAN_CIPHER_SUITE_WEP40		0x000FAC01
 diff -up linux-2.6.23.noarch/include/linux/ssb/ssb_regs.h.orig linux-2.6.23.noarch/include/linux/ssb/ssb_regs.h
---- linux-2.6.23.noarch/include/linux/ssb/ssb_regs.h.orig	2007-11-30 10:24:30.000000000 -0500
-+++ linux-2.6.23.noarch/include/linux/ssb/ssb_regs.h	2007-11-30 10:25:50.000000000 -0500
+--- linux-2.6.23.noarch/include/linux/ssb/ssb_regs.h.orig	2007-12-01 14:02:29.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/ssb/ssb_regs.h	2007-12-01 14:02:43.000000000 -0500
 @@ -147,6 +147,10 @@
  #define  SSB_IDLOW_SSBREV	0xF0000000 /* Sonics Backplane Revision code */
  #define  SSB_IDLOW_SSBREV_22	0x00000000 /* <= 2.2 */
@@ -47049,8 +49227,8 @@
  enum {
  	SSB_SPROM1CCODE_WORLD = 0,
 diff -up linux-2.6.23.noarch/include/linux/ssb/ssb.h.orig linux-2.6.23.noarch/include/linux/ssb/ssb.h
---- linux-2.6.23.noarch/include/linux/ssb/ssb.h.orig	2007-11-30 10:24:30.000000000 -0500
-+++ linux-2.6.23.noarch/include/linux/ssb/ssb.h	2007-11-30 10:25:50.000000000 -0500
+--- linux-2.6.23.noarch/include/linux/ssb/ssb.h.orig	2007-12-01 14:02:29.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/ssb/ssb.h	2007-12-01 14:02:43.000000000 -0500
 @@ -15,22 +15,14 @@ struct pcmcia_device;
  struct ssb_bus;
  struct ssb_driver;
@@ -47152,43 +49330,3 @@
  	u8 chip_package;
  
  	/* List of devices (cores) on the backplane. */
-diff -up linux-2.6.23.noarch/MAINTAINERS.orig linux-2.6.23.noarch/MAINTAINERS
---- linux-2.6.23.noarch/MAINTAINERS.orig	2007-11-30 10:24:30.000000000 -0500
-+++ linux-2.6.23.noarch/MAINTAINERS	2007-11-30 10:25:50.000000000 -0500
-@@ -2063,10 +2063,12 @@ W:	http://sourceforge.net/projects/e1000
- S:	Supported
- 
- INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
--P:	Yi Zhu
-+P:	Zhu Yi
- M:	yi.zhu at intel.com
- P:	James Ketrenos
- M:	jketreno at linux.intel.com
-+P:	Reinette Chatre
-+M:	reinette.chatre at intel.com
- L:	linux-wireless at vger.kernel.org
- L:	ipw2100-devel at lists.sourceforge.net
- L:	http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
-@@ -2074,10 +2076,12 @@ W:	http://ipw2100.sourceforge.net
- S:	Supported
- 
- INTEL PRO/WIRELESS 2915ABG NETWORK CONNECTION SUPPORT
--P:	Yi Zhu
-+P:	Zhu Yi
- M:	yi.zhu at intel.com
- P:	James Ketrenos
- M:	jketreno at linux.intel.com
-+P:	Reinette Chatre
-+M:	reinette.chatre at intel.com
- L:	linux-wireless at vger.kernel.org
- L:	ipw2100-devel at lists.sourceforge.net
- L:	http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
-@@ -2087,6 +2091,8 @@ S:	Supported
- INTEL WIRELESS WIFI LINK (iwlwifi)
- P:	Zhu Yi
- M:	yi.zhu at intel.com
-+P:	Reinette Chatre
-+M:	reinette.chatre at intel.com
- L:	linux-wireless at vger.kernel.org
- L:	ipw3945-devel at lists.sourceforge.net
- W:	http://intellinuxwireless.org


