From patchwork Thu Jun 20 22:14:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Berg X-Patchwork-Id: 253099 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 498A82C00A3 for ; Fri, 21 Jun 2013 08:15:21 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030364Ab3FTWPD (ORCPT ); Thu, 20 Jun 2013 18:15:03 -0400 Received: from s3.sipsolutions.net ([144.76.43.152]:49178 "EHLO sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030315Ab3FTWPB (ORCPT ); Thu, 20 Jun 2013 18:15:01 -0400 Received: by sipsolutions.net with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1Upn88-0003vx-T4; Fri, 21 Jun 2013 00:15:01 +0200 From: Johannes Berg To: netdev@vger.kernel.org Cc: ben@decadent.org.uk Subject: [PATCH 1/6] alx: treat flow control correctly in alx_set_pauseparam() Date: Fri, 21 Jun 2013 00:14:49 +0200 Message-Id: <1371766494-18979-2-git-send-email-johannes@sipsolutions.net> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1371766494-18979-1-git-send-email-johannes@sipsolutions.net> References: <1371766494-18979-1-git-send-email-johannes@sipsolutions.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Even when alx_setup_speed_duplex() is called, we still need to call alx_cfg_mac_flowcontrol() and set hw->flowctrl if flow control changed. This was a bug I accidentally introduced while simplifying the original driver. Reported-by: Ben Hutchings Signed-off-by: Johannes Berg --- drivers/net/ethernet/atheros/alx/ethtool.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/atheros/alx/ethtool.c b/drivers/net/ethernet/atheros/alx/ethtool.c index 6fa2aec..50a91d0 100644 --- a/drivers/net/ethernet/atheros/alx/ethtool.c +++ b/drivers/net/ethernet/atheros/alx/ethtool.c @@ -187,7 +187,8 @@ static int alx_set_pauseparam(struct net_device *netdev, if (reconfig_phy) { err = alx_setup_speed_duplex(hw, hw->adv_cfg, fc); - return err; + if (err) + return err; } /* flow control on mac */