diff options
author | David S. Miller <davem@davemloft.net> | 2018-03-06 06:53:44 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-03-06 07:20:46 +0100 |
commit | 0f3e9c97eb5a97972b0c0076a5cc01bb142f8e70 (patch) | |
tree | 439c89ea3c87496c23e167148f2cdbefb6e82b30 /net/mac80211 | |
parent | Merge branch 'mvpp2-jumbo-frames-support' (diff) | |
parent | Merge tag 'please-pull-ia64_misc' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
download | linux-0f3e9c97eb5a97972b0c0076a5cc01bb142f8e70.tar.xz linux-0f3e9c97eb5a97972b0c0076a5cc01bb142f8e70.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
All of the conflicts were cases of overlapping changes.
In net/core/devlink.c, we have to make care that the
resouce size_params have become a struct member rather
than a pointer to such an object.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211')
-rw-r--r-- | net/mac80211/rx.c | 2 | ||||
-rw-r--r-- | net/mac80211/tx.c | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index de7d10732fd5..d01743234cf6 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -3965,7 +3965,7 @@ static bool ieee80211_invoke_fast_rx(struct ieee80211_rx_data *rx, if ((hdr->frame_control & cpu_to_le16(IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS)) != fast_rx->expected_ds_bits) - goto drop; + return false; /* assign the key to drop unencrypted frames (later) * and strip the IV/MIC if necessary diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 7643178ef132..933c67b5f845 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -3569,6 +3569,14 @@ void __ieee80211_subif_start_xmit(struct sk_buff *skb, if (!IS_ERR_OR_NULL(sta)) { struct ieee80211_fast_tx *fast_tx; + /* We need a bit of data queued to build aggregates properly, so + * instruct the TCP stack to allow more than a single ms of data + * to be queued in the stack. The value is a bit-shift of 1 + * second, so 8 is ~4ms of queued data. Only affects local TCP + * sockets. + */ + sk_pacing_shift_update(skb->sk, 8); + fast_tx = rcu_dereference(sta->fast_tx); if (fast_tx && |