rpms/kernel/devel kernel.spec, 1.659, 1.660 linux-2.6-at76.patch, 1.10, 1.11

John W. Linville (linville) fedora-extras-commits at redhat.com
Tue May 27 20:23:17 UTC 2008 

Author: linville

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

Modified Files:
	kernel.spec linux-2.6-at76.patch 
Log Message:
missed at76 bits from 2008-05-22


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.659
retrieving revision 1.660
diff -u -r1.659 -r1.660
--- kernel.spec	27 May 2008 19:57:22 -0000	1.659
+++ kernel.spec	27 May 2008 20:22:22 -0000	1.660
@@ -1771,6 +1771,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
+* Tue May 27 2008 John W. Linville <linville at redhat.com>
+- Missed some at76 bits from 2008-05-22...
+
 * Tue May 27 2008 Tom "spot" Callaway <tcallawa at redhat.com>
 - Apply patch to Resolve issues with glitch-free pulseaudio on hda-intel
 

linux-2.6-at76.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.10 -r 1.11 linux-2.6-at76.patch
Index: linux-2.6-at76.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-at76.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- linux-2.6-at76.patch	19 May 2008 18:40:11 -0000	1.10
+++ linux-2.6-at76.patch	27 May 2008 20:22:22 -0000	1.11
@@ -1,4 +1,58 @@
-commit 755a49a4b9d296651276ca8ca3ece49ded9ae621
+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
 
@@ -59,7 +113,7 @@
     Signed-off-by: Bruno Randolf <br1 at einfach.org>
     Signed-off-by: John W. Linville <linville at tuxdriver.com>
 
-commit 644ef9df7c598e369ba1794f65610b1a1e643fca
+commit ace095545ffa056bf906496a7be0808823fa9980
 Author: Pavel Roskin <proski at gnu.org>
 Date:   Fri Feb 22 00:01:07 2008 -0500
 
@@ -68,7 +122,7 @@
     Signed-off-by: Pavel Roskin <proski at gnu.org>
     Signed-off-by: John W. Linville <linville at tuxdriver.com>
 
-commit b226eae4c43640ed83cd8126c11602e230150a56
+commit 590364c5a53756b670dd104e4cddd8e760875e2f
 Author: Pavel Roskin <proski at gnu.org>
 Date:   Fri Feb 22 00:01:01 2008 -0500
 
@@ -77,7 +131,7 @@
     Signed-off-by: Pavel Roskin <proski at gnu.org>
     Signed-off-by: John W. Linville <linville at tuxdriver.com>
 
-commit 9eccbe8447a68d649d3ca683193f34b3cb9c7c6c
+commit 00a1912a53673056e06572bfa37f85b8ef65d682
 Author: Pavel Roskin <proski at gnu.org>
 Date:   Fri Feb 22 00:00:55 2008 -0500
 
@@ -86,7 +140,7 @@
     Signed-off-by: Pavel Roskin <proski at gnu.org>
     Signed-off-by: John W. Linville <linville at tuxdriver.com>
 
-commit 5a92d66e9642b3a0a8cee6eec7172b65d9c43548
+commit cad8f142e3505c0bf0f70a16c6fd7c441697e9e2
 Author: Pavel Roskin <proski at gnu.org>
 Date:   Fri Feb 22 00:00:50 2008 -0500
 
@@ -95,7 +149,7 @@
     Signed-off-by: Pavel Roskin <proski at gnu.org>
     Signed-off-by: John W. Linville <linville at tuxdriver.com>
 
-commit 67c3d5b697774c6fe9a644fa302c82333e1d75e3
+commit 7babe23f68a622c32bbaf6dfaec3d36644eaa946
 Author: Pavel Roskin <proski at gnu.org>
 Date:   Fri Feb 22 00:00:44 2008 -0500
 
@@ -106,7 +160,7 @@
     Signed-off-by: Pavel Roskin <proski at gnu.org>
     Signed-off-by: John W. Linville <linville at tuxdriver.com>
 
