lkml.org 
[lkml]   [2007]   [Sep]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: Linux 2.6.20.19
    diff --git a/Makefile b/Makefile
    index 48daec7..6bb9f2e 100644
    --- a/Makefile
    +++ b/Makefile
    @@ -1,7 +1,7 @@
    VERSION = 2
    PATCHLEVEL = 6
    SUBLEVEL = 20
    -EXTRAVERSION = .18
    +EXTRAVERSION = .19
    NAME = Homicidal Dwarf Hamster

    # *DOCUMENTATION*
    diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c
    index de96e1a..82a3444 100644
    --- a/net/ipv6/exthdrs.c
    +++ b/net/ipv6/exthdrs.c
    @@ -653,6 +653,14 @@ EXPORT_SYMBOL_GPL(ipv6_invert_rthdr);
    Hop-by-hop options.
    **********************************/

    +/*
    + * Note: we cannot rely on skb->dst before we assign it in ip6_route_input().
    + */
    +static inline struct inet6_dev *ipv6_skb_idev(struct sk_buff *skb)
    +{
    + return skb->dst ? ip6_dst_idev(skb->dst) : __in6_dev_get(skb->dev);
    +}
    +
    /* Router Alert as of RFC 2711 */

    static int ipv6_hop_ra(struct sk_buff **skbp, int optoff)
    @@ -679,25 +687,25 @@ static int ipv6_hop_jumbo(struct sk_buff **skbp, int optoff)
    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]);
    - IP6_INC_STATS_BH(ip6_dst_idev(skb->dst),
    + IP6_INC_STATS_BH(ipv6_skb_idev(skb),
    IPSTATS_MIB_INHDRERRORS);
    goto drop;
    }

    pkt_len = ntohl(*(__be32*)(skb->nh.raw+optoff+2));
    if (pkt_len <= IPV6_MAXPLEN) {
    - IP6_INC_STATS_BH(ip6_dst_idev(skb->dst), IPSTATS_MIB_INHDRERRORS);
    + IP6_INC_STATS_BH(ipv6_skb_idev(skb), IPSTATS_MIB_INHDRERRORS);
    icmpv6_param_prob(skb, ICMPV6_HDR_FIELD, optoff+2);
    return 0;
    }
    if (skb->nh.ipv6h->payload_len) {
    - IP6_INC_STATS_BH(ip6_dst_idev(skb->dst), IPSTATS_MIB_INHDRERRORS);
    + IP6_INC_STATS_BH(ipv6_skb_idev(skb), IPSTATS_MIB_INHDRERRORS);
    icmpv6_param_prob(skb, ICMPV6_HDR_FIELD, optoff);
    return 0;
    }

    if (pkt_len > skb->len - sizeof(struct ipv6hdr)) {
    - IP6_INC_STATS_BH(ip6_dst_idev(skb->dst), IPSTATS_MIB_INTRUNCATEDPKTS);
    + IP6_INC_STATS_BH(ipv6_skb_idev(skb), IPSTATS_MIB_INTRUNCATEDPKTS);
    goto drop;
    }

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2007-09-08 21:45    [W:0.023 / U:31.300 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site