wireless: remove redundant tests on unsigned

bufsize and remainder are unsigned. When negative they are wrapped and caught by
the other test.

Signed-off-by: Roel Kluin <[email protected]>
Signed-off-by: Pavel Roskin <[email protected]>
Signed-off-by: John W. Linville <[email protected]>

diff --git a/drivers/net/wireless/orinoco/hermes.c b/drivers/net/wireless/orinoco/hermes.c
index f2c918c2572da5a21ab3ae7e8d4620b723aa4577..1a2fca76fd3c87b87aef781dab91f1d9c8bb1ac4 100644 (file)
--- a/drivers/net/wireless/orinoco/hermes.c
+++ b/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/drivers/net/wireless/rtl818x/rtl8180_dev.c b/drivers/net/wireless/rtl818x/rtl8180_dev.c
index 47521c5b6f91060e9d669cb4d84a574a1a5aae96..09f46abc730a97274fcf167f045012cdcc4e62fa 100644 (file)
--- a/drivers/net/wireless/rtl818x/rtl8180_dev.c
+++ b/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;
        }