korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-20 04:44:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] libertas: don't stomp on interface-specific private data

Browse Source 
Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Dan Williams 2007-08-20 11:45:16 -04:00 committed by David S. Miller
parent 954ee164f4
commit 64f104e89b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/libertas/main.c
View File

@ -256,7 +256,7 @@ void libertas_remove_rtap(wlan_private *priv);
static ssize_t libertas_rtap_get(struct device * dev, static ssize_t libertas_rtap_get(struct device * dev,
struct device_attribute *attr, char * buf) struct device_attribute *attr, char * buf)
{ {
wlan_private *priv = (wlan_private *) dev->driver_data; wlan_private *priv = (wlan_private *) (to_net_dev(dev))->priv;
wlan_adapter *adapter = priv->adapter; wlan_adapter *adapter = priv->adapter;
return snprintf(buf, 5, "0x%X\n", adapter->monitormode); return snprintf(buf, 5, "0x%X\n", adapter->monitormode);
} }
@ -268,7 +268,7 @@ static ssize_t libertas_rtap_set(struct device * dev,
struct device_attribute *attr, const char * buf, size_t count) struct device_attribute *attr, const char * buf, size_t count)
{ {
int monitor_mode; int monitor_mode;
wlan_private *priv = (wlan_private *) dev->driver_data; wlan_private *priv = (wlan_private *) (to_net_dev(dev))->priv;
wlan_adapter *adapter = priv->adapter; wlan_adapter *adapter = priv->adapter;
sscanf(buf, "%x", &monitor_mode); sscanf(buf, "%x", &monitor_mode);
@ -1138,7 +1138,7 @@ wlan_private *libertas_add_card(void *card, struct device *dmdev)
lbs_pr_err("init ethX device failed\n"); lbs_pr_err("init ethX device failed\n");
goto done; goto done;
} }
dmdev->driver_data = priv = dev->priv; priv = dev->priv;
/* allocate buffer for wlan_adapter */ /* allocate buffer for wlan_adapter */
if (!(priv->adapter = kzalloc(sizeof(wlan_adapter), GFP_KERNEL))) { if (!(priv->adapter = kzalloc(sizeof(wlan_adapter), GFP_KERNEL))) {