Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=2c85103da3c88a06a7c01eece709482d85eff07f
Commit: 2c85103da3c88a06a7c01eece709482d85eff07f
Parent: 85c93e5189b7402b4f9f4324c284bb91e8e8fb85
Author: Holger Schurig <[EMAIL PROTECTED]>
AuthorDate: Thu Aug 2 13:11:38 2007 -0400
Committer: David S. Miller <[EMAIL PROTECTED]>
CommitDate: Wed Oct 10 16:50:06 2007 -0700
[PATCH] libertas: remove adapter->beaconperiod
beaconperiod was initialized with MRVDRV_BEACON_INTERVAL, but there is
no code that would ever change it's value. We can use the define directly.
Signed-off-by: Holger Schurig <[EMAIL PROTECTED]>
Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
---
drivers/net/wireless/libertas/dev.h | 1 -
drivers/net/wireless/libertas/join.c | 2 +-
drivers/net/wireless/libertas/main.c | 2 --
3 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/libertas/dev.h
b/drivers/net/wireless/libertas/dev.h
index 90e9405..602a93e 100644
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -265,7 +265,6 @@ struct _wlan_adapter {
u8 scantype;
u32 scanmode;
- u16 beaconperiod;
u8 adhoccreate;
/** capability Info used in Association, start, join */
diff --git a/drivers/net/wireless/libertas/join.c
b/drivers/net/wireless/libertas/join.c
index 95c21ba..c16d1f6 100644
--- a/drivers/net/wireless/libertas/join.c
+++ b/drivers/net/wireless/libertas/join.c
@@ -496,7 +496,7 @@ int libertas_cmd_80211_ad_hoc_start(wlan_private * priv,
/* set the BSS type */
adhs->bsstype = CMD_BSS_TYPE_IBSS;
adapter->mode = IW_MODE_ADHOC;
- adhs->beaconperiod = cpu_to_le16(adapter->beaconperiod);
+ adhs->beaconperiod = cpu_to_le16(MRVDRV_BEACON_INTERVAL);
/* set Physical param set */
#define DS_PARA_IE_ID 3
diff --git a/drivers/net/wireless/libertas/main.c
b/drivers/net/wireless/libertas/main.c
index ab8dcbf..1c8760c 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -1043,8 +1043,6 @@ static void wlan_init_adapter(wlan_private * priv)
adapter->auto_rate = 1;
adapter->cur_rate = 0;
- adapter->beaconperiod = MRVDRV_BEACON_INTERVAL;
-
// set default capabilities
adapter->capability = WLAN_CAPABILITY_SHORT_PREAMBLE;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
