blob: f12db8649610d0b5ce4fb517c125f11e781f3565 [file] [log] [blame]
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>$
Subject: [PATCH] net/cpsw: revert stable patches v3.8..v3.8.9
and apply them from net & net-next branch.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
diff --git b/drivers/net/ethernet/ti/cpsw.c a/drivers/net/ethernet/ti/cpsw.c
index 3b1be52..40aff68 100644
--- b/drivers/net/ethernet/ti/cpsw.c
+++ a/drivers/net/ethernet/ti/cpsw.c
@@ -375,7 +375,7 @@ void cpsw_tx_handler(void *token, int len, int status)
struct cpsw_priv *priv = netdev_priv(ndev);
if (unlikely(netif_queue_stopped(ndev)))
- netif_wake_queue(ndev);
+ netif_start_queue(ndev);
cpts_tx_timestamp(&priv->cpts, skb);
priv->stats.tx_packets++;
priv->stats.tx_bytes += len;
@@ -1111,7 +1111,7 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,
struct platform_device *mdio;
parp = of_get_property(slave_node, "phy_id", &lenp);
- if ((parp == NULL) || (lenp != (sizeof(void *) * 2))) {
+ if ((parp == NULL) && (lenp != (sizeof(void *) * 2))) {
pr_err("Missing slave[%d] phy_id property\n", i);
ret = -EINVAL;
goto error_ret;
diff --git b/drivers/net/ethernet/ti/davinci_emac.c a/drivers/net/ethernet/ti/davinci_emac.c
index 4ebcb24..2a3e2c5 100644
--- b/drivers/net/ethernet/ti/davinci_emac.c
+++ a/drivers/net/ethernet/ti/davinci_emac.c
@@ -1055,7 +1055,7 @@ static void emac_tx_handler(void *token, int len, int status)
atomic_dec(&priv->cur_tx);
if (unlikely(netif_queue_stopped(ndev)))
- netif_wake_queue(ndev);
+ netif_start_queue(ndev);
ndev->stats.tx_packets++;
ndev->stats.tx_bytes += len;
dev_kfree_skb_any(skb);