projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-3.3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
ethernet
/
ti
/
davinci_emac.c
diff --git
a/drivers/net/ethernet/ti/davinci_emac.c
b/drivers/net/ethernet/ti/davinci_emac.c
index 794ac30a577b61b1baaf8a1499c1e0f9ee41bcaf..4b2f54565f64adece3f69b5a89b7997666ce16e5 100644
(file)
--- a/
drivers/net/ethernet/ti/davinci_emac.c
+++ b/
drivers/net/ethernet/ti/davinci_emac.c
@@
-1009,7
+1009,7
@@
static void emac_rx_handler(void *token, int len, int status)
int ret;
/* free and bail if we are shutting down */
int ret;
/* free and bail if we are shutting down */
- if (unlikely(!netif_running(ndev)
|| !netif_carrier_ok(ndev)
)) {
+ if (unlikely(!netif_running(ndev))) {
dev_kfree_skb_any(skb);
return;
}
dev_kfree_skb_any(skb);
return;
}
@@
-1038,7
+1038,9
@@
static void emac_rx_handler(void *token, int len, int status)
recycle:
ret = cpdma_chan_submit(priv->rxchan, skb, skb->data,
skb_tailroom(skb), GFP_KERNEL);
recycle:
ret = cpdma_chan_submit(priv->rxchan, skb, skb->data,
skb_tailroom(skb), GFP_KERNEL);
- if (WARN_ON(ret < 0))
+
+ WARN_ON(ret == -ENOMEM);
+ if (unlikely(ret < 0))
dev_kfree_skb_any(skb);
}
dev_kfree_skb_any(skb);
}
@@
-1600,8
+1602,9
@@
static int emac_dev_open(struct net_device *ndev)
if (IS_ERR(priv->phydev)) {
dev_err(emac_dev, "could not connect to phy %s\n",
priv->phy_id);
if (IS_ERR(priv->phydev)) {
dev_err(emac_dev, "could not connect to phy %s\n",
priv->phy_id);
+ ret = PTR_ERR(priv->phydev);
priv->phydev = NULL;
priv->phydev = NULL;
- return
PTR_ERR(priv->phydev)
;
+ return
ret
;
}
priv->link = 0;
}
priv->link = 0;