diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-07-20 10:31:35 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-07-20 10:31:35 +0300 |
| commit | 6bdb486c5a628f7a927c2658166e3a5ef1f883e7 (patch) | |
| tree | 4b817231c6f48216bc0deff7075c91b6c3ebdf35 /Documentation/networking/dsa/dsa.rst | |
| parent | da6d647598a6d182eb6a0344a7b14ae005244399 (diff) | |
| parent | ba47d845d715a010f7b51f6f89bae32845e6acb7 (diff) | |
| download | linux-6bdb486c5a628f7a927c2658166e3a5ef1f883e7.tar.xz | |
Merge 5.8-rc6 into driver-core-next
We need the driver core fixes in here too.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/networking/dsa/dsa.rst')
| -rw-r--r-- | Documentation/networking/dsa/dsa.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/networking/dsa/dsa.rst b/Documentation/networking/dsa/dsa.rst index 563d56c6a25c..a8d15dd2b42b 100644 --- a/Documentation/networking/dsa/dsa.rst +++ b/Documentation/networking/dsa/dsa.rst @@ -95,7 +95,7 @@ Ethernet switch. Networking stack hooks ---------------------- -When a master netdev is used with DSA, a small hook is placed in in the +When a master netdev is used with DSA, a small hook is placed in the networking stack is in order to have the DSA subsystem process the Ethernet switch specific tagging protocol. DSA accomplishes this by registering a specific (and fake) Ethernet type (later becoming ``skb->protocol``) with the |