|
@@ -1025,12 +1025,11 @@ static int rtl8187_add_interface(struct ieee80211_hw *dev,
|
|
int ret = -EOPNOTSUPP;
|
|
int ret = -EOPNOTSUPP;
|
|
|
|
|
|
mutex_lock(&priv->conf_mutex);
|
|
mutex_lock(&priv->conf_mutex);
|
|
- if (priv->mode != NL80211_IFTYPE_MONITOR)
|
|
|
|
|
|
+ if (priv->vif)
|
|
goto exit;
|
|
goto exit;
|
|
|
|
|
|
switch (conf->type) {
|
|
switch (conf->type) {
|
|
case NL80211_IFTYPE_STATION:
|
|
case NL80211_IFTYPE_STATION:
|
|
- priv->mode = conf->type;
|
|
|
|
break;
|
|
break;
|
|
default:
|
|
default:
|
|
goto exit;
|
|
goto exit;
|
|
@@ -1055,7 +1054,6 @@ static void rtl8187_remove_interface(struct ieee80211_hw *dev,
|
|
{
|
|
{
|
|
struct rtl8187_priv *priv = dev->priv;
|
|
struct rtl8187_priv *priv = dev->priv;
|
|
mutex_lock(&priv->conf_mutex);
|
|
mutex_lock(&priv->conf_mutex);
|
|
- priv->mode = NL80211_IFTYPE_MONITOR;
|
|
|
|
priv->vif = NULL;
|
|
priv->vif = NULL;
|
|
mutex_unlock(&priv->conf_mutex);
|
|
mutex_unlock(&priv->conf_mutex);
|
|
}
|
|
}
|
|
@@ -1365,7 +1363,6 @@ static int __devinit rtl8187_probe(struct usb_interface *intf,
|
|
dev->wiphy->bands[IEEE80211_BAND_2GHZ] = &priv->band;
|
|
dev->wiphy->bands[IEEE80211_BAND_2GHZ] = &priv->band;
|
|
|
|
|
|
|
|
|
|
- priv->mode = NL80211_IFTYPE_MONITOR;
|
|
|
|
dev->flags = IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |
|
|
dev->flags = IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |
|
|
IEEE80211_HW_SIGNAL_DBM |
|
|
IEEE80211_HW_SIGNAL_DBM |
|
|
IEEE80211_HW_RX_INCLUDES_FCS;
|
|
IEEE80211_HW_RX_INCLUDES_FCS;
|