-commit b0b7eb18c8233622d1ffdea33814548e286379dd
+commit 0678f4b57e5d832ec56a54830b8dd94692e1f291
 Author: Kalle Valo <kalle.valo at iki.fi>
 Date:   Sun Feb 10 17:01:19 2008 +0200
 
@@ -117,7 +171,7 @@
     Signed-off-by: Kalle Valo <kalle.valo at iki.fi>
     Signed-off-by: John W. Linville <linville at tuxdriver.com>
 
-commit 1416847d10d0f9ddee78264dfdf14eab5fff72aa
+commit 5b6e27b59e14602e50f32b82cdb9781535bcbbbc
 Author: Kalle Valo <kalle.valo at iki.fi>
 Date:   Sun Feb 10 17:01:11 2008 +0200
 
@@ -128,7 +182,7 @@
     Signed-off-by: Kalle Valo <kalle.valo at iki.fi>
     Signed-off-by: John W. Linville <linville at tuxdriver.com>
 
-commit 3483c0c0779a404e7aa9a5261978a083fbf3aac7
+commit 12189dc89c5b54fa0c48693f853223d738869896
 Author: Kalle Valo <kalle.valo at iki.fi>
 Date:   Sun Feb 10 17:01:04 2008 +0200
 
@@ -142,7 +196,7 @@
     Signed-off-by: Kalle Valo <kalle.valo at iki.fi>
     Signed-off-by: John W. Linville <linville at tuxdriver.com>
 
-commit 10a9088fa5d75ca48fbc74108a106430336ab615
+commit 3341952b9aac1be83bbf1e4858220727a138ebfa
 Author: Kalle Valo <kalle.valo at iki.fi>
 Date:   Sun Feb 10 17:00:56 2008 +0200
 
@@ -156,7 +210,7 @@
     Signed-off-by: Kalle Valo <kalle.valo at iki.fi>
     Signed-off-by: John W. Linville <linville at tuxdriver.com>
 
-commit bc12541b59aa1a0b4c58a093195d7ade3ebbbe60
+commit d6703673ea7df77f8651e584b264c4f88e38cafd
 Author: Kalle Valo <kalle.valo at iki.fi>
 Date:   Sun Feb 10 17:00:49 2008 +0200
 
@@ -169,7 +223,7 @@
     Signed-off-by: Kalle Valo <kalle.valo at iki.fi>
     Signed-off-by: John W. Linville <linville at tuxdriver.com>
 
-commit b5415e12ce5552b0b640c83a40fdc806eb130149
+commit 72817d08169e390161aed451baea3eebeb859a77
 Author: Kalle Valo <kalle.valo at iki.fi>
 Date:   Sun Feb 10 17:00:41 2008 +0200
 
@@ -178,7 +232,7 @@
     Signed-off-by: Kalle Valo <kalle.valo at iki.fi>
     Signed-off-by: John W. Linville <linville at tuxdriver.com>
 
-commit 82d266cbe56da67064793e1747d12abfe705ffc5
+commit ba52a65debbc5a873cbcdb8f6a5a314f1bba0a44
 Author: Kalle Valo <kalle.valo at iki.fi>
 Date:   Sun Feb 10 17:00:34 2008 +0200
 
@@ -187,7 +241,7 @@
     Signed-off-by: Kalle Valo <kalle.valo at iki.fi>
     Signed-off-by: John W. Linville <linville at tuxdriver.com>
 
-commit 4e9c1daf0d0b98af6e4c0b87c299855dd63dec06
+commit d6a316db4a79a216b1cbfee444b92d343c988b5b
 Author: Kalle Valo <kalle.valo at iki.fi>
 Date:   Sun Feb 10 17:00:26 2008 +0200
 
@@ -202,7 +256,7 @@
     Signed-off-by: Kalle Valo <kalle.valo at iki.fi>
     Signed-off-by: John W. Linville <linville at tuxdriver.com>
 
-commit 475d2454db1a8a21af2cd06da2e31896b987efe4
+commit 29820bb1c8633fb4ae6eb9df621970074b669450
 Author: Kalle Valo <kalle.valo at iki.fi>
 Date:   Sun Feb 10 17:00:19 2008 +0200
 
