summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Brandeburg <jesse.brandeburg@intel.com>2015-03-31 00:45:02 -0700
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2015-04-03 03:54:29 -0700
commitb38da40190a1f8a1a0edcc70f983f7838aabadd4 (patch)
tree79db4f4f5512e909b80d90c5e0f8af6e09840c0e
parent8b6ed9c202c0c7c179ab7a6cf8010ff0b63d2d4f (diff)
downloadlinux-stable-b38da40190a1f8a1a0edcc70f983f7838aabadd4.tar.gz
linux-stable-b38da40190a1f8a1a0edcc70f983f7838aabadd4.tar.bz2
linux-stable-b38da40190a1f8a1a0edcc70f983f7838aabadd4.zip
i40e: fix invalid void return in FCoE code
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>
-rw-r--r--drivers/net/ethernet/intel/i40e/i40e_fcoe.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_fcoe.c b/drivers/net/ethernet/intel/i40e/i40e_fcoe.c
index 1ca48458e668..1803afeef23e 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);
}
/**