Commit c40a27f4 authored by David S. Miller's avatar David S. Miller
Browse files

[ATM]: Kill ipcommon.[ch] 



All that remained was skb_migrate() and that was overkill
for what the two call sites were trying to do.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1e9b3d53

net/atm/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -7,10 +7,7 @@ mpoa-objs := mpc.o mpoa_caches.o mpoa_proc.o 


obj-$(CONFIG_ATM) += atm.o

obj-$(CONFIG_ATM_CLIP) += clip.o

atm-$(subst m,y,$(CONFIG_ATM_CLIP)) += ipcommon.o

obj-$(CONFIG_ATM_BR2684) += br2684.o

atm-$(subst m,y,$(CONFIG_ATM_BR2684)) += ipcommon.o

atm-$(subst m,y,$(CONFIG_NET_SCH_ATM)) += ipcommon.o

atm-$(CONFIG_PROC_FS) += proc.o



obj-$(CONFIG_ATM_LANE) += lec.o

net/atm/br2684.c

+23 −5
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ Author: Marcell GAL, 2000, XDSL Ltd, Hungary 
#include <linux/atmbr2684.h>



#include "common.h"

#include "ipcommon.h"



/*

 * Define this to use a version of the code which interacts with the higher
@@ -500,11 +499,12 @@ Note: we do not have explicit unassign, but look at _push() 
*/

	int err;

	struct br2684_vcc *brvcc;

	struct sk_buff_head copy;

	struct sk_buff *skb;

	struct sk_buff_head *rq;

	struct br2684_dev *brdev;

	struct net_device *net_dev;

	struct atm_backend_br2684 be;

	unsigned long flags;



	if (copy_from_user(&be, arg, sizeof be))

		return -EFAULT;
