From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 25 Jan 2022 20:52:54 +0000 (+0900)
Subject: network: tc: drop unused QDisc::family element
X-Git-Tag: v251-rc1~322^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=058fd55efa7b2662be372cd577239774998d32e0;p=thirdparty%2Fsystemd.git

network: tc: drop unused QDisc::family element
---

diff --git a/src/network/tc/qdisc.c b/src/network/tc/qdisc.c
index 803c999855b..7b41730fd17 100644
--- a/src/network/tc/qdisc.c
+++ b/src/network/tc/qdisc.c
@@ -50,7 +50,6 @@ static int qdisc_new(QDiscKind kind, QDisc **ret) {
 
                 *qdisc = (QDisc) {
                         .meta.kind = TC_KIND_QDISC,
-                        .family = AF_UNSPEC,
                         .parent = TC_H_ROOT,
                         .kind = kind,
                 };
@@ -60,7 +59,6 @@ static int qdisc_new(QDiscKind kind, QDisc **ret) {
                         return -ENOMEM;
 
                 qdisc->meta.kind = TC_KIND_QDISC,
-                qdisc->family = AF_UNSPEC;
                 qdisc->parent = TC_H_ROOT;
                 qdisc->kind = kind;
 
@@ -115,7 +113,6 @@ int qdisc_new_static(QDiscKind kind, Network *network, const char *filename, uns
                 return r;
 
         if (q) {
-                qdisc->family = q->family;
                 qdisc->handle = q->handle;
                 qdisc->parent = q->parent;
                 qdisc->tca_kind = TAKE_PTR(q->tca_kind);
@@ -182,7 +179,7 @@ int qdisc_configure(Link *link, QDisc *qdisc) {
         assert(link->manager->rtnl);
         assert(link->ifindex > 0);
 
-        r = sd_rtnl_message_new_qdisc(link->manager->rtnl, &req, RTM_NEWQDISC, qdisc->family, link->ifindex);
+        r = sd_rtnl_message_new_qdisc(link->manager->rtnl, &req, RTM_NEWQDISC, AF_UNSPEC, link->ifindex);
         if (r < 0)
                 return log_link_debug_errno(link, r, "Could not create RTM_NEWQDISC message: %m");
 
diff --git a/src/network/tc/qdisc.h b/src/network/tc/qdisc.h
index e37c4806e32..8329d18b4f5 100644
--- a/src/network/tc/qdisc.h
+++ b/src/network/tc/qdisc.h
@@ -40,7 +40,6 @@ typedef struct QDisc {
         ConfigSection *section;
         Network *network;
 
-        int family;
         uint32_t handle;
         uint32_t parent;