From 9c4b824a69cc22fe4007bf98dfab5608f5cb1c37 Mon Sep 17 00:00:00 2001 From: Thomas Graf Date: Wed, 13 Jun 2012 22:40:15 +0000 Subject: [PATCH] --- yaml --- r: 314266 b: refs/heads/master c: b3908e22ad8bb6074934496ef171fd83605d7d3e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/dcb/dcbnl.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1c452c2de8f1..d6e8672361ca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 39912f9cf9603f0de085fb5ba916a7a88010ccd9 +refs/heads/master: b3908e22ad8bb6074934496ef171fd83605d7d3e diff --git a/trunk/net/dcb/dcbnl.c b/trunk/net/dcb/dcbnl.c index da6ee81ce51f..0a360072cfec 100644 --- a/trunk/net/dcb/dcbnl.c +++ b/trunk/net/dcb/dcbnl.c @@ -208,10 +208,7 @@ static struct sk_buff *dcbnl_newmsg(int type, u8 cmd, u32 port, u32 seq, return NULL; nlh = nlmsg_put(skb, port, seq, type, sizeof(*dcb), flags); - if (!nlh) { - /* header should always fit, allocation must be buggy */ - BUG(); - } + BUG_ON(!nlh); dcb = nlmsg_data(nlh); dcb->dcb_family = AF_UNSPEC;