Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 236019
b: refs/heads/master
c: 70de655
h: refs/heads/master
i:
  236017: 5b91408
  236015: 59c06aa
v: v3
  • Loading branch information
Stanislav Fomichev authored and Greg Kroah-Hartman committed Feb 18, 2011
1 parent 4c59623 commit df9f2f7
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 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: 02aed8f3d69f1aefd3f7e66780ee103183ddb2ca
refs/heads/master: 70de655cace24d9f2dd8a4277e65fc6da07df75b
2 changes: 1 addition & 1 deletion trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
Original file line number Diff line number Diff line change
Expand Up @@ -1375,7 +1375,7 @@ wl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
memcpy(join_params.params.bssid, ether_bcast, ETH_ALEN);

wl_ch_to_chanspec(wl->channel, &join_params, &join_params_size);
WL_DBG("join_param_size %d\n", join_params_size);
WL_DBG("join_param_size %zu\n", join_params_size);

if (join_params.ssid.SSID_len < IEEE80211_MAX_SSID_LEN) {
WL_DBG("ssid \"%s\", len (%d)\n",
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
Original file line number Diff line number Diff line change
Expand Up @@ -1861,12 +1861,12 @@ int wl_check_firmwares(struct wl_info *wl)
WL_ERROR("%s: invalid bin/hdr fw\n", __func__);
rc = -EBADF;
} else if (fw_hdr->size % sizeof(struct wl_fw_hdr)) {
WL_ERROR("%s: non integral fw hdr file size %d/%zu\n",
WL_ERROR("%s: non integral fw hdr file size %zu/%zu\n",
__func__, fw_hdr->size,
sizeof(struct wl_fw_hdr));
rc = -EBADF;
} else if (fw->size < MIN_FW_SIZE || fw->size > MAX_FW_SIZE) {
WL_ERROR("%s: out of bounds fw file size %d\n",
WL_ERROR("%s: out of bounds fw file size %zu\n",
__func__, fw->size);
rc = -EBADF;
} else {
Expand Down

0 comments on commit df9f2f7

Please sign in to comment.