Fix new found CFG_

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

diff --git a/include/net.h b/include/net.h
index 9a2f03f..d2d394f 100644 (file)
--- a/include/net.h
+++ b/include/net.h
@@ -38,16 +38,16 @@
 #define CONFIG_NET_MULTI
 #if (CONFIG_ETHER_INDEX == 1)
 #define        CONFIG_ETHER_ON_FCC1
-# define CFG_CMXFCR_MASK1      CFG_CMXFCR_MASK
-# define CFG_CMXFCR_VALUE1     CFG_CMXFCR_VALUE
+# define CONFIG_SYS_CMXFCR_MASK1       CONFIG_SYS_CMXFCR_MASK
+# define CONFIG_SYS_CMXFCR_VALUE1      CONFIG_SYS_CMXFCR_VALUE
 #elif (CONFIG_ETHER_INDEX == 2)
 #define        CONFIG_ETHER_ON_FCC2
-# define CFG_CMXFCR_MASK2      CFG_CMXFCR_MASK
-# define CFG_CMXFCR_VALUE2     CFG_CMXFCR_VALUE
+# define CONFIG_SYS_CMXFCR_MASK2       CONFIG_SYS_CMXFCR_MASK
+# define CONFIG_SYS_CMXFCR_VALUE2      CONFIG_SYS_CMXFCR_VALUE
 #elif (CONFIG_ETHER_INDEX == 3)
 #define        CONFIG_ETHER_ON_FCC3
-# define CFG_CMXFCR_MASK3      CFG_CMXFCR_MASK
-# define CFG_CMXFCR_VALUE3     CFG_CMXFCR_VALUE
+# define CONFIG_SYS_CMXFCR_MASK3       CONFIG_SYS_CMXFCR_MASK
+# define CONFIG_SYS_CMXFCR_VALUE3      CONFIG_SYS_CMXFCR_VALUE
 #endif /* CONFIG_ETHER_INDEX */
 #endif /* CONFIG_ETHER_ON_FCC */
 #endif /* !CONFIG_NET_MULTI && CONFIG_8260 */
@@ -61,8 +61,8 @@
  *
  */
 
-#ifdef CFG_RX_ETH_BUFFER
-# define PKTBUFSRX     CFG_RX_ETH_BUFFER
+#ifdef CONFIG_SYS_RX_ETH_BUFFER
+# define PKTBUFSRX     CONFIG_SYS_RX_ETH_BUFFER
 #else
 # define PKTBUFSRX     4
 #endif
@@ -200,6 +200,12 @@ typedef struct {
        ushort          udp_xsum;       /* Checksum                     */
 } IP_t;
 
+#define IP_OFFS                0x1fff /* ip offset *= 8 */
+#define IP_FLAGS       0xe000 /* first 3 bits */
+#define IP_FLAGS_RES   0x8000 /* reserved */
+#define IP_FLAGS_DFRAG 0x4000 /* don't fragments */
+#define IP_FLAGS_MFRAG 0x2000 /* more fragments */
+
 #define IP_HDR_SIZE_NO_UDP     (sizeof (IP_t) - 8)
 #define IP_HDR_SIZE            (sizeof (IP_t))
 
@@ -240,7 +246,7 @@ typedef struct
 /*
  * ICMP stuff (just enough to handle (host) redirect messages)
  */
-#define ICMP_ECHO_REPLY                0       /* Echo reply                   */
+#define ICMP_ECHO_REPLY                0       /* Echo reply                   */
 #define ICMP_REDIRECT          5       /* Redirect (change route)      */
 #define ICMP_ECHO_REQUEST      8       /* Echo request                 */
 
@@ -327,12 +333,12 @@ extern unsigned           NetIPID;                /* IP ID (counting)             */
 extern uchar           NetBcastAddr[6];        /* Ethernet boardcast address   */
 extern uchar           NetEtherNullAddr[6];
 
-#define VLAN_NONE      4095                    /* untagged                     */
-#define VLAN_IDMASK    0x0fff                  /* mask of valid vlan id        */
-extern ushort          NetOurVLAN;             /* Our VLAN                     */
-extern ushort          NetOurNativeVLAN;       /* Our Native VLAN              */
+#define VLAN_NONE      4095                    /* untagged                     */
+#define VLAN_IDMASK    0x0fff                  /* mask of valid vlan id        */
+extern ushort          NetOurVLAN;             /* Our VLAN                     */
+extern ushort          NetOurNativeVLAN;       /* Our Native VLAN              */
 
-extern uchar           NetCDPAddr[6];          /* Ethernet CDP address         */
+extern uchar           NetCDPAddr[6];          /* Ethernet CDP address         */
 extern ushort          CDPNativeVLAN;          /* CDP returned native VLAN     */
 extern ushort          CDPApplianceVLAN;       /* CDP returned appliance VLAN  */
 
@@ -352,7 +358,7 @@ typedef enum { BOOTP, RARP, ARP, TFTP, DHCP, PING, DNS, NFS, CDP, NETCONS, SNTP
 extern char    BootFile[128];                  /* Boot File name               */
 
 #if defined(CONFIG_CMD_PING)
-extern IPaddr_t        NetPingIP;                      /* the ip address to ping               */
+extern IPaddr_t        NetPingIP;                      /* the ip address to ping               */
 #endif
 
 #if defined(CONFIG_CMD_CDP)
@@ -362,7 +368,7 @@ extern ushort CDPApplianceVLAN;
 #endif
 
 #if defined(CONFIG_CMD_SNTP)
-extern IPaddr_t        NetNtpServerIP;                 /* the ip address to NTP        */
+extern IPaddr_t        NetNtpServerIP;                 /* the ip address to NTP        */
 extern int NetTimeOffset;                      /* offset time from UTC         */
 #endif
 
@@ -376,7 +382,7 @@ extern void NetStop(void);
 extern void    NetStartAgain(void);
 
 /* Get size of the ethernet header when we send */
-extern int     NetEthHdrSize(void);
+extern int     NetEthHdrSize(void);
 
 /* Set ethernet header; returns the size of the header */
 extern int     NetSetEther(volatile uchar *, uchar *, uint);