Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2256481ybg; Sun, 27 Oct 2019 14:31:53 -0700 (PDT) X-Google-Smtp-Source: APXvYqwustzhBK8bwNGC98U0pyrFCaQZpCMCIEhanV2nVFQ15dW0Q6d4oZi64ixdmydEt8TWTlni X-Received: by 2002:a17:906:1949:: with SMTP id b9mr13681440eje.277.1572211913584; Sun, 27 Oct 2019 14:31:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572211913; cv=none; d=google.com; s=arc-20160816; b=wVZtYt2+glqzaW6+hAsrYIXODBp3UNwX3Z9ydbOJzVyMZU5j788KSRP9fXwND3i0xU JEf7CDsHTR1V5z+BzDzkgk2nX7J7Fd8O8UQBvm0A3BZGx0p6IH8+oGAD+rzPch12v9DX lKNT9cCeP9USTcwXiXsg4LczFcW8AxU1gZjhgw5w5ea1pBycjqvQE5atRnHpwxQLKlKL zfbB8UHTcKq/Eu/8S/1gk3wvBqEcIabMKoAUvjCq/I1vZ32wwWLolAtT0IISOQtnwx67 pGMdOQGZE6Xiby2iGVGLuLYVZ/f1OMz5s3SjH59F3jHuOKybZawhWnbuaXv7ltUmB5gE dvlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ZqQeLauVChds3ZI86AJrLJPFkAmHBgSpFujSzZRLVIw=; b=aZgxiBHZdgDUkcYFwru4kv3/4FRDyeoPNoElR+b88rnIcCWAtVvXYCkXitfnf7RD+y nycwbzEH+HYYahGjs4Fhn28llgrV1hhZpD/k6bl18l16MNBzLFnmy8wq2lsmKE9IXcdY 2MfvrMm4RugnBlVukCIq/b35xMK/3fBFiRRJyCc3Jd/oq8j2z88eAgv/z9g+9dIHR1gU 5om15VvFhCDoYkABOiSay7oJoVOw8Ex4TwI14dTMbYaiGdppVoa7blRnFiR4Mr47ETLu rAany2acL1XErVC8klUhIIEXMsop9vywGbGhaW9ez+tLlJyHjR25n4CKYl7U9hwSHqyU 42mA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=2hwAM38N; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k20si6778775edj.55.2019.10.27.14.31.30; Sun, 27 Oct 2019 14:31:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=2hwAM38N; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730848AbfJ0VTV (ORCPT + 99 others); Sun, 27 Oct 2019 17:19:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:39608 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731418AbfJ0VTS (ORCPT ); Sun, 27 Oct 2019 17:19:18 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 22449214E0; Sun, 27 Oct 2019 21:19:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211157; bh=HZt28qeJ9roEqr1pQ7f0oFDZLmYIjlhJZ2bgYQLGM9g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2hwAM38N9Pq/nbyaw0cu3kPTSkOHjVb1IGrdfcyfXeXnZlRqp8UDlgmQ96Vx3ID8Y UWt9/qq5fVSQalJyVz1AEXxYBhduclDXngv3IT6flvKdE8u6rAJELp0gpmsmbO/X2i 2x4ps6HQhsCUTvqVW+kuB/dedYINoFUEuxGenCQQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kai-Heng Feng , "David S. Miller" , Sasha Levin Subject: [PATCH 5.3 053/197] r8152: Set macpassthru in reset_resume callback Date: Sun, 27 Oct 2019 21:59:31 +0100 Message-Id: <20191027203354.543257012@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203351.684916567@linuxfoundation.org> References: <20191027203351.684916567@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kai-Heng Feng [ Upstream commit a54cdeeb04fc719e4c7f19d6e28dba7ea86cee5b ] r8152 may fail to establish network connection after resume from system suspend. If the USB port connects to r8152 lost its power during system suspend, the MAC address was written before is lost. The reason is that The MAC address doesn't get written again in its reset_resume callback. So let's set MAC address again in reset_resume callback. Also remove unnecessary lock as no other locking attempt will happen during reset_resume. Signed-off-by: Kai-Heng Feng Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/usb/r8152.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 04137ac373b07..9eedc0714422c 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -4533,10 +4533,9 @@ static int rtl8152_reset_resume(struct usb_interface *intf) struct r8152 *tp = usb_get_intfdata(intf); clear_bit(SELECTIVE_SUSPEND, &tp->flags); - mutex_lock(&tp->control); tp->rtl_ops.init(tp); queue_delayed_work(system_long_wq, &tp->hw_phy_work, 0); - mutex_unlock(&tp->control); + set_ethernet_addr(tp); return rtl8152_resume(intf); } -- 2.20.1