summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas/decl.h
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2007-05-25 13:13:25 -0400
committerJohn W. Linville <linville@tuxdriver.com>2007-06-11 14:28:40 -0400
commit7732ca45c68f893689a8c0d8c6e2eb2bfefbc087 (patch)
treeb894177055e35cd426cf36d923adfd8985e4e9ed /drivers/net/wireless/libertas/decl.h
parent0681f989357416d7ef28ebaea4151ce70a6ae21c (diff)
[PATCH] libertas: call SET_NETDEV_DEV from common code
Move usage of SET_NETDEV_DEV into common code since it has nothing to do with bus-specific devices. Also fixes a bug where the mesh device was getting SET_NETDEV_DEV called after register_netdevice, resulting in no 'device' link in /sys/class/net/mshX/. Signed-off-by: Dan Williams <dcbw@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/decl.h')
-rw-r--r--drivers/net/wireless/libertas/decl.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/libertas/decl.h b/drivers/net/wireless/libertas/decl.h
index d6fcb339f5c..40f56bb1eac 100644
--- a/drivers/net/wireless/libertas/decl.h
+++ b/drivers/net/wireless/libertas/decl.h
@@ -6,6 +6,8 @@
#ifndef _WLAN_DECL_H_
#define _WLAN_DECL_H_
+#include <linux/device.h>
+
#include "defs.h"
/** Function Prototype Declaration */
@@ -79,10 +81,10 @@ int libertas_init_fw(wlan_private * priv, char *fw_name);
/* main.c */
struct chan_freq_power *libertas_get_region_cfp_table(u8 region, u8 band,
int *cfp_no);
-wlan_private *libertas_add_card(void *card);
+wlan_private *libertas_add_card(void *card, struct device *dmdev);
int libertas_activate_card(wlan_private *priv, char *fw_name);
int libertas_remove_card(wlan_private *priv);
-int libertas_add_mesh(wlan_private *priv);
+int libertas_add_mesh(wlan_private *priv, struct device *dev);
void libertas_remove_mesh(wlan_private *priv);