libipw: correct sparse warnings and mark some variables static
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 20 Jul 2010 18:14:03 +0000 (14:14 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 20 Jul 2010 20:49:40 +0000 (16:49 -0400)
  CHECK   drivers/net/wireless/ipw2x00/libipw_module.c
drivers/net/wireless/ipw2x00/libipw_module.c:65:21: warning: symbol 'libipw_config_ops' was not declared. Should it be static?
drivers/net/wireless/ipw2x00/libipw_module.c:66:6: warning: symbol 'libipw_wiphy_privid' was not declared. Should it be static?
  CHECK   drivers/net/wireless/ipw2x00/libipw_wx.c
drivers/net/wireless/ipw2x00/libipw_wx.c:415:17: warning: symbol 'ssid' shadows an earlier one
drivers/net/wireless/ipw2x00/libipw_wx.c:324:9: originally declared here

Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ipw2x00/libipw_module.c
drivers/net/wireless/ipw2x00/libipw_wx.c

index 55965408ff3f3786e07f0117f5def525f55c8a20..32dee2ce5d3177706f8bc7394794952a87389324 100644 (file)
@@ -62,8 +62,8 @@ MODULE_DESCRIPTION(DRV_DESCRIPTION);
 MODULE_AUTHOR(DRV_COPYRIGHT);
 MODULE_LICENSE("GPL");
 
-struct cfg80211_ops libipw_config_ops = { };
-void *libipw_wiphy_privid = &libipw_wiphy_privid;
+static struct cfg80211_ops libipw_config_ops = { };
+static void *libipw_wiphy_privid = &libipw_wiphy_privid;
 
 static int libipw_networks_allocate(struct libipw_device *ieee)
 {
index 3633c6682e4967575ef040ad620fbb8550531c35..8a4bae44b1094146ca3f3f9b0c44f6da46ad3913 100644 (file)
@@ -411,10 +411,6 @@ int libipw_wx_set_encode(struct libipw_device *ieee,
 
        /* If a new key was provided, set it up */
        if (erq->length > 0) {
-#ifdef CONFIG_LIBIPW_DEBUG
-               DECLARE_SSID_BUF(ssid);
-#endif
-
                len = erq->length <= 5 ? 5 : 13;
                memcpy(sec.keys[key], keybuf, erq->length);
                if (len > erq->length)