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

Commit 3646dd97 authored by Arend van Spriel's avatar Arend van Spriel Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: use consistent naming for mac80211 callbacks 



Most mac80211 callbacks were named using prefix 'wl_ops' except
for a few. These have been aligned to use the prefix as well.

Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarBrett Rudley <brudley@broadcom.com>
Reviewed-by: default avatarHenry Ptasinski <henryp@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 073f4825

drivers/staging/brcm80211/brcmsmac/wl_mac80211.c

+17 −16
Original line number Diff line number Diff line
@@ -135,11 +135,12 @@ static void wl_ops_sta_notify(struct ieee80211_hw *hw, 
static int wl_ops_conf_tx(struct ieee80211_hw *hw, u16 queue,

			  const struct ieee80211_tx_queue_params *params);

static u64 wl_ops_get_tsf(struct ieee80211_hw *hw);

static int wl_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

static int wl_ops_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

		      struct ieee80211_sta *sta);

static int wl_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

static int wl_ops_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

			 struct ieee80211_sta *sta);

static int wl_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

static int wl_ops_ampdu_action(struct ieee80211_hw *hw,

			       struct ieee80211_vif *vif,

			       enum ieee80211_ampdu_mlme_action action,

			       struct ieee80211_sta *sta, u16 tid, u16 *ssn);

static void wl_ops_rfkill_poll(struct ieee80211_hw *hw);
@@ -514,7 +515,7 @@ static u64 wl_ops_get_tsf(struct ieee80211_hw *hw) 
}



static int

wl_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

wl_ops_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

	       struct ieee80211_sta *sta)

{

	struct scb *scb;
@@ -549,7 +550,7 @@ wl_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
}



static int

wl_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

wl_ops_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

		  struct ieee80211_sta *sta)

{

	WL_NONE("%s: Enter\n", __func__);
@@ -557,7 +558,7 @@ wl_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
}



static int

wl_ampdu_action(struct ieee80211_hw *hw,

wl_ops_ampdu_action(struct ieee80211_hw *hw,

		    struct ieee80211_vif *vif,

		    enum ieee80211_ampdu_mlme_action action,

		    struct ieee80211_sta *sta, u16 tid, u16 *ssn)
@@ -632,9 +633,9 @@ static const struct ieee80211_ops wl_ops = { 
	.sta_notify = wl_ops_sta_notify,

	.conf_tx = wl_ops_conf_tx,

	.get_tsf = wl_ops_get_tsf,

	.sta_add = wl_sta_add,

	.sta_remove = wl_sta_remove,

	.ampdu_action = wl_ampdu_action,

	.sta_add = wl_ops_sta_add,

	.sta_remove = wl_ops_sta_remove,

	.ampdu_action = wl_ops_ampdu_action,

	.rfkill_poll = wl_ops_rfkill_poll,

};