Skip to content

Commit f58fb33

Browse files
committed
Merge branch 'dsa-doc-fixes'
Florian Fainelli says: ==================== Documentation: dsa: misc fixes Here are some miscelaneous documentation fixes for DSA, I targeted "net" because these are not functional code changes, but still documentation fixes per-se. Changes in v2: - reword what the port_vlan_filtering is about based on feedback from Vivien and Ido ==================== Signed-off-by: David S. Miller <[email protected]>
2 parents c0795bf + f05e2db commit f58fb33

File tree

1 file changed

+10
-7
lines changed
  • Documentation/networking/dsa

1 file changed

+10
-7
lines changed

Documentation/networking/dsa/dsa.txt

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -369,8 +369,6 @@ does not allocate any driver private context space.
369369
Switch configuration
370370
--------------------
371371

372-
- priv_size: additional size needed by the switch driver for its private context
373-
374372
- tag_protocol: this is to indicate what kind of tagging protocol is supported,
375373
should be a valid value from the dsa_tag_protocol enum
376374

@@ -416,11 +414,6 @@ PHY devices and link management
416414
to the switch port MDIO registers. If unavailable return a negative error
417415
code.
418416

419-
- poll_link: Function invoked by DSA to query the link state of the switch
420-
builtin Ethernet PHYs, per port. This function is responsible for calling
421-
netif_carrier_{on,off} when appropriate, and can be used to poll all ports in a
422-
single call. Executes from workqueue context.
423-
424417
- adjust_link: Function invoked by the PHY library when a slave network device
425418
is attached to a PHY device. This function is responsible for appropriately
426419
configuring the switch port link parameters: speed, duplex, pause based on
@@ -542,6 +535,16 @@ Bridge layer
542535
Bridge VLAN filtering
543536
---------------------
544537

538+
- port_vlan_filtering: bridge layer function invoked when the bridge gets
539+
configured for turning on or off VLAN filtering. If nothing specific needs to
540+
be done at the hardware level, this callback does not need to be implemented.
541+
When VLAN filtering is turned on, the hardware must be programmed with
542+
rejecting 802.1Q frames which have VLAN IDs outside of the programmed allowed
543+
VLAN ID map/rules. If there is no PVID programmed into the switch port,
544+
untagged frames must be rejected as well. When turned off the switch must
545+
accept any 802.1Q frames irrespective of their VLAN ID, and untagged frames are
546+
allowed.
547+
545548
- port_vlan_prepare: bridge layer function invoked when the bridge prepares the
546549
configuration of a VLAN on the given port. If the operation is not supported
547550
by the hardware, this function should return -EOPNOTSUPP to inform the bridge

0 commit comments

Comments
 (0)