Skip to content

Commit b82de0e

Browse files
committed
arcnet: move dev_free_skb to its only user
The call for dev_free_skb is done only once. This patch moves its call to its only user and removes the obsolete condition variable. Signed-off-by: Michael Grzeschik <[email protected]>
1 parent d1611c3 commit b82de0e

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

drivers/net/arcnet/arcnet.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ netdev_tx_t arcnet_send_packet(struct sk_buff *skb,
515515
struct ArcProto *proto;
516516
int txbuf;
517517
unsigned long flags;
518-
int freeskb, retval;
518+
int retval;
519519

520520
arc_printk(D_DURING, dev,
521521
"transmit requested (status=%Xh, txbufs=%d/%d, len=%d, protocol %x)\n",
@@ -554,15 +554,13 @@ netdev_tx_t arcnet_send_packet(struct sk_buff *skb,
554554
* the package later - forget about it now
555555
*/
556556
dev->stats.tx_bytes += skb->len;
557-
freeskb = 1;
557+
dev_kfree_skb(skb);
558558
} else {
559559
/* do it the 'split' way */
560560
lp->outgoing.proto = proto;
561561
lp->outgoing.skb = skb;
562562
lp->outgoing.pkt = pkt;
563563

564-
freeskb = 0;
565-
566564
if (proto->continue_tx &&
567565
proto->continue_tx(dev, txbuf)) {
568566
arc_printk(D_NORMAL, dev,
@@ -574,7 +572,6 @@ netdev_tx_t arcnet_send_packet(struct sk_buff *skb,
574572
lp->next_tx = txbuf;
575573
} else {
576574
retval = NETDEV_TX_BUSY;
577-
freeskb = 0;
578575
}
579576

580577
arc_printk(D_DEBUG, dev, "%s: %d: %s, status: %x\n",
@@ -589,9 +586,6 @@ netdev_tx_t arcnet_send_packet(struct sk_buff *skb,
589586
__FILE__, __LINE__, __func__, lp->hw.status(dev));
590587

591588
spin_unlock_irqrestore(&lp->lock, flags);
592-
if (freeskb)
593-
dev_kfree_skb(skb);
594-
595589
return retval; /* no need to try again */
596590
}
597591
EXPORT_SYMBOL(arcnet_send_packet);

0 commit comments

Comments
 (0)