net: cosmetic: tftp.* checkpatch compliance

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Acked-by: Simon Glass <sjg@chromium.org>

diff --git a/include/net.h b/include/net.h
index 3dbe1544ac3a1cc888cf3149718c53cc76179078..92afc190346ed45f8e1060956f6bb1b6f46ff1a9 100644 (file)
--- a/include/net.h
+++ b/include/net.h
@@ -396,6 +396,10 @@ extern IPaddr_t    NetNtpServerIP;                 /* the ip address to NTP */
 extern int NetTimeOffset;                      /* offset time from UTC */
 #endif
 
+#if defined(CONFIG_MCAST_TFTP)
+extern IPaddr_t Mcast_addr;
+#endif
+
 /* Initialize the network adapter */
 extern int NetLoop(enum proto_t);
 

diff --git a/net/tftp.c b/net/tftp.c
index e62f2299f57c9b9b975ed11a873bfb5307329cb5..bc7fe05465cb9b4c3b0a1e8a1d45264862be7fae 100644 (file)
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -11,6 +11,9 @@
 #include <net.h>
 #include "tftp.h"
 #include "bootp.h"
+#ifdef CONFIG_SYS_DIRECT_FLASH_TFTP
+#include <flash.h>
+#endif
 
 /* Well known TFTP port # */
 #define WELL_KNOWN_PORT        69
@@ -112,10 +115,6 @@ static char default_filename[DEFAULT_NAME_LEN];
 
 static char tftp_filename[MAX_LEN];
 
-#ifdef CONFIG_SYS_DIRECT_FLASH_TFTP
-extern flash_info_t flash_info[];
-#endif
-
 /* 512 is poor choice for ethernet, MTU is typically 1500.
  * Minus eth.hdrs thats 1468.  Can get 2x better throughput with
  * almost-MTU block sizes.  At least try... fall back to 512 if need be.
@@ -137,7 +136,6 @@ static unsigned *Bitmap;
 static int PrevBitmapHole, Mapsize = MTFTP_BITMAPSIZE;
 static uchar ProhibitMcast, MasterClient;
 static uchar Multicast;
-extern IPaddr_t Mcast_addr;
 static int Mcast_port;
 static ulong TftpEndingBlock; /* can get 'last' block before done..*/
 
@@ -157,7 +155,7 @@ mcast_cleanup(void)
 
 #endif /* CONFIG_MCAST_TFTP */
 
-static __inline__ void
+static inline void
 store_block(unsigned block, uchar *src, unsigned len)
 {
        ulong offset = block * TftpBlkSize + TftpBlockWrapOffset;
@@ -182,8 +180,7 @@ store_block(unsigned block, uchar *src, unsigned len)
                        NetState = NETLOOP_FAIL;
                        return;
                }
-       }
-       else
+       } else
 #endif /* CONFIG_SYS_DIRECT_FLASH_TFTP */
        {
                (void)memcpy((void *)(load_addr + offset), src, len);
@@ -357,12 +354,14 @@ TftpSend(void)
                                0, TftpBlkSizeOption, 0);
 #ifdef CONFIG_MCAST_TFTP
                /* Check all preconditions before even trying the option */
-               if (!ProhibitMcast
-                && (Bitmap = malloc(Mapsize))
-                && eth_get_dev()->mcast) {
-                       free(Bitmap);
-                       Bitmap = NULL;
-                       pkt += sprintf((char *)pkt, "multicast%c%c", 0, 0);
+               if (!ProhibitMcast) {
+                       Bitmap = malloc(Mapsize);
+                       if (Bitmap && eth_get_dev()->mcast) {
+                               free(Bitmap);
+                               Bitmap = NULL;
+                               pkt += sprintf((char *)pkt, "multicast%c%c",
+                                       0, 0);
+                       }
                }
 #endif /* CONFIG_MCAST_TFTP */
                len = pkt - xp;
@@ -630,8 +629,7 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
                                mcast_cleanup();
                                NetState = NETLOOP_SUCCESS;
                        }
-               }
-               else
+               } else
 #endif
                if (len < TftpBlkSize)
                        tftp_complete();

diff --git a/net/tftp.h b/net/tftp.h
index c51aa253c4707fdb476442c843a9b85cbef2e461..18e4c9c25d72debace773afa62e873ba372c62fd 100644 (file)
--- a/net/tftp.h
+++ b/net/tftp.h
@@ -19,7 +19,7 @@
 void TftpStart(enum proto_t protocol); /* Begin TFTP get/put */
 
 #ifdef CONFIG_CMD_TFTPSRV
-extern void    TftpStartServer(void);  /* Wait for incoming TFTP put */
+extern void TftpStartServer(void);     /* Wait for incoming TFTP put */
 #endif
 
 /**********************************************************************/