diff options
| author | David S. Miller <davem@davemloft.net> | 2020-06-25 19:29:51 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-06-25 19:29:51 -0700 |
| commit | 7bed14551659875e1cd23a7c0266394a29a773b3 (patch) | |
| tree | 2bbd8b1b2b1610d2e48a71bf7bb5f41ac5e1d0ef /drivers/net/ethernet/realtek | |
| parent | b8392808eb3fc28e523e28cb258c81ca246deb9b (diff) | |
| parent | 4a21185cda0fbb860580eeeb4f1a70a9cda332a4 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Minor overlapping changes in xfrm_device.c, between the double
ESP trailing bug fix setting the XFRM_INIT flag and the changes
in net-next preparing for bonding encryption support.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/realtek')
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169_main.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index c4136740db44..226205099253 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -2053,8 +2053,11 @@ static void rtl_release_firmware(struct rtl8169_private *tp) void r8169_apply_firmware(struct rtl8169_private *tp) { /* TODO: release firmware if rtl_fw_write_firmware signals failure. */ - if (tp->rtl_fw) + if (tp->rtl_fw) { rtl_fw_write_firmware(tp, tp->rtl_fw); + /* At least one firmware doesn't reset tp->ocp_base. */ + tp->ocp_base = OCP_STD_PHY_BASE; + } } static void rtl8168_config_eee_mac(struct rtl8169_private *tp) |