net: cosmetic: Clean up DNS variables and functions

[karo-tx-uboot.git] / include / net.h

diff --git a/include/net.h b/include/net.h
index 39d639f5e9e7f5cee8511022735b22400860d061..20cf65d7984822778788967eb20fcb0bab5774ef 100644 (file)
--- 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) */
@@ -512,8 +508,8 @@ extern u32  net_boot_file_size;
 extern u32     net_boot_file_expected_size_in_blocks;
 
 #if defined(CONFIG_CMD_DNS)
-extern char *NetDNSResolve;            /* The host to resolve  */
-extern char *NetDNSenvvar;             /* the env var to put the ip into */
+extern char *net_dns_resolve;          /* The host to resolve  */
+extern char *net_dns_env_var;          /* the env var to put the ip into */
 #endif
 
 #if defined(CONFIG_CMD_PING)
@@ -522,8 +518,8 @@ extern struct in_addr net_ping_ip;  /* the ip address to ping */
 
 #if defined(CONFIG_CMD_CDP)
 /* when CDP completes these hold the return values */
-extern ushort CDPNativeVLAN;           /* CDP returned native VLAN */
-extern ushort CDPApplianceVLAN;                /* CDP returned appliance VLAN */
+extern ushort cdp_native_vlan;         /* CDP returned native VLAN */
+extern ushort cdp_appliance_vlan;      /* CDP returned appliance VLAN */
 
 /*
  * Check for a CDP packet by examining the received MAC address field
@@ -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);