From: Jeff Garzik <jgarzik@pobox.com>
Date: Wed, 24 Aug 2005 05:02:04 +0000 (-0400)
Subject: Merge upstream into ieee80211.
X-Git-Tag: v2.6.14-rc1~1017^2~8^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b2382b363df828f25e35ed8b70a3da33b29b2a64;p=linux-2.6-omap-h63xx.git

Merge upstream into ieee80211.

Hand-fix merge conflict in drivers/usb/net/zd1201.c.
---

b2382b363df828f25e35ed8b70a3da33b29b2a64
diff --cc drivers/usb/net/zd1201.c
index 2a1d489e92c,e32a80b3918..fc013978837
--- a/drivers/usb/net/zd1201.c
+++ b/drivers/usb/net/zd1201.c
@@@ -345,12 -345,11 +345,11 @@@ static void zd1201_usbrx(struct urb *ur
  
  			if (datalen<14)
  				goto resubmit;
 -			if ((seq & IEEE802_11_SCTL_FRAG) == 0) {
 +			if ((seq & IEEE80211_SCTL_FRAG) == 0) {
- 				frag = kmalloc(sizeof(struct zd1201_frag*),
- 				    GFP_ATOMIC);
+ 				frag = kmalloc(sizeof(*frag), GFP_ATOMIC);
  				if (!frag)
  					goto resubmit;
 -				skb = dev_alloc_skb(IEEE802_11_DATA_LEN +14+2);
 +				skb = dev_alloc_skb(IEEE80211_DATA_LEN +14+2);
  				if (!skb) {
  					kfree(frag);
  					goto resubmit;