Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 268548
b: refs/heads/master
c: e7751b6
h: refs/heads/master
v: v3
  • Loading branch information
David Kilroy authored and Greg Kroah-Hartman committed Sep 27, 2011
1 parent dc615b0 commit f27f1b5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 145a401fc43fa82cf1aad55bc35a7f6c5bbd1ecb
refs/heads/master: e7751b6384596cc9a2646f037a03ad57f6201f6d
11 changes: 1 addition & 10 deletions trunk/drivers/staging/wlags49_h2/wl_wext.c
Original file line number Diff line number Diff line change
Expand Up @@ -1042,9 +1042,6 @@ static int wireless_get_essid(struct net_device *dev, struct iw_request_info *in
/* Copy the information into the user buffer */
data->length = pName->length;

/* NOTE: Null terminating is necessary for proper display of the SSID in
the wireless tools */
data->length = pName->length + 1;
if( pName->length < HCF_MAX_NAME_LEN ) {
pName->name[pName->length] = '\0';
}
Expand All @@ -1070,11 +1067,7 @@ static int wireless_get_essid(struct net_device *dev, struct iw_request_info *in
pName->length = CNV_LITTLE_TO_INT( pName->length );

/* Copy the information into the user buffer */
data->length = pName->length + 1;
if( pName->length < HCF_MAX_NAME_LEN ) {
pName->name[pName->length] = '\0';
}

data->length = pName->length;
data->flags = 1;
} else {
ret = -EFAULT;
Expand All @@ -1084,8 +1077,6 @@ static int wireless_get_essid(struct net_device *dev, struct iw_request_info *in

#endif // HCF_STA

data->length--;

if (pName->length > IW_ESSID_MAX_SIZE) {
ret = -EFAULT;
goto out_unlock;
Expand Down

0 comments on commit f27f1b5

Please sign in to comment.