[ 3.8.y.z extended stable ] Patch "ndisc: Add missing inline to ndisc_addr_option_pad" has been added to staging queue
Kamal Mostafa
kamal at canonical.com
Fri Aug 16 00:06:42 UTC 2013
This is a note to let you know that I have just added a patch titled
ndisc: Add missing inline to ndisc_addr_option_pad
to the linux-3.8.y-queue branch of the 3.8.y.z extended stable tree
which can be found at:
http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.8.y-queue
This patch is scheduled to be released in version 3.8.13.7.
If you, or anyone else, feels it should not be added to this tree, please
reply to this email.
For more information about the 3.8.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable
Thanks.
-Kamal
------
>From 6e85cfcbbdd3f3704cc064ad011289689ab79904 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe at perches.com>
Date: Tue, 30 Jul 2013 10:31:00 -0700
Subject: ndisc: Add missing inline to ndisc_addr_option_pad
[ Upstream commit d9d10a30964504af834d8d250a0c76d4ae91eb1e ]
Signed-off-by: Joe Perches <joe at perches.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
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 23b3a7c..c9db93d 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;
--
1.8.1.2
More information about the kernel-team
mailing list