NET_SCH_ATM doesn't need ipcommon.o
Subsystems (3)
PATCH 1/1 NET_SCH_ATM doesn't need ipcommon.o
NET_SCH_ATM doesn't need ipcommon.o
net/atm/Makefile renamed from net/atm/Makefile.old +0 -1
@@ -10,7 +10,6 @@ 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/Makefile line 13
Quoted 11 lines · Adrian Bunk
NET_SCH_ATMdoesn't need ipcommon.oSigned-off-by Adrian Bunk <[email protected]>net/atm/Makefile renamed from net/atm/Makefile.old +0
-1@@ -10,7 +10,6 @@ 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
Btw, ages ago Dave said there plans to get rid of ipcommon.c (it's just a single function). Did anything ever happen towards those plans?
David Miller
maintainerFrom: Christoph Hellwig <[email protected]>
Date: Mon, 27 Nov 2006 06:04:37 +0000
Quoted 5 lines · Adrian Bunk
Quoted 4 lines
NET_SCH_ATMdoesn't need ipcommon.oSigned-off-by Adrian Bunk <[email protected]>
Quoted 10 lines
net/atm/Makefile line 13
Quoted 7 lines
net/atm/Makefile renamed from net/atm/Makefile.old +0
-1@@ -10,7 +10,6 @@ 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.oBtw, ages ago Dave said there plans to get rid of
ipcommon.c(it's just a single function). Did anything ever happen towards those plans?
Let's get rid of that crap. I just checked the following into my net-2.6.20 tree.
commit 5465ae68b5ec11b2820db3f9b4c6fd94f113da44
Author: David S. Miller <[email protected]> Date: Thu Nov 30 21:05:23 2006 -0800
[ATM]: Kill ipcommon.[ch]
All that remained was skb_migrate() and that was overkill for what the two call sites were trying to do.
net/atm/Makefile +0 -3
@@ -7,10 +7,7 @@ mpoa-objs := mpc.o mpoa_caches.o mpoa_pr 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
@@ -23,7 +23,6 @@ #include <linux/seq_file.h>#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,*/ 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, brvcc->old_push = atmvcc->push;barrier (); atmvcc->push = br2684_push; -skb_queue_head_init (©); -skb_migrate (&sk_atm (atmvcc)->sk_receive_queue, ©); -while ((skb =skb_dequeue (©)) !=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
@@ -38,7 +38,6 @@ #include <asm/atomic.h>#include "common.h" #include "resources.h" -#include "ipcommon.h" #include <net/atmclip.h>
@@ -469,8 +468,9 @@ static struct net_device_stats *clip_getstatic 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 clip_vcc->old_pop = vcc->pop; vcc->push = clip_push; vcc->pop = clip_pop; -skb_queue_head_init (©); -skb_migrate (&sk_atm (vcc)->sk_receive_queue, ©); + + 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 (©)) !=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 *vccPRIV (skb->dev)->stats.rx_bytes -= len;kfree_skb (skb); } + + skb = next; + }return 0 ; }
net/atm/ipcommon.c deleted +0 -63
63 lines not on this page · raw message
net/atm/ipcommon.h deleted +0 -22
@@ -1,22 +0,0 @@ -/* 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