minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-17 16:07:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

net: rename NetRxPkt to NetRxPacket

Browse Source 
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>
This commit is contained in:
Mike Frysinger 2009-07-18 21:04:08 -04:00 committed by Ben Warren
parent 88a4c2e77c
commit d9bec9f42a
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/net.h
View File

@ -331,8 +331,8 @@ extern IPaddr_t NetOurIP; /* Our IP addr (0 = unknown) */
extern IPaddr_t NetServerIP; /* Server IP addr (0 = unknown) */ extern IPaddr_t NetServerIP; /* Server IP addr (0 = unknown) */
extern volatile uchar * NetTxPacket; /* THE transmit packet */ extern volatile uchar * NetTxPacket; /* THE transmit packet */
extern volatile uchar * NetRxPackets[PKTBUFSRX];/* Receive packets */ extern volatile uchar * NetRxPackets[PKTBUFSRX];/* Receive packets */
extern volatile uchar * NetRxPkt; /* Current receive packet */ extern volatile uchar * NetRxPacket; /* Current receive packet */
extern int NetRxPktLen; /* Current rx packet length */ extern int NetRxPacketLen; /* Current rx packet length */
extern unsigned NetIPID; /* IP ID (counting) */ extern unsigned NetIPID; /* IP ID (counting) */
extern uchar NetBcastAddr[6]; /* Ethernet boardcast address */ extern uchar NetBcastAddr[6]; /* Ethernet boardcast address */
extern uchar NetEtherNullAddr[6]; extern uchar NetEtherNullAddr[6];

2
net/bootp.c
View File

@ -124,7 +124,7 @@ static void BootpCopyNetParams(Bootp_t *bp)
NetCopyIP(&tmp_ip, &bp->bp_siaddr); NetCopyIP(&tmp_ip, &bp->bp_siaddr);
if (tmp_ip != 0) if (tmp_ip != 0)
NetCopyIP(&NetServerIP, &bp->bp_siaddr); NetCopyIP(&NetServerIP, &bp->bp_siaddr);
memcpy (NetServerEther, ((Ethernet_t *)NetRxPkt)->et_src, 6); memcpy (NetServerEther, ((Ethernet_t *)NetRxPacket)->et_src, 6);
#endif #endif
if (strlen(bp->bp_file) > 0) if (strlen(bp->bp_file) > 0)
copy_filename (BootFile, bp->bp_file, sizeof(BootFile)); copy_filename (BootFile, bp->bp_file, sizeof(BootFile));

8
net/net.c
View File

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