@@ -554,12 +554,30 @@ Note: we do not have explicit unassign, but look at _push() 
	brvcc->old_push = atmvcc->push;

	barrier();

	atmvcc->push = br2684_push;

	skb_queue_head_init(&copy);

	skb_migrate(&sk_atm(atmvcc)->sk_receive_queue, &copy);

	while ((skb = skb_dequeue(&copy)) != NULL) {



	rq = &sk_atm(atmvcc)->sk_receive_queue;



	spin_lock_irqsave(&rq->lock, flags);

	if (skb_queue_empty(rq)) {

		skb = NULL;

	} else {

		/* NULL terminate the list.  */

		rq->prev->next = NULL;

		skb = rq->next;

	}

	rq->prev = rq->next = (struct sk_buff *)rq;

	rq->qlen = 0;

	spin_unlock_irqrestore(&rq->lock, flags);



	while (skb) {

		struct sk_buff *next = skb->next;



		skb->next = skb->prev = NULL;

		BRPRIV(skb->dev)->stats.rx_bytes -= skb->len;

		BRPRIV(skb->dev)->stats.rx_packets--;

		br2684_push(atmvcc, skb);



		skb = next;

	}

	__module_get(THIS_MODULE);

	return 0;

net/atm/clip.c

+24 −5
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 


#include "common.h"

#include "resources.h"

#include "ipcommon.h"

#include <net/atmclip.h>
@@ -469,8 +468,9 @@ static struct net_device_stats *clip_get_stats(struct net_device *dev) 
static int clip_mkip(struct atm_vcc *vcc, int timeout)

{

	struct clip_vcc *clip_vcc;

	struct sk_buff_head copy;

	struct sk_buff *skb;

	struct sk_buff_head *rq;

	unsigned long flags;



	if (!vcc->push)

		return -EBADFD;
@@ -490,10 +490,26 @@ static int clip_mkip(struct atm_vcc *vcc, int timeout) 
	clip_vcc->old_pop = vcc->pop;

	vcc->push = clip_push;

	vcc->pop = clip_pop;

	skb_queue_head_init(&copy);

	skb_migrate(&sk_atm(vcc)->sk_receive_queue, &copy);



	rq = &sk_atm(vcc)->sk_receive_queue;



	spin_lock_irqsave(&rq->lock, flags);

	if (skb_queue_empty(rq)) {

		skb = NULL;

	} else {

		/* NULL terminate the list.  */

		rq->prev->next = NULL;

		skb = rq->next;

	}

	rq->prev = rq->next = (struct sk_buff *)rq;

	rq->qlen = 0;

	spin_unlock_irqrestore(&rq->lock, flags);



	/* re-process everything received between connection setup and MKIP */

	while ((skb = skb_dequeue(&copy)) != NULL)

	while (skb) {

		struct sk_buff *next = skb->next;



		skb->next = skb->prev = NULL;

		if (!clip_devs) {

			atm_return(vcc, skb->truesize);

			kfree_skb(skb);
@@ -506,6 +522,9 @@ static int clip_mkip(struct atm_vcc *vcc, int timeout) 
			PRIV(skb->dev)->stats.rx_bytes -= len;

			kfree_skb(skb);

		}



		skb = next;

	}

	return 0;

}

net/atm/ipcommon.c

deleted100644 → 0
+0 −63
Original line number Diff line number Diff line 
/* net/atm/ipcommon.c - Common items for all ways of doing IP over ATM */



/* Written 1996-2000 by Werner Almesberger, EPFL LRC/ICA */





#include <linux/module.h>

#include <linux/string.h>

#include <linux/skbuff.h>

#include <linux/netdevice.h>

#include <linux/in.h>

#include <linux/atmdev.h>

#include <linux/atmclip.h>



#include "common.h"

#include "ipcommon.h"





#if 0

#define DPRINTK(format,args...) printk(KERN_DEBUG format,##args)

#else

#define DPRINTK(format,args...)

#endif





/*

 * skb_migrate appends the list at "from" to "to", emptying "from" in the

 * process. skb_migrate is atomic with respect to all other skb operations on

 * "from" and "to". Note that it locks both lists at the same time, so to deal

 * with the lock ordering, the locks are taken in address order.

 *

 * This function should live in skbuff.c or skbuff.h.

 */





void skb_migrate(struct sk_buff_head *from, struct sk_buff_head *to)

{

	unsigned long flags;

	struct sk_buff *skb_from = (struct sk_buff *) from;

	struct sk_buff *skb_to = (struct sk_buff *) to;

	struct sk_buff *prev;



	if ((unsigned long) from < (unsigned long) to) {

		spin_lock_irqsave(&from->lock, flags);

		spin_lock_nested(&to->lock, SINGLE_DEPTH_NESTING);

	} else {

		spin_lock_irqsave(&to->lock, flags);

		spin_lock_nested(&from->lock, SINGLE_DEPTH_NESTING);

	}

	prev = from->prev;

	from->next->prev = to->prev;

	prev->next = skb_to;

	to->prev->next = from->next;

	to->prev = from->prev;

	to->qlen += from->qlen;

	spin_unlock(&to->lock);

	from->prev = skb_from;

	from->next = skb_from;

	from->qlen = 0;

	spin_unlock_irqrestore(&from->lock, flags);

}





EXPORT_SYMBOL(skb_migrate);

net/atm/ipcommon.h

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
/* net/atm/ipcommon.h - Common items for all ways of doing IP over ATM */



/* Written 1996-2000 by Werner Almesberger, EPFL LRC/ICA */





#ifndef NET_ATM_IPCOMMON_H

#define NET_ATM_IPCOMMON_H





#include <linux/string.h>

#include <linux/skbuff.h>

#include <linux/netdevice.h>

#include <linux/atmdev.h>



/*

 * Appends all skbs from "from" to "to". The operation is atomic with respect

 * to all other skb operations on "from" or "to".

 */



void skb_migrate(struct sk_buff_head *from,struct sk_buff_head *to);



#endif