diff options
| author | Taku Izumi <izumi.taku@jp.fujitsu.com> | 2015-08-21 17:29:30 +0900 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-24 14:06:35 -0700 |
| commit | 4393e767aee706944dbdf3aa91810a0c981b6710 (patch) | |
| tree | 0eb4e1894e1e289b902e76bc21787f1c18c272e5 /drivers/net/fjes | |
| parent | b9e23a67d52f956d75e6327a7fccbb53fbdc540b (diff) | |
| download | linux-4393e767aee706944dbdf3aa91810a0c981b6710.tar.gz linux-4393e767aee706944dbdf3aa91810a0c981b6710.tar.bz2 linux-4393e767aee706944dbdf3aa91810a0c981b6710.zip | |
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/net/fjes')
| -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*); static struct rtnl_link_stats64 * fjes_get_stats64(struct net_device *, struct rtnl_link_stats64 *); static int fjes_change_mtu(struct net_device *, int); +static void fjes_tx_retry(struct net_device *); static int fjes_acpi_add(struct acpi_device *); static int fjes_acpi_remove(struct acpi_device *); @@ -224,6 +225,7 @@ static const struct net_device_ops fjes_netdev_ops = { .ndo_start_xmit = fjes_xmit_frame, .ndo_get_stats64 = fjes_get_stats64, .ndo_change_mtu = fjes_change_mtu, + .ndo_tx_timeout = fjes_tx_retry, }; /* 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) return ret; } +static void fjes_tx_retry(struct net_device *netdev) +{ + struct netdev_queue *queue = netdev_get_tx_queue(netdev, 0); + + netif_tx_wake_queue(queue); +} + static struct rtnl_link_stats64 * fjes_get_stats64(struct net_device *netdev, struct rtnl_link_stats64 *stats) { |