projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mac80211: dont use interface indices in drivers
[deliverable/linux.git]
/
drivers
/
net
/
wireless
/
iwlwifi
/
iwl4965-base.c
diff --git
a/drivers/net/wireless/iwlwifi/iwl4965-base.c
b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index ce0574b087fb2336248259298f7560830e6a2701..52eb37f4ac78b3bce622eb2b6daecb69c3d3a61d 100644
(file)
--- a/
drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/
drivers/net/wireless/iwlwifi/iwl4965-base.c
@@
-2897,8
+2897,8
@@
static int iwl4965_tx_skb(struct iwl4965_priv *priv,
goto drop_unlock;
}
goto drop_unlock;
}
- if (!priv->
interface_id
) {
- IWL_DEBUG_DROP("Dropping - !priv->
interface_id
\n");
+ if (!priv->
vif
) {
+ IWL_DEBUG_DROP("Dropping - !priv->
vif
\n");
goto drop_unlock;
}
goto drop_unlock;
}
@@
-3893,7
+3893,7
@@
static void iwl4965_bg_beacon_update(struct work_struct *work)
struct sk_buff *beacon;
/* Pull updated AP beacon from mac80211. will fail if not in AP mode */
struct sk_buff *beacon;
/* Pull updated AP beacon from mac80211. will fail if not in AP mode */
- beacon = ieee80211_beacon_get(priv->hw, priv->
interface_id
, NULL);
+ beacon = ieee80211_beacon_get(priv->hw, priv->
vif
, NULL);
if (!beacon) {
IWL_ERROR("update beacon failed\n");
if (!beacon) {
IWL_ERROR("update beacon failed\n");
@@
-7214,7
+7214,7
@@
static void iwl4965_bg_post_associate(struct work_struct *data)
mutex_lock(&priv->mutex);
mutex_lock(&priv->mutex);
- if (!priv->
interface_id
|| !priv->is_open) {
+ if (!priv->
vif
|| !priv->is_open) {
mutex_unlock(&priv->mutex);
return;
}
mutex_unlock(&priv->mutex);
return;
}
@@
-7425,15
+7425,15
@@
static int iwl4965_mac_add_interface(struct ieee80211_hw *hw,
unsigned long flags;
DECLARE_MAC_BUF(mac);
unsigned long flags;
DECLARE_MAC_BUF(mac);
- IWL_DEBUG_MAC80211("enter:
id %d, type %d\n", conf->if_id
, conf->type);
+ IWL_DEBUG_MAC80211("enter:
type %d\n"
, conf->type);
- if (priv->
interface_id
) {
- IWL_DEBUG_MAC80211("leave -
interface_id != 0
\n");
+ if (priv->
vif
) {
+ IWL_DEBUG_MAC80211("leave -
vif != NULL
\n");
return 0;
}
spin_lock_irqsave(&priv->lock, flags);
return 0;
}
spin_lock_irqsave(&priv->lock, flags);
- priv->
interface_id = conf->if_id
;
+ priv->
vif = conf->vif
;
spin_unlock_irqrestore(&priv->lock, flags);
spin_unlock_irqrestore(&priv->lock, flags);
@@
-7617,7
+7617,8
@@
static void iwl4965_config_ap(struct iwl4965_priv *priv)
* clear sta table, add BCAST sta... */
}
* clear sta table, add BCAST sta... */
}
-static int iwl4965_mac_config_interface(struct ieee80211_hw *hw, int if_id,
+static int iwl4965_mac_config_interface(struct ieee80211_hw *hw,
+ struct ieee80211_vif *vif,
struct ieee80211_if_conf *conf)
{
struct iwl4965_priv *priv = hw->priv;
struct ieee80211_if_conf *conf)
{
struct iwl4965_priv *priv = hw->priv;
@@
-7637,7
+7638,6
@@
static int iwl4965_mac_config_interface(struct ieee80211_hw *hw, int if_id,
mutex_lock(&priv->mutex);
mutex_lock(&priv->mutex);
- IWL_DEBUG_MAC80211("enter: interface id %d\n", if_id);
if (conf->bssid)
IWL_DEBUG_MAC80211("bssid: %s\n",
print_mac(mac, conf->bssid));
if (conf->bssid)
IWL_DEBUG_MAC80211("bssid: %s\n",
print_mac(mac, conf->bssid));
@@
-7654,8
+7654,8
@@
static int iwl4965_mac_config_interface(struct ieee80211_hw *hw, int if_id,
return 0;
}
return 0;
}
- if (priv->
interface_id != if_id
) {
- IWL_DEBUG_MAC80211("leave -
interface_id != if_id
\n");
+ if (priv->
vif != vif
) {
+ IWL_DEBUG_MAC80211("leave -
priv->vif != vif
\n");
mutex_unlock(&priv->mutex);
return 0;
}
mutex_unlock(&priv->mutex);
return 0;
}
@@
-7753,8
+7753,8
@@
static void iwl4965_mac_remove_interface(struct ieee80211_hw *hw,
priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
iwl4965_commit_rxon(priv);
}
priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
iwl4965_commit_rxon(priv);
}
- if (priv->
interface_id == conf->if_id
) {
- priv->
interface_id = 0
;
+ if (priv->
vif == conf->vif
) {
+ priv->
vif = NULL
;
memset(priv->bssid, 0, ETH_ALEN);
memset(priv->essid, 0, IW_ESSID_MAX_SIZE);
priv->essid_len = 0;
memset(priv->bssid, 0, ETH_ALEN);
memset(priv->essid, 0, IW_ESSID_MAX_SIZE);
priv->essid_len = 0;
This page took
0.032256 seconds
and
5
git commands to generate.