diff options
author | Taku Izumi <izumi.taku@jp.fujitsu.com> | 2015-08-21 04:29:30 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-08-24 17:06:35 -0400 |
commit | 4393e767aee706944dbdf3aa91810a0c981b6710 (patch) | |
tree | 0eb4e1894e1e289b902e76bc21787f1c18c272e5 /drivers | |
parent | b9e23a67d52f956d75e6327a7fccbb53fbdc540b (diff) |
fjes: net_device_ops.ndo_tx_timeout
This patch adds net_device_ops.ndo_tx_timeout callback.
Signed-off-by: Taku Izumi <izumi.taku@jp.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/fjes/fjes_main.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/net/fjes/fjes_main.c b/drivers/net/fjes/fjes_main.c index 519976cd4d9e..94ccc115020b 100644 --- a/drivers/net/fjes/fjes_main.c +++ b/drivers/net/fjes/fjes_main.c | |||
@@ -58,6 +58,7 @@ static irqreturn_t fjes_intr(int, void*); | |||
58 | static struct rtnl_link_stats64 * | 58 | static struct rtnl_link_stats64 * |
59 | fjes_get_stats64(struct net_device *, struct rtnl_link_stats64 *); | 59 | fjes_get_stats64(struct net_device *, struct rtnl_link_stats64 *); |
60 | static int fjes_change_mtu(struct net_device *, int); | 60 | static int fjes_change_mtu(struct net_device *, int); |
61 | static void fjes_tx_retry(struct net_device *); | ||
61 | 62 | ||
62 | static int fjes_acpi_add(struct acpi_device *); | 63 | static int fjes_acpi_add(struct acpi_device *); |
63 | static int fjes_acpi_remove(struct acpi_device *); | 64 | static int fjes_acpi_remove(struct acpi_device *); |
@@ -224,6 +225,7 @@ static const struct net_device_ops fjes_netdev_ops = { | |||
224 | .ndo_start_xmit = fjes_xmit_frame, | 225 | .ndo_start_xmit = fjes_xmit_frame, |
225 | .ndo_get_stats64 = fjes_get_stats64, | 226 | .ndo_get_stats64 = fjes_get_stats64, |
226 | .ndo_change_mtu = fjes_change_mtu, | 227 | .ndo_change_mtu = fjes_change_mtu, |
228 | .ndo_tx_timeout = fjes_tx_retry, | ||
227 | }; | 229 | }; |
228 | 230 | ||
229 | /* fjes_open - Called when a network interface is made active */ | 231 | /* fjes_open - Called when a network interface is made active */ |
@@ -705,6 +707,13 @@ fjes_xmit_frame(struct sk_buff *skb, struct net_device *netdev) | |||
705 | return ret; | 707 | return ret; |
706 | } | 708 | } |
707 | 709 | ||
710 | static void fjes_tx_retry(struct net_device *netdev) | ||
711 | { | ||
712 | struct netdev_queue *queue = netdev_get_tx_queue(netdev, 0); | ||
713 | |||
714 | netif_tx_wake_queue(queue); | ||
715 | } | ||
716 | |||
708 | static struct rtnl_link_stats64 * | 717 | static struct rtnl_link_stats64 * |
709 | fjes_get_stats64(struct net_device *netdev, struct rtnl_link_stats64 *stats) | 718 | fjes_get_stats64(struct net_device *netdev, struct rtnl_link_stats64 *stats) |
710 | { | 719 | { |