Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[firefly-linux-kernel-4.4.55.git] / drivers / staging / vt6655 / device_main.c

diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 2e317842943794c7cef41220e99cdd5dfe28430f..83e4162c0094c4b2bed6853bc8cfb5636011191a 100644 (file)
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -1485,7 +1485,6 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw,
                else
                        priv->bShortSlotTime = false;
 
-               vUpdateIFS(priv);
                CARDbSetPhyParameter(priv, priv->byBBType);
                BBvSetVGAGainOffset(priv, priv->abyBBVGA[0]);
        }
@@ -1514,8 +1513,7 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw,
 
                        CARDbSetBeaconPeriod(priv, conf->beacon_int);
 
-                       CARDvSetFirstNextTBTT(priv->PortOffset,
-                                             conf->beacon_int);
+                       CARDvSetFirstNextTBTT(priv, conf->beacon_int);
                } else {
                        VNSvOutPortB(priv->PortOffset + MAC_REG_TFTCTL,
                                     TFTCTL_TSFCNTRST);
@@ -1634,7 +1632,7 @@ static u64 vnt_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
        struct vnt_private *priv = hw->priv;
        u64 tsf;
 
-       CARDbGetCurrentTSF(priv->PortOffset, &tsf);
+       CARDbGetCurrentTSF(priv, &tsf);
 
        return tsf;
 }
@@ -1644,7 +1642,7 @@ static void vnt_set_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
 {
        struct vnt_private *priv = hw->priv;
 
-       CARDvUpdateNextTBTT(priv->PortOffset, tsf, vif->bss_conf.beacon_int);
+       CARDvUpdateNextTBTT(priv, tsf, vif->bss_conf.beacon_int);
 }
 
 static void vnt_reset_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)