Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e55f578 authored by Jorge Boncompte [DTI2]'s avatar Jorge Boncompte [DTI2] Committed by David S. Miller
Browse files

atm: Introduce vcc_process_recv_queue 



This function moves the implementation found in the clip and br2684
modules to common code, correctly unlinks the skb from the queue
before pushing it and makes pppoatm use it.

Signed-off-by: default avatarJorge Boncompte [DTI2] <jorge@dti2.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3b829366

net/atm/br2684.c

+5 −15
Original line number Original line Diff line number Diff line
@@ -489,15 +489,11 @@ free_skb: 
 */

 */

static int br2684_regvcc(struct atm_vcc *atmvcc, void __user * arg)

static int br2684_regvcc(struct atm_vcc *atmvcc, void __user * arg)

{

{

	struct sk_buff_head queue;

	int err;

	struct br2684_vcc *brvcc;

	struct br2684_vcc *brvcc;

	struct sk_buff *skb, *tmp;

	struct sk_buff_head *rq;

	struct br2684_dev *brdev;

	struct br2684_dev *brdev;

	struct net_device *net_dev;

	struct net_device *net_dev;

	struct atm_backend_br2684 be;

	struct atm_backend_br2684 be;

	unsigned long flags;

	int err;





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

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

		return -EFAULT;

		return -EFAULT;
@@ -550,16 +546,6 @@ static int br2684_regvcc(struct atm_vcc *atmvcc, void __user * arg) 
	atmvcc->push = br2684_push;

	atmvcc->push = br2684_push;

	atmvcc->pop = br2684_pop;

	atmvcc->pop = br2684_pop;





	__skb_queue_head_init(&queue);

	rq = &sk_atm(atmvcc)->sk_receive_queue;



	spin_lock_irqsave(&rq->lock, flags);

	skb_queue_splice_init(rq, &queue);

	spin_unlock_irqrestore(&rq->lock, flags);



	skb_queue_walk_safe(&queue, skb, tmp)

		br2684_push(atmvcc, skb);



	/* initialize netdev carrier state */

	/* initialize netdev carrier state */

	if (atmvcc->dev->signal == ATM_PHY_SIG_LOST)

	if (atmvcc->dev->signal == ATM_PHY_SIG_LOST)

		netif_carrier_off(net_dev);

		netif_carrier_off(net_dev);
@@ -567,6 +553,10 @@ static int br2684_regvcc(struct atm_vcc *atmvcc, void __user * arg) 
		netif_carrier_on(net_dev);

		netif_carrier_on(net_dev);





	__module_get(THIS_MODULE);

	__module_get(THIS_MODULE);



	/* re-process everything received between connection setup and

	   backend setup */

	vcc_process_recv_queue(atmvcc);

	return 0;

	return 0;





error:

error:

net/atm/clip.c

+1 −12
Original line number Original line Diff line number Diff line
@@ -455,10 +455,7 @@ static netdev_tx_t clip_start_xmit(struct sk_buff *skb, 




static int clip_mkip(struct atm_vcc *vcc, int timeout)

static int clip_mkip(struct atm_vcc *vcc, int timeout)

{

{

	struct sk_buff_head *rq, queue;

	struct clip_vcc *clip_vcc;

	struct clip_vcc *clip_vcc;

	struct sk_buff *skb, *tmp;

	unsigned long flags;





	if (!vcc->push)

	if (!vcc->push)

		return -EBADFD;

		return -EBADFD;
@@ -479,16 +476,8 @@ static int clip_mkip(struct atm_vcc *vcc, int timeout) 
	vcc->push = clip_push;

	vcc->push = clip_push;

	vcc->pop = clip_pop;

	vcc->pop = clip_pop;





	__skb_queue_head_init(&queue);

	rq = &sk_atm(vcc)->sk_receive_queue;



	spin_lock_irqsave(&rq->lock, flags);

	skb_queue_splice_init(rq, &queue);

	spin_unlock_irqrestore(&rq->lock, flags);



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

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

	skb_queue_walk_safe(&queue, skb, tmp)

	vcc_process_recv_queue(vcc);

		clip_push(vcc, skb);





	return 0;

	return 0;

}

}

net/atm/common.c

+20 −0
Original line number Original line Diff line number Diff line
@@ -214,6 +214,26 @@ void vcc_release_async(struct atm_vcc *vcc, int reply) 
}

}

EXPORT_SYMBOL(vcc_release_async);

EXPORT_SYMBOL(vcc_release_async);





void vcc_process_recv_queue(struct atm_vcc *vcc)

{

	struct sk_buff_head queue, *rq;

	struct sk_buff *skb, *tmp;

	unsigned long flags;



	__skb_queue_head_init(&queue);

	rq = &sk_atm(vcc)->sk_receive_queue;



	spin_lock_irqsave(&rq->lock, flags);

	skb_queue_splice_init(rq, &queue);

	spin_unlock_irqrestore(&rq->lock, flags);



	skb_queue_walk_safe(&queue, skb, tmp) {

		__skb_unlink(skb, &queue);

		vcc->push(vcc, skb);

	}

}

EXPORT_SYMBOL(vcc_process_recv_queue);



void atm_dev_signal_change(struct atm_dev *dev, char signal)

void atm_dev_signal_change(struct atm_dev *dev, char signal)

{

{

	pr_debug("%s signal=%d dev=%p number=%d dev->signal=%d\n",

	pr_debug("%s signal=%d dev=%p number=%d dev->signal=%d\n",

net/atm/common.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ int vcc_setsockopt(struct socket *sock, int level, int optname, 
		   char __user *optval, unsigned int optlen);

		   char __user *optval, unsigned int optlen);

int vcc_getsockopt(struct socket *sock, int level, int optname,

int vcc_getsockopt(struct socket *sock, int level, int optname,

		   char __user *optval, int __user *optlen);

		   char __user *optval, int __user *optlen);

void vcc_process_recv_queue(struct atm_vcc *vcc);





int atmpvc_init(void);

int atmpvc_init(void);

void atmpvc_exit(void);

void atmpvc_exit(void);

net/atm/pppoatm.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -303,6 +303,10 @@ static int pppoatm_assign_vcc(struct atm_vcc *atmvcc, void __user *arg) 
	atmvcc->push = pppoatm_push;

	atmvcc->push = pppoatm_push;

	atmvcc->pop = pppoatm_pop;

	atmvcc->pop = pppoatm_pop;

	__module_get(THIS_MODULE);

	__module_get(THIS_MODULE);



	/* re-process everything received between connection setup and

	   backend setup */

	vcc_process_recv_queue(atmvcc);

	return 0;

	return 0;

}

}