realtek: Switch booleans in rtl838x_l2_entry to single bits

In upstream kernel, it is not well received to use a lot of simple booleans
in structs. It is preferred to use 1-bit bitfields [1] and consolidate the
booleans together.

[1] https://www.kernel.org/doc/html/v6.16/process/coding-style.html#using-bool

Signed-off-by: Sven Eckelmann <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/20183
Signed-off-by: Robert Marko <[email protected]>

diff --git a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl838x.h b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl838x.h
index a9f20789ff7a2bf584f03c3ff75562f275c3d642..1126d082ebab28317cac4bcc6375c9e6f7fefb6f 100644 (file)
--- a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl838x.h
+++ b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl838x.h
@@ -711,32 +711,32 @@ struct rtl838x_l2_entry {
        u16 vid;
        u16 rvid;
        u8 port;
-       bool valid;
        enum l2_entry_type type;
-       bool is_static;
-       bool is_ip_mc;
-       bool is_ipv6_mc;
-       bool block_da;
-       bool block_sa;
-       bool suspended;
-       bool next_hop;
+       bool valid:1;
+       bool is_static:1;
+       bool is_ip_mc:1;
+       bool is_ipv6_mc:1;
+       bool block_da:1;
+       bool block_sa:1;
+       bool suspended:1;
+       bool next_hop:1;
+       bool is_trunk:1;
+       bool nh_vlan_target:1;  /* Only RTL83xx: VLAN used for next hop */
        int age;
        u8 trunk;
-       bool is_trunk;
        u8 stack_dev;
        u16 mc_portmask_index;
        u32 mc_gip;
        u32 mc_sip;
        u16 mc_mac_index;
        u16 nh_route_id;
-       bool nh_vlan_target;  /* Only RTL83xx: VLAN used for next hop */
 
        /* The following is only valid on RTL931x */
-       bool is_open_flow;
-       bool is_pe_forward;
-       bool is_local_forward;
-       bool is_remote_forward;
-       bool is_l2_tunnel;
+       bool is_open_flow:1;
+       bool is_pe_forward:1;
+       bool is_local_forward:1;
+       bool is_remote_forward:1;
+       bool is_l2_tunnel:1;
        int l2_tunnel_id;
        int l2_tunnel_list_id;
 };