diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-10-08 17:13:17 +0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-10-08 17:13:17 +0300 |
| commit | 47e7dd34a26def31af352df3a8281e7ff1bc345a (patch) | |
| tree | f8cbd86ce126d65f79bca2ceefbaea6130923e1b /Documentation/networking/device_drivers/ethernet/intel/ice.rst | |
| parent | be8ecc57f180415e8a7c1cc5620c5236be2a7e56 (diff) | |
| parent | 1da38549dd64c7f5dd22427f12dfa8db3d8a722b (diff) | |
| download | linux-47e7dd34a26def31af352df3a8281e7ff1bc345a.tar.xz | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up the fixes in perf/urgent that were just merged into upstream.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'Documentation/networking/device_drivers/ethernet/intel/ice.rst')
| -rw-r--r-- | Documentation/networking/device_drivers/ethernet/intel/ice.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/networking/device_drivers/ethernet/intel/ice.rst b/Documentation/networking/device_drivers/ethernet/intel/ice.rst index e7d9cbff771b..67b7a701ce9e 100644 --- a/Documentation/networking/device_drivers/ethernet/intel/ice.rst +++ b/Documentation/networking/device_drivers/ethernet/intel/ice.rst @@ -851,7 +851,7 @@ NOTES: - 0x88A8 traffic will not be received unless VLAN stripping is disabled with the following command:: - # ethool -K <ethX> rxvlan off + # ethtool -K <ethX> rxvlan off - 0x88A8/0x8100 double VLANs cannot be used with 0x8100 or 0x8100/0x8100 VLANS configured on the same port. 0x88a8/0x8100 traffic will not be received if |