Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d6141c3 authored by Jiri Slaby's avatar Jiri Slaby Committed by John W. Linville
Browse files

mac80211: fix defined but not used 



These two symbols are used only in ifdeffed function. Move them to that
section too.
net/mac80211/sta_info.c:387: warning: `__sta_info_pin' defined but not used
net/mac80211/sta_info.c:397: warning: `__sta_info_unpin' defined but not used

Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Cc: Michael Wu <flamingice@sourmilk.net>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Jiri Benc <jbenc@suse.cz>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e764948b

net/mac80211/sta_info.c

+30 −30
Original line number Diff line number Diff line
@@ -424,36 +424,6 @@ void sta_info_clear_tim_bit(struct sta_info *sta) 
	spin_unlock_irqrestore(&sta->local->sta_lock, flags);

}



/*

 * See comment in __sta_info_unlink,

 * caller must hold local->sta_lock.

 */

static void __sta_info_pin(struct sta_info *sta)

{

	WARN_ON(sta->pin_status != STA_INFO_PIN_STAT_NORMAL);

	sta->pin_status = STA_INFO_PIN_STAT_PINNED;

}



/*

 * See comment in __sta_info_unlink, returns sta if it

 * needs to be destroyed.

 */

static struct sta_info *__sta_info_unpin(struct sta_info *sta)

{

	struct sta_info *ret = NULL;

	unsigned long flags;



	spin_lock_irqsave(&sta->local->sta_lock, flags);

	WARN_ON(sta->pin_status != STA_INFO_PIN_STAT_DESTROY &&

		sta->pin_status != STA_INFO_PIN_STAT_PINNED);

	if (sta->pin_status == STA_INFO_PIN_STAT_DESTROY)

		ret = sta;

	sta->pin_status = STA_INFO_PIN_STAT_NORMAL;

	spin_unlock_irqrestore(&sta->local->sta_lock, flags);



	return ret;

}



void __sta_info_unlink(struct sta_info **sta)

{

	struct ieee80211_local *local = (*sta)->local;
@@ -617,6 +587,36 @@ static void sta_info_cleanup(unsigned long data) 
}



#ifdef CONFIG_MAC80211_DEBUGFS

/*

 * See comment in __sta_info_unlink,

 * caller must hold local->sta_lock.

 */

static void __sta_info_pin(struct sta_info *sta)

{

	WARN_ON(sta->pin_status != STA_INFO_PIN_STAT_NORMAL);

	sta->pin_status = STA_INFO_PIN_STAT_PINNED;

}



/*

 * See comment in __sta_info_unlink, returns sta if it

 * needs to be destroyed.

 */

static struct sta_info *__sta_info_unpin(struct sta_info *sta)

{

	struct sta_info *ret = NULL;

	unsigned long flags;



	spin_lock_irqsave(&sta->local->sta_lock, flags);

	WARN_ON(sta->pin_status != STA_INFO_PIN_STAT_DESTROY &&

		sta->pin_status != STA_INFO_PIN_STAT_PINNED);

	if (sta->pin_status == STA_INFO_PIN_STAT_DESTROY)

		ret = sta;

	sta->pin_status = STA_INFO_PIN_STAT_NORMAL;

	spin_unlock_irqrestore(&sta->local->sta_lock, flags);



	return ret;

}



static void sta_info_debugfs_add_work(struct work_struct *work)

{

	struct ieee80211_local *local =