Merge branch 'master' of git://git.denx.de/u-boot-arm

[u-boot] / drivers / net / netconsole.c

diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index f5329a594e8c2d7367ddf37ab30ae230e42dff3a..e40efb826bb13973a621584afedaf3c00886ee7d 100644 (file)
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -40,13 +40,14 @@ static short nc_port;                       /* source/target port */
 static const char *output_packet;      /* used by first send udp */
 static int output_packet_len = 0;
 
-static void nc_wait_arp_handler (uchar * pkt, unsigned dest, unsigned src,
+static void nc_wait_arp_handler(uchar *pkt, unsigned dest,
+                                IPaddr_t sip, unsigned src,
                                 unsigned len)
 {
        NetState = NETLOOP_SUCCESS;     /* got arp reply - quit net loop */
 }
 
-static void nc_handler (uchar * pkt, unsigned dest, unsigned src,
+static void nc_handler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
                        unsigned len)
 {
        if (input_size)
@@ -139,7 +140,7 @@ static void nc_send_packet (const char *buf, int len)
                eth_halt ();
 }
 
-int nc_start (void)
+static int nc_start(void)
 {
        int netmask, our_ip;
 
@@ -169,7 +170,7 @@ int nc_start (void)
        return 0;
 }
 
-void nc_putc (char c)
+static void nc_putc(char c)
 {
        if (output_recursion)
                return;
@@ -180,7 +181,7 @@ void nc_putc (char c)
        output_recursion = 0;
 }
 
-void nc_puts (const char *s)
+static void nc_puts(const char *s)
 {
        int len;
 
@@ -196,7 +197,7 @@ void nc_puts (const char *s)
        output_recursion = 0;
 }
 
-int nc_getc (void)
+static int nc_getc(void)
 {
        uchar c;
 
@@ -217,7 +218,7 @@ int nc_getc (void)
        return c;
 }
 
-int nc_tstc (void)
+static int nc_tstc(void)
 {
        struct eth_device *eth;