diff options
| author | David S. Miller <davem@davemloft.net> | 2013-03-20 17:46:26 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-20 17:46:26 +0100 |
| commit | 61816596d1c9026d0ecb20c44f90452c41596ffe (patch) | |
| tree | 3027ed6dc62f71e14b9d525405747fa0eb8f074d /drivers/net/ethernet/ti/cpsw.c | |
| parent | net: fix psock_fanout selftest hash collision (diff) | |
| parent | net: fec: Define indexes as 'unsigned int' (diff) | |
| download | linux-61816596d1c9026d0ecb20c44f90452c41596ffe.tar.xz linux-61816596d1c9026d0ecb20c44f90452c41596ffe.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull in the 'net' tree to get Daniel Borkmann's flow dissector
infrastructure change.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ti/cpsw.c')
| -rw-r--r-- | drivers/net/ethernet/ti/cpsw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 8ff1d3dde778..5ceaa4c3cfa5 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -1006,7 +1006,7 @@ static netdev_tx_t cpsw_ndo_start_xmit(struct sk_buff *skb, /* If there is no more tx desc left free then we need to * tell the kernel to stop sending us tx frames. */ - if (unlikely(cpdma_check_free_tx_desc(priv->txch))) + if (unlikely(!cpdma_check_free_tx_desc(priv->txch))) netif_stop_queue(ndev); return NETDEV_TX_OK; |