git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/hda' into for-linus
[pandora-kernel.git]
/
drivers
/
staging
/
rtl8187se
/
ieee80211
/
ieee80211_softmac_wx.c
diff --git
a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c
b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c
index
93af37e
..
54b4b71
100644
(file)
--- a/
drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c
+++ b/
drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c
@@
-461,19
+461,19
@@
int ieee80211_wx_get_name(struct ieee80211_device *ieee,
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
{
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
{
- str
cpy(wrqu->name, "802.11"
);
+ str
lcpy(wrqu->name, "802.11", IFNAMSIZ
);
if(ieee->modulation & IEEE80211_CCK_MODULATION){
if(ieee->modulation & IEEE80211_CCK_MODULATION){
- str
cat(wrqu->name, "b"
);
+ str
lcat(wrqu->name, "b", IFNAMSIZ
);
if(ieee->modulation & IEEE80211_OFDM_MODULATION)
if(ieee->modulation & IEEE80211_OFDM_MODULATION)
- str
cat(wrqu->name, "/g"
);
+ str
lcat(wrqu->name, "/g", IFNAMSIZ
);
}else if(ieee->modulation & IEEE80211_OFDM_MODULATION)
}else if(ieee->modulation & IEEE80211_OFDM_MODULATION)
- str
cat(wrqu->name, "g"
);
+ str
lcat(wrqu->name, "g", IFNAMSIZ
);
if((ieee->state == IEEE80211_LINKED) ||
(ieee->state == IEEE80211_LINKED_SCANNING))
if((ieee->state == IEEE80211_LINKED) ||
(ieee->state == IEEE80211_LINKED_SCANNING))
- str
cat(wrqu->name," linked"
);
+ str
lcat(wrqu->name," link", IFNAMSIZ
);
else if(ieee->state != IEEE80211_NOLINK)
else if(ieee->state != IEEE80211_NOLINK)
- str
cat(wrqu->name," link.."
);
+ str
lcat(wrqu->name," .....", IFNAMSIZ
);
return 0;
return 0;