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

Commit 17f6f054 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

p54: convert to new station add/remove callbacks 



This converts p54 to use the new station
add/remove callbacks instead of using the
old sta_notify callback.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3e60f860

drivers/net/wireless/p54/main.c

+19 −9
Original line number Diff line number Diff line
@@ -33,21 +33,29 @@ MODULE_DESCRIPTION("Softmac Prism54 common code"); 
MODULE_LICENSE("GPL");

MODULE_ALIAS("prism54common");



static void p54_sta_notify(struct ieee80211_hw *dev, struct ieee80211_vif *vif,

			      enum sta_notify_cmd notify_cmd,

static int p54_sta_add_remove(struct ieee80211_hw *hw,

			      struct ieee80211_vif *vif,

			      struct ieee80211_sta *sta)

{

	struct p54_common *priv = dev->priv;

	switch (notify_cmd) {

	case STA_NOTIFY_ADD:

	case STA_NOTIFY_REMOVE:

	struct p54_common *priv = hw->priv;



	/*

	 * Notify the firmware that we don't want or we don't

	 * need to buffer frames for this station anymore.

	 */



	p54_sta_unlock(priv, sta->addr);

		break;



	return 0;

}



static void p54_sta_notify(struct ieee80211_hw *dev, struct ieee80211_vif *vif,

			      enum sta_notify_cmd notify_cmd,

			      struct ieee80211_sta *sta)

{

	struct p54_common *priv = dev->priv;



	switch (notify_cmd) {

	case STA_NOTIFY_AWAKE:

		/* update the firmware's filter table */

		p54_sta_unlock(priv, sta->addr);
@@ -506,6 +514,8 @@ static const struct ieee80211_ops p54_ops = { 
	.remove_interface	= p54_remove_interface,

	.set_tim		= p54_set_tim,

	.sta_notify		= p54_sta_notify,

	.sta_add		= p54_sta_add_remove,

	.sta_remove		= p54_sta_add_remove,

	.set_key		= p54_set_key,

	.config			= p54_config,

	.bss_info_changed	= p54_bss_info_changed,