diff options
| author |   Sara Sharon <sara.sharon@intel.com> | 2018-09-05 08:06:11 +0300 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2018-09-05 10:11:50 +0200 |
| commit | 9739fe29a207ffff55361a3047e7780ebddccdb2 (patch) | |
| tree | 171bb83bc4c8f0290d4ac051c1bafbe61de8aec9 /net | |
| parent | mac80211: allow AMSDU size limitation per-TID (diff) | |
| download | linux-dev-9739fe29a207ffff55361a3047e7780ebddccdb2.tar.xz linux-dev-9739fe29a207ffff55361a3047e7780ebddccdb2.zip | |
mac80211: add an option for drivers to check if packets can be aggregated
Some hardwares have limitations on the packets' type in AMSDU.
Add an optional driver callback to determine if two skbs can
be used in the same AMSDU or not.
Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to '')
| -rw-r--r-- | net/mac80211/driver-ops.h | 10 | ||||
| -rw-r--r-- | net/mac80211/tx.c | 3 |
2 files changed, 13 insertions, 0 deletions
diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h index 8f6998091d26..e42c641b6190 100644 --- a/net/mac80211/driver-ops.h +++ b/net/mac80211/driver-ops.h @@ -1173,6 +1173,16 @@ static inline void drv_wake_tx_queue(struct ieee80211_local *local, local->ops->wake_tx_queue(&local->hw, &txq->txq); } +static inline int drv_can_aggregate_in_amsdu(struct ieee80211_local *local, + struct sk_buff *head, + struct sk_buff *skb) +{ + if (!local->ops->can_aggregate_in_amsdu) + return true; + + return local->ops->can_aggregate_in_amsdu(&local->hw, head, skb); +} + static inline int drv_start_nan(struct ieee80211_local *local, struct ieee80211_sub_if_data *sdata, struct cfg80211_nan_conf *conf) diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 42f44c33a133..c42bfa1dcd2c 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -3261,6 +3261,9 @@ static bool ieee80211_amsdu_aggregate(struct ieee80211_sub_if_data *sdata, if (max_frags && nfrags > max_frags) goto out; + if (!drv_can_aggregate_in_amsdu(local, head, skb)) + goto out; + if (!ieee80211_amsdu_prepare_head(sdata, fast_tx, head)) goto out; |