projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: axi_emac: Put iobase to private structure
[oweals/u-boot.git]
/
drivers
/
net
/
uli526x.c
diff --git
a/drivers/net/uli526x.c
b/drivers/net/uli526x.c
index 538f11e3ebaed699ae8443ddbb27ada04e2a5e22..47cdb858c7731211c0114cc6e5fca70cbc8dd592 100644
(file)
--- a/
drivers/net/uli526x.c
+++ b/
drivers/net/uli526x.c
@@
-548,7
+548,7
@@
static int uli526x_rx_packet(struct eth_device *dev)
rdes0 = le32_to_cpu(rxptr->rdes0);
#ifdef RX_DEBUG
rdes0 = le32_to_cpu(rxptr->rdes0);
#ifdef RX_DEBUG
- printf("%s(): rxptr->rdes0=%x
:%x
\n", __FUNCTION__, rxptr->rdes0);
+ printf("%s(): rxptr->rdes0=%x\n", __FUNCTION__, rxptr->rdes0);
#endif
if (!(rdes0 & 0x80000000)) { /* packet owner check */
if ((rdes0 & 0x300) != 0x300) {
#endif
if (!(rdes0 & 0x80000000)) { /* packet owner check */
if ((rdes0 & 0x300) != 0x300) {
@@
-587,7
+587,8
@@
static int uli526x_rx_packet(struct eth_device *dev)
__FUNCTION__, i, rxptr->rx_buf_ptr[i]);
#endif
__FUNCTION__, i, rxptr->rx_buf_ptr[i]);
#endif
- NetReceive((uchar *)rxptr->rx_buf_ptr, rxlen);
+ net_process_received_packet(
+ (uchar *)rxptr->rx_buf_ptr, rxlen);
uli526x_reuse_buf(rxptr);
} else {
uli526x_reuse_buf(rxptr);
} else {
@@
-709,7
+710,7
@@
static void allocate_rx_buffer(struct uli526x_board_info *db)
u32 addr;
for (index = 0; index < RX_DESC_CNT; index++) {
u32 addr;
for (index = 0; index < RX_DESC_CNT; index++) {
- addr = (u32)
NetRxP
ackets[index];
+ addr = (u32)
net_rx_p
ackets[index];
addr += (16 - (addr & 15));
rxptr->rx_buf_ptr = (char *) addr;
rxptr->rdes2 = cpu_to_le32(addr);
addr += (16 - (addr & 15));
rxptr->rx_buf_ptr = (char *) addr;
rxptr->rdes2 = cpu_to_le32(addr);