On Tue, Jun 27, 2006 at 01:46:35PM -0700, Michael Chan wrote: > On Tue, 2006-06-27 at 22:07 +1000, Herbert Xu wrote: > > > [NET]: Added GSO header verification > > > > @@ -2166,10 +2166,14 @@ struct sk_buff *tcp_tso_segment(struct s > > if (!pskb_may_pull(skb, thlen)) > > goto out; > > > > + segs = NULL; > > + if (skb_gso_ok(skb, features | NETIF_F_GSO_ROBUST)) > > + goto out; > > + > > This logic doesn't look right to me. Perhaps it's backwards and should > be: > > if (!skb_gso_ok(skb, features | NETIF_F_GSO_ROBUST))
Oops, you're absolutely right. Here is the fix. [NET]: Fix logical error in skb_gso_ok The test in skb_gso_ok is backwards. Noticed by Michael Chan <[EMAIL PROTECTED]>. Signed-off-by: Herbert Xu <[EMAIL PROTECTED]> Thanks, -- Visit Openswan at http://www.openswan.org/ Email: Herbert Xu ~{PmV>HI~} <[EMAIL PROTECTED]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt -- diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 84b0f0d..efd1e2a 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -994,12 +994,12 @@ static inline int skb_gso_ok(struct sk_b { int feature = skb_shinfo(skb)->gso_size ? skb_shinfo(skb)->gso_type << NETIF_F_GSO_SHIFT : 0; - return (features & feature) != feature; + return (features & feature) == feature; } static inline int netif_needs_gso(struct net_device *dev, struct sk_buff *skb) { - return skb_gso_ok(skb, dev->features); + return !skb_gso_ok(skb, dev->features); } #endif /* __KERNEL__ */ - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
