From eb138c0b251d3d3ae988637609d9da1d9a990f9e Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Mon, 22 Jun 2009 17:42:21 +0200 Subject: [PATCH] --- yaml --- r: 158908 b: refs/heads/master c: 35a0ace7739b50331c919a3255639f123b78eaff h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/orinoco/hermes.c | 2 +- trunk/drivers/net/wireless/rtl818x/rtl8180_dev.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f504856ebe4f..0c65b40a6226 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1795378ee8d162084c6f98fc62ec309e418dfbe9 +refs/heads/master: 35a0ace7739b50331c919a3255639f123b78eaff diff --git a/trunk/drivers/net/wireless/orinoco/hermes.c b/trunk/drivers/net/wireless/orinoco/hermes.c index f2c918c2572d..1a2fca76fd3c 100644 --- a/trunk/drivers/net/wireless/orinoco/hermes.c +++ b/trunk/drivers/net/wireless/orinoco/hermes.c @@ -469,7 +469,7 @@ int hermes_read_ltv(hermes_t *hw, int bap, u16 rid, unsigned bufsize, u16 rlength, rtype; unsigned nwords; - if ((bufsize < 0) || (bufsize % 2)) + if (bufsize % 2) return -EINVAL; err = hermes_docmd_wait(hw, HERMES_CMD_ACCESS, rid, NULL); diff --git a/trunk/drivers/net/wireless/rtl818x/rtl8180_dev.c b/trunk/drivers/net/wireless/rtl818x/rtl8180_dev.c index 47521c5b6f91..09f46abc730a 100644 --- a/trunk/drivers/net/wireless/rtl818x/rtl8180_dev.c +++ b/trunk/drivers/net/wireless/rtl818x/rtl8180_dev.c @@ -281,7 +281,7 @@ static int rtl8180_tx(struct ieee80211_hw *dev, struct sk_buff *skb) (ieee80211_get_tx_rate(dev, info)->bitrate * 2) / 10); remainder = (16 * (skb->len + 4)) % ((ieee80211_get_tx_rate(dev, info)->bitrate * 2) / 10); - if (remainder > 0 && remainder <= 6) + if (remainder <= 6) plcp_len |= 1 << 15; }