diff options
author | David S. Miller <davem@davemloft.net> | 2019-02-22 21:51:21 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-02-22 21:51:21 +0100 |
commit | ab01f251c9da8dc5ae70041ae6a2a50e8b94c079 (patch) | |
tree | 4b77c3cfcb5c7971aec1afde764cb70d73bd377e /drivers/net | |
parent | Documentation: networking: switchdev: Update port parent ID section (diff) | |
parent | mac80211: allocate tailroom for forwarded mesh packets (diff) | |
download | linux-ab01f251c9da8dc5ae70041ae6a2a50e8b94c079.tar.xz linux-ab01f251c9da8dc5ae70041ae6a2a50e8b94c079.zip |
Merge tag 'mac80211-for-davem-2019-02-22' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
Three more fixes:
* mac80211 mesh code wasn't allocating SKB tailroom properly
in some cases
* tx_sk_pacing_shift should be 7 for better performance
* mac80211_hwsim wasn't propagating genlmsg_reply() errors
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/mac80211_hwsim.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index 320edcac4699..6359053bd0c7 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c @@ -3554,7 +3554,7 @@ static int hwsim_get_radio_nl(struct sk_buff *msg, struct genl_info *info) goto out_err; } - genlmsg_reply(skb, info); + res = genlmsg_reply(skb, info); break; } |