diff options
| author | David S. Miller <davem@davemloft.net> | 2015-03-01 04:33:53 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-01 04:33:53 (GMT) |
| commit | 32034e0580a9cd8cebd303ced20f54c06cb24f4d (patch) | |
| tree | ec0076ab74f5b46413851897a4ded6d1f51a7ba5 /drivers/net | |
| parent | 06615bed60c1fb7c37adddb75bdc80da873b5edb (diff) | |
| parent | 9c1c98a3bb7b7593b60264b9a07e001e68b46697 (diff) | |
| download | linux-32034e0580a9cd8cebd303ced20f54c06cb24f4d.tar.xz | |
Merge tag 'mac80211-for-davem-2015-02-27' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
A few patches have accumulated, among them the fix for Linus's
four-way-handshake problem. The others are various small fixes
for problems all over, nothing really stands out.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/mac80211_hwsim.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index 4a4c658..8908be6 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c @@ -946,7 +946,8 @@ static void mac80211_hwsim_tx_frame_nl(struct ieee80211_hw *hw, goto nla_put_failure; genlmsg_end(skb, msg_head); - genlmsg_unicast(&init_net, skb, dst_portid); + if (genlmsg_unicast(&init_net, skb, dst_portid)) + goto err_free_txskb; /* Enqueue the packet */ skb_queue_tail(&data->pending, my_skb); @@ -955,6 +956,8 @@ static void mac80211_hwsim_tx_frame_nl(struct ieee80211_hw *hw, return; nla_put_failure: + nlmsg_free(skb); +err_free_txskb: printk(KERN_DEBUG "mac80211_hwsim: error occurred in %s\n", __func__); ieee80211_free_txskb(hw, my_skb); data->tx_failed++; |