Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f58fb330 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents c0795bf6 f05e2db1

Documentation/networking/dsa/dsa.txt

+10 −7
Original line number Diff line number Diff line
@@ -369,8 +369,6 @@ does not allocate any driver private context space. 
Switch configuration

--------------------



- priv_size: additional size needed by the switch driver for its private context



- tag_protocol: this is to indicate what kind of tagging protocol is supported,

  should be a valid value from the dsa_tag_protocol enum
@@ -416,11 +414,6 @@ PHY devices and link management 
  to the switch port MDIO registers. If unavailable return a negative error

  code.



- poll_link: Function invoked by DSA to query the link state of the switch

  builtin Ethernet PHYs, per port. This function is responsible for calling

  netif_carrier_{on,off} when appropriate, and can be used to poll all ports in a

  single call. Executes from workqueue context.



- adjust_link: Function invoked by the PHY library when a slave network device

  is attached to a PHY device. This function is responsible for appropriately

  configuring the switch port link parameters: speed, duplex, pause based on
@@ -542,6 +535,16 @@ Bridge layer 
Bridge VLAN filtering

---------------------



- port_vlan_filtering: bridge layer function invoked when the bridge gets

  configured for turning on or off VLAN filtering. If nothing specific needs to

  be done at the hardware level, this callback does not need to be implemented.

  When VLAN filtering is turned on, the hardware must be programmed with

  rejecting 802.1Q frames which have VLAN IDs outside of the programmed allowed

  VLAN ID map/rules.  If there is no PVID programmed into the switch port,

  untagged frames must be rejected as well. When turned off the switch must

  accept any 802.1Q frames irrespective of their VLAN ID, and untagged frames are

  allowed.



- port_vlan_prepare: bridge layer function invoked when the bridge prepares the

  configuration of a VLAN on the given port. If the operation is not supported

  by the hardware, this function should return -EOPNOTSUPP to inform the bridge