rpms/kernel/F-8 kernel.spec, 1.313, 1.314 linux-2.6-ath5k.patch, 1.12, 1.13 linux-2.6-wireless-pending.patch, 1.22, 1.23 linux-2.6-wireless.patch, 1.19, 1.20
John W. Linville (linville)
fedora-extras-commits at redhat.com
Thu Jan 10 23:23:37 UTC 2008
Author: linville
Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15726
Modified Files:
kernel.spec linux-2.6-ath5k.patch
linux-2.6-wireless-pending.patch linux-2.6-wireless.patch
Log Message:
rt2500usb thinko fix ; b43 N phy pre-support updates ; ath5k cleanups and beacon fixes
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -r1.313 -r1.314
--- kernel.spec 9 Jan 2008 21:49:04 -0000 1.313
+++ kernel.spec 10 Jan 2008 23:22:50 -0000 1.314
@@ -2053,6 +2053,11 @@
%changelog
+* Thu Jan 10 2008 John W. Linville <linville at redhat.com> 2.6.23.13-105
+- rt2500usb thinko fix
+- b43 N phy pre-support updates
+- ath5k cleanups and beacon fixes
+
* Wed Jan 09 2008 John W. Linville <linville at redhat.com> 2.6.23.13-104
- More wireless fixes for 2.6.24
- More wireless update for 2.6.25
linux-2.6-ath5k.patch:
Index: linux-2.6-ath5k.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-ath5k.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- linux-2.6-ath5k.patch 9 Jan 2008 21:49:04 -0000 1.12
+++ linux-2.6-ath5k.patch 10 Jan 2008 23:22:50 -0000 1.13
@@ -1,3 +1,100 @@
+commit 5a2b0eb069545d31c2babad6b1f9c472c1f1db76
+Author: Bruno Randolf <bruno at thinktube.com>
+Date: Thu Jan 10 15:06:29 2008 +0900
+
+ ath5k: remove duplicate bssid variable
+
+ struct ath5k_hw included two different variables for caching the bssid. remove
+ one of them.
+
+ drivers/net/wireless/ath5k/ath5k.h: Changes-licensed-under: ISC
+ drivers/net/wireless/ath5k/base.c: Changes-licensed-under: 3-Clause-BSD
+ drivers/net/wireless/ath5k/hw.c: Changes-licensed-under: ISC
+
+ Signed-off-by: Bruno Randolf <bruno at thinktube.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit d06d995304a974e0e2e5b53b94a4f7caf3669324
+Author: Bruno Randolf <bruno at thinktube.com>
+Date: Wed Jan 9 19:11:14 2008 +0900
+
+ ath5k: simplify beacon configuration
+
+ make ath5k_beacon_config() clearer and move timer configuration into a seperate
+ function. it will be needed later when we can detect HW merges.
+
+ Changes-licensed-under: 3-clause-BSD
+ Signed-off-by: Bruno Randolf <bruno at thinktube.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit f4e1fe88feeb0368159019bbd81f47a7ff2b4603
+Author: Bruno Randolf <bruno at thinktube.com>
+Date: Wed Jan 9 18:16:08 2008 +0900
+
+ ath5k: configure beacons
+
+ call ath5k_beacon_config() on beacon_update and after channel changes. this is
+ necessary to ensure beacons are sent.
+
+ Changes-licensed-under: 3-clause-BSD
+ Signed-off-by: Bruno Randolf <bruno at thinktube.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 5c1ba23224c3f5b32f65f012ad4f997d9e06bd6c
+Author: Bruno Randolf <bruno at thinktube.com>
+Date: Wed Jan 9 18:16:07 2008 +0900
+
+ ath5k: centrally define TSF to TU conversion macro
+
+ centrally define TSF_TO_TO macro for TSF to TU conversion and use it in all
+ instances. there will be more usage for this later.
+
+ ath5k.h: Changes-licensed-under: ISC
+ all others: Changes-licensed-under: 3-clause-BSD
+ Signed-off-by: Bruno Randolf <bruno at thinktube.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit dc54838a243069219afcebc49be888c70b3b352e
+Author: Bruno Randolf <bruno at thinktube.com>
+Date: Wed Jan 9 18:16:06 2008 +0900
+
+ ath5k: comment out unused beacon functions and structures
+
+ use '#if 0' to comment out unused functions and structures wrt beacons. we
+ might need that info later but right now they are useless and probably need to
+ be rewritten.
+
+ Changes-licensed-under: ISC
+ Signed-off-by: Bruno Randolf <bruno at thinktube.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit ed700c25133d90619b05ef44bb20ec23976861ed
+Author: Bruno Randolf <bruno at thinktube.com>
+Date: Wed Jan 9 18:16:05 2008 +0900
+
+ ath5k: rename function ath5k_hw_wait_for_beacon
+
+ rename to ath5k_hw_beaconq_finish, since this is more clear.
+ this function is unused at the moment
+
+ Changes-licensed-under: ISC
+ Signed-off-by: Bruno Randolf <bruno at thinktube.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 393c6826c469077da28543b5ca635b37b7dc18cd
+Author: Bruno Randolf <bruno at thinktube.com>
+Date: Wed Jan 9 18:16:04 2008 +0900
+
+ ath5k: code cosmetics
+
+ * move some enums to kdoc
+ * small cosmetic changes of indentation etc
+
+ base.[ch]: Changes-licensed-under: 3-clause-BSD
+ all others: Changes-licensed-under: ISC
+ Signed-off-by: Bruno Randolf <bruno at thinktube.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
commit c8b7de755e09acd128db3998747989e1c2b118c8
Author: Johannes Berg <johannes at sipsolutions.net>
Date: Fri Dec 21 00:59:04 2007 +0100
@@ -1563,8 +1660,8 @@
Signed-off-by: John W. Linville <linville at tuxdriver.com>
diff -up linux-2.6.23.noarch/MAINTAINERS.orig linux-2.6.23.noarch/MAINTAINERS
---- linux-2.6.23.noarch/MAINTAINERS.orig 2008-01-09 14:23:27.000000000 -0500
-+++ linux-2.6.23.noarch/MAINTAINERS 2008-01-09 14:28:44.000000000 -0500
+--- linux-2.6.23.noarch/MAINTAINERS.orig 2008-01-10 17:32:11.000000000 -0500
++++ linux-2.6.23.noarch/MAINTAINERS 2008-01-10 17:33:50.000000000 -0500
@@ -642,6 +642,17 @@ M: ecashin at coraid.com
W: http://www.coraid.com/support/linux
S: Supported
@@ -1584,8 +1681,8 @@
P: Jay Cliburn
M: jcliburn at gmail.com
diff -up linux-2.6.23.noarch/drivers/net/wireless/Makefile.orig linux-2.6.23.noarch/drivers/net/wireless/Makefile
---- linux-2.6.23.noarch/drivers/net/wireless/Makefile.orig 2008-01-09 14:23:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/Makefile 2008-01-09 14:28:44.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/Makefile.orig 2008-01-10 17:32:11.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/Makefile 2008-01-10 17:33:50.000000000 -0500
@@ -62,3 +62,5 @@ obj-$(CONFIG_RT2X00) += rt2x00/
obj-$(CONFIG_P54_COMMON) += p54common.o
obj-$(CONFIG_P54_USB) += p54usb.o
@@ -1593,8 +1690,8 @@
+
+obj-$(CONFIG_ATH5K) += ath5k/
diff -up linux-2.6.23.noarch/drivers/net/wireless/Kconfig.orig linux-2.6.23.noarch/drivers/net/wireless/Kconfig
---- linux-2.6.23.noarch/drivers/net/wireless/Kconfig.orig 2008-01-09 14:23:27.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/Kconfig 2008-01-09 14:29:20.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/Kconfig.orig 2008-01-10 17:32:11.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/Kconfig 2008-01-10 17:34:19.000000000 -0500
@@ -650,6 +650,23 @@ config P54_PCI
If you choose to build a module, it'll be called p54pci.
@@ -1620,8 +1717,8 @@
source "drivers/net/wireless/bcm43xx/Kconfig"
source "drivers/net/wireless/b43/Kconfig"
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/ath5k/phy.c
---- /dev/null 2008-01-09 08:24:16.586202496 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/phy.c 2008-01-09 14:28:44.000000000 -0500
+--- /dev/null 2008-01-10 08:19:44.585871638 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/phy.c 2008-01-10 17:33:50.000000000 -0500
@@ -0,0 +1,2071 @@
+/*
+ * PHY functions
@@ -3695,9 +3792,9 @@
+ return ath5k_hw_txpower(ah, channel, power);
+}
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/ath5k/ath5k.h
---- /dev/null 2008-01-09 08:24:16.586202496 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/ath5k.h 2008-01-09 14:28:44.000000000 -0500
-@@ -0,0 +1,1153 @@
+--- /dev/null 2008-01-10 08:19:44.585871638 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/ath5k.h 2008-01-10 17:33:50.000000000 -0500
+@@ -0,0 +1,1173 @@
+/*
+ * Copyright (c) 2004-2007 Reyk Floeter <reyk at openbsd.org>
+ * Copyright (c) 2006-2007 Nick Kossifidis <mickflemm at gmail.com>
@@ -3989,16 +4086,22 @@
+#define AR5K_TXERR_FILT 0x02
+#define AR5K_TXERR_FIFO 0x04
+
-+/*
-+ * Queue types used to classify tx queues.
++/**
++ * enum ath5k_tx_queue - Queue types used to classify tx queues.
++ * @AR5K_TX_QUEUE_INACTIVE: q is unused -- see ath5k_hw_release_tx_queue
++ * @AR5K_TX_QUEUE_DATA: A normal data queue
++ * @AR5K_TX_QUEUE_XR_DATA: An XR-data queue
++ * @AR5K_TX_QUEUE_BEACON: The beacon queue
++ * @AR5K_TX_QUEUE_CAB: The after-beacon queue
++ * @AR5K_TX_QUEUE_UAPSD: Unscheduled Automatic Power Save Delivery queue
+ */
+enum ath5k_tx_queue {
-+ AR5K_TX_QUEUE_INACTIVE = 0, /* q is unused -- see ath5k_hw_release_tx_queue */
-+ AR5K_TX_QUEUE_DATA, /*A normal data queue*/
-+ AR5K_TX_QUEUE_XR_DATA, /*An XR-data queue*/
-+ AR5K_TX_QUEUE_BEACON, /*The beacon queue*/
-+ AR5K_TX_QUEUE_CAB, /*The ater-beacon queue*/
-+ AR5K_TX_QUEUE_UAPSD, /*Unscheduled Automatic Power Save Delivery queue*/
++ AR5K_TX_QUEUE_INACTIVE = 0,
++ AR5K_TX_QUEUE_DATA,
++ AR5K_TX_QUEUE_XR_DATA,
++ AR5K_TX_QUEUE_BEACON,
++ AR5K_TX_QUEUE_CAB,
++ AR5K_TX_QUEUE_UAPSD,
+};
+
+#define AR5K_NUM_TX_QUEUES 10
@@ -4153,25 +4256,37 @@
+#define AR5K_BEACON_ENA 0x00800000 /*enable beacon xmit*/
+#define AR5K_BEACON_RESET_TSF 0x01000000 /*force a TSF reset*/
+
-+/*
-+ * Per-station beacon timer state.
++#if 0
++/**
++ * struct ath5k_beacon_state - Per-station beacon timer state.
++ * @bs_interval: in TU's, can also include the above flags
++ * @bs_cfp_max_duration: if non-zero hw is setup to coexist with a
++ * Point Coordination Function capable AP
+ */
+struct ath5k_beacon_state {
+ u32 bs_next_beacon;
+ u32 bs_next_dtim;
-+ u32 bs_interval; /*in TU's -see net80211/ieee80211_var.h-
-+ can also include the above flags*/
++ u32 bs_interval;
+ u8 bs_dtim_period;
+ u8 bs_cfp_period;
-+ u16 bs_cfp_max_duration; /*if non-zero hw is setup to coexist with
-+ a Point Coordination Function capable AP*/
++ u16 bs_cfp_max_duration;
+ u16 bs_cfp_du_remain;
+ u16 bs_tim_offset;
+ u16 bs_sleep_duration;
+ u16 bs_bmiss_threshold;
+ u32 bs_cfp_next;
+};
++#endif
++
+
++/*
++ * TSF to TU conversion:
++ *
++ * TSF is a 64bit value in usec (microseconds).
++ * TU is a 32bit value in roughly msec (milliseconds): usec / 1024
++ * (1000ms equals 976 TU)
++ */
++#define TSF_TO_TU(_tsf) (u32)((_tsf) >> 10)
+
+
+
@@ -4633,10 +4748,6 @@
+ enum ieee80211_if_types ah_op_mode;
+ enum ath5k_power_mode ah_power_mode;
+ struct ieee80211_channel ah_current_channel;
-+ /* Current BSSID we are trying to assoc to / creating, this
-+ * comes from ieee80211_if_conf. This is passed by mac80211 on
-+ * config_interface() */
-+ u8 bssid[ETH_ALEN];
+ bool ah_turbo;
+ bool ah_calibration;
+ bool ah_running;
@@ -4673,6 +4784,10 @@
+ bool ah_ant_diversity;
+
+ u8 ah_sta_id[ETH_ALEN];
++
++ /* Current BSSID we are trying to assoc to / creating.
++ * This is passed by mac80211 on config_interface() and cached here for
++ * use in resets */
+ u8 ah_bssid[ETH_ALEN];
+
+ u32 ah_gpio[AR5K_MAX_GPIO];
@@ -4775,9 +4890,11 @@
+extern u64 ath5k_hw_get_tsf64(struct ath5k_hw *ah);
+extern void ath5k_hw_reset_tsf(struct ath5k_hw *ah);
+extern void ath5k_hw_init_beacon(struct ath5k_hw *ah, u32 next_beacon, u32 interval);
++#if 0
+extern int ath5k_hw_set_beacon_timers(struct ath5k_hw *ah, const struct ath5k_beacon_state *state);
+extern void ath5k_hw_reset_beacon(struct ath5k_hw *ah);
-+extern int ath5k_hw_wait_for_beacon(struct ath5k_hw *ah, unsigned long phys_addr);
++extern int ath5k_hw_beaconq_finish(struct ath5k_hw *ah, unsigned long phys_addr);
++#endif
+extern void ath5k_hw_update_mib_counters(struct ath5k_hw *ah, struct ath5k_mib_stats *statistics);
+/* ACK bit rate */
+void ath5k_hw_set_ack_bitrate_high(struct ath5k_hw *ah, bool high);
@@ -4852,14 +4969,14 @@
+
+#endif
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/ath5k/Makefile
---- /dev/null 2008-01-09 08:24:16.586202496 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/Makefile 2008-01-09 14:28:44.000000000 -0500
+--- /dev/null 2008-01-10 08:19:44.585871638 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/Makefile 2008-01-10 17:33:50.000000000 -0500
@@ -0,0 +1,2 @@
+ath5k-objs = base.o hw.o regdom.o initvals.o phy.o debug.o
+obj-$(CONFIG_ATH5K) += ath5k.o
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/ath5k/reg.h
---- /dev/null 2008-01-09 08:24:16.586202496 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/reg.h 2008-01-09 14:28:44.000000000 -0500
+--- /dev/null 2008-01-10 08:19:44.585871638 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/reg.h 2008-01-10 17:33:50.000000000 -0500
@@ -0,0 +1,1987 @@
+/*
+ * Copyright (c) 2007 Nick Kossifidis <mickflemm at gmail.com>
@@ -4946,7 +5063,7 @@
+/*
+ * Interrupt enable register
+ */
-+#define AR5K_IER 0x0024 /* Register Address */
++#define AR5K_IER 0x0024 /* Register Address */
+#define AR5K_IER_DISABLE 0x00000000 /* Disable card interrupts */
+#define AR5K_IER_ENABLE 0x00000001 /* Enable card interrupts */
+
@@ -4959,7 +5076,7 @@
+/*
+ * Beacon control register [5210]
+ */
-+#define AR5K_BCR 0x0028 /* Register Address */
++#define AR5K_BCR 0x0028 /* Register Address */
+#define AR5K_BCR_AP 0x00000000 /* AP mode */
+#define AR5K_BCR_ADHOC 0x00000001 /* Ad-Hoc mode */
+#define AR5K_BCR_BDMAE 0x00000002 /* DMA enable */
@@ -4970,7 +5087,7 @@
+/*
+ * First RTS duration register [5211]
+ */
-+#define AR5K_RTSD0 0x0028 /* Register Address */
++#define AR5K_RTSD0 0x0028 /* Register Address */
+#define AR5K_RTSD0_6 0x000000ff /* 6Mb RTS duration mask (?) */
+#define AR5K_RTSD0_6_S 0 /* 6Mb RTS duration shift (?) */
+#define AR5K_RTSD0_9 0x0000ff00 /* 9Mb*/
@@ -6849,8 +6966,8 @@
+#define AR5K_PHY_GAIN_2GHZ_MARGIN_TXRX_S 18
+#define AR5K_PHY_GAIN_2GHZ_INI_5111 0x6480416c
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/ath5k/regdom.h
---- /dev/null 2008-01-09 08:24:16.586202496 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/regdom.h 2008-01-09 14:28:44.000000000 -0500
+--- /dev/null 2008-01-10 08:19:44.585871638 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/regdom.h 2008-01-10 17:33:50.000000000 -0500
@@ -0,0 +1,500 @@
+/*
+ * Copyright (c) 2004, 2005 Reyk Floeter <reyk at openbsd.org>
@@ -7353,8 +7470,8 @@
+
+#endif
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/ath5k/debug.h
---- /dev/null 2008-01-09 08:24:16.586202496 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/debug.h 2008-01-09 14:28:44.000000000 -0500
+--- /dev/null 2008-01-10 08:19:44.585871638 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/debug.h 2008-01-10 17:33:50.000000000 -0500
@@ -0,0 +1,216 @@
+/*
+ * Copyright (c) 2007 Bruno Randolf <bruno at thinktube.com>
@@ -7573,8 +7690,8 @@
+
+#endif /* ifndef _ATH5K_DEBUG_H */
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/ath5k/hw.c
---- /dev/null 2008-01-09 08:24:16.586202496 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/hw.c 2008-01-09 14:28:44.000000000 -0500
+--- /dev/null 2008-01-10 08:19:44.585871638 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/hw.c 2008-01-10 17:33:50.000000000 -0500
@@ -0,0 +1,4349 @@
+ /*
+ * Copyright (c) 2004-2007 Reyk Floeter <reyk at openbsd.org>
@@ -7840,8 +7957,8 @@
+
+ ath5k_hw_set_lladdr(ah, mac);
+ /* Set BSSID to bcast address: ff:ff:ff:ff:ff:ff for now */
-+ memset(ah->bssid, 0xff, ETH_ALEN);
-+ ath5k_hw_set_associd(ah, ah->bssid, 0);
++ memset(ah->ah_bssid, 0xff, ETH_ALEN);
++ ath5k_hw_set_associd(ah, ah->ah_bssid, 0);
+ ath5k_hw_set_opmode(ah);
+
+ ath5k_hw_set_rfgain_opt(ah);
@@ -8443,7 +8560,7 @@
+ * Misc
+ */
+ /* XXX: add ah->aid once mac80211 gives this to us */
-+ ath5k_hw_set_associd(ah, ah->bssid, 0);
++ ath5k_hw_set_associd(ah, ah->ah_bssid, 0);
+
+ ath5k_hw_set_opmode(ah);
+ /*PISR/SISR Not available on 5210*/
@@ -9863,7 +9980,6 @@
+ ath5k_hw_reg_write(ah, low_id, AR5K_BSS_ID0);
+ ath5k_hw_reg_write(ah, high_id | ((assoc_id & 0x3fff) <<
+ AR5K_BSS_ID1_AID_S), AR5K_BSS_ID1);
-+ memcpy(&ah->ah_bssid, bssid, ETH_ALEN);
+
+ if (assoc_id == 0) {
+ ath5k_hw_disable_pspoll(ah);
@@ -10202,6 +10318,7 @@
+ AR5K_BEACON);
+}
+
++#if 0
+/*
+ * Set beacon timers
+ */
@@ -10350,9 +10467,8 @@
+
+/*
+ * Wait for beacon queue to finish
-+ * TODO: This function's name is misleading, rename
+ */
-+int ath5k_hw_wait_for_beacon(struct ath5k_hw *ah, unsigned long phys_addr)
++int ath5k_hw_beaconq_finish(struct ath5k_hw *ah, unsigned long phys_addr)
+{
+ unsigned int i;
+ int ret;
@@ -10397,6 +10513,7 @@
+
+ return ret;
+}
++#endif
+
+/*
+ * Update mib counters (statistics)
@@ -11926,8 +12043,8 @@
+ return -EIO;
+}
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/ath5k/hw.h
---- /dev/null 2008-01-09 08:24:16.586202496 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/hw.h 2008-01-09 14:28:44.000000000 -0500
+--- /dev/null 2008-01-10 08:19:44.585871638 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/hw.h 2008-01-10 17:33:50.000000000 -0500
@@ -0,0 +1,588 @@
+/*
+ * Copyright (c) 2004-2007 Reyk Floeter <reyk at openbsd.org>
@@ -12518,8 +12635,8 @@
+ return retval;
+}
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/ath5k/initvals.c
---- /dev/null 2008-01-09 08:24:16.586202496 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/initvals.c 2008-01-09 14:28:44.000000000 -0500
+--- /dev/null 2008-01-10 08:19:44.585871638 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/initvals.c 2008-01-10 17:33:50.000000000 -0500
@@ -0,0 +1,1347 @@
+/*
+ * Initial register settings functions
@@ -13869,9 +13986,9 @@
+ return 0;
+}
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/ath5k/base.c
---- /dev/null 2008-01-09 08:24:16.586202496 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/base.c 2008-01-09 14:28:44.000000000 -0500
-@@ -0,0 +1,2822 @@
+--- /dev/null 2008-01-10 08:19:44.585871638 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/base.c 2008-01-10 17:33:50.000000000 -0500
+@@ -0,0 +1,2817 @@
+/*-
+ * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
+ * Copyright (c) 2004-2005 Atheros Communications, Inc.
@@ -14929,6 +15046,7 @@
+ */
+/* ath5k_chan_change(sc, chan); */
+
++ ath5k_beacon_config(sc);
+ /*
+ * Re-enable interrupts.
+ */
@@ -15319,7 +15437,7 @@
+ if (ret)
+ return ret;
+ if (sc->opmode == IEEE80211_IF_TYPE_AP ||
-+ sc->opmode == IEEE80211_IF_TYPE_IBSS) {
++ sc->opmode == IEEE80211_IF_TYPE_IBSS) {
+ /*
+ * Always burst out beacon and CAB traffic
+ * (aifs = cwmin = cwmax = 0)
@@ -15377,7 +15495,7 @@
+ /* XXX return value */
+ if (likely(!test_bit(ATH_STAT_INVALID, sc->status))) {
+ /* don't touch the hardware if marked invalid */
-+ (void)ath5k_hw_stop_tx_dma(ah, sc->bhalq);
++ ath5k_hw_stop_tx_dma(ah, sc->bhalq);
+ ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "beacon queue %x\n",
+ ath5k_hw_get_tx_buf(ah, sc->bhalq));
+ for (i = 0; i < ARRAY_SIZE(sc->txqs); i++)
@@ -15844,25 +15962,10 @@
+ sc->bsent++;
+}
+
-+/*
-+ * Configure the beacon and sleep timers.
-+ *
-+ * When operating as an AP this resets the TSF and sets
-+ * up the hardware to notify us when we need to issue beacons.
-+ *
-+ * When operating in station mode this sets up the beacon
-+ * timers according to the timestamp of the last received
-+ * beacon and the current TSF, configures PCF and DTIM
-+ * handling, programs the sleep registers so the hardware
-+ * will wakeup in time to receive beacons, and configures
-+ * the beacon miss handling so we'll receive a BMISS
-+ * interrupt when we stop seeing beacons from the AP
-+ * we've associated with.
-+ */
++
+static void
-+ath5k_beacon_config(struct ath5k_softc *sc)
++ath5k_beacon_update_timers(struct ath5k_softc *sc)
+{
-+#define TSF_TO_TU(_h, _l) (((_h) << 22) | ((_l) >> 10))
+ struct ath5k_hw *ah = sc->ah;
+ u32 uninitialized_var(nexttbtt), intval, tsftu;
+ u64 tsf;
@@ -15873,60 +15976,67 @@
+
+ /* current TSF converted to TU */
+ tsf = ath5k_hw_get_tsf64(ah);
-+ tsftu = TSF_TO_TU((u32)(tsf >> 32), (u32)tsf);
++ tsftu = TSF_TO_TU(tsf);
+
-+ ATH5K_DBG(sc, ATH5K_DEBUG_BEACON, "intval %u hw tsftu %u\n",
-+ intval, tsftu);
++ /*
++ * Pull nexttbtt forward to reflect the current
++ * TSF. Add one intval otherwise the timespan
++ * can be too short for ibss merges.
++ */
++ nexttbtt = tsftu + 2 * intval;
+
-+ if (sc->opmode == IEEE80211_IF_TYPE_STA ||
-+ (sc->opmode == IEEE80211_IF_TYPE_IBSS &&
-+ !sc->bbuf->skb)) {
-+ ath5k_hw_set_intr(ah, 0);
-+ sc->imask |= AR5K_INT_BMISS;
-+ sc->bmisscount = 0;
-+ ath5k_hw_set_intr(ah, sc->imask);
-+ } else if (sc->opmode == IEEE80211_IF_TYPE_IBSS /* TODO || AP */) {
-+ ath5k_hw_set_intr(ah, 0);
-+ if (sc->opmode == IEEE80211_IF_TYPE_IBSS) {
-+ /*
-+ * Pull nexttbtt forward to reflect the current
-+ * TSF. Add one intval otherwise the timespan
-+ * can be too short for ibss merges.
-+ */
-+ nexttbtt = tsftu + 2 * intval;
++ ATH5K_DBG(sc, ATH5K_DEBUG_BEACON,
++ "hw tsftu %u nexttbtt %u intval %u\n", tsftu, nexttbtt, intval);
+
-+ ATH5K_DBG(sc, ATH5K_DEBUG_BEACON, "nexttbtt %u "
-+ "intval %u\n", nexttbtt, intval);
++ intval |= AR5K_BEACON_ENA;
+
-+ /*
-+ * In IBSS mode enable the beacon timers but only
-+ * enable SWBA interrupts if we need to manually
-+ * prepare beacon frames. Otherwise we use a
-+ * self-linked tx descriptor and let the hardware
-+ * deal with things.
-+ */
-+ if (!ath5k_hw_hasveol(ah))
-+ sc->imask |= AR5K_INT_SWBA;
-+ } /* TODO else AP */
++ ath5k_hw_init_beacon(ah, nexttbtt, intval);
++}
+
-+ intval |= AR5K_BEACON_ENA;
+
-+ ath5k_beaconq_config(sc);
-+ ath5k_hw_init_beacon(ah, nexttbtt, intval);
++/*
++ * Configure the beacon timers and interrupts based on the operating mode
++ *
++ * When operating in station mode we want to receive a BMISS interrupt when we
++ * stop seeing beacons from the AP we've associated with so we can look for
++ * another AP to associate with.
++ *
++ * In IBSS mode we need to configure the beacon timers and use a self-linked tx
++ * descriptor if possible. If the hardware cannot deal with that we enable SWBA
++ * interrupts to send the beacons from the interrupt handler.
++ */
++static void
++ath5k_beacon_config(struct ath5k_softc *sc)
++{
++ struct ath5k_hw *ah = sc->ah;
+
-+ sc->bmisscount = 0;
-+ ath5k_hw_set_intr(ah, sc->imask);
++ ath5k_hw_set_intr(ah, 0);
++ sc->bmisscount = 0;
++
++ if (sc->opmode == IEEE80211_IF_TYPE_STA) {
++ sc->imask |= AR5K_INT_BMISS;
++ } else if (sc->opmode == IEEE80211_IF_TYPE_IBSS) {
+ /*
-+ * When using a self-linked beacon descriptor in
-+ * ibss mode load it once here.
++ * In IBSS mode enable the beacon timers but only enable SWBA
++ * interrupts if we need to manually prepare beacon frames.
++ * Otherwise we use a self-linked tx descriptor and let the
++ * hardware deal with things. In that case we have to load it
++ * only once here.
+ */
-+ if (sc->opmode == IEEE80211_IF_TYPE_IBSS &&
-+ ath5k_hw_hasveol(ah))
++ ath5k_beaconq_config(sc);
++ ath5k_beacon_update_timers(sc);
++
++ if (!ath5k_hw_hasveol(ah))
++ sc->imask |= AR5K_INT_SWBA;
++ else
+ ath5k_beacon_send(sc);
+ }
-+#undef TSF_TO_TU
++ /* TODO else AP */
++
++ ath5k_hw_set_intr(ah, sc->imask);
+}
+
++
+/********************\
+* Interrupt handling *
+\********************/
@@ -16447,10 +16557,10 @@
+ }
+ if (conf->bssid) {
+ /* Cache for later use during resets */
-+ memcpy(ah->bssid, conf->bssid, ETH_ALEN);
++ memcpy(ah->ah_bssid, conf->bssid, ETH_ALEN);
+ /* XXX: assoc id is set to 0 for now, mac80211 doesn't have
+ * a clean way of letting us retrieve this yet. */
-+ ath5k_hw_set_associd(ah, ah->bssid, 0);
++ ath5k_hw_set_associd(ah, ah->ah_bssid, 0);
+ }
+ mutex_unlock(&sc->lock);
+
@@ -16688,6 +16798,8 @@
+ ret = ath5k_beacon_setup(sc, sc->bbuf, ctl);
+ if (ret)
+ sc->bbuf->skb = NULL;
++ else
++ ath5k_beacon_config(sc);
+
+end:
+ mutex_unlock(&sc->lock);
@@ -16695,8 +16807,8 @@
+}
+
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/ath5k/debug.c
---- /dev/null 2008-01-09 08:24:16.586202496 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/debug.c 2008-01-09 14:28:44.000000000 -0500
+--- /dev/null 2008-01-10 08:19:44.585871638 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/debug.c 2008-01-10 17:33:50.000000000 -0500
@@ -0,0 +1,469 @@
+/*
+ * Copyright (c) 2007 Bruno Randolf <bruno at thinktube.com>
@@ -16966,7 +17078,7 @@
+
+ tsf = ath5k_hw_get_tsf64(sc->ah);
+ len += snprintf(buf+len, sizeof(buf)-len,
-+ "TSF\t\t0x%016llx\tTU: %08x\n", tsf, (u32)(tsf >> 10));
++ "TSF\t\t0x%016llx\tTU: %08x\n", tsf, TSF_TO_TU(tsf));
+
+ return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+}
@@ -17168,8 +17280,8 @@
+
+#endif /* if ATH5K_DEBUG */
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/ath5k/base.h
---- /dev/null 2008-01-09 08:24:16.586202496 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/base.h 2008-01-09 14:28:44.000000000 -0500
+--- /dev/null 2008-01-10 08:19:44.585871638 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/base.h 2008-01-10 17:33:50.000000000 -0500
@@ -0,0 +1,178 @@
+/*-
+ * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting
@@ -17229,7 +17341,7 @@
+struct ath5k_buf {
+ struct list_head list;
+ unsigned int flags; /* tx descriptor flags */
-+ struct ath5k_desc *desc; /* virtual addr of desc */
++ struct ath5k_desc *desc; /* virtual addr of desc */
+ dma_addr_t daddr; /* physical addr of desc */
+ struct sk_buff *skb; /* skbuff for buf */
+ dma_addr_t skbaddr;/* physical addr of skb data */
@@ -17246,11 +17358,11 @@
+ * hardware queue).
+ */
+struct ath5k_txq {
-+ unsigned int qnum; /* hardware q number */
-+ u32 *link; /* link ptr in last TX desc */
-+ struct list_head q; /* transmit queue */
-+ spinlock_t lock; /* lock on q and link */
-+ bool setup;
++ unsigned int qnum; /* hardware q number */
++ u32 *link; /* link ptr in last TX desc */
++ struct list_head q; /* transmit queue */
++ spinlock_t lock; /* lock on q and link */
++ bool setup;
+};
+
+#if CHAN_DEBUG
@@ -17350,8 +17462,8 @@
+
+#endif
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/ath5k/regdom.c
---- /dev/null 2008-01-09 08:24:16.586202496 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/regdom.c 2008-01-09 14:28:44.000000000 -0500
+--- /dev/null 2008-01-10 08:19:44.585871638 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/regdom.c 2008-01-10 17:33:50.000000000 -0500
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2004, 2005 Reyk Floeter <reyk at vantronix.net>
linux-2.6-wireless-pending.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.22 -r 1.23 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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- linux-2.6-wireless-pending.patch 9 Jan 2008 21:49:04 -0000 1.22
+++ linux-2.6-wireless-pending.patch 10 Jan 2008 23:22:50 -0000 1.23
@@ -1,3 +1,77 @@
+commit f74028c41cc14c2301a2b74fa17ad9ceb262daaf
+Author: John W. Linville <linville at tuxdriver.com>
+Date: Thu Jan 10 13:37:45 2008 -0500
+
+ iwlwifi: fix-up damage from rebase of namespace separation patches
+
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 607dd1fd3a2347b3b7144c1cf4300ba6f8da6fe6
+Author: John W. Linville <linville at tuxdriver.com>
+Date: Thu Jan 10 13:28:49 2008 -0500
+
+ b43: finish removal of pio support
+
+ As suggested in "b43: Remove PIO support"...
+
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit d507e02672266ddd62ce48ab933b35468fa8b3eb
+Author: Pavel Roskin <proski at gnu.org>
+Date: Wed Jan 9 22:16:58 2008 -0500
+
+ hostap_cs: don't match revisions in presense of the MAC chip name
+
+ If the third PCMCIA ID string specifies the MAC chip, the fourth ID
+ string doesn't need to be matched. Even if it's different, it will be
+ compatible with the driver.
+
+ This ensures that other different revisions of the card will be
+ supported.
+
+ Signed-off-by: Pavel Roskin <proski at gnu.org>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 30c796bad54b869d48897cb13e1b7b8f9dccef1c
+Author: Michael Buesch <mb at bu3sch.de>
+Date: Wed Jan 9 19:08:49 2008 +0100
+
+ b43: Remove the PHY spinlock
+
+ This fixes a sparse warning about weird locking.
+ The spinlock is not needed, so simply remove it.
+ This also adds some sanity checks to the PHY and radio locking
+ to protect against recursive locking.
+
+ Signed-off-by: Michael Buesch <mb at bu3sch.de>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 5548d74c57387e1f041bf01093807d7a9af94a05
+Author: Michael Buesch <mb at bu3sch.de>
+Date: Wed Jan 9 18:39:09 2008 +0100
+
+ b43: Fix PHY register routing
+
+ This fixes the PHY routing bit handling.
+ This is needed for N-PHY.
+ No functional change to A-PHY and G-PHY code.
+
+ Signed-off-by: Michael Buesch <mb at bu3sch.de>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 0ec160e294c65d11340750aca9fa6ecfda92be99
+Author: Michael Buesch <mb at bu3sch.de>
+Date: Wed Jan 9 16:13:56 2008 +0100
+
+ b43: Add N-PHY register definitions
+
+ This patch adds all register definitions for the N-PHY.
+ This adds two new files: nphy.h and nphy.c
+ No functional changes to existing code.
+
+ Signed-off-by: Michael Buesch <mb at bu3sch.de>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
commit deb27641a93290475f6c66b99d2fceabbc28d6fb
Author: Michael Buesch <mb at bu3sch.de>
Date: Sat Dec 29 17:24:23 2007 +0100
@@ -5812,8 +5886,8 @@
Signed-off-by: John W. Linville <linville at tuxdriver.com>
diff -up linux-2.6.23.noarch/include/linux/nl80211.h.orig linux-2.6.23.noarch/include/linux/nl80211.h
---- linux-2.6.23.noarch/include/linux/nl80211.h.orig 2008-01-09 14:18:17.000000000 -0500
-+++ linux-2.6.23.noarch/include/linux/nl80211.h 2008-01-09 14:18:28.000000000 -0500
+--- linux-2.6.23.noarch/include/linux/nl80211.h.orig 2008-01-10 18:11:08.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/nl80211.h 2008-01-10 18:11:15.000000000 -0500
@@ -7,6 +7,18 @@
*/
@@ -6015,8 +6089,8 @@
+
#endif /* __LINUX_NL80211_H */
diff -up linux-2.6.23.noarch/include/linux/wireless.h.orig linux-2.6.23.noarch/include/linux/wireless.h
---- linux-2.6.23.noarch/include/linux/wireless.h.orig 2008-01-09 14:18:17.000000000 -0500
-+++ linux-2.6.23.noarch/include/linux/wireless.h 2008-01-09 14:18:28.000000000 -0500
+--- linux-2.6.23.noarch/include/linux/wireless.h.orig 2008-01-10 18:11:08.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/wireless.h 2008-01-10 18:11:15.000000000 -0500
@@ -541,6 +541,16 @@
/* Maximum size of returned data */
#define IW_SCAN_MAX_DATA 4096 /* In bytes */
@@ -6045,8 +6119,8 @@
__u32 event_capa[6];
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 2008-01-09 14:18:17.000000000 -0500
-+++ linux-2.6.23.noarch/include/linux/ieee80211.h 2008-01-09 14:18:28.000000000 -0500
+--- linux-2.6.23.noarch/include/linux/ieee80211.h.orig 2008-01-10 18:11:08.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/ieee80211.h 2008-01-10 18:11:15.000000000 -0500
@@ -54,6 +54,8 @@
#define IEEE80211_STYPE_ACTION 0x00D0
@@ -6271,8 +6345,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 2008-01-09 14:18:17.000000000 -0500
-+++ linux-2.6.23.noarch/include/linux/ssb/ssb_regs.h 2008-01-09 14:18:28.000000000 -0500
+--- linux-2.6.23.noarch/include/linux/ssb/ssb_regs.h.orig 2008-01-10 18:11:08.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/ssb/ssb_regs.h 2008-01-10 18:11:15.000000000 -0500
@@ -147,6 +147,10 @@
#define SSB_IDLOW_SSBREV 0xF0000000 /* Sonics Backplane Revision code */
#define SSB_IDLOW_SSBREV_22 0x00000000 /* <= 2.2 */
@@ -6404,8 +6478,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 2008-01-09 14:18:17.000000000 -0500
-+++ linux-2.6.23.noarch/include/linux/ssb/ssb.h 2008-01-09 14:18:28.000000000 -0500
+--- linux-2.6.23.noarch/include/linux/ssb/ssb.h.orig 2008-01-10 18:11:08.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/ssb/ssb.h 2008-01-10 18:11:15.000000000 -0500
@@ -15,22 +15,19 @@ struct pcmcia_device;
struct ssb_bus;
struct ssb_driver;
@@ -6548,8 +6622,8 @@
diff -up linux-2.6.23.noarch/include/net/cfg80211.h.orig linux-2.6.23.noarch/include/net/cfg80211.h
---- linux-2.6.23.noarch/include/net/cfg80211.h.orig 2008-01-09 14:18:17.000000000 -0500
-+++ linux-2.6.23.noarch/include/net/cfg80211.h 2008-01-09 14:18:28.000000000 -0500
+--- linux-2.6.23.noarch/include/net/cfg80211.h.orig 2008-01-10 18:11:08.000000000 -0500
++++ linux-2.6.23.noarch/include/net/cfg80211.h 2008-01-10 18:11:15.000000000 -0500
@@ -49,6 +49,120 @@ extern int ieee80211_radiotap_iterator_n
struct ieee80211_radiotap_iterator *iterator);
@@ -6739,8 +6813,8 @@
#endif /* __NET_CFG80211_H */
diff -up linux-2.6.23.noarch/include/net/ieee80211.h.orig linux-2.6.23.noarch/include/net/ieee80211.h
---- linux-2.6.23.noarch/include/net/ieee80211.h.orig 2008-01-09 14:18:17.000000000 -0500
-+++ linux-2.6.23.noarch/include/net/ieee80211.h 2008-01-09 14:18:28.000000000 -0500
+--- linux-2.6.23.noarch/include/net/ieee80211.h.orig 2008-01-10 18:11:08.000000000 -0500
++++ linux-2.6.23.noarch/include/net/ieee80211.h 2008-01-10 18:11:15.000000000 -0500
@@ -682,7 +682,7 @@ struct ieee80211_probe_request {
struct ieee80211_probe_response {
@@ -6762,8 +6836,8 @@
};
diff -up linux-2.6.23.noarch/include/net/mac80211.h.orig linux-2.6.23.noarch/include/net/mac80211.h
---- linux-2.6.23.noarch/include/net/mac80211.h.orig 2008-01-09 14:18:17.000000000 -0500
-+++ linux-2.6.23.noarch/include/net/mac80211.h 2008-01-09 14:18:28.000000000 -0500
+--- linux-2.6.23.noarch/include/net/mac80211.h.orig 2008-01-10 18:11:08.000000000 -0500
++++ linux-2.6.23.noarch/include/net/mac80211.h 2008-01-10 18:11:15.000000000 -0500
@@ -139,17 +139,54 @@ enum ieee80211_phymode {
};
@@ -7043,9 +7117,9 @@
+
#endif /* MAC80211_H */
diff -up linux-2.6.23.noarch/MAINTAINERS.orig linux-2.6.23.noarch/MAINTAINERS
---- linux-2.6.23.noarch/MAINTAINERS.orig 2008-01-09 14:18:17.000000000 -0500
-+++ linux-2.6.23.noarch/MAINTAINERS 2008-01-09 14:18:28.000000000 -0500
-@@ -829,7 +829,7 @@ P: Stefano Brivio
+--- linux-2.6.23.noarch/MAINTAINERS.orig 2008-01-10 18:11:08.000000000 -0500
++++ linux-2.6.23.noarch/MAINTAINERS 2008-01-10 18:11:15.000000000 -0500
+@@ -820,7 +820,7 @@ P: Stefano Brivio
M: stefano.brivio at polimi.it
L: linux-wireless at vger.kernel.org
W: http://bcm43xx.berlios.de/
@@ -7054,7 +7128,7 @@
BEFS FILE SYSTEM
P: Sergey S. Kostyliov
-@@ -2072,10 +2072,12 @@ W: http://sourceforge.net/projects/e1000
+@@ -2063,10 +2063,12 @@ W: http://sourceforge.net/projects/e1000
S: Supported
INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
@@ -7068,7 +7142,7 @@
L: linux-wireless at vger.kernel.org
L: ipw2100-devel at lists.sourceforge.net
L: http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
[...5010 lines suppressed...]
diff -up linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_80211_rx.c.orig linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_80211_rx.c
---- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_80211_rx.c.orig 2008-01-09 14:18:18.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_80211_rx.c 2008-01-09 14:18:29.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_80211_rx.c.orig 2008-01-10 18:11:09.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_80211_rx.c 2008-01-10 18:11:15.000000000 -0500
@@ -1032,7 +1032,7 @@ void hostap_80211_rx(struct net_device *
memcpy(skb_push(skb, ETH_ALEN), src, ETH_ALEN);
memcpy(skb_push(skb, ETH_ALEN), dst, ETH_ALEN);
@@ -86930,8 +89412,8 @@
skb_pull(skb, hdrlen);
len = htons(skb->len);
diff -up linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ap.c.orig linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ap.c
---- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ap.c.orig 2008-01-09 14:18:18.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ap.c 2008-01-09 14:18:29.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ap.c.orig 2008-01-10 18:11:09.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ap.c 2008-01-10 18:11:15.000000000 -0500
@@ -254,7 +254,7 @@ static void ap_handle_timer(unsigned lon
sta->addr, ap->tx_callback_poll);
} else {
@@ -87191,8 +89673,8 @@
if (local->ap->ap_policy != AP_OTHER_AP_EVEN_IBSS &&
diff -up linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_wlan.h.orig linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_wlan.h
---- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_wlan.h.orig 2008-01-09 14:18:18.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_wlan.h 2008-01-09 14:18:29.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_wlan.h.orig 2008-01-10 18:11:09.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_wlan.h 2008-01-10 18:11:15.000000000 -0500
@@ -39,20 +39,20 @@ struct linux_wlan_ng_prism_hdr {
} __attribute__ ((packed));
@@ -87493,8 +89975,8 @@
struct comm_tallies_sums {
diff -up linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_pci.c.orig linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_pci.c
---- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_pci.c.orig 2008-01-09 14:18:18.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_pci.c 2008-01-09 14:18:29.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_pci.c.orig 2008-01-10 18:11:09.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_pci.c 2008-01-10 18:11:15.000000000 -0500
@@ -128,8 +128,8 @@ static inline u16 hfa384x_inw_debug(stru
#define HFA384X_INB(a) hfa384x_inb_debug(dev, (a))
#define HFA384X_OUTW(v,a) hfa384x_outw_debug(dev, (a), (v))
@@ -87544,8 +90026,8 @@
for ( ; len > 1; len -= 2)
HFA384X_OUTW_DATA(*pos++, d_off);
diff -up linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_download.c.orig linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_download.c
---- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_download.c.orig 2008-01-09 14:18:18.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_download.c 2008-01-09 14:18:29.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_download.c.orig 2008-01-10 18:11:09.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_download.c 2008-01-10 18:11:15.000000000 -0500
@@ -100,7 +100,7 @@ static int hfa384x_from_aux(struct net_d
#ifdef PRISM2_PCI
@@ -87605,9 +90087,45 @@
local->hw_downloading = 1;
+diff -up linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_cs.c
+--- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig 2008-01-10 18:09:39.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_cs.c 2008-01-10 18:12:03.000000000 -0500
+@@ -845,15 +845,13 @@ static struct pcmcia_device_id hostap_cs
+ 0x4b801a17),
+ PCMCIA_MFC_DEVICE_PROD_ID12(0, "SanDisk", "ConnectPlus",
+ 0x7a954bd9, 0x74be00c6),
+- PCMCIA_DEVICE_PROD_ID1234(
++ PCMCIA_DEVICE_PROD_ID123(
+ "Intersil", "PRISM 2_5 PCMCIA ADAPTER", "ISL37300P",
+- "Eval-RevA",
+- 0x4b801a17, 0x6345a0bf, 0xc9049a39, 0xc23adc0e),
++ 0x4b801a17, 0x6345a0bf, 0xc9049a39),
+ /* D-Link DWL-650 Rev. P1; manfid 0x000b, 0x7110 */
+- PCMCIA_DEVICE_PROD_ID1234(
++ PCMCIA_DEVICE_PROD_ID123(
+ "D-Link", "DWL-650 Wireless PC Card RevP", "ISL37101P-10",
+- "A3",
+- 0x1a424a1c, 0x6ea57632, 0xdd97a26b, 0x56b21f52),
++ 0x1a424a1c, 0x6ea57632, 0xdd97a26b),
+ PCMCIA_DEVICE_PROD_ID123(
+ "Addtron", "AWP-100 Wireless PCMCIA", "Version 01.02",
+ 0xe6ec52ce, 0x08649af2, 0x4b74baa0),
+@@ -890,10 +888,9 @@ static struct pcmcia_device_id hostap_cs
+ PCMCIA_DEVICE_PROD_ID123(
+ "corega", "WL PCCL-11", "ISL37300P",
+ 0xa21501a, 0x59868926, 0xc9049a39),
+- PCMCIA_DEVICE_PROD_ID1234(
++ PCMCIA_DEVICE_PROD_ID123(
+ "The Linksys Group, Inc.", "Wireless Network CF Card", "ISL37300P",
+- "RevA",
+- 0xa5f472c2, 0x9c05598d, 0xc9049a39, 0x57a66194),
++ 0xa5f472c2, 0x9c05598d, 0xc9049a39),
+ PCMCIA_DEVICE_NULL
+ };
+ MODULE_DEVICE_TABLE(pcmcia, hostap_cs_ids);
diff -up linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_hw.c.orig linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_hw.c
---- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_hw.c.orig 2008-01-09 14:18:18.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_hw.c 2008-01-09 14:18:29.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_hw.c.orig 2008-01-10 18:11:09.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_hw.c 2008-01-10 18:11:15.000000000 -0500
@@ -1075,7 +1075,7 @@ static int prism2_setup_rids(struct net_
{
struct hostap_interface *iface;
@@ -87694,8 +90212,8 @@
goto out;
}
diff -up linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_main.c.orig linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_main.c
---- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_main.c.orig 2008-01-09 14:18:18.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_main.c 2008-01-09 14:18:29.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_main.c.orig 2008-01-10 18:11:09.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_main.c 2008-01-10 18:11:15.000000000 -0500
@@ -295,7 +295,7 @@ int hostap_tx_callback_unregister(local_
int hostap_set_word(struct net_device *dev, int rid, u16 val)
{
@@ -87724,8 +90242,8 @@
wireless_send_event(local->dev, SIOCGIWAP, &wrqu, NULL);
return ret;
diff -up linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_info.c.orig linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_info.c
---- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_info.c.orig 2008-01-09 14:18:18.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_info.c 2008-01-09 14:18:29.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_info.c.orig 2008-01-10 18:11:09.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_info.c 2008-01-10 18:11:15.000000000 -0500
@@ -300,7 +300,7 @@ static void prism2_info_hostscanresults(
int i, result_size, copy_len, new_count;
struct hfa384x_hostscan_result *results, *prev;
@@ -87764,8 +90282,8 @@
for (i = 0; i < (left < 100 ? left : 100); i++)
PDEBUG2(DEBUG_EXTRA, " %02x", buf[i]);
diff -up linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_80211.h.orig linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_80211.h
---- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_80211.h.orig 2008-01-09 14:18:18.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_80211.h 2008-01-09 14:18:29.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_80211.h.orig 2008-01-10 18:11:09.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_80211.h 2008-01-10 18:11:15.000000000 -0500
@@ -5,52 +5,52 @@
#include <net/ieee80211_crypt.h>
@@ -87837,8 +90355,8 @@
* FH Params, DS Params, CF Params, IBSS Params, TIM */
u8 variable[0];
diff -up linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ioctl.c
---- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig 2008-01-09 14:18:18.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ioctl.c 2008-01-09 14:18:29.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig 2008-01-10 18:11:09.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ioctl.c 2008-01-10 18:11:15.000000000 -0500
@@ -84,7 +84,7 @@ static int prism2_get_datarates(struct n
if (len < 2)
return 0;
@@ -88103,8 +90621,8 @@
reason = cpu_to_le16(param->u.mlme.reason_code);
switch (param->u.mlme.cmd) {
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 2008-01-09 14:18:18.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c 2008-01-09 14:18:29.000000000 -0500
+--- linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c.orig 2008-01-10 18:11:09.000000000 -0500
++++ linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c 2008-01-10 18:11:15.000000000 -0500
@@ -27,6 +27,8 @@ static const struct pci_device_id b43_pc
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4321) },
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4324) },
@@ -88115,8 +90633,8 @@
};
MODULE_DEVICE_TABLE(pci, b43_pci_bridge_tbl);
diff -up linux-2.6.23.noarch/drivers/ssb/pcmcia.c.orig linux-2.6.23.noarch/drivers/ssb/pcmcia.c
---- linux-2.6.23.noarch/drivers/ssb/pcmcia.c.orig 2008-01-09 14:18:18.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/pcmcia.c 2008-01-09 14:18:29.000000000 -0500
+--- linux-2.6.23.noarch/drivers/ssb/pcmcia.c.orig 2008-01-10 18:11:09.000000000 -0500
++++ linux-2.6.23.noarch/drivers/ssb/pcmcia.c 2008-01-10 18:11:15.000000000 -0500
@@ -93,7 +93,6 @@ int ssb_pcmcia_switch_core(struct ssb_bu
struct ssb_device *dev)
{
@@ -88267,8 +90785,8 @@
}
diff -up linux-2.6.23.noarch/drivers/ssb/main.c.orig linux-2.6.23.noarch/drivers/ssb/main.c
---- linux-2.6.23.noarch/drivers/ssb/main.c.orig 2008-01-09 14:18:18.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/main.c 2008-01-09 14:18:29.000000000 -0500
+--- linux-2.6.23.noarch/drivers/ssb/main.c.orig 2008-01-10 18:11:09.000000000 -0500
++++ linux-2.6.23.noarch/drivers/ssb/main.c 2008-01-10 18:11:15.000000000 -0500
@@ -877,14 +877,22 @@ EXPORT_SYMBOL(ssb_clockspeed);
static u32 ssb_tmslow_reject_bitmask(struct ssb_device *dev)
@@ -88294,8 +90812,8 @@
}
return (SSB_TMSLOW_REJECT_22 | SSB_TMSLOW_REJECT_23);
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 2008-01-09 14:18:18.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/pci.c 2008-01-09 14:18:29.000000000 -0500
+--- linux-2.6.23.noarch/drivers/ssb/pci.c.orig 2008-01-10 18:11:09.000000000 -0500
++++ linux-2.6.23.noarch/drivers/ssb/pci.c 2008-01-10 18:11:15.000000000 -0500
@@ -212,29 +212,29 @@ static inline u8 ssb_crc8(u8 crc, u8 dat
return t[crc ^ data];
}
@@ -88738,8 +91256,8 @@
err = -EINVAL;
goto out_kfree;
diff -up linux-2.6.23.noarch/Documentation/feature-removal-schedule.txt.orig linux-2.6.23.noarch/Documentation/feature-removal-schedule.txt
---- linux-2.6.23.noarch/Documentation/feature-removal-schedule.txt.orig 2008-01-09 14:18:18.000000000 -0500
-+++ linux-2.6.23.noarch/Documentation/feature-removal-schedule.txt 2008-01-09 14:18:29.000000000 -0500
+--- linux-2.6.23.noarch/Documentation/feature-removal-schedule.txt.orig 2008-01-10 18:11:09.000000000 -0500
++++ linux-2.6.23.noarch/Documentation/feature-removal-schedule.txt 2008-01-10 18:11:15.000000000 -0500
@@ -316,3 +316,28 @@ Why: powermac supports proper generic pm
Who: Johannes Berg <johannes at sipsolutions.net>
linux-2.6-wireless.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.19 -r 1.20 linux-2.6-wireless.patch
Index: linux-2.6-wireless.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-wireless.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- linux-2.6-wireless.patch 9 Jan 2008 22:17:13 -0000 1.19
+++ linux-2.6-wireless.patch 10 Jan 2008 23:22:50 -0000 1.20
@@ -2,6 +2,18 @@
better in the future...FWIW, it is safe to presume that any wireless
patch between 2.6.23 and 2.6.24-rc5 is included as well... -- JWL
+commit dd87145d2c3a7b1c8b338e1f6e174b3d2a17cd35
+Author: Ivo van Doorn <ivdoorn at gmail.com>
+Date: Wed Jan 9 19:18:25 2008 +0100
+
+ rt2x00: Corectly initialize rt2500usb MAC
+
+ mac is a pointer, obviously we shouldn't use the address
+ of a pointer as MAC address.
+
+ Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
commit 85ae82313303ded51b3d49ae8b586224476abd33
Author: Michael Buesch <mb at bu3sch.de>
Date: Wed Jan 2 18:55:53 2008 +0100
@@ -295,8 +307,8 @@
Signed-off-by: John W. Linville <linville at tuxdriver.com>
diff -up linux-2.6.23.noarch/CREDITS.orig linux-2.6.23.noarch/CREDITS
---- linux-2.6.23.noarch/CREDITS.orig 2008-01-09 12:18:41.000000000 -0500
-+++ linux-2.6.23.noarch/CREDITS 2008-01-09 12:22:11.000000000 -0500
+--- linux-2.6.23.noarch/CREDITS.orig 2008-01-10 17:09:34.000000000 -0500
++++ linux-2.6.23.noarch/CREDITS 2008-01-10 17:12:14.000000000 -0500
@@ -665,6 +665,11 @@ D: Minor updates to SCSI types, added /p
S: (ask for current address)
S: USA
@@ -365,7 +377,7 @@
D: Linux System Administrator's Guide, author, former maintainer
diff -up linux-2.6.23.noarch/include/linux/nl80211.h.orig linux-2.6.23.noarch/include/linux/nl80211.h
--- linux-2.6.23.noarch/include/linux/nl80211.h.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/include/linux/nl80211.h 2008-01-09 12:22:11.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/nl80211.h 2008-01-10 17:12:14.000000000 -0500
@@ -7,7 +7,97 @@
*/
@@ -489,7 +501,7 @@
#endif /* __LINUX_NL80211_H */
diff -up linux-2.6.23.noarch/include/linux/mod_devicetable.h.orig linux-2.6.23.noarch/include/linux/mod_devicetable.h
--- linux-2.6.23.noarch/include/linux/mod_devicetable.h.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/include/linux/mod_devicetable.h 2008-01-09 12:22:11.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/mod_devicetable.h 2008-01-10 17:12:14.000000000 -0500
@@ -340,4 +340,19 @@ struct parisc_device_id {
#define PA_HVERSION_ANY_ID 0xffff
#define PA_SVERSION_ANY_ID 0xffffffff
@@ -512,7 +524,7 @@
#endif /* LINUX_MOD_DEVICETABLE_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-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/include/linux/ieee80211.h 2008-01-09 12:22:11.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/ieee80211.h 2008-01-10 17:12:14.000000000 -0500
@@ -16,6 +16,7 @@
#define IEEE80211_H
@@ -588,7 +600,7 @@
#endif /* IEEE80211_H */
diff -up linux-2.6.23.noarch/include/linux/rfkill.h.orig linux-2.6.23.noarch/include/linux/rfkill.h
--- linux-2.6.23.noarch/include/linux/rfkill.h.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/include/linux/rfkill.h 2008-01-09 12:22:11.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/rfkill.h 2008-01-10 17:12:14.000000000 -0500
@@ -2,7 +2,7 @@
#define __RFKILL_H
@@ -671,8 +683,8 @@
#endif /* RFKILL_H */
diff -up /dev/null linux-2.6.23.noarch/include/linux/ssb/ssb_driver_chipcommon.h
---- /dev/null 2008-01-09 08:24:16.586202496 -0500
-+++ linux-2.6.23.noarch/include/linux/ssb/ssb_driver_chipcommon.h 2008-01-09 12:22:11.000000000 -0500
+--- /dev/null 2008-01-10 08:19:44.585871638 -0500
++++ linux-2.6.23.noarch/include/linux/ssb/ssb_driver_chipcommon.h 2008-01-10 17:12:14.000000000 -0500
@@ -0,0 +1,396 @@
+#ifndef LINUX_SSB_CHIPCO_H_
+#define LINUX_SSB_CHIPCO_H_
@@ -1071,8 +1083,8 @@
+
+#endif /* LINUX_SSB_CHIPCO_H_ */
diff -up /dev/null linux-2.6.23.noarch/include/linux/ssb/ssb_driver_extif.h
---- /dev/null 2008-01-09 08:24:16.586202496 -0500
-+++ linux-2.6.23.noarch/include/linux/ssb/ssb_driver_extif.h 2008-01-09 12:22:11.000000000 -0500
+--- /dev/null 2008-01-10 08:19:44.585871638 -0500
++++ linux-2.6.23.noarch/include/linux/ssb/ssb_driver_extif.h 2008-01-10 17:12:14.000000000 -0500
@@ -0,0 +1,204 @@
+/*
+ * Hardware-specific External Interface I/O core definitions
@@ -1279,8 +1291,8 @@
+#endif /* CONFIG_SSB_DRIVER_EXTIF */
+#endif /* LINUX_SSB_EXTIFCORE_H_ */
diff -up /dev/null linux-2.6.23.noarch/include/linux/ssb/ssb_driver_mips.h
---- /dev/null 2008-01-09 08:24:16.586202496 -0500
-+++ linux-2.6.23.noarch/include/linux/ssb/ssb_driver_mips.h 2008-01-09 12:22:11.000000000 -0500
+--- /dev/null 2008-01-10 08:19:44.585871638 -0500
++++ linux-2.6.23.noarch/include/linux/ssb/ssb_driver_mips.h 2008-01-10 17:12:14.000000000 -0500
@@ -0,0 +1,46 @@
+#ifndef LINUX_SSB_MIPSCORE_H_
+#define LINUX_SSB_MIPSCORE_H_
@@ -1329,8 +1341,8 @@
+
+#endif /* LINUX_SSB_MIPSCORE_H_ */
diff -up /dev/null linux-2.6.23.noarch/include/linux/ssb/ssb_regs.h
---- /dev/null 2008-01-09 08:24:16.586202496 -0500
-+++ linux-2.6.23.noarch/include/linux/ssb/ssb_regs.h 2008-01-09 12:22:11.000000000 -0500
+--- /dev/null 2008-01-10 08:19:44.585871638 -0500
++++ linux-2.6.23.noarch/include/linux/ssb/ssb_regs.h 2008-01-10 17:12:14.000000000 -0500
@@ -0,0 +1,292 @@
+#ifndef LINUX_SSB_REGS_H_
+#define LINUX_SSB_REGS_H_
@@ -1625,8 +1637,8 @@
+
+#endif /* LINUX_SSB_REGS_H_ */
diff -up /dev/null linux-2.6.23.noarch/include/linux/ssb/ssb_driver_pci.h
---- /dev/null 2008-01-09 08:24:16.586202496 -0500
-+++ linux-2.6.23.noarch/include/linux/ssb/ssb_driver_pci.h 2008-01-09 12:22:11.000000000 -0500
+--- /dev/null 2008-01-10 08:19:44.585871638 -0500
++++ linux-2.6.23.noarch/include/linux/ssb/ssb_driver_pci.h 2008-01-10 17:12:14.000000000 -0500
@@ -0,0 +1,106 @@
+#ifndef LINUX_SSB_PCICORE_H_
+#define LINUX_SSB_PCICORE_H_
@@ -1735,8 +1747,8 @@
+#endif /* CONFIG_SSB_DRIVER_PCICORE */
+#endif /* LINUX_SSB_PCICORE_H_ */
diff -up /dev/null linux-2.6.23.noarch/include/linux/ssb/ssb.h
---- /dev/null 2008-01-09 08:24:16.586202496 -0500
-+++ linux-2.6.23.noarch/include/linux/ssb/ssb.h 2008-01-09 12:22:11.000000000 -0500
+--- /dev/null 2008-01-10 08:19:44.585871638 -0500
++++ linux-2.6.23.noarch/include/linux/ssb/ssb.h 2008-01-10 17:12:14.000000000 -0500
@@ -0,0 +1,424 @@
+#ifndef LINUX_SSB_H_
+#define LINUX_SSB_H_
@@ -2164,7 +2176,7 @@
+#endif /* LINUX_SSB_H_ */
diff -up linux-2.6.23.noarch/include/net/cfg80211.h.orig linux-2.6.23.noarch/include/net/cfg80211.h
--- linux-2.6.23.noarch/include/net/cfg80211.h.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/include/net/cfg80211.h 2008-01-09 12:22:11.000000000 -0500
++++ linux-2.6.23.noarch/include/net/cfg80211.h 2008-01-10 17:12:14.000000000 -0500
@@ -3,15 +3,15 @@
#include <linux/netlink.h>
@@ -2203,7 +2215,7 @@
#endif /* __NET_CFG80211_H */
diff -up linux-2.6.23.noarch/include/net/ieee80211.h.orig linux-2.6.23.noarch/include/net/ieee80211.h
--- linux-2.6.23.noarch/include/net/ieee80211.h.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/include/net/ieee80211.h 2008-01-09 12:22:11.000000000 -0500
++++ linux-2.6.23.noarch/include/net/ieee80211.h 2008-01-10 17:12:14.000000000 -0500
@@ -115,8 +115,16 @@ extern u32 ieee80211_debug_level;
do { if (ieee80211_debug_level & (level)) \
printk(KERN_DEBUG "ieee80211: %c %s " fmt, \
@@ -2223,7 +2235,7 @@
/* debug macros not dependent on CONFIG_IEEE80211_DEBUG */
diff -up linux-2.6.23.noarch/include/net/mac80211.h.orig linux-2.6.23.noarch/include/net/mac80211.h
--- linux-2.6.23.noarch/include/net/mac80211.h.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/include/net/mac80211.h 2008-01-09 12:22:11.000000000 -0500
++++ linux-2.6.23.noarch/include/net/mac80211.h 2008-01-10 17:12:14.000000000 -0500
@@ -1,7 +1,9 @@
/*
- * Low-level hardware driver -- IEEE 802.11 driver (80211.o) interface
@@ -3915,7 +3927,7 @@
((u8*)(x))[3], ((u8*)(x))[4], ((u8*)(x))[5]
diff -up linux-2.6.23.noarch/include/net/ieee80211softmac.h.orig linux-2.6.23.noarch/include/net/ieee80211softmac.h
--- linux-2.6.23.noarch/include/net/ieee80211softmac.h.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/include/net/ieee80211softmac.h 2008-01-09 12:22:11.000000000 -0500
++++ linux-2.6.23.noarch/include/net/ieee80211softmac.h 2008-01-10 17:12:14.000000000 -0500
@@ -229,6 +229,8 @@ struct ieee80211softmac_device {
/* this lock protects this structure */
spinlock_t lock;
@@ -3927,7 +3939,7 @@
diff -up linux-2.6.23.noarch/include/net/iw_handler.h.orig linux-2.6.23.noarch/include/net/iw_handler.h
--- linux-2.6.23.noarch/include/net/iw_handler.h.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/include/net/iw_handler.h 2008-01-09 12:22:11.000000000 -0500
++++ linux-2.6.23.noarch/include/net/iw_handler.h 2008-01-10 17:12:14.000000000 -0500
@@ -431,7 +431,13 @@ struct iw_public_data {
* Those may be called only within the kernel.
*/
@@ -3945,7 +3957,7 @@
extern void wireless_send_event(struct net_device * dev,
diff -up linux-2.6.23.noarch/include/net/ieee80211_radiotap.h.orig linux-2.6.23.noarch/include/net/ieee80211_radiotap.h
--- linux-2.6.23.noarch/include/net/ieee80211_radiotap.h.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/include/net/ieee80211_radiotap.h 2008-01-09 12:22:11.000000000 -0500
++++ linux-2.6.23.noarch/include/net/ieee80211_radiotap.h 2008-01-10 17:12:14.000000000 -0500
@@ -40,6 +40,7 @@
#include <linux/if_ether.h>
@@ -3969,8 +3981,8 @@
+
#endif /* IEEE80211_RADIOTAP_H */
diff -up linux-2.6.23.noarch/MAINTAINERS.orig linux-2.6.23.noarch/MAINTAINERS
---- linux-2.6.23.noarch/MAINTAINERS.orig 2008-01-09 12:18:41.000000000 -0500
-+++ linux-2.6.23.noarch/MAINTAINERS 2008-01-09 12:22:11.000000000 -0500
[...2388 lines suppressed...]
@@ -444,7 +444,7 @@ static int prism2_pci_resume(struct pci_
MODULE_DEVICE_TABLE(pci, prism2_pci_id_table);
@@ -131558,7 +131570,7 @@
diff -up linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_cs.c
--- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_cs.c 2008-01-09 12:22:11.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_cs.c 2008-01-10 17:12:16.000000000 -0500
@@ -272,7 +272,7 @@ static int sandisk_enable_wireless(struc
{
int res, ret = 0;
@@ -131589,7 +131601,7 @@
MODULE_DEVICE_TABLE(pcmcia, hostap_cs_ids);
diff -up linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_hw.c.orig linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_hw.c
--- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_hw.c.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_hw.c 2008-01-09 12:22:11.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_hw.c 2008-01-10 17:12:16.000000000 -0500
@@ -825,7 +825,7 @@ static int hfa384x_get_rid(struct net_de
local->hw_downloading)
return -ENODEV;
@@ -131670,7 +131682,7 @@
/* Send disconnect event, e.g., to trigger reassociation after resume
diff -up linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_main.c.orig linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_main.c
--- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_main.c.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_main.c 2008-01-09 12:22:11.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_main.c 2008-01-10 17:12:16.000000000 -0500
@@ -72,7 +72,7 @@ struct net_device * hostap_add_interface
dev->mem_start = mdev->mem_start;
dev->mem_end = mdev->mem_end;
@@ -131727,7 +131739,7 @@
diff -up linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ioctl.c
--- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ioctl.c 2008-01-09 12:22:11.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ioctl.c 2008-01-10 17:12:16.000000000 -0500
@@ -3088,7 +3088,7 @@ static int prism2_ioctl_priv_download(lo
static int prism2_set_genericelement(struct net_device *dev, u8 *elem,
size_t len)
@@ -131793,7 +131805,7 @@
u16 reason;
diff -up linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap.h.orig linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap.h
--- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap.h.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap.h 2008-01-09 12:22:11.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap.h 2008-01-10 17:12:16.000000000 -0500
@@ -35,7 +35,7 @@ int hostap_80211_prism_header_parse(stru
int hostap_80211_get_hdrlen(u16 fc);
struct net_device_stats *hostap_get_stats(struct net_device *dev);
@@ -131804,8 +131816,8 @@
int hostap_set_hostapd(local_info_t *local, int val, int rtnl_locked);
int hostap_set_hostapd_sta(local_info_t *local, int val, int rtnl_locked);
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c
---- /dev/null 2008-01-09 08:24:16.586202496 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c 2008-01-09 12:22:11.000000000 -0500
+--- /dev/null 2008-01-10 08:19:44.585871638 -0500
++++ linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c 2008-01-10 17:12:16.000000000 -0500
@@ -0,0 +1,48 @@
+/*
+ * Broadcom 43xx PCI-SSB bridge module
@@ -131856,8 +131868,8 @@
+ ssb_pcihost_unregister(&b43_pci_bridge_driver);
+}
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/Makefile
---- /dev/null 2008-01-09 08:24:16.586202496 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/Makefile 2008-01-09 12:22:11.000000000 -0500
+--- /dev/null 2008-01-10 08:19:44.585871638 -0500
++++ linux-2.6.23.noarch/drivers/ssb/Makefile 2008-01-10 17:12:16.000000000 -0500
@@ -0,0 +1,18 @@
+# core
+ssb-y += main.o scan.o
@@ -131878,8 +131890,8 @@
+
+obj-$(CONFIG_SSB) += ssb.o
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/pcmcia.c
---- /dev/null 2008-01-09 08:24:16.586202496 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/pcmcia.c 2008-01-09 12:22:11.000000000 -0500
+--- /dev/null 2008-01-10 08:19:44.585871638 -0500
++++ linux-2.6.23.noarch/drivers/ssb/pcmcia.c 2008-01-10 17:12:16.000000000 -0500
@@ -0,0 +1,271 @@
+/*
+ * Sonics Silicon Backplane
@@ -132153,8 +132165,8 @@
+ return -ENODEV;
+}
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/main.c
---- /dev/null 2008-01-09 08:24:16.586202496 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/main.c 2008-01-09 12:22:11.000000000 -0500
+--- /dev/null 2008-01-10 08:19:44.585871638 -0500
++++ linux-2.6.23.noarch/drivers/ssb/main.c 2008-01-10 17:12:16.000000000 -0500
@@ -0,0 +1,1166 @@
+/*
+ * Sonics Silicon Backplane
@@ -133323,8 +133335,8 @@
+}
+module_exit(ssb_modexit)
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/pcihost_wrapper.c
---- /dev/null 2008-01-09 08:24:16.586202496 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/pcihost_wrapper.c 2008-01-09 12:22:11.000000000 -0500
+--- /dev/null 2008-01-10 08:19:44.585871638 -0500
++++ linux-2.6.23.noarch/drivers/ssb/pcihost_wrapper.c 2008-01-10 17:12:16.000000000 -0500
@@ -0,0 +1,104 @@
+/*
+ * Sonics Silicon Backplane
@@ -133431,8 +133443,8 @@
+}
+EXPORT_SYMBOL(ssb_pcihost_register);
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/driver_mipscore.c
---- /dev/null 2008-01-09 08:24:16.586202496 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/driver_mipscore.c 2008-01-09 12:22:11.000000000 -0500
+--- /dev/null 2008-01-10 08:19:44.585871638 -0500
++++ linux-2.6.23.noarch/drivers/ssb/driver_mipscore.c 2008-01-10 17:12:16.000000000 -0500
@@ -0,0 +1,224 @@
+/*
+ * Sonics Silicon Backplane
@@ -133659,8 +133671,8 @@
+ ssb_mips_flash_detect(mcore);
+}
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/ssb_private.h
---- /dev/null 2008-01-09 08:24:16.586202496 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/ssb_private.h 2008-01-09 12:22:11.000000000 -0500
+--- /dev/null 2008-01-10 08:19:44.585871638 -0500
++++ linux-2.6.23.noarch/drivers/ssb/ssb_private.h 2008-01-10 17:12:16.000000000 -0500
@@ -0,0 +1,136 @@
+#ifndef LINUX_SSB_PRIVATE_H_
+#define LINUX_SSB_PRIVATE_H_
@@ -133799,8 +133811,8 @@
+
+#endif /* LINUX_SSB_PRIVATE_H_ */
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/pci.c
---- /dev/null 2008-01-09 08:24:16.586202496 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/pci.c 2008-01-09 12:22:11.000000000 -0500
+--- /dev/null 2008-01-10 08:19:44.585871638 -0500
++++ linux-2.6.23.noarch/drivers/ssb/pci.c 2008-01-10 17:12:16.000000000 -0500
@@ -0,0 +1,740 @@
+/*
+ * Sonics Silicon Backplane PCI-Hostbus related functions.
@@ -134543,8 +134555,8 @@
+ return err;
+}
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/driver_chipcommon.c
---- /dev/null 2008-01-09 08:24:16.586202496 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/driver_chipcommon.c 2008-01-09 12:22:11.000000000 -0500
+--- /dev/null 2008-01-10 08:19:44.585871638 -0500
++++ linux-2.6.23.noarch/drivers/ssb/driver_chipcommon.c 2008-01-10 17:12:16.000000000 -0500
@@ -0,0 +1,445 @@
+/*
+ * Sonics Silicon Backplane
@@ -134992,8 +135004,8 @@
+}
+#endif /* CONFIG_SSB_SERIAL */
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/Kconfig
---- /dev/null 2008-01-09 08:24:16.586202496 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/Kconfig 2008-01-09 12:22:11.000000000 -0500
+--- /dev/null 2008-01-10 08:19:44.585871638 -0500
++++ linux-2.6.23.noarch/drivers/ssb/Kconfig 2008-01-10 17:12:16.000000000 -0500
@@ -0,0 +1,117 @@
+menu "Sonics Silicon Backplane"
+
@@ -135113,8 +135125,8 @@
+
+endmenu
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/scan.c
---- /dev/null 2008-01-09 08:24:16.586202496 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/scan.c 2008-01-09 12:25:58.000000000 -0500
+--- /dev/null 2008-01-10 08:19:44.585871638 -0500
++++ linux-2.6.23.noarch/drivers/ssb/scan.c 2008-01-10 17:12:16.000000000 -0500
@@ -0,0 +1,413 @@
+/*
+ * Sonics Silicon Backplane
@@ -135530,8 +135542,8 @@
+ goto out;
+}
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/driver_extif.c
---- /dev/null 2008-01-09 08:24:16.586202496 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/driver_extif.c 2008-01-09 12:22:11.000000000 -0500
+--- /dev/null 2008-01-10 08:19:44.585871638 -0500
++++ linux-2.6.23.noarch/drivers/ssb/driver_extif.c 2008-01-10 17:12:16.000000000 -0500
@@ -0,0 +1,129 @@
+/*
+ * Sonics Silicon Backplane
@@ -135663,8 +135675,8 @@
+}
+
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/driver_pcicore.c
---- /dev/null 2008-01-09 08:24:16.586202496 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/driver_pcicore.c 2008-01-09 12:22:11.000000000 -0500
+--- /dev/null 2008-01-10 08:19:44.585871638 -0500
++++ linux-2.6.23.noarch/drivers/ssb/driver_pcicore.c 2008-01-10 17:12:16.000000000 -0500
@@ -0,0 +1,576 @@
+/*
+ * Sonics Silicon Backplane
@@ -136244,7 +136256,7 @@
+EXPORT_SYMBOL(ssb_pcicore_dev_irqvecs_enable);
diff -up linux-2.6.23.noarch/Documentation/networking/mac80211-injection.txt.orig linux-2.6.23.noarch/Documentation/networking/mac80211-injection.txt
--- linux-2.6.23.noarch/Documentation/networking/mac80211-injection.txt.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/Documentation/networking/mac80211-injection.txt 2008-01-09 12:22:11.000000000 -0500
++++ linux-2.6.23.noarch/Documentation/networking/mac80211-injection.txt 2008-01-10 17:12:16.000000000 -0500
@@ -13,15 +13,35 @@ The radiotap format is discussed in
./Documentation/networking/radiotap-headers.txt.
More information about the fedora-extras-commits
mailing list