projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
32976e6
)
ndisc: Add missing inline to ndisc_addr_option_pad
author
Joe Perches
<joe@perches.com>
Tue, 30 Jul 2013 17:31:00 +0000
(10:31 -0700)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Mon, 12 Aug 2013 01:35:26 +0000
(18:35 -0700)
[ 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>
include/net/ndisc.h
patch
|
blob
|
history
diff --git
a/include/net/ndisc.h
b/include/net/ndisc.h
index 745bf741e029c50d8a464374ec5cc4bae855c655..5043f8b080532435ceab264c72a5060a79fc798d 100644
(file)
--- 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 in
line in
t ndisc_addr_option_pad(unsigned short type)
{
switch (type) {
case ARPHRD_INFINIBAND: return 2;