From: Willem de Bruijn <willemb@google.com>
Date: Fri, 6 Mar 2015 16:44:28 +0000 (-0500)
Subject: fib: make netdev_switch_fib_ipv4_abort in header file static inline
X-Git-Tag: v4.1-rc1~128^2~319
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=89650ad0047f039b3c3bc0f6a5823bb9c9738152

fib: make netdev_switch_fib_ipv4_abort in header file static inline

When building without CONFIG_NET_SWITCHDEV,
netdev_switch_fib_ipv4_abort is defined in the header file. It must
be static inline to avoid build failure at link time.

Fixes: 8e05fd7166c6 ("fib: hook IPv4 fib for hardware offload")

Signed-off-by: Willem de Bruijn <willemb@google.com>
Acked-by: Scott Feldman <sfeldma@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/include/net/switchdev.h b/include/net/switchdev.h
index dc0a5cc7c2c5..933fac410a7a 100644
--- a/include/net/switchdev.h
+++ b/include/net/switchdev.h
@@ -129,7 +129,7 @@ static inline int netdev_switch_fib_ipv4_del(u32 dst, int dst_len,
 	return 0;
 }
 
-void netdev_switch_fib_ipv4_abort(struct fib_info *fi)
+static inline void netdev_switch_fib_ipv4_abort(struct fib_info *fi)
 {
 }