Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[sfrench/cifs-2.6.git] / drivers / net / wireless / mac80211_hwsim.c

diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index 02d374360bcc563620e1a682efbe686e7e7cd8a0..8d54f9face2f4b6b24d8baaf5227e4bf4b5a9829 100644 (file)
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -1276,7 +1276,7 @@ static void mac80211_hwsim_tx_frame_nl(struct ieee80211_hw *hw,
                hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_PM);
        /* If the queue contains MAX_QUEUE skb's drop some */
        if (skb_queue_len(&data->pending) >= MAX_QUEUE) {
-               /* Droping until WARN_QUEUE level */
+               /* Dropping until WARN_QUEUE level */
                while (skb_queue_len(&data->pending) >= WARN_QUEUE) {
                        ieee80211_free_txskb(hw, skb_dequeue(&data->pending));
                        data->tx_dropped++;