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

Commit c0365f04 authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: Add buf_size parameter to ampdu_action handler function 



struct ieee80211_ops.ampdu_action function pointer definition now includes a
u8 buf_size parameter.

Update wl_ops_ampdu_action handler function according to this new signature.

Signed-off-by: default avatarJavier Martinez Canillas <martinez.javier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f4728c38

drivers/staging/brcm80211/brcmsmac/wl_mac80211.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -149,7 +149,8 @@ static int wl_ops_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
static int wl_ops_ampdu_action(struct ieee80211_hw *hw,

static int 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,

			       u8 buf_size);

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)
@@ -617,7 +618,8 @@ static int 
wl_ops_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,

		    u8 buf_size)

{

{

#if defined(BCMDBG)

#if defined(BCMDBG)

	struct scb *scb = (struct scb *)sta->drv_priv;

	struct scb *scb = (struct scb *)sta->drv_priv;