aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2007-08-20 11:45:16 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 16:50:34 -0700
commit64f104e89b2b30107a21c5f05c3e2ffa6291e129 (patch)
tree8d58b448808ee0e0edba864ba0a69d8bfd06d629 /drivers
parent954ee164f4f4598afc172c0ec3865d0352e55a0b (diff)
[PATCH] libertas: don't stomp on interface-specific private data
Signed-off-by: Dan Williams <dcbw@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/libertas/main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 6304bd97d39..3feddcc750e 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -256,7 +256,7 @@ void libertas_remove_rtap(wlan_private *priv);
static ssize_t libertas_rtap_get(struct device * dev,
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;
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)
{
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;
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");
goto done;
}
- dmdev->driver_data = priv = dev->priv;
+ priv = dev->priv;
/* allocate buffer for wlan_adapter */
if (!(priv->adapter = kzalloc(sizeof(wlan_adapter), GFP_KERNEL))) {