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/dm9k.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/dm9k.c')
| -rw-r--r-- | drivers/net/dm9k.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/dm9k.c b/drivers/net/dm9k.c index 7c706e515b..3a4c6aacdc 100644 --- a/drivers/net/dm9k.c +++ b/drivers/net/dm9k.c @@ -634,7 +634,7 @@ static int dm9k_eth_rx(struct eth_device *edev) dev_dbg(dev, "Receiving packet\n"); dm9k_rd(priv->buswidth, priv->iodata, priv->pckt, rx_len); dev_dbg(dev, "passing %u bytes packet to upper layer\n", rx_len); - net_receive(priv->pckt, rx_len); + net_receive(edev, priv->pckt, rx_len); return 0; } else { dev_dbg(dev, "Discarding packet\n"); |