Skip to contentSkip to conversation

pull request: wireless-2.6 2009-11-16

PATCH John W. Linville 2 participants 3 messages Nov 16, 2009 – Nov 17, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

Dave,

One last(?) set of fixes intended for 2.6.32...

The biggest is a revert of the patch that added cfg80211 support to ipw2200. It was ill conceived and inadvertantly caused problems for ipw2100. There are fixes available now, but they are just as big as the revert -- I'll restage them for 2.6.33. There is little activity in ipw2200, so it the revert should be set. Plus, I've tested the revert locally.

There is also a warning fix for where p54usb was using stack memory for DMA. And finally, two small MAINTAINERS fixes.

Please let me know if there are problems!

Thanks,

John

---

Individual patches are available here:

http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/

---

The following changes since commit d01032e4fd33110f9f3a085a36cb819c1dfc5827:
Wey-Yi Guy (1):
iwlwifi: Fix issue on file transfer stalled in HT mode

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git master

Gertjan van Wingerde (1):
rt2x00: Update MAINTAINERS

Joe Perches (1):
MAINTAINERS: RFKILL - Fix pattern entry missing colon

John W. Linville (1):
Revert "libipw: initiate cfg80211 API conversion"

Larry Finger (1):
p54usb: Remove DMA buffer from stack

 MAINTAINERS                                  |    3 +-
 drivers/net/wireless/ipw2x00/ipw2100.c       |    6 +-
 drivers/net/wireless/ipw2x00/ipw2200.c       |  141 +++++---------------------
 drivers/net/wireless/ipw2x00/libipw.h        |    8 +-
 drivers/net/wireless/ipw2x00/libipw_module.c |   42 +-------
 drivers/net/wireless/p54/p54usb.c            |   10 ++-
 6 files changed, 45 insertions(+), 165 deletions(-)
MAINTAINERS +2 -1
index b37e0cd..887b50b 100644
@@ -4281,6 +4281,7 @@ F:	drivers/video/aty/aty128fb.c
 RALINK RT2X00 WIRELESS LAN DRIVER
 P:	rt2x00 project
 M:	Ivo van Doorn <[email protected]>
+M:	Gertjan van Wingerde <[email protected]>
 L:	[email protected]
 L:	[email protected] (moderated for non-subscribers)
 W:	http://rt2x00.serialmonkey.com/
@@ -4368,7 +4369,7 @@ RFKILL
 M:	Johannes Berg <[email protected]>
 L:	[email protected]
 S:	Maintained
-F	Documentation/rfkill.txt
+F:	Documentation/rfkill.txt
 F:	net/rfkill/
 
 RISCOM8 DRIVER
drivers/net/wireless/ipw2x00/ipw2100.c +3 -3
index 240cff1..6e2fc0c 100644
@@ -6029,7 +6029,7 @@ static struct net_device *ipw2100_alloc_device(struct pci_dev *pci_dev,
 	struct ipw2100_priv *priv;
 	struct net_device *dev;
 
-	dev = alloc_ieee80211(sizeof(struct ipw2100_priv), 0);
+	dev = alloc_ieee80211(sizeof(struct ipw2100_priv));
 	if (!dev)
 		return NULL;
 	priv = libipw_priv(dev);
@@ -6342,7 +6342,7 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
 		sysfs_remove_group(&pci_dev->dev.kobj,
 				   &ipw2100_attribute_group);
 
-		free_ieee80211(dev, 0);
+		free_ieee80211(dev);
 		pci_set_drvdata(pci_dev, NULL);
 	}
 
@@ -6400,7 +6400,7 @@ static void __devexit ipw2100_pci_remove_one(struct pci_dev *pci_dev)
 		if (dev->base_addr)
 			iounmap((void __iomem *)dev->base_addr);
 
-		free_ieee80211(dev, 0);
+		free_ieee80211(dev);
 	}
 
 	pci_release_regions(pci_dev);
drivers/net/wireless/ipw2x00/ipw2200.c +28 -113

208 lines not on this page · raw message

drivers/net/wireless/ipw2x00/libipw.h +2 -6
index bf45391..1e334ff 100644
@@ -31,7 +31,6 @@
 #include <linux/ieee80211.h>
 
 #include <net/lib80211.h>
-#include <net/cfg80211.h>
 
 #define LIBIPW_VERSION "git-1.1.13"
 
@@ -784,15 +783,12 @@ struct libipw_geo {
 
 struct libipw_device {
 	struct net_device *dev;
-	struct wireless_dev wdev;
 	struct libipw_security sec;
 
 	/* Bookkeeping structures */
 	struct libipw_stats ieee_stats;
 
 	struct libipw_geo geo;
-	struct ieee80211_supported_band bg_band;
-	struct ieee80211_supported_band a_band;
 
 	/* Probe / Beacon management */
 	struct list_head network_free_list;
@@ -1018,8 +1014,8 @@ static inline int libipw_is_cck_rate(u8 rate)
 }
 
 /* ieee80211.c */
-extern void free_ieee80211(struct net_device *dev, int monitor);
-extern struct net_device *alloc_ieee80211(int sizeof_priv, int monitor);
+extern void free_ieee80211(struct net_device *dev);
+extern struct net_device *alloc_ieee80211(int sizeof_priv);
 extern int libipw_change_mtu(struct net_device *dev, int new_mtu);
 
 extern void libipw_networks_age(struct libipw_device *ieee,
drivers/net/wireless/ipw2x00/libipw_module.c +3 -39

81 lines not on this page · raw message

drivers/net/wireless/p54/p54usb.c +7 -3
index 17e1995..92af9b9 100644
@@ -426,12 +426,16 @@ static const char p54u_romboot_3887[] = "~~~~";
 static int p54u_firmware_reset_3887(struct ieee80211_hw *dev)
 {
 	struct p54u_priv *priv = dev->priv;
-	u8 buf[4];
+	u8 *buf;
 	int ret;
 
-	memcpy(&buf, p54u_romboot_3887, sizeof(buf));
+	buf = kmalloc(4, GFP_KERNEL);
+	if (!buf)
+		return -ENOMEM;
+	memcpy(buf, p54u_romboot_3887, 4);
 	ret = p54u_bulk_msg(priv, P54U_PIPE_DATA,
-			    buf, sizeof(buf));
+			    buf, 4);
+	kfree(buf);
 	if (ret)
 		dev_err(&priv->udev->dev, "(p54usb) unable to jump to "
 			"boot ROM (%d)!\n", ret);
Signature · 6 lines
John W. Linville		Someday the world will need a hero, and you
[email protected]			might be all we have.  Be ready.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#1 lore raw
Quoted 2 lines · John W. Linville

activity in ipw2200, so it the revert should be set. Plus, I've tested the revert locally.

s/so it the revert should be set/so the revert should be safe/

John

Signature · 2 lines
John W. Linville		Someday the world will need a hero, and you
[email protected]			might be all we have.  Be ready.
maintainer
#2 lore raw
In reply to John W. Linville

From: "John W. Linville" <[email protected]>
Date: Mon, 16 Nov 2009 11:26:55 -0500

Quoted 6 lines

The biggest is a revert of the patch that added cfg80211 support to ipw2200. It was ill conceived and inadvertantly caused problems for ipw2100. There are fixes available now, but they are just as big as the revert -- I'll restage them for 2.6.33. There is little activity in ipw2200, so it the revert should be set. Plus, I've tested the revert locally.

...

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git master

Pulled, thanks a lot.