net: rename NetRxPkt to NetRxPacket

The net code is mostly consistent in using 'Packet' rather than 'Pkt', so
rename the minor detractor to follow suite.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>

diff --git a/include/net.h b/include/net.h
index 5a1d36ee3113c57bb3a3fd51f77edeb7fdebe42d..88a951357168b0e57c05447bc1fb12a517e73560 100644 (file)
--- a/include/net.h
+++ b/include/net.h
@@ -331,8 +331,8 @@ extern IPaddr_t             NetOurIP;               /* Our    IP addr (0 = unknown) */
 extern IPaddr_t                NetServerIP;            /* Server IP addr (0 = unknown) */
 extern volatile uchar * NetTxPacket;           /* THE transmit packet          */
 extern volatile uchar * NetRxPackets[PKTBUFSRX];/* Receive packets             */
-extern volatile uchar * NetRxPkt;              /* Current receive packet       */
-extern int             NetRxPktLen;            /* Current rx packet length     */
+extern volatile uchar * NetRxPacket;           /* Current receive packet       */
+extern int             NetRxPacketLen;         /* Current rx packet length     */
 extern unsigned                NetIPID;                /* IP ID (counting)             */
 extern uchar           NetBcastAddr[6];        /* Ethernet boardcast address   */
 extern uchar           NetEtherNullAddr[6];

diff --git a/net/bootp.c b/net/bootp.c
index 77057c6c0a7b2c51e29dc4ed0482a6f8d1cd5992..d5f9c4be6d32dffb3508f9a70a9c0988bc98917c 100644 (file)
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -124,7 +124,7 @@ static void BootpCopyNetParams(Bootp_t *bp)
        NetCopyIP(&tmp_ip, &bp->bp_siaddr);
        if (tmp_ip != 0)
                NetCopyIP(&NetServerIP, &bp->bp_siaddr);
-       memcpy (NetServerEther, ((Ethernet_t *)NetRxPkt)->et_src, 6);
+       memcpy (NetServerEther, ((Ethernet_t *)NetRxPacket)->et_src, 6);
 #endif
        if (strlen(bp->bp_file) > 0)
                copy_filename (BootFile, bp->bp_file, sizeof(BootFile));

diff --git a/net/net.c b/net/net.c
index 5637cf54f6d64efe21a8a168b050262d51a83756..e215fd8d9a997ccc8b46c7b78f991feda135b8f2 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -139,8 +139,8 @@ uchar               NetServerEther[6] =     /* Boot server enet address             */
                        { 0, 0, 0, 0, 0, 0 };
 IPaddr_t       NetOurIP;               /* Our IP addr (0 = unknown)            */
 IPaddr_t       NetServerIP;            /* Server IP addr (0 = unknown)         */
-volatile uchar *NetRxPkt;              /* Current receive packet               */
-int            NetRxPktLen;            /* Current rx packet length             */
+volatile uchar *NetRxPacket;           /* Current receive packet               */
+int            NetRxPacketLen;         /* Current rx packet length             */
 unsigned       NetIPID;                /* IP packet ID                         */
 uchar          NetBcastAddr[6] =       /* Ethernet bcast address               */
                        { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
@@ -1122,8 +1122,8 @@ NetReceive(volatile uchar * inpkt, int len)
        printf("packet received\n");
 #endif
 
-       NetRxPkt = inpkt;
-       NetRxPktLen = len;
+       NetRxPacket = inpkt;
+       NetRxPacketLen = len;
        et = (Ethernet_t *)inpkt;
 
        /* too small packet? */