From: Alexander Duyck <alexander.duyck@gmail.com>
To: Nicholas Krause <xerofoify@gmail.com>, jeffrey.t.kirsher@intel.com
Cc: linux-kernel@vger.kernel.org, intel-wired-lan@lists.osuosl.org,
netdev@vger.kernel.org
Subject: Re: [Intel-wired-lan] [PATCH] e1000e:Fix incorrect assumption that the function e1000e_up always runs successfully in e1000_change_mtu
Date: Fri, 23 Oct 2015 23:01:02 -0700 [thread overview]
Message-ID: <562B1E9E.5090005@gmail.com> (raw)
In-Reply-To: <1445659791-30497-1-git-send-email-xerofoify@gmail.com>
On 10/23/2015 09:09 PM, Nicholas Krause wrote:
> This fixes the function e1000_change_mtu to properly check and run
> the error code by e1000e_up as this function can fail and the error
> code should be returned to the caller of the function e1000_change_mtu
> to signal a error has occurred when calling this particular function
The function e1000e_up always returns 0. It should probably be switched
to a void instead of an int. You could probably go through and drop a
bunch of dead code that is checking for the result of that function as well.
> Signed-off-by: Nicholas Krause <xerofoify@gmail.com>
> ---
> drivers/net/ethernet/intel/e1000e/netdev.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
> index faf4b3f..aebccb1 100644
> --- a/drivers/net/ethernet/intel/e1000e/netdev.c
> +++ b/drivers/net/ethernet/intel/e1000e/netdev.c
> @@ -5931,6 +5931,7 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu)
> {
> struct e1000_adapter *adapter = netdev_priv(netdev);
> int max_frame = new_mtu + VLAN_ETH_HLEN + ETH_FCS_LEN;
> + int err = 0;
>
> /* Jumbo frame support */
> if ((max_frame > (VLAN_ETH_FRAME_LEN + ETH_FCS_LEN)) &&
> @@ -5984,7 +5985,9 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu)
> adapter->rx_buffer_len = VLAN_ETH_FRAME_LEN + ETH_FCS_LEN;
>
> if (netif_running(netdev))
> - e1000e_up(adapter);
> + err = e1000e_up(adapter);
> + if (err)
> + e_err("Failed to successfully bring up this adapter\n");
> else
> e1000e_reset(adapter);
>
> @@ -5992,7 +5995,7 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu)
>
> clear_bit(__E1000_RESETTING, &adapter->state);
>
> - return 0;
> + return err;
> }
>
> static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr,
parent reply other threads:[~2015-10-24 6:01 UTC|newest]
Thread overview: expand[flat|nested] mbox.gz Atom feed
[parent not found: <1445659791-30497-1-git-send-email-xerofoify@gmail.com>]
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=562B1E9E.5090005@gmail.com \
--to=alexander.duyck@gmail.com \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=jeffrey.t.kirsher@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=xerofoify@gmail.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).