mx28evk: Fix PSWITCH key position

[karo-tx-uboot.git] / net / bootp.c

diff --git a/net/bootp.c b/net/bootp.c
index 009369b3bd382c236387eb28bba94714b92954e5..0f0867b1c492dd65bbae9575c55636179f85aae5 100644 (file)
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -18,7 +18,6 @@
 #ifdef CONFIG_STATUS_LED
 #include <status_led.h>
 #endif
-#include <linux/compiler.h>
 
 #define BOOTP_VENDOR_MAGIC     0x63825363      /* RFC1048 Magic Cookie */
 
@@ -96,15 +95,15 @@ static int BootpCheckPkt(uchar *pkt, unsigned dest, unsigned src, unsigned len)
  */
 static void BootpCopyNetParams(struct Bootp_t *bp)
 {
-       __maybe_unused IPaddr_t tmp_ip;
-
-       NetCopyIP(&NetOurIP, &bp->bp_yiaddr);
 #if !defined(CONFIG_BOOTP_SERVERIP)
+       IPaddr_t tmp_ip;
+
        NetCopyIP(&tmp_ip, &bp->bp_siaddr);
        if (tmp_ip != 0)
                NetCopyIP(&NetServerIP, &bp->bp_siaddr);
        memcpy(NetServerEther, ((struct ethernet_hdr *)NetRxPacket)->et_src, 6);
 #endif
+       NetCopyIP(&NetOurIP, &bp->bp_yiaddr);
        if (strlen(bp->bp_file) > 0)
                copy_filename(BootFile, bp->bp_file, sizeof(BootFile));
 
@@ -327,8 +326,13 @@ static void
 BootpTimeout(void)
 {
        if (BootpTry >= TIMEOUT_COUNT) {
+#ifdef CONFIG_BOOTP_MAY_FAIL
+               puts("\nRetry count exceeded\n");
+               NetSetState(NETLOOP_FAIL);
+#else
                puts("\nRetry count exceeded; starting again\n");
                NetStartAgain();
+#endif
        } else {
                NetSetTimeout(TIMEOUT, BootpTimeout);
                BootpRequest();
@@ -581,7 +585,8 @@ BootpRequest(void)
 {
        uchar *pkt, *iphdr;
        struct Bootp_t *bp;
-       int ext_len, pktlen, iplen;
+       int extlen, pktlen, iplen;
+       int eth_hdr_size;
 #ifdef CONFIG_BOOTP_RANDOM_DELAY
        ulong i, rand_ms;
 #endif
@@ -610,7 +615,8 @@ BootpRequest(void)
        pkt = NetTxPacket;
        memset((void *)pkt, 0, PKTSIZE);
 
-       pkt += NetSetEther(pkt, NetBcastAddr, PROT_IP);
+       eth_hdr_size = NetSetEther(pkt, NetBcastAddr, PROT_IP);
+       pkt += eth_hdr_size;
 
        /*
         * Next line results in incorrect packet size being transmitted,
@@ -619,9 +625,9 @@ BootpRequest(void)
         * determined.
         * C. Hallinan, DS4.COM, Inc.
         */
-       /* NetSetIP(pkt, 0xFFFFFFFFL, PORT_BOOTPS, PORT_BOOTPC,
+       /* net_set_udp_header(pkt, 0xFFFFFFFFL, PORT_BOOTPS, PORT_BOOTPC,
                sizeof (struct Bootp_t)); */
-       iphdr = pkt;    /* We need this later for NetSetIP() */
+       iphdr = pkt;    /* We need this later for net_set_udp_header() */
        pkt += IP_UDP_HDR_SIZE;
 
        bp = (struct Bootp_t *)pkt;
@@ -639,9 +645,9 @@ BootpRequest(void)
 
        /* Request additional information from the BOOTP/DHCP server */
 #if defined(CONFIG_CMD_DHCP)
-       ext_len = DhcpExtended((u8 *)bp->bp_vend, DHCP_DISCOVER, 0, 0);
+       extlen = DhcpExtended((u8 *)bp->bp_vend, DHCP_DISCOVER, 0, 0);
 #else
-       ext_len = BootpExtended((u8 *)bp->bp_vend);
+       extlen = BootpExtended((u8 *)bp->bp_vend);
 #endif
 
        /*
@@ -660,17 +666,16 @@ BootpRequest(void)
         * Calculate proper packet lengths taking into account the
         * variable size of the options field
         */
-       pktlen = ((int)(pkt-NetTxPacket)) + BOOTP_HDR_SIZE -
-               sizeof(bp->bp_vend) + ext_len;
-       iplen = BOOTP_HDR_SIZE - sizeof(bp->bp_vend) + ext_len;
-       NetSetIP(iphdr, 0xFFFFFFFFL, PORT_BOOTPS, PORT_BOOTPC, iplen);
+       iplen = BOOTP_HDR_SIZE - OPT_FIELD_SIZE + extlen;
+       pktlen = eth_hdr_size + IP_UDP_HDR_SIZE + iplen;
+       net_set_udp_header(iphdr, 0xFFFFFFFFL, PORT_BOOTPS, PORT_BOOTPC, iplen);
        NetSetTimeout(SELECT_TIMEOUT, BootpTimeout);
 
 #if defined(CONFIG_CMD_DHCP)
        dhcp_state = SELECTING;
-       NetSetHandler(DhcpHandler);
+       net_set_udp_handler(DhcpHandler);
 #else
-       NetSetHandler(BootpHandler);
+       net_set_udp_handler(BootpHandler);
 #endif
        NetSendPacket(NetTxPacket, pktlen);
 }
@@ -798,13 +803,15 @@ static void DhcpSendRequestPkt(struct Bootp_t *bp_offer)
        uchar *pkt, *iphdr;
        struct Bootp_t *bp;
        int pktlen, iplen, extlen;
+       int eth_hdr_size;
        IPaddr_t OfferedIP;
 
        debug("DhcpSendRequestPkt: Sending DHCPREQUEST\n");
        pkt = NetTxPacket;
        memset((void *)pkt, 0, PKTSIZE);
 
-       pkt += NetSetEther(pkt, NetBcastAddr, PROT_IP);
+       eth_hdr_size = NetSetEther(pkt, NetBcastAddr, PROT_IP);
+       pkt += eth_hdr_size;
 
        iphdr = pkt;    /* We'll need this later to set proper pkt size */
        pkt += IP_UDP_HDR_SIZE;
@@ -841,15 +848,14 @@ static void DhcpSendRequestPkt(struct Bootp_t *bp_offer)
        extlen = DhcpExtended((u8 *)bp->bp_vend, DHCP_REQUEST,
                NetDHCPServerIP, OfferedIP);
 
-       pktlen = ((int)(pkt-NetTxPacket)) + BOOTP_HDR_SIZE -
-               sizeof(bp->bp_vend) + extlen;
-       iplen = BOOTP_HDR_SIZE - sizeof(bp->bp_vend) + extlen;
-       NetSetIP(iphdr, 0xFFFFFFFFL, PORT_BOOTPS, PORT_BOOTPC, iplen);
+       iplen = BOOTP_HDR_SIZE - OPT_FIELD_SIZE + extlen;
+       pktlen = eth_hdr_size + IP_UDP_HDR_SIZE + iplen;
+       net_set_udp_header(iphdr, 0xFFFFFFFFL, PORT_BOOTPS, PORT_BOOTPC, iplen);
 
-       debug("Transmitting DHCPREQUEST packet: len = %d\n", pktlen);
 #ifdef CONFIG_BOOTP_DHCP_REQUEST_DELAY
        udelay(CONFIG_BOOTP_DHCP_REQUEST_DELAY);
 #endif /* CONFIG_BOOTP_DHCP_REQUEST_DELAY */
+       debug("Transmitting DHCPREQUEST packet: len = %d\n", pktlen);
        NetSendPacket(NetTxPacket, pktlen);
 }