aboutsummaryrefslogtreecommitdiff
path: root/net/mac80211/mlme.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-04-25 15:13:37 -0400
committerDavid S. Miller <davem@davemloft.net>2012-04-25 15:13:37 -0400
commit202149265770426f0965557ffa0b500fbbd701dd (patch)
tree3a6fe0c357b6eb6ac5e15a0ec27eaf570ebfd0ce /net/mac80211/mlme.c
parentf891ea1634ce41f5f47ae40d8594809f4cd2ca66 (diff)
parent395836282f7cf8b1dac9b9c2aa2bacddfa1580b5 (diff)
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r--net/mac80211/mlme.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index f76da5b3f5c..20c680bfc3a 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -3497,7 +3497,7 @@ int ieee80211_mgd_disassoc(struct ieee80211_sub_if_data *sdata,
return 0;
}
-void ieee80211_mgd_teardown(struct ieee80211_sub_if_data *sdata)
+void ieee80211_mgd_stop(struct ieee80211_sub_if_data *sdata)
{
struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;