From 99e73b91c74a4c0d8b0b60a6ed44b69d12fb3292 Mon Sep 17 00:00:00 2001 From: Peter Huewe Date: Wed, 13 Feb 2013 03:58:17 +0100 Subject: [PATCH] --- yaml --- r: 354517 b: refs/heads/master c: 8a26aefda17d7fdf0bdfb505b6366a7051e7fb1a h: refs/heads/master i: 354515: e979f84d9f8eb8d4d687fbc6fae110fef7423401 v: v3 --- [refs] | 2 +- trunk/drivers/staging/rtl8187se/r8185b_init.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index b7f879a8f742..fd361641fe17 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b926050cb1bfa64e575fab5e4eb3d2a15d349464 +refs/heads/master: 8a26aefda17d7fdf0bdfb505b6366a7051e7fb1a diff --git a/trunk/drivers/staging/rtl8187se/r8185b_init.c b/trunk/drivers/staging/rtl8187se/r8185b_init.c index 4aca954283dc..1e54eadb054e 100644 --- a/trunk/drivers/staging/rtl8187se/r8185b_init.c +++ b/trunk/drivers/staging/rtl8187se/r8185b_init.c @@ -866,10 +866,7 @@ void ActUpdateChannelAccessSetting(struct net_device *dev, WIRELESS_MODE WirelessMode, PCHANNEL_ACCESS_SETTING ChnlAccessSetting) { - struct r8180_priv *priv = ieee80211_priv(dev); - struct ieee80211_device *ieee = priv->ieee80211; AC_CODING eACI; - u8 u1bAIFS; /* * @@ -891,8 +888,6 @@ void ActUpdateChannelAccessSetting(struct net_device *dev, write_nic_byte(dev, SIFS, ChnlAccessSetting->SIFS_Timer); write_nic_byte(dev, SLOT, ChnlAccessSetting->SlotTimeTimer); /* Rewrited from directly use PlatformEFIOWrite1Byte(), by Annie, 2006-03-29. */ - u1bAIFS = aSifsTime + (2 * ChnlAccessSetting->SlotTimeTimer); - write_nic_byte(dev, EIFS, ChnlAccessSetting->EIFS_Timer); write_nic_byte(dev, AckTimeOutReg, 0x5B); /* Suggested by wcchu, it is the default value of EIFS register, 2005.12.08. */