summaryrefslogtreecommitdiff
path: root/include/net/netns
diff options
context:
space:
mode:
authorClark Williams <williams@redhat.com>2012-02-03 15:10:42 -0600
committerClark Williams <williams@redhat.com>2012-02-03 15:10:42 -0600
commit77f57fb93d132875acead3581bcdc5d2fefbe7a0 (patch)
tree5db5ccf5e1754248edc790e2f37f3a2b863f0ddb /include/net/netns
parentd28048db190097536aef2be5ee9a736bd7bb92eb (diff)
parent69bade053d0f2ef0c8ee98af9f6699a55a8d8bb9 (diff)
Merge commit 'v3.2.3' into rt-3.2.3-rt10
Diffstat (limited to 'include/net/netns')
-rw-r--r--include/net/netns/generic.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/netns/generic.h b/include/net/netns/generic.h
index 3419bf5cd154..d55f43443335 100644
--- a/include/net/netns/generic.h
+++ b/include/net/netns/generic.h
@@ -41,6 +41,7 @@ static inline void *net_generic(const struct net *net, int id)
ptr = ng->ptr[id - 1];
rcu_read_unlock();
+ BUG_ON(!ptr);
return ptr;
}
#endif