diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-06-04 21:03:45 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-06-04 21:03:45 +0200 |
commit | a3dfea9af8d31d27b0d9957965d1056912041321 (patch) | |
tree | 3b25fbb33a1f74d69ba7fa5b350bf406cdb1596d /drivers/net/gianfar.c | |
parent | 6331e58a2c99009587eeb2252d0c6ac9de882c1c (diff) | |
parent | 15b0abce264be775aa63dc0de9c74d39529baf84 (diff) | |
download | barebox-a3dfea9af8d31d27b0d9957965d1056912041321.tar.gz barebox-a3dfea9af8d31d27b0d9957965d1056912041321.tar.xz |
Merge branch 'for-next/net'
Conflicts:
drivers/net/dm9k.c
Diffstat (limited to 'drivers/net/gianfar.c')
-rw-r--r-- | drivers/net/gianfar.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index f944c6c060..3370b5cdb3 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c @@ -413,7 +413,7 @@ static int gfar_recv(struct eth_device *edev) /* Send the packet up if there were no errors */ if (!(priv->rxbd[priv->rxidx].status & RXBD_STATS)) { - net_receive(NetRxPackets[priv->rxidx], length - 4); + net_receive(edev, NetRxPackets[priv->rxidx], length - 4); } else { dev_err(dev, "Got error %x\n", (priv->rxbd[priv->rxidx].status & RXBD_STATS)); |