Merge tag ‘mac80211-for-davem-2019-02-22’ of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211 [Linux 5.0]

Merge tag ‘mac80211-for-davem-2019-02-22’ of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211 [Linux 5.0]

This Linux kernel change "Merge tag ‘mac80211-for-davem-2019-02-22’ of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211" is included in the Linux 5.0 release. This change is authored by David S. Miller <davem [at] davemloft.net> on Fri Feb 22 12:51:21 2019 -0800. The commit for this change in Linux stable tree is ab01f25 (patch). Other info about this change: Merge: 80d79ad 51d0af2

Merge tag 'mac80211-for-davem-2019-02-22' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211

Johannes Berg says:

====================
Three more fixes:
 * mac80211 mesh code wasn't allocating SKB tailroom properly
   in some cases
 * tx_sk_pacing_shift should be 7 for better performance
 * mac80211_hwsim wasn't propagating genlmsg_reply() errors
====================

Signed-off-by: David S. Miller <[email protected]>

There is no are 0 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 Documentation/networking/switchdev.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Documentation/networking/switchdev.txt b/Documentation/networking/switchdev.txt
index 82236a1..97b7ca8 100644
--- a/Documentation/networking/switchdev.txt
+++ b/Documentation/networking/switchdev.txt
@@ -92,11 +92,11 @@ device.
 Switch ID
 ^^^^^^^^^

-The switchdev driver must implement the switchdev op switchdev_port_attr_get
-for SWITCHDEV_ATTR_ID_PORT_PARENT_ID for each port netdev, returning the same
-physical ID for each port of a switch.  The ID must be unique between switches
-on the same system.  The ID does not need to be unique between switches on
-different systems.
+The switchdev driver must implement the net_device operation
+ndo_get_port_parent_id for each port netdev, returning the same physical ID for
+each port of a switch. The ID must be unique between switches on the same
+system. The ID does not need to be unique between switches on different
+systems.

 The switch ID is used to locate ports on a switch and to know if aggregated
 ports belong to the same switch.

Leave a Reply

Your email address will not be published. Required fields are marked *