aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/mlme.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2010-06-04 14:25:44 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-06-04 14:25:44 -0400
commit26b36cfefaf2be98b225e3c1a399edb0daf52ddd (patch)
tree6344512c5477ebc5d8b2d5862b6e2dc2ce5b865b /net/mac80211/mlme.c
parent2826bcd844e05dcbef9b9284bddb7fe88e8d314f (diff)
mac80211: make ARP filtering depend on CONFIG_INET
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r--net/mac80211/mlme.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 7e720133358c..3623bb7c4bf4 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -2078,6 +2078,7 @@ static enum work_done_result ieee80211_assoc_done(struct ieee80211_work *wk,
2078 cfg80211_send_assoc_timeout(wk->sdata->dev, 2078 cfg80211_send_assoc_timeout(wk->sdata->dev,
2079 wk->filter_ta); 2079 wk->filter_ta);
2080 return WORK_DONE_DESTROY; 2080 return WORK_DONE_DESTROY;
2081#ifdef CONFIG_INET
2081 } else { 2082 } else {
2082 mutex_unlock(&wk->sdata->u.mgd.mtx); 2083 mutex_unlock(&wk->sdata->u.mgd.mtx);
2083 2084
@@ -2088,6 +2089,7 @@ static enum work_done_result ieee80211_assoc_done(struct ieee80211_work *wk,
2088 rtnl_lock(); 2089 rtnl_lock();
2089 ieee80211_set_arp_filter(wk->sdata); 2090 ieee80211_set_arp_filter(wk->sdata);
2090 rtnl_unlock(); 2091 rtnl_unlock();
2092#endif
2091 } 2093 }
2092 } 2094 }
2093 2095