From 2402dc82e4ba45887d814e7d5ed9715ce516df7b Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Wed, 20 Feb 2008 12:06:47 +0100
Subject: [PATCH] --- yaml --- r: 89961 b: refs/heads/master c:
 e63e3fa7bd4d0dc8cbab5ab7aff84cd37d45295e h: refs/heads/master i:   89959:
 ef2d4b063fcf97dee35f21601ba706b01a4364c0 v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/net/wireless/adm8211.c | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 0a7b3c852979..05c9ade46d62 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffc7689ddae5cbe12bde437ae0f2b386d568b5cd
+refs/heads/master: e63e3fa7bd4d0dc8cbab5ab7aff84cd37d45295e
diff --git a/trunk/drivers/net/wireless/adm8211.c b/trunk/drivers/net/wireless/adm8211.c
index 7d4218206c47..a1303ae03b0d 100644
--- a/trunk/drivers/net/wireless/adm8211.c
+++ b/trunk/drivers/net/wireless/adm8211.c
@@ -1109,7 +1109,7 @@ static void adm8211_hw_init(struct ieee80211_hw *dev)
 	u32 reg;
 	u8 cline;
 
-	reg = le32_to_cpu(ADM8211_CSR_READ(PAR));
+	reg = ADM8211_CSR_READ(PAR);
 	reg |= ADM8211_PAR_MRLE | ADM8211_PAR_MRME;
 	reg &= ~(ADM8211_PAR_BAR | ADM8211_PAR_CAL);
 
@@ -1702,13 +1702,9 @@ static int adm8211_tx(struct ieee80211_hw *dev, struct sk_buff *skb,
 	int plcp, dur, len, plcp_signal, short_preamble;
 	struct ieee80211_hdr *hdr;
 
-	if (control->tx_rate < 0) {
-		short_preamble = 1;
-		plcp_signal = -control->tx_rate->bitrate;
-	} else {
-		short_preamble = 0;
-		plcp_signal = control->tx_rate->bitrate;
-	}
+	short_preamble = !!(control->tx_rate->flags &
+					IEEE80211_TXCTL_SHORT_PREAMBLE);
+	plcp_signal = control->tx_rate->bitrate;
 
 	hdr = (struct ieee80211_hdr *)skb->data;
 	fc = le16_to_cpu(hdr->frame_control) & ~IEEE80211_FCTL_PROTECTED;