diff options
author | Wolfram Sang <wsa@kernel.org> | 2022-09-27 21:33:37 +0200 |
---|---|---|
committer | Wolfram Sang <wsa@kernel.org> | 2022-09-27 21:33:37 +0200 |
commit | 85f17d677f6c40069287617630f202eb20fcfe36 (patch) | |
tree | a0a7de12ddf19068b14124d7a64d79cf697e0710 /drivers/net/dsa | |
parent | macintosh/ams: Adapt declaration of ams_i2c_remove() to earlier change (diff) | |
parent | Linux 6.0-rc7 (diff) | |
download | linux-85f17d677f6c40069287617630f202eb20fcfe36.tar.xz linux-85f17d677f6c40069287617630f202eb20fcfe36.zip |
Merge branch 'master' into i2c/for-mergewindow
Diffstat (limited to 'drivers/net/dsa')
-rw-r--r-- | drivers/net/dsa/microchip/lan937x_main.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/dsa/microchip/lan937x_main.c b/drivers/net/dsa/microchip/lan937x_main.c index daedd2bf20c1..5579644e8fde 100644 --- a/drivers/net/dsa/microchip/lan937x_main.c +++ b/drivers/net/dsa/microchip/lan937x_main.c @@ -244,10 +244,6 @@ void lan937x_port_setup(struct ksz_device *dev, int port, bool cpu_port) lan937x_port_cfg(dev, port, REG_PORT_CTRL_0, PORT_TAIL_TAG_ENABLE, true); - /* disable frame check length field */ - lan937x_port_cfg(dev, port, REG_PORT_MAC_CTRL_0, PORT_CHECK_LENGTH, - false); - /* set back pressure for half duplex */ lan937x_port_cfg(dev, port, REG_PORT_MAC_CTRL_1, PORT_BACK_PRESSURE, true); |