net: Fix files explicitly needing to include module.h

[deliverable/linux.git] / net / mac80211 / rate.c

diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
index f61244c0e0a267422109227e3aab63e4be1eba63..5a5a7767d541c2a952aecbeefca79125dfe17052 100644 (file)
--- a/net/mac80211/rate.c
+++ b/net/mac80211/rate.c
@@ -11,6 +11,7 @@
 #include <linux/kernel.h>
 #include <linux/rtnetlink.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include "rate.h"
 #include "ieee80211_i.h"
 #include "debugfs.h"
@@ -199,7 +200,7 @@ static void rate_control_release(struct kref *kref)
        kfree(ctrl_ref);
 }
 
-static bool rc_no_data_or_no_ack(struct ieee80211_tx_rate_control *txrc)
+static bool rc_no_data_or_no_ack_use_min(struct ieee80211_tx_rate_control *txrc)
 {
        struct sk_buff *skb = txrc->skb;
        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
@@ -208,7 +209,9 @@ static bool rc_no_data_or_no_ack(struct ieee80211_tx_rate_control *txrc)
 
        fc = hdr->frame_control;
 
-       return (info->flags & IEEE80211_TX_CTL_NO_ACK) || !ieee80211_is_data(fc);
+       return (info->flags & (IEEE80211_TX_CTL_NO_ACK |
+                              IEEE80211_TX_CTL_USE_MINRATE)) ||
+               !ieee80211_is_data(fc);
 }
 
 static void rc_send_low_broadcast(s8 *idx, u32 basic_rates,
@@ -262,7 +265,7 @@ bool rate_control_send_low(struct ieee80211_sta *sta,
        struct ieee80211_supported_band *sband = txrc->sband;
        int mcast_rate;
 
-       if (!sta || !priv_sta || rc_no_data_or_no_ack(txrc)) {
+       if (!sta || !priv_sta || rc_no_data_or_no_ack_use_min(txrc)) {
                if ((sband->band != IEEE80211_BAND_2GHZ) ||
                    !(info->flags & IEEE80211_TX_CTL_NO_CCK_RATE))
                        info->control.rates[0].idx =