Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / libertas / join.h

diff --git a/drivers/net/wireless/libertas/join.h b/drivers/net/wireless/libertas/join.h
index 8efa2455af9ad3fd129d2562349359619e9782a9..894a072b9f8d4e6ab8164a422deec0aa68e462df 100644 (file)
--- a/drivers/net/wireless/libertas/join.h
+++ b/drivers/net/wireless/libertas/join.h
@@ -1,6 +1,3 @@
-/* -*- mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
-/* vi: set expandtab shiftwidth=4 tabstop=4 textwidth=78: */
-
 /**
   * Interface for the wlan infrastructure and adhoc join routines
   *
@@ -12,53 +9,45 @@
 #define _WLAN_JOIN_H
 
 #include "defs.h"
+#include "dev.h"
 
 struct cmd_ds_command;
-extern int libertas_cmd_80211_authenticate(wlan_private * priv,
+int libertas_cmd_80211_authenticate(wlan_private * priv,
                                        struct cmd_ds_command *cmd,
                                        void *pdata_buf);
-extern int libertas_cmd_80211_ad_hoc_join(wlan_private * priv,
+int libertas_cmd_80211_ad_hoc_join(wlan_private * priv,
                                       struct cmd_ds_command *cmd,
                                       void *pdata_buf);
-extern int libertas_cmd_80211_ad_hoc_stop(wlan_private * priv,
+int libertas_cmd_80211_ad_hoc_stop(wlan_private * priv,
                                       struct cmd_ds_command *cmd);
-extern int libertas_cmd_80211_ad_hoc_start(wlan_private * priv,
+int libertas_cmd_80211_ad_hoc_start(wlan_private * priv,
                                        struct cmd_ds_command *cmd,
-                                       void *pssid);
-extern int libertas_cmd_80211_deauthenticate(wlan_private * priv,
+                                       void *pdata_buf);
+int libertas_cmd_80211_deauthenticate(wlan_private * priv,
                                          struct cmd_ds_command *cmd);
-extern int libertas_cmd_80211_associate(wlan_private * priv,
+int libertas_cmd_80211_associate(wlan_private * priv,
                                     struct cmd_ds_command *cmd,
                                     void *pdata_buf);
 
-extern int libertas_ret_80211_ad_hoc_start(wlan_private * priv,
+int libertas_ret_80211_ad_hoc_start(wlan_private * priv,
                                        struct cmd_ds_command *resp);
-extern int libertas_ret_80211_ad_hoc_stop(wlan_private * priv,
+int libertas_ret_80211_ad_hoc_stop(wlan_private * priv,
                                       struct cmd_ds_command *resp);
-extern int libertas_ret_80211_disassociate(wlan_private * priv,
+int libertas_ret_80211_disassociate(wlan_private * priv,
                                        struct cmd_ds_command *resp);
-extern int libertas_ret_80211_associate(wlan_private * priv,
+int libertas_ret_80211_associate(wlan_private * priv,
                                     struct cmd_ds_command *resp);
 
-extern int libertas_idle_on(wlan_private * priv);
-extern int libertas_idle_off(wlan_private * priv);
-
-extern int libertas_do_adhocstop_ioctl(wlan_private * priv);
-extern int libertas_reassociation_thread(void *data);
-
-struct WLAN_802_11_SSID;
-struct bss_descriptor;
-
-extern int libertas_start_adhoc_network(wlan_private * priv,
-                            struct WLAN_802_11_SSID *adhocssid);
-extern int libertas_join_adhoc_network(wlan_private * priv, struct bss_descriptor *pbssdesc);
-extern int libertas_stop_adhoc_network(wlan_private * priv);
+int libertas_start_adhoc_network(wlan_private * priv,
+                            struct assoc_request * assoc_req);
+int libertas_join_adhoc_network(wlan_private * priv,
+                               struct assoc_request * assoc_req);
+int libertas_stop_adhoc_network(wlan_private * priv);
 
-extern int libertas_send_deauthentication(wlan_private * priv);
-extern int libertas_send_deauth(wlan_private * priv);
+int libertas_send_deauthentication(wlan_private * priv);
 
-extern int libertas_do_adhocstop_ioctl(wlan_private * priv);
+int wlan_associate(wlan_private * priv, struct assoc_request * assoc_req);
 
-int wlan_associate(wlan_private * priv, struct bss_descriptor * pbssdesc);
+void libertas_unset_basic_rate_flags(u8 * rates, size_t len);
 
 #endif