aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-12-26 16:38:31 -0500
committerJeff Garzik <jeff@garzik.org>2006-12-26 16:38:31 -0500
commit3a960f7e350de5d087b88a4c06df236e0f4186fd (patch)
tree14e5a1b941d6e4cf7b2c9c1ed46262f427a825a9 /net
parentaed2cec45c426c941c80d84ec89ce34f2f2607cc (diff)
parent0c234ae655a45ac3ee53a25b2e56e9bb6c27d71d (diff)
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
Diffstat (limited to 'net')
-rw-r--r--net/ieee80211/softmac/ieee80211softmac_assoc.c4
-rw-r--r--net/ieee80211/softmac/ieee80211softmac_wx.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/net/ieee80211/softmac/ieee80211softmac_assoc.c b/net/ieee80211/softmac/ieee80211softmac_assoc.c
index e3f37fdda65f..a824852909e4 100644
--- a/net/ieee80211/softmac/ieee80211softmac_assoc.c
+++ b/net/ieee80211/softmac/ieee80211softmac_assoc.c
@@ -167,7 +167,7 @@ static void
167ieee80211softmac_assoc_notify_scan(struct net_device *dev, int event_type, void *context) 167ieee80211softmac_assoc_notify_scan(struct net_device *dev, int event_type, void *context)
168{ 168{
169 struct ieee80211softmac_device *mac = ieee80211_priv(dev); 169 struct ieee80211softmac_device *mac = ieee80211_priv(dev);
170 ieee80211softmac_assoc_work((void*)mac); 170 ieee80211softmac_assoc_work(&mac->associnfo.work.work);
171} 171}
172 172
173static void 173static void
@@ -177,7 +177,7 @@ ieee80211softmac_assoc_notify_auth(struct net_device *dev, int event_type, void
177 177
178 switch (event_type) { 178 switch (event_type) {
179 case IEEE80211SOFTMAC_EVENT_AUTHENTICATED: 179 case IEEE80211SOFTMAC_EVENT_AUTHENTICATED:
180 ieee80211softmac_assoc_work((void*)mac); 180 ieee80211softmac_assoc_work(&mac->associnfo.work.work);
181 break; 181 break;
182 case IEEE80211SOFTMAC_EVENT_AUTH_FAILED: 182 case IEEE80211SOFTMAC_EVENT_AUTH_FAILED:
183 case IEEE80211SOFTMAC_EVENT_AUTH_TIMEOUT: 183 case IEEE80211SOFTMAC_EVENT_AUTH_TIMEOUT:
diff --git a/net/ieee80211/softmac/ieee80211softmac_wx.c b/net/ieee80211/softmac/ieee80211softmac_wx.c
index 480d72c7a42c..fa2f7da606a9 100644
--- a/net/ieee80211/softmac/ieee80211softmac_wx.c
+++ b/net/ieee80211/softmac/ieee80211softmac_wx.c
@@ -463,7 +463,7 @@ ieee80211softmac_wx_get_genie(struct net_device *dev,
463 err = -E2BIG; 463 err = -E2BIG;
464 } 464 }
465 spin_unlock_irqrestore(&mac->lock, flags); 465 spin_unlock_irqrestore(&mac->lock, flags);
466 mutex_lock(&mac->associnfo.mutex); 466 mutex_unlock(&mac->associnfo.mutex);
467 467
468 return err; 468 return err;
469} 469}