On Fri, Nov 14, 2014 at 10:32 AM, Fabian Frederick <f...@skynet.be> wrote: > Signed-off-by: Fabian Frederick <f...@skynet.be> Acked-by: Pravin B Shelar <pshe...@nicira.com>
> --- > net/openvswitch/flow_netlink.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c > index c0d066d..c8fccdd 100644 > --- a/net/openvswitch/flow_netlink.c > +++ b/net/openvswitch/flow_netlink.c > @@ -1425,10 +1425,8 @@ static int add_action(struct sw_flow_actions **sfa, > int attrtype, > struct nlattr *a; > > a = __add_action(sfa, attrtype, data, len, log); > - if (IS_ERR(a)) > - return PTR_ERR(a); > > - return 0; > + return PTR_ERR_OR_ZERO(a); > } > > static inline int add_nested_action_start(struct sw_flow_actions **sfa, > -- > 1.9.3 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
