aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas/decl.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-12-04 13:25:15 -0800
committerDavid S. Miller <davem@davemloft.net>2009-12-04 13:25:15 -0800
commit8f56874bd7e8bee73ed6a1cf80dcec2753616262 (patch)
treeaebd15dea662ef5efd89402b8fd92fec540a98eb /drivers/net/wireless/libertas/decl.h
parenttcp: fix a timewait refcnt race (diff)
parentiwmc3200wifi: Enable wimax core through module parameter (diff)
downloadlinux-dev-8f56874bd7e8bee73ed6a1cf80dcec2753616262.tar.xz
linux-dev-8f56874bd7e8bee73ed6a1cf80dcec2753616262.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/libertas/decl.h')
-rw-r--r--drivers/net/wireless/libertas/decl.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/wireless/libertas/decl.h b/drivers/net/wireless/libertas/decl.h
index 678f7c9f7503..709ffcad22ad 100644
--- a/drivers/net/wireless/libertas/decl.h
+++ b/drivers/net/wireless/libertas/decl.h
@@ -27,11 +27,6 @@ netdev_tx_t lbs_hard_start_xmit(struct sk_buff *skb,
int lbs_process_rxed_packet(struct lbs_private *priv, struct sk_buff *);
-/* persistcfg.c */
-void lbs_persist_config_init(struct net_device *net);
-void lbs_persist_config_remove(struct net_device *net);
-
-
/* main.c */
struct lbs_private *lbs_add_card(void *card, struct device *dmdev);
void lbs_remove_card(struct lbs_private *priv);
@@ -39,6 +34,9 @@ int lbs_start_card(struct lbs_private *priv);
void lbs_stop_card(struct lbs_private *priv);
void lbs_host_to_card_done(struct lbs_private *priv);
+int lbs_set_mac_address(struct net_device *dev, void *addr);
+void lbs_set_multicast_list(struct net_device *dev);
+
int lbs_suspend(struct lbs_private *priv);
void lbs_resume(struct lbs_private *priv);