Merge with git://www.denx.de/git/u-boot.git

[platform/kernel/u-boot.git] / include / net.h

diff --git a/include/net.h b/include/net.h
index 623d225..9671948 100644 (file)
--- a/include/net.h
+++ b/include/net.h
@@ -114,6 +114,7 @@ extern void eth_try_another(int first_restart);     /* Change the device            */
 extern void eth_set_current(void);             /* set nterface to ethcur var.  */
 #endif
 extern struct eth_device *eth_get_dev(void);   /* get the current device MAC   */
+extern struct eth_device *eth_get_dev_by_name(char *devname); /* get device    */
 extern int eth_get_dev_index (void);           /* get the device index         */
 extern void eth_set_enetaddr(int num, char* a);        /* Set new MAC address          */
 
@@ -295,7 +296,7 @@ typedef struct icmphdr {
 extern IPaddr_t                NetOurGatewayIP;        /* Our gateway IP addresse      */
 extern IPaddr_t                NetOurSubnetMask;       /* Our subnet mask (0 = unknown)*/
 extern IPaddr_t                NetOurDNSIP;     /* Our Domain Name Server (0 = unknown)*/
-#if (CONFIG_BOOTP_MASK & CONFIG_BOOTP_DNS2)
+#if defined(CONFIG_BOOTP_DNS2)
 extern IPaddr_t                NetOurDNS2IP;    /* Our 2nd Domain Name Server (0 = unknown)*/
 #endif
 extern char            NetOurNISDomain[32];    /* Our NIS domain               */
@@ -340,17 +341,17 @@ typedef enum { BOOTP, RARP, ARP, TFTP, DHCP, PING, DNS, NFS, CDP, NETCONS, SNTP
 /* from net/net.c */
 extern char    BootFile[128];                  /* Boot File name               */
 
-#if (CONFIG_COMMANDS & CFG_CMD_PING)
+#if defined(CONFIG_CMD_PING)
 extern IPaddr_t        NetPingIP;                      /* the ip address to ping               */
 #endif
 
-#if (CONFIG_COMMANDS & CFG_CMD_CDP)
+#if defined(CONFIG_CMD_CDP)
 /* when CDP completes these hold the return values */
 extern ushort CDPNativeVLAN;
 extern ushort CDPApplianceVLAN;
 #endif
 
-#if (CONFIG_COMMANDS & CFG_CMD_SNTP)
+#if defined(CONFIG_CMD_SNTP)
 extern IPaddr_t        NetNtpServerIP;                 /* the ip address to NTP        */
 extern int NetTimeOffset;                      /* offset time from UTC         */
 #endif
@@ -453,7 +454,7 @@ extern IPaddr_t getenv_IPaddr (char *);
 extern ushort getenv_VLAN(char *);
 
 /* copy a filename (allow for "..." notation, limit length) */
-extern void    copy_filename (uchar *dst, uchar *src, int size);
+extern void    copy_filename (char *dst, char *src, int size);
 
 /**********************************************************************/