From 029cc68bff88646a1cb38d7b681d61554f89be51 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Tue, 28 Oct 2008 16:49:41 +0100
Subject: [PATCH] --- yaml --- r: 121755 b: refs/heads/master c:
 2df78167ade3d0542f0f95be7cc58861343cce3a h: refs/heads/master i:   121753:
 de360ef485fba94a113d35b401731cf587df0047   121751:
 79419fe0e379a934313517fad5f40216d8fd46bb v: v3

---
 [refs]                                | 2 +-
 trunk/net/mac80211/rc80211_minstrel.c | 2 +-
 trunk/net/mac80211/tx.c               | 1 -
 trunk/net/wireless/reg.c              | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index cab09bb32611..07b363a9213f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1239cd58d237fa6ad501acaec8776262a5784ec8
+refs/heads/master: 2df78167ade3d0542f0f95be7cc58861343cce3a
diff --git a/trunk/net/mac80211/rc80211_minstrel.c b/trunk/net/mac80211/rc80211_minstrel.c
index c643e373fc50..2b3b490a6073 100644
--- a/trunk/net/mac80211/rc80211_minstrel.c
+++ b/trunk/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/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c
index d6392af9cd20..0d81b2cfd1a6 100644
--- a/trunk/net/mac80211/tx.c
+++ b/trunk/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/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
index 9dff716d1b02..8e5d23975a0d 100644
--- a/trunk/net/wireless/reg.c
+++ b/trunk/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]);