diff options
Diffstat (limited to 'br-nf-bds/linux/net/core')
| -rw-r--r-- | br-nf-bds/linux/net/core/netfilter.c | 3 | ||||
| -rw-r--r-- | br-nf-bds/linux/net/core/skbuff.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/br-nf-bds/linux/net/core/netfilter.c b/br-nf-bds/linux/net/core/netfilter.c index 573968e..198dad6 100644 --- a/br-nf-bds/linux/net/core/netfilter.c +++ b/br-nf-bds/linux/net/core/netfilter.c @@ -83,8 +83,7 @@ void nf_unregister_hook(struct nf_hook_ops *reg) /* Do exclusive ranges overlap? */ static inline int overlap(int min1, int max1, int min2, int max2) { - return (min1 >= min2 && min1 < max2) - || (max1 > min2 && max1 <= max2); + return max1 > min2 && min1 < max2; } /* Functions to register sockopt ranges (exclusive). */ diff --git a/br-nf-bds/linux/net/core/skbuff.c b/br-nf-bds/linux/net/core/skbuff.c index 3a95500..d492fed 100644 --- a/br-nf-bds/linux/net/core/skbuff.c +++ b/br-nf-bds/linux/net/core/skbuff.c @@ -4,7 +4,7 @@ * Authors: Alan Cox <iiitac@pyr.swan.ac.uk> * Florian La Roche <rzsfl@rz.uni-sb.de> * - * Version: $Id: skbuff.c,v 1.1 2002/06/02 20:51:42 bdschuym Exp $ + * Version: $Id: skbuff.c,v 1.2 2002/08/24 08:45:29 bdschuym Exp $ * * Fixes: * Alan Cox : Fixed the worst of the load balancer bugs. @@ -754,7 +754,7 @@ int ___pskb_trim(struct sk_buff *skb, unsigned int len, int realloc) if (skb_cloned(skb)) { if (!realloc) BUG(); - if (!pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) + if (pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) return -ENOMEM; } if (len <= offset) { |