From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-Id: <20130911042919.697469892@goodmis.org> Date: Wed, 11 Sep 2013 00:29:51 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Joe Perches , "David S. Miller" Subject: [164/251] ndisc: Add missing inline to ndisc_addr_option_pad References: <20130911042707.738353451@goodmis.org> Content-Disposition: inline; filename=0164-ndisc-Add-missing-inline-to-ndisc_addr_option_pad.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.6.11.9-rc1 stable review patch. If anyone has any objections, please let me know. ------------------ From: Joe Perches [ Upstream commit d9d10a30964504af834d8d250a0c76d4ae91eb1e ] Signed-off-by: Joe Perches Signed-off-by: David S. Miller Signed-off-by: Steven Rostedt --- include/net/ndisc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/net/ndisc.h b/include/net/ndisc.h index 826a541..9761757 100644 --- a/include/net/ndisc.h +++ b/include/net/ndisc.h @@ -118,7 +118,7 @@ extern struct ndisc_options *ndisc_parse_options(u8 *opt, int opt_len, * if RFC 3831 IPv6-over-Fibre Channel is ever implemented it may * also need a pad of 2. */ -static int ndisc_addr_option_pad(unsigned short type) +static inline int ndisc_addr_option_pad(unsigned short type) { switch (type) { case ARPHRD_INFINIBAND: return 2; -- 1.7.10.4