mac80211: fix lock leak w/ ARP filtering and w/o CONFIG_INET

[net-next-2.6.git] / net / mac80211 / mlme.c

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 3623bb7c4bf45d2e5b9021568c874f5999b56bbe..9420cf14fae4c042156fd7a786c99ea5474e49f0 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -2078,10 +2078,9 @@ static enum work_done_result ieee80211_assoc_done(struct ieee80211_work *wk,
                        cfg80211_send_assoc_timeout(wk->sdata->dev,
                                                    wk->filter_ta);
                        return WORK_DONE_DESTROY;
-#ifdef CONFIG_INET
                } else {
                        mutex_unlock(&wk->sdata->u.mgd.mtx);
-
+#ifdef CONFIG_INET
                        /*
                         * configure ARP filter IP addresses to the driver,
                         * intentionally outside the mgd mutex.