Re: [PATCH net-next 02/17] tipc: Fix build.

[David Miller <davem@davemloft.net>]

From: Neil Horman <nhorman@tuxdriver.com>
Date: Mon, 25 Aug 2014 06:21:42 -0400

> On Fri, Aug 22, 2014 at 06:09:05PM -0400, Jon Maloy wrote:
>> From: "David S. Miller" <davem@davemloft.net>
>> 
>> Missing semicolon in range check fix.
>> 
>> Signed-off-by: David S. Miller <davem@davemloft.net>
>> Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
>> ---
>>  net/tipc/port.h |    3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>> 
>> diff --git a/net/tipc/port.h b/net/tipc/port.h
>> index a69118f..3087da3 100644
>> --- a/net/tipc/port.h
>> +++ b/net/tipc/port.h
>> @@ -182,8 +182,9 @@ static inline int tipc_port_importance(struct tipc_port *port)
>>  static inline int tipc_port_set_importance(struct tipc_port *port, int imp)
>>  {
>>  	if (imp > TIPC_CRITICAL_IMPORTANCE)
>> -		return -EINVAL
>> +		return -EINVAL;
>>  	msg_set_importance(&port->phdr, (u32)imp);
>> +	return 0;
>>  }
>>  
> Fold this in with the previous patch to avoid a FTBFS during a bisect.

See his header posting, these are changes already in mainline that hadn't
hit net-next yet.