diff options
author | David Daney <ddaney@caviumnetworks.com> | 2010-05-05 09:03:11 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-05-06 00:22:34 -0400 |
commit | b635e06993076c3c8f8cc766b183be7da3baafdb (patch) | |
tree | 0195c38348de31f61379e1cf78e8b6ffb2b65273 /drivers/net/octeon | |
parent | a0cfa850ac639759cd68a121920f3e474ce9dfb1 (diff) |
netdev: octeon_mgmt: Free TX skbufs in a timely manner.
We also reduce the high water mark to 1 so skbufs are not stranded for
long periods of time. Since we are cleaning after each packet, no
need to do it in the transmit path.
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/octeon')
-rw-r--r-- | drivers/net/octeon/octeon_mgmt.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/octeon/octeon_mgmt.c b/drivers/net/octeon/octeon_mgmt.c index 633fa89c442f..3cf6f62502c8 100644 --- a/drivers/net/octeon/octeon_mgmt.c +++ b/drivers/net/octeon/octeon_mgmt.c | |||
@@ -832,9 +832,9 @@ static int octeon_mgmt_open(struct net_device *netdev) | |||
832 | mix_irhwm.s.irhwm = 0; | 832 | mix_irhwm.s.irhwm = 0; |
833 | cvmx_write_csr(CVMX_MIXX_IRHWM(port), mix_irhwm.u64); | 833 | cvmx_write_csr(CVMX_MIXX_IRHWM(port), mix_irhwm.u64); |
834 | 834 | ||
835 | /* Interrupt when we have 5 or more packets to clean. */ | 835 | /* Interrupt when we have 1 or more packets to clean. */ |
836 | mix_orhwm.u64 = 0; | 836 | mix_orhwm.u64 = 0; |
837 | mix_orhwm.s.orhwm = 5; | 837 | mix_orhwm.s.orhwm = 1; |
838 | cvmx_write_csr(CVMX_MIXX_ORHWM(port), mix_orhwm.u64); | 838 | cvmx_write_csr(CVMX_MIXX_ORHWM(port), mix_orhwm.u64); |
839 | 839 | ||
840 | /* Enable receive and transmit interrupts */ | 840 | /* Enable receive and transmit interrupts */ |
@@ -995,7 +995,6 @@ static int octeon_mgmt_xmit(struct sk_buff *skb, struct net_device *netdev) | |||
995 | cvmx_write_csr(CVMX_MIXX_ORING2(port), 1); | 995 | cvmx_write_csr(CVMX_MIXX_ORING2(port), 1); |
996 | 996 | ||
997 | netdev->trans_start = jiffies; | 997 | netdev->trans_start = jiffies; |
998 | octeon_mgmt_clean_tx_buffers(p); | ||
999 | octeon_mgmt_update_tx_stats(netdev); | 998 | octeon_mgmt_update_tx_stats(netdev); |
1000 | return NETDEV_TX_OK; | 999 | return NETDEV_TX_OK; |
1001 | } | 1000 | } |