summaryrefslogtreecommitdiffstats
path: root/net/ping.c
diff options
context:
space:
mode:
authorJoe Hershberger <joe.hershberger@ni.com>2012-05-23 07:58:05 +0000
committerJoe Hershberger <joe.hershberger@ni.com>2012-05-23 17:46:14 -0500
commitc5c59df04d6bb394209936c2a2c2a3054ead9150 (patch)
tree166890b8221e53b6a11de975626b1e0c3fd4634e /net/ping.c
parent594c26f8a7dbb83243a5168378a2164fa08d6dd8 (diff)
downloadtalos-obmc-uboot-c5c59df04d6bb394209936c2a2c2a3054ead9150.zip
talos-obmc-uboot-c5c59df04d6bb394209936c2a2c2a3054ead9150.tar.gz
net: cosmetic: Split struct ip_udp_hdr into ip_hdr
Add a structure that only contains IP header fields to be used by functions that don't need UDP Rename IP_HDR_SIZE_NO_UDP to IP_HDR_SIZE Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Diffstat (limited to 'net/ping.c')
-rw-r--r--net/ping.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ping.c b/net/ping.c
index 6a2e85d..8542e22 100644
--- a/net/ping.c
+++ b/net/ping.c
@@ -44,7 +44,7 @@ static int ping_send(void)
/* IP_HDR_SIZE / 4 (not including UDP) */
ip->ip_hl_v = 0x45;
ip->ip_tos = 0;
- ip->ip_len = htons(IP_HDR_SIZE_NO_UDP + 8);
+ ip->ip_len = htons(IP_HDR_SIZE + 8);
ip->ip_id = htons(NetIPID++);
ip->ip_off = htons(IP_FLAGS_DFRAG); /* Don't fragment */
ip->ip_ttl = 255;
@@ -54,7 +54,7 @@ static int ping_send(void)
NetCopyIP((void *)&ip->ip_src, &NetOurIP);
/* - "" - */
NetCopyIP((void *)&ip->ip_dst, &NetPingIP);
- ip->ip_sum = ~NetCksum((uchar *)ip, IP_HDR_SIZE_NO_UDP / 2);
+ ip->ip_sum = ~NetCksum((uchar *)ip, IP_HDR_SIZE / 2);
s = &ip->udp_src; /* XXX ICMP starts here */
s[0] = htons(0x0800); /* echo-request, code */
@@ -65,7 +65,7 @@ static int ping_send(void)
/* size of the waiting packet */
NetArpWaitTxPacketSize =
- (pkt - NetArpWaitTxPacket) + IP_HDR_SIZE_NO_UDP + 8;
+ (pkt - NetArpWaitTxPacket) + IP_HDR_SIZE + 8;
/* and do the ARP request */
NetArpWaitTry = 1;
@@ -125,12 +125,12 @@ void ping_receive(Ethernet_t *et, struct ip_udp_hdr *ip, int len)
NetCopyIP((void *)&ip->ip_dst, &ip->ip_src);
NetCopyIP((void *)&ip->ip_src, &NetOurIP);
ip->ip_sum = ~NetCksum((uchar *)ip,
- IP_HDR_SIZE_NO_UDP >> 1);
+ IP_HDR_SIZE >> 1);
icmph->type = ICMP_ECHO_REPLY;
icmph->checksum = 0;
icmph->checksum = ~NetCksum((uchar *)icmph,
- (len - IP_HDR_SIZE_NO_UDP) >> 1);
+ (len - IP_HDR_SIZE) >> 1);
(void) eth_send((uchar *)et,
ETHER_HDR_SIZE + len);
return;
OpenPOWER on IntegriCloud