diff options
| author | Mugunthan V N <mugunthanvnm@ti.com> | 2015-07-21 06:30:42 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-07-21 13:41:24 -0400 |
| commit | 1e353cddcf81fbb79dd637cab9a22c837e94c205 (patch) | |
| tree | f3d439ed1989dbfc160c2024baedffd47efa47ab /drivers/net | |
| parent | 0848f6428ba3a2e42db124d41ac6f548655735bf (diff) | |
drivers: net: cpsw: remove tx event processing in rx napi poll
With commit c03abd84634d ("net: ethernet: cpsw: don't requests IRQs
we don't use") common isr and napi are separated into separate tx isr
and rx isr/napi, but still in rx napi tx events are handled. So removing
the tx event handling in rx napi.
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/ti/cpsw.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index f335bf119ab5..d155bf2573cd 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c | |||
| @@ -793,9 +793,7 @@ static irqreturn_t cpsw_rx_interrupt(int irq, void *dev_id) | |||
| 793 | static int cpsw_poll(struct napi_struct *napi, int budget) | 793 | static int cpsw_poll(struct napi_struct *napi, int budget) |
| 794 | { | 794 | { |
| 795 | struct cpsw_priv *priv = napi_to_priv(napi); | 795 | struct cpsw_priv *priv = napi_to_priv(napi); |
| 796 | int num_tx, num_rx; | 796 | int num_rx; |
| 797 | |||
| 798 | num_tx = cpdma_chan_process(priv->txch, 128); | ||
| 799 | 797 | ||
| 800 | num_rx = cpdma_chan_process(priv->rxch, budget); | 798 | num_rx = cpdma_chan_process(priv->rxch, budget); |
| 801 | if (num_rx < budget) { | 799 | if (num_rx < budget) { |
| @@ -810,9 +808,8 @@ static int cpsw_poll(struct napi_struct *napi, int budget) | |||
| 810 | } | 808 | } |
| 811 | } | 809 | } |
| 812 | 810 | ||
| 813 | if (num_rx || num_tx) | 811 | if (num_rx) |
| 814 | cpsw_dbg(priv, intr, "poll %d rx, %d tx pkts\n", | 812 | cpsw_dbg(priv, intr, "poll %d rx pkts\n", num_rx); |
| 815 | num_rx, num_tx); | ||
| 816 | 813 | ||
| 817 | return num_rx; | 814 | return num_rx; |
| 818 | } | 815 | } |
