aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIoana Radulescu <ruxandra.radulescu@nxp.com>2017-06-06 10:00:26 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-06-13 12:02:54 +0200
commitc433db403bbc0b7b7e3e9b6abd5fc652a52c91c6 (patch)
treee3d53b92c8f9361a08a5dfa6ad122398d9eb4780
parentstaging: fsl-dpaa2/eth: Initialize variable before use (diff)
downloadlinux-c433db403bbc0b7b7e3e9b6abd5fc652a52c91c6.tar.gz
linux-c433db403bbc0b7b7e3e9b6abd5fc652a52c91c6.zip
staging: fsl-dpaa2/eth: Fix return type of ndo_start_xmit
ndo_start_xmit() returns a value of type netdev_tx_t. Update our ndo function to use the correct type. Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c
index f0ef3a7c0f73..a9e245df2488 100644
--- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c
+++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c
@@ -551,7 +551,7 @@ static void free_tx_fd(const struct dpaa2_eth_priv *priv,
dev_kfree_skb(skb);
}
-static int dpaa2_eth_tx(struct sk_buff *skb, struct net_device *net_dev)
+static netdev_tx_t dpaa2_eth_tx(struct sk_buff *skb, struct net_device *net_dev)
{
struct dpaa2_eth_priv *priv = netdev_priv(net_dev);
struct dpaa2_fd fd;
adataDaniel Borkmann7-10/+15 2016-03-11cisco: enic: Update logging macros and usesJoe Perches6-37/+43 2016-03-11bridge: allow zero ageing timeStephen Hemminger2-7/+8 2016-03-11rocker: set FDB cleanup timer according to lowest ageing timeIdo Schimmel3-1/+7 2016-03-11mlxsw: spectrum: Check requested ageing time is validIdo Schimmel2-2/+9 2016-03-11macvtap: always pass ethernet header in linearWillem de Bruijn1-3/+6 2016-03-11net/flower: Fix pointer castAmir Vadai2-7/+7 2016-03-10net/mlx5e: Support offload cls_flower with skbedit mark actionAmir Vadai3-0/+6 2016-03-10net/mlx5e: Support offload cls_flower with drop actionAmir Vadai3-0/+309 2016-03-10net/mlx5e: Introduce tc offload supportAmir Vadai5-2/+222 2016-03-10net/mlx5e: Add a new priority for kernel flow tablesAmir Vadai2-4/+4 2016-03-10net/mlx5e: Relax ndo_setup_tc handle restrictionAmir Vadai1-1/+1 2016-03-10net/mlx5_core: Set flow steering dest only for forward rulesAmir Vadai2-19/+28 2016-03-10net/act_skbedit: Utility functions for mark actionAmir Vadai1-0/+16 2016-03-10net/sched: Macro instead of CONFIG_NET_CLS_ACT ifdefAmir Vadai2-7/+18 2016-03-10net/flow_dissector: Make dissector_uses_key() and skb_flow_dissector_target()...Amir Vadai2-13/+13 2016-03-10net/flower: Introduce hardware offload supportAmir Vadai4-1/+81 2016-03-10net-next: mediatek: add an entry to MAINTAINERSJohn Crispin1-0/+7 2016-03-10net-next: mediatek: add Kconfig and MakefileJohn Crispin4-0/+24 2016-03-10net-next: mediatek: add support for MT7623 ethernetJohn Crispin2-0/+2228