diff options
| author | Joe Hershberger <joe.hershberger@ni.com> | 2015-04-08 01:41:06 -0500 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-04-18 11:11:33 -0600 |
| commit | 1fd92db83d399ff7918e51ba84bc73d2466b5eb6 (patch) | |
| tree | 6d42cf4bc236ce7024c179e492957d9a1316f644 /drivers/net/dc2114x.c | |
| parent | 1203fcceec113d502995f7242d7e1be09d373e80 (diff) | |
| download | u-boot-imx-1fd92db83d399ff7918e51ba84bc73d2466b5eb6.zip u-boot-imx-1fd92db83d399ff7918e51ba84bc73d2466b5eb6.tar.gz u-boot-imx-1fd92db83d399ff7918e51ba84bc73d2466b5eb6.tar.bz2 | |
net: cosmetic: Fix var naming net <-> eth drivers
Update the naming convention used in the network stack functions and
variables that Ethernet drivers use to interact with it.
This cleans up the temporary hacks that were added to this interface
along with the DM support.
This patch has a few remaining checkpatch.pl failures that would be out
of the scope of this patch to fix (drivers that are in gross violation
of checkpatch.pl).
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/net/dc2114x.c')
| -rw-r--r-- | drivers/net/dc2114x.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c index 799839c..8245cf5 100644 --- a/drivers/net/dc2114x.c +++ b/drivers/net/dc2114x.c @@ -333,9 +333,11 @@ static int dc21x4x_init(struct eth_device* dev, bd_t* bis) for (i = 0; i < NUM_RX_DESC; i++) { rx_ring[i].status = cpu_to_le32(R_OWN); rx_ring[i].des1 = cpu_to_le32(RX_BUFF_SZ); - rx_ring[i].buf = cpu_to_le32(phys_to_bus((u32) NetRxPackets[i])); + rx_ring[i].buf = cpu_to_le32( + phys_to_bus((u32)net_rx_packets[i])); #ifdef CONFIG_TULIP_FIX_DAVICOM - rx_ring[i].next = cpu_to_le32(phys_to_bus((u32) &rx_ring[(i+1) % NUM_RX_DESC])); + rx_ring[i].next = cpu_to_le32( + phys_to_bus((u32)&rx_ring[(i + 1) % NUM_RX_DESC])); #else rx_ring[i].next = 0; #endif @@ -448,7 +450,8 @@ static int dc21x4x_recv(struct eth_device* dev) /* Pass the packet up to the protocol * layers. */ - NetReceive(NetRxPackets[rx_new], length - 4); + net_process_received_packet( + net_rx_packets[rx_new], length - 4); } /* Change buffer ownership for this frame, back |