[MAC80211]: remove IEEE80211_HW_DATA_NULLFUNC_ACK

[linux-2.6] / include / net / mac80211.h

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index e503cd37f82e1f3756b0ae2768097f39e11fdabc..427ff6d36265dc778015f4231666e759ea9030b2 100644 (file)
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -463,14 +463,13 @@ struct ieee80211_hw {
 
        /* TODO: frame_type 802.11/802.3, sw_encryption requirements */
 
-       /* Some wireless LAN chipsets generate beacons in the hardware/firmware
-        * and others rely on host generated beacons. This option is used to
-        * configure the upper layer IEEE 802.11 module to generate beacons.
-        * The low-level driver can use ieee80211_beacon_get() to fetch the
-        * next beacon frame. */
-#define IEEE80211_HW_HOST_GEN_BEACON (1<<0)
-
-       /* The device needs to be supplied with a beacon template only. */
+/* hole at 0 */
+
+       /*
+        * The device only needs to be supplied with a beacon template.
+        * If you need the host to generate each beacon then don't use
+        * this flag and use ieee80211_beacon_get().
+        */
 #define IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE (1<<1)
 
        /* Some devices handle decryption internally and do not
@@ -492,8 +491,7 @@ struct ieee80211_hw {
 
 #define IEEE80211_HW_WEP_INCLUDE_IV (1<<5)
 
-       /* will data nullfunc frames get proper TX status callback */
-#define IEEE80211_HW_DATA_NULLFUNC_ACK (1<<6)
+/* hole at 6 */
 
        /* Force software encryption for TKIP packets if WMM is enabled. */
 #define IEEE80211_HW_NO_TKIP_WMM_HWACCEL (1<<7)
@@ -568,9 +566,6 @@ struct ieee80211_ops {
        int (*tx)(struct ieee80211_hw *hw, struct sk_buff *skb,
                  struct ieee80211_tx_control *control);
 
-       /* Handler for performing hardware reset. */
-       int (*reset)(struct ieee80211_hw *hw);
-
        /* Handler that is called when any netdevice attached to the hardware
         * device is set UP for the first time. This can be used, e.g., to
         * enable interrupts and beacon sending. */