diff options
| author | David S. Miller <davem@davemloft.net> | 2016-06-01 17:53:19 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-01 17:53:19 -0700 |
| commit | 31843af4dc6acb71c4bd287afe7921c81b0b6fcb (patch) | |
| tree | 9d12473f85c19c9a36a9e9454550d2754f231ded /drivers/net | |
| parent | 6b15d6650c5301ce023d8df0cc3a60b1a76d377e (diff) | |
| parent | 6fe04128f158c5ad27e7504bfdf1b12e63331bc9 (diff) | |
Merge tag 'mac80211-for-davem-2016-06-01' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
Three small fixes for the current cycle:
* missing netlink attribute check in hwsim wmediumd (Martin)
* fast xmit structure alignment fix (Felix)
* mesh path flush/synchronisation fix (Bob)
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/mac80211_hwsim.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index 9ed0ed1bf514..4dd5adcdd29b 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c @@ -2776,6 +2776,7 @@ static int hwsim_tx_info_frame_received_nl(struct sk_buff *skb_2, if (!info->attrs[HWSIM_ATTR_ADDR_TRANSMITTER] || !info->attrs[HWSIM_ATTR_FLAGS] || !info->attrs[HWSIM_ATTR_COOKIE] || + !info->attrs[HWSIM_ATTR_SIGNAL] || !info->attrs[HWSIM_ATTR_TX_INFO]) goto out; |