Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 194779
b: refs/heads/master
c: b635e06
h: refs/heads/master
i:
  194777: c221248
  194775: 1026620
v: v3
  • Loading branch information
David Daney authored and David S. Miller committed May 6, 2010
1 parent 29aba00 commit 79fe5a4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a0cfa850ac639759cd68a121920f3e474ce9dfb1
refs/heads/master: b635e06993076c3c8f8cc766b183be7da3baafdb
5 changes: 2 additions & 3 deletions trunk/drivers/net/octeon/octeon_mgmt.c
Original file line number Diff line number Diff line change
Expand Up @@ -832,9 +832,9 @@ static int octeon_mgmt_open(struct net_device *netdev)
mix_irhwm.s.irhwm = 0;
cvmx_write_csr(CVMX_MIXX_IRHWM(port), mix_irhwm.u64);

/* Interrupt when we have 5 or more packets to clean. */
/* Interrupt when we have 1 or more packets to clean. */
mix_orhwm.u64 = 0;
mix_orhwm.s.orhwm = 5;
mix_orhwm.s.orhwm = 1;
cvmx_write_csr(CVMX_MIXX_ORHWM(port), mix_orhwm.u64);

/* Enable receive and transmit interrupts */
Expand Down Expand Up @@ -995,7 +995,6 @@ static int octeon_mgmt_xmit(struct sk_buff *skb, struct net_device *netdev)
cvmx_write_csr(CVMX_MIXX_ORING2(port), 1);

netdev->trans_start = jiffies;
octeon_mgmt_clean_tx_buffers(p);
octeon_mgmt_update_tx_stats(netdev);
return NETDEV_TX_OK;
}
Expand Down

0 comments on commit 79fe5a4

Please sign in to comment.