Skip to content

Commit

Permalink
rtl8187: Fix locking of private data
Browse files Browse the repository at this point in the history
In rtl8187_add_interface(), the mutex that protects the data in struct
rtl8187_priv does not include all references to that structure.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Larry Finger authored and John W. Linville committed Jan 29, 2009
1 parent 1fac36e commit 66aafd9
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions drivers/net/wireless/rtl818x/rtl8187_dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -974,19 +974,21 @@ static int rtl8187_add_interface(struct ieee80211_hw *dev,
{
struct rtl8187_priv *priv = dev->priv;
int i;
int ret = -EOPNOTSUPP;

mutex_lock(&priv->conf_mutex);
if (priv->mode != NL80211_IFTYPE_MONITOR)
return -EOPNOTSUPP;
goto exit;

switch (conf->type) {
case NL80211_IFTYPE_STATION:
priv->mode = conf->type;
break;
default:
return -EOPNOTSUPP;
goto exit;
}

mutex_lock(&priv->conf_mutex);
ret = 0;
priv->vif = conf->vif;

rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_CONFIG);
Expand All @@ -995,8 +997,9 @@ static int rtl8187_add_interface(struct ieee80211_hw *dev,
((u8 *)conf->mac_addr)[i]);
rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_NORMAL);

exit:
mutex_unlock(&priv->conf_mutex);
return 0;
return ret;
}

static void rtl8187_remove_interface(struct ieee80211_hw *dev,
Expand Down

0 comments on commit 66aafd9

Please sign in to comment.