[brcm63xx] refresh kernel patches

[openwrt.git] / package / busybox / patches / 241-udhcpc-oversized_packets.patch

diff --git a/package/busybox/patches/241-udhcpc-oversized_packets.patch b/package/busybox/patches/241-udhcpc-oversized_packets.patch
index d324d75..9379491 100644 (file)
--- a/package/busybox/patches/241-udhcpc-oversized_packets.patch
+++ b/package/busybox/patches/241-udhcpc-oversized_packets.patch
@@ -1,7 +1,8 @@
-diff -ruN busybox-1.3.1-old/networking/udhcp/packet.c busybox-1.3.1/networking/udhcp/packet.c
---- busybox-1.3.1-old/networking/udhcp/packet.c        2006-12-27 05:52:33.000000000 +0100
-+++ busybox-1.3.1/networking/udhcp/packet.c    2006-12-28 05:38:36.000000000 +0100
-@@ -107,6 +107,10 @@
+Index: busybox-1.7.2/networking/udhcp/packet.c
+===================================================================
+--- busybox-1.7.2.orig/networking/udhcp/packet.c       2007-10-30 15:35:00.000000000 -0500
++++ busybox-1.7.2/networking/udhcp/packet.c    2007-10-30 15:35:01.000000000 -0500
+@@ -121,6 +121,10 @@
        return ~sum;
  }
  
@@ -12,7 +13,7 @@ diff -ruN busybox-1.3.1-old/networking/udhcp/packet.c busybox-1.3.1/networking/u
  
  /* Construct a ip/udp header for a packet, and specify the source and dest hardware address */
  void BUG_sizeof_struct_udp_dhcp_packet_must_be_576(void);
-@@ -118,6 +122,7 @@
+@@ -132,6 +136,7 @@
        int result;
        struct sockaddr_ll dest;
        struct udp_dhcp_packet packet;
@@ -20,7 +21,7 @@ diff -ruN busybox-1.3.1-old/networking/udhcp/packet.c busybox-1.3.1/networking/u
  
        fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP));
        if (fd < 0) {
-@@ -127,6 +132,7 @@
+@@ -141,6 +146,7 @@
  
        memset(&dest, 0, sizeof(dest));
        memset(&packet, 0, sizeof(packet));
@@ -28,7 +29,7 @@ diff -ruN busybox-1.3.1-old/networking/udhcp/packet.c busybox-1.3.1/networking/u
  
        dest.sll_family = AF_PACKET;
        dest.sll_protocol = htons(ETH_P_IP);
-@@ -144,12 +150,13 @@
+@@ -158,12 +164,13 @@
        packet.ip.daddr = dest_ip;
        packet.udp.source = htons(source_port);
        packet.udp.dest = htons(dest_port);
@@ -46,7 +47,7 @@ diff -ruN busybox-1.3.1-old/networking/udhcp/packet.c busybox-1.3.1/networking/u
        packet.ip.ihl = sizeof(packet.ip) >> 2;
        packet.ip.version = IPVERSION;
        packet.ip.ttl = IPDEFTTL;
-@@ -158,7 +165,7 @@
+@@ -172,7 +179,7 @@
        if (sizeof(struct udp_dhcp_packet) != 576)
                BUG_sizeof_struct_udp_dhcp_packet_must_be_576();
  
@@ -55,7 +56,7 @@ diff -ruN busybox-1.3.1-old/networking/udhcp/packet.c busybox-1.3.1/networking/u
                        (struct sockaddr *) &dest, sizeof(dest));
        if (result <= 0) {
                bb_perror_msg("sendto");
-@@ -205,7 +212,7 @@
+@@ -216,7 +223,7 @@
                return -1;
        }
  
@@ -64,10 +65,11 @@ diff -ruN busybox-1.3.1-old/networking/udhcp/packet.c busybox-1.3.1/networking/u
        close(fd);
        return result;
  }
-diff -ruN busybox-1.3.1-old/networking/udhcp/common.h busybox-1.3.1/networking/udhcp/common.h
---- busybox-1.3.1-old/networking/udhcp/common.h        2006-12-27 05:52:33.000000000 +0100
-+++ busybox-1.3.1/networking/udhcp/common.h    2006-12-28 05:17:06.000000000 +0100
-@@ -26,6 +26,8 @@
+Index: busybox-1.7.2/networking/udhcp/common.h
+===================================================================
+--- busybox-1.7.2.orig/networking/udhcp/common.h       2007-10-30 15:35:00.000000000 -0500
++++ busybox-1.7.2/networking/udhcp/common.h    2007-10-30 15:35:01.000000000 -0500
+@@ -21,6 +21,8 @@
  #include <netinet/udp.h>
  #include <netinet/ip.h>
  
@@ -76,7 +78,7 @@ diff -ruN busybox-1.3.1-old/networking/udhcp/common.h busybox-1.3.1/networking/u
  struct dhcpMessage {
        uint8_t op;
        uint8_t htype;
-@@ -42,7 +44,7 @@
+@@ -37,7 +39,7 @@
        uint8_t sname[64];
        uint8_t file[128];
        uint32_t cookie;