wireless: fix a few sparse warnings

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/net/mac80211/rc80211_minstrel.c b/net/mac80211/rc80211_minstrel.c
index c643e373fc50fde1d82b7acec7a330762e7ab7c4..2b3b490a6073467755e3b83998d1480398864148 100644 (file)
--- a/net/mac80211/rc80211_minstrel.c
+++ b/net/mac80211/rc80211_minstrel.c
@@ -225,7 +225,7 @@ minstrel_get_next_sample(struct minstrel_sta_info *mi)
        return sample_ndx;
 }
 
-void
+static void
 minstrel_get_rate(void *priv, struct ieee80211_sta *sta,
                  void *priv_sta, struct ieee80211_tx_rate_control *txrc)
 {

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index d6392af9cd20f3f94cce26372c67a226acfeec54..0d81b2cfd1a6d7cbcca80a1d1b3a31dbbdc0ba26 100644 (file)
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -698,7 +698,6 @@ ieee80211_tx_h_fragment(struct ieee80211_tx_data *tx)
        left = payload_len - per_fragm;
        for (i = 0; i < num_fragm - 1; i++) {
                struct ieee80211_hdr *fhdr;
-               struct ieee80211_tx_info *info;
                size_t copylen;
 
                if (left <= 0)

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 9dff716d1b0203c175d6f8368ccf612b941ed21d..8e5d23975a0d9a8c5c9389428a9014a70a52bf8b 100644 (file)
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -638,7 +638,7 @@ static void print_regdomain(const struct ieee80211_regdomain *rd)
        print_rd_rules(rd);
 }
 
-void print_regdomain_info(const struct ieee80211_regdomain *rd)
+static void print_regdomain_info(const struct ieee80211_regdomain *rd)
 {
        printk(KERN_INFO "cfg80211: Regulatory domain: %c%c\n",
                rd->alpha2[0], rd->alpha2[1]);