Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[karo-tx-linux.git] / net / ipv4 / inet_fragment.c

diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c
index 3a88b0c73797231e1468de8297045c8ad725ccfa..b5e9317eaf9eea802089dc0c947d88a932ee857a 100644 (file)
--- a/net/ipv4/inet_fragment.c
+++ b/net/ipv4/inet_fragment.c
@@ -355,7 +355,7 @@ static struct inet_frag_queue *inet_frag_alloc(struct netns_frags *nf,
 {
        struct inet_frag_queue *q;
 
-       if (frag_mem_limit(nf) > nf->high_thresh) {
+       if (!nf->high_thresh || frag_mem_limit(nf) > nf->high_thresh) {
                inet_frag_schedule_worker(f);
                return NULL;
        }