Merge branch 'master' into for-next

[cascardo/linux.git] / include / net / mac80211.h

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index f4ab2fb..703b1f1 100644 (file)
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -1895,7 +1895,7 @@ void ieee80211_free_txskb(struct ieee80211_hw *hw, struct sk_buff *skb);
  *
  * Driver informs U-APSD client support by enabling
  * %IEEE80211_HW_SUPPORTS_UAPSD flag. The mode is configured through the
- * uapsd paramater in conf_tx() operation. Hardware needs to send the QoS
+ * uapsd parameter in conf_tx() operation. Hardware needs to send the QoS
  * Nullfunc frames and stay awake until the service period has ended. To
  * utilize U-APSD, dynamic powersave is disabled for voip AC and all frames
  * from that AC are transmitted with powersave enabled.
@@ -2101,7 +2101,7 @@ void ieee80211_free_txskb(struct ieee80211_hw *hw, struct sk_buff *skb);
  * with the number of frames to be released and which TIDs they are
  * to come from. In this case, the driver is responsible for setting
  * the EOSP (for uAPSD) and MORE_DATA bits in the released frames,
- * to help the @more_data paramter is passed to tell the driver if
+ * to help the @more_data parameter is passed to tell the driver if
  * there is more data on other TIDs -- the TIDs to release frames
  * from are ignored since mac80211 doesn't know how many frames the
  * buffers for those TIDs contain.
@@ -2662,7 +2662,7 @@ enum ieee80211_roc_type {
  *     parameters. In the case where the driver buffers some frames for
  *     sleeping stations mac80211 will use this callback to tell the driver
  *     to release some frames, either for PS-poll or uAPSD.
- *     Note that if the @more_data paramter is %false the driver must check
+ *     Note that if the @more_data parameter is %false the driver must check
  *     if there are more frames on the given TIDs, and if there are more than
  *     the frames being released then it must still set the more-data bit in
  *     the frame. If the @more_data parameter is %true, then of course the