Эх сурвалжийг харах

[PATCH] orinoco: remove redundance skb length check before padding

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>
John W. Linville 19 жил өмнө
parent
commit
36841c9d02

+ 3 - 5
drivers/net/wireless/orinoco.c

@@ -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 */
 	/* Check packet length, pad short packets, round up odd length */
 	len = max_t(int, ALIGN(skb->len, 2), ETH_ZLEN);
 	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;
 	len -= ETH_HLEN;
 
 
 	eh = (struct ethhdr *)skb->data;
 	eh = (struct ethhdr *)skb->data;