From: Ulrich Kunitz <kune@xxxxxxxxxxxxxx>
The zd1211rw driver used to build it's own radiotap header and the
struct zd_rt_hdr has been used for it. The new mac80211 stack
handles the construction of the radiotap header itself, so the
structure is not required anymore.
Also removed a sparse warning by marking zd_channel_range static.
Signed-off-by: Ulrich Kunitz <kune@xxxxxxxxxxxxxx>
Signed-off-by: Daniel Drake <dsd@xxxxxxxxxx>
---
.../net/wireless/zd1211rw-mac80211/zd_ieee80211.c | 2 +-
drivers/net/wireless/zd1211rw-mac80211/zd_mac.c | 8 --------
2 files changed, 1 insertions(+), 9 deletions(-)
diff --git a/drivers/net/wireless/zd1211rw-mac80211/zd_ieee80211.c b/drivers/net/wireless/zd1211rw-mac80211/zd_ieee80211.c
index 507a435..77cfe5e 100644
--- a/drivers/net/wireless/zd1211rw-mac80211/zd_ieee80211.c
+++ b/drivers/net/wireless/zd1211rw-mac80211/zd_ieee80211.c
@@ -47,7 +47,7 @@ static const struct channel_range channel_ranges[] = {
{ ZD_REGDOMAIN_JAPAN_ADD, 1, 15 },
};
-const struct channel_range *zd_channel_range(u8 regdomain)
+static const struct channel_range *zd_channel_range(u8 regdomain)
{
int i;
for (i = 0; i < ARRAY_SIZE(channel_ranges); i++) {
diff --git a/drivers/net/wireless/zd1211rw-mac80211/zd_mac.c b/drivers/net/wireless/zd1211rw-mac80211/zd_mac.c
index 2a1be76..e8ad6ae 100644
--- a/drivers/net/wireless/zd1211rw-mac80211/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw-mac80211/zd_mac.c
@@ -607,14 +607,6 @@ out:
return r;
}
-struct zd_rt_hdr {
- struct ieee80211_radiotap_header rt_hdr;
- u8 rt_flags;
- u8 rt_rate;
- __le16 rt_channel;
- __le16 rt_chbitmask;
-} __attribute__((packed));
-
static int fill_rx_stats(struct ieee80211_rx_status *stats,
const struct rx_status **pstatus,
struct zd_mac *mac,
--
1.5.2.4
-
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
