netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>,
	netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
	jogreene@redhat.com, Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 06/15] i40e: fix invalid void return in FCoE code
Date: Fri,  3 Apr 2015 05:04:49 -0700	[thread overview]
Message-ID: <1428062698-16180-7-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1428062698-16180-1-git-send-email-jeffrey.t.kirsher@intel.com>

From: Jesse Brandeburg <jesse.brandeburg@intel.com>

A function was calling i40e_tx_map with return, but tx_map returns
void, and the caller returns void, so just drop the return, and
everything is good.

Change-ID: I53fc676d517864761e7cbb8ca83f1ef0c15b1f8f
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Jim Young <james.m.young@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/ethernet/intel/i40e/i40e_fcoe.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/intel/i40e/i40e_fcoe.c b/drivers/net/ethernet/intel/i40e/i40e_fcoe.c
index 1ca4845..1803afe 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_fcoe.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_fcoe.c
@@ -1306,8 +1306,7 @@ static void i40e_fcoe_tx_map(struct i40e_ring *tx_ring,
 	/* MACLEN is ether header length in words not bytes */
 	td_offset |= (maclen >> 1) << I40E_TX_DESC_LENGTH_MACLEN_SHIFT;
 
-	return i40e_tx_map(tx_ring, skb, first, tx_flags, hdr_len,
-			   td_cmd, td_offset);
+	i40e_tx_map(tx_ring, skb, first, tx_flags, hdr_len, td_cmd, td_offset);
 }
 
 /**
-- 
1.9.3

  parent reply	other threads:[~2015-04-03 12:05 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-03 12:04 [net-next 00/15][pull request] Intel Wired LAN Driver Updates 2015-04-03 Jeff Kirsher
2015-04-03 12:04 ` [net-next 01/15] i40evf: Fix Outer UDP RX checksum code Jeff Kirsher
2015-04-03 12:04 ` [net-next 02/15] i40e: validate VSI param from VFs Jeff Kirsher
2015-04-03 12:04 ` [net-next 03/15] i40e: Print some more info to help figure out the cause of HMC error Jeff Kirsher
2015-04-03 12:04 ` [net-next 04/15] i40e: Change some memcpys to struct assignments Jeff Kirsher
2015-04-03 12:04 ` [net-next 05/15] i40e/i40evf: fix bug when skb allocation fails Jeff Kirsher
2015-04-03 12:04 ` Jeff Kirsher [this message]
2015-04-03 12:04 ` [net-next 07/15] i40e: warn at the right time Jeff Kirsher
2015-04-03 12:04 ` [net-next 08/15] i40e/i40evf: Set Ethernet protocol correctly when Tx VLAN offloads are disabled Jeff Kirsher
2015-04-03 12:04 ` [net-next 09/15] i40e: Don't register/de-register apps on NIC partitions in MFP mode Jeff Kirsher
2015-04-03 12:04 ` [net-next 10/15] i40e: fix up VXLAN messages Jeff Kirsher
2015-04-03 12:04 ` [net-next 11/15] i40e: stop flow director on shutdown Jeff Kirsher
2015-04-03 12:04 ` [net-next 12/15] i40e: Communicate VSI id in place of VSI index to the VFs Jeff Kirsher
2015-04-03 12:04 ` [net-next 13/15] i40evf: protect VLAN filter list Jeff Kirsher
2015-04-03 12:04 ` [net-next 14/15] i40evf: Refactor VF RSS code Jeff Kirsher
2015-04-03 12:04 ` [net-next 15/15] i40e: Bump to version 1.3.1 Jeff Kirsher
2015-04-03 16:44 ` [net-next 00/15][pull request] Intel Wired LAN Driver Updates 2015-04-03 David Miller

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=1428062698-16180-7-git-send-email-jeffrey.t.kirsher@intel.com \
    --to=jeffrey.t.kirsher@intel.com \
    --cc=davem@davemloft.net \
    --cc=jesse.brandeburg@intel.com \
    --cc=jogreene@redhat.com \
    --cc=netdev@vger.kernel.org \
    --cc=nhorman@redhat.com \
    --cc=sassmann@redhat.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).