|
@@ -110,7 +110,7 @@
|
|
const char gfar_driver_version[] = "2.0";
|
|
const char gfar_driver_version[] = "2.0";
|
|
|
|
|
|
static int gfar_enet_open(struct net_device *dev);
|
|
static int gfar_enet_open(struct net_device *dev);
|
|
-static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev);
|
|
|
|
|
|
+static netdev_tx_t gfar_start_xmit(struct sk_buff *skb, struct net_device *dev);
|
|
static void gfar_reset_task(struct work_struct *work);
|
|
static void gfar_reset_task(struct work_struct *work);
|
|
static void gfar_timeout(struct net_device *dev);
|
|
static void gfar_timeout(struct net_device *dev);
|
|
static int gfar_close(struct net_device *dev);
|
|
static int gfar_close(struct net_device *dev);
|
|
@@ -2332,7 +2332,7 @@ static inline bool gfar_csum_errata_76(struct gfar_private *priv,
|
|
/* This is called by the kernel when a frame is ready for transmission.
|
|
/* This is called by the kernel when a frame is ready for transmission.
|
|
* It is pointed to by the dev->hard_start_xmit function pointer
|
|
* It is pointed to by the dev->hard_start_xmit function pointer
|
|
*/
|
|
*/
|
|
-static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
|
|
|
|
|
+static netdev_tx_t gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
|
{
|
|
{
|
|
struct gfar_private *priv = netdev_priv(dev);
|
|
struct gfar_private *priv = netdev_priv(dev);
|
|
struct gfar_priv_tx_q *tx_queue = NULL;
|
|
struct gfar_priv_tx_q *tx_queue = NULL;
|