UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: unisys: simplify visornic_serverdown_complete 

Theres a lot of code duplication going on in visornic_serverdown_complete.
We should just be able to send it through the dev_close path and have it
do the right things.

Signed-off-by: Neil Horman <nhorman@redhat.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Neil Horman 2015-07-21 09:55:41 -04:00 committed by Greg Kroah-Hartman
parent 8cf12de41b
commit 0d5073935a
1 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/staging/unisys/visornic/visornic_main.c
View File

@ -19,10 +19,11 @@
*/
#include <linux/debugfs.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/skbuff.h>
#include <linux/netdevice.h>
#include <linux/kthread.h>
#include <linux/skbuff.h>
#include <linux/rtnetlink.h>
#include "visorbus.h"
#include "iochannel.h"
@ -370,8 +371,6 @@ visornic_serverdown_complete(struct work_struct *work)
{
struct visornic_devdata *devdata;
struct net_device *netdev;
unsigned long flags;
int i = 0, count = 0;
devdata = container_of(work, struct visornic_devdata,
serverdown_completion);
@ -380,27 +379,11 @@ visornic_serverdown_complete(struct work_struct *work)
/* Stop using datachan */
visor_thread_stop(&devdata->threadinfo);
/* Inform Linux that the link is down */
netif_carrier_off(netdev);
netif_stop_queue(netdev);
rtnl_lock();
dev_close(netdev);
rtnl_unlock();
/* Free the skb for XMITs that haven't been serviced by the server
* We shouldn't have to inform Linux about these IOs because they
* are "lost in the ethernet"
*/
skb_queue_purge(&devdata->xmitbufhead);
spin_lock_irqsave(&devdata->priv_lock, flags);
/* free rcv buffers */
for (i = 0; i < devdata->num_rcv_bufs; i++) {
if (devdata->rcvbuf[i]) {
kfree_skb(devdata->rcvbuf[i]);
devdata->rcvbuf[i] = NULL;
count++;
}
}
atomic_set(&devdata->num_rcvbuf_in_iovm, 0);
spin_unlock_irqrestore(&devdata->priv_lock, flags);
if (devdata->server_down_complete_func)
(*devdata->server_down_complete_func)(devdata->dev, 0);
@ -605,6 +588,8 @@ visornic_disable_with_timeout(struct net_device *netdev, const int timeout)
/* we've set enabled to 0, so we can give up the lock. */
spin_unlock_irqrestore(&devdata->priv_lock, flags);
skb_queue_purge(&devdata->xmitbufhead);
/* Free rcv buffers - other end has automatically unposed them on
* disable
*/
@ -1174,7 +1159,6 @@ repost_return(struct uiscmdrsp *cmdrsp, struct visornic_devdata *devdata,
devdata->bad_rcv_buf++;
}
}
atomic_dec(&devdata->usage);
return status;
}
@ -1228,10 +1212,6 @@ visornic_rx(struct uiscmdrsp *cmdrsp)
devdata->net_stats.rx_packets++;
devdata->net_stats.rx_bytes = skb->len;
atomic_inc(&devdata->usage); /* don't want a close to happen before
* we're done here
*/
/* set length to how much was ACTUALLY received -
* NOTE: rcv_done_len includes actual length of data rcvd
* including ethhdr