1c16b574c4
Backport the phy/phylink/sfp patches currently queued in netdev or in mainline necessary to support GPON popular modules, specifically to support Huawei and Nokia GPON modules. Signed-off-by: Russell King <linux@armlinux.org.uk> [jonas.gorski: include kernel version in file names, refresh patches] Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
28 lines
912 B
Diff
28 lines
912 B
Diff
From f76d84cd85f8bd3f083495f7ca723822cba8abc9 Mon Sep 17 00:00:00 2001
|
|
From: Russell King <rmk+kernel@armlinux.org.uk>
|
|
Date: Mon, 11 Nov 2019 10:23:35 +0000
|
|
Subject: [PATCH 617/660] net: sfp: fix sfp_bus_add_upstream() warning
|
|
|
|
When building with SFP disabled, the stub for sfp_bus_add_upstream()
|
|
missed "inline". Add it.
|
|
|
|
Fixes: 727b3668b730 ("net: sfp: rework upstream interface")
|
|
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
|
|
---
|
|
include/linux/sfp.h | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/include/linux/sfp.h
|
|
+++ b/include/linux/sfp.h
|
|
@@ -563,8 +563,8 @@ static inline struct sfp_bus *sfp_bus_fi
|
|
return NULL;
|
|
}
|
|
|
|
-static int sfp_bus_add_upstream(struct sfp_bus *bus, void *upstream,
|
|
- const struct sfp_upstream_ops *ops)
|
|
+static inline int sfp_bus_add_upstream(struct sfp_bus *bus, void *upstream,
|
|
+ const struct sfp_upstream_ops *ops)
|
|
{
|
|
return 0;
|
|
}
|