diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-03-25 20:46:37 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-10-17 14:35:05 +0100 |
| commit | dc8d9ba5042c821a027194ec12d5c903bac7e5e5 (patch) | |
| tree | 81d912915fe7acb6a8ce2cfd745dd36076c16895 | |
| parent | 5bf5fcf8a52a0cfd09cd18565ddb41fccb0bade2 (diff) | |
net: fec: clean up fec_enet_get_free_txdesc_num() callsites
Clean up the various callsites to this function; most callsites
are using a temporary variable and immediately following it with
a test. There is no need of a temporary variable for this.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | drivers/net/ethernet/freescale/fec_main.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index 30a48ff1f798..3fedb5f6cb7a 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -504,11 +504,9 @@ static int fec_enet_txq_submit_skb(struct sk_buff *skb, struct net_device *ndev) unsigned short buflen; unsigned int estatus = 0; unsigned int index; - int entries_free; int ret; - entries_free = fec_enet_get_free_txdesc_num(fep); - if (entries_free < MAX_SKB_FRAGS + 1) { + if (fec_enet_get_free_txdesc_num(fep) < MAX_SKB_FRAGS + 1) { dev_kfree_skb_any(skb); if (net_ratelimit()) netdev_err(ndev, "NOT enough BD for SG!\n"); @@ -801,7 +799,6 @@ static netdev_tx_t fec_enet_start_xmit(struct sk_buff *skb, struct net_device *ndev) { struct fec_enet_private *fep = netdev_priv(ndev); - int entries_free; int ret; if (skb_is_gso(skb)) @@ -811,8 +808,7 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *ndev) if (ret) return ret; - entries_free = fec_enet_get_free_txdesc_num(fep); - if (entries_free <= fep->tx_stop_threshold) + if (fec_enet_get_free_txdesc_num(fep) <= fep->tx_stop_threshold) netif_stop_queue(ndev); return NETDEV_TX_OK; @@ -1132,7 +1128,6 @@ fec_enet_tx(struct net_device *ndev) unsigned short status; struct sk_buff *skb; int index = 0; - int entries_free; unsigned int pkts_compl, bytes_compl; fep = netdev_priv(ndev); @@ -1208,11 +1203,9 @@ fec_enet_tx(struct net_device *ndev) /* Since we have freed up a buffer, the ring is no longer full */ - if (netif_queue_stopped(ndev)) { - entries_free = fec_enet_get_free_txdesc_num(fep); - if (entries_free >= fep->tx_wake_threshold) - netif_wake_queue(ndev); - } + if (netif_queue_stopped(ndev) && + fec_enet_get_free_txdesc_num(fep) >= fep->tx_wake_threshold) + netif_wake_queue(ndev); } netdev_completed_queue(ndev, pkts_compl, bytes_compl); |