summaryrefslogtreecommitdiff
path: root/Documentation/networking
diff options
context:
space:
mode:
authorVladimir Oltean <vladimir.oltean@nxp.com>2021-03-17 20:44:55 +0300
committerDavid S. Miller <davem@davemloft.net>2021-03-17 22:34:34 +0300
commit6b38c57198366a86dd73fb250db5dfcbdc45763f (patch)
treef34558f8e1389b5359a7466a242444b56fdd2e05 /Documentation/networking
parentcfeb961a2b5f1a7c6e0dc43a1673b28fab05baf8 (diff)
downloadlinux-6b38c57198366a86dd73fb250db5dfcbdc45763f.tar.xz
Documentation: networking: switchdev: add missing "and" word
Even though this is clear from the context, it is nice to actually be grammatically correct. Fixes: 0f22ad45f47c ("Documentation: networking: switchdev: clarify device driver behavior") Reported-by: Ido Schimmel <idosch@nvidia.com> Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation/networking')
-rw-r--r--Documentation/networking/switchdev.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/networking/switchdev.rst b/Documentation/networking/switchdev.rst
index aa78102c9fab..f1f4e6a85a29 100644
--- a/Documentation/networking/switchdev.rst
+++ b/Documentation/networking/switchdev.rst
@@ -523,7 +523,7 @@ as untagged packets, since the bridge device does not allow the manipulation of
VID 0 in its database.
When the bridge has VLAN filtering enabled and a PVID is not configured on the
-ingress port, untagged 802.1p tagged packets must be dropped. When the bridge
+ingress port, untagged and 802.1p tagged packets must be dropped. When the bridge
has VLAN filtering enabled and a PVID exists on the ingress port, untagged and
priority-tagged packets must be accepted and forwarded according to the
bridge's port membership of the PVID VLAN. When the bridge has VLAN filtering