[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20140825.114420.77676883396367108.davem@davemloft.net>
Date: Mon, 25 Aug 2014 11:44:20 -0700 (PDT)
From: David Miller <davem@...emloft.net>
To: nhorman@...driver.com
Cc: jon.maloy@...csson.com, netdev@...r.kernel.org,
paul.gortmaker@...driver.com, erik.hugne@...csson.com,
ying.xue@...driver.com, maloy@...jonn.com,
tipc-discussion@...ts.sourceforge.net
Subject: Re: [PATCH net-next 02/17] tipc: Fix build.
From: Neil Horman <nhorman@...driver.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@...emloft.net>
>>
>> Missing semicolon in range check fix.
>>
>> Signed-off-by: David S. Miller <davem@...emloft.net>
>> Signed-off-by: Jon Maloy <jon.maloy@...csson.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.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists