linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Hayes Wang <hayeswang@realtek.com>
To: <netdev@vger.kernel.org>
Cc: <nic_swsd@realtek.com>, <linux-kernel@vger.kernel.org>,
	<linux-usb@vger.kernel.org>
Subject: [PATCH net-next v2 1/2] r8152: call rtl_start_rx after netif_carrier_on
Date: Mon, 22 Dec 2014 14:52:55 +0800	[thread overview]
Message-ID: <1394712342-15778-111-Taiwan-albertk@realtek.com> (raw)
In-Reply-To: <1394712342-15778-110-Taiwan-albertk@realtek.com>

Remove rtl_start_rx() from rtl_enable() and put it after calling
netif_carrier_on().

Signed-off-by: Hayes Wang <hayeswang@realtek.com>
---
 drivers/net/usb/r8152.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 2d1c77e..cbe450c 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -2043,7 +2043,7 @@ static int rtl_enable(struct r8152 *tp)
 
 	rxdy_gated_en(tp, false);
 
-	return rtl_start_rx(tp);
+	return 0;
 }
 
 static int rtl8152_enable(struct r8152 *tp)
@@ -2858,6 +2858,7 @@ static void set_carrier(struct r8152 *tp)
 			tp->rtl_ops.enable(tp);
 			set_bit(RTL8152_SET_RX_MODE, &tp->flags);
 			netif_carrier_on(netdev);
+			rtl_start_rx(tp);
 		}
 	} else {
 		if (tp->speed & LINK_STATUS) {
-- 
2.1.0


  reply	other threads:[~2014-12-22  6:53 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-19  8:55 [PATCH net-next 0/2] r8152: adjust r8152_submit_rx Hayes Wang
2014-12-19  8:55 ` [PATCH net-next 1/2] r8152: adjust set_carrier Hayes Wang
2014-12-19  8:56 ` [PATCH net-next 2/2] r8152: check the status before submitting rx Hayes Wang
2014-12-19 20:44   ` David Miller
2014-12-22  2:53     ` [PATCH net-next 2/2] r8152: check the status before submittingrx Hayes Wang
2014-12-22  5:22       ` David Miller
2014-12-22  6:52 ` [PATCH net-next v2 0/2] r8152: adjust r8152_submit_rx Hayes Wang
2014-12-22  6:52   ` Hayes Wang [this message]
2014-12-22  6:52   ` [PATCH net-next v2 2/2] r8152: check the status before submitting rx Hayes Wang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1394712342-15778-111-Taiwan-albertk@realtek.com \
    --to=hayeswang@realtek.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=nic_swsd@realtek.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).