From fc454b01d6d0dcccae792403ea91f8e5a2cff1fd Mon Sep 17 00:00:00 2001 From: Hans Zhang Date: Mon, 22 Oct 2012 22:21:23 +0000 Subject: [PATCH] --- yaml --- r: 340463 b: refs/heads/master c: c80bbeaec98b36eeba9c6c77061226034d5c4622 h: refs/heads/master i: 340461: 4c9ed1b5bfde286c38cf6e2d9b5e80ac73a8f0de 340459: 2581c74644e21c3d0a4af5a8b4e9446d32a0345a 340455: cfa0fafa5ff96719fe6bd6efa2da580a744bfdae 340447: 4ca7ef594b8f5c7d85acbfa5763ffa585ed0514c v: v3 --- [refs] | 2 +- trunk/net/core/rtnetlink.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c7d13c2f4fde..6a15e0f0d528 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 45f00f99d6e73a7b9e1d7dc191f78357f550d5b5 +refs/heads/master: c80bbeaec98b36eeba9c6c77061226034d5c4622 diff --git a/trunk/net/core/rtnetlink.c b/trunk/net/core/rtnetlink.c index 76d4c2c3c89b..64fe3cca2a4e 100644 --- a/trunk/net/core/rtnetlink.c +++ b/trunk/net/core/rtnetlink.c @@ -128,7 +128,7 @@ static rtnl_doit_func rtnl_get_doit(int protocol, int msgindex) if (tab == NULL || tab[msgindex].doit == NULL) tab = rtnl_msg_handlers[PF_UNSPEC]; - return tab ? tab[msgindex].doit : NULL; + return tab[msgindex].doit; } static rtnl_dumpit_func rtnl_get_dumpit(int protocol, int msgindex) @@ -143,7 +143,7 @@ static rtnl_dumpit_func rtnl_get_dumpit(int protocol, int msgindex) if (tab == NULL || tab[msgindex].dumpit == NULL) tab = rtnl_msg_handlers[PF_UNSPEC]; - return tab ? tab[msgindex].dumpit : NULL; + return tab[msgindex].dumpit; } static rtnl_calcit_func rtnl_get_calcit(int protocol, int msgindex) @@ -158,7 +158,7 @@ static rtnl_calcit_func rtnl_get_calcit(int protocol, int msgindex) if (tab == NULL || tab[msgindex].calcit == NULL) tab = rtnl_msg_handlers[PF_UNSPEC]; - return tab ? tab[msgindex].calcit : NULL; + return tab[msgindex].calcit; } /**