diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-07-14 16:18:22 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-07-14 16:18:22 +0200 |
commit | 7e50133234007f77d40c5ad871960a3171b362c3 (patch) | |
tree | 30e41547b0595b3926cd4e6e694a5e9b3f4becb6 /drivers/net/dsa/bcm_sf2.c | |
parent | drivers/usb/host/ehci-fsl: Fix interrupt setup in host mode. (diff) | |
parent | Linux 5.19-rc6 (diff) | |
download | linux-dev-7e50133234007f77d40c5ad871960a3171b362c3.tar.xz linux-dev-7e50133234007f77d40c5ad871960a3171b362c3.zip |
Merge tag 'v5.19-rc6' into usb-linus
The usb-serial fixes are based on this branch, so merge it in here to
prevent merge confusion when merging in that tree.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/dsa/bcm_sf2.c')
-rw-r--r-- | drivers/net/dsa/bcm_sf2.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c index 87e81c636339..be0edfa093d0 100644 --- a/drivers/net/dsa/bcm_sf2.c +++ b/drivers/net/dsa/bcm_sf2.c @@ -878,6 +878,11 @@ static void bcm_sf2_sw_mac_link_up(struct dsa_switch *ds, int port, if (duplex == DUPLEX_FULL) reg |= DUPLX_MODE; + if (tx_pause) + reg |= TXFLOW_CNTL; + if (rx_pause) + reg |= RXFLOW_CNTL; + core_writel(priv, reg, offset); } |