additional net driver fixes

These two wireless fixes are IN ADDITION to the previously submitted fixes. Same linear history. In other words, if you pull "upstream-linus", you will get both the changes below, _and_ the changes I submitted yesterday. If you have already pulled yesterday's fixes, then you will only receive the changesets below.

Please pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git upstream-linus

to receive the following updates:

 fs/compat_ioctl.c                              |    2 +
 net/ieee80211/softmac/ieee80211softmac_assoc.c |    2 -
 net/ieee80211/softmac/ieee80211softmac_wx.c    |   54 +++++++++---------------
 7 files changed, 61 insertions(+), 52 deletions(-)

Jean Tourrilhes (1):
WE : Add missing auth compat-ioctl

Larry Finger (1):
softmac: Fix inability to associate with WEP networks

index 5a5b711..37310b0 100644
@@ -3190,6 +3190,8 @@ COMPATIBLE_IOCTL(SIOCSIWRETRY)
 COMPATIBLE_IOCTL(SIOCGIWRETRY)
 COMPATIBLE_IOCTL(SIOCSIWPOWER)
 COMPATIBLE_IOCTL(SIOCGIWPOWER)
+COMPATIBLE_IOCTL(SIOCSIWAUTH)
+COMPATIBLE_IOCTL(SIOCGIWAUTH)
 /* hiddev */
 COMPATIBLE_IOCTL(HIDIOCGVERSION)
 COMPATIBLE_IOCTL(HIDIOCAPPLICATION)

index afb6c66..e475f2e 100644
@@ -273,8 +273,6 @@ ieee80211softmac_assoc_work(struct work_struct *work)
 			ieee80211softmac_notify(mac->dev, IEEE80211SOFTMAC_EVENT_SCAN_FINISHED, ieee80211softmac_assoc_notify_scan, NULL);
 			if (ieee80211softmac_start_scan(mac)) {
 				dprintk(KERN_INFO PFX "Associate: failed to initiate scan. Is device up?\n");
-				mac->associnfo.associating = 0;
-				mac->associnfo.associated = 0;
 			}
 			goto out;
 		} else {