diff options
| author | Dan Williams <dcbw@redhat.com> | 2006-01-12 21:00:58 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-01-16 22:51:53 +0100 |
| commit | d6a13a24b76236ade7fd70081ba41a51e8215578 (patch) | |
| tree | 85c495d422a6e152789108b8623245886afcd554 /drivers/net/wireless/prism54/isl_ioctl.c | |
| parent | [PATCH] hostap: allow flashing firmware (diff) | |
| download | linux-d6a13a24b76236ade7fd70081ba41a51e8215578.tar.xz linux-d6a13a24b76236ade7fd70081ba41a51e8215578.zip | |
[PATCH] drivers/net/wireless: correct reported ssid lengths
ESSIDs can technically include NULL characters. Drivers should not be
adjusting the length of the ESSID before reporting it in their
SIOCGIWESSID handlers. Breaks stuff like wpa_supplicant. Note that ipw
drivers, which seem to currently be the "most correct", don't have this
problem.
Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/prism54/isl_ioctl.c')
| -rw-r--r-- | drivers/net/wireless/prism54/isl_ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c index 135a156db25d..c5cd61c7f927 100644 --- a/drivers/net/wireless/prism54/isl_ioctl.c +++ b/drivers/net/wireless/prism54/isl_ioctl.c @@ -748,7 +748,7 @@ prism54_get_essid(struct net_device *ndev, struct iw_request_info *info, if (essid->length) { dwrq->flags = 1; /* set ESSID to ON for Wireless Extensions */ /* if it is to big, trunk it */ - dwrq->length = min(IW_ESSID_MAX_SIZE, essid->length + 1); + dwrq->length = min(IW_ESSID_MAX_SIZE, essid->length); } else { dwrq->flags = 0; dwrq->length = 0; |