aboutsummaryrefslogtreecommitdiff
path: root/include/net.h
diff options
context:
space:
mode:
authorJoe Hershberger2015-04-08 01:41:06 -0500
committerSimon Glass2015-04-18 11:11:33 -0600
commit1fd92db83d399ff7918e51ba84bc73d2466b5eb6 (patch)
tree6d42cf4bc236ce7024c179e492957d9a1316f644 /include/net.h
parent1203fcceec113d502995f7242d7e1be09d373e80 (diff)
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 'include/net.h')
-rw-r--r--include/net.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/include/net.h b/include/net.h
index 294dc401406..502e0c29f98 100644
--- a/include/net.h
+++ b/include/net.h
@@ -482,11 +482,7 @@ extern u8 net_server_ethaddr[6]; /* Boot server enet address */
extern struct in_addr net_ip; /* Our IP addr (0 = unknown) */
extern struct in_addr net_server_ip; /* Server IP addr (0 = unknown) */
extern uchar *net_tx_packet; /* 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 *net_rx_packet; /* Current receive packet */
extern int net_rx_packet_len; /* Current rx packet length */
extern unsigned NetIPID; /* IP ID (counting) */
@@ -640,9 +636,6 @@ static inline void net_send_packet(uchar *pkt, int len)
int net_send_udp_packet(uchar *ether, struct in_addr 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 net_process_received_packet(uchar *in_packet, int len);