diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-03-04 13:05:12 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-03-04 13:05:12 -0500 |
| commit | f3b6a488a670f1be2666ab97e31dcfc0b1648884 (patch) | |
| tree | d8d2431f21d4371c907dec075926e86840e86d1e /drivers/net/wireless/libertas | |
| parent | c14c5d99a453af6b86f15aca8fe9005b2b8f3b26 (diff) | |
| parent | adb07df1e039e9fe43e66aeea8b4771f83659dbb (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/ath/ath9k/recv.c
drivers/net/wireless/mwifiex/pcie.c
Diffstat (limited to 'drivers/net/wireless/libertas')
| -rw-r--r-- | drivers/net/wireless/libertas/cfg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/cfg.c b/drivers/net/wireless/libertas/cfg.c index 2d72a6b4b93..54e344aed6e 100644 --- a/drivers/net/wireless/libertas/cfg.c +++ b/drivers/net/wireless/libertas/cfg.c @@ -621,7 +621,7 @@ static int lbs_ret_scan(struct lbs_private *priv, unsigned long dummy, id = *pos++; elen = *pos++; left -= 2; - if (elen > left || elen == 0) { + if (elen > left) { lbs_deb_scan("scan response: invalid IE fmt\n"); goto done; } |