summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2013-07-30 10:31:00 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-08-11 18:35:26 -0700
commit379731ab2b425538cf87437049ec1c1301605e46 (patch)
tree79e36fb77452558b0d3d6604937a804359fcffe8
parent32976e6354d193eb47fd3e405cf22209782efe19 (diff)
downloadlinux-3.10-379731ab2b425538cf87437049ec1c1301605e46.tar.gz
linux-3.10-379731ab2b425538cf87437049ec1c1301605e46.tar.bz2
linux-3.10-379731ab2b425538cf87437049ec1c1301605e46.zip
ndisc: Add missing inline to ndisc_addr_option_pad
[ Upstream commit d9d10a30964504af834d8d250a0c76d4ae91eb1e ] Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--include/net/ndisc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/ndisc.h b/include/net/ndisc.h
index 745bf741e02..5043f8b0805 100644
--- a/include/net/ndisc.h
+++ b/include/net/ndisc.h
@@ -119,7 +119,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;