diff options
| author | Sara Sharon <sarasharon1@gmail.com> | 2015-12-30 16:06:04 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2016-01-14 11:13:17 +0100 |
| commit | 50ea05efaf3bed7dd34bcc2635a8b3f53bd0ccc1 (patch) | |
| tree | db757aea54659c74f10376ade43d41b3f626a4ca /drivers/net/wireless/rsi/rsi_91x_mac80211.c | |
| parent | a85a7e28f45f7217b9a2efc3ba323de5c0e5b056 (diff) | |
| download | op-kernel-dev-50ea05efaf3bed7dd34bcc2635a8b3f53bd0ccc1.zip op-kernel-dev-50ea05efaf3bed7dd34bcc2635a8b3f53bd0ccc1.tar.gz | |
mac80211: pass block ack session timeout to to driver
Currently mac80211 does not inform the driver of the session
block ack timeout when starting a rx aggregation session.
Drivers that manage the reorder buffer need to know this
parameter.
Seeing that there are now too many arguments for the
drv_ampdu_action() function, wrap them inside a structure.
Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/rsi/rsi_91x_mac80211.c')
| -rw-r--r-- | drivers/net/wireless/rsi/rsi_91x_mac80211.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/drivers/net/wireless/rsi/rsi_91x_mac80211.c b/drivers/net/wireless/rsi/rsi_91x_mac80211.c index b5bcc93..4df992d 100644 --- a/drivers/net/wireless/rsi/rsi_91x_mac80211.c +++ b/drivers/net/wireless/rsi/rsi_91x_mac80211.c @@ -659,29 +659,24 @@ static int rsi_mac80211_set_key(struct ieee80211_hw *hw, * informs the f/w regarding this. * @hw: Pointer to the ieee80211_hw structure. * @vif: Pointer to the ieee80211_vif structure. - * @action: ieee80211_ampdu_mlme_action enum. - * @sta: Pointer to the ieee80211_sta structure. - * @tid: Traffic identifier. - * @ssn: Pointer to ssn value. - * @buf_size: Buffer size (for kernel version > 2.6.38). - * @amsdu: is AMSDU in AMPDU allowed + * @params: Pointer to A-MPDU action parameters * * Return: status: 0 on success, negative error code on failure. */ static int rsi_mac80211_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif, - enum ieee80211_ampdu_mlme_action action, - struct ieee80211_sta *sta, - unsigned short tid, - unsigned short *ssn, - unsigned char buf_size, - bool amsdu) + struct ieee80211_ampdu_params *params) { int status = -EOPNOTSUPP; struct rsi_hw *adapter = hw->priv; struct rsi_common *common = adapter->priv; u16 seq_no = 0; u8 ii = 0; + struct ieee80211_sta *sta = params->sta; + enum ieee80211_ampdu_mlme_action action = params->action; + u16 tid = params->tid; + u16 *ssn = ¶ms->ssn; + u8 buf_size = params->buf_size; for (ii = 0; ii < RSI_MAX_VIFS; ii++) { if (vif == adapter->vifs[ii]) |
