diff options
-rw-r--r-- | drivers/net/wireless/bcm43xx/bcm43xx_wx.c | 2 | ||||
-rw-r--r-- | net/ieee80211/softmac/ieee80211softmac_wx.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c index 888077fc14c4..9b7b15cf6561 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c | |||
@@ -334,7 +334,7 @@ static int bcm43xx_wx_get_nick(struct net_device *net_dev, | |||
334 | size_t len; | 334 | size_t len; |
335 | 335 | ||
336 | mutex_lock(&bcm->mutex); | 336 | mutex_lock(&bcm->mutex); |
337 | len = strlen(bcm->nick) + 1; | 337 | len = strlen(bcm->nick); |
338 | memcpy(extra, bcm->nick, len); | 338 | memcpy(extra, bcm->nick, len); |
339 | data->data.length = (__u16)len; | 339 | data->data.length = (__u16)len; |
340 | data->data.flags = 1; | 340 | data->data.flags = 1; |
diff --git a/net/ieee80211/softmac/ieee80211softmac_wx.c b/net/ieee80211/softmac/ieee80211softmac_wx.c index 75320b6842ab..2aa779d18f38 100644 --- a/net/ieee80211/softmac/ieee80211softmac_wx.c +++ b/net/ieee80211/softmac/ieee80211softmac_wx.c | |||
@@ -80,10 +80,10 @@ ieee80211softmac_wx_set_essid(struct net_device *net_dev, | |||
80 | * If it's our network, ignore the change, we're already doing it! | 80 | * If it's our network, ignore the change, we're already doing it! |
81 | */ | 81 | */ |
82 | if((sm->associnfo.associating || sm->associated) && | 82 | if((sm->associnfo.associating || sm->associated) && |
83 | (data->essid.flags && data->essid.length && extra)) { | 83 | (data->essid.flags && data->essid.length)) { |
84 | /* Get the associating network */ | 84 | /* Get the associating network */ |
85 | n = ieee80211softmac_get_network_by_bssid(sm, sm->associnfo.bssid); | 85 | n = ieee80211softmac_get_network_by_bssid(sm, sm->associnfo.bssid); |
86 | if(n && n->essid.len == (data->essid.length - 1) && | 86 | if(n && n->essid.len == data->essid.length && |
87 | !memcmp(n->essid.data, extra, n->essid.len)) { | 87 | !memcmp(n->essid.data, extra, n->essid.len)) { |
88 | dprintk(KERN_INFO PFX "Already associating or associated to "MAC_FMT"\n", | 88 | dprintk(KERN_INFO PFX "Already associating or associated to "MAC_FMT"\n", |
89 | MAC_ARG(sm->associnfo.bssid)); | 89 | MAC_ARG(sm->associnfo.bssid)); |
@@ -109,8 +109,8 @@ ieee80211softmac_wx_set_essid(struct net_device *net_dev, | |||
109 | sm->associnfo.static_essid = 0; | 109 | sm->associnfo.static_essid = 0; |
110 | sm->associnfo.assoc_wait = 0; | 110 | sm->associnfo.assoc_wait = 0; |
111 | 111 | ||
112 | if (data->essid.flags && data->essid.length && extra /*required?*/) { | 112 | if (data->essid.flags && data->essid.length) { |
113 | length = min(data->essid.length - 1, IW_ESSID_MAX_SIZE); | 113 | length = min((int)data->essid.length, IW_ESSID_MAX_SIZE); |
114 | if (length) { | 114 | if (length) { |
115 | memcpy(sm->associnfo.req_essid.data, extra, length); | 115 | memcpy(sm->associnfo.req_essid.data, extra, length); |
116 | sm->associnfo.static_essid = 1; | 116 | sm->associnfo.static_essid = 1; |