[PATCH] softmac: fix some sparse warnings

Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/net/ieee80211/softmac/ieee80211softmac_auth.c b/net/ieee80211/softmac/ieee80211softmac_auth.c
index 94cac14..286f071 100644 (file)
--- a/net/ieee80211/softmac/ieee80211softmac_auth.c
+++ b/net/ieee80211/softmac/ieee80211softmac_auth.c
@@ -243,7 +243,7 @@ free_aq:
 /*
  * Handle deauthorization
  */
-void
+static void
 ieee80211softmac_deauth_from_net(struct ieee80211softmac_device *mac,
        struct ieee80211softmac_network *net)
 {

diff --git a/net/ieee80211/softmac/ieee80211softmac_io.c b/net/ieee80211/softmac/ieee80211softmac_io.c
index 2cb3087..a142dae 100644 (file)
--- a/net/ieee80211/softmac/ieee80211softmac_io.c
+++ b/net/ieee80211/softmac/ieee80211softmac_io.c
@@ -155,7 +155,7 @@ ieee80211softmac_hdr_3addr(struct ieee80211softmac_device *mac,
  *****************************************************************************/ 
 
 /* Creates an association request packet */
-u32
+static u32
 ieee80211softmac_assoc_req(struct ieee80211_assoc_request **pkt, 
        struct ieee80211softmac_device *mac, struct ieee80211softmac_network *net)
 {
@@ -206,7 +206,7 @@ ieee80211softmac_assoc_req(struct ieee80211_assoc_request **pkt,
 }
 
 /* Create a reassociation request packet */
-u32
+static u32
 ieee80211softmac_reassoc_req(struct ieee80211_reassoc_request **pkt, 
        struct ieee80211softmac_device *mac, struct ieee80211softmac_network *net)
 {
@@ -253,7 +253,7 @@ ieee80211softmac_reassoc_req(struct ieee80211_reassoc_request **pkt,
 }
 
 /* Create an authentication packet */
-u32
+static u32
 ieee80211softmac_auth(struct ieee80211_auth **pkt, 
        struct ieee80211softmac_device *mac, struct ieee80211softmac_network *net,
        u16 transaction, u16 status)
@@ -301,7 +301,7 @@ ieee80211softmac_auth(struct ieee80211_auth **pkt,
 }
 
 /* Create a disassocation or deauthentication packet */
-u32
+static u32
 ieee80211softmac_disassoc_deauth(struct ieee80211_disassoc **pkt,
        struct ieee80211softmac_device *mac, struct ieee80211softmac_network *net,
        u16 type, u16 reason)
@@ -318,7 +318,7 @@ ieee80211softmac_disassoc_deauth(struct ieee80211_disassoc **pkt,
 }
 
 /* Create a probe request packet */
-u32
+static u32
 ieee80211softmac_probe_req(struct ieee80211_probe_request **pkt,
        struct ieee80211softmac_device *mac, struct ieee80211softmac_essid *essid)
 {
@@ -347,7 +347,7 @@ ieee80211softmac_probe_req(struct ieee80211_probe_request **pkt,
 
 /* Create a probe response packet */
 /* FIXME: Not complete */
-u32
+static u32
 ieee80211softmac_probe_resp(struct ieee80211_probe_response **pkt,
        struct ieee80211softmac_device *mac, struct ieee80211softmac_network *net)
 {
@@ -430,7 +430,7 @@ ieee80211softmac_send_mgt_frame(struct ieee80211softmac_device *mac,
 
 
 /* Create an rts/cts frame */
-u32
+static u32
 ieee80211softmac_rts_cts(struct ieee80211_hdr_2addr **pkt,
        struct ieee80211softmac_device *mac, struct ieee80211softmac_network *net, 
        u32 type)

diff --git a/net/ieee80211/softmac/ieee80211softmac_priv.h b/net/ieee80211/softmac/ieee80211softmac_priv.h
index 591d3bd..44a8ba4 100644 (file)
--- a/net/ieee80211/softmac/ieee80211softmac_priv.h
+++ b/net/ieee80211/softmac/ieee80211softmac_priv.h
@@ -91,7 +91,12 @@ struct ieee80211softmac_network * ieee80211softmac_get_network_by_ssid_locked(
        struct ieee80211softmac_device *mac, u8 *ssid, u8 ssid_len);
 struct ieee80211softmac_network * ieee80211softmac_get_network_by_ssid(
        struct ieee80211softmac_device *mac, u8 *ssid, u8 ssid_len);
-
+struct ieee80211softmac_network *
+ieee80211softmac_get_network_by_essid_locked(struct ieee80211softmac_device *mac,
+       struct ieee80211softmac_essid *essid);
+struct ieee80211softmac_network *
+ieee80211softmac_get_network_by_essid(struct ieee80211softmac_device *mac,
+       struct ieee80211softmac_essid *essid);
 
 /* Rates related */
 u8 ieee80211softmac_lower_rate_delta(struct ieee80211softmac_device *mac, u8 rate, int delta);