projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test/py: fs: add fstest/unlink test
[oweals/u-boot.git]
/
drivers
/
net
/
dc2114x.c
diff --git
a/drivers/net/dc2114x.c
b/drivers/net/dc2114x.c
index 799839c4f1d90bbd96fcfae67004570565446dca..8d7c271038c69986bf1b4a80db02734877c06ff9 100644
(file)
--- a/
drivers/net/dc2114x.c
+++ b/
drivers/net/dc2114x.c
@@
-1,6
+1,4
@@
-/*
- * SPDX-License-Identifier: GPL-2.0+
- */
+// SPDX-License-Identifier: GPL-2.0+
#include <common.h>
#include <malloc.h>
#include <common.h>
#include <malloc.h>
@@
-333,9
+331,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);
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
#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
#else
rx_ring[i].next = 0;
#endif
@@
-448,7
+448,8
@@
static int dc21x4x_recv(struct eth_device* dev)
/* Pass the packet up to the protocol
* layers.
*/
/* 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
}
/* Change buffer ownership for this frame, back
@@
-747,7
+748,7
@@
static void update_srom(struct eth_device *dev, bd_t *bis)
uchar enetaddr[6];
/* Ethernet Addr... */
uchar enetaddr[6];
/* Ethernet Addr... */
- if (!eth_
getenv
_enetaddr("ethaddr", enetaddr))
+ if (!eth_
env_get
_enetaddr("ethaddr", enetaddr))
return;
eeprom[0x0a] = (enetaddr[1] << 8) | enetaddr[0];
eeprom[0x0b] = (enetaddr[3] << 8) | enetaddr[2];
return;
eeprom[0x0a] = (enetaddr[1] << 8) | enetaddr[0];
eeprom[0x0b] = (enetaddr[3] << 8) | enetaddr[2];