X Tutup
Skip to content

Commit f200093

Browse files
yuwatayuwata
committed
network: drop bond_mode_to_kernel() and bond_xmit_hash_policy_to_kernel()
1 parent ae695a9 commit f200093

File tree

3 files changed

+20
-61
lines changed

3 files changed

+20
-61
lines changed

‎src/network/netdev/bond.c‎

Lines changed: 3 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
/* SPDX-License-Identifier: LGPL-2.1+ */
22

3-
#include <netinet/ether.h>
4-
#include <linux/if_bonding.h>
5-
63
#include "sd-netlink.h"
74

85
#include "alloc-util.h"
6+
#include "bond.h"
97
#include "conf-parser.h"
108
#include "ether-addr-util.h"
119
#include "extract-word.h"
12-
#include "missing.h"
13-
#include "netdev/bond.h"
1410
#include "string-table.h"
1511
#include "string-util.h"
1612

@@ -125,44 +121,6 @@ static const char *const bond_primary_reselect_table[_NETDEV_BOND_PRIMARY_RESELE
125121
DEFINE_STRING_TABLE_LOOKUP(bond_primary_reselect, BondPrimaryReselect);
126122
DEFINE_CONFIG_PARSE_ENUM(config_parse_bond_primary_reselect, bond_primary_reselect, BondPrimaryReselect, "Failed to parse bond primary reselect");
127123

128-
static uint8_t bond_mode_to_kernel(BondMode mode) {
129-
switch (mode) {
130-
case NETDEV_BOND_MODE_BALANCE_RR:
131-
return BOND_MODE_ROUNDROBIN;
132-
case NETDEV_BOND_MODE_ACTIVE_BACKUP:
133-
return BOND_MODE_ACTIVEBACKUP;
134-
case NETDEV_BOND_MODE_BALANCE_XOR:
135-
return BOND_MODE_XOR;
136-
case NETDEV_BOND_MODE_BROADCAST:
137-
return BOND_MODE_BROADCAST;
138-
case NETDEV_BOND_MODE_802_3AD:
139-
return BOND_MODE_8023AD;
140-
case NETDEV_BOND_MODE_BALANCE_TLB:
141-
return BOND_MODE_TLB;
142-
case NETDEV_BOND_MODE_BALANCE_ALB:
143-
return BOND_MODE_ALB;
144-
default:
145-
return (uint8_t) -1;
146-
}
147-
}
148-
149-
static uint8_t bond_xmit_hash_policy_to_kernel(BondXmitHashPolicy policy) {
150-
switch (policy) {
151-
case NETDEV_BOND_XMIT_HASH_POLICY_LAYER2:
152-
return BOND_XMIT_POLICY_LAYER2;
153-
case NETDEV_BOND_XMIT_HASH_POLICY_LAYER34:
154-
return BOND_XMIT_POLICY_LAYER34;
155-
case NETDEV_BOND_XMIT_HASH_POLICY_LAYER23:
156-
return BOND_XMIT_POLICY_LAYER23;
157-
case NETDEV_BOND_XMIT_HASH_POLICY_ENCAP23:
158-
return BOND_XMIT_POLICY_ENCAP23;
159-
case NETDEV_BOND_XMIT_HASH_POLICY_ENCAP34:
160-
return BOND_XMIT_POLICY_ENCAP34;
161-
default:
162-
return (uint8_t) -1;
163-
}
164-
}
165-
166124
static int netdev_bond_fill_message_create(NetDev *netdev, Link *link, sd_netlink_message *m) {
167125
Bond *b;
168126
ArpIpTarget *target = NULL;
@@ -177,14 +135,13 @@ static int netdev_bond_fill_message_create(NetDev *netdev, Link *link, sd_netlin
177135
assert(b);
178136

179137
if (b->mode != _NETDEV_BOND_MODE_INVALID) {
180-
r = sd_netlink_message_append_u8(m, IFLA_BOND_MODE, bond_mode_to_kernel(b->mode));
138+
r = sd_netlink_message_append_u8(m, IFLA_BOND_MODE, b->mode);
181139
if (r < 0)
182140
return log_netdev_error_errno(netdev, r, "Could not append IFLA_BOND_MODE attribute: %m");
183141
}
184142

185143
if (b->xmit_hash_policy != _NETDEV_BOND_XMIT_HASH_POLICY_INVALID) {
186-
r = sd_netlink_message_append_u8(m, IFLA_BOND_XMIT_HASH_POLICY,
187-
bond_xmit_hash_policy_to_kernel(b->xmit_hash_policy));
144+
r = sd_netlink_message_append_u8(m, IFLA_BOND_XMIT_HASH_POLICY, b->xmit_hash_policy);
188145
if (r < 0)
189146
return log_netdev_error_errno(netdev, r, "Could not append IFLA_BOND_XMIT_HASH_POLICY attribute: %m");
190147
}

‎src/network/netdev/bond.h‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/* SPDX-License-Identifier: LGPL-2.1+ */
22
#pragma once
33

4+
#include <linux/if_bonding.h>
5+
46
#include "in-addr-util.h"
57
#include "list.h"
6-
7-
#include "netdev/netdev.h"
8+
#include "netdev.h"
89

910
/*
1011
* Maximum number of targets supported by the kernel for a single
@@ -13,23 +14,23 @@
1314
#define NETDEV_BOND_ARP_TARGETS_MAX 16
1415

1516
typedef enum BondMode {
16-
NETDEV_BOND_MODE_BALANCE_RR,
17-
NETDEV_BOND_MODE_ACTIVE_BACKUP,
18-
NETDEV_BOND_MODE_BALANCE_XOR,
19-
NETDEV_BOND_MODE_BROADCAST,
20-
NETDEV_BOND_MODE_802_3AD,
21-
NETDEV_BOND_MODE_BALANCE_TLB,
22-
NETDEV_BOND_MODE_BALANCE_ALB,
17+
NETDEV_BOND_MODE_BALANCE_RR = BOND_MODE_ROUNDROBIN,
18+
NETDEV_BOND_MODE_ACTIVE_BACKUP = BOND_MODE_ACTIVEBACKUP,
19+
NETDEV_BOND_MODE_BALANCE_XOR = BOND_MODE_XOR,
20+
NETDEV_BOND_MODE_BROADCAST = BOND_MODE_BROADCAST,
21+
NETDEV_BOND_MODE_802_3AD = BOND_MODE_8023AD,
22+
NETDEV_BOND_MODE_BALANCE_TLB = BOND_MODE_TLB,
23+
NETDEV_BOND_MODE_BALANCE_ALB = BOND_MODE_ALB,
2324
_NETDEV_BOND_MODE_MAX,
24-
_NETDEV_BOND_MODE_INVALID = -1
25+
_NETDEV_BOND_MODE_INVALID = -1
2526
} BondMode;
2627

2728
typedef enum BondXmitHashPolicy {
28-
NETDEV_BOND_XMIT_HASH_POLICY_LAYER2,
29-
NETDEV_BOND_XMIT_HASH_POLICY_LAYER34,
30-
NETDEV_BOND_XMIT_HASH_POLICY_LAYER23,
31-
NETDEV_BOND_XMIT_HASH_POLICY_ENCAP23,
32-
NETDEV_BOND_XMIT_HASH_POLICY_ENCAP34,
29+
NETDEV_BOND_XMIT_HASH_POLICY_LAYER2 = BOND_XMIT_POLICY_LAYER2,
30+
NETDEV_BOND_XMIT_HASH_POLICY_LAYER34 = BOND_XMIT_POLICY_LAYER34,
31+
NETDEV_BOND_XMIT_HASH_POLICY_LAYER23 = BOND_XMIT_POLICY_LAYER23,
32+
NETDEV_BOND_XMIT_HASH_POLICY_ENCAP23 = BOND_XMIT_POLICY_ENCAP23,
33+
NETDEV_BOND_XMIT_HASH_POLICY_ENCAP34 = BOND_XMIT_POLICY_ENCAP34,
3334
_NETDEV_BOND_XMIT_HASH_POLICY_MAX,
3435
_NETDEV_BOND_XMIT_HASH_POLICY_INVALID = -1
3536
} BondXmitHashPolicy;

‎src/network/netdev/netdev.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/* SPDX-License-Identifier: LGPL-2.1+ */
22

33
#include <net/if.h>
4+
#include <netinet/in.h>
45

56
#include "alloc-util.h"
67
#include "conf-files.h"

0 commit comments

Comments
 (0)
X Tutup