From d0663fb4b61790f991286c8407639a1e08bb0e2c Mon Sep 17 00:00:00 2001 From: "John W. Linville" Date: Tue, 20 Jul 2010 14:14:03 -0400 Subject: [PATCH] --- yaml --- r: 203729 b: refs/heads/master c: cc40cc56f4e271c51ba5b7cf9d7ae5f955dc7e2d h: refs/heads/master i: 203727: 81e49f1886e7aebff7c984f542806dfd64f949f4 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ipw2x00/libipw_module.c | 4 ++-- trunk/drivers/net/wireless/ipw2x00/libipw_wx.c | 4 ---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 1b7d0bdb2451..d751d64a5578 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d267be307a3345ef06889511cad2aa1fecc83db7 +refs/heads/master: cc40cc56f4e271c51ba5b7cf9d7ae5f955dc7e2d diff --git a/trunk/drivers/net/wireless/ipw2x00/libipw_module.c b/trunk/drivers/net/wireless/ipw2x00/libipw_module.c index 55965408ff3f..32dee2ce5d31 100644 --- a/trunk/drivers/net/wireless/ipw2x00/libipw_module.c +++ b/trunk/drivers/net/wireless/ipw2x00/libipw_module.c @@ -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) { diff --git a/trunk/drivers/net/wireless/ipw2x00/libipw_wx.c b/trunk/drivers/net/wireless/ipw2x00/libipw_wx.c index 3633c6682e49..8a4bae44b109 100644 --- a/trunk/drivers/net/wireless/ipw2x00/libipw_wx.c +++ b/trunk/drivers/net/wireless/ipw2x00/libipw_wx.c @@ -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)