diff options
| author | Joe Hershberger <joe.hershberger@ni.com> | 2015-03-22 17:09:11 -0500 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-04-18 11:11:12 -0600 |
| commit | 2a504df00652ede0316e2cf872ab065090617a8e (patch) | |
| tree | 51f6c95bf713ecb9aca694e8fe0825252c6adc1c /include/net.h | |
| parent | 05c3e68f8518809616cd4ec5523d3f1e423ee41a (diff) | |
| download | blackbird-obmc-uboot-2a504df00652ede0316e2cf872ab065090617a8e.tar.gz blackbird-obmc-uboot-2a504df00652ede0316e2cf872ab065090617a8e.zip | |
net: Clean up network stack names used in DM drivers
Take the opportunity to enforce better names on newly written or
retrofitted Ethernet drivers.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include/net.h')
| -rw-r--r-- | include/net.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/net.h b/include/net.h index 9c5dea58f9..a536fcc061 100644 --- a/include/net.h +++ b/include/net.h @@ -468,7 +468,11 @@ extern uchar NetServerEther[6]; /* Boot server enet address */ extern IPaddr_t NetOurIP; /* Our IP addr (0 = unknown) */ extern IPaddr_t NetServerIP; /* Server IP addr (0 = unknown) */ extern uchar *NetTxPacket; /* THE transmit packet */ +#ifdef CONFIG_DM_ETH +extern uchar *net_rx_packets[PKTBUFSRX]; /* Receive packets */ +#else extern uchar *NetRxPackets[PKTBUFSRX]; /* Receive packets */ +#endif extern uchar *NetRxPacket; /* Current receive packet */ extern int NetRxPacketLen; /* Current rx packet length */ extern unsigned NetIPID; /* IP ID (counting) */ @@ -618,8 +622,11 @@ static inline void NetSendPacket(uchar *pkt, int len) int NetSendUDPPacket(uchar *ether, IPaddr_t dest, int dport, int sport, int payload_len); +#ifndef CONFIG_DM_ETH +#define NetReceive(in_packet, len) net_process_received_packet(in_packet, len) +#endif /* Processes a received packet */ -void NetReceive(uchar *, int); +void net_process_received_packet(uchar *in_packet, int len); #ifdef CONFIG_NETCONSOLE void NcStart(void); |
