From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 2 Oct 2020 08:51:14 +0000 (+0900)
Subject: network: move link_configure_sr_iov()
X-Git-Tag: v247-rc1~117^2~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3a3ff2762ebd3c470fe081e17a6c45fe48f9add;p=thirdparty%2Fsystemd.git

network: move link_configure_sr_iov()
---

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 59ac24ccdff..04038e986c0 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -2240,27 +2240,6 @@ static int link_drop_config(Link *link) {
         return 0;
 }
 
-static int link_configure_sr_iov(Link *link) {
-        SRIOV *sr_iov;
-        int r;
-
-        link->sr_iov_configured = false;
-        link->sr_iov_messages = 0;
-
-        ORDERED_HASHMAP_FOREACH(sr_iov, link->network->sr_iov_by_section) {
-                r = sr_iov_configure(link, sr_iov);
-                if (r < 0)
-                        return r;
-        }
-
-        if (link->sr_iov_messages == 0)
-                link->sr_iov_configured = true;
-        else
-                log_link_debug(link, "Configuring SR-IOV");
-
-        return 0;
-}
-
 int link_configure(Link *link) {
         int r;
 
diff --git a/src/network/networkd-sriov.c b/src/network/networkd-sriov.c
index 7d997073434..6c96ca39d22 100644
--- a/src/network/networkd-sriov.c
+++ b/src/network/networkd-sriov.c
@@ -108,7 +108,7 @@ static int sr_iov_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) {
         return 1;
 }
 
-int sr_iov_configure(Link *link, SRIOV *sr_iov) {
+static int sr_iov_configure(Link *link, SRIOV *sr_iov) {
         _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
         int r;
 
@@ -226,6 +226,27 @@ int sr_iov_configure(Link *link, SRIOV *sr_iov) {
         return 0;
 }
 
+int link_configure_sr_iov(Link *link) {
+        SRIOV *sr_iov;
+        int r;
+
+        link->sr_iov_configured = false;
+        link->sr_iov_messages = 0;
+
+        ORDERED_HASHMAP_FOREACH(sr_iov, link->network->sr_iov_by_section) {
+                r = sr_iov_configure(link, sr_iov);
+                if (r < 0)
+                        return r;
+        }
+
+        if (link->sr_iov_messages == 0)
+                link->sr_iov_configured = true;
+        else
+                log_link_debug(link, "Configuring SR-IOV");
+
+        return 0;
+}
+
 int sr_iov_section_verify(SRIOV *sr_iov) {
         assert(sr_iov);
 
diff --git a/src/network/networkd-sriov.h b/src/network/networkd-sriov.h
index 04cc4270f1b..b32a64e8275 100644
--- a/src/network/networkd-sriov.h
+++ b/src/network/networkd-sriov.h
@@ -34,8 +34,7 @@ typedef struct SRIOV {
 } SRIOV;
 
 SRIOV *sr_iov_free(SRIOV *sr_iov);
-
-int sr_iov_configure(Link *link, SRIOV *sr_iov);
+int link_configure_sr_iov(Link *link);
 int sr_iov_section_verify(SRIOV *sr_iov);
 
 DEFINE_NETWORK_SECTION_FUNCTIONS(SRIOV, sr_iov_free);