Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-25 23:06:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: Use new checksum functions

Browse source 
Drop the old checksum functions in favour of the new ones.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Simon Glass 2015-01-19 22:16:08 -07:00
parent 360334a178
commit 0da0fcd51f
3 changed files with 6 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/net.h
View file

@ -512,10 +512,6 @@ unsigned add_ip_checksums(unsigned offset, unsigned sum, unsigned new_sum);
*/ */
int ip_checksum_ok(const void *addr, unsigned nbytes); int ip_checksum_ok(const void *addr, unsigned nbytes);
/* Checksum */
extern int NetCksumOk(uchar *, int); /* Return true if cksum OK */
extern uint NetCksum(uchar *, int); /* Calculate the checksum */
/* Callbacks */ /* Callbacks */
extern rxhand_f *net_get_udp_handler(void); /* Get UDP RX packet handler */ extern rxhand_f *net_get_udp_handler(void); /* Get UDP RX packet handler */
extern void net_set_udp_handler(rxhand_f *); /* Set UDP RX packet handler */ extern void net_set_udp_handler(rxhand_f *); /* Set UDP RX packet handler */

25
net/net.c
View file

@ -1086,7 +1086,7 @@ NetReceive(uchar *inpkt, int len)
if ((ip->ip_hl_v & 0x0f) > 0x05) if ((ip->ip_hl_v & 0x0f) > 0x05)
return; return;
/* Check the Checksum of the header */ /* Check the Checksum of the header */
if (!NetCksumOk((uchar *)ip, IP_HDR_SIZE / 2)) { if (!ip_checksum_ok((uchar *)ip, IP_HDR_SIZE)) {
debug("checksum bad\n"); debug("checksum bad\n");
return; return;
} }
@ -1290,27 +1290,6 @@ common:
} }
/**********************************************************************/ /**********************************************************************/
int
NetCksumOk(uchar *ptr, int len)
{
return !((NetCksum(ptr, len) + 1) & 0xfffe);
}
unsigned
NetCksum(uchar *ptr, int len)
{
ulong xsum;
ushort *p = (ushort *)ptr;
xsum = 0;
while (len-- > 0)
xsum += *p++;
xsum = (xsum & 0xffff) + (xsum >> 16);
xsum = (xsum & 0xffff) + (xsum >> 16);
return xsum & 0xffff;
}
int int
NetEthHdrSize(void) NetEthHdrSize(void)
{ {
@ -1410,7 +1389,7 @@ void net_set_udp_header(uchar *pkt, IPaddr_t dest, int dport, int sport,
net_set_ip_header(pkt, dest, NetOurIP); net_set_ip_header(pkt, dest, NetOurIP);
ip->ip_len = htons(IP_UDP_HDR_SIZE + len); ip->ip_len = htons(IP_UDP_HDR_SIZE + len);
ip->ip_p = IPPROTO_UDP; ip->ip_p = IPPROTO_UDP;
ip->ip_sum = ~NetCksum((uchar *)ip, IP_HDR_SIZE >> 1); ip->ip_sum = compute_ip_checksum(ip, IP_HDR_SIZE);
ip->udp_src = htons(sport); ip->udp_src = htons(sport);
ip->udp_dst = htons(dport); ip->udp_dst = htons(dport);

10
net/ping.c
View file

@ -29,14 +29,14 @@ static void set_icmp_header(uchar *pkt, IPaddr_t dest)
ip->ip_len = htons(IP_ICMP_HDR_SIZE); ip->ip_len = htons(IP_ICMP_HDR_SIZE);
ip->ip_p = IPPROTO_ICMP; ip->ip_p = IPPROTO_ICMP;
ip->ip_sum = ~NetCksum((uchar *)ip, IP_HDR_SIZE >> 1); ip->ip_sum = compute_ip_checksum(ip, IP_HDR_SIZE);
icmp->type = ICMP_ECHO_REQUEST; icmp->type = ICMP_ECHO_REQUEST;
icmp->code = 0; icmp->code = 0;
icmp->checksum = 0; icmp->checksum = 0;
icmp->un.echo.id = 0; icmp->un.echo.id = 0;
icmp->un.echo.sequence = htons(PingSeqNo++); icmp->un.echo.sequence = htons(PingSeqNo++);
icmp->checksum = ~NetCksum((uchar *)icmp, ICMP_HDR_SIZE >> 1); icmp->checksum = compute_ip_checksum(icmp, ICMP_HDR_SIZE);
} }
static int ping_send(void) static int ping_send(void)
@ -101,13 +101,11 @@ void ping_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len)
ip->ip_off = 0; ip->ip_off = 0;
NetCopyIP((void *)&ip->ip_dst, &ip->ip_src); NetCopyIP((void *)&ip->ip_dst, &ip->ip_src);
NetCopyIP((void *)&ip->ip_src, &NetOurIP); NetCopyIP((void *)&ip->ip_src, &NetOurIP);
ip->ip_sum = ~NetCksum((uchar *)ip, ip->ip_sum = compute_ip_checksum(ip, IP_HDR_SIZE);
IP_HDR_SIZE >> 1);
icmph->type = ICMP_ECHO_REPLY; icmph->type = ICMP_ECHO_REPLY;
icmph->checksum = 0; icmph->checksum = 0;
icmph->checksum = ~NetCksum((uchar *)icmph, icmph->checksum = compute_ip_checksum(icmph, len - IP_HDR_SIZE);
(len - IP_HDR_SIZE) >> 1);
NetSendPacket((uchar *)et, eth_hdr_size + len); NetSendPacket((uchar *)et, eth_hdr_size + len);
return; return;
/* default: /* default: