From: Jeff Garzik <jeff@garzik.org>
Date: Thu, 7 Dec 2006 10:02:40 +0000 (-0500)
Subject: Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville... 
X-Git-Tag: v2.6.20-rc1~145^2^2~6^2~3
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=359f2d17e32b32f53577375f83fb06d34e31bfe8;p=linux-2.6

Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream

Conflicts:

	drivers/net/wireless/zd1211rw/zd_mac.h
	net/ieee80211/softmac/ieee80211softmac_assoc.c
---

359f2d17e32b32f53577375f83fb06d34e31bfe8
diff --cc drivers/net/wireless/hostap/hostap_cs.c
index ee542ec6d6,ef470e6e1c..8d8f4b9b8b
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@@ -568,8 -571,8 +568,7 @@@ static int prism2_config(struct pcmcia_
  		ret = -ENOMEM;
  		goto failed;
  	}
- 	memset(hw_priv, 0, sizeof(*hw_priv));
  
 -	tuple.DesiredTuple = CISTPL_CONFIG;
  	tuple.Attributes = 0;
  	tuple.TupleData = buf;
  	tuple.TupleDataMax = sizeof(buf);
diff --cc drivers/net/wireless/zd1211rw/zd_mac.h
index d4e8b87040,77f1268080..f0cf05dc7d
--- a/drivers/net/wireless/zd1211rw/zd_mac.h
+++ b/drivers/net/wireless/zd1211rw/zd_mac.h
@@@ -133,8 -133,10 +133,10 @@@ struct zd_mac 
  	struct iw_statistics iw_stats;
  
  	struct housekeeping housekeeping;
+ 	struct work_struct set_multicast_hash_work;
+ 	struct zd_mc_hash multicast_hash;
 -	struct work_struct set_rts_cts_work;
 -	struct work_struct set_basic_rates_work;
 +	struct delayed_work set_rts_cts_work;
 +	struct delayed_work set_basic_rates_work;
  
  	unsigned int stats_count;
  	u8 qual_buffer[ZD_MAC_STATS_BUFFER_SIZE];