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/orion-gbe.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/orion-gbe.c')
| -rw-r--r-- | drivers/net/orion-gbe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/orion-gbe.c b/drivers/net/orion-gbe.c index 00f5e543c1..17497047a9 100644 --- a/drivers/net/orion-gbe.c +++ b/drivers/net/orion-gbe.c @@ -303,7 +303,7 @@ static int port_recv(struct eth_device *edev) ALIGN(PKTSIZE, 8)); /* received packet is padded with two null bytes */ - net_receive(rxdesc->buf_ptr + 0x2, rxdesc->byte_cnt - 0x2); + net_receive(edev, rxdesc->buf_ptr + 0x2, rxdesc->byte_cnt - 0x2); ret = 0; recv_err: |