From 3d7d9e73e1035ca0a3d92bd79e06ac5df1a2afe2 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Wed, 1 Aug 2012 16:49:34 +0200 Subject: [PATCH] --- yaml --- r: 327659 b: refs/heads/master c: cc74c0c7d6d623d0d3f13ef64895937edb7b3177 h: refs/heads/master i: 327657: 4d7c9442c6761888f18e42a488662d49369f86d3 327655: 1227b7dcdae0ffc0ab5bd52735181cc18a07dce4 v: v3 --- [refs] | 2 +- trunk/net/mac80211/ieee80211_i.h | 1 - trunk/net/mac80211/mlme.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f1a8155d9f51..e3b67917a31d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5bc1420b11903e9f8c470d3b33061b8de0c5c005 +refs/heads/master: cc74c0c7d6d623d0d3f13ef64895937edb7b3177 diff --git a/trunk/net/mac80211/ieee80211_i.h b/trunk/net/mac80211/ieee80211_i.h index 793f03e15191..2a80698b6324 100644 --- a/trunk/net/mac80211/ieee80211_i.h +++ b/trunk/net/mac80211/ieee80211_i.h @@ -1430,7 +1430,6 @@ void ieee80211_sta_rx_notify(struct ieee80211_sub_if_data *sdata, struct ieee80211_hdr *hdr); void ieee80211_sta_tx_notify(struct ieee80211_sub_if_data *sdata, struct ieee80211_hdr *hdr, bool ack); -void ieee80211_beacon_connection_loss_work(struct work_struct *work); void ieee80211_wake_queues_by_reason(struct ieee80211_hw *hw, enum queue_stop_reason reason); diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c index b9cb8dbe34d9..ddb2db5c5b05 100644 --- a/trunk/net/mac80211/mlme.c +++ b/trunk/net/mac80211/mlme.c @@ -1720,7 +1720,7 @@ static void __ieee80211_connection_loss(struct ieee80211_sub_if_data *sdata) mutex_unlock(&local->mtx); } -void ieee80211_beacon_connection_loss_work(struct work_struct *work) +static void ieee80211_beacon_connection_loss_work(struct work_struct *work) { struct ieee80211_sub_if_data *sdata = container_of(work, struct ieee80211_sub_if_data,