Commit 15e32a5e authored by Pavel Belous's avatar Pavel Belous Committed by David S. Miller

net: ethernet: aquantia: Removed busy_count field.

 busy_count field and is_busy flag is not needed at all.
Signed-off-by: default avatarPavel Belous <pavel.belous@aquantia.com>
Reviewed-by: default avatarLino Sanfilippo <LinoSanfilippo@gmx.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 99e55827
...@@ -122,14 +122,11 @@ static void aq_nic_service_timer_cb(unsigned long param) ...@@ -122,14 +122,11 @@ static void aq_nic_service_timer_cb(unsigned long param)
struct aq_nic_s *self = (struct aq_nic_s *)param; struct aq_nic_s *self = (struct aq_nic_s *)param;
struct net_device *ndev = aq_nic_get_ndev(self); struct net_device *ndev = aq_nic_get_ndev(self);
int err = 0; int err = 0;
bool is_busy = false;
unsigned int i = 0U; unsigned int i = 0U;
struct aq_hw_link_status_s link_status; struct aq_hw_link_status_s link_status;
struct aq_ring_stats_rx_s stats_rx; struct aq_ring_stats_rx_s stats_rx;
struct aq_ring_stats_tx_s stats_tx; struct aq_ring_stats_tx_s stats_tx;
atomic_inc(&self->header.busy_count);
is_busy = true;
if (aq_utils_obj_test(&self->header.flags, AQ_NIC_FLAGS_IS_NOT_READY)) if (aq_utils_obj_test(&self->header.flags, AQ_NIC_FLAGS_IS_NOT_READY))
goto err_exit; goto err_exit;
...@@ -170,8 +167,6 @@ static void aq_nic_service_timer_cb(unsigned long param) ...@@ -170,8 +167,6 @@ static void aq_nic_service_timer_cb(unsigned long param)
ndev->stats.tx_errors = stats_tx.errors; ndev->stats.tx_errors = stats_tx.errors;
err_exit: err_exit:
if (is_busy)
atomic_dec(&self->header.busy_count);
mod_timer(&self->service_timer, mod_timer(&self->service_timer,
jiffies + AQ_CFG_SERVICE_TIMER_INTERVAL); jiffies + AQ_CFG_SERVICE_TIMER_INTERVAL);
} }
...@@ -574,16 +569,12 @@ __acquires(&ring->lock) ...@@ -574,16 +569,12 @@ __acquires(&ring->lock)
unsigned int trys = AQ_CFG_LOCK_TRYS; unsigned int trys = AQ_CFG_LOCK_TRYS;
int err = 0; int err = 0;
bool is_nic_in_bad_state; bool is_nic_in_bad_state;
bool is_busy = false;
struct aq_ring_buff_s buffers[AQ_CFG_SKB_FRAGS_MAX]; struct aq_ring_buff_s buffers[AQ_CFG_SKB_FRAGS_MAX];
frags = skb_shinfo(skb)->nr_frags + 1; frags = skb_shinfo(skb)->nr_frags + 1;
ring = self->aq_ring_tx[AQ_NIC_TCVEC2RING(self, tc, vec)]; ring = self->aq_ring_tx[AQ_NIC_TCVEC2RING(self, tc, vec)];
atomic_inc(&self->header.busy_count);
is_busy = true;
if (frags > AQ_CFG_SKB_FRAGS_MAX) { if (frags > AQ_CFG_SKB_FRAGS_MAX) {
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
goto err_exit; goto err_exit;
...@@ -629,8 +620,6 @@ __acquires(&ring->lock) ...@@ -629,8 +620,6 @@ __acquires(&ring->lock)
} }
err_exit: err_exit:
if (is_busy)
atomic_dec(&self->header.busy_count);
return err; return err;
} }
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
struct aq_obj_s { struct aq_obj_s {
spinlock_t lock; /* spinlock for nic/rings processing */ spinlock_t lock; /* spinlock for nic/rings processing */
atomic_t flags; atomic_t flags;
atomic_t busy_count;
}; };
static inline void aq_utils_obj_set(atomic_t *flags, u32 mask) static inline void aq_utils_obj_set(atomic_t *flags, u32 mask)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment