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

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
...@@ -135,13 +135,14 @@ static void wl_ops_sta_notify(struct ieee80211_hw *hw, ...@@ -135,13 +135,14 @@ static void wl_ops_sta_notify(struct ieee80211_hw *hw,
static int wl_ops_conf_tx(struct ieee80211_hw *hw, u16 queue, static int wl_ops_conf_tx(struct ieee80211_hw *hw, u16 queue,
const struct ieee80211_tx_queue_params *params); const struct ieee80211_tx_queue_params *params);
static u64 wl_ops_get_tsf(struct ieee80211_hw *hw); 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); 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); 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,
enum ieee80211_ampdu_mlme_action action, struct ieee80211_vif *vif,
struct ieee80211_sta *sta, u16 tid, u16 *ssn); enum ieee80211_ampdu_mlme_action action,
struct ieee80211_sta *sta, u16 tid, u16 *ssn);
static void wl_ops_rfkill_poll(struct ieee80211_hw *hw); static void wl_ops_rfkill_poll(struct ieee80211_hw *hw);
static int wl_ops_tx(struct ieee80211_hw *hw, struct sk_buff *skb) static int wl_ops_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
...@@ -514,8 +515,8 @@ static u64 wl_ops_get_tsf(struct ieee80211_hw *hw) ...@@ -514,8 +515,8 @@ static u64 wl_ops_get_tsf(struct ieee80211_hw *hw)
} }
static int 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 ieee80211_sta *sta)
{ {
struct scb *scb; struct scb *scb;
...@@ -549,18 +550,18 @@ wl_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif, ...@@ -549,18 +550,18 @@ wl_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
} }
static int 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) struct ieee80211_sta *sta)
{ {
WL_NONE("%s: Enter\n", __func__); WL_NONE("%s: Enter\n", __func__);
return 0; return 0;
} }
static int static int
wl_ampdu_action(struct ieee80211_hw *hw, wl_ops_ampdu_action(struct ieee80211_hw *hw,
struct ieee80211_vif *vif, struct ieee80211_vif *vif,
enum ieee80211_ampdu_mlme_action action, enum ieee80211_ampdu_mlme_action action,
struct ieee80211_sta *sta, u16 tid, u16 *ssn) struct ieee80211_sta *sta, u16 tid, u16 *ssn)
{ {
#if defined(BCMDBG) #if defined(BCMDBG)
struct scb *scb = (struct scb *)sta->drv_priv; struct scb *scb = (struct scb *)sta->drv_priv;
...@@ -632,9 +633,9 @@ static const struct ieee80211_ops wl_ops = { ...@@ -632,9 +633,9 @@ static const struct ieee80211_ops wl_ops = {
.sta_notify = wl_ops_sta_notify, .sta_notify = wl_ops_sta_notify,
.conf_tx = wl_ops_conf_tx, .conf_tx = wl_ops_conf_tx,
.get_tsf = wl_ops_get_tsf, .get_tsf = wl_ops_get_tsf,
.sta_add = wl_sta_add, .sta_add = wl_ops_sta_add,
.sta_remove = wl_sta_remove, .sta_remove = wl_ops_sta_remove,
.ampdu_action = wl_ampdu_action, .ampdu_action = wl_ops_ampdu_action,
.rfkill_poll = wl_ops_rfkill_poll, .rfkill_poll = wl_ops_rfkill_poll,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment