Skip to contentSkip to conversation

sc92031: remove bogus unlikely()

PATCH Applied Cesar Eduardo Barros 2 participants 2 messages May 30, 2008 – May 31, 2008

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Cesar Eduardo Barros

author
#0 lore raw

PATCH 1/1 sc92031: remove bogus unlikely()

Commit 5a0a92e67b5009a71e011658da04fb92dad8961f mentions len < ETH_ZLEN is true for ARP packets. This obviously is not unlikely.

Signed-off-by Cesar Eduardo Barros <[email protected]>
---
 drivers/net/sc92031.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/sc92031.c +1 -1
index b4b6380..61955f8 100644
@@ -972,7 +972,7 @@ static int sc92031_start_xmit(struct sk_buff *skb, struct net_device *dev)
 	skb_copy_and_csum_dev(skb, priv->tx_bufs + entry * TX_BUF_SIZE);
 
 	len = skb->len;
-	if (unlikely(len < ETH_ZLEN)) {
+	if (len < ETH_ZLEN) {
 		memset(priv->tx_bufs + entry * TX_BUF_SIZE + len,
 				0, ETH_ZLEN - len);
 		len = ETH_ZLEN;
Signature · 6 lines
1.5.5.1

-- 
Cesar Eduardo Barros
[email protected]
[email protected]
Applied
#1 lore raw
Quoted 13 lines · Cesar Eduardo Barros

Commit 5a0a92e67b5009a71e011658da04fb92dad8961f mentions len < ETH_ZLEN is true for ARP packets. This obviously is not unlikely.

Signed-off-by Cesar Eduardo Barros <[email protected]>
---
 drivers/net/sc92031.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/sc92031.c +0 -0
index b4b6380..61955f8 100644

drivers/net/sc92031.c static int sc92031_start_xmit(struct sk_buff *skb, struct net_device *dev) · line 976

Quoted 6 lines
drivers/net/sc92031.c +1 -1
@@ -972,7 +972,7 @@ static int sc92031_start_xmit(struct sk_buff *skb, struct net_device *dev)
 	skb_copy_and_csum_dev(skb, priv->tx_bufs + entry * TX_BUF_SIZE);
 
 	len = skb->len;
-	if (unlikely(len < ETH_ZLEN)) {
+	if (len < ETH_ZLEN) {
 		memset(priv->tx_bufs + entry * TX_BUF_SIZE + len,

applied