iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wil6210: inline functions for vring hi/lo watermarks

Browse Source 
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>
This commit is contained in:
Vladimir Kondratiev 2014-05-27 14:45:46 +03:00 committed by John W. Linville
parent fc219eed07
commit 5bb6423e8f
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/net/wireless/ath/wil6210/txrx.c
View File

@ -64,6 +64,22 @@ static inline int wil_vring_avail_tx(struct vring *vring)
return vring->size - used - 1; 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) static int wil_vring_alloc(struct wil6210_priv *wil, struct vring *vring)
{ {
struct device *dev = wil_to_dev(wil); struct device *dev = wil_to_dev(wil);
@ -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); rc = wil_tx_vring(wil, vring, skb);
/* do we still have enough room in the vring? */ /* 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)); netif_tx_stop_all_queues(wil_to_ndev(wil));
switch (rc) { switch (rc) {
@ -1116,7 +1132,7 @@ int wil_tx_complete(struct wil6210_priv *wil, int ringid)
done++; 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)); netif_tx_wake_all_queues(wil_to_ndev(wil));
return done; return done;