fjes: force_close_task

This patch adds force_close_task.
This task is used to close network device forcibly.

Signed-off-by: Taku Izumi <izumi.taku@jp.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/fjes/fjes.h b/drivers/net/fjes/fjes.h
index 1743dbb83e5bfc6b2968ee3bb2e465f8c165b5a1..d31d4c3be45ffa51c5cfc467238c85aa950417ae 100644 (file)
--- a/drivers/net/fjes/fjes.h
+++ b/drivers/net/fjes/fjes.h
@@ -47,6 +47,7 @@ struct fjes_adapter {
        unsigned long rx_last_jiffies;
        bool unset_rx_last;
 
+       struct work_struct force_close_task;
        bool force_reset;
        bool open_guard;
 

diff --git a/drivers/net/fjes/fjes_main.c b/drivers/net/fjes/fjes_main.c
index 5fce33dec8207c91221a1b0527efbec9bb034ba4..caecfb39ecf99bb1ec51c199a841eaa8ef233f33 100644 (file)
--- a/drivers/net/fjes/fjes_main.c
+++ b/drivers/net/fjes/fjes_main.c
@@ -54,6 +54,7 @@ static void fjes_free_resources(struct fjes_adapter *);
 static netdev_tx_t fjes_xmit_frame(struct sk_buff *, struct net_device *);
 static void fjes_raise_intr_rxdata_task(struct work_struct *);
 static void fjes_tx_stall_task(struct work_struct *);
+static void fjes_force_close_task(struct work_struct *);
 static irqreturn_t fjes_intr(int, void*);
 static struct rtnl_link_stats64 *
 fjes_get_stats64(struct net_device *, struct rtnl_link_stats64 *);
@@ -492,6 +493,17 @@ static void fjes_tx_stall_task(struct work_struct *work)
        queue_work(adapter->txrx_wq, &adapter->tx_stall_task);
 }
 
+static void fjes_force_close_task(struct work_struct *work)
+{
+       struct fjes_adapter *adapter = container_of(work,
+                       struct fjes_adapter, force_close_task);
+       struct net_device *netdev = adapter->netdev;
+
+       rtnl_lock();
+       dev_close(netdev);
+       rtnl_unlock();
+}
+
 static void fjes_raise_intr_rxdata_task(struct work_struct *work)
 {
        struct fjes_adapter *adapter = container_of(work,
@@ -1003,6 +1015,7 @@ static int fjes_probe(struct platform_device *plat_dev)
        if (err)
                goto err_free_netdev;
 
+       INIT_WORK(&adapter->force_close_task, fjes_force_close_task);
        adapter->force_reset = false;
        adapter->open_guard = false;