]> err.no Git - linux-2.6/commitdiff
[PATCH] orinoco: remove redundance skb length check before padding
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 19 Oct 2005 01:30:58 +0000 (21:30 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 19 Oct 2005 02:27:14 +0000 (22:27 -0400)
Checking the skb->len value before calling skb_padto is redundant.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
drivers/net/wireless/orinoco.c

index da4c5e94a959ef6126fe82fe307ad39e71f949d3..5db2bbad65c42986b0a1dcf41dd4402a8229999a 100644 (file)
@@ -492,11 +492,9 @@ static int orinoco_xmit(struct sk_buff *skb, struct net_device *dev)
 
        /* Check packet length, pad short packets, round up odd length */
        len = max_t(int, ALIGN(skb->len, 2), ETH_ZLEN);
-       if (skb->len < len) {
-               skb = skb_padto(skb, len);
-               if (skb == NULL)
-                       goto fail;
-       }
+       skb = skb_padto(skb, len);
+       if (skb == NULL)
+               goto fail;
        len -= ETH_HLEN;
 
        eh = (struct ethhdr *)skb->data;