diff options
-rw-r--r-- | net/mac80211/rc80211_minstrel.c | 2 | ||||
-rw-r--r-- | net/mac80211/tx.c | 1 | ||||
-rw-r--r-- | net/wireless/reg.c | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/net/mac80211/rc80211_minstrel.c b/net/mac80211/rc80211_minstrel.c index c643e373fc50..2b3b490a6073 100644 --- 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) | |||
225 | return sample_ndx; | 225 | return sample_ndx; |
226 | } | 226 | } |
227 | 227 | ||
228 | void | 228 | static void |
229 | minstrel_get_rate(void *priv, struct ieee80211_sta *sta, | 229 | minstrel_get_rate(void *priv, struct ieee80211_sta *sta, |
230 | void *priv_sta, struct ieee80211_tx_rate_control *txrc) | 230 | void *priv_sta, struct ieee80211_tx_rate_control *txrc) |
231 | { | 231 | { |
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index d6392af9cd20..0d81b2cfd1a6 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c | |||
@@ -698,7 +698,6 @@ ieee80211_tx_h_fragment(struct ieee80211_tx_data *tx) | |||
698 | left = payload_len - per_fragm; | 698 | left = payload_len - per_fragm; |
699 | for (i = 0; i < num_fragm - 1; i++) { | 699 | for (i = 0; i < num_fragm - 1; i++) { |
700 | struct ieee80211_hdr *fhdr; | 700 | struct ieee80211_hdr *fhdr; |
701 | struct ieee80211_tx_info *info; | ||
702 | size_t copylen; | 701 | size_t copylen; |
703 | 702 | ||
704 | if (left <= 0) | 703 | if (left <= 0) |
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 9dff716d1b02..8e5d23975a0d 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c | |||
@@ -638,7 +638,7 @@ static void print_regdomain(const struct ieee80211_regdomain *rd) | |||
638 | print_rd_rules(rd); | 638 | print_rd_rules(rd); |
639 | } | 639 | } |
640 | 640 | ||
641 | void print_regdomain_info(const struct ieee80211_regdomain *rd) | 641 | static void print_regdomain_info(const struct ieee80211_regdomain *rd) |
642 | { | 642 | { |
643 | printk(KERN_INFO "cfg80211: Regulatory domain: %c%c\n", | 643 | printk(KERN_INFO "cfg80211: Regulatory domain: %c%c\n", |
644 | rd->alpha2[0], rd->alpha2[1]); | 644 | rd->alpha2[0], rd->alpha2[1]); |