diff options
| author | Johannes Berg | 2018-05-23 11:05:26 +0200 |
|---|---|---|
| committer | Johannes Berg | 2018-05-23 11:05:59 +0200 |
| commit | dd8070bff204a67fcb6585f18047841a895b68d7 (patch) | |
| tree | cce17d4b8eb8987194beb40498c8f83e74d6799f /include/net/mac80211.h | |
| parent | cfg80211: add missing kernel-doc (diff) | |
| parent | Merge branch 'qed-firmware-TLV' (diff) | |
| download | kernel-qcow2-linux-dd8070bff204a67fcb6585f18047841a895b68d7.tar.gz kernel-qcow2-linux-dd8070bff204a67fcb6585f18047841a895b68d7.tar.xz kernel-qcow2-linux-dd8070bff204a67fcb6585f18047841a895b68d7.zip | |
Merge remote-tracking branch 'net-next/master' into mac80211-next
Bring in net-next which had pulled in net, so I have the changes
from mac80211 and can apply a patch that would otherwise conflict.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include/net/mac80211.h')
| -rw-r--r-- | include/net/mac80211.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 52f36c43f35f..604d738a2128 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -2080,7 +2080,7 @@ struct ieee80211_txq { * virtual interface might not be given air time for the transmission of * the frame, as it is not synced with the AP/P2P GO yet, and thus the * deauthentication frame might not be transmitted. - > + * * @IEEE80211_HW_DOESNT_SUPPORT_QOS_NDP: The driver (or firmware) doesn't * support QoS NDP for AP probing - that's most likely a driver bug. * |