Skip to content

Commit

Permalink
wil6210: inline functions for vring hi/lo watermarks
Browse files Browse the repository at this point in the history
Provide clear definition of the watermarks for the vring descriptor space.

Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Vladimir Kondratiev authored and John W. Linville committed May 29, 2014
1 parent fc219ee commit 5bb6423
Showing 1 changed file with 18 additions and 2 deletions.
20 changes: 18 additions & 2 deletions drivers/net/wireless/ath/wil6210/txrx.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,22 @@ static inline int wil_vring_avail_tx(struct vring *vring)
return vring->size - used - 1;
}

/**
* wil_vring_wmark_low - low watermark for available descriptor space
*/
static inline int wil_vring_wmark_low(struct vring *vring)
{
return vring->size/8;
}

/**
* wil_vring_wmark_high - high watermark for available descriptor space
*/
static inline int wil_vring_wmark_high(struct vring *vring)
{
return vring->size/4;
}

static int wil_vring_alloc(struct wil6210_priv *wil, struct vring *vring)
{
struct device *dev = wil_to_dev(wil);
Expand Down Expand Up @@ -1007,7 +1023,7 @@ netdev_tx_t wil_start_xmit(struct sk_buff *skb, struct net_device *ndev)
rc = wil_tx_vring(wil, vring, skb);

/* do we still have enough room in the vring? */
if (wil_vring_avail_tx(vring) < vring->size/8)
if (wil_vring_avail_tx(vring) < wil_vring_wmark_low(vring))
netif_tx_stop_all_queues(wil_to_ndev(wil));

switch (rc) {
Expand Down Expand Up @@ -1116,7 +1132,7 @@ int wil_tx_complete(struct wil6210_priv *wil, int ringid)
done++;
}
}
if (wil_vring_avail_tx(vring) > vring->size/4)
if (wil_vring_avail_tx(vring) > wil_vring_wmark_high(vring))
netif_tx_wake_all_queues(wil_to_ndev(wil));

return done;
Expand Down

0 comments on commit 5bb6423

Please sign in to comment.