@@ -211,7 +265,7 @@
     Signed-off-by: Kalle Valo <kalle.valo at iki.fi>
     Signed-off-by: John W. Linville <linville at tuxdriver.com>
 
-commit adad9eb5df49e8b3848a28d3b865d2e6424f3092
+commit 2b2886cdd58c0351fc6f09d42ed35662a2b59a0b
[...4032 lines suppressed...]
-+			dev_printk(KERN_ERR, &interface->dev,
-+				   "error %d getting firmware version\n", ret);
-+			goto error;
-+		}
-+	}
++	struct mutex mtx;	/* locks this structure */
 +
-+	priv = at76_alloc_new_device(udev);
-+	if (!priv) {
-+		ret = -ENOMEM;
-+		goto error;
-+	}
++	/* work queues */
++	struct work_struct work_set_promisc;
++	struct work_struct work_submit_rx;
++	struct delayed_work dwork_hw_scan;
 +
-+	usb_set_intfdata(interface, priv);
++	struct tasklet_struct rx_tasklet;
 +
-+	memcpy(&priv->fw_version, &fwv, sizeof(struct mib_fw_version));
-+	priv->board_type = board_type;
++	/* 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 */
 +
-+	ret = at76_init_new_device(priv, interface);
-+	if (ret < 0)
-+		at76_delete_device(priv);
++	int channel;
++	int iw_mode;
++	u8 bssid[ETH_ALEN];
++	u8 essid[IW_ESSID_MAX_SIZE];
++	int essid_size;
++	int radio_on;
++	int promisc;
 +
-+	return ret;
++	int preamble_type;	/* 0 - long, 1 - short, 2 - auto */
++	int auth_mode;		/* authentication type: 0 open, 1 shared key */
++	int txrate;		/* 0,1,2,3 = 1,2,5.5,11 Mbps, 4 is auto */
++	int frag_threshold;	/* threshold for fragmentation of tx packets */
++	int rts_threshold;	/* threshold for RTS mechanism */
++	int short_retry_limit;
 +
-+error:
-+	usb_put_dev(udev);
-+	return ret;
-+}
++	int scan_min_time;	/* scan min channel time */
++	int scan_max_time;	/* scan max channel time */
++	int scan_mode;		/* SCAN_TYPE_ACTIVE, SCAN_TYPE_PASSIVE */
++	int scan_need_any;	/* if set, need to scan for any ESSID */
 +
-+static void at76_disconnect(struct usb_interface *interface)
-+{
-+	struct at76_priv *priv;
++	u16 assoc_id;		/* current association ID, if associated */
 +
-+	priv = usb_get_intfdata(interface);
-+	usb_set_intfdata(interface, NULL);
++	u8 pm_mode;		/* power management mode */
++	u32 pm_period;		/* power management period in microseconds */
 +
-+	/* Disconnect after loading internal firmware */
-+	if (!priv)
-+		return;
++	struct reg_domain const *domain;	/* reg domain description */
 +
-+	printk(KERN_INFO "%s: disconnecting\n", wiphy_name(priv->hw->wiphy));
-+	at76_delete_device(priv);
-+	dev_printk(KERN_INFO, &interface->dev, "disconnected\n");
-+}
++	/* 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];
++	u8 regulatory_domain;
 +
-+/* Structure for registering this driver with the USB subsystem */
-+static struct usb_driver at76_driver = {
-+	.name = DRIVER_NAME,
-+	.probe = at76_probe,
-+	.disconnect = at76_disconnect,
-+	.id_table = dev_table,
-+};
++	struct at76_card_config card_config;
 +
-+static int __init at76_mod_init(void)
-+{
-+	int result;
++	enum board_type board_type;
++	struct mib_fw_version fw_version;
 +
-+	printk(KERN_INFO DRIVER_DESC " " DRIVER_VERSION " loading\n");
++	unsigned int device_unplugged:1;
++	unsigned int netdev_registered:1;
++	struct set_mib_buffer mib_buf;	/* global buffer for set_mib calls */
 +
-+	mutex_init(&fw_mutex);
++	int beacon_period;	/* period of mgmt beacons, Kus */
 +
-+	/* register this driver with the USB subsystem */
-+	result = usb_register(&at76_driver);
-+	if (result < 0)
-+		printk(KERN_ERR DRIVER_NAME
-+		       ": usb_register failed (status %d)\n", result);
++	struct ieee80211_hw *hw;
++	int mac80211_registered;
++};
 +
-+	led_trigger_register_simple("at76_usb-tx", &ledtrig_tx);
-+	return result;
-+}
++#define AT76_SUPPORTED_FILTERS FIF_PROMISC_IN_BSS
 +
-+static void __exit at76_mod_exit(void)
-+{
-+	int i;
++#define SCAN_POLL_INTERVAL	(HZ / 4)
 +
-+	printk(KERN_INFO DRIVER_DESC " " DRIVER_VERSION " unloading\n");
-+	usb_deregister(&at76_driver);
-+	for (i = 0; i < ARRAY_SIZE(firmwares); i++) {
-+		if (firmwares[i].fw)
-+			release_firmware(firmwares[i].fw);
-+	}
-+	led_trigger_unregister_simple(ledtrig_tx);
-+}
++#define CMD_COMPLETION_TIMEOUT	(5 * HZ)
 +
-+module_param_named(debug, at76_debug, int, 0600);
-+MODULE_PARM_DESC(debug, "Debugging level");
++#define DEF_RTS_THRESHOLD	1536
++#define DEF_FRAG_THRESHOLD	1536
++#define DEF_SHORT_RETRY_LIMIT	8
++#define DEF_CHANNEL		10
++#define DEF_SCAN_MIN_TIME	10
++#define DEF_SCAN_MAX_TIME	120
 +
-+module_init(at76_mod_init);
-+module_exit(at76_mod_exit);
++/* the max padding size for tx in bytes (see calc_padding) */
++#define MAX_PADDING_SIZE	53
 +
-+MODULE_AUTHOR("Oliver Kurth <oku at masqmail.cx>");
-+MODULE_AUTHOR("Joerg Albert <joerg.albert at gmx.de>");
-+MODULE_AUTHOR("Alex <alex at foogod.com>");
-+MODULE_AUTHOR("Nick Jones");
-+MODULE_AUTHOR("Balint Seeber <n0_5p4m_p13453 at hotmail.com>");
-+MODULE_AUTHOR("Pavel Roskin <proski at gnu.org>");
-+MODULE_AUTHOR("Guido Guenther <agx at sigxcpu.org>");
-+MODULE_AUTHOR("Kalle Valo <kalle.valo at iki.fi>");
-+MODULE_DESCRIPTION(DRIVER_DESC);
-+MODULE_LICENSE("GPL");
++#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-19 09:13:44.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/Kconfig	2008-05-19 13:37:11.000000000 -0400
+--- 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
 @@ -456,6 +456,14 @@ config PCMCIA_ATMEL
  	  Enable support for PCMCIA cards containing the
  	  Atmel at76c502 and at76c504 chips.
@@ -3993,3 +4011,34 @@
  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
+@@ -32,6 +32,8 @@ obj-$(CONFIG_ATMEL)             += atmel
+ obj-$(CONFIG_PCI_ATMEL)         += atmel_pci.o 
+ obj-$(CONFIG_PCMCIA_ATMEL)      += atmel_cs.o
+ 
++obj-$(CONFIG_USB_ATMEL)	        += at76_usb.o
++
+ 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
+ W:	http://atmelwlandriver.sourceforge.net/
+ S:	Maintained
+ 
++ATMEL USB WIRELESS DRIVER
++P:	Pavel Roskin
++M:	proski at gnu.org
++L:	linux-wireless at vger.kernel.org
++L:	at76c503a-user at lists.berlios.de
++L:	at76c503a-develop at lists.berlios.de
++W:	http://at76c503a.berlios.de/
++S:	Maintained
++
+ AUDIT SUBSYSTEM
+ P:	Al Viro
+ M:	viro at zeniv.linux.org.uk

More information about the scm-commits mailing list