network drivers: call net_receive directly instead of NetReceive
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
663a6269f2
commit
c70689d727
|
@ -190,7 +190,7 @@ static int at91rm9200_eth_rx (struct eth_device *edev)
|
|||
return 0;
|
||||
|
||||
size = rbfp->size & RBF_SIZE;
|
||||
NetReceive ((volatile uchar *) (rbfp->addr & RBF_ADDR), size);
|
||||
net_receive((volatile uchar *) (rbfp->addr & RBF_ADDR), size);
|
||||
|
||||
rbfp->addr &= ~RBF_OWNER;
|
||||
if (rbfp->addr & RBF_WRAP)
|
||||
|
|
|
@ -309,7 +309,7 @@ static int cs8900_recv(struct eth_device *dev)
|
|||
if (len & 1) {
|
||||
*addr++ = readw(priv->regs + CS8900_RTDATA0);
|
||||
}
|
||||
NetReceive(NetRxPackets[0], len);
|
||||
net_receive(NetRxPackets[0], len);
|
||||
|
||||
return len;
|
||||
}
|
||||
|
|
|
@ -416,7 +416,7 @@ static int dm9000_eth_rx (struct eth_device *edev)
|
|||
|
||||
/* Pass to upper layer */
|
||||
debug("passing packet to upper layer\n");
|
||||
NetReceive(NetRxPackets[0], RxLen);
|
||||
net_receive(NetRxPackets[0], RxLen);
|
||||
return RxLen;
|
||||
}
|
||||
return 0;
|
||||
|
|
|
@ -335,9 +335,9 @@ static int ep93xx_eth_rcv_packet(struct eth_device *edev)
|
|||
* protocol stack. We track the total number of
|
||||
* bytes in the frame (nbytes_frame) which will be
|
||||
* used when we pass the data off to the protocol
|
||||
* layer via NetReceive().
|
||||
* layer via net_receive().
|
||||
*/
|
||||
NetReceive((uchar *)priv->rx_dq.current->word1,
|
||||
net_receive((uchar *)priv->rx_dq.current->word1,
|
||||
RX_STATUS_FRAME_LEN(priv->rx_sq.current));
|
||||
pr_debug("reporting %d bytes...\n",
|
||||
RX_STATUS_FRAME_LEN(priv->rx_sq.current));
|
||||
|
|
|
@ -515,7 +515,7 @@ static int fec_recv(struct eth_device *dev)
|
|||
*/
|
||||
frame = phys_to_virt(readl(&rbd->data_pointer));
|
||||
frame_length = readw(&rbd->data_length) - 4;
|
||||
NetReceive(frame->data, frame_length);
|
||||
net_receive(frame->data, frame_length);
|
||||
len = frame_length;
|
||||
} else {
|
||||
if (bd_status & FEC_RBD_ERR) {
|
||||
|
|
|
@ -645,7 +645,7 @@ static int mpc5xxx_fec_recv(struct eth_device *dev)
|
|||
*/
|
||||
memcpy(buff, frame->head, 14);
|
||||
memcpy(buff + 14, frame->data, frame_length);
|
||||
NetReceive(buff, frame_length);
|
||||
net_receive(buff, frame_length);
|
||||
len = frame_length;
|
||||
}
|
||||
/*
|
||||
|
|
|
@ -190,7 +190,7 @@ static int macb_recv(struct eth_device *edev)
|
|||
buffer = (void *)NetRxPackets[0];
|
||||
}
|
||||
|
||||
NetReceive(buffer, length);
|
||||
net_receive(buffer, length);
|
||||
if (++rx_tail >= CFG_MACB_RX_RING_SIZE)
|
||||
rx_tail = 0;
|
||||
reclaim_rx_buffers(macb, rx_tail);
|
||||
|
|
|
@ -111,7 +111,7 @@ static int netx_eth_rx (struct eth_device *edev)
|
|||
/* get data */
|
||||
memcpy((void*)NetRxPackets[0], (void *)(SRAM_BASE(seg) + frameno * 1560), len);
|
||||
/* pass to barebox */
|
||||
NetReceive(NetRxPackets[0], len);
|
||||
net_receive(NetRxPackets[0], len);
|
||||
|
||||
PFIFO_REG(PFIFO_BASE(EMPTY_PTR_FIFO(xcno))) =
|
||||
FIFO_PTR_SEGMENT(seg) |
|
||||
|
|
|
@ -1156,7 +1156,7 @@ static int smc91c111_eth_rx(struct eth_device *edev)
|
|||
|
||||
if (!is_error) {
|
||||
/* Pass the packet up to the protocol layers. */
|
||||
NetReceive(NetRxPackets[0], packet_length);
|
||||
net_receive(NetRxPackets[0], packet_length);
|
||||
return packet_length;
|
||||
}
|
||||
|
||||
|
|
|
@ -668,7 +668,7 @@ static int smc911x_eth_rx(struct eth_device *edev)
|
|||
": dropped bad packet. Status: 0x%08x\n",
|
||||
status);
|
||||
else
|
||||
NetReceive(NetRxPackets[0], pktlen);
|
||||
net_receive(NetRxPackets[0], pktlen);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
|
@ -48,7 +48,7 @@ int tap_eth_rx (struct eth_device *edev)
|
|||
length = linux_read_nonblock(priv->fd, NetRxPackets[0], PKTSIZE);
|
||||
|
||||
if (length > 0)
|
||||
NetReceive(NetRxPackets[0], length);
|
||||
net_receive(NetRxPackets[0], length);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -425,7 +425,7 @@ static int asix_rx_fixup(struct usbnet *dev, void *buf, int len)
|
|||
return 0;
|
||||
}
|
||||
|
||||
NetReceive(buf, size);
|
||||
net_receive(buf, size);
|
||||
|
||||
buf += ((size + 1) & 0xfffe);
|
||||
len -= ((size + 1) & 0xfffe);
|
||||
|
|
|
@ -137,7 +137,7 @@ static int usbnet_recv(struct eth_device *edev)
|
|||
if (info->rx_fixup)
|
||||
return info->rx_fixup(dev, rx_buf, alen);
|
||||
else
|
||||
NetReceive(rx_buf, alen);
|
||||
net_receive(rx_buf, alen);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
Loading…
Reference in New Issue