]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
refresh ipv6 patch after dropping an earlier ipv6 patch
authorChris Wright <chrisw@sous-sol.org>
Thu, 17 May 2007 21:03:10 +0000 (14:03 -0700)
committerChris Wright <chrisw@sous-sol.org>
Thu, 17 May 2007 21:03:10 +0000 (14:03 -0700)
queue-2.6.21/ipv6-do-no-rely-on-skb-dst-before-it-is-assigned.patch

index a8d34b5423b7cb1f34c08d7107c2accc5fd32a34..8e2bee1f611645f551074a7d323d146610cb98fb 100644 (file)
@@ -22,7 +22,7 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
 
 --- linux-2.6.21.1.orig/net/ipv6/exthdrs.c
 +++ linux-2.6.21.1/net/ipv6/exthdrs.c
-@@ -638,6 +638,14 @@ EXPORT_SYMBOL_GPL(ipv6_invert_rthdr);
+@@ -652,6 +652,14 @@ EXPORT_SYMBOL_GPL(ipv6_invert_rthdr);
    Hop-by-hop options.
   **********************************/
  
@@ -37,7 +37,7 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  /* Router Alert as of RFC 2711 */
  
  static int ipv6_hop_ra(struct sk_buff **skbp, int optoff)
-@@ -664,25 +672,25 @@ static int ipv6_hop_jumbo(struct sk_buff
+@@ -678,25 +686,25 @@ static int ipv6_hop_jumbo(struct sk_buff
        if (skb->nh.raw[optoff+1] != 4 || (optoff&3) != 2) {
                LIMIT_NETDEBUG(KERN_DEBUG "ipv6_hop_jumbo: wrong jumbo opt length/alignment %d\n",
                               skb->nh.raw[optoff+1]);