prism54: misc cleanups
Subsystems (3)
PATCH 1/1 prism54: misc cleanups
This patch makes some functions in prism54 that are only required locally static.
As a side effect it turned out that the mgt_unlatch_all function was completely unused, and it's therefore #if 0'ed.
I also considered moving display_buffer as static inline into islpci_mgt.h, but I wasn't 100% sure and therefore left it.
Signed-off-by Adrian Bunk <[email protected]>
---
This patch was already sent on:
- 20 Dec 2004
drivers/net/wireless/prism54/isl_ioctl.c | 32 +++++++++++------- drivers/net/wireless/prism54/isl_ioctl.h | 5 -- drivers/net/wireless/prism54/islpci_dev.c | 5 +- drivers/net/wireless/prism54/islpci_dev.h | 2 - drivers/net/wireless/prism54/islpci_mgt.c | 2 + drivers/net/wireless/prism54/oid_mgt.c | 38 +--------------------- drivers/net/wireless/prism54/oid_mgt.h | 4 -- 7 files changed, 28 insertions(+), 60 deletions(-)
drivers/net/wireless/prism54/isl_ioctl.h renamed from drivers/net/wireless/prism54/isl_ioctl.h.old +0 -5
@@ -41,15 +41,10 @@void prism54_wpa_ie_init (islpci_private *priv);void prism54_wpa_ie_clean (islpci_private *priv); -void prism54_wpa_ie_add (islpci_private *priv,u8 *bssid, -u8 *wpa_ie,size_t wpa_ie_len); -size_t prism54_wpa_ie_get (islpci_private *priv,u8 *bssid,u8 *wpa_ie);int prism54_set_mac_address (struct net_device *,void *);int prism54_ioctl (struct net_device *,struct ifreq *,int ); -int prism54_set_wpa (struct net_device *,struct iw_request_info *, -__u32 *,char *);extern const struct iw_handler_def prism54_handler_def;
drivers/net/wireless/prism54/isl_ioctl.c renamed from drivers/net/wireless/prism54/isl_ioctl.c.old +20 -12
@@ -36,6 +36,14 @@#include <net/iw_handler.h> /* New driver API */ + +static void prism54_wpa_ie_add (islpci_private *priv,u8 *bssid, +u8 *wpa_ie,size_t wpa_ie_len); +static size_t prism54_wpa_ie_get (islpci_private *priv,u8 *bssid,u8 *wpa_ie); +static int prism54_set_wpa (struct net_device *,struct iw_request_info *, +__u32 *,char *); + +/** * prism54_mib_mode_helper - MIB change mode helper function * @mib: the &struct islpci_mib object to modify
@@ -47,7 +55,7 @@* Wireless API modes to Device firmware modes. It also checks for * correct valid Linux wireless modes. */ -int +static int prism54_mib_mode_helper (islpci_private *priv,u32 iw_mode) {u32 config =INL_CONFIG_MANUALRUN ;
@@ -647,7 +655,7 @@return current_ev; } -int +static int prism54_get_scan (struct net_device *ndev,struct iw_request_info *info,struct iw_point *dwrq,char *extra) {
@@ -1582,7 +1590,7 @@#define MAC2STR (a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5]#define MACSTR "%02x:%02x:%02x:%02x:%02x:%02x" -void +static void prism54_wpa_ie_add (islpci_private *priv,u8 *bssid,u8 *wpa_ie,size_t wpa_ie_len) {
@@ -1649,7 +1657,7 @@up (&priv->wpa_sem); } -size_t +static size_t prism54_wpa_ie_get (islpci_private *priv,u8 *bssid,u8 *wpa_ie) {struct list_head *ptr;
@@ -1736,7 +1744,7 @@ } } -int +static int prism54_process_trap_helper (islpci_private *priv,enum oid_num_t oid,char *data) {
@@ -2314,7 +2322,7 @@return ret; } -int +static int prism54_set_wpa (struct net_device *ndev,struct iw_request_info *info,__u32 * uwrq,char *extra) {
@@ -2358,7 +2366,7 @@return 0 ; } -int +static int prism54_get_wpa (struct net_device *ndev,struct iw_request_info *info,__u32 * uwrq,char *extra) {
@@ -2367,7 +2375,7 @@return 0 ; } -int +static int prism54_set_prismhdr (struct net_device *ndev,struct iw_request_info *info,__u32 * uwrq,char *extra) {
@@ -2380,7 +2388,7 @@return 0 ; } -int +static int prism54_get_prismhdr (struct net_device *ndev,struct iw_request_info *info,__u32 * uwrq,char *extra) {
@@ -2389,7 +2397,7 @@return 0 ; } -int +static int prism54_debug_oid (struct net_device *ndev,struct iw_request_info *info,__u32 * uwrq,char *extra) {
@@ -2401,7 +2409,7 @@return 0 ; } -int +static int prism54_debug_get_oid (struct net_device *ndev,struct iw_request_info *info,struct iw_point *data,char *extra) {
@@ -2437,7 +2445,7 @@return ret; } -int +static int prism54_debug_set_oid (struct net_device *ndev,struct iw_request_info *info,struct iw_point *data,char *extra) {
drivers/net/wireless/prism54/islpci_dev.h renamed from drivers/net/wireless/prism54/islpci_dev.h.old +0 -2
@@ -211,8 +211,6 @@ priv->device_base); } -struct net_device_stats *islpci_statistics (struct net_device *); -int islpci_free_memory (islpci_private *);struct net_device *islpci_setup (struct pci_dev *);#endif /* _ISLPCI_DEV_H */
drivers/net/wireless/prism54/islpci_dev.c renamed from drivers/net/wireless/prism54/islpci_dev.c.old +3 -2
@@ -44,6 +44,7 @@static int prism54_bring_down (islpci_private *);static int islpci_alloc_memory (islpci_private *); +static struct net_device_stats *islpci_statistics (struct net_device *);/* Temporary dummy MAC address to use until firmware is loaded. * The idea there is that some tools (such as nameif) may query
@@ -52,7 +53,7 @@* Of course, this is not the final/real MAC address. It doesn't * matter, as you are suppose to be able to change it anytime via * ndev->set_mac_address. Jean II */ -const unsigned char dummy_mac[6 ] = {0x00 ,0x30 ,0xB4 ,0x00 ,0x00 ,0x00 }; +static const unsigned char dummy_mac[6 ] = {0x00 ,0x30 ,0xB4 ,0x00 ,0x00 ,0x00 };static int isl_upload_firmware (islpci_private *priv)
@@ -607,7 +608,7 @@return rc; } -struct net_device_stats * +static struct net_device_stats *islpci_statistics (struct net_device *ndev) {islpci_private *priv =netdev_priv (ndev);
drivers/net/wireless/prism54/islpci_mgt.c renamed from drivers/net/wireless/prism54/islpci_mgt.c.old +2 -0
@@ -44,6 +44,7 @@/****************************************************************************** Driver general functions ******************************************************************************/ +#if VERBOSE >SHOW_ERROR_MESSAGES void display_buffer (char *buffer,int length) {
@@ -58,6 +59,7 @@ printk("\n"); } +#endif /***************************************************************************** Queue handling for management frames
drivers/net/wireless/prism54/oid_mgt.h renamed from drivers/net/wireless/prism54/oid_mgt.h.old +1 -3
@@ -28,8 +28,7 @@void mgt_clean (islpci_private *); -/* I don't know where to put these 3 */ -extern const int frequency_list_bg[]; +/* I don't know where to put these 2 */ extern const int frequency_list_a[];int channel_of_freq (int );
@@ -49,7 +48,6 @@void mgt_get (islpci_private *,enum oid_num_t ,void *);int mgt_commit (islpci_private *); -void mgt_unlatch_all (islpci_private *);int mgt_mlme_answer (islpci_private *);
drivers/net/wireless/prism54/oid_mgt.c renamed from drivers/net/wireless/prism54/oid_mgt.c.old +4 -2
@@ -24,8 +24,8 @@#include "isl_ioctl.h" /* to convert between channel and freq */ -const int frequency_list_bg[] = {2412 ,2417 ,2422 ,2427 ,2432 ,2437 ,2442 , -2447 ,2452 ,2457 ,2462 ,2467 ,2472 ,2484 +static const int frequency_list_bg[] = {2412 ,2417 ,2422 ,2427 ,2432 , +2437 ,2442 ,2447 ,2452 ,2457 ,2462 ,2467 ,2472 ,2484 };int
@@ -730,6 +730,7 @@* * The way to do this is to set ESSID. Note though that they may get * unlatch before though by setting another OID. */ +#if 0 void mgt_unlatch_all (islpci_private *priv) {
@@ -756,6 +757,7 @@if (rvalue) printk(KERN_DEBUG "%s: Unlatching OIDs failed\n", priv->ndev->name); } +#endif /* This will tell you if you are allowed to answer a mlme(ex) request .*/