leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IPoIB/cm: Factor out ipoib_cm_free_rx_reap_list()

Browse Source 
Factor out the code for going through the rx_reap list of struct
ipoib_cm_rx and freeing each one.  This consolidates the code
duplicated between ipoib_cm_dev_stop() and ipoib_cm_rx_reap() and
reduces the risk of error when adding additional accounting.

Signed-off-by: Roland Dreier <rolandd@cisco.com>
This commit is contained in:
Roland Dreier 2008-01-25 14:15:24 -08:00
parent 7b3687df66
commit efcd99717f
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/infiniband/ulp/ipoib/ipoib_cm.c
View File

@ -673,10 +673,27 @@ err_cm:
return ret; return ret;
} }
static void ipoib_cm_free_rx_reap_list(struct net_device *dev)
{
struct ipoib_dev_priv *priv = netdev_priv(dev);
struct ipoib_cm_rx *rx, *n;
LIST_HEAD(list);
spin_lock_irq(&priv->lock);
list_splice_init(&priv->cm.rx_reap_list, &list);
spin_unlock_irq(&priv->lock);
list_for_each_entry_safe(rx, n, &list, list) {
ib_destroy_cm_id(rx->id);
ib_destroy_qp(rx->qp);
kfree(rx);
}
}
void ipoib_cm_dev_stop(struct net_device *dev) void ipoib_cm_dev_stop(struct net_device *dev)
{ {
struct ipoib_dev_priv *priv = netdev_priv(dev); struct ipoib_dev_priv *priv = netdev_priv(dev);
struct ipoib_cm_rx *p, *n; struct ipoib_cm_rx *p;
unsigned long begin; unsigned long begin;
LIST_HEAD(list); LIST_HEAD(list);
int ret; int ret;
@ -722,15 +739,9 @@ void ipoib_cm_dev_stop(struct net_device *dev)
spin_lock_irq(&priv->lock); spin_lock_irq(&priv->lock);
} }
list_splice_init(&priv->cm.rx_reap_list, &list);
spin_unlock_irq(&priv->lock); spin_unlock_irq(&priv->lock);
list_for_each_entry_safe(p, n, &list, list) { ipoib_cm_free_rx_reap_list(dev);
ib_destroy_cm_id(p->id);
ib_destroy_qp(p->qp);
kfree(p);
}
cancel_delayed_work(&priv->cm.stale_task); cancel_delayed_work(&priv->cm.stale_task);
} }
@ -1182,20 +1193,8 @@ void ipoib_cm_skb_too_long(struct net_device *dev, struct sk_buff *skb,
static void ipoib_cm_rx_reap(struct work_struct *work) static void ipoib_cm_rx_reap(struct work_struct *work)
{ {
struct ipoib_dev_priv *priv = container_of(work, struct ipoib_dev_priv, ipoib_cm_free_rx_reap_list(container_of(work, struct ipoib_dev_priv,
cm.rx_reap_task); cm.rx_reap_task)->dev);
struct ipoib_cm_rx *p, *n;
LIST_HEAD(list);
spin_lock_irq(&priv->lock);
list_splice_init(&priv->cm.rx_reap_list, &list);
spin_unlock_irq(&priv->lock);
list_for_each_entry_safe(p, n, &list, list) {
ib_destroy_cm_id(p->id);
ib_destroy_qp(p->qp);
kfree(p);
}
} }
static void ipoib_cm_stale_task(struct work_struct *work) static void ipoib_cm_stale_task(struct work_struct *work)