diff options
| author |   David S. Miller <davem@davemloft.net> | 2018-07-03 10:26:50 +0900 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-07-03 10:29:26 +0900 |
| commit | 5cd3da4ba2397ef07226ca2aa5094ed21ff8198f (patch) | |
| tree | caa3c5968df02c296e9644a98c00e759d011b44c /net/mac80211 | |
| parent | Merge branch 'hns3-a-few-code-improvements' (diff) | |
| parent | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md (diff) | |
| download | linux-dev-5cd3da4ba2397ef07226ca2aa5094ed21ff8198f.tar.xz linux-dev-5cd3da4ba2397ef07226ca2aa5094ed21ff8198f.zip | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Simple overlapping changes in stmmac driver.
Adjust skb_gro_flush_final_remcsum function signature to make GRO list
changes in net-next, as per Stephen Rothwell's example merge
resolution.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/tx.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 5b93bde248fd..6a79d564de35 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -4850,7 +4850,9 @@ int ieee80211_tx_control_port(struct wiphy *wiphy, struct net_device *dev, skb_reset_network_header(skb); skb_reset_mac_header(skb); + local_bh_disable(); __ieee80211_subif_start_xmit(skb, skb->dev, flags); + local_bh_enable(); return 0; } |