[package] nvram: handle nvram at varying offsets within the eraseblock (fixes Edimax...

[openwrt.git] / package / busybox / patches / 460-truncated_ping_results.patch

diff --git a/package/busybox/patches/460-truncated_ping_results.patch b/package/busybox/patches/460-truncated_ping_results.patch
index f45caac..25f0555 100644 (file)
--- a/package/busybox/patches/460-truncated_ping_results.patch
+++ b/package/busybox/patches/460-truncated_ping_results.patch
@@ -1,8 +1,6 @@
-Index: busybox-1.15.3/networking/ping.c
-===================================================================
---- busybox-1.15.3.orig/networking/ping.c      2010-02-28 13:47:00.000000000 +0100
-+++ busybox-1.15.3/networking/ping.c   2010-02-28 13:47:19.000000000 +0100
-@@ -79,6 +79,7 @@
+--- a/networking/ping.c
++++ b/networking/ping.c
+@@ -79,6 +79,7 @@ static int in_cksum(unsigned short *buf,

  /* simple version */
  
  static char *hostname;
  /* simple version */
  
  static char *hostname;


@@ -10,7 +8,7 @@ Index: busybox-1.15.3/networking/ping.c
  
  static void noresp(int ign UNUSED_PARAM)
  {
  
  static void noresp(int ign UNUSED_PARAM)
  {

-@@ -91,7 +92,7 @@
+@@ -91,7 +92,7 @@ static void ping4(len_and_sockaddr *lsa)

        struct sockaddr_in pingaddr;
        struct icmp *pkt;
        int pingsock, c;
        struct sockaddr_in pingaddr;
        struct icmp *pkt;
        int pingsock, c;


@@ -19,7 +17,7 @@ Index: busybox-1.15.3/networking/ping.c
  
        pingsock = create_icmp_socket();
        pingaddr = lsa->u.sin;
  
        pingsock = create_icmp_socket();
        pingaddr = lsa->u.sin;

-@@ -101,7 +102,7 @@
+@@ -101,7 +102,7 @@ static void ping4(len_and_sockaddr *lsa)

        pkt->icmp_type = ICMP_ECHO;
        pkt->icmp_cksum = in_cksum((unsigned short *) pkt, sizeof(packet));
  
        pkt->icmp_type = ICMP_ECHO;
        pkt->icmp_cksum = in_cksum((unsigned short *) pkt, sizeof(packet));
  


@@ -28,7 +26,7 @@ Index: busybox-1.15.3/networking/ping.c
                           (struct sockaddr *) &pingaddr, sizeof(pingaddr));
  
        /* listen for replies */
                           (struct sockaddr *) &pingaddr, sizeof(pingaddr));
  
        /* listen for replies */

-@@ -135,7 +136,7 @@
+@@ -135,7 +136,7 @@ static void ping6(len_and_sockaddr *lsa)

        struct icmp6_hdr *pkt;
        int pingsock, c;
        int sockopt;
        struct icmp6_hdr *pkt;
        int pingsock, c;
        int sockopt;


@@ -37,7 +35,7 @@ Index: busybox-1.15.3/networking/ping.c
  
        pingsock = create_icmp6_socket();
        pingaddr = lsa->u.sin6;
  
        pingsock = create_icmp6_socket();
        pingaddr = lsa->u.sin6;

-@@ -147,7 +148,7 @@
+@@ -147,7 +148,7 @@ static void ping6(len_and_sockaddr *lsa)

        sockopt = offsetof(struct icmp6_hdr, icmp6_cksum);
        setsockopt(pingsock, SOL_RAW, IPV6_CHECKSUM, &sockopt, sizeof(sockopt));
  
        sockopt = offsetof(struct icmp6_hdr, icmp6_cksum);
        setsockopt(pingsock, SOL_RAW, IPV6_CHECKSUM, &sockopt, sizeof(sockopt));