aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rtl8187_dev.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/rtl8187_dev.c')
-rw-r--r--drivers/net/wireless/rtl8187_dev.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/rtl8187_dev.c b/drivers/net/wireless/rtl8187_dev.c
index 8dab25a65990..0d71716d750d 100644
--- a/drivers/net/wireless/rtl8187_dev.c
+++ b/drivers/net/wireless/rtl8187_dev.c
@@ -150,7 +150,8 @@ static int rtl8187_tx(struct ieee80211_hw *dev, struct sk_buff *skb,
150 flags |= RTL8187_TX_FLAG_MORE_FRAG; 150 flags |= RTL8187_TX_FLAG_MORE_FRAG;
151 if (control->flags & IEEE80211_TXCTL_USE_RTS_CTS) { 151 if (control->flags & IEEE80211_TXCTL_USE_RTS_CTS) {
152 flags |= RTL8187_TX_FLAG_RTS; 152 flags |= RTL8187_TX_FLAG_RTS;
153 rts_dur = ieee80211_rts_duration(dev, priv->if_id, skb->len, control); 153 rts_dur = ieee80211_rts_duration(dev, priv->vif,
154 skb->len, control);
154 } 155 }
155 if (control->flags & IEEE80211_TXCTL_USE_CTS_PROTECT) 156 if (control->flags & IEEE80211_TXCTL_USE_CTS_PROTECT)
156 flags |= RTL8187_TX_FLAG_CTS; 157 flags |= RTL8187_TX_FLAG_CTS;
@@ -560,14 +561,13 @@ static int rtl8187_config(struct ieee80211_hw *dev, struct ieee80211_conf *conf)
560 return 0; 561 return 0;
561} 562}
562 563
563static int rtl8187_config_interface(struct ieee80211_hw *dev, int if_id, 564static int rtl8187_config_interface(struct ieee80211_hw *dev,
565 struct ieee80211_vif *vif,
564 struct ieee80211_if_conf *conf) 566 struct ieee80211_if_conf *conf)
565{ 567{
566 struct rtl8187_priv *priv = dev->priv; 568 struct rtl8187_priv *priv = dev->priv;
567 int i; 569 int i;
568 570
569 priv->if_id = if_id;
570
571 for (i = 0; i < ETH_ALEN; i++) 571 for (i = 0; i < ETH_ALEN; i++)
572 rtl818x_iowrite8(priv, &priv->map->BSSID[i], conf->bssid[i]); 572 rtl818x_iowrite8(priv, &priv->map->BSSID[i], conf->bssid[i]);
573 573