efi_loader: simplify efi_serialize_load_option()

[platform/kernel/u-boot.git] / lib / net_utils.c

diff --git a/lib/net_utils.c b/lib/net_utils.c
index ed5044c..72a3b09 100644 (file)
--- a/lib/net_utils.c
+++ b/lib/net_utils.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <net.h>
 
 struct in_addr string_to_ip(const char *s)
 {
@@ -22,7 +23,7 @@ struct in_addr string_to_ip(const char *s)
                return addr;
 
        for (addr.s_addr = 0, i = 0; i < 4; ++i) {
-               ulong val = s ? simple_strtoul(s, &e, 10) : 0;
+               ulong val = s ? dectoul(s, &e) : 0;
                if (val > 255) {
                        addr.s_addr = 0;
                        return addr;
@@ -51,8 +52,56 @@ void string_to_enetaddr(const char *addr, uint8_t *enetaddr)
                return;
 
        for (i = 0; i < 6; ++i) {
-               enetaddr[i] = addr ? simple_strtoul(addr, &end, 16) : 0;
+               enetaddr[i] = addr ? hextoul(addr, &end) : 0;
                if (addr)
                        addr = (*end) ? end + 1 : end;
        }
 }
+
+uint compute_ip_checksum(const void *vptr, uint nbytes)
+{
+       int sum, oddbyte;
+       const unsigned short *ptr = vptr;
+
+       sum = 0;
+       while (nbytes > 1) {
+               sum += *ptr++;
+               nbytes -= 2;
+       }
+       if (nbytes == 1) {
+               oddbyte = 0;
+               ((u8 *)&oddbyte)[0] = *(u8 *)ptr;
+               ((u8 *)&oddbyte)[1] = 0;
+               sum += oddbyte;
+       }
+       sum = (sum >> 16) + (sum & 0xffff);
+       sum += (sum >> 16);
+       sum = ~sum & 0xffff;
+
+       return sum;
+}
+
+uint add_ip_checksums(uint offset, uint sum, uint new)
+{
+       ulong checksum;
+
+       sum = ~sum & 0xffff;
+       new = ~new & 0xffff;
+       if (offset & 1) {
+               /*
+                * byte-swap the sum if it came from an odd offset; since the
+                * computation is endian-independent this works.
+                */
+               new = ((new >> 8) & 0xff) | ((new << 8) & 0xff00);
+       }
+       checksum = sum + new;
+       if (checksum > 0xffff)
+               checksum -= 0xffff;
+
+       return (~checksum) & 0xffff;
+}
+
+int ip_checksum_ok(const void *addr, uint nbytes)
+{
+       return !(compute_ip_checksum(addr, nbytes) & 0xfffe);
+}