diff options
| author | Michael Grzeschik <m.grzeschik@pengutronix.de> | 2015-04-22 16:41:46 +0200 |
|---|---|---|
| committer | Michael Grzeschik <m.grzeschik@pengutronix.de> | 2015-10-26 09:10:56 +0100 |
| commit | b82de0e28ccac15e1a0c3b4f6f20dfd230049041 (patch) | |
| tree | 1ada5546b75d2986772df829cfa86c2c13d56243 /drivers/net/arcnet/arcnet.c | |
| parent | bnxt_en: Fix compile warnings when CONFIG_INET is not set. (diff) | |
| download | linux-b82de0e28ccac15e1a0c3b4f6f20dfd230049041.tar.xz linux-b82de0e28ccac15e1a0c3b4f6f20dfd230049041.zip | |
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 <m.grzeschik@pengutronix.de>
Diffstat (limited to 'drivers/net/arcnet/arcnet.c')
| -rw-r--r-- | drivers/net/arcnet/arcnet.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/arcnet/arcnet.c b/drivers/net/arcnet/arcnet.c index e41dd36fe832..542e2b46b9eb 100644 --- a/drivers/net/arcnet/arcnet.c +++ b/drivers/net/arcnet/arcnet.c @@ -515,7 +515,7 @@ netdev_tx_t arcnet_send_packet(struct sk_buff *skb, struct ArcProto *proto; int txbuf; unsigned long flags; - int freeskb, retval; + int retval; arc_printk(D_DURING, dev, "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, * the package later - forget about it now */ dev->stats.tx_bytes += skb->len; - freeskb = 1; + dev_kfree_skb(skb); } else { /* do it the 'split' way */ lp->outgoing.proto = proto; lp->outgoing.skb = skb; lp->outgoing.pkt = pkt; - freeskb = 0; - if (proto->continue_tx && proto->continue_tx(dev, txbuf)) { arc_printk(D_NORMAL, dev, @@ -574,7 +572,6 @@ netdev_tx_t arcnet_send_packet(struct sk_buff *skb, lp->next_tx = txbuf; } else { retval = NETDEV_TX_BUSY; - freeskb = 0; } 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, __FILE__, __LINE__, __func__, lp->hw.status(dev)); spin_unlock_irqrestore(&lp->lock, flags); - if (freeskb) - dev_kfree_skb(skb); - return retval; /* no need to try again */ } EXPORT_SYMBOL(arcnet_send_packet); |