Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 220283
b: refs/heads/master
c: 94dc5e7
h: refs/heads/master
i:
  220281: b532342
  220279: f21e753
v: v3
  • Loading branch information
Jason Cooper authored and Greg Kroah-Hartman committed Oct 11, 2010
1 parent bdc11ab commit a517a51
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 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: d5642d3ba7b6609e93a688bb39bd5883a270e41f
refs/heads/master: 94dc5e778042daea25f2198884e2eb8f3bd350ed
8 changes: 4 additions & 4 deletions trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.c
Original file line number Diff line number Diff line change
Expand Up @@ -1280,7 +1280,7 @@ wl_iw_set_scan(struct net_device *dev,
__func__, req->essid));
return -EBUSY;
} else {
g_specific_ssid.SSID_len = min_t(unsigned char,
g_specific_ssid.SSID_len = min_t(size_t,
sizeof(g_specific_ssid.SSID),
req->essid_len);
memcpy(g_specific_ssid.SSID, req->essid,
Expand Down Expand Up @@ -1379,7 +1379,7 @@ wl_iw_iscan_set_scan(struct net_device *dev,
if (wrqu->data.length == sizeof(struct iw_scan_req)) {
if (wrqu->data.flags & IW_SCAN_THIS_ESSID) {
struct iw_scan_req *req = (struct iw_scan_req *)extra;
ssid.SSID_len = min_t(unsigned char, sizeof(ssid.SSID),
ssid.SSID_len = min_t(size_t, sizeof(ssid.SSID),
req->essid_len);
memcpy(ssid.SSID, req->essid, ssid.SSID_len);
ssid.SSID_len = htod32(ssid.SSID_len);
Expand Down Expand Up @@ -1907,10 +1907,10 @@ wl_iw_set_essid(struct net_device *dev,

if (dwrq->length && extra) {
#if WIRELESS_EXT > 20
g_ssid.SSID_len = min_t(unsigned char, sizeof(g_ssid.SSID),
g_ssid.SSID_len = min_t(size_t, sizeof(g_ssid.SSID),
dwrq->length);
#else
g_ssid.SSID_len = min_t(unsigned char, sizeof(g_ssid.SSID),
g_ssid.SSID_len = min_t(size_t, sizeof(g_ssid.SSID),
dwrq->length - 1);
#endif
memcpy(g_ssid.SSID, extra, g_ssid.SSID_len);
Expand Down

0 comments on commit a517a51

Please sign in to comment.