diff options
Diffstat (limited to 'drivers/atm')
| -rw-r--r-- | drivers/atm/atmtcp.c | 6 | ||||
| -rw-r--r-- | drivers/atm/eni.c | 3 | ||||
| -rw-r--r-- | drivers/atm/he.c | 3 | ||||
| -rw-r--r-- | drivers/atm/solos-pci.c | 3 | 
4 files changed, 5 insertions, 10 deletions
diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c index b22d71cac54..0e3f8f9dcd2 100644 --- a/drivers/atm/atmtcp.c +++ b/drivers/atm/atmtcp.c @@ -157,7 +157,6 @@ static int atmtcp_v_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)  {  	struct atm_cirange ci;  	struct atm_vcc *vcc; -	struct hlist_node *node;  	struct sock *s;  	int i; @@ -171,7 +170,7 @@ static int atmtcp_v_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)  	for(i = 0; i < VCC_HTABLE_SIZE; ++i) {  		struct hlist_head *head = &vcc_hash[i]; -		sk_for_each(s, node, head) { +		sk_for_each(s, head) {  			vcc = atm_sk(s);  			if (vcc->dev != dev)  				continue; @@ -264,12 +263,11 @@ static struct atm_vcc *find_vcc(struct atm_dev *dev, short vpi, int vci)  {          struct hlist_head *head;          struct atm_vcc *vcc; -        struct hlist_node *node;          struct sock *s;          head = &vcc_hash[vci & (VCC_HTABLE_SIZE -1)]; -        sk_for_each(s, node, head) { +	sk_for_each(s, head) {                  vcc = atm_sk(s);                  if (vcc->dev == dev &&                      vcc->vci == vci && vcc->vpi == vpi && diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c index c1eb6fa8ac3..b1955ba40d6 100644 --- a/drivers/atm/eni.c +++ b/drivers/atm/eni.c @@ -2093,7 +2093,6 @@ static unsigned char eni_phy_get(struct atm_dev *dev,unsigned long addr)  static int eni_proc_read(struct atm_dev *dev,loff_t *pos,char *page)  { -	struct hlist_node *node;  	struct sock *s;  	static const char *signal[] = { "LOST","unknown","okay" };  	struct eni_dev *eni_dev = ENI_DEV(dev); @@ -2171,7 +2170,7 @@ static int eni_proc_read(struct atm_dev *dev,loff_t *pos,char *page)  	for(i = 0; i < VCC_HTABLE_SIZE; ++i) {  		struct hlist_head *head = &vcc_hash[i]; -		sk_for_each(s, node, head) { +		sk_for_each(s, head) {  			struct eni_vcc *eni_vcc;  			int length; diff --git a/drivers/atm/he.c b/drivers/atm/he.c index 72b6960fa95..d6891267f5b 100644 --- a/drivers/atm/he.c +++ b/drivers/atm/he.c @@ -329,7 +329,6 @@ __find_vcc(struct he_dev *he_dev, unsigned cid)  {  	struct hlist_head *head;  	struct atm_vcc *vcc; -	struct hlist_node *node;  	struct sock *s;  	short vpi;  	int vci; @@ -338,7 +337,7 @@ __find_vcc(struct he_dev *he_dev, unsigned cid)  	vci = cid & ((1 << he_dev->vcibits) - 1);  	head = &vcc_hash[vci & (VCC_HTABLE_SIZE -1)]; -	sk_for_each(s, node, head) { +	sk_for_each(s, head) {  		vcc = atm_sk(s);  		if (vcc->dev == he_dev->atm_dev &&  		    vcc->vci == vci && vcc->vpi == vpi && diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c index 0474a89170b..32784d18d1f 100644 --- a/drivers/atm/solos-pci.c +++ b/drivers/atm/solos-pci.c @@ -896,12 +896,11 @@ static struct atm_vcc *find_vcc(struct atm_dev *dev, short vpi, int vci)  {  	struct hlist_head *head;  	struct atm_vcc *vcc = NULL; -	struct hlist_node *node;  	struct sock *s;  	read_lock(&vcc_sklist_lock);  	head = &vcc_hash[vci & (VCC_HTABLE_SIZE -1)]; -	sk_for_each(s, node, head) { +	sk_for_each(s, head) {  		vcc = atm_sk(s);  		if (vcc->dev == dev && vcc->vci == vci &&  		    vcc->vpi == vpi && vcc->qos.rxtp.traffic_class != ATM_NONE &&  |