Skip to content

Commit

Permalink
IPv6: Removing unnecessary NULL checks.
Browse files Browse the repository at this point in the history
This patch removes unnecessary NULL checks noticed by Dan Carpenter.
Checks were introduced in commit
4a287eb to net-next.

Signed-off-by: Matti Vaittinen <Mazziesaccount@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Matti Vaittinen authored and David S. Miller committed Nov 15, 2011
1 parent ad79eef commit 229a66e
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions net/ipv6/ip6_fib.c
Original file line number Diff line number Diff line change
Expand Up @@ -635,10 +635,9 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct rt6_info *rt,
{
struct rt6_info *iter = NULL;
struct rt6_info **ins;
int replace = (NULL != info &&
NULL != info->nlh &&
int replace = (NULL != info->nlh &&
(info->nlh->nlmsg_flags&NLM_F_REPLACE));
int add = ((NULL == info || NULL == info->nlh) ||
int add = (NULL == info->nlh ||
(info->nlh->nlmsg_flags&NLM_F_CREATE));
int found = 0;

Expand Down Expand Up @@ -755,7 +754,7 @@ int fib6_add(struct fib6_node *root, struct rt6_info *rt, struct nl_info *info)
int err = -ENOMEM;
int allow_create = 1;
int replace_required = 0;
if (NULL != info && NULL != info->nlh) {
if (NULL != info->nlh) {
if (!(info->nlh->nlmsg_flags&NLM_F_CREATE))
allow_create = 0;
if ((info->nlh->nlmsg_flags&NLM_F_REPLACE))
Expand Down

0 comments on commit 229a66e

Please sign in to comment.