rpms/kernel/F-9 kernel.spec, 1.780, 1.781 linux-2.6-at76.patch, 1.13, 1.14
John W. Linville
linville at fedoraproject.org
Mon Oct 6 14:39:42 UTC 2008
Author: linville
Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28175
Modified Files:
kernel.spec linux-2.6-at76.patch
Log Message:
Re-revert at76_usb to version from before attempted mac80211 port
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.780
retrieving revision 1.781
diff -u -r1.780 -r1.781
--- kernel.spec 6 Oct 2008 14:13:03 -0000 1.780
+++ kernel.spec 6 Oct 2008 14:39:11 -0000 1.781
@@ -1927,6 +1927,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
+* Mon Oct 06 2008 John W. Linville <linville at redhat.com> 2.6.26.5-54
+- Re-revert at76_usb to version from before attempted mac80211 port
+
* Mon Oct 06 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-53
- Add missing WARN() macro.
linux-2.6-at76.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.13 -r 1.14 linux-2.6-at76.patch
Index: linux-2.6-at76.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-at76.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- linux-2.6-at76.patch 4 Aug 2008 22:20:04 -0000 1.13
+++ linux-2.6-at76.patch 6 Oct 2008 14:39:11 -0000 1.14
@@ -1,306 +1,4 @@
-commit 34f6f7e889723def0ae895ca8aaa0b12e6ee3f6c
-Author: Johannes Berg <johannes at sipsolutions.net>
-Date: Thu May 15 12:55:29 2008 +0200
-
- at76_usb: move TX info into skb->cb
-
- This patch converts mac80211 and all drivers to have transmit
- information and status in skb->cb rather than allocating extra
- memory for it and copying all the data around. To make it fit,
- a union is used where only data that is necessary for all steps
- is kept outside of the union.
-
- A number of fixes were done by Ivo, as well as the rt2x00 part
- of this patch.
-
- Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
- Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
- Acked-by: David S. Miller <davem at davemloft.net>
- Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
-commit 5d77944bc40ebe1b7b1c56fb2f92684b4c29b66b
-Author: Johannes Berg <johannes at sipsolutions.net>
-Date: Thu May 15 12:55:27 2008 +0200
-
- at76_usb: use rate index in TX control
-
- This patch modifies struct ieee80211_tx_control to give band
- info and the rate index (instead of rate pointers) to drivers.
- This mostly serves to reduce the TX control structure size to
- make it fit into skb->cb so that the fragmentation code can
- put it there and we can think about passing it to drivers that
- way in the future.
-
- The rt2x00 driver update was done by Ivo, thanks.
-
- Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
- Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
- Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
-commit a7782d1764b316686de4231286c677e230018021
-Author: Johannes Berg <johannes at sipsolutions.net>
-Date: Thu May 15 12:55:26 2008 +0200
-
- at76_usb: let drivers wake but not start queues
-
- Having drivers start queues is just confusing, their ->start()
- callback can block and do whatever is necessary, so let mac80211
- start queues and have drivers wake queues when necessary (to get
- packets flowing again right away.)
-
- Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
- Acked-by: David S. Miller <davem at davemloft.net>
- Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
-commit 761fb2009c498157d653d9aa9dfd8565039aa072
-Author: Bruno Randolf <br1 at einfach.org>
-Date: Thu May 8 19:15:40 2008 +0200
-
- at76: use hardware flags for signal/noise units
-
- This is the at76_usb bits...
-
- trying to clean up the signal/noise code. the previous code in mac80211 had
- confusing names for the related variables, did not have much definition of
- what units of signal and noise were provided and used implicit mechanisms from
- the wireless extensions.
-
- this patch introduces hardware capability flags to let the hardware specify
- clearly if it can provide signal and noise level values and which units it can
- provide. this also anticipates possible new units like RCPI in the future.
-
- for signal:
-
- IEEE80211_HW_SIGNAL_UNSPEC - unspecified, unknown, hw specific
- IEEE80211_HW_SIGNAL_DB - dB difference to unspecified reference point
- IEEE80211_HW_SIGNAL_DBM - dBm, difference to 1mW
-
- for noise we currently only have dBm:
-
- IEEE80211_HW_NOISE_DBM - dBm, difference to 1mW
-
- if IEEE80211_HW_SIGNAL_UNSPEC or IEEE80211_HW_SIGNAL_DB is used the driver has
- to provide the maximum value (max_signal) it reports in order for applications
- to make sense of the signal values.
-
- i tried my best to find out for each driver what it can provide and update it
- but i'm not sure (?) for some of them and used the more conservative guess in
- doubt. this can be fixed easily after this patch has been merged by changing
- the hardware flags of the driver.
-
- DRIVER SIGNAL MAX NOISE QUAL
- -----------------------------------------------------------------
- adm8211 unspec(?) 100 n/a missing
- at76_usb unspec(?) (?) unused missing
- ath5k dBm dBm percent rssi
- b43legacy dBm dBm percent jssi(?)
- b43 dBm dBm percent jssi(?)
- iwl-3945 dBm dBm percent snr+more
- iwl-4965 dBm dBm percent snr+more
- p54 unspec 127 n/a missing
- rt2x00 dBm n/a percent rssi+tx/rx frame success
- rt2400 dBm n/a
- rt2500pci dBm n/a
- rt2500usb dBm n/a
- rt61pci dBm n/a
- rt73usb dBm n/a
- rtl8180 unspec(?) 65 n/a (?)
- rtl8187 unspec(?) 65 (?) noise(?)
- zd1211 dB(?) 100 n/a percent
-
- drivers/net/wireless/ath5k/base.c: Changes-licensed-under: 3-Clause-BSD
-
- Signed-off-by: Bruno Randolf <br1 at einfach.org>
- Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
-commit ace095545ffa056bf906496a7be0808823fa9980
-Author: Pavel Roskin <proski at gnu.org>
-Date: Fri Feb 22 00:01:07 2008 -0500
-
- at76_usb: make the driver depend on MAC80211
-
- Signed-off-by: Pavel Roskin <proski at gnu.org>
- Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
-commit 590364c5a53756b670dd104e4cddd8e760875e2f
-Author: Pavel Roskin <proski at gnu.org>
-Date: Fri Feb 22 00:01:01 2008 -0500
-
- at76_usb: reindent, reorder initializers for readability
-
- Signed-off-by: Pavel Roskin <proski at gnu.org>
- Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
-commit 00a1912a53673056e06572bfa37f85b8ef65d682
-Author: Pavel Roskin <proski at gnu.org>
-Date: Fri Feb 22 00:00:55 2008 -0500
-
- at76_usb: add more MODULE_AUTHOR entries
-
- Signed-off-by: Pavel Roskin <proski at gnu.org>
- Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
-commit cad8f142e3505c0bf0f70a16c6fd7c441697e9e2
-Author: Pavel Roskin <proski at gnu.org>
-Date: Fri Feb 22 00:00:50 2008 -0500
-
- at76_usb: remove unneeded code
-
- Signed-off-by: Pavel Roskin <proski at gnu.org>
- Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
-commit 7babe23f68a622c32bbaf6dfaec3d36644eaa946
-Author: Pavel Roskin <proski at gnu.org>
-Date: Fri Feb 22 00:00:44 2008 -0500
-
- at76_usb: fix missing newlines in printk, improve some messages
-
- It's important to know which function failed.
-
- Signed-off-by: Pavel Roskin <proski at gnu.org>
- Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
-commit 0678f4b57e5d832ec56a54830b8dd94692e1f291
-Author: Kalle Valo <kalle.valo at iki.fi>
-Date: Sun Feb 10 17:01:19 2008 +0200
-
- at76_usb: Remove struct net_device
-
- This patch contains only code removal, no code has been modified.
-
- Signed-off-by: Kalle Valo <kalle.valo at iki.fi>
- Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
-commit 5b6e27b59e14602e50f32b82cdb9781535bcbbbc
-Author: Kalle Valo <kalle.valo at iki.fi>
-Date: Sun Feb 10 17:01:11 2008 +0200
-
- at76_usb: Prepare for struct net_device removal
-
- Some cleanup to make it easier to remove the struct net_device.
-
- Signed-off-by: Kalle Valo <kalle.valo at iki.fi>
- Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
-commit 12189dc89c5b54fa0c48693f853223d738869896
-Author: Kalle Valo <kalle.valo at iki.fi>
-Date: Sun Feb 10 17:01:04 2008 +0200
-
- at76_usb: Allocate struct at76_priv using ieee80211_alloc_hw()
-
- This is for the preparation to remove struct net_device.
[...5950 lines suppressed...]
+
+ /* work queues */
++ struct work_struct work_assoc_done;
++ struct work_struct work_join;
++ struct work_struct work_new_bss;
++ struct work_struct work_start_scan;
+ struct work_struct work_set_promisc;
+ struct work_struct work_submit_rx;
-+ struct delayed_work dwork_hw_scan;
++ struct delayed_work dwork_restart;
++ struct delayed_work dwork_get_scan;
++ struct delayed_work dwork_beacon;
++ struct delayed_work dwork_auth;
++ struct delayed_work dwork_assoc;
+
+ struct tasklet_struct rx_tasklet;
+
+ /* the WEP stuff */
+ int wep_enabled; /* 1 if WEP is enabled */
+ int wep_key_id; /* key id to be used */
-+ u8 wep_keys[WEP_KEYS][WEP_LARGE_KEY_LEN]; /* WEP keys */
-+ u8 wep_keys_len[WEP_KEYS]; /* length of WEP keys */
++ u8 wep_keys[WEP_KEYS][WEP_KEY_LEN]; /* the four WEP keys,
++ 5 or 13 bytes are used */
++ u8 wep_keys_len[WEP_KEYS]; /* the length of the above keys */
+
+ int channel;
+ int iw_mode;
@@ -3949,13 +6769,44 @@
+ int scan_mode; /* SCAN_TYPE_ACTIVE, SCAN_TYPE_PASSIVE */
+ int scan_need_any; /* if set, need to scan for any ESSID */
+
++ /* the list we got from scanning */
++ spinlock_t bss_list_spinlock; /* protects bss_list operations */
++ struct list_head bss_list; /* list of BSS we got beacons from */
++ struct timer_list bss_list_timer; /* timer to purge old entries
++ from bss_list */
++ struct bss_info *curr_bss; /* current BSS */
+ u16 assoc_id; /* current association ID, if associated */
+
++ u8 wanted_bssid[ETH_ALEN];
++ int wanted_bssid_valid; /* != 0 if wanted_bssid is to be used */
++
++ /* some data for infrastructure mode only */
++ spinlock_t mgmt_spinlock; /* this spinlock protects access to
++ next_mgmt_bulk */
++
++ struct at76_tx_buffer *next_mgmt_bulk; /* pending management msg to
++ send via bulk out */
++ enum mac_state mac_state;
++ enum {
++ SCAN_IDLE,
++ SCAN_IN_PROGRESS,
++ SCAN_COMPLETED
++ } scan_state;
++ time_t last_scan;
++
++ int retries; /* remaining retries in case of timeout when
++ * sending AuthReq or AssocReq */
+ u8 pm_mode; /* power management mode */
+ u32 pm_period; /* power management period in microseconds */
+
+ struct reg_domain const *domain; /* reg domain description */
+
++ /* iwspy support */
++ spinlock_t spy_spinlock;
++ struct iw_spy_data spy_data;
++
++ struct iw_public_data wireless_data;
++
+ /* These fields contain HW config provided by the device (not all of
+ * these fields are used by all board types) */
+ u8 mac_addr[ETH_ALEN];
@@ -3963,6 +6814,9 @@
+
+ struct at76_card_config card_config;
+
++ /* store rx fragments until complete */
++ struct rx_data_buf rx_data[NR_RX_DATA_BUF];
++
+ enum board_type board_type;
+ struct mib_fw_version fw_version;
+
@@ -3970,16 +6824,58 @@
+ unsigned int netdev_registered:1;
+ struct set_mib_buffer mib_buf; /* global buffer for set_mib calls */
+
++ /* beacon counting */
+ int beacon_period; /* period of mgmt beacons, Kus */
++ int beacons_received;
++ unsigned long beacons_last_qual; /* time we restarted counting
++ beacons */
++};
+
-+ struct ieee80211_hw *hw;
-+ int mac80211_registered;
++struct at76_rx_radiotap {
++ struct ieee80211_radiotap_header rt_hdr;
++ __le64 rt_tsft;
++ u8 rt_flags;
++ u8 rt_rate;
++ s8 rt_signal;
++ s8 rt_noise;
+};
+
-+#define AT76_SUPPORTED_FILTERS FIF_PROMISC_IN_BSS
++#define AT76_RX_RADIOTAP_PRESENT \
++ ((1 << IEEE80211_RADIOTAP_TSFT) | \
++ (1 << IEEE80211_RADIOTAP_FLAGS) | \
++ (1 << IEEE80211_RADIOTAP_RATE) | \
++ (1 << IEEE80211_RADIOTAP_DB_ANTSIGNAL) | \
++ (1 << IEEE80211_RADIOTAP_DB_ANTNOISE))
++
++#define BEACON_MAX_DATA_LENGTH 1500
+
++/* the maximum size of an AssocReq packet */
++#define ASSOCREQ_MAX_SIZE \
++ (AT76_TX_HDRLEN + sizeof(struct ieee80211_assoc_request) + \
++ 1 + 1 + IW_ESSID_MAX_SIZE + 1 + 1 + 4)
++
++/* for shared secret auth, add the challenge text size */
++#define AUTH_FRAME_SIZE (AT76_TX_HDRLEN + sizeof(struct ieee80211_auth))
++
++/* Maximal number of AuthReq retries */
++#define AUTH_RETRIES 3
++
++/* Maximal number of AssocReq retries */
++#define ASSOC_RETRIES 3
++
++/* Beacon timeout in managed mode when we are connected */
++#define BEACON_TIMEOUT (10 * HZ)
++
++/* Timeout for authentication response */
++#define AUTH_TIMEOUT (1 * HZ)
++
++/* Timeout for association response */
++#define ASSOC_TIMEOUT (1 * HZ)
++
++/* Polling interval when scan is running */
+#define SCAN_POLL_INTERVAL (HZ / 4)
+
++/* Command completion timeout */
+#define CMD_COMPLETION_TIMEOUT (5 * HZ)
+
+#define DEF_RTS_THRESHOLD 1536
@@ -3989,20 +6885,22 @@
+#define DEF_SCAN_MIN_TIME 10
+#define DEF_SCAN_MAX_TIME 120
+
++#define MAX_RTS_THRESHOLD (MAX_FRAG_THRESHOLD + 1)
++
+/* the max padding size for tx in bytes (see calc_padding) */
+#define MAX_PADDING_SIZE 53
+
+#endif /* _AT76_USB_H */
-diff -up linux-2.6.25.noarch/drivers/net/wireless/Kconfig.orig linux-2.6.25.noarch/drivers/net/wireless/Kconfig
---- linux-2.6.25.noarch/drivers/net/wireless/Kconfig.orig 2008-05-27 15:51:49.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/Kconfig 2008-05-27 15:52:01.000000000 -0400
+diff -up linux-2.6.26.noarch/drivers/net/wireless/Kconfig.orig linux-2.6.26.noarch/drivers/net/wireless/Kconfig
+--- linux-2.6.26.noarch/drivers/net/wireless/Kconfig.orig 2008-08-01 11:32:35.000000000 -0400
++++ linux-2.6.26.noarch/drivers/net/wireless/Kconfig 2008-08-01 11:33:05.000000000 -0400
@@ -456,6 +456,14 @@ config PCMCIA_ATMEL
Enable support for PCMCIA cards containing the
Atmel at76c502 and at76c504 chips.
+config USB_ATMEL
+ tristate "Atmel at76c503/at76c505/at76c505a USB cards"
-+ depends on MAC80211 && WLAN_80211 && USB
++ depends on WLAN_80211 && USB
+ select FW_LOADER
+ ---help---
+ Enable support for USB Wireless devices using Atmel at76c503,
@@ -4011,9 +6909,9 @@
config AIRO_CS
tristate "Cisco/Aironet 34X/35X/4500/4800 PCMCIA cards"
depends on PCMCIA && (BROKEN || !M32R) && WLAN_80211
-diff -up linux-2.6.25.noarch/drivers/net/wireless/Makefile.orig linux-2.6.25.noarch/drivers/net/wireless/Makefile
---- linux-2.6.25.noarch/drivers/net/wireless/Makefile.orig 2008-05-27 15:51:49.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/Makefile 2008-05-27 15:52:01.000000000 -0400
+diff -up linux-2.6.26.noarch/drivers/net/wireless/Makefile.orig linux-2.6.26.noarch/drivers/net/wireless/Makefile
+--- linux-2.6.26.noarch/drivers/net/wireless/Makefile.orig 2008-08-01 11:32:35.000000000 -0400
++++ linux-2.6.26.noarch/drivers/net/wireless/Makefile 2008-08-01 11:33:05.000000000 -0400
@@ -32,6 +32,8 @@ obj-$(CONFIG_ATMEL) += atmel
obj-$(CONFIG_PCI_ATMEL) += atmel_pci.o
obj-$(CONFIG_PCMCIA_ATMEL) += atmel_cs.o
@@ -4023,10 +6921,10 @@
obj-$(CONFIG_PRISM54) += prism54/
obj-$(CONFIG_HOSTAP) += hostap/
-diff -up linux-2.6.25.noarch/MAINTAINERS.orig linux-2.6.25.noarch/MAINTAINERS
---- linux-2.6.25.noarch/MAINTAINERS.orig 2008-05-27 15:51:49.000000000 -0400
-+++ linux-2.6.25.noarch/MAINTAINERS 2008-05-27 15:52:01.000000000 -0400
-@@ -751,6 +751,15 @@ W: http://www.thekelleys.org.uk/atmel
+diff -up linux-2.6.26.noarch/MAINTAINERS.orig linux-2.6.26.noarch/MAINTAINERS
+--- linux-2.6.26.noarch/MAINTAINERS.orig 2008-08-01 11:32:35.000000000 -0400
++++ linux-2.6.26.noarch/MAINTAINERS 2008-08-01 11:33:05.000000000 -0400
+@@ -781,6 +781,15 @@ W: http://www.thekelleys.org.uk/atmel
W: http://atmelwlandriver.sourceforge.net/
S: Maintained
More information about the scm-commits
mailing list