diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/octeon/ethernet-rx.c | 1 | ||||
| -rw-r--r-- | drivers/staging/octeon/ethernet-spi.c | 2 | ||||
| -rw-r--r-- | drivers/staging/octeon/ethernet-tx.c | 1 |
3 files changed, 0 insertions, 4 deletions
diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c index 6ca935ba7f4a..85c5dc15e668 100644 --- a/drivers/staging/octeon/ethernet-rx.c +++ b/drivers/staging/octeon/ethernet-rx.c @@ -101,7 +101,6 @@ static inline int cvm_oct_check_rcv_error(cvmx_wqe_t *work) gmxx_rxx_frm_ctl.u64 = cvmx_read_csr(CVMX_GMXX_RXX_FRM_CTL(index, interface)); if (gmxx_rxx_frm_ctl.s.pre_chk == 0) { - u8 *ptr = cvmx_phys_to_ptr(work->packet_ptr.s.addr); int i = 0; diff --git a/drivers/staging/octeon/ethernet-spi.c b/drivers/staging/octeon/ethernet-spi.c index 2ae1944b3a1b..063dcd07557b 100644 --- a/drivers/staging/octeon/ethernet-spi.c +++ b/drivers/staging/octeon/ethernet-spi.c @@ -167,9 +167,7 @@ static void cvm_oct_spi_poll(struct net_device *dev) int interface; for (interface = 0; interface < 2; interface++) { - if ((priv->port == interface * 16) && need_retrain[interface]) { - if (cvmx_spi_restart_interface (interface, CVMX_SPI_MODE_DUPLEX, 10) == 0) { need_retrain[interface] = 0; diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c index 5df4d01eb2c3..f085491bdc88 100644 --- a/drivers/staging/octeon/ethernet-tx.c +++ b/drivers/staging/octeon/ethernet-tx.c @@ -427,7 +427,6 @@ dont_put_skbuff_in_hw: /* Drop this packet if we have too many already queued to the HW */ if (unlikely(skb_queue_len(&priv->tx_free_list[qos]) >= MAX_OUT_QUEUE_DEPTH)) { - if (dev->tx_queue_len != 0) { /* Drop the lock when notifying the core. */ spin_unlock_irqrestore(&priv->tx_free_list[qos].lock, |