This is a cosmetic incremental fixup to commits 7787ff776398 ("net: dsa: merge all bools of struct dsa_switch into a single u32") bde82f389af1 ("net: dsa: merge all bools of struct dsa_port into a single u8") The desire to make this change was enunciated after posting these patches here: https://patchwork.kernel.org/project/netdevbpf/cover/20220105132141.2648876-1-vladimir.oltean@nxp.com/ but due to a slight timing overlap (message posted at 2:28 p.m. UTC, merge commit is at 2:46 p.m. UTC), that comment was missed and the changes were applied as-is.
Unified · Split
| @@ -265,14 +265,16 @@ struct dsa_port { · 264 unmodified lines | |||
| 265 | 265 | ||
| 266 | u8 stp_state; | 266 | u8 stp_state; |
| 267 | 267 | ||
| 268 | u8 vlan_filtering:1, | 268 | u8 vlan_filtering:1; |
| 269 | /* Managed by DSA on user ports and by | 269 | |
| 270 | * drivers on CPU and DSA ports | 270 | /* Managed by DSA on user ports and by drivers on CPU and DSA ports */ |
| 271 | */ | 271 | u8 learning:1; |
| 272 | learning:1, | 272 | |
| 273 | lag_tx_enabled:1, | 273 | u8 lag_tx_enabled:1; |
| 274 | devlink_port_setup:1, | 274 | |
| 275 | setup:1; | 275 | u8 devlink_port_setup:1; |
| 276 | |||
| 277 | u8 setup:1; | ||
| 276 | 278 | ||
| 277 | struct device_node *dn; | 279 | struct device_node *dn; |
| 278 | unsigned int ageing_time; | 280 | unsigned int ageing_time; |
| @@ -331,56 +333,52 @@ struct dsa_switch { · 52 unmodified lines | |||
| 331 | struct dsa_switch_tree *dst; | 333 | struct dsa_switch_tree *dst; |
| 332 | unsigned int index; | 334 | unsigned int index; |
| 333 | 335 | ||
| 334 | u32 setup:1, | 336 | u32 setup:1; |
| 335 | /* Disallow bridge core from requesting | 337 | |
| 336 | * different VLAN awareness settings on ports | 338 | /* Disallow bridge core from requesting different VLAN awareness |
| 337 | * if not hardware-supported | 339 | * settings on ports if not hardware-supported |
| 338 | */ | 340 | */ |
| 339 | vlan_filtering_is_global:1, | 341 | u32 vlan_filtering_is_global:1; |
| 340 | /* Keep VLAN filtering enabled on ports not | 342 | |
| 341 | * offloading any upper | 343 | /* Keep VLAN filtering enabled on ports not offloading any upper */ |
| 342 | */ | 344 | u32 needs_standalone_vlan_filtering:1; |
| 343 | needs_standalone_vlan_filtering:1, | 345 | |
| 344 | /* Pass .port_vlan_add and .port_vlan_del to | 346 | /* Pass .port_vlan_add and .port_vlan_del to drivers even for bridges |
| 345 | * drivers even for bridges that have | 347 | * that have vlan_filtering=0. All drivers should ideally set this (and |
| 346 | * vlan_filtering=0. All drivers should ideally | 348 | * then the option would get removed), but it is unknown whether this |
| 347 | * set this (and then the option would get | 349 | * would break things or not. |
| 348 | * removed), but it is unknown whether this | 350 | */ |
| 349 | * would break things or not. | 351 | u32 configure_vlan_while_not_filtering:1; |
| 350 | */ | 352 | |
| 351 | configure_vlan_while_not_filtering:1, | 353 | /* If the switch driver always programs the CPU port as egress tagged |
| 352 | /* If the switch driver always programs the CPU | 354 | * despite the VLAN configuration indicating otherwise, then setting |
| 353 | * port as egress tagged despite the VLAN | 355 | * @untag_bridge_pvid will force the DSA receive path to pop the |
| 354 | * configuration indicating otherwise, then | 356 | * bridge's default_pvid VLAN tagged frames to offer a consistent |
| 355 | * setting @untag_bridge_pvid will force the | 357 | * behavior between a vlan_filtering=0 and vlan_filtering=1 bridge |
| 356 | * DSA receive path to pop the bridge's | 358 | * device. |
| 357 | * default_pvid VLAN tagged frames to offer a | 359 | */ |
| 358 | * consistent behavior between a | 360 | u32 untag_bridge_pvid:1; |
| 359 | * vlan_filtering=0 and vlan_filtering=1 bridge | 361 | |
| 360 | * device. | 362 | /* Let DSA manage the FDB entries towards the |
| 361 | */ | 363 | * CPU, based on the software bridge database. |
| 362 | untag_bridge_pvid:1, | 364 | */ |
| 363 | /* Let DSA manage the FDB entries towards the | 365 | u32 assisted_learning_on_cpu_port:1; |
| 364 | * CPU, based on the software bridge database. | 366 | |
| 365 | */ | 367 | /* In case vlan_filtering_is_global is set, the VLAN awareness state |
| 366 | assisted_learning_on_cpu_port:1, | 368 | * should be retrieved from here and not from the per-port settings. |
| 367 | /* In case vlan_filtering_is_global is set, the | 369 | */ |
| 368 | * VLAN awareness state should be retrieved | 370 | u32 vlan_filtering:1; |
| 369 | * from here and not from the per-port | 371 | |
| 370 | * settings. | 372 | /* MAC PCS does not provide link state change interrupt, and requires |
| 371 | */ | 373 | * polling. Flag passed on to PHYLINK. |
| 372 | vlan_filtering:1, | 374 | */ |
| 373 | /* MAC PCS does not provide link state change | 375 | u32 pcs_poll:1; |
| 374 | * interrupt, and requires polling. Flag passed | 376 | |
| 375 | * on to PHYLINK. | 377 | /* For switches that only have the MRU configurable. To ensure the |
| 376 | */ | 378 | * configured MTU is not exceeded, normalization of MRU on all bridged |
| 377 | pcs_poll:1, | 379 | * interfaces is needed. |
| 378 | /* For switches that only have the MRU | 380 | */ |
| 379 | * configurable. To ensure the configured MTU | 381 | u32 mtu_enforcement_ingress:1; |
| 380 | * is not exceeded, normalization of MRU on all | ||
| 381 | * bridged interfaces is needed. | ||
| 382 | */ | ||
| 383 | mtu_enforcement_ingress:1; | ||
| 384 | 382 | ||
| 385 | /* Listener for switch fabric events */ | 383 | /* Listener for switch fabric events */ |
| 386 | struct notifier_block nb; | 384 | struct notifier_block nb; |