aboutsummaryrefslogtreecommitdiffstats
path: root/net/atm
diff options
context:
space:
mode:
authorAndrea Bastoni <bastoni@cs.unc.edu>2010-05-30 19:16:45 -0400
committerAndrea Bastoni <bastoni@cs.unc.edu>2010-05-30 19:16:45 -0400
commitada47b5fe13d89735805b566185f4885f5a3f750 (patch)
tree644b88f8a71896307d71438e9b3af49126ffb22b /net/atm
parent43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff)
parent3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff)
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'net/atm')
-rw-r--r--net/atm/addr.c3
-rw-r--r--net/atm/atm_misc.c40
-rw-r--r--net/atm/atm_sysfs.c28
-rw-r--r--net/atm/br2684.c102
-rw-r--r--net/atm/clip.c87
-rw-r--r--net/atm/common.c389
-rw-r--r--net/atm/ioctl.c369
-rw-r--r--net/atm/lec.c610
-rw-r--r--net/atm/mpc.c541
-rw-r--r--net/atm/mpoa_caches.c191
-rw-r--r--net/atm/mpoa_proc.c90
-rw-r--r--net/atm/pppoatm.c29
-rw-r--r--net/atm/proc.c84
-rw-r--r--net/atm/pvc.c48
-rw-r--r--net/atm/raw.c27
-rw-r--r--net/atm/resources.c419
-rw-r--r--net/atm/signaling.c220
-rw-r--r--net/atm/svc.c267
18 files changed, 1882 insertions, 1662 deletions
diff --git a/net/atm/addr.c b/net/atm/addr.c
index 82e85abc303d..dcda35c66f15 100644
--- a/net/atm/addr.c
+++ b/net/atm/addr.c
@@ -4,7 +4,8 @@
4 4
5#include <linux/atm.h> 5#include <linux/atm.h>
6#include <linux/atmdev.h> 6#include <linux/atmdev.h>
7#include <asm/uaccess.h> 7#include <linux/slab.h>
8#include <linux/uaccess.h>
8 9
9#include "signaling.h" 10#include "signaling.h"
10#include "addr.h" 11#include "addr.h"
diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
index 02cc7e71efea..fc63526d8695 100644
--- a/net/atm/atm_misc.c
+++ b/net/atm/atm_misc.c
@@ -2,37 +2,35 @@
2 2
3/* Written 1995-2000 by Werner Almesberger, EPFL ICA */ 3/* Written 1995-2000 by Werner Almesberger, EPFL ICA */
4 4
5
6#include <linux/module.h> 5#include <linux/module.h>
7#include <linux/atm.h> 6#include <linux/atm.h>
8#include <linux/atmdev.h> 7#include <linux/atmdev.h>
9#include <linux/skbuff.h> 8#include <linux/skbuff.h>
10#include <linux/sonet.h> 9#include <linux/sonet.h>
11#include <linux/bitops.h> 10#include <linux/bitops.h>
11#include <linux/errno.h>
12#include <asm/atomic.h> 12#include <asm/atomic.h>
13#include <asm/errno.h>
14
15 13
16int atm_charge(struct atm_vcc *vcc,int truesize) 14int atm_charge(struct atm_vcc *vcc, int truesize)
17{ 15{
18 atm_force_charge(vcc,truesize); 16 atm_force_charge(vcc, truesize);
19 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf) 17 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
20 return 1; 18 return 1;
21 atm_return(vcc,truesize); 19 atm_return(vcc, truesize);
22 atomic_inc(&vcc->stats->rx_drop); 20 atomic_inc(&vcc->stats->rx_drop);
23 return 0; 21 return 0;
24} 22}
23EXPORT_SYMBOL(atm_charge);
25 24
26 25struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
27struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc,int pdu_size, 26 gfp_t gfp_flags)
28 gfp_t gfp_flags)
29{ 27{
30 struct sock *sk = sk_atm(vcc); 28 struct sock *sk = sk_atm(vcc);
31 int guess = atm_guess_pdu2truesize(pdu_size); 29 int guess = atm_guess_pdu2truesize(pdu_size);
32 30
33 atm_force_charge(vcc,guess); 31 atm_force_charge(vcc, guess);
34 if (atomic_read(&sk->sk_rmem_alloc) <= sk->sk_rcvbuf) { 32 if (atomic_read(&sk->sk_rmem_alloc) <= sk->sk_rcvbuf) {
35 struct sk_buff *skb = alloc_skb(pdu_size,gfp_flags); 33 struct sk_buff *skb = alloc_skb(pdu_size, gfp_flags);
36 34
37 if (skb) { 35 if (skb) {
38 atomic_add(skb->truesize-guess, 36 atomic_add(skb->truesize-guess,
@@ -40,10 +38,11 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc,int pdu_size,
40 return skb; 38 return skb;
41 } 39 }
42 } 40 }
43 atm_return(vcc,guess); 41 atm_return(vcc, guess);
44 atomic_inc(&vcc->stats->rx_drop); 42 atomic_inc(&vcc->stats->rx_drop);
45 return NULL; 43 return NULL;
46} 44}
45EXPORT_SYMBOL(atm_alloc_charge);
47 46
48 47
49/* 48/*
@@ -73,7 +72,6 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc,int pdu_size,
73 * else * 72 * else *
74 */ 73 */
75 74
76
77int atm_pcr_goal(const struct atm_trafprm *tp) 75int atm_pcr_goal(const struct atm_trafprm *tp)
78{ 76{
79 if (tp->pcr && tp->pcr != ATM_MAX_PCR) 77 if (tp->pcr && tp->pcr != ATM_MAX_PCR)
@@ -84,26 +82,20 @@ int atm_pcr_goal(const struct atm_trafprm *tp)
84 return -tp->max_pcr; 82 return -tp->max_pcr;
85 return 0; 83 return 0;
86} 84}
85EXPORT_SYMBOL(atm_pcr_goal);
87 86
88 87void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
89void sonet_copy_stats(struct k_sonet_stats *from,struct sonet_stats *to)
90{ 88{
91#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i) 89#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
92 __SONET_ITEMS 90 __SONET_ITEMS
93#undef __HANDLE_ITEM 91#undef __HANDLE_ITEM
94} 92}
93EXPORT_SYMBOL(sonet_copy_stats);
95 94
96 95void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
97void sonet_subtract_stats(struct k_sonet_stats *from,struct sonet_stats *to)
98{ 96{
99#define __HANDLE_ITEM(i) atomic_sub(to->i,&from->i) 97#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
100 __SONET_ITEMS 98 __SONET_ITEMS
101#undef __HANDLE_ITEM 99#undef __HANDLE_ITEM
102} 100}
103
104
105EXPORT_SYMBOL(atm_charge);
106EXPORT_SYMBOL(atm_alloc_charge);
107EXPORT_SYMBOL(atm_pcr_goal);
108EXPORT_SYMBOL(sonet_copy_stats);
109EXPORT_SYMBOL(sonet_subtract_stats); 101EXPORT_SYMBOL(sonet_subtract_stats);
diff --git a/net/atm/atm_sysfs.c b/net/atm/atm_sysfs.c
index b5674dc2083d..799c631f0fed 100644
--- a/net/atm/atm_sysfs.c
+++ b/net/atm/atm_sysfs.c
@@ -1,6 +1,7 @@
1/* ATM driver model support. */ 1/* ATM driver model support. */
2 2
3#include <linux/kernel.h> 3#include <linux/kernel.h>
4#include <linux/slab.h>
4#include <linux/init.h> 5#include <linux/init.h>
5#include <linux/kobject.h> 6#include <linux/kobject.h>
6#include <linux/atmdev.h> 7#include <linux/atmdev.h>
@@ -42,13 +43,14 @@ static ssize_t show_atmaddress(struct device *cdev,
42 43
43 spin_lock_irqsave(&adev->lock, flags); 44 spin_lock_irqsave(&adev->lock, flags);
44 list_for_each_entry(aaddr, &adev->local, entry) { 45 list_for_each_entry(aaddr, &adev->local, entry) {
45 for(i = 0, j = 0; i < ATM_ESA_LEN; ++i, ++j) { 46 for (i = 0, j = 0; i < ATM_ESA_LEN; ++i, ++j) {
46 if (j == *fmt) { 47 if (j == *fmt) {
47 pos += sprintf(pos, "."); 48 pos += sprintf(pos, ".");
48 ++fmt; 49 ++fmt;
49 j = 0; 50 j = 0;
50 } 51 }
51 pos += sprintf(pos, "%02x", aaddr->addr.sas_addr.prv[i]); 52 pos += sprintf(pos, "%02x",
53 aaddr->addr.sas_addr.prv[i]);
52 } 54 }
53 pos += sprintf(pos, "\n"); 55 pos += sprintf(pos, "\n");
54 } 56 }
@@ -78,17 +80,17 @@ static ssize_t show_link_rate(struct device *cdev,
78 80
79 /* show the link rate, not the data rate */ 81 /* show the link rate, not the data rate */
80 switch (adev->link_rate) { 82 switch (adev->link_rate) {
81 case ATM_OC3_PCR: 83 case ATM_OC3_PCR:
82 link_rate = 155520000; 84 link_rate = 155520000;
83 break; 85 break;
84 case ATM_OC12_PCR: 86 case ATM_OC12_PCR:
85 link_rate = 622080000; 87 link_rate = 622080000;
86 break; 88 break;
87 case ATM_25_PCR: 89 case ATM_25_PCR:
88 link_rate = 25600000; 90 link_rate = 25600000;
89 break; 91 break;
90 default: 92 default:
91 link_rate = adev->link_rate * 8 * 53; 93 link_rate = adev->link_rate * 8 * 53;
92 } 94 }
93 pos += sprintf(pos, "%d\n", link_rate); 95 pos += sprintf(pos, "%d\n", link_rate);
94 96
diff --git a/net/atm/br2684.c b/net/atm/br2684.c
index 26a646d4eb32..d6c7ceaf13e9 100644
--- a/net/atm/br2684.c
+++ b/net/atm/br2684.c
@@ -6,6 +6,8 @@
6 * Eric Kinzie, 2006-2007, US Naval Research Laboratory 6 * Eric Kinzie, 2006-2007, US Naval Research Laboratory
7 */ 7 */
8 8
9#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
10
9#include <linux/module.h> 11#include <linux/module.h>
10#include <linux/init.h> 12#include <linux/init.h>
11#include <linux/kernel.h> 13#include <linux/kernel.h>
@@ -15,7 +17,8 @@
15#include <linux/etherdevice.h> 17#include <linux/etherdevice.h>
16#include <linux/rtnetlink.h> 18#include <linux/rtnetlink.h>
17#include <linux/ip.h> 19#include <linux/ip.h>
18#include <asm/uaccess.h> 20#include <linux/uaccess.h>
21#include <linux/slab.h>
19#include <net/arp.h> 22#include <net/arp.h>
20#include <linux/atm.h> 23#include <linux/atm.h>
21#include <linux/atmdev.h> 24#include <linux/atmdev.h>
@@ -26,20 +29,14 @@
26 29
27#include "common.h" 30#include "common.h"
28 31
29#ifdef SKB_DEBUG
30static void skb_debug(const struct sk_buff *skb) 32static void skb_debug(const struct sk_buff *skb)
31{ 33{
34#ifdef SKB_DEBUG
32#define NUM2PRINT 50 35#define NUM2PRINT 50
33 char buf[NUM2PRINT * 3 + 1]; /* 3 chars per byte */ 36 print_hex_dump(KERN_DEBUG, "br2684: skb: ", DUMP_OFFSET,
34 int i = 0; 37 16, 1, skb->data, min(NUM2PRINT, skb->len), true);
35 for (i = 0; i < skb->len && i < NUM2PRINT; i++) {
36 sprintf(buf + i * 3, "%2.2x ", 0xff & skb->data[i]);
37 }
38 printk(KERN_DEBUG "br2684: skb: %s\n", buf);
39}
40#else
41#define skb_debug(skb) do {} while (0)
42#endif 38#endif
39}
43 40
44#define BR2684_ETHERTYPE_LEN 2 41#define BR2684_ETHERTYPE_LEN 2
45#define BR2684_PAD_LEN 2 42#define BR2684_PAD_LEN 2
@@ -68,7 +65,7 @@ struct br2684_vcc {
68 struct atm_vcc *atmvcc; 65 struct atm_vcc *atmvcc;
69 struct net_device *device; 66 struct net_device *device;
70 /* keep old push, pop functions for chaining */ 67 /* keep old push, pop functions for chaining */
71 void (*old_push) (struct atm_vcc * vcc, struct sk_buff * skb); 68 void (*old_push)(struct atm_vcc *vcc, struct sk_buff *skb);
72 void (*old_pop)(struct atm_vcc *vcc, struct sk_buff *skb); 69 void (*old_pop)(struct atm_vcc *vcc, struct sk_buff *skb);
73 enum br2684_encaps encaps; 70 enum br2684_encaps encaps;
74 struct list_head brvccs; 71 struct list_head brvccs;
@@ -148,7 +145,7 @@ static void br2684_pop(struct atm_vcc *vcc, struct sk_buff *skb)
148 struct br2684_vcc *brvcc = BR2684_VCC(vcc); 145 struct br2684_vcc *brvcc = BR2684_VCC(vcc);
149 struct net_device *net_dev = skb->dev; 146 struct net_device *net_dev = skb->dev;
150 147
151 pr_debug("br2684_pop(vcc %p ; net_dev %p )\n", vcc, net_dev); 148 pr_debug("(vcc %p ; net_dev %p )\n", vcc, net_dev);
152 brvcc->old_pop(vcc, skb); 149 brvcc->old_pop(vcc, skb);
153 150
154 if (!net_dev) 151 if (!net_dev)
@@ -244,7 +241,7 @@ static netdev_tx_t br2684_start_xmit(struct sk_buff *skb,
244 struct br2684_dev *brdev = BRPRIV(dev); 241 struct br2684_dev *brdev = BRPRIV(dev);
245 struct br2684_vcc *brvcc; 242 struct br2684_vcc *brvcc;
246 243
247 pr_debug("br2684_start_xmit, skb_dst(skb)=%p\n", skb_dst(skb)); 244 pr_debug("skb_dst(skb)=%p\n", skb_dst(skb));
248 read_lock(&devs_lock); 245 read_lock(&devs_lock);
249 brvcc = pick_outgoing_vcc(skb, brdev); 246 brvcc = pick_outgoing_vcc(skb, brdev);
250 if (brvcc == NULL) { 247 if (brvcc == NULL) {
@@ -300,7 +297,8 @@ static int br2684_setfilt(struct atm_vcc *atmvcc, void __user * arg)
300 struct br2684_dev *brdev; 297 struct br2684_dev *brdev;
301 read_lock(&devs_lock); 298 read_lock(&devs_lock);
302 brdev = BRPRIV(br2684_find_dev(&fs.ifspec)); 299 brdev = BRPRIV(br2684_find_dev(&fs.ifspec));
303 if (brdev == NULL || list_empty(&brdev->brvccs) || brdev->brvccs.next != brdev->brvccs.prev) /* >1 VCC */ 300 if (brdev == NULL || list_empty(&brdev->brvccs) ||
301 brdev->brvccs.next != brdev->brvccs.prev) /* >1 VCC */
304 brvcc = NULL; 302 brvcc = NULL;
305 else 303 else
306 brvcc = list_entry_brvcc(brdev->brvccs.next); 304 brvcc = list_entry_brvcc(brdev->brvccs.next);
@@ -352,7 +350,7 @@ static void br2684_push(struct atm_vcc *atmvcc, struct sk_buff *skb)
352 struct net_device *net_dev = brvcc->device; 350 struct net_device *net_dev = brvcc->device;
353 struct br2684_dev *brdev = BRPRIV(net_dev); 351 struct br2684_dev *brdev = BRPRIV(net_dev);
354 352
355 pr_debug("br2684_push\n"); 353 pr_debug("\n");
356 354
357 if (unlikely(skb == NULL)) { 355 if (unlikely(skb == NULL)) {
358 /* skb==NULL means VCC is being destroyed */ 356 /* skb==NULL means VCC is being destroyed */
@@ -376,29 +374,25 @@ static void br2684_push(struct atm_vcc *atmvcc, struct sk_buff *skb)
376 __skb_trim(skb, skb->len - 4); 374 __skb_trim(skb, skb->len - 4);
377 375
378 /* accept packets that have "ipv[46]" in the snap header */ 376 /* accept packets that have "ipv[46]" in the snap header */
379 if ((skb->len >= (sizeof(llc_oui_ipv4))) 377 if ((skb->len >= (sizeof(llc_oui_ipv4))) &&
380 && 378 (memcmp(skb->data, llc_oui_ipv4,
381 (memcmp 379 sizeof(llc_oui_ipv4) - BR2684_ETHERTYPE_LEN) == 0)) {
382 (skb->data, llc_oui_ipv4, 380 if (memcmp(skb->data + 6, ethertype_ipv6,
383 sizeof(llc_oui_ipv4) - BR2684_ETHERTYPE_LEN) == 0)) { 381 sizeof(ethertype_ipv6)) == 0)
384 if (memcmp
385 (skb->data + 6, ethertype_ipv6,
386 sizeof(ethertype_ipv6)) == 0)
387 skb->protocol = htons(ETH_P_IPV6); 382 skb->protocol = htons(ETH_P_IPV6);
388 else if (memcmp 383 else if (memcmp(skb->data + 6, ethertype_ipv4,
389 (skb->data + 6, ethertype_ipv4, 384 sizeof(ethertype_ipv4)) == 0)
390 sizeof(ethertype_ipv4)) == 0)
391 skb->protocol = htons(ETH_P_IP); 385 skb->protocol = htons(ETH_P_IP);
392 else 386 else
393 goto error; 387 goto error;
394 skb_pull(skb, sizeof(llc_oui_ipv4)); 388 skb_pull(skb, sizeof(llc_oui_ipv4));
395 skb_reset_network_header(skb); 389 skb_reset_network_header(skb);
396 skb->pkt_type = PACKET_HOST; 390 skb->pkt_type = PACKET_HOST;
397 /* 391 /*
398 * Let us waste some time for checking the encapsulation. 392 * Let us waste some time for checking the encapsulation.
399 * Note, that only 7 char is checked so frames with a valid FCS 393 * Note, that only 7 char is checked so frames with a valid FCS
400 * are also accepted (but FCS is not checked of course). 394 * are also accepted (but FCS is not checked of course).
401 */ 395 */
402 } else if ((skb->len >= sizeof(llc_oui_pid_pad)) && 396 } else if ((skb->len >= sizeof(llc_oui_pid_pad)) &&
403 (memcmp(skb->data, llc_oui_pid_pad, 7) == 0)) { 397 (memcmp(skb->data, llc_oui_pid_pad, 7) == 0)) {
404 skb_pull(skb, sizeof(llc_oui_pid_pad)); 398 skb_pull(skb, sizeof(llc_oui_pid_pad));
@@ -479,8 +473,7 @@ static int br2684_regvcc(struct atm_vcc *atmvcc, void __user * arg)
479 write_lock_irq(&devs_lock); 473 write_lock_irq(&devs_lock);
480 net_dev = br2684_find_dev(&be.ifspec); 474 net_dev = br2684_find_dev(&be.ifspec);
481 if (net_dev == NULL) { 475 if (net_dev == NULL) {
482 printk(KERN_ERR 476 pr_err("tried to attach to non-existant device\n");
483 "br2684: tried to attach to non-existant device\n");
484 err = -ENXIO; 477 err = -ENXIO;
485 goto error; 478 goto error;
486 } 479 }
@@ -494,17 +487,16 @@ static int br2684_regvcc(struct atm_vcc *atmvcc, void __user * arg)
494 err = -EEXIST; 487 err = -EEXIST;
495 goto error; 488 goto error;
496 } 489 }
497 if (be.fcs_in != BR2684_FCSIN_NO || be.fcs_out != BR2684_FCSOUT_NO || 490 if (be.fcs_in != BR2684_FCSIN_NO ||
498 be.fcs_auto || be.has_vpiid || be.send_padding || (be.encaps != 491 be.fcs_out != BR2684_FCSOUT_NO ||
499 BR2684_ENCAPS_VC 492 be.fcs_auto || be.has_vpiid || be.send_padding ||
500 && be.encaps != 493 (be.encaps != BR2684_ENCAPS_VC &&
501 BR2684_ENCAPS_LLC) 494 be.encaps != BR2684_ENCAPS_LLC) ||
502 || be.min_size != 0) { 495 be.min_size != 0) {
503 err = -EINVAL; 496 err = -EINVAL;
504 goto error; 497 goto error;
505 } 498 }
506 pr_debug("br2684_regvcc vcc=%p, encaps=%d, brvcc=%p\n", atmvcc, 499 pr_debug("vcc=%p, encaps=%d, brvcc=%p\n", atmvcc, be.encaps, brvcc);
507 be.encaps, brvcc);
508 if (list_empty(&brdev->brvccs) && !brdev->mac_was_set) { 500 if (list_empty(&brdev->brvccs) && !brdev->mac_was_set) {
509 unsigned char *esi = atmvcc->dev->esi; 501 unsigned char *esi = atmvcc->dev->esi;
510 if (esi[0] | esi[1] | esi[2] | esi[3] | esi[4] | esi[5]) 502 if (esi[0] | esi[1] | esi[2] | esi[3] | esi[4] | esi[5])
@@ -541,7 +533,8 @@ static int br2684_regvcc(struct atm_vcc *atmvcc, void __user * arg)
541 } 533 }
542 __module_get(THIS_MODULE); 534 __module_get(THIS_MODULE);
543 return 0; 535 return 0;
544 error: 536
537error:
545 write_unlock_irq(&devs_lock); 538 write_unlock_irq(&devs_lock);
546 kfree(brvcc); 539 kfree(brvcc);
547 return err; 540 return err;
@@ -554,6 +547,12 @@ static const struct net_device_ops br2684_netdev_ops = {
554 .ndo_validate_addr = eth_validate_addr, 547 .ndo_validate_addr = eth_validate_addr,
555}; 548};
556 549
550static const struct net_device_ops br2684_netdev_ops_routed = {
551 .ndo_start_xmit = br2684_start_xmit,
552 .ndo_set_mac_address = br2684_mac_addr,
553 .ndo_change_mtu = eth_change_mtu
554};
555
557static void br2684_setup(struct net_device *netdev) 556static void br2684_setup(struct net_device *netdev)
558{ 557{
559 struct br2684_dev *brdev = BRPRIV(netdev); 558 struct br2684_dev *brdev = BRPRIV(netdev);
@@ -569,11 +568,10 @@ static void br2684_setup(struct net_device *netdev)
569static void br2684_setup_routed(struct net_device *netdev) 568static void br2684_setup_routed(struct net_device *netdev)
570{ 569{
571 struct br2684_dev *brdev = BRPRIV(netdev); 570 struct br2684_dev *brdev = BRPRIV(netdev);
572 brdev->net_dev = netdev;
573 571
572 brdev->net_dev = netdev;
574 netdev->hard_header_len = 0; 573 netdev->hard_header_len = 0;
575 574 netdev->netdev_ops = &br2684_netdev_ops_routed;
576 netdev->netdev_ops = &br2684_netdev_ops;
577 netdev->addr_len = 0; 575 netdev->addr_len = 0;
578 netdev->mtu = 1500; 576 netdev->mtu = 1500;
579 netdev->type = ARPHRD_PPP; 577 netdev->type = ARPHRD_PPP;
@@ -582,7 +580,7 @@ static void br2684_setup_routed(struct net_device *netdev)
582 INIT_LIST_HEAD(&brdev->brvccs); 580 INIT_LIST_HEAD(&brdev->brvccs);
583} 581}
584 582
585static int br2684_create(void __user * arg) 583static int br2684_create(void __user *arg)
586{ 584{
587 int err; 585 int err;
588 struct net_device *netdev; 586 struct net_device *netdev;
@@ -590,11 +588,10 @@ static int br2684_create(void __user * arg)
590 struct atm_newif_br2684 ni; 588 struct atm_newif_br2684 ni;
591 enum br2684_payload payload; 589 enum br2684_payload payload;
592 590
593 pr_debug("br2684_create\n"); 591 pr_debug("\n");
594 592
595 if (copy_from_user(&ni, arg, sizeof ni)) { 593 if (copy_from_user(&ni, arg, sizeof ni))
596 return -EFAULT; 594 return -EFAULT;
597 }
598 595
599 if (ni.media & BR2684_FLAG_ROUTED) 596 if (ni.media & BR2684_FLAG_ROUTED)
600 payload = p_routed; 597 payload = p_routed;
@@ -602,9 +599,8 @@ static int br2684_create(void __user * arg)
602 payload = p_bridged; 599 payload = p_bridged;
603 ni.media &= 0xffff; /* strip flags */ 600 ni.media &= 0xffff; /* strip flags */
604 601
605 if (ni.media != BR2684_MEDIA_ETHERNET || ni.mtu != 1500) { 602 if (ni.media != BR2684_MEDIA_ETHERNET || ni.mtu != 1500)
606 return -EINVAL; 603 return -EINVAL;
607 }
608 604
609 netdev = alloc_netdev(sizeof(struct br2684_dev), 605 netdev = alloc_netdev(sizeof(struct br2684_dev),
610 ni.ifname[0] ? ni.ifname : "nas%d", 606 ni.ifname[0] ? ni.ifname : "nas%d",
@@ -619,7 +615,7 @@ static int br2684_create(void __user * arg)
619 /* open, stop, do_ioctl ? */ 615 /* open, stop, do_ioctl ? */
620 err = register_netdev(netdev); 616 err = register_netdev(netdev);
621 if (err < 0) { 617 if (err < 0) {
622 printk(KERN_ERR "br2684_create: register_netdev failed\n"); 618 pr_err("register_netdev failed\n");
623 free_netdev(netdev); 619 free_netdev(netdev);
624 return err; 620 return err;
625 } 621 }
diff --git a/net/atm/clip.c b/net/atm/clip.c
index 64629c354343..313aba11316b 100644
--- a/net/atm/clip.c
+++ b/net/atm/clip.c
@@ -2,6 +2,8 @@
2 2
3/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */ 3/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
4 4
5#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
6
5#include <linux/string.h> 7#include <linux/string.h>
6#include <linux/errno.h> 8#include <linux/errno.h>
7#include <linux/kernel.h> /* for UINT_MAX */ 9#include <linux/kernel.h> /* for UINT_MAX */
@@ -28,12 +30,13 @@
28#include <linux/seq_file.h> 30#include <linux/seq_file.h>
29#include <linux/rcupdate.h> 31#include <linux/rcupdate.h>
30#include <linux/jhash.h> 32#include <linux/jhash.h>
33#include <linux/slab.h>
31#include <net/route.h> /* for struct rtable and routing */ 34#include <net/route.h> /* for struct rtable and routing */
32#include <net/icmp.h> /* icmp_send */ 35#include <net/icmp.h> /* icmp_send */
33#include <asm/param.h> /* for HZ */ 36#include <linux/param.h> /* for HZ */
37#include <linux/uaccess.h>
34#include <asm/byteorder.h> /* for htons etc. */ 38#include <asm/byteorder.h> /* for htons etc. */
35#include <asm/system.h> /* save/restore_flags */ 39#include <asm/system.h> /* save/restore_flags */
36#include <asm/uaccess.h>
37#include <asm/atomic.h> 40#include <asm/atomic.h>
38 41
39#include "common.h" 42#include "common.h"
@@ -51,13 +54,13 @@ static int to_atmarpd(enum atmarp_ctrl_type type, int itf, __be32 ip)
51 struct atmarp_ctrl *ctrl; 54 struct atmarp_ctrl *ctrl;
52 struct sk_buff *skb; 55 struct sk_buff *skb;
53 56
54 pr_debug("to_atmarpd(%d)\n", type); 57 pr_debug("(%d)\n", type);
55 if (!atmarpd) 58 if (!atmarpd)
56 return -EUNATCH; 59 return -EUNATCH;
57 skb = alloc_skb(sizeof(struct atmarp_ctrl),GFP_ATOMIC); 60 skb = alloc_skb(sizeof(struct atmarp_ctrl), GFP_ATOMIC);
58 if (!skb) 61 if (!skb)
59 return -ENOMEM; 62 return -ENOMEM;
60 ctrl = (struct atmarp_ctrl *) skb_put(skb,sizeof(struct atmarp_ctrl)); 63 ctrl = (struct atmarp_ctrl *)skb_put(skb, sizeof(struct atmarp_ctrl));
61 ctrl->type = type; 64 ctrl->type = type;
62 ctrl->itf_num = itf; 65 ctrl->itf_num = itf;
63 ctrl->ip = ip; 66 ctrl->ip = ip;
@@ -71,8 +74,7 @@ static int to_atmarpd(enum atmarp_ctrl_type type, int itf, __be32 ip)
71 74
72static void link_vcc(struct clip_vcc *clip_vcc, struct atmarp_entry *entry) 75static void link_vcc(struct clip_vcc *clip_vcc, struct atmarp_entry *entry)
73{ 76{
74 pr_debug("link_vcc %p to entry %p (neigh %p)\n", clip_vcc, entry, 77 pr_debug("%p to entry %p (neigh %p)\n", clip_vcc, entry, entry->neigh);
75 entry->neigh);
76 clip_vcc->entry = entry; 78 clip_vcc->entry = entry;
77 clip_vcc->xoff = 0; /* @@@ may overrun buffer by one packet */ 79 clip_vcc->xoff = 0; /* @@@ may overrun buffer by one packet */
78 clip_vcc->next = entry->vccs; 80 clip_vcc->next = entry->vccs;
@@ -86,7 +88,7 @@ static void unlink_clip_vcc(struct clip_vcc *clip_vcc)
86 struct clip_vcc **walk; 88 struct clip_vcc **walk;
87 89
88 if (!entry) { 90 if (!entry) {
89 printk(KERN_CRIT "!clip_vcc->entry (clip_vcc %p)\n", clip_vcc); 91 pr_crit("!clip_vcc->entry (clip_vcc %p)\n", clip_vcc);
90 return; 92 return;
91 } 93 }
92 netif_tx_lock_bh(entry->neigh->dev); /* block clip_start_xmit() */ 94 netif_tx_lock_bh(entry->neigh->dev); /* block clip_start_xmit() */
@@ -106,13 +108,11 @@ static void unlink_clip_vcc(struct clip_vcc *clip_vcc)
106 error = neigh_update(entry->neigh, NULL, NUD_NONE, 108 error = neigh_update(entry->neigh, NULL, NUD_NONE,
107 NEIGH_UPDATE_F_ADMIN); 109 NEIGH_UPDATE_F_ADMIN);
108 if (error) 110 if (error)
109 printk(KERN_CRIT "unlink_clip_vcc: " 111 pr_crit("neigh_update failed with %d\n", error);
110 "neigh_update failed with %d\n", error);
111 goto out; 112 goto out;
112 } 113 }
113 printk(KERN_CRIT "ATMARP: unlink_clip_vcc failed (entry %p, vcc " 114 pr_crit("ATMARP: failed (entry %p, vcc 0x%p)\n", entry, clip_vcc);
114 "0x%p)\n", entry, clip_vcc); 115out:
115 out:
116 netif_tx_unlock_bh(entry->neigh->dev); 116 netif_tx_unlock_bh(entry->neigh->dev);
117} 117}
118 118
@@ -127,7 +127,7 @@ static int neigh_check_cb(struct neighbour *n)
127 127
128 if (cv->idle_timeout && time_after(jiffies, exp)) { 128 if (cv->idle_timeout && time_after(jiffies, exp)) {
129 pr_debug("releasing vcc %p->%p of entry %p\n", 129 pr_debug("releasing vcc %p->%p of entry %p\n",
130 cv, cv->vcc, entry); 130 cv, cv->vcc, entry);
131 vcc_release_async(cv->vcc, -ETIMEDOUT); 131 vcc_release_async(cv->vcc, -ETIMEDOUT);
132 } 132 }
133 } 133 }
@@ -139,7 +139,7 @@ static int neigh_check_cb(struct neighbour *n)
139 struct sk_buff *skb; 139 struct sk_buff *skb;
140 140
141 pr_debug("destruction postponed with ref %d\n", 141 pr_debug("destruction postponed with ref %d\n",
142 atomic_read(&n->refcnt)); 142 atomic_read(&n->refcnt));
143 143
144 while ((skb = skb_dequeue(&n->arp_queue)) != NULL) 144 while ((skb = skb_dequeue(&n->arp_queue)) != NULL)
145 dev_kfree_skb(skb); 145 dev_kfree_skb(skb);
@@ -163,7 +163,7 @@ static int clip_arp_rcv(struct sk_buff *skb)
163{ 163{
164 struct atm_vcc *vcc; 164 struct atm_vcc *vcc;
165 165
166 pr_debug("clip_arp_rcv\n"); 166 pr_debug("\n");
167 vcc = ATM_SKB(skb)->vcc; 167 vcc = ATM_SKB(skb)->vcc;
168 if (!vcc || !atm_charge(vcc, skb->truesize)) { 168 if (!vcc || !atm_charge(vcc, skb->truesize)) {
169 dev_kfree_skb_any(skb); 169 dev_kfree_skb_any(skb);
@@ -188,7 +188,7 @@ static void clip_push(struct atm_vcc *vcc, struct sk_buff *skb)
188{ 188{
189 struct clip_vcc *clip_vcc = CLIP_VCC(vcc); 189 struct clip_vcc *clip_vcc = CLIP_VCC(vcc);
190 190
191 pr_debug("clip push\n"); 191 pr_debug("\n");
192 if (!skb) { 192 if (!skb) {
193 pr_debug("removing VCC %p\n", clip_vcc); 193 pr_debug("removing VCC %p\n", clip_vcc);
194 if (clip_vcc->entry) 194 if (clip_vcc->entry)
@@ -206,12 +206,12 @@ static void clip_push(struct atm_vcc *vcc, struct sk_buff *skb)
206 } 206 }
207 ATM_SKB(skb)->vcc = vcc; 207 ATM_SKB(skb)->vcc = vcc;
208 skb_reset_mac_header(skb); 208 skb_reset_mac_header(skb);
209 if (!clip_vcc->encap 209 if (!clip_vcc->encap ||
210 || skb->len < RFC1483LLC_LEN 210 skb->len < RFC1483LLC_LEN ||
211 || memcmp(skb->data, llc_oui, sizeof (llc_oui))) 211 memcmp(skb->data, llc_oui, sizeof(llc_oui)))
212 skb->protocol = htons(ETH_P_IP); 212 skb->protocol = htons(ETH_P_IP);
213 else { 213 else {
214 skb->protocol = ((__be16 *) skb->data)[3]; 214 skb->protocol = ((__be16 *)skb->data)[3];
215 skb_pull(skb, RFC1483LLC_LEN); 215 skb_pull(skb, RFC1483LLC_LEN);
216 if (skb->protocol == htons(ETH_P_ARP)) { 216 if (skb->protocol == htons(ETH_P_ARP)) {
217 skb->dev->stats.rx_packets++; 217 skb->dev->stats.rx_packets++;
@@ -239,7 +239,7 @@ static void clip_pop(struct atm_vcc *vcc, struct sk_buff *skb)
239 int old; 239 int old;
240 unsigned long flags; 240 unsigned long flags;
241 241
242 pr_debug("clip_pop(vcc %p)\n", vcc); 242 pr_debug("(vcc %p)\n", vcc);
243 clip_vcc->old_pop(vcc, skb); 243 clip_vcc->old_pop(vcc, skb);
244 /* skb->dev == NULL in outbound ARP packets */ 244 /* skb->dev == NULL in outbound ARP packets */
245 if (!dev) 245 if (!dev)
@@ -255,7 +255,7 @@ static void clip_pop(struct atm_vcc *vcc, struct sk_buff *skb)
255 255
256static void clip_neigh_solicit(struct neighbour *neigh, struct sk_buff *skb) 256static void clip_neigh_solicit(struct neighbour *neigh, struct sk_buff *skb)
257{ 257{
258 pr_debug("clip_neigh_solicit (neigh %p, skb %p)\n", neigh, skb); 258 pr_debug("(neigh %p, skb %p)\n", neigh, skb);
259 to_atmarpd(act_need, PRIV(neigh->dev)->number, NEIGH2ENTRY(neigh)->ip); 259 to_atmarpd(act_need, PRIV(neigh->dev)->number, NEIGH2ENTRY(neigh)->ip);
260} 260}
261 261
@@ -284,7 +284,7 @@ static int clip_constructor(struct neighbour *neigh)
284 struct in_device *in_dev; 284 struct in_device *in_dev;
285 struct neigh_parms *parms; 285 struct neigh_parms *parms;
286 286
287 pr_debug("clip_constructor (neigh %p, entry %p)\n", neigh, entry); 287 pr_debug("(neigh %p, entry %p)\n", neigh, entry);
288 neigh->type = inet_addr_type(&init_net, entry->ip); 288 neigh->type = inet_addr_type(&init_net, entry->ip);
289 if (neigh->type != RTN_UNICAST) 289 if (neigh->type != RTN_UNICAST)
290 return -EINVAL; 290 return -EINVAL;
@@ -369,9 +369,9 @@ static netdev_tx_t clip_start_xmit(struct sk_buff *skb,
369 int old; 369 int old;
370 unsigned long flags; 370 unsigned long flags;
371 371
372 pr_debug("clip_start_xmit (skb %p)\n", skb); 372 pr_debug("(skb %p)\n", skb);
373 if (!skb_dst(skb)) { 373 if (!skb_dst(skb)) {
374 printk(KERN_ERR "clip_start_xmit: skb_dst(skb) == NULL\n"); 374 pr_err("skb_dst(skb) == NULL\n");
375 dev_kfree_skb(skb); 375 dev_kfree_skb(skb);
376 dev->stats.tx_dropped++; 376 dev->stats.tx_dropped++;
377 return NETDEV_TX_OK; 377 return NETDEV_TX_OK;
@@ -385,7 +385,7 @@ static netdev_tx_t clip_start_xmit(struct sk_buff *skb,
385 return 0; 385 return 0;
386 } 386 }
387#endif 387#endif
388 printk(KERN_ERR "clip_start_xmit: NO NEIGHBOUR !\n"); 388 pr_err("NO NEIGHBOUR !\n");
389 dev_kfree_skb(skb); 389 dev_kfree_skb(skb);
390 dev->stats.tx_dropped++; 390 dev->stats.tx_dropped++;
391 return NETDEV_TX_OK; 391 return NETDEV_TX_OK;
@@ -421,7 +421,7 @@ static netdev_tx_t clip_start_xmit(struct sk_buff *skb,
421 pr_debug("atm_skb(%p)->vcc(%p)->dev(%p)\n", skb, vcc, vcc->dev); 421 pr_debug("atm_skb(%p)->vcc(%p)->dev(%p)\n", skb, vcc, vcc->dev);
422 old = xchg(&entry->vccs->xoff, 1); /* assume XOFF ... */ 422 old = xchg(&entry->vccs->xoff, 1); /* assume XOFF ... */
423 if (old) { 423 if (old) {
424 printk(KERN_WARNING "clip_start_xmit: XOFF->XOFF transition\n"); 424 pr_warning("XOFF->XOFF transition\n");
425 return NETDEV_TX_OK; 425 return NETDEV_TX_OK;
426 } 426 }
427 dev->stats.tx_packets++; 427 dev->stats.tx_packets++;
@@ -456,7 +456,7 @@ static int clip_mkip(struct atm_vcc *vcc, int timeout)
456 clip_vcc = kmalloc(sizeof(struct clip_vcc), GFP_KERNEL); 456 clip_vcc = kmalloc(sizeof(struct clip_vcc), GFP_KERNEL);
457 if (!clip_vcc) 457 if (!clip_vcc)
458 return -ENOMEM; 458 return -ENOMEM;
459 pr_debug("mkip clip_vcc %p vcc %p\n", clip_vcc, vcc); 459 pr_debug("%p vcc %p\n", clip_vcc, vcc);
460 clip_vcc->vcc = vcc; 460 clip_vcc->vcc = vcc;
461 vcc->user_back = clip_vcc; 461 vcc->user_back = clip_vcc;
462 set_bit(ATM_VF_IS_CLIP, &vcc->flags); 462 set_bit(ATM_VF_IS_CLIP, &vcc->flags);
@@ -506,16 +506,16 @@ static int clip_setentry(struct atm_vcc *vcc, __be32 ip)
506 struct rtable *rt; 506 struct rtable *rt;
507 507
508 if (vcc->push != clip_push) { 508 if (vcc->push != clip_push) {
509 printk(KERN_WARNING "clip_setentry: non-CLIP VCC\n"); 509 pr_warning("non-CLIP VCC\n");
510 return -EBADF; 510 return -EBADF;
511 } 511 }
512 clip_vcc = CLIP_VCC(vcc); 512 clip_vcc = CLIP_VCC(vcc);
513 if (!ip) { 513 if (!ip) {
514 if (!clip_vcc->entry) { 514 if (!clip_vcc->entry) {
515 printk(KERN_ERR "hiding hidden ATMARP entry\n"); 515 pr_err("hiding hidden ATMARP entry\n");
516 return 0; 516 return 0;
517 } 517 }
518 pr_debug("setentry: remove\n"); 518 pr_debug("remove\n");
519 unlink_clip_vcc(clip_vcc); 519 unlink_clip_vcc(clip_vcc);
520 return 0; 520 return 0;
521 } 521 }
@@ -529,9 +529,9 @@ static int clip_setentry(struct atm_vcc *vcc, __be32 ip)
529 entry = NEIGH2ENTRY(neigh); 529 entry = NEIGH2ENTRY(neigh);
530 if (entry != clip_vcc->entry) { 530 if (entry != clip_vcc->entry) {
531 if (!clip_vcc->entry) 531 if (!clip_vcc->entry)
532 pr_debug("setentry: add\n"); 532 pr_debug("add\n");
533 else { 533 else {
534 pr_debug("setentry: update\n"); 534 pr_debug("update\n");
535 unlink_clip_vcc(clip_vcc); 535 unlink_clip_vcc(clip_vcc);
536 } 536 }
537 link_vcc(clip_vcc, entry); 537 link_vcc(clip_vcc, entry);
@@ -614,16 +614,16 @@ static int clip_device_event(struct notifier_block *this, unsigned long event,
614 614
615 switch (event) { 615 switch (event) {
616 case NETDEV_UP: 616 case NETDEV_UP:
617 pr_debug("clip_device_event NETDEV_UP\n"); 617 pr_debug("NETDEV_UP\n");
618 to_atmarpd(act_up, PRIV(dev)->number, 0); 618 to_atmarpd(act_up, PRIV(dev)->number, 0);
619 break; 619 break;
620 case NETDEV_GOING_DOWN: 620 case NETDEV_GOING_DOWN:
621 pr_debug("clip_device_event NETDEV_DOWN\n"); 621 pr_debug("NETDEV_DOWN\n");
622 to_atmarpd(act_down, PRIV(dev)->number, 0); 622 to_atmarpd(act_down, PRIV(dev)->number, 0);
623 break; 623 break;
624 case NETDEV_CHANGE: 624 case NETDEV_CHANGE:
625 case NETDEV_CHANGEMTU: 625 case NETDEV_CHANGEMTU:
626 pr_debug("clip_device_event NETDEV_CHANGE*\n"); 626 pr_debug("NETDEV_CHANGE*\n");
627 to_atmarpd(act_change, PRIV(dev)->number, 0); 627 to_atmarpd(act_change, PRIV(dev)->number, 0);
628 break; 628 break;
629 } 629 }
@@ -645,7 +645,6 @@ static int clip_inet_event(struct notifier_block *this, unsigned long event,
645 return clip_device_event(this, NETDEV_CHANGE, in_dev->dev); 645 return clip_device_event(this, NETDEV_CHANGE, in_dev->dev);
646} 646}
647 647
648
649static struct notifier_block clip_dev_notifier = { 648static struct notifier_block clip_dev_notifier = {
650 .notifier_call = clip_device_event, 649 .notifier_call = clip_device_event,
651}; 650};
@@ -660,7 +659,7 @@ static struct notifier_block clip_inet_notifier = {
660 659
661static void atmarpd_close(struct atm_vcc *vcc) 660static void atmarpd_close(struct atm_vcc *vcc)
662{ 661{
663 pr_debug("atmarpd_close\n"); 662 pr_debug("\n");
664 663
665 rtnl_lock(); 664 rtnl_lock();
666 atmarpd = NULL; 665 atmarpd = NULL;
@@ -671,7 +670,6 @@ static void atmarpd_close(struct atm_vcc *vcc)
671 module_put(THIS_MODULE); 670 module_put(THIS_MODULE);
672} 671}
673 672
674
675static struct atmdev_ops atmarpd_dev_ops = { 673static struct atmdev_ops atmarpd_dev_ops = {
676 .close = atmarpd_close 674 .close = atmarpd_close
677}; 675};
@@ -693,11 +691,11 @@ static int atm_init_atmarp(struct atm_vcc *vcc)
693 return -EADDRINUSE; 691 return -EADDRINUSE;
694 } 692 }
695 693
696 mod_timer(&idle_timer, jiffies+CLIP_CHECK_INTERVAL*HZ); 694 mod_timer(&idle_timer, jiffies + CLIP_CHECK_INTERVAL * HZ);
697 695
698 atmarpd = vcc; 696 atmarpd = vcc;
699 set_bit(ATM_VF_META,&vcc->flags); 697 set_bit(ATM_VF_META, &vcc->flags);
700 set_bit(ATM_VF_READY,&vcc->flags); 698 set_bit(ATM_VF_READY, &vcc->flags);
701 /* allow replies and avoid getting closed if signaling dies */ 699 /* allow replies and avoid getting closed if signaling dies */
702 vcc->dev = &atmarpd_dev; 700 vcc->dev = &atmarpd_dev;
703 vcc_insert_socket(sk_atm(vcc)); 701 vcc_insert_socket(sk_atm(vcc));
@@ -950,8 +948,7 @@ static int __init atm_clip_init(void)
950 948
951 p = proc_create("arp", S_IRUGO, atm_proc_root, &arp_seq_fops); 949 p = proc_create("arp", S_IRUGO, atm_proc_root, &arp_seq_fops);
952 if (!p) { 950 if (!p) {
953 printk(KERN_ERR "Unable to initialize " 951 pr_err("Unable to initialize /proc/net/atm/arp\n");
954 "/proc/net/atm/arp\n");
955 atm_clip_exit_noproc(); 952 atm_clip_exit_noproc();
956 return -ENOMEM; 953 return -ENOMEM;
957 } 954 }
diff --git a/net/atm/common.c b/net/atm/common.c
index 950bd16d2383..97ed94aa0cbc 100644
--- a/net/atm/common.c
+++ b/net/atm/common.c
@@ -2,6 +2,7 @@
2 2
3/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */ 3/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
4 4
5#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
5 6
6#include <linux/module.h> 7#include <linux/module.h>
7#include <linux/kmod.h> 8#include <linux/kmod.h>
@@ -17,12 +18,12 @@
17#include <linux/skbuff.h> 18#include <linux/skbuff.h>
18#include <linux/bitops.h> 19#include <linux/bitops.h>
19#include <linux/init.h> 20#include <linux/init.h>
21#include <linux/slab.h>
20#include <net/sock.h> /* struct sock */ 22#include <net/sock.h> /* struct sock */
23#include <linux/uaccess.h>
24#include <linux/poll.h>
21 25
22#include <asm/uaccess.h>
23#include <asm/atomic.h> 26#include <asm/atomic.h>
24#include <asm/poll.h>
25
26 27
27#include "resources.h" /* atm_find_dev */ 28#include "resources.h" /* atm_find_dev */
28#include "common.h" /* prototypes */ 29#include "common.h" /* prototypes */
@@ -31,13 +32,15 @@
31#include "signaling.h" /* for WAITING and sigd_attach */ 32#include "signaling.h" /* for WAITING and sigd_attach */
32 33
33struct hlist_head vcc_hash[VCC_HTABLE_SIZE]; 34struct hlist_head vcc_hash[VCC_HTABLE_SIZE];
35EXPORT_SYMBOL(vcc_hash);
36
34DEFINE_RWLOCK(vcc_sklist_lock); 37DEFINE_RWLOCK(vcc_sklist_lock);
38EXPORT_SYMBOL(vcc_sklist_lock);
35 39
36static void __vcc_insert_socket(struct sock *sk) 40static void __vcc_insert_socket(struct sock *sk)
37{ 41{
38 struct atm_vcc *vcc = atm_sk(sk); 42 struct atm_vcc *vcc = atm_sk(sk);
39 struct hlist_head *head = &vcc_hash[vcc->vci & 43 struct hlist_head *head = &vcc_hash[vcc->vci & (VCC_HTABLE_SIZE - 1)];
40 (VCC_HTABLE_SIZE - 1)];
41 sk->sk_hash = vcc->vci & (VCC_HTABLE_SIZE - 1); 44 sk->sk_hash = vcc->vci & (VCC_HTABLE_SIZE - 1);
42 sk_add_node(sk, head); 45 sk_add_node(sk, head);
43} 46}
@@ -48,6 +51,7 @@ void vcc_insert_socket(struct sock *sk)
48 __vcc_insert_socket(sk); 51 __vcc_insert_socket(sk);
49 write_unlock_irq(&vcc_sklist_lock); 52 write_unlock_irq(&vcc_sklist_lock);
50} 53}
54EXPORT_SYMBOL(vcc_insert_socket);
51 55
52static void vcc_remove_socket(struct sock *sk) 56static void vcc_remove_socket(struct sock *sk)
53{ 57{
@@ -56,37 +60,32 @@ static void vcc_remove_socket(struct sock *sk)
56 write_unlock_irq(&vcc_sklist_lock); 60 write_unlock_irq(&vcc_sklist_lock);
57} 61}
58 62
59 63static struct sk_buff *alloc_tx(struct atm_vcc *vcc, unsigned int size)
60static struct sk_buff *alloc_tx(struct atm_vcc *vcc,unsigned int size)
61{ 64{
62 struct sk_buff *skb; 65 struct sk_buff *skb;
63 struct sock *sk = sk_atm(vcc); 66 struct sock *sk = sk_atm(vcc);
64 67
65 if (sk_wmem_alloc_get(sk) && !atm_may_send(vcc, size)) { 68 if (sk_wmem_alloc_get(sk) && !atm_may_send(vcc, size)) {
66 pr_debug("Sorry: wmem_alloc = %d, size = %d, sndbuf = %d\n", 69 pr_debug("Sorry: wmem_alloc = %d, size = %d, sndbuf = %d\n",
67 sk_wmem_alloc_get(sk), size, 70 sk_wmem_alloc_get(sk), size, sk->sk_sndbuf);
68 sk->sk_sndbuf);
69 return NULL; 71 return NULL;
70 } 72 }
71 while (!(skb = alloc_skb(size, GFP_KERNEL))) 73 while (!(skb = alloc_skb(size, GFP_KERNEL)))
72 schedule(); 74 schedule();
73 pr_debug("AlTx %d += %d\n", sk_wmem_alloc_get(sk), skb->truesize); 75 pr_debug("%d += %d\n", sk_wmem_alloc_get(sk), skb->truesize);
74 atomic_add(skb->truesize, &sk->sk_wmem_alloc); 76 atomic_add(skb->truesize, &sk->sk_wmem_alloc);
75 return skb; 77 return skb;
76} 78}
77 79
78
79EXPORT_SYMBOL(vcc_hash);
80EXPORT_SYMBOL(vcc_sklist_lock);
81EXPORT_SYMBOL(vcc_insert_socket);
82
83static void vcc_sock_destruct(struct sock *sk) 80static void vcc_sock_destruct(struct sock *sk)
84{ 81{
85 if (atomic_read(&sk->sk_rmem_alloc)) 82 if (atomic_read(&sk->sk_rmem_alloc))
86 printk(KERN_DEBUG "vcc_sock_destruct: rmem leakage (%d bytes) detected.\n", atomic_read(&sk->sk_rmem_alloc)); 83 printk(KERN_DEBUG "%s: rmem leakage (%d bytes) detected.\n",
84 __func__, atomic_read(&sk->sk_rmem_alloc));
87 85
88 if (atomic_read(&sk->sk_wmem_alloc)) 86 if (atomic_read(&sk->sk_wmem_alloc))
89 printk(KERN_DEBUG "vcc_sock_destruct: wmem leakage (%d bytes) detected.\n", atomic_read(&sk->sk_wmem_alloc)); 87 printk(KERN_DEBUG "%s: wmem leakage (%d bytes) detected.\n",
88 __func__, atomic_read(&sk->sk_wmem_alloc));
90} 89}
91 90
92static void vcc_def_wakeup(struct sock *sk) 91static void vcc_def_wakeup(struct sock *sk)
@@ -142,8 +141,8 @@ int vcc_create(struct net *net, struct socket *sock, int protocol, int family)
142 141
143 vcc = atm_sk(sk); 142 vcc = atm_sk(sk);
144 vcc->dev = NULL; 143 vcc->dev = NULL;
145 memset(&vcc->local,0,sizeof(struct sockaddr_atmsvc)); 144 memset(&vcc->local, 0, sizeof(struct sockaddr_atmsvc));
146 memset(&vcc->remote,0,sizeof(struct sockaddr_atmsvc)); 145 memset(&vcc->remote, 0, sizeof(struct sockaddr_atmsvc));
147 vcc->qos.txtp.max_sdu = 1 << 16; /* for meta VCs */ 146 vcc->qos.txtp.max_sdu = 1 << 16; /* for meta VCs */
148 atomic_set(&sk->sk_wmem_alloc, 1); 147 atomic_set(&sk->sk_wmem_alloc, 1);
149 atomic_set(&sk->sk_rmem_alloc, 0); 148 atomic_set(&sk->sk_rmem_alloc, 0);
@@ -156,7 +155,6 @@ int vcc_create(struct net *net, struct socket *sock, int protocol, int family)
156 return 0; 155 return 0;
157} 156}
158 157
159
160static void vcc_destroy_socket(struct sock *sk) 158static void vcc_destroy_socket(struct sock *sk)
161{ 159{
162 struct atm_vcc *vcc = atm_sk(sk); 160 struct atm_vcc *vcc = atm_sk(sk);
@@ -171,7 +169,7 @@ static void vcc_destroy_socket(struct sock *sk)
171 vcc->push(vcc, NULL); /* atmarpd has no push */ 169 vcc->push(vcc, NULL); /* atmarpd has no push */
172 170
173 while ((skb = skb_dequeue(&sk->sk_receive_queue)) != NULL) { 171 while ((skb = skb_dequeue(&sk->sk_receive_queue)) != NULL) {
174 atm_return(vcc,skb->truesize); 172 atm_return(vcc, skb->truesize);
175 kfree_skb(skb); 173 kfree_skb(skb);
176 } 174 }
177 175
@@ -182,7 +180,6 @@ static void vcc_destroy_socket(struct sock *sk)
182 vcc_remove_socket(sk); 180 vcc_remove_socket(sk);
183} 181}
184 182
185
186int vcc_release(struct socket *sock) 183int vcc_release(struct socket *sock)
187{ 184{
188 struct sock *sk = sock->sk; 185 struct sock *sk = sock->sk;
@@ -197,7 +194,6 @@ int vcc_release(struct socket *sock)
197 return 0; 194 return 0;
198} 195}
199 196
200
201void vcc_release_async(struct atm_vcc *vcc, int reply) 197void vcc_release_async(struct atm_vcc *vcc, int reply)
202{ 198{
203 struct sock *sk = sk_atm(vcc); 199 struct sock *sk = sk_atm(vcc);
@@ -208,8 +204,6 @@ void vcc_release_async(struct atm_vcc *vcc, int reply)
208 clear_bit(ATM_VF_WAITING, &vcc->flags); 204 clear_bit(ATM_VF_WAITING, &vcc->flags);
209 sk->sk_state_change(sk); 205 sk->sk_state_change(sk);
210} 206}
211
212
213EXPORT_SYMBOL(vcc_release_async); 207EXPORT_SYMBOL(vcc_release_async);
214 208
215 209
@@ -235,37 +229,37 @@ void atm_dev_release_vccs(struct atm_dev *dev)
235 write_unlock_irq(&vcc_sklist_lock); 229 write_unlock_irq(&vcc_sklist_lock);
236} 230}
237 231
238 232static int adjust_tp(struct atm_trafprm *tp, unsigned char aal)
239static int adjust_tp(struct atm_trafprm *tp,unsigned char aal)
240{ 233{
241 int max_sdu; 234 int max_sdu;
242 235
243 if (!tp->traffic_class) return 0; 236 if (!tp->traffic_class)
237 return 0;
244 switch (aal) { 238 switch (aal) {
245 case ATM_AAL0: 239 case ATM_AAL0:
246 max_sdu = ATM_CELL_SIZE-1; 240 max_sdu = ATM_CELL_SIZE-1;
247 break; 241 break;
248 case ATM_AAL34: 242 case ATM_AAL34:
249 max_sdu = ATM_MAX_AAL34_PDU; 243 max_sdu = ATM_MAX_AAL34_PDU;
250 break; 244 break;
251 default: 245 default:
252 printk(KERN_WARNING "ATM: AAL problems ... " 246 pr_warning("AAL problems ... (%d)\n", aal);
253 "(%d)\n",aal); 247 /* fall through */
254 /* fall through */ 248 case ATM_AAL5:
255 case ATM_AAL5: 249 max_sdu = ATM_MAX_AAL5_PDU;
256 max_sdu = ATM_MAX_AAL5_PDU;
257 } 250 }
258 if (!tp->max_sdu) tp->max_sdu = max_sdu; 251 if (!tp->max_sdu)
259 else if (tp->max_sdu > max_sdu) return -EINVAL; 252 tp->max_sdu = max_sdu;
260 if (!tp->max_cdv) tp->max_cdv = ATM_MAX_CDV; 253 else if (tp->max_sdu > max_sdu)
254 return -EINVAL;
255 if (!tp->max_cdv)
256 tp->max_cdv = ATM_MAX_CDV;
261 return 0; 257 return 0;
262} 258}
263 259
264
265static int check_ci(const struct atm_vcc *vcc, short vpi, int vci) 260static int check_ci(const struct atm_vcc *vcc, short vpi, int vci)
266{ 261{
267 struct hlist_head *head = &vcc_hash[vci & 262 struct hlist_head *head = &vcc_hash[vci & (VCC_HTABLE_SIZE - 1)];
268 (VCC_HTABLE_SIZE - 1)];
269 struct hlist_node *node; 263 struct hlist_node *node;
270 struct sock *s; 264 struct sock *s;
271 struct atm_vcc *walk; 265 struct atm_vcc *walk;
@@ -289,7 +283,6 @@ static int check_ci(const struct atm_vcc *vcc, short vpi, int vci)
289 return 0; 283 return 0;
290} 284}
291 285
292
293static int find_ci(const struct atm_vcc *vcc, short *vpi, int *vci) 286static int find_ci(const struct atm_vcc *vcc, short *vpi, int *vci)
294{ 287{
295 static short p; /* poor man's per-device cache */ 288 static short p; /* poor man's per-device cache */
@@ -327,14 +320,13 @@ static int find_ci(const struct atm_vcc *vcc, short *vpi, int *vci)
327 if ((c == ATM_NOT_RSV_VCI || *vci != ATM_VCI_ANY) && 320 if ((c == ATM_NOT_RSV_VCI || *vci != ATM_VCI_ANY) &&
328 *vpi == ATM_VPI_ANY) { 321 *vpi == ATM_VPI_ANY) {
329 p++; 322 p++;
330 if (p >= 1 << vcc->dev->ci_range.vpi_bits) p = 0; 323 if (p >= 1 << vcc->dev->ci_range.vpi_bits)
324 p = 0;
331 } 325 }
332 } 326 } while (old_p != p || old_c != c);
333 while (old_p != p || old_c != c);
334 return -EADDRINUSE; 327 return -EADDRINUSE;
335} 328}
336 329
337
338static int __vcc_connect(struct atm_vcc *vcc, struct atm_dev *dev, short vpi, 330static int __vcc_connect(struct atm_vcc *vcc, struct atm_dev *dev, short vpi,
339 int vci) 331 int vci)
340{ 332{
@@ -362,37 +354,46 @@ static int __vcc_connect(struct atm_vcc *vcc, struct atm_dev *dev, short vpi,
362 __vcc_insert_socket(sk); 354 __vcc_insert_socket(sk);
363 write_unlock_irq(&vcc_sklist_lock); 355 write_unlock_irq(&vcc_sklist_lock);
364 switch (vcc->qos.aal) { 356 switch (vcc->qos.aal) {
365 case ATM_AAL0: 357 case ATM_AAL0:
366 error = atm_init_aal0(vcc); 358 error = atm_init_aal0(vcc);
367 vcc->stats = &dev->stats.aal0; 359 vcc->stats = &dev->stats.aal0;
368 break; 360 break;
369 case ATM_AAL34: 361 case ATM_AAL34:
370 error = atm_init_aal34(vcc); 362 error = atm_init_aal34(vcc);
371 vcc->stats = &dev->stats.aal34; 363 vcc->stats = &dev->stats.aal34;
372 break; 364 break;
373 case ATM_NO_AAL: 365 case ATM_NO_AAL:
374 /* ATM_AAL5 is also used in the "0 for default" case */ 366 /* ATM_AAL5 is also used in the "0 for default" case */
375 vcc->qos.aal = ATM_AAL5; 367 vcc->qos.aal = ATM_AAL5;
376 /* fall through */ 368 /* fall through */
377 case ATM_AAL5: 369 case ATM_AAL5:
378 error = atm_init_aal5(vcc); 370 error = atm_init_aal5(vcc);
379 vcc->stats = &dev->stats.aal5; 371 vcc->stats = &dev->stats.aal5;
380 break; 372 break;
381 default: 373 default:
382 error = -EPROTOTYPE; 374 error = -EPROTOTYPE;
383 } 375 }
384 if (!error) error = adjust_tp(&vcc->qos.txtp,vcc->qos.aal); 376 if (!error)
385 if (!error) error = adjust_tp(&vcc->qos.rxtp,vcc->qos.aal); 377 error = adjust_tp(&vcc->qos.txtp, vcc->qos.aal);
378 if (!error)
379 error = adjust_tp(&vcc->qos.rxtp, vcc->qos.aal);
386 if (error) 380 if (error)
387 goto fail; 381 goto fail;
388 pr_debug("VCC %d.%d, AAL %d\n",vpi,vci,vcc->qos.aal); 382 pr_debug("VCC %d.%d, AAL %d\n", vpi, vci, vcc->qos.aal);
389 pr_debug(" TX: %d, PCR %d..%d, SDU %d\n",vcc->qos.txtp.traffic_class, 383 pr_debug(" TX: %d, PCR %d..%d, SDU %d\n",
390 vcc->qos.txtp.min_pcr,vcc->qos.txtp.max_pcr,vcc->qos.txtp.max_sdu); 384 vcc->qos.txtp.traffic_class,
391 pr_debug(" RX: %d, PCR %d..%d, SDU %d\n",vcc->qos.rxtp.traffic_class, 385 vcc->qos.txtp.min_pcr,
392 vcc->qos.rxtp.min_pcr,vcc->qos.rxtp.max_pcr,vcc->qos.rxtp.max_sdu); 386 vcc->qos.txtp.max_pcr,
387 vcc->qos.txtp.max_sdu);
388 pr_debug(" RX: %d, PCR %d..%d, SDU %d\n",
389 vcc->qos.rxtp.traffic_class,
390 vcc->qos.rxtp.min_pcr,
391 vcc->qos.rxtp.max_pcr,
392 vcc->qos.rxtp.max_sdu);
393 393
394 if (dev->ops->open) { 394 if (dev->ops->open) {
395 if ((error = dev->ops->open(vcc))) 395 error = dev->ops->open(vcc);
396 if (error)
396 goto fail; 397 goto fail;
397 } 398 }
398 return 0; 399 return 0;
@@ -406,14 +407,13 @@ fail_module_put:
406 return error; 407 return error;
407} 408}
408 409
409
410int vcc_connect(struct socket *sock, int itf, short vpi, int vci) 410int vcc_connect(struct socket *sock, int itf, short vpi, int vci)
411{ 411{
412 struct atm_dev *dev; 412 struct atm_dev *dev;
413 struct atm_vcc *vcc = ATM_SD(sock); 413 struct atm_vcc *vcc = ATM_SD(sock);
414 int error; 414 int error;
415 415
416 pr_debug("vcc_connect (vpi %d, vci %d)\n",vpi,vci); 416 pr_debug("(vpi %d, vci %d)\n", vpi, vci);
417 if (sock->state == SS_CONNECTED) 417 if (sock->state == SS_CONNECTED)
418 return -EISCONN; 418 return -EISCONN;
419 if (sock->state != SS_UNCONNECTED) 419 if (sock->state != SS_UNCONNECTED)
@@ -422,30 +422,33 @@ int vcc_connect(struct socket *sock, int itf, short vpi, int vci)
422 return -EINVAL; 422 return -EINVAL;
423 423
424 if (vpi != ATM_VPI_UNSPEC && vci != ATM_VCI_UNSPEC) 424 if (vpi != ATM_VPI_UNSPEC && vci != ATM_VCI_UNSPEC)
425 clear_bit(ATM_VF_PARTIAL,&vcc->flags); 425 clear_bit(ATM_VF_PARTIAL, &vcc->flags);
426 else 426 else
427 if (test_bit(ATM_VF_PARTIAL,&vcc->flags)) 427 if (test_bit(ATM_VF_PARTIAL, &vcc->flags))
428 return -EINVAL; 428 return -EINVAL;
429 pr_debug("vcc_connect (TX: cl %d,bw %d-%d,sdu %d; " 429 pr_debug("(TX: cl %d,bw %d-%d,sdu %d; "
430 "RX: cl %d,bw %d-%d,sdu %d,AAL %s%d)\n", 430 "RX: cl %d,bw %d-%d,sdu %d,AAL %s%d)\n",
431 vcc->qos.txtp.traffic_class,vcc->qos.txtp.min_pcr, 431 vcc->qos.txtp.traffic_class, vcc->qos.txtp.min_pcr,
432 vcc->qos.txtp.max_pcr,vcc->qos.txtp.max_sdu, 432 vcc->qos.txtp.max_pcr, vcc->qos.txtp.max_sdu,
433 vcc->qos.rxtp.traffic_class,vcc->qos.rxtp.min_pcr, 433 vcc->qos.rxtp.traffic_class, vcc->qos.rxtp.min_pcr,
434 vcc->qos.rxtp.max_pcr,vcc->qos.rxtp.max_sdu, 434 vcc->qos.rxtp.max_pcr, vcc->qos.rxtp.max_sdu,
435 vcc->qos.aal == ATM_AAL5 ? "" : vcc->qos.aal == ATM_AAL0 ? "" : 435 vcc->qos.aal == ATM_AAL5 ? "" :
436 " ??? code ",vcc->qos.aal == ATM_AAL0 ? 0 : vcc->qos.aal); 436 vcc->qos.aal == ATM_AAL0 ? "" : " ??? code ",
437 vcc->qos.aal == ATM_AAL0 ? 0 : vcc->qos.aal);
437 if (!test_bit(ATM_VF_HASQOS, &vcc->flags)) 438 if (!test_bit(ATM_VF_HASQOS, &vcc->flags))
438 return -EBADFD; 439 return -EBADFD;
439 if (vcc->qos.txtp.traffic_class == ATM_ANYCLASS || 440 if (vcc->qos.txtp.traffic_class == ATM_ANYCLASS ||
440 vcc->qos.rxtp.traffic_class == ATM_ANYCLASS) 441 vcc->qos.rxtp.traffic_class == ATM_ANYCLASS)
441 return -EINVAL; 442 return -EINVAL;
442 if (likely(itf != ATM_ITF_ANY)) { 443 if (likely(itf != ATM_ITF_ANY)) {
443 dev = try_then_request_module(atm_dev_lookup(itf), "atm-device-%d", itf); 444 dev = try_then_request_module(atm_dev_lookup(itf),
445 "atm-device-%d", itf);
444 } else { 446 } else {
445 dev = NULL; 447 dev = NULL;
446 mutex_lock(&atm_dev_mutex); 448 mutex_lock(&atm_dev_mutex);
447 if (!list_empty(&atm_devs)) { 449 if (!list_empty(&atm_devs)) {
448 dev = list_entry(atm_devs.next, struct atm_dev, dev_list); 450 dev = list_entry(atm_devs.next,
451 struct atm_dev, dev_list);
449 atm_dev_hold(dev); 452 atm_dev_hold(dev);
450 } 453 }
451 mutex_unlock(&atm_dev_mutex); 454 mutex_unlock(&atm_dev_mutex);
@@ -458,13 +461,12 @@ int vcc_connect(struct socket *sock, int itf, short vpi, int vci)
458 return error; 461 return error;
459 } 462 }
460 if (vpi == ATM_VPI_UNSPEC || vci == ATM_VCI_UNSPEC) 463 if (vpi == ATM_VPI_UNSPEC || vci == ATM_VCI_UNSPEC)
461 set_bit(ATM_VF_PARTIAL,&vcc->flags); 464 set_bit(ATM_VF_PARTIAL, &vcc->flags);
462 if (test_bit(ATM_VF_READY,&ATM_SD(sock)->flags)) 465 if (test_bit(ATM_VF_READY, &ATM_SD(sock)->flags))
463 sock->state = SS_CONNECTED; 466 sock->state = SS_CONNECTED;
464 return 0; 467 return 0;
465} 468}
466 469
467
468int vcc_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, 470int vcc_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
469 size_t size, int flags) 471 size_t size, int flags)
470{ 472{
@@ -478,8 +480,8 @@ int vcc_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
478 if (flags & ~MSG_DONTWAIT) /* only handle MSG_DONTWAIT */ 480 if (flags & ~MSG_DONTWAIT) /* only handle MSG_DONTWAIT */
479 return -EOPNOTSUPP; 481 return -EOPNOTSUPP;
480 vcc = ATM_SD(sock); 482 vcc = ATM_SD(sock);
481 if (test_bit(ATM_VF_RELEASED,&vcc->flags) || 483 if (test_bit(ATM_VF_RELEASED, &vcc->flags) ||
482 test_bit(ATM_VF_CLOSE,&vcc->flags) || 484 test_bit(ATM_VF_CLOSE, &vcc->flags) ||
483 !test_bit(ATM_VF_READY, &vcc->flags)) 485 !test_bit(ATM_VF_READY, &vcc->flags))
484 return 0; 486 return 0;
485 487
@@ -496,14 +498,13 @@ int vcc_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
496 error = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied); 498 error = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied);
497 if (error) 499 if (error)
498 return error; 500 return error;
499 sock_recv_timestamp(msg, sk, skb); 501 sock_recv_ts_and_drops(msg, sk, skb);
500 pr_debug("RcvM %d -= %d\n", atomic_read(&sk->sk_rmem_alloc), skb->truesize); 502 pr_debug("%d -= %d\n", atomic_read(&sk->sk_rmem_alloc), skb->truesize);
501 atm_return(vcc, skb->truesize); 503 atm_return(vcc, skb->truesize);
502 skb_free_datagram(sk, skb); 504 skb_free_datagram(sk, skb);
503 return copied; 505 return copied;
504} 506}
505 507
506
507int vcc_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *m, 508int vcc_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *m,
508 size_t total_len) 509 size_t total_len)
509{ 510{
@@ -511,7 +512,7 @@ int vcc_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *m,
511 DEFINE_WAIT(wait); 512 DEFINE_WAIT(wait);
512 struct atm_vcc *vcc; 513 struct atm_vcc *vcc;
513 struct sk_buff *skb; 514 struct sk_buff *skb;
514 int eff,error; 515 int eff, error;
515 const void __user *buff; 516 const void __user *buff;
516 int size; 517 int size;
517 518
@@ -550,7 +551,7 @@ int vcc_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *m,
550 eff = (size+3) & ~3; /* align to word boundary */ 551 eff = (size+3) & ~3; /* align to word boundary */
551 prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE); 552 prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE);
552 error = 0; 553 error = 0;
553 while (!(skb = alloc_tx(vcc,eff))) { 554 while (!(skb = alloc_tx(vcc, eff))) {
554 if (m->msg_flags & MSG_DONTWAIT) { 555 if (m->msg_flags & MSG_DONTWAIT) {
555 error = -EAGAIN; 556 error = -EAGAIN;
556 break; 557 break;
@@ -560,9 +561,9 @@ int vcc_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *m,
560 error = -ERESTARTSYS; 561 error = -ERESTARTSYS;
561 break; 562 break;
562 } 563 }
563 if (test_bit(ATM_VF_RELEASED,&vcc->flags) || 564 if (test_bit(ATM_VF_RELEASED, &vcc->flags) ||
564 test_bit(ATM_VF_CLOSE,&vcc->flags) || 565 test_bit(ATM_VF_CLOSE, &vcc->flags) ||
565 !test_bit(ATM_VF_READY,&vcc->flags)) { 566 !test_bit(ATM_VF_READY, &vcc->flags)) {
566 error = -EPIPE; 567 error = -EPIPE;
567 send_sig(SIGPIPE, current, 0); 568 send_sig(SIGPIPE, current, 0);
568 break; 569 break;
@@ -574,20 +575,20 @@ int vcc_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *m,
574 goto out; 575 goto out;
575 skb->dev = NULL; /* for paths shared with net_device interfaces */ 576 skb->dev = NULL; /* for paths shared with net_device interfaces */
576 ATM_SKB(skb)->atm_options = vcc->atm_options; 577 ATM_SKB(skb)->atm_options = vcc->atm_options;
577 if (copy_from_user(skb_put(skb,size),buff,size)) { 578 if (copy_from_user(skb_put(skb, size), buff, size)) {
578 kfree_skb(skb); 579 kfree_skb(skb);
579 error = -EFAULT; 580 error = -EFAULT;
580 goto out; 581 goto out;
581 } 582 }
582 if (eff != size) memset(skb->data+size,0,eff-size); 583 if (eff != size)
583 error = vcc->dev->ops->send(vcc,skb); 584 memset(skb->data + size, 0, eff-size);
585 error = vcc->dev->ops->send(vcc, skb);
584 error = error ? error : size; 586 error = error ? error : size;
585out: 587out:
586 release_sock(sk); 588 release_sock(sk);
587 return error; 589 return error;
588} 590}
589 591
590
591unsigned int vcc_poll(struct file *file, struct socket *sock, poll_table *wait) 592unsigned int vcc_poll(struct file *file, struct socket *sock, poll_table *wait)
592{ 593{
593 struct sock *sk = sock->sk; 594 struct sock *sk = sock->sk;
@@ -623,8 +624,7 @@ unsigned int vcc_poll(struct file *file, struct socket *sock, poll_table *wait)
623 return mask; 624 return mask;
624} 625}
625 626
626 627static int atm_change_qos(struct atm_vcc *vcc, struct atm_qos *qos)
627static int atm_change_qos(struct atm_vcc *vcc,struct atm_qos *qos)
628{ 628{
629 int error; 629 int error;
630 630
@@ -636,25 +636,31 @@ static int atm_change_qos(struct atm_vcc *vcc,struct atm_qos *qos)
636 qos->rxtp.traffic_class != vcc->qos.rxtp.traffic_class || 636 qos->rxtp.traffic_class != vcc->qos.rxtp.traffic_class ||
637 qos->txtp.traffic_class != vcc->qos.txtp.traffic_class) 637 qos->txtp.traffic_class != vcc->qos.txtp.traffic_class)
638 return -EINVAL; 638 return -EINVAL;
639 error = adjust_tp(&qos->txtp,qos->aal); 639 error = adjust_tp(&qos->txtp, qos->aal);
640 if (!error) error = adjust_tp(&qos->rxtp,qos->aal); 640 if (!error)
641 if (error) return error; 641 error = adjust_tp(&qos->rxtp, qos->aal);
642 if (!vcc->dev->ops->change_qos) return -EOPNOTSUPP; 642 if (error)
643 return error;
644 if (!vcc->dev->ops->change_qos)
645 return -EOPNOTSUPP;
643 if (sk_atm(vcc)->sk_family == AF_ATMPVC) 646 if (sk_atm(vcc)->sk_family == AF_ATMPVC)
644 return vcc->dev->ops->change_qos(vcc,qos,ATM_MF_SET); 647 return vcc->dev->ops->change_qos(vcc, qos, ATM_MF_SET);
645 return svc_change_qos(vcc,qos); 648 return svc_change_qos(vcc, qos);
646} 649}
647 650
648
649static int check_tp(const struct atm_trafprm *tp) 651static int check_tp(const struct atm_trafprm *tp)
650{ 652{
651 /* @@@ Should be merged with adjust_tp */ 653 /* @@@ Should be merged with adjust_tp */
652 if (!tp->traffic_class || tp->traffic_class == ATM_ANYCLASS) return 0; 654 if (!tp->traffic_class || tp->traffic_class == ATM_ANYCLASS)
655 return 0;
653 if (tp->traffic_class != ATM_UBR && !tp->min_pcr && !tp->pcr && 656 if (tp->traffic_class != ATM_UBR && !tp->min_pcr && !tp->pcr &&
654 !tp->max_pcr) return -EINVAL; 657 !tp->max_pcr)
655 if (tp->min_pcr == ATM_MAX_PCR) return -EINVAL; 658 return -EINVAL;
659 if (tp->min_pcr == ATM_MAX_PCR)
660 return -EINVAL;
656 if (tp->min_pcr && tp->max_pcr && tp->max_pcr != ATM_MAX_PCR && 661 if (tp->min_pcr && tp->max_pcr && tp->max_pcr != ATM_MAX_PCR &&
657 tp->min_pcr > tp->max_pcr) return -EINVAL; 662 tp->min_pcr > tp->max_pcr)
663 return -EINVAL;
658 /* 664 /*
659 * We allow pcr to be outside [min_pcr,max_pcr], because later 665 * We allow pcr to be outside [min_pcr,max_pcr], because later
660 * adjustment may still push it in the valid range. 666 * adjustment may still push it in the valid range.
@@ -662,7 +668,6 @@ static int check_tp(const struct atm_trafprm *tp)
662 return 0; 668 return 0;
663} 669}
664 670
665
666static int check_qos(const struct atm_qos *qos) 671static int check_qos(const struct atm_qos *qos)
667{ 672{
668 int error; 673 int error;
@@ -672,9 +677,11 @@ static int check_qos(const struct atm_qos *qos)
672 if (qos->txtp.traffic_class != qos->rxtp.traffic_class && 677 if (qos->txtp.traffic_class != qos->rxtp.traffic_class &&
673 qos->txtp.traffic_class && qos->rxtp.traffic_class && 678 qos->txtp.traffic_class && qos->rxtp.traffic_class &&
674 qos->txtp.traffic_class != ATM_ANYCLASS && 679 qos->txtp.traffic_class != ATM_ANYCLASS &&
675 qos->rxtp.traffic_class != ATM_ANYCLASS) return -EINVAL; 680 qos->rxtp.traffic_class != ATM_ANYCLASS)
681 return -EINVAL;
676 error = check_tp(&qos->txtp); 682 error = check_tp(&qos->txtp);
677 if (error) return error; 683 if (error)
684 return error;
678 return check_tp(&qos->rxtp); 685 return check_tp(&qos->rxtp);
679} 686}
680 687
@@ -690,37 +697,41 @@ int vcc_setsockopt(struct socket *sock, int level, int optname,
690 697
691 vcc = ATM_SD(sock); 698 vcc = ATM_SD(sock);
692 switch (optname) { 699 switch (optname) {
693 case SO_ATMQOS: 700 case SO_ATMQOS:
694 { 701 {
695 struct atm_qos qos; 702 struct atm_qos qos;
696 703
697 if (copy_from_user(&qos,optval,sizeof(qos))) 704 if (copy_from_user(&qos, optval, sizeof(qos)))
698 return -EFAULT; 705 return -EFAULT;
699 error = check_qos(&qos); 706 error = check_qos(&qos);
700 if (error) return error; 707 if (error)
701 if (sock->state == SS_CONNECTED) 708 return error;
702 return atm_change_qos(vcc,&qos); 709 if (sock->state == SS_CONNECTED)
703 if (sock->state != SS_UNCONNECTED) 710 return atm_change_qos(vcc, &qos);
704 return -EBADFD; 711 if (sock->state != SS_UNCONNECTED)
705 vcc->qos = qos; 712 return -EBADFD;
706 set_bit(ATM_VF_HASQOS,&vcc->flags); 713 vcc->qos = qos;
707 return 0; 714 set_bit(ATM_VF_HASQOS, &vcc->flags);
708 } 715 return 0;
709 case SO_SETCLP:
710 if (get_user(value,(unsigned long __user *)optval))
711 return -EFAULT;
712 if (value) vcc->atm_options |= ATM_ATMOPT_CLP;
713 else vcc->atm_options &= ~ATM_ATMOPT_CLP;
714 return 0;
715 default:
716 if (level == SOL_SOCKET) return -EINVAL;
717 break;
718 } 716 }
719 if (!vcc->dev || !vcc->dev->ops->setsockopt) return -EINVAL; 717 case SO_SETCLP:
720 return vcc->dev->ops->setsockopt(vcc,level,optname,optval,optlen); 718 if (get_user(value, (unsigned long __user *)optval))
719 return -EFAULT;
720 if (value)
721 vcc->atm_options |= ATM_ATMOPT_CLP;
722 else
723 vcc->atm_options &= ~ATM_ATMOPT_CLP;
724 return 0;
725 default:
726 if (level == SOL_SOCKET)
727 return -EINVAL;
728 break;
729 }
730 if (!vcc->dev || !vcc->dev->ops->setsockopt)
731 return -EINVAL;
732 return vcc->dev->ops->setsockopt(vcc, level, optname, optval, optlen);
721} 733}
722 734
723
724int vcc_getsockopt(struct socket *sock, int level, int optname, 735int vcc_getsockopt(struct socket *sock, int level, int optname,
725 char __user *optval, int __user *optlen) 736 char __user *optval, int __user *optlen)
726{ 737{
@@ -734,33 +745,33 @@ int vcc_getsockopt(struct socket *sock, int level, int optname,
734 745
735 vcc = ATM_SD(sock); 746 vcc = ATM_SD(sock);
736 switch (optname) { 747 switch (optname) {
737 case SO_ATMQOS: 748 case SO_ATMQOS:
738 if (!test_bit(ATM_VF_HASQOS,&vcc->flags)) 749 if (!test_bit(ATM_VF_HASQOS, &vcc->flags))
739 return -EINVAL; 750 return -EINVAL;
740 return copy_to_user(optval,&vcc->qos,sizeof(vcc->qos)) ? 751 return copy_to_user(optval, &vcc->qos, sizeof(vcc->qos))
741 -EFAULT : 0; 752 ? -EFAULT : 0;
742 case SO_SETCLP: 753 case SO_SETCLP:
743 return put_user(vcc->atm_options & ATM_ATMOPT_CLP ? 1 : 754 return put_user(vcc->atm_options & ATM_ATMOPT_CLP ? 1 : 0,
744 0,(unsigned long __user *)optval) ? -EFAULT : 0; 755 (unsigned long __user *)optval) ? -EFAULT : 0;
745 case SO_ATMPVC: 756 case SO_ATMPVC:
746 { 757 {
747 struct sockaddr_atmpvc pvc; 758 struct sockaddr_atmpvc pvc;
748 759
749 if (!vcc->dev || 760 if (!vcc->dev || !test_bit(ATM_VF_ADDR, &vcc->flags))
750 !test_bit(ATM_VF_ADDR,&vcc->flags)) 761 return -ENOTCONN;
751 return -ENOTCONN; 762 pvc.sap_family = AF_ATMPVC;
752 pvc.sap_family = AF_ATMPVC; 763 pvc.sap_addr.itf = vcc->dev->number;
753 pvc.sap_addr.itf = vcc->dev->number; 764 pvc.sap_addr.vpi = vcc->vpi;
754 pvc.sap_addr.vpi = vcc->vpi; 765 pvc.sap_addr.vci = vcc->vci;
755 pvc.sap_addr.vci = vcc->vci; 766 return copy_to_user(optval, &pvc, sizeof(pvc)) ? -EFAULT : 0;
756 return copy_to_user(optval,&pvc,sizeof(pvc)) ? 767 }
757 -EFAULT : 0; 768 default:
758 } 769 if (level == SOL_SOCKET)
759 default: 770 return -EINVAL;
760 if (level == SOL_SOCKET) return -EINVAL;
761 break; 771 break;
762 } 772 }
763 if (!vcc->dev || !vcc->dev->ops->getsockopt) return -EINVAL; 773 if (!vcc->dev || !vcc->dev->ops->getsockopt)
774 return -EINVAL;
764 return vcc->dev->ops->getsockopt(vcc, level, optname, optval, len); 775 return vcc->dev->ops->getsockopt(vcc, level, optname, optval, len);
765} 776}
766 777
@@ -768,23 +779,27 @@ static int __init atm_init(void)
768{ 779{
769 int error; 780 int error;
770 781
771 if ((error = proto_register(&vcc_proto, 0)) < 0) 782 error = proto_register(&vcc_proto, 0);
783 if (error < 0)
772 goto out; 784 goto out;
773 785 error = atmpvc_init();
774 if ((error = atmpvc_init()) < 0) { 786 if (error < 0) {
775 printk(KERN_ERR "atmpvc_init() failed with %d\n", error); 787 pr_err("atmpvc_init() failed with %d\n", error);
776 goto out_unregister_vcc_proto; 788 goto out_unregister_vcc_proto;
777 } 789 }
778 if ((error = atmsvc_init()) < 0) { 790 error = atmsvc_init();
779 printk(KERN_ERR "atmsvc_init() failed with %d\n", error); 791 if (error < 0) {
792 pr_err("atmsvc_init() failed with %d\n", error);
780 goto out_atmpvc_exit; 793 goto out_atmpvc_exit;
781 } 794 }
782 if ((error = atm_proc_init()) < 0) { 795 error = atm_proc_init();
783 printk(KERN_ERR "atm_proc_init() failed with %d\n",error); 796 if (error < 0) {
797 pr_err("atm_proc_init() failed with %d\n", error);
784 goto out_atmsvc_exit; 798 goto out_atmsvc_exit;
785 } 799 }
786 if ((error = atm_sysfs_init()) < 0) { 800 error = atm_sysfs_init();
787 printk(KERN_ERR "atm_sysfs_init() failed with %d\n",error); 801 if (error < 0) {
802 pr_err("atm_sysfs_init() failed with %d\n", error);
788 goto out_atmproc_exit; 803 goto out_atmproc_exit;
789 } 804 }
790out: 805out:
diff --git a/net/atm/ioctl.c b/net/atm/ioctl.c
index 4da8892ced5f..62dc8bfe6fe7 100644
--- a/net/atm/ioctl.c
+++ b/net/atm/ioctl.c
@@ -3,6 +3,7 @@
3/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */ 3/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
4/* 2003 John Levon <levon@movementarian.org> */ 4/* 2003 John Levon <levon@movementarian.org> */
5 5
6#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
6 7
7#include <linux/module.h> 8#include <linux/module.h>
8#include <linux/kmod.h> 9#include <linux/kmod.h>
@@ -36,6 +37,7 @@ void register_atm_ioctl(struct atm_ioctl *ioctl)
36 list_add_tail(&ioctl->list, &ioctl_list); 37 list_add_tail(&ioctl->list, &ioctl_list);
37 mutex_unlock(&ioctl_mutex); 38 mutex_unlock(&ioctl_mutex);
38} 39}
40EXPORT_SYMBOL(register_atm_ioctl);
39 41
40void deregister_atm_ioctl(struct atm_ioctl *ioctl) 42void deregister_atm_ioctl(struct atm_ioctl *ioctl)
41{ 43{
@@ -43,129 +45,128 @@ void deregister_atm_ioctl(struct atm_ioctl *ioctl)
43 list_del(&ioctl->list); 45 list_del(&ioctl->list);
44 mutex_unlock(&ioctl_mutex); 46 mutex_unlock(&ioctl_mutex);
45} 47}
46
47EXPORT_SYMBOL(register_atm_ioctl);
48EXPORT_SYMBOL(deregister_atm_ioctl); 48EXPORT_SYMBOL(deregister_atm_ioctl);
49 49
50static int do_vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg, int compat) 50static int do_vcc_ioctl(struct socket *sock, unsigned int cmd,
51 unsigned long arg, int compat)
51{ 52{
52 struct sock *sk = sock->sk; 53 struct sock *sk = sock->sk;
53 struct atm_vcc *vcc; 54 struct atm_vcc *vcc;
54 int error; 55 int error;
55 struct list_head * pos; 56 struct list_head *pos;
56 void __user *argp = (void __user *)arg; 57 void __user *argp = (void __user *)arg;
57 58
58 vcc = ATM_SD(sock); 59 vcc = ATM_SD(sock);
59 switch (cmd) { 60 switch (cmd) {
60 case SIOCOUTQ: 61 case SIOCOUTQ:
61 if (sock->state != SS_CONNECTED || 62 if (sock->state != SS_CONNECTED ||
62 !test_bit(ATM_VF_READY, &vcc->flags)) { 63 !test_bit(ATM_VF_READY, &vcc->flags)) {
63 error = -EINVAL; 64 error = -EINVAL;
64 goto done; 65 goto done;
65 } 66 }
66 error = put_user(sk->sk_sndbuf - sk_wmem_alloc_get(sk), 67 error = put_user(sk->sk_sndbuf - sk_wmem_alloc_get(sk),
67 (int __user *) argp) ? -EFAULT : 0; 68 (int __user *)argp) ? -EFAULT : 0;
69 goto done;
70 case SIOCINQ:
71 {
72 struct sk_buff *skb;
73
74 if (sock->state != SS_CONNECTED) {
75 error = -EINVAL;
68 goto done; 76 goto done;
69 case SIOCINQ: 77 }
70 { 78 skb = skb_peek(&sk->sk_receive_queue);
71 struct sk_buff *skb; 79 error = put_user(skb ? skb->len : 0,
72 80 (int __user *)argp) ? -EFAULT : 0;
73 if (sock->state != SS_CONNECTED) { 81 goto done;
74 error = -EINVAL; 82 }
75 goto done; 83 case SIOCGSTAMP: /* borrowed from IP */
76 }
77 skb = skb_peek(&sk->sk_receive_queue);
78 error = put_user(skb ? skb->len : 0,
79 (int __user *)argp) ? -EFAULT : 0;
80 goto done;
81 }
82 case SIOCGSTAMP: /* borrowed from IP */
83#ifdef CONFIG_COMPAT 84#ifdef CONFIG_COMPAT
84 if (compat) 85 if (compat)
85 error = compat_sock_get_timestamp(sk, argp); 86 error = compat_sock_get_timestamp(sk, argp);
86 else 87 else
87#endif 88#endif
88 error = sock_get_timestamp(sk, argp); 89 error = sock_get_timestamp(sk, argp);
89 goto done; 90 goto done;
90 case SIOCGSTAMPNS: /* borrowed from IP */ 91 case SIOCGSTAMPNS: /* borrowed from IP */
91#ifdef CONFIG_COMPAT 92#ifdef CONFIG_COMPAT
92 if (compat) 93 if (compat)
93 error = compat_sock_get_timestampns(sk, argp); 94 error = compat_sock_get_timestampns(sk, argp);
94 else 95 else
95#endif 96#endif
96 error = sock_get_timestampns(sk, argp); 97 error = sock_get_timestampns(sk, argp);
98 goto done;
99 case ATM_SETSC:
100 if (net_ratelimit())
101 pr_warning("ATM_SETSC is obsolete; used by %s:%d\n",
102 current->comm, task_pid_nr(current));
103 error = 0;
104 goto done;
105 case ATMSIGD_CTRL:
106 if (!capable(CAP_NET_ADMIN)) {
107 error = -EPERM;
97 goto done; 108 goto done;
98 case ATM_SETSC: 109 }
99 if (net_ratelimit()) 110 /*
100 printk(KERN_WARNING "ATM_SETSC is obsolete; used by %s:%d\n", 111 * The user/kernel protocol for exchanging signalling
101 current->comm, task_pid_nr(current)); 112 * info uses kernel pointers as opaque references,
102 error = 0; 113 * so the holder of the file descriptor can scribble
114 * on the kernel... so we should make sure that we
115 * have the same privileges that /proc/kcore needs
116 */
117 if (!capable(CAP_SYS_RAWIO)) {
118 error = -EPERM;
103 goto done; 119 goto done;
104 case ATMSIGD_CTRL: 120 }
105 if (!capable(CAP_NET_ADMIN)) {
106 error = -EPERM;
107 goto done;
108 }
109 /*
110 * The user/kernel protocol for exchanging signalling
111 * info uses kernel pointers as opaque references,
112 * so the holder of the file descriptor can scribble
113 * on the kernel... so we should make sure that we
114 * have the same privileges that /proc/kcore needs
115 */
116 if (!capable(CAP_SYS_RAWIO)) {
117 error = -EPERM;
118 goto done;
119 }
120#ifdef CONFIG_COMPAT 121#ifdef CONFIG_COMPAT
121 /* WTF? I don't even want to _think_ about making this 122 /* WTF? I don't even want to _think_ about making this
122 work for 32-bit userspace. TBH I don't really want 123 work for 32-bit userspace. TBH I don't really want
123 to think about it at all. dwmw2. */ 124 to think about it at all. dwmw2. */
124 if (compat) { 125 if (compat) {
125 if (net_ratelimit()) 126 if (net_ratelimit())
126 printk(KERN_WARNING "32-bit task cannot be atmsigd\n"); 127 pr_warning("32-bit task cannot be atmsigd\n");
127 error = -EINVAL; 128 error = -EINVAL;
128 goto done; 129 goto done;
129 } 130 }
130#endif 131#endif
131 error = sigd_attach(vcc); 132 error = sigd_attach(vcc);
132 if (!error) 133 if (!error)
133 sock->state = SS_CONNECTED; 134 sock->state = SS_CONNECTED;
135 goto done;
136 case ATM_SETBACKEND:
137 case ATM_NEWBACKENDIF:
138 {
139 atm_backend_t backend;
140 error = get_user(backend, (atm_backend_t __user *)argp);
141 if (error)
134 goto done; 142 goto done;
135 case ATM_SETBACKEND: 143 switch (backend) {
136 case ATM_NEWBACKENDIF: 144 case ATM_BACKEND_PPP:
137 { 145 request_module("pppoatm");
138 atm_backend_t backend;
139 error = get_user(backend, (atm_backend_t __user *) argp);
140 if (error)
141 goto done;
142 switch (backend) {
143 case ATM_BACKEND_PPP:
144 request_module("pppoatm");
145 break;
146 case ATM_BACKEND_BR2684:
147 request_module("br2684");
148 break;
149 }
150 }
151 break;
152 case ATMMPC_CTRL:
153 case ATMMPC_DATA:
154 request_module("mpoa");
155 break; 146 break;
156 case ATMARPD_CTRL: 147 case ATM_BACKEND_BR2684:
157 request_module("clip"); 148 request_module("br2684");
158 break;
159 case ATMLEC_CTRL:
160 request_module("lec");
161 break; 149 break;
150 }
151 break;
152 }
153 case ATMMPC_CTRL:
154 case ATMMPC_DATA:
155 request_module("mpoa");
156 break;
157 case ATMARPD_CTRL:
158 request_module("clip");
159 break;
160 case ATMLEC_CTRL:
161 request_module("lec");
162 break;
162 } 163 }
163 164
164 error = -ENOIOCTLCMD; 165 error = -ENOIOCTLCMD;
165 166
166 mutex_lock(&ioctl_mutex); 167 mutex_lock(&ioctl_mutex);
167 list_for_each(pos, &ioctl_list) { 168 list_for_each(pos, &ioctl_list) {
168 struct atm_ioctl * ic = list_entry(pos, struct atm_ioctl, list); 169 struct atm_ioctl *ic = list_entry(pos, struct atm_ioctl, list);
169 if (try_module_get(ic->owner)) { 170 if (try_module_get(ic->owner)) {
170 error = ic->ioctl(sock, cmd, arg); 171 error = ic->ioctl(sock, cmd, arg);
171 module_put(ic->owner); 172 module_put(ic->owner);
@@ -184,15 +185,187 @@ done:
184 return error; 185 return error;
185} 186}
186 187
187
188int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) 188int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
189{ 189{
190 return do_vcc_ioctl(sock, cmd, arg, 0); 190 return do_vcc_ioctl(sock, cmd, arg, 0);
191} 191}
192 192
193#ifdef CONFIG_COMPAT 193#ifdef CONFIG_COMPAT
194int vcc_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) 194/*
195 * FIXME:
196 * The compat_ioctl handling is duplicated, using both these conversion
197 * routines and the compat argument to the actual handlers. Both
198 * versions are somewhat incomplete and should be merged, e.g. by
199 * moving the ioctl number translation into the actual handlers and
200 * killing the conversion code.
201 *
202 * -arnd, November 2009
203 */
204#define ATM_GETLINKRATE32 _IOW('a', ATMIOC_ITF+1, struct compat_atmif_sioc)
205#define ATM_GETNAMES32 _IOW('a', ATMIOC_ITF+3, struct compat_atm_iobuf)
206#define ATM_GETTYPE32 _IOW('a', ATMIOC_ITF+4, struct compat_atmif_sioc)
207#define ATM_GETESI32 _IOW('a', ATMIOC_ITF+5, struct compat_atmif_sioc)
208#define ATM_GETADDR32 _IOW('a', ATMIOC_ITF+6, struct compat_atmif_sioc)
209#define ATM_RSTADDR32 _IOW('a', ATMIOC_ITF+7, struct compat_atmif_sioc)
210#define ATM_ADDADDR32 _IOW('a', ATMIOC_ITF+8, struct compat_atmif_sioc)
211#define ATM_DELADDR32 _IOW('a', ATMIOC_ITF+9, struct compat_atmif_sioc)
212#define ATM_GETCIRANGE32 _IOW('a', ATMIOC_ITF+10, struct compat_atmif_sioc)
213#define ATM_SETCIRANGE32 _IOW('a', ATMIOC_ITF+11, struct compat_atmif_sioc)
214#define ATM_SETESI32 _IOW('a', ATMIOC_ITF+12, struct compat_atmif_sioc)
215#define ATM_SETESIF32 _IOW('a', ATMIOC_ITF+13, struct compat_atmif_sioc)
216#define ATM_GETSTAT32 _IOW('a', ATMIOC_SARCOM+0, struct compat_atmif_sioc)
217#define ATM_GETSTATZ32 _IOW('a', ATMIOC_SARCOM+1, struct compat_atmif_sioc)
218#define ATM_GETLOOP32 _IOW('a', ATMIOC_SARCOM+2, struct compat_atmif_sioc)
219#define ATM_SETLOOP32 _IOW('a', ATMIOC_SARCOM+3, struct compat_atmif_sioc)
220#define ATM_QUERYLOOP32 _IOW('a', ATMIOC_SARCOM+4, struct compat_atmif_sioc)
221
222static struct {
223 unsigned int cmd32;
224 unsigned int cmd;
225} atm_ioctl_map[] = {
226 { ATM_GETLINKRATE32, ATM_GETLINKRATE },
227 { ATM_GETNAMES32, ATM_GETNAMES },
228 { ATM_GETTYPE32, ATM_GETTYPE },
229 { ATM_GETESI32, ATM_GETESI },
230 { ATM_GETADDR32, ATM_GETADDR },
231 { ATM_RSTADDR32, ATM_RSTADDR },
232 { ATM_ADDADDR32, ATM_ADDADDR },
233 { ATM_DELADDR32, ATM_DELADDR },
234 { ATM_GETCIRANGE32, ATM_GETCIRANGE },
235 { ATM_SETCIRANGE32, ATM_SETCIRANGE },
236 { ATM_SETESI32, ATM_SETESI },
237 { ATM_SETESIF32, ATM_SETESIF },
238 { ATM_GETSTAT32, ATM_GETSTAT },
239 { ATM_GETSTATZ32, ATM_GETSTATZ },
240 { ATM_GETLOOP32, ATM_GETLOOP },
241 { ATM_SETLOOP32, ATM_SETLOOP },
242 { ATM_QUERYLOOP32, ATM_QUERYLOOP },
243};
244
245#define NR_ATM_IOCTL ARRAY_SIZE(atm_ioctl_map)
246
247static int do_atm_iobuf(struct socket *sock, unsigned int cmd,
248 unsigned long arg)
249{
250 struct atm_iobuf __user *iobuf;
251 struct compat_atm_iobuf __user *iobuf32;
252 u32 data;
253 void __user *datap;
254 int len, err;
255
256 iobuf = compat_alloc_user_space(sizeof(*iobuf));
257 iobuf32 = compat_ptr(arg);
258
259 if (get_user(len, &iobuf32->length) ||
260 get_user(data, &iobuf32->buffer))
261 return -EFAULT;
262 datap = compat_ptr(data);
263 if (put_user(len, &iobuf->length) ||
264 put_user(datap, &iobuf->buffer))
265 return -EFAULT;
266
267 err = do_vcc_ioctl(sock, cmd, (unsigned long) iobuf, 0);
268
269 if (!err) {
270 if (copy_in_user(&iobuf32->length, &iobuf->length,
271 sizeof(int)))
272 err = -EFAULT;
273 }
274
275 return err;
276}
277
278static int do_atmif_sioc(struct socket *sock, unsigned int cmd,
279 unsigned long arg)
280{
281 struct atmif_sioc __user *sioc;
282 struct compat_atmif_sioc __user *sioc32;
283 u32 data;
284 void __user *datap;
285 int err;
286
287 sioc = compat_alloc_user_space(sizeof(*sioc));
288 sioc32 = compat_ptr(arg);
289
290 if (copy_in_user(&sioc->number, &sioc32->number, 2 * sizeof(int)) ||
291 get_user(data, &sioc32->arg))
292 return -EFAULT;
293 datap = compat_ptr(data);
294 if (put_user(datap, &sioc->arg))
295 return -EFAULT;
296
297 err = do_vcc_ioctl(sock, cmd, (unsigned long) sioc, 0);
298
299 if (!err) {
300 if (copy_in_user(&sioc32->length, &sioc->length,
301 sizeof(int)))
302 err = -EFAULT;
303 }
304 return err;
305}
306
307static int do_atm_ioctl(struct socket *sock, unsigned int cmd32,
308 unsigned long arg)
195{ 309{
196 return do_vcc_ioctl(sock, cmd, arg, 1); 310 int i;
311 unsigned int cmd = 0;
312
313 switch (cmd32) {
314 case SONET_GETSTAT:
315 case SONET_GETSTATZ:
316 case SONET_GETDIAG:
317 case SONET_SETDIAG:
318 case SONET_CLRDIAG:
319 case SONET_SETFRAMING:
320 case SONET_GETFRAMING:
321 case SONET_GETFRSENSE:
322 return do_atmif_sioc(sock, cmd32, arg);
323 }
324
325 for (i = 0; i < NR_ATM_IOCTL; i++) {
326 if (cmd32 == atm_ioctl_map[i].cmd32) {
327 cmd = atm_ioctl_map[i].cmd;
328 break;
329 }
330 }
331 if (i == NR_ATM_IOCTL)
332 return -EINVAL;
333
334 switch (cmd) {
335 case ATM_GETNAMES:
336 return do_atm_iobuf(sock, cmd, arg);
337
338 case ATM_GETLINKRATE:
339 case ATM_GETTYPE:
340 case ATM_GETESI:
341 case ATM_GETADDR:
342 case ATM_RSTADDR:
343 case ATM_ADDADDR:
344 case ATM_DELADDR:
345 case ATM_GETCIRANGE:
346 case ATM_SETCIRANGE:
347 case ATM_SETESI:
348 case ATM_SETESIF:
349 case ATM_GETSTAT:
350 case ATM_GETSTATZ:
351 case ATM_GETLOOP:
352 case ATM_SETLOOP:
353 case ATM_QUERYLOOP:
354 return do_atmif_sioc(sock, cmd, arg);
355 }
356
357 return -EINVAL;
358}
359
360int vcc_compat_ioctl(struct socket *sock, unsigned int cmd,
361 unsigned long arg)
362{
363 int ret;
364
365 ret = do_vcc_ioctl(sock, cmd, arg, 1);
366 if (ret != -ENOIOCTLCMD)
367 return ret;
368
369 return do_atm_ioctl(sock, cmd, arg);
197} 370}
198#endif 371#endif
diff --git a/net/atm/lec.c b/net/atm/lec.c
index b2d644560323..feeaf5718472 100644
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -4,6 +4,9 @@
4 * Marko Kiiskila <mkiiskila@yahoo.com> 4 * Marko Kiiskila <mkiiskila@yahoo.com>
5 */ 5 */
6 6
7#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
8
9#include <linux/slab.h>
7#include <linux/kernel.h> 10#include <linux/kernel.h>
8#include <linux/bitops.h> 11#include <linux/bitops.h>
9#include <linux/capability.h> 12#include <linux/capability.h>
@@ -16,7 +19,7 @@
16#include <linux/skbuff.h> 19#include <linux/skbuff.h>
17#include <linux/ip.h> 20#include <linux/ip.h>
18#include <asm/byteorder.h> 21#include <asm/byteorder.h>
19#include <asm/uaccess.h> 22#include <linux/uaccess.h>
20#include <net/arp.h> 23#include <net/arp.h>
21#include <net/dst.h> 24#include <net/dst.h>
22#include <linux/proc_fs.h> 25#include <linux/proc_fs.h>
@@ -62,7 +65,6 @@ static int lec_open(struct net_device *dev);
62static netdev_tx_t lec_start_xmit(struct sk_buff *skb, 65static netdev_tx_t lec_start_xmit(struct sk_buff *skb,
63 struct net_device *dev); 66 struct net_device *dev);
64static int lec_close(struct net_device *dev); 67static int lec_close(struct net_device *dev);
65static void lec_init(struct net_device *dev);
66static struct lec_arp_table *lec_arp_find(struct lec_priv *priv, 68static struct lec_arp_table *lec_arp_find(struct lec_priv *priv,
67 const unsigned char *mac_addr); 69 const unsigned char *mac_addr);
68static int lec_arp_remove(struct lec_priv *priv, 70static int lec_arp_remove(struct lec_priv *priv,
@@ -86,17 +88,19 @@ static struct atm_vcc *lec_arp_resolve(struct lec_priv *priv,
86 int is_rdesc, 88 int is_rdesc,
87 struct lec_arp_table **ret_entry); 89 struct lec_arp_table **ret_entry);
88static void lec_arp_update(struct lec_priv *priv, const unsigned char *mac_addr, 90static void lec_arp_update(struct lec_priv *priv, const unsigned char *mac_addr,
89 const unsigned char *atm_addr, unsigned long remoteflag, 91 const unsigned char *atm_addr,
92 unsigned long remoteflag,
90 unsigned int targetless_le_arp); 93 unsigned int targetless_le_arp);
91static void lec_flush_complete(struct lec_priv *priv, unsigned long tran_id); 94static void lec_flush_complete(struct lec_priv *priv, unsigned long tran_id);
92static int lec_mcast_make(struct lec_priv *priv, struct atm_vcc *vcc); 95static int lec_mcast_make(struct lec_priv *priv, struct atm_vcc *vcc);
93static void lec_set_flush_tran_id(struct lec_priv *priv, 96static void lec_set_flush_tran_id(struct lec_priv *priv,
94 const unsigned char *atm_addr, 97 const unsigned char *atm_addr,
95 unsigned long tran_id); 98 unsigned long tran_id);
96static void lec_vcc_added(struct lec_priv *priv, const struct atmlec_ioc *ioc_data, 99static void lec_vcc_added(struct lec_priv *priv,
100 const struct atmlec_ioc *ioc_data,
97 struct atm_vcc *vcc, 101 struct atm_vcc *vcc,
98 void (*old_push) (struct atm_vcc *vcc, 102 void (*old_push)(struct atm_vcc *vcc,
99 struct sk_buff *skb)); 103 struct sk_buff *skb));
100static void lec_vcc_close(struct lec_priv *priv, struct atm_vcc *vcc); 104static void lec_vcc_close(struct lec_priv *priv, struct atm_vcc *vcc);
101 105
102/* must be done under lec_arp_lock */ 106/* must be done under lec_arp_lock */
@@ -111,7 +115,6 @@ static inline void lec_arp_put(struct lec_arp_table *entry)
111 kfree(entry); 115 kfree(entry);
112} 116}
113 117
114
115static struct lane2_ops lane2_ops = { 118static struct lane2_ops lane2_ops = {
116 lane2_resolve, /* resolve, spec 3.1.3 */ 119 lane2_resolve, /* resolve, spec 3.1.3 */
117 lane2_associate_req, /* associate_req, spec 3.1.4 */ 120 lane2_associate_req, /* associate_req, spec 3.1.4 */
@@ -149,7 +152,8 @@ static void lec_handle_bridge(struct sk_buff *skb, struct net_device *dev)
149 mesg = (struct atmlec_msg *)skb2->data; 152 mesg = (struct atmlec_msg *)skb2->data;
150 mesg->type = l_topology_change; 153 mesg->type = l_topology_change;
151 buff += 4; 154 buff += 4;
152 mesg->content.normal.flag = *buff & 0x01; /* 0x01 is topology change */ 155 mesg->content.normal.flag = *buff & 0x01;
156 /* 0x01 is topology change */
153 157
154 priv = netdev_priv(dev); 158 priv = netdev_priv(dev);
155 atm_force_charge(priv->lecd, skb2->truesize); 159 atm_force_charge(priv->lecd, skb2->truesize);
@@ -243,7 +247,7 @@ lec_send(struct atm_vcc *vcc, struct sk_buff *skb)
243 247
244static void lec_tx_timeout(struct net_device *dev) 248static void lec_tx_timeout(struct net_device *dev)
245{ 249{
246 printk(KERN_INFO "%s: tx timeout\n", dev->name); 250 pr_info("%s\n", dev->name);
247 dev->trans_start = jiffies; 251 dev->trans_start = jiffies;
248 netif_wake_queue(dev); 252 netif_wake_queue(dev);
249} 253}
@@ -262,14 +266,10 @@ static netdev_tx_t lec_start_xmit(struct sk_buff *skb,
262 unsigned char rdesc[ETH_ALEN]; /* Token Ring route descriptor */ 266 unsigned char rdesc[ETH_ALEN]; /* Token Ring route descriptor */
263#endif 267#endif
264 int is_rdesc; 268 int is_rdesc;
265#if DUMP_PACKETS > 0
266 char buf[300];
267 int i = 0;
268#endif /* DUMP_PACKETS >0 */
269 269
270 pr_debug("lec_start_xmit called\n"); 270 pr_debug("called\n");
271 if (!priv->lecd) { 271 if (!priv->lecd) {
272 printk("%s:No lecd attached\n", dev->name); 272 pr_info("%s:No lecd attached\n", dev->name);
273 dev->stats.tx_errors++; 273 dev->stats.tx_errors++;
274 netif_stop_queue(dev); 274 netif_stop_queue(dev);
275 kfree_skb(skb); 275 kfree_skb(skb);
@@ -277,8 +277,8 @@ static netdev_tx_t lec_start_xmit(struct sk_buff *skb,
277 } 277 }
278 278
279 pr_debug("skbuff head:%lx data:%lx tail:%lx end:%lx\n", 279 pr_debug("skbuff head:%lx data:%lx tail:%lx end:%lx\n",
280 (long)skb->head, (long)skb->data, (long)skb_tail_pointer(skb), 280 (long)skb->head, (long)skb->data, (long)skb_tail_pointer(skb),
281 (long)skb_end_pointer(skb)); 281 (long)skb_end_pointer(skb));
282#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) 282#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
283 if (memcmp(skb->data, bridge_ula_lec, sizeof(bridge_ula_lec)) == 0) 283 if (memcmp(skb->data, bridge_ula_lec, sizeof(bridge_ula_lec)) == 0)
284 lec_handle_bridge(skb, dev); 284 lec_handle_bridge(skb, dev);
@@ -286,8 +286,7 @@ static netdev_tx_t lec_start_xmit(struct sk_buff *skb,
286 286
287 /* Make sure we have room for lec_id */ 287 /* Make sure we have room for lec_id */
288 if (skb_headroom(skb) < 2) { 288 if (skb_headroom(skb) < 2) {
289 289 pr_debug("reallocating skb\n");
290 pr_debug("lec_start_xmit: reallocating skb\n");
291 skb2 = skb_realloc_headroom(skb, LEC_HEADER_LEN); 290 skb2 = skb_realloc_headroom(skb, LEC_HEADER_LEN);
292 kfree_skb(skb); 291 kfree_skb(skb);
293 if (skb2 == NULL) 292 if (skb2 == NULL)
@@ -314,23 +313,17 @@ static netdev_tx_t lec_start_xmit(struct sk_buff *skb,
314 } 313 }
315#endif 314#endif
316 315
317#if DUMP_PACKETS > 0
318 printk("%s: send datalen:%ld lecid:%4.4x\n", dev->name,
319 skb->len, priv->lecid);
320#if DUMP_PACKETS >= 2 316#if DUMP_PACKETS >= 2
321 for (i = 0; i < skb->len && i < 99; i++) { 317#define MAX_DUMP_SKB 99
322 sprintf(buf + i * 3, "%2.2x ", 0xff & skb->data[i]);
323 }
324#elif DUMP_PACKETS >= 1 318#elif DUMP_PACKETS >= 1
325 for (i = 0; i < skb->len && i < 30; i++) { 319#define MAX_DUMP_SKB 30
326 sprintf(buf + i * 3, "%2.2x ", 0xff & skb->data[i]); 320#endif
327 } 321#if DUMP_PACKETS >= 1
322 printk(KERN_DEBUG "%s: send datalen:%ld lecid:%4.4x\n",
323 dev->name, skb->len, priv->lecid);
324 print_hex_dump(KERN_DEBUG, "", DUMP_OFFSET, 16, 1,
325 skb->data, min(skb->len, MAX_DUMP_SKB), true);
328#endif /* DUMP_PACKETS >= 1 */ 326#endif /* DUMP_PACKETS >= 1 */
329 if (i == skb->len)
330 printk("%s\n", buf);
331 else
332 printk("%s...\n", buf);
333#endif /* DUMP_PACKETS > 0 */
334 327
335 /* Minimum ethernet-frame size */ 328 /* Minimum ethernet-frame size */
336#ifdef CONFIG_TR 329#ifdef CONFIG_TR
@@ -368,31 +361,28 @@ static netdev_tx_t lec_start_xmit(struct sk_buff *skb,
368#endif 361#endif
369 entry = NULL; 362 entry = NULL;
370 vcc = lec_arp_resolve(priv, dst, is_rdesc, &entry); 363 vcc = lec_arp_resolve(priv, dst, is_rdesc, &entry);
371 pr_debug("%s:vcc:%p vcc_flags:%lx, entry:%p\n", dev->name, 364 pr_debug("%s:vcc:%p vcc_flags:%lx, entry:%p\n",
372 vcc, vcc ? vcc->flags : 0, entry); 365 dev->name, vcc, vcc ? vcc->flags : 0, entry);
373 if (!vcc || !test_bit(ATM_VF_READY, &vcc->flags)) { 366 if (!vcc || !test_bit(ATM_VF_READY, &vcc->flags)) {
374 if (entry && (entry->tx_wait.qlen < LEC_UNRES_QUE_LEN)) { 367 if (entry && (entry->tx_wait.qlen < LEC_UNRES_QUE_LEN)) {
375 pr_debug("%s:lec_start_xmit: queuing packet, ", 368 pr_debug("%s:queuing packet, MAC address %pM\n",
376 dev->name); 369 dev->name, lec_h->h_dest);
377 pr_debug("MAC address %pM\n", lec_h->h_dest);
378 skb_queue_tail(&entry->tx_wait, skb); 370 skb_queue_tail(&entry->tx_wait, skb);
379 } else { 371 } else {
380 pr_debug 372 pr_debug("%s:tx queue full or no arp entry, dropping, MAC address: %pM\n",
381 ("%s:lec_start_xmit: tx queue full or no arp entry, dropping, ", 373 dev->name, lec_h->h_dest);
382 dev->name);
383 pr_debug("MAC address %pM\n", lec_h->h_dest);
384 dev->stats.tx_dropped++; 374 dev->stats.tx_dropped++;
385 dev_kfree_skb(skb); 375 dev_kfree_skb(skb);
386 } 376 }
387 goto out; 377 goto out;
388 } 378 }
389#if DUMP_PACKETS > 0 379#if DUMP_PACKETS > 0
390 printk("%s:sending to vpi:%d vci:%d\n", dev->name, vcc->vpi, vcc->vci); 380 printk(KERN_DEBUG "%s:sending to vpi:%d vci:%d\n",
381 dev->name, vcc->vpi, vcc->vci);
391#endif /* DUMP_PACKETS > 0 */ 382#endif /* DUMP_PACKETS > 0 */
392 383
393 while (entry && (skb2 = skb_dequeue(&entry->tx_wait))) { 384 while (entry && (skb2 = skb_dequeue(&entry->tx_wait))) {
394 pr_debug("lec.c: emptying tx queue, "); 385 pr_debug("emptying tx queue, MAC address %pM\n", lec_h->h_dest);
395 pr_debug("MAC address %pM\n", lec_h->h_dest);
396 lec_send(vcc, skb2); 386 lec_send(vcc, skb2);
397 } 387 }
398 388
@@ -445,14 +435,12 @@ static int lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb)
445 pr_debug("%s: msg from zeppelin:%d\n", dev->name, mesg->type); 435 pr_debug("%s: msg from zeppelin:%d\n", dev->name, mesg->type);
446 switch (mesg->type) { 436 switch (mesg->type) {
447 case l_set_mac_addr: 437 case l_set_mac_addr:
448 for (i = 0; i < 6; i++) { 438 for (i = 0; i < 6; i++)
449 dev->dev_addr[i] = mesg->content.normal.mac_addr[i]; 439 dev->dev_addr[i] = mesg->content.normal.mac_addr[i];
450 }
451 break; 440 break;
452 case l_del_mac_addr: 441 case l_del_mac_addr:
453 for (i = 0; i < 6; i++) { 442 for (i = 0; i < 6; i++)
454 dev->dev_addr[i] = 0; 443 dev->dev_addr[i] = 0;
455 }
456 break; 444 break;
457 case l_addr_delete: 445 case l_addr_delete:
458 lec_addr_delete(priv, mesg->content.normal.atm_addr, 446 lec_addr_delete(priv, mesg->content.normal.atm_addr,
@@ -478,10 +466,10 @@ static int lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb)
478 mesg->content.normal.atm_addr, 466 mesg->content.normal.atm_addr,
479 mesg->content.normal.flag, 467 mesg->content.normal.flag,
480 mesg->content.normal.targetless_le_arp); 468 mesg->content.normal.targetless_le_arp);
481 pr_debug("lec: in l_arp_update\n"); 469 pr_debug("in l_arp_update\n");
482 if (mesg->sizeoftlvs != 0) { /* LANE2 3.1.5 */ 470 if (mesg->sizeoftlvs != 0) { /* LANE2 3.1.5 */
483 pr_debug("lec: LANE2 3.1.5, got tlvs, size %d\n", 471 pr_debug("LANE2 3.1.5, got tlvs, size %d\n",
484 mesg->sizeoftlvs); 472 mesg->sizeoftlvs);
485 lane2_associate_ind(dev, mesg->content.normal.mac_addr, 473 lane2_associate_ind(dev, mesg->content.normal.mac_addr,
486 tmp, mesg->sizeoftlvs); 474 tmp, mesg->sizeoftlvs);
487 } 475 }
@@ -500,13 +488,14 @@ static int lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb)
500 priv->flush_timeout = (mesg->content.config.flush_timeout * HZ); 488 priv->flush_timeout = (mesg->content.config.flush_timeout * HZ);
501 priv->path_switching_delay = 489 priv->path_switching_delay =
502 (mesg->content.config.path_switching_delay * HZ); 490 (mesg->content.config.path_switching_delay * HZ);
503 priv->lane_version = mesg->content.config.lane_version; /* LANE2 */ 491 priv->lane_version = mesg->content.config.lane_version;
492 /* LANE2 */
504 priv->lane2_ops = NULL; 493 priv->lane2_ops = NULL;
505 if (priv->lane_version > 1) 494 if (priv->lane_version > 1)
506 priv->lane2_ops = &lane2_ops; 495 priv->lane2_ops = &lane2_ops;
507 if (dev_set_mtu(dev, mesg->content.config.mtu)) 496 if (dev_set_mtu(dev, mesg->content.config.mtu))
508 printk("%s: change_mtu to %d failed\n", dev->name, 497 pr_info("%s: change_mtu to %d failed\n",
509 mesg->content.config.mtu); 498 dev->name, mesg->content.config.mtu);
510 priv->is_proxy = mesg->content.config.is_proxy; 499 priv->is_proxy = mesg->content.config.is_proxy;
511 break; 500 break;
512 case l_flush_tran_id: 501 case l_flush_tran_id:
@@ -519,40 +508,35 @@ static int lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb)
519 break; 508 break;
520 case l_should_bridge: 509 case l_should_bridge:
521#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) 510#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
522 { 511 {
523 pr_debug("%s: bridge zeppelin asks about %pM\n", 512 pr_debug("%s: bridge zeppelin asks about %pM\n",
524 dev->name, mesg->content.proxy.mac_addr); 513 dev->name, mesg->content.proxy.mac_addr);
525 514
526 if (br_fdb_test_addr_hook == NULL) 515 if (br_fdb_test_addr_hook == NULL)
527 break; 516 break;
528 517
529 if (br_fdb_test_addr_hook(dev, 518 if (br_fdb_test_addr_hook(dev, mesg->content.proxy.mac_addr)) {
530 mesg->content.proxy.mac_addr)) { 519 /* hit from bridge table, send LE_ARP_RESPONSE */
531 /* hit from bridge table, send LE_ARP_RESPONSE */ 520 struct sk_buff *skb2;
532 struct sk_buff *skb2; 521 struct sock *sk;
533 struct sock *sk; 522
534 523 pr_debug("%s: entry found, responding to zeppelin\n",
535 pr_debug 524 dev->name);
536 ("%s: entry found, responding to zeppelin\n", 525 skb2 = alloc_skb(sizeof(struct atmlec_msg), GFP_ATOMIC);
537 dev->name); 526 if (skb2 == NULL)
538 skb2 = 527 break;
539 alloc_skb(sizeof(struct atmlec_msg), 528 skb2->len = sizeof(struct atmlec_msg);
540 GFP_ATOMIC); 529 skb_copy_to_linear_data(skb2, mesg, sizeof(*mesg));
541 if (skb2 == NULL) 530 atm_force_charge(priv->lecd, skb2->truesize);
542 break; 531 sk = sk_atm(priv->lecd);
543 skb2->len = sizeof(struct atmlec_msg); 532 skb_queue_tail(&sk->sk_receive_queue, skb2);
544 skb_copy_to_linear_data(skb2, mesg, 533 sk->sk_data_ready(sk, skb2->len);
545 sizeof(*mesg));
546 atm_force_charge(priv->lecd, skb2->truesize);
547 sk = sk_atm(priv->lecd);
548 skb_queue_tail(&sk->sk_receive_queue, skb2);
549 sk->sk_data_ready(sk, skb2->len);
550 }
551 } 534 }
535 }
552#endif /* defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) */ 536#endif /* defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) */
553 break; 537 break;
554 default: 538 default:
555 printk("%s: Unknown message type %d\n", dev->name, mesg->type); 539 pr_info("%s: Unknown message type %d\n", dev->name, mesg->type);
556 dev_kfree_skb(skb); 540 dev_kfree_skb(skb);
557 return -EINVAL; 541 return -EINVAL;
558 } 542 }
@@ -573,14 +557,13 @@ static void lec_atm_close(struct atm_vcc *vcc)
573 lec_arp_destroy(priv); 557 lec_arp_destroy(priv);
574 558
575 if (skb_peek(&sk_atm(vcc)->sk_receive_queue)) 559 if (skb_peek(&sk_atm(vcc)->sk_receive_queue))
576 printk("%s lec_atm_close: closing with messages pending\n", 560 pr_info("%s closing with messages pending\n", dev->name);
577 dev->name); 561 while ((skb = skb_dequeue(&sk_atm(vcc)->sk_receive_queue))) {
578 while ((skb = skb_dequeue(&sk_atm(vcc)->sk_receive_queue)) != NULL) {
579 atm_return(vcc, skb->truesize); 562 atm_return(vcc, skb->truesize);
580 dev_kfree_skb(skb); 563 dev_kfree_skb(skb);
581 } 564 }
582 565
583 printk("%s: Shut down!\n", dev->name); 566 pr_info("%s: Shut down!\n", dev->name);
584 module_put(THIS_MODULE); 567 module_put(THIS_MODULE);
585} 568}
586 569
@@ -609,9 +592,8 @@ send_to_lecd(struct lec_priv *priv, atmlec_msg_type type,
609 struct sk_buff *skb; 592 struct sk_buff *skb;
610 struct atmlec_msg *mesg; 593 struct atmlec_msg *mesg;
611 594
612 if (!priv || !priv->lecd) { 595 if (!priv || !priv->lecd)
613 return -1; 596 return -1;
614 }
615 skb = alloc_skb(sizeof(struct atmlec_msg), GFP_ATOMIC); 597 skb = alloc_skb(sizeof(struct atmlec_msg), GFP_ATOMIC);
616 if (!skb) 598 if (!skb)
617 return -1; 599 return -1;
@@ -634,7 +616,7 @@ send_to_lecd(struct lec_priv *priv, atmlec_msg_type type,
634 sk->sk_data_ready(sk, skb->len); 616 sk->sk_data_ready(sk, skb->len);
635 617
636 if (data != NULL) { 618 if (data != NULL) {
637 pr_debug("lec: about to send %d bytes of data\n", data->len); 619 pr_debug("about to send %d bytes of data\n", data->len);
638 atm_force_charge(priv->lecd, data->truesize); 620 atm_force_charge(priv->lecd, data->truesize);
639 skb_queue_tail(&sk->sk_receive_queue, data); 621 skb_queue_tail(&sk->sk_receive_queue, data);
640 sk->sk_data_ready(sk, skb->len); 622 sk->sk_data_ready(sk, skb->len);
@@ -670,13 +652,6 @@ static const struct net_device_ops lec_netdev_ops = {
670 .ndo_set_multicast_list = lec_set_multicast_list, 652 .ndo_set_multicast_list = lec_set_multicast_list,
671}; 653};
672 654
673
674static void lec_init(struct net_device *dev)
675{
676 dev->netdev_ops = &lec_netdev_ops;
677 printk("%s: Initialized!\n", dev->name);
678}
679
680static const unsigned char lec_ctrl_magic[] = { 655static const unsigned char lec_ctrl_magic[] = {
681 0xff, 656 0xff,
682 0x00, 657 0x00,
@@ -699,36 +674,28 @@ static void lec_push(struct atm_vcc *vcc, struct sk_buff *skb)
699 struct net_device *dev = (struct net_device *)vcc->proto_data; 674 struct net_device *dev = (struct net_device *)vcc->proto_data;
700 struct lec_priv *priv = netdev_priv(dev); 675 struct lec_priv *priv = netdev_priv(dev);
701 676
702#if DUMP_PACKETS >0 677#if DUMP_PACKETS > 0
703 int i = 0; 678 printk(KERN_DEBUG "%s: vcc vpi:%d vci:%d\n",
704 char buf[300]; 679 dev->name, vcc->vpi, vcc->vci);
705
706 printk("%s: lec_push vcc vpi:%d vci:%d\n", dev->name,
707 vcc->vpi, vcc->vci);
708#endif 680#endif
709 if (!skb) { 681 if (!skb) {
710 pr_debug("%s: null skb\n", dev->name); 682 pr_debug("%s: null skb\n", dev->name);
711 lec_vcc_close(priv, vcc); 683 lec_vcc_close(priv, vcc);
712 return; 684 return;
713 } 685 }
714#if DUMP_PACKETS > 0
715 printk("%s: rcv datalen:%ld lecid:%4.4x\n", dev->name,
716 skb->len, priv->lecid);
717#if DUMP_PACKETS >= 2 686#if DUMP_PACKETS >= 2
718 for (i = 0; i < skb->len && i < 99; i++) { 687#define MAX_SKB_DUMP 99
719 sprintf(buf + i * 3, "%2.2x ", 0xff & skb->data[i]);
720 }
721#elif DUMP_PACKETS >= 1 688#elif DUMP_PACKETS >= 1
722 for (i = 0; i < skb->len && i < 30; i++) { 689#define MAX_SKB_DUMP 30
723 sprintf(buf + i * 3, "%2.2x ", 0xff & skb->data[i]); 690#endif
724 } 691#if DUMP_PACKETS > 0
725#endif /* DUMP_PACKETS >= 1 */ 692 printk(KERN_DEBUG "%s: rcv datalen:%ld lecid:%4.4x\n",
726 if (i == skb->len) 693 dev->name, skb->len, priv->lecid);
727 printk("%s\n", buf); 694 print_hex_dump(KERN_DEBUG, "", DUMP_OFFSET, 16, 1,
728 else 695 skb->data, min(MAX_SKB_DUMP, skb->len), true);
729 printk("%s...\n", buf);
730#endif /* DUMP_PACKETS > 0 */ 696#endif /* DUMP_PACKETS > 0 */
731 if (memcmp(skb->data, lec_ctrl_magic, 4) == 0) { /* Control frame, to daemon */ 697 if (memcmp(skb->data, lec_ctrl_magic, 4) == 0) {
698 /* Control frame, to daemon */
732 struct sock *sk = sk_atm(vcc); 699 struct sock *sk = sk_atm(vcc);
733 700
734 pr_debug("%s: To daemon\n", dev->name); 701 pr_debug("%s: To daemon\n", dev->name);
@@ -786,9 +753,8 @@ static void lec_push(struct atm_vcc *vcc, struct sk_buff *skb)
786 dev_kfree_skb(skb); 753 dev_kfree_skb(skb);
787 return; 754 return;
788 } 755 }
789 if (!hlist_empty(&priv->lec_arp_empty_ones)) { 756 if (!hlist_empty(&priv->lec_arp_empty_ones))
790 lec_arp_check_empties(priv, vcc, skb); 757 lec_arp_check_empties(priv, vcc, skb);
791 }
792 skb_pull(skb, 2); /* skip lec_id */ 758 skb_pull(skb, 2); /* skip lec_id */
793#ifdef CONFIG_TR 759#ifdef CONFIG_TR
794 if (priv->is_trdev) 760 if (priv->is_trdev)
@@ -809,7 +775,7 @@ static void lec_pop(struct atm_vcc *vcc, struct sk_buff *skb)
809 struct net_device *dev = skb->dev; 775 struct net_device *dev = skb->dev;
810 776
811 if (vpriv == NULL) { 777 if (vpriv == NULL) {
812 printk("lec_pop(): vpriv = NULL!?!?!?\n"); 778 pr_info("vpriv = NULL!?!?!?\n");
813 return; 779 return;
814 } 780 }
815 781
@@ -830,15 +796,13 @@ static int lec_vcc_attach(struct atm_vcc *vcc, void __user *arg)
830 796
831 /* Lecd must be up in this case */ 797 /* Lecd must be up in this case */
832 bytes_left = copy_from_user(&ioc_data, arg, sizeof(struct atmlec_ioc)); 798 bytes_left = copy_from_user(&ioc_data, arg, sizeof(struct atmlec_ioc));
833 if (bytes_left != 0) { 799 if (bytes_left != 0)
834 printk 800 pr_info("copy from user failed for %d bytes\n", bytes_left);
835 ("lec: lec_vcc_attach, copy from user failed for %d bytes\n",
836 bytes_left);
837 }
838 if (ioc_data.dev_num < 0 || ioc_data.dev_num >= MAX_LEC_ITF || 801 if (ioc_data.dev_num < 0 || ioc_data.dev_num >= MAX_LEC_ITF ||
839 !dev_lec[ioc_data.dev_num]) 802 !dev_lec[ioc_data.dev_num])
840 return -EINVAL; 803 return -EINVAL;
841 if (!(vpriv = kmalloc(sizeof(struct lec_vcc_priv), GFP_KERNEL))) 804 vpriv = kmalloc(sizeof(struct lec_vcc_priv), GFP_KERNEL);
805 if (!vpriv)
842 return -ENOMEM; 806 return -ENOMEM;
843 vpriv->xoff = 0; 807 vpriv->xoff = 0;
844 vpriv->old_pop = vcc->pop; 808 vpriv->old_pop = vcc->pop;
@@ -893,6 +857,7 @@ static int lecd_attach(struct atm_vcc *vcc, int arg)
893 dev_lec[i] = alloc_etherdev(size); 857 dev_lec[i] = alloc_etherdev(size);
894 if (!dev_lec[i]) 858 if (!dev_lec[i])
895 return -ENOMEM; 859 return -ENOMEM;
860 dev_lec[i]->netdev_ops = &lec_netdev_ops;
896 snprintf(dev_lec[i]->name, IFNAMSIZ, "lec%d", i); 861 snprintf(dev_lec[i]->name, IFNAMSIZ, "lec%d", i);
897 if (register_netdev(dev_lec[i])) { 862 if (register_netdev(dev_lec[i])) {
898 free_netdev(dev_lec[i]); 863 free_netdev(dev_lec[i]);
@@ -901,7 +866,6 @@ static int lecd_attach(struct atm_vcc *vcc, int arg)
901 866
902 priv = netdev_priv(dev_lec[i]); 867 priv = netdev_priv(dev_lec[i]);
903 priv->is_trdev = is_trdev; 868 priv->is_trdev = is_trdev;
904 lec_init(dev_lec[i]);
905 } else { 869 } else {
906 priv = netdev_priv(dev_lec[i]); 870 priv = netdev_priv(dev_lec[i]);
907 if (priv->lecd) 871 if (priv->lecd)
@@ -929,9 +893,8 @@ static int lecd_attach(struct atm_vcc *vcc, int arg)
929 priv->flush_timeout = (4 * HZ); 893 priv->flush_timeout = (4 * HZ);
930 priv->path_switching_delay = (6 * HZ); 894 priv->path_switching_delay = (6 * HZ);
931 895
932 if (dev_lec[i]->flags & IFF_UP) { 896 if (dev_lec[i]->flags & IFF_UP)
933 netif_start_queue(dev_lec[i]); 897 netif_start_queue(dev_lec[i]);
934 }
935 __module_get(THIS_MODULE); 898 __module_get(THIS_MODULE);
936 return i; 899 return i;
937} 900}
@@ -1133,7 +1096,9 @@ static int lec_seq_show(struct seq_file *seq, void *v)
1133 else { 1096 else {
1134 struct lec_state *state = seq->private; 1097 struct lec_state *state = seq->private;
1135 struct net_device *dev = state->dev; 1098 struct net_device *dev = state->dev;
1136 struct lec_arp_table *entry = hlist_entry(state->node, struct lec_arp_table, next); 1099 struct lec_arp_table *entry = hlist_entry(state->node,
1100 struct lec_arp_table,
1101 next);
1137 1102
1138 seq_printf(seq, "%s ", dev->name); 1103 seq_printf(seq, "%s ", dev->name);
1139 lec_info(seq, entry); 1104 lec_info(seq, entry);
@@ -1207,13 +1172,13 @@ static int __init lane_module_init(void)
1207 1172
1208 p = proc_create("lec", S_IRUGO, atm_proc_root, &lec_seq_fops); 1173 p = proc_create("lec", S_IRUGO, atm_proc_root, &lec_seq_fops);
1209 if (!p) { 1174 if (!p) {
1210 printk(KERN_ERR "Unable to initialize /proc/net/atm/lec\n"); 1175 pr_err("Unable to initialize /proc/net/atm/lec\n");
1211 return -ENOMEM; 1176 return -ENOMEM;
1212 } 1177 }
1213#endif 1178#endif
1214 1179
1215 register_atm_ioctl(&lane_ioctl_ops); 1180 register_atm_ioctl(&lane_ioctl_ops);
1216 printk("lec.c: " __DATE__ " " __TIME__ " initialized\n"); 1181 pr_info("lec.c: " __DATE__ " " __TIME__ " initialized\n");
1217 return 0; 1182 return 0;
1218} 1183}
1219 1184
@@ -1302,13 +1267,13 @@ static int lane2_associate_req(struct net_device *dev, const u8 *lan_dst,
1302 struct lec_priv *priv = netdev_priv(dev); 1267 struct lec_priv *priv = netdev_priv(dev);
1303 1268
1304 if (compare_ether_addr(lan_dst, dev->dev_addr)) 1269 if (compare_ether_addr(lan_dst, dev->dev_addr))
1305 return (0); /* not our mac address */ 1270 return 0; /* not our mac address */
1306 1271
1307 kfree(priv->tlvs); /* NULL if there was no previous association */ 1272 kfree(priv->tlvs); /* NULL if there was no previous association */
1308 1273
1309 priv->tlvs = kmemdup(tlvs, sizeoftlvs, GFP_KERNEL); 1274 priv->tlvs = kmemdup(tlvs, sizeoftlvs, GFP_KERNEL);
1310 if (priv->tlvs == NULL) 1275 if (priv->tlvs == NULL)
1311 return (0); 1276 return 0;
1312 priv->sizeoftlvs = sizeoftlvs; 1277 priv->sizeoftlvs = sizeoftlvs;
1313 1278
1314 skb = alloc_skb(sizeoftlvs, GFP_ATOMIC); 1279 skb = alloc_skb(sizeoftlvs, GFP_ATOMIC);
@@ -1318,12 +1283,12 @@ static int lane2_associate_req(struct net_device *dev, const u8 *lan_dst,
1318 skb_copy_to_linear_data(skb, tlvs, sizeoftlvs); 1283 skb_copy_to_linear_data(skb, tlvs, sizeoftlvs);
1319 retval = send_to_lecd(priv, l_associate_req, NULL, NULL, skb); 1284 retval = send_to_lecd(priv, l_associate_req, NULL, NULL, skb);
1320 if (retval != 0) 1285 if (retval != 0)
1321 printk("lec.c: lane2_associate_req() failed\n"); 1286 pr_info("lec.c: lane2_associate_req() failed\n");
1322 /* 1287 /*
1323 * If the previous association has changed we must 1288 * If the previous association has changed we must
1324 * somehow notify other LANE entities about the change 1289 * somehow notify other LANE entities about the change
1325 */ 1290 */
1326 return (1); 1291 return 1;
1327} 1292}
1328 1293
1329/* 1294/*
@@ -1356,12 +1321,12 @@ static void lane2_associate_ind(struct net_device *dev, const u8 *mac_addr,
1356 entry->sizeoftlvs = sizeoftlvs; 1321 entry->sizeoftlvs = sizeoftlvs;
1357#endif 1322#endif
1358#if 0 1323#if 0
1359 printk("lec.c: lane2_associate_ind()\n"); 1324 pr_info("\n");
1360 printk("dump of tlvs, sizeoftlvs=%d\n", sizeoftlvs); 1325 pr_info("dump of tlvs, sizeoftlvs=%d\n", sizeoftlvs);
1361 while (i < sizeoftlvs) 1326 while (i < sizeoftlvs)
1362 printk("%02x ", tlvs[i++]); 1327 pr_cont("%02x ", tlvs[i++]);
1363 1328
1364 printk("\n"); 1329 pr_cont("\n");
1365#endif 1330#endif
1366 1331
1367 /* tell MPOA about the TLVs we saw */ 1332 /* tell MPOA about the TLVs we saw */
@@ -1381,15 +1346,15 @@ static void lane2_associate_ind(struct net_device *dev, const u8 *mac_addr,
1381 1346
1382#include <linux/types.h> 1347#include <linux/types.h>
1383#include <linux/timer.h> 1348#include <linux/timer.h>
1384#include <asm/param.h> 1349#include <linux/param.h>
1385#include <asm/atomic.h> 1350#include <asm/atomic.h>
1386#include <linux/inetdevice.h> 1351#include <linux/inetdevice.h>
1387#include <net/route.h> 1352#include <net/route.h>
1388 1353
1389#if 0 1354#if 0
1390#define pr_debug(format,args...) 1355#define pr_debug(format, args...)
1391/* 1356/*
1392#define pr_debug printk 1357 #define pr_debug printk
1393*/ 1358*/
1394#endif 1359#endif
1395#define DEBUG_ARP_TABLE 0 1360#define DEBUG_ARP_TABLE 0
@@ -1403,7 +1368,7 @@ static void lec_arp_expire_arp(unsigned long data);
1403 * Arp table funcs 1368 * Arp table funcs
1404 */ 1369 */
1405 1370
1406#define HASH(ch) (ch & (LEC_ARP_TABLE_SIZE -1)) 1371#define HASH(ch) (ch & (LEC_ARP_TABLE_SIZE - 1))
1407 1372
1408/* 1373/*
1409 * Initialization of arp-cache 1374 * Initialization of arp-cache
@@ -1412,9 +1377,8 @@ static void lec_arp_init(struct lec_priv *priv)
1412{ 1377{
1413 unsigned short i; 1378 unsigned short i;
1414 1379
1415 for (i = 0; i < LEC_ARP_TABLE_SIZE; i++) { 1380 for (i = 0; i < LEC_ARP_TABLE_SIZE; i++)
1416 INIT_HLIST_HEAD(&priv->lec_arp_tables[i]); 1381 INIT_HLIST_HEAD(&priv->lec_arp_tables[i]);
1417 }
1418 INIT_HLIST_HEAD(&priv->lec_arp_empty_ones); 1382 INIT_HLIST_HEAD(&priv->lec_arp_empty_ones);
1419 INIT_HLIST_HEAD(&priv->lec_no_forward); 1383 INIT_HLIST_HEAD(&priv->lec_no_forward);
1420 INIT_HLIST_HEAD(&priv->mcast_fwds); 1384 INIT_HLIST_HEAD(&priv->mcast_fwds);
@@ -1458,10 +1422,7 @@ lec_arp_add(struct lec_priv *priv, struct lec_arp_table *entry)
1458 tmp = &priv->lec_arp_tables[HASH(entry->mac_addr[ETH_ALEN - 1])]; 1422 tmp = &priv->lec_arp_tables[HASH(entry->mac_addr[ETH_ALEN - 1])];
1459 hlist_add_head(&entry->next, tmp); 1423 hlist_add_head(&entry->next, tmp);
1460 1424
1461 pr_debug("LEC_ARP: Added entry:%2.2x %2.2x %2.2x %2.2x %2.2x %2.2x\n", 1425 pr_debug("Added entry:%pM\n", entry->mac_addr);
1462 0xff & entry->mac_addr[0], 0xff & entry->mac_addr[1],
1463 0xff & entry->mac_addr[2], 0xff & entry->mac_addr[3],
1464 0xff & entry->mac_addr[4], 0xff & entry->mac_addr[5]);
1465} 1426}
1466 1427
1467/* 1428/*
@@ -1474,20 +1435,23 @@ lec_arp_remove(struct lec_priv *priv, struct lec_arp_table *to_remove)
1474 struct lec_arp_table *entry; 1435 struct lec_arp_table *entry;
1475 int i, remove_vcc = 1; 1436 int i, remove_vcc = 1;
1476 1437
1477 if (!to_remove) { 1438 if (!to_remove)
1478 return -1; 1439 return -1;
1479 }
1480 1440
1481 hlist_del(&to_remove->next); 1441 hlist_del(&to_remove->next);
1482 del_timer(&to_remove->timer); 1442 del_timer(&to_remove->timer);
1483 1443
1484 /* If this is the only MAC connected to this VCC, also tear down the VCC */ 1444 /*
1445 * If this is the only MAC connected to this VCC,
1446 * also tear down the VCC
1447 */
1485 if (to_remove->status >= ESI_FLUSH_PENDING) { 1448 if (to_remove->status >= ESI_FLUSH_PENDING) {
1486 /* 1449 /*
1487 * ESI_FLUSH_PENDING, ESI_FORWARD_DIRECT 1450 * ESI_FLUSH_PENDING, ESI_FORWARD_DIRECT
1488 */ 1451 */
1489 for (i = 0; i < LEC_ARP_TABLE_SIZE; i++) { 1452 for (i = 0; i < LEC_ARP_TABLE_SIZE; i++) {
1490 hlist_for_each_entry(entry, node, &priv->lec_arp_tables[i], next) { 1453 hlist_for_each_entry(entry, node,
1454 &priv->lec_arp_tables[i], next) {
1491 if (memcmp(to_remove->atm_addr, 1455 if (memcmp(to_remove->atm_addr,
1492 entry->atm_addr, ATM_ESA_LEN) == 0) { 1456 entry->atm_addr, ATM_ESA_LEN) == 0) {
1493 remove_vcc = 0; 1457 remove_vcc = 0;
@@ -1500,10 +1464,7 @@ lec_arp_remove(struct lec_priv *priv, struct lec_arp_table *to_remove)
1500 } 1464 }
1501 skb_queue_purge(&to_remove->tx_wait); /* FIXME: good place for this? */ 1465 skb_queue_purge(&to_remove->tx_wait); /* FIXME: good place for this? */
1502 1466
1503 pr_debug("LEC_ARP: Removed entry:%2.2x %2.2x %2.2x %2.2x %2.2x %2.2x\n", 1467 pr_debug("Removed entry:%pM\n", to_remove->mac_addr);
1504 0xff & to_remove->mac_addr[0], 0xff & to_remove->mac_addr[1],
1505 0xff & to_remove->mac_addr[2], 0xff & to_remove->mac_addr[3],
1506 0xff & to_remove->mac_addr[4], 0xff & to_remove->mac_addr[5]);
1507 return 0; 1468 return 0;
1508} 1469}
1509 1470
@@ -1521,9 +1482,8 @@ static const char *get_status_string(unsigned char st)
1521 return "ESI_FLUSH_PENDING"; 1482 return "ESI_FLUSH_PENDING";
1522 case ESI_FORWARD_DIRECT: 1483 case ESI_FORWARD_DIRECT:
1523 return "ESI_FORWARD_DIRECT"; 1484 return "ESI_FORWARD_DIRECT";
1524 default:
1525 return "<UNKNOWN>";
1526 } 1485 }
1486 return "<UNKNOWN>";
1527} 1487}
1528 1488
1529static void dump_arp_table(struct lec_priv *priv) 1489static void dump_arp_table(struct lec_priv *priv)
@@ -1533,18 +1493,15 @@ static void dump_arp_table(struct lec_priv *priv)
1533 char buf[256]; 1493 char buf[256];
1534 int i, j, offset; 1494 int i, j, offset;
1535 1495
1536 printk("Dump %p:\n", priv); 1496 pr_info("Dump %p:\n", priv);
1537 for (i = 0; i < LEC_ARP_TABLE_SIZE; i++) { 1497 for (i = 0; i < LEC_ARP_TABLE_SIZE; i++) {
1538 hlist_for_each_entry(rulla, node, &priv->lec_arp_tables[i], next) { 1498 hlist_for_each_entry(rulla, node,
1499 &priv->lec_arp_tables[i], next) {
1539 offset = 0; 1500 offset = 0;
1540 offset += sprintf(buf, "%d: %p\n", i, rulla); 1501 offset += sprintf(buf, "%d: %p\n", i, rulla);
1541 offset += sprintf(buf + offset, "Mac:"); 1502 offset += sprintf(buf + offset, "Mac: %pM",
1542 for (j = 0; j < ETH_ALEN; j++) { 1503 rulla->mac_addr);
1543 offset += sprintf(buf + offset, 1504 offset += sprintf(buf + offset, " Atm:");
1544 "%2.2x ",
1545 rulla->mac_addr[j] & 0xff);
1546 }
1547 offset += sprintf(buf + offset, "Atm:");
1548 for (j = 0; j < ATM_ESA_LEN; j++) { 1505 for (j = 0; j < ATM_ESA_LEN; j++) {
1549 offset += sprintf(buf + offset, 1506 offset += sprintf(buf + offset,
1550 "%2.2x ", 1507 "%2.2x ",
@@ -1564,20 +1521,16 @@ static void dump_arp_table(struct lec_priv *priv)
1564 "Flags:%x, Packets_flooded:%x, Status: %s ", 1521 "Flags:%x, Packets_flooded:%x, Status: %s ",
1565 rulla->flags, rulla->packets_flooded, 1522 rulla->flags, rulla->packets_flooded,
1566 get_status_string(rulla->status)); 1523 get_status_string(rulla->status));
1567 printk("%s\n", buf); 1524 pr_info("%s\n", buf);
1568 } 1525 }
1569 } 1526 }
1570 1527
1571 if (!hlist_empty(&priv->lec_no_forward)) 1528 if (!hlist_empty(&priv->lec_no_forward))
1572 printk("No forward\n"); 1529 pr_info("No forward\n");
1573 hlist_for_each_entry(rulla, node, &priv->lec_no_forward, next) { 1530 hlist_for_each_entry(rulla, node, &priv->lec_no_forward, next) {
1574 offset = 0; 1531 offset = 0;
1575 offset += sprintf(buf + offset, "Mac:"); 1532 offset += sprintf(buf + offset, "Mac: %pM", rulla->mac_addr);
1576 for (j = 0; j < ETH_ALEN; j++) { 1533 offset += sprintf(buf + offset, " Atm:");
1577 offset += sprintf(buf + offset, "%2.2x ",
1578 rulla->mac_addr[j] & 0xff);
1579 }
1580 offset += sprintf(buf + offset, "Atm:");
1581 for (j = 0; j < ATM_ESA_LEN; j++) { 1534 for (j = 0; j < ATM_ESA_LEN; j++) {
1582 offset += sprintf(buf + offset, "%2.2x ", 1535 offset += sprintf(buf + offset, "%2.2x ",
1583 rulla->atm_addr[j] & 0xff); 1536 rulla->atm_addr[j] & 0xff);
@@ -1594,19 +1547,15 @@ static void dump_arp_table(struct lec_priv *priv)
1594 "Flags:%x, Packets_flooded:%x, Status: %s ", 1547 "Flags:%x, Packets_flooded:%x, Status: %s ",
1595 rulla->flags, rulla->packets_flooded, 1548 rulla->flags, rulla->packets_flooded,
1596 get_status_string(rulla->status)); 1549 get_status_string(rulla->status));
1597 printk("%s\n", buf); 1550 pr_info("%s\n", buf);
1598 } 1551 }
1599 1552
1600 if (!hlist_empty(&priv->lec_arp_empty_ones)) 1553 if (!hlist_empty(&priv->lec_arp_empty_ones))
1601 printk("Empty ones\n"); 1554 pr_info("Empty ones\n");
1602 hlist_for_each_entry(rulla, node, &priv->lec_arp_empty_ones, next) { 1555 hlist_for_each_entry(rulla, node, &priv->lec_arp_empty_ones, next) {
1603 offset = 0; 1556 offset = 0;
1604 offset += sprintf(buf + offset, "Mac:"); 1557 offset += sprintf(buf + offset, "Mac: %pM", rulla->mac_addr);
1605 for (j = 0; j < ETH_ALEN; j++) { 1558 offset += sprintf(buf + offset, " Atm:");
1606 offset += sprintf(buf + offset, "%2.2x ",
1607 rulla->mac_addr[j] & 0xff);
1608 }
1609 offset += sprintf(buf + offset, "Atm:");
1610 for (j = 0; j < ATM_ESA_LEN; j++) { 1559 for (j = 0; j < ATM_ESA_LEN; j++) {
1611 offset += sprintf(buf + offset, "%2.2x ", 1560 offset += sprintf(buf + offset, "%2.2x ",
1612 rulla->atm_addr[j] & 0xff); 1561 rulla->atm_addr[j] & 0xff);
@@ -1623,19 +1572,15 @@ static void dump_arp_table(struct lec_priv *priv)
1623 "Flags:%x, Packets_flooded:%x, Status: %s ", 1572 "Flags:%x, Packets_flooded:%x, Status: %s ",
1624 rulla->flags, rulla->packets_flooded, 1573 rulla->flags, rulla->packets_flooded,
1625 get_status_string(rulla->status)); 1574 get_status_string(rulla->status));
1626 printk("%s", buf); 1575 pr_info("%s", buf);
1627 } 1576 }
1628 1577
1629 if (!hlist_empty(&priv->mcast_fwds)) 1578 if (!hlist_empty(&priv->mcast_fwds))
1630 printk("Multicast Forward VCCs\n"); 1579 pr_info("Multicast Forward VCCs\n");
1631 hlist_for_each_entry(rulla, node, &priv->mcast_fwds, next) { 1580 hlist_for_each_entry(rulla, node, &priv->mcast_fwds, next) {
1632 offset = 0; 1581 offset = 0;
1633 offset += sprintf(buf + offset, "Mac:"); 1582 offset += sprintf(buf + offset, "Mac: %pM", rulla->mac_addr);
1634 for (j = 0; j < ETH_ALEN; j++) { 1583 offset += sprintf(buf + offset, " Atm:");
1635 offset += sprintf(buf + offset, "%2.2x ",
1636 rulla->mac_addr[j] & 0xff);
1637 }
1638 offset += sprintf(buf + offset, "Atm:");
1639 for (j = 0; j < ATM_ESA_LEN; j++) { 1584 for (j = 0; j < ATM_ESA_LEN; j++) {
1640 offset += sprintf(buf + offset, "%2.2x ", 1585 offset += sprintf(buf + offset, "%2.2x ",
1641 rulla->atm_addr[j] & 0xff); 1586 rulla->atm_addr[j] & 0xff);
@@ -1652,7 +1597,7 @@ static void dump_arp_table(struct lec_priv *priv)
1652 "Flags:%x, Packets_flooded:%x, Status: %s ", 1597 "Flags:%x, Packets_flooded:%x, Status: %s ",
1653 rulla->flags, rulla->packets_flooded, 1598 rulla->flags, rulla->packets_flooded,
1654 get_status_string(rulla->status)); 1599 get_status_string(rulla->status));
1655 printk("%s\n", buf); 1600 pr_info("%s\n", buf);
1656 } 1601 }
1657 1602
1658} 1603}
@@ -1678,14 +1623,16 @@ static void lec_arp_destroy(struct lec_priv *priv)
1678 1623
1679 spin_lock_irqsave(&priv->lec_arp_lock, flags); 1624 spin_lock_irqsave(&priv->lec_arp_lock, flags);
1680 for (i = 0; i < LEC_ARP_TABLE_SIZE; i++) { 1625 for (i = 0; i < LEC_ARP_TABLE_SIZE; i++) {
1681 hlist_for_each_entry_safe(entry, node, next, &priv->lec_arp_tables[i], next) { 1626 hlist_for_each_entry_safe(entry, node, next,
1627 &priv->lec_arp_tables[i], next) {
1682 lec_arp_remove(priv, entry); 1628 lec_arp_remove(priv, entry);
1683 lec_arp_put(entry); 1629 lec_arp_put(entry);
1684 } 1630 }
1685 INIT_HLIST_HEAD(&priv->lec_arp_tables[i]); 1631 INIT_HLIST_HEAD(&priv->lec_arp_tables[i]);
1686 } 1632 }
1687 1633
1688 hlist_for_each_entry_safe(entry, node, next, &priv->lec_arp_empty_ones, next) { 1634 hlist_for_each_entry_safe(entry, node, next,
1635 &priv->lec_arp_empty_ones, next) {
1689 del_timer_sync(&entry->timer); 1636 del_timer_sync(&entry->timer);
1690 lec_arp_clear_vccs(entry); 1637 lec_arp_clear_vccs(entry);
1691 hlist_del(&entry->next); 1638 hlist_del(&entry->next);
@@ -1693,7 +1640,8 @@ static void lec_arp_destroy(struct lec_priv *priv)
1693 } 1640 }
1694 INIT_HLIST_HEAD(&priv->lec_arp_empty_ones); 1641 INIT_HLIST_HEAD(&priv->lec_arp_empty_ones);
1695 1642
1696 hlist_for_each_entry_safe(entry, node, next, &priv->lec_no_forward, next) { 1643 hlist_for_each_entry_safe(entry, node, next,
1644 &priv->lec_no_forward, next) {
1697 del_timer_sync(&entry->timer); 1645 del_timer_sync(&entry->timer);
1698 lec_arp_clear_vccs(entry); 1646 lec_arp_clear_vccs(entry);
1699 hlist_del(&entry->next); 1647 hlist_del(&entry->next);
@@ -1722,15 +1670,12 @@ static struct lec_arp_table *lec_arp_find(struct lec_priv *priv,
1722 struct hlist_head *head; 1670 struct hlist_head *head;
1723 struct lec_arp_table *entry; 1671 struct lec_arp_table *entry;
1724 1672
1725 pr_debug("LEC_ARP: lec_arp_find :%2.2x %2.2x %2.2x %2.2x %2.2x %2.2x\n", 1673 pr_debug("%pM\n", mac_addr);
1726 mac_addr[0] & 0xff, mac_addr[1] & 0xff, mac_addr[2] & 0xff,
1727 mac_addr[3] & 0xff, mac_addr[4] & 0xff, mac_addr[5] & 0xff);
1728 1674
1729 head = &priv->lec_arp_tables[HASH(mac_addr[ETH_ALEN - 1])]; 1675 head = &priv->lec_arp_tables[HASH(mac_addr[ETH_ALEN - 1])];
1730 hlist_for_each_entry(entry, node, head, next) { 1676 hlist_for_each_entry(entry, node, head, next) {
1731 if (!compare_ether_addr(mac_addr, entry->mac_addr)) { 1677 if (!compare_ether_addr(mac_addr, entry->mac_addr))
1732 return entry; 1678 return entry;
1733 }
1734 } 1679 }
1735 return NULL; 1680 return NULL;
1736} 1681}
@@ -1742,7 +1687,7 @@ static struct lec_arp_table *make_entry(struct lec_priv *priv,
1742 1687
1743 to_return = kzalloc(sizeof(struct lec_arp_table), GFP_ATOMIC); 1688 to_return = kzalloc(sizeof(struct lec_arp_table), GFP_ATOMIC);
1744 if (!to_return) { 1689 if (!to_return) {
1745 printk("LEC: Arp entry kmalloc failed\n"); 1690 pr_info("LEC: Arp entry kmalloc failed\n");
1746 return NULL; 1691 return NULL;
1747 } 1692 }
1748 memcpy(to_return->mac_addr, mac_addr, ETH_ALEN); 1693 memcpy(to_return->mac_addr, mac_addr, ETH_ALEN);
@@ -1763,7 +1708,7 @@ static void lec_arp_expire_arp(unsigned long data)
1763 1708
1764 entry = (struct lec_arp_table *)data; 1709 entry = (struct lec_arp_table *)data;
1765 1710
1766 pr_debug("lec_arp_expire_arp\n"); 1711 pr_debug("\n");
1767 if (entry->status == ESI_ARP_PENDING) { 1712 if (entry->status == ESI_ARP_PENDING) {
1768 if (entry->no_tries <= entry->priv->max_retry_count) { 1713 if (entry->no_tries <= entry->priv->max_retry_count) {
1769 if (entry->is_rdesc) 1714 if (entry->is_rdesc)
@@ -1787,10 +1732,10 @@ static void lec_arp_expire_vcc(unsigned long data)
1787 1732
1788 del_timer(&to_remove->timer); 1733 del_timer(&to_remove->timer);
1789 1734
1790 pr_debug("LEC_ARP %p %p: lec_arp_expire_vcc vpi:%d vci:%d\n", 1735 pr_debug("%p %p: vpi:%d vci:%d\n",
1791 to_remove, priv, 1736 to_remove, priv,
1792 to_remove->vcc ? to_remove->recv_vcc->vpi : 0, 1737 to_remove->vcc ? to_remove->recv_vcc->vpi : 0,
1793 to_remove->vcc ? to_remove->recv_vcc->vci : 0); 1738 to_remove->vcc ? to_remove->recv_vcc->vci : 0);
1794 1739
1795 spin_lock_irqsave(&priv->lec_arp_lock, flags); 1740 spin_lock_irqsave(&priv->lec_arp_lock, flags);
1796 hlist_del(&to_remove->next); 1741 hlist_del(&to_remove->next);
@@ -1800,6 +1745,50 @@ static void lec_arp_expire_vcc(unsigned long data)
1800 lec_arp_put(to_remove); 1745 lec_arp_put(to_remove);
1801} 1746}
1802 1747
1748static bool __lec_arp_check_expire(struct lec_arp_table *entry,
1749 unsigned long now,
1750 struct lec_priv *priv)
1751{
1752 unsigned long time_to_check;
1753
1754 if ((entry->flags) & LEC_REMOTE_FLAG && priv->topology_change)
1755 time_to_check = priv->forward_delay_time;
1756 else
1757 time_to_check = priv->aging_time;
1758
1759 pr_debug("About to expire: %lx - %lx > %lx\n",
1760 now, entry->last_used, time_to_check);
1761 if (time_after(now, entry->last_used + time_to_check) &&
1762 !(entry->flags & LEC_PERMANENT_FLAG) &&
1763 !(entry->mac_addr[0] & 0x01)) { /* LANE2: 7.1.20 */
1764 /* Remove entry */
1765 pr_debug("Entry timed out\n");
1766 lec_arp_remove(priv, entry);
1767 lec_arp_put(entry);
1768 } else {
1769 /* Something else */
1770 if ((entry->status == ESI_VC_PENDING ||
1771 entry->status == ESI_ARP_PENDING) &&
1772 time_after_eq(now, entry->timestamp +
1773 priv->max_unknown_frame_time)) {
1774 entry->timestamp = jiffies;
1775 entry->packets_flooded = 0;
1776 if (entry->status == ESI_VC_PENDING)
1777 send_to_lecd(priv, l_svc_setup,
1778 entry->mac_addr,
1779 entry->atm_addr,
1780 NULL);
1781 }
1782 if (entry->status == ESI_FLUSH_PENDING &&
1783 time_after_eq(now, entry->timestamp +
1784 priv->path_switching_delay)) {
1785 lec_arp_hold(entry);
1786 return true;
1787 }
1788 }
1789
1790 return false;
1791}
1803/* 1792/*
1804 * Expire entries. 1793 * Expire entries.
1805 * 1. Re-set timer 1794 * 1. Re-set timer
@@ -1824,62 +1813,28 @@ static void lec_arp_check_expire(struct work_struct *work)
1824 struct hlist_node *node, *next; 1813 struct hlist_node *node, *next;
1825 struct lec_arp_table *entry; 1814 struct lec_arp_table *entry;
1826 unsigned long now; 1815 unsigned long now;
1827 unsigned long time_to_check;
1828 int i; 1816 int i;
1829 1817
1830 pr_debug("lec_arp_check_expire %p\n", priv); 1818 pr_debug("%p\n", priv);
1831 now = jiffies; 1819 now = jiffies;
1832restart: 1820restart:
1833 spin_lock_irqsave(&priv->lec_arp_lock, flags); 1821 spin_lock_irqsave(&priv->lec_arp_lock, flags);
1834 for (i = 0; i < LEC_ARP_TABLE_SIZE; i++) { 1822 for (i = 0; i < LEC_ARP_TABLE_SIZE; i++) {
1835 hlist_for_each_entry_safe(entry, node, next, &priv->lec_arp_tables[i], next) { 1823 hlist_for_each_entry_safe(entry, node, next,
1836 if ((entry->flags) & LEC_REMOTE_FLAG && 1824 &priv->lec_arp_tables[i], next) {
1837 priv->topology_change) 1825 if (__lec_arp_check_expire(entry, now, priv)) {
1838 time_to_check = priv->forward_delay_time; 1826 struct sk_buff *skb;
1839 else 1827 struct atm_vcc *vcc = entry->vcc;
1840 time_to_check = priv->aging_time; 1828
1841 1829 spin_unlock_irqrestore(&priv->lec_arp_lock,
1842 pr_debug("About to expire: %lx - %lx > %lx\n", 1830 flags);
1843 now, entry->last_used, time_to_check); 1831 while ((skb = skb_dequeue(&entry->tx_wait)))
1844 if (time_after(now, entry->last_used + time_to_check) 1832 lec_send(vcc, skb);
1845 && !(entry->flags & LEC_PERMANENT_FLAG) 1833 entry->last_used = jiffies;
1846 && !(entry->mac_addr[0] & 0x01)) { /* LANE2: 7.1.20 */ 1834 entry->status = ESI_FORWARD_DIRECT;
1847 /* Remove entry */
1848 pr_debug("LEC:Entry timed out\n");
1849 lec_arp_remove(priv, entry);
1850 lec_arp_put(entry); 1835 lec_arp_put(entry);
1851 } else { 1836
1852 /* Something else */ 1837 goto restart;
1853 if ((entry->status == ESI_VC_PENDING ||
1854 entry->status == ESI_ARP_PENDING)
1855 && time_after_eq(now,
1856 entry->timestamp +
1857 priv->
1858 max_unknown_frame_time)) {
1859 entry->timestamp = jiffies;
1860 entry->packets_flooded = 0;
1861 if (entry->status == ESI_VC_PENDING)
1862 send_to_lecd(priv, l_svc_setup,
1863 entry->mac_addr,
1864 entry->atm_addr,
1865 NULL);
1866 }
1867 if (entry->status == ESI_FLUSH_PENDING
1868 &&
1869 time_after_eq(now, entry->timestamp +
1870 priv->path_switching_delay)) {
1871 struct sk_buff *skb;
1872 struct atm_vcc *vcc = entry->vcc;
1873
1874 lec_arp_hold(entry);
1875 spin_unlock_irqrestore(&priv->lec_arp_lock, flags);
1876 while ((skb = skb_dequeue(&entry->tx_wait)) != NULL)
1877 lec_send(vcc, skb);
1878 entry->last_used = jiffies;
1879 entry->status = ESI_FORWARD_DIRECT;
1880 lec_arp_put(entry);
1881 goto restart;
1882 }
1883 } 1838 }
1884 } 1839 }
1885 } 1840 }
@@ -1893,7 +1848,8 @@ restart:
1893 * 1848 *
1894 */ 1849 */
1895static struct atm_vcc *lec_arp_resolve(struct lec_priv *priv, 1850static struct atm_vcc *lec_arp_resolve(struct lec_priv *priv,
1896 const unsigned char *mac_to_find, int is_rdesc, 1851 const unsigned char *mac_to_find,
1852 int is_rdesc,
1897 struct lec_arp_table **ret_entry) 1853 struct lec_arp_table **ret_entry)
1898{ 1854{
1899 unsigned long flags; 1855 unsigned long flags;
@@ -1929,9 +1885,8 @@ static struct atm_vcc *lec_arp_resolve(struct lec_priv *priv,
1929 * If the LE_ARP cache entry is still pending, reset count to 0 1885 * If the LE_ARP cache entry is still pending, reset count to 0
1930 * so another LE_ARP request can be made for this frame. 1886 * so another LE_ARP request can be made for this frame.
1931 */ 1887 */
1932 if (entry->status == ESI_ARP_PENDING) { 1888 if (entry->status == ESI_ARP_PENDING)
1933 entry->no_tries = 0; 1889 entry->no_tries = 0;
1934 }
1935 /* 1890 /*
1936 * Data direct VC not yet set up, check to see if the unknown 1891 * Data direct VC not yet set up, check to see if the unknown
1937 * frame count is greater than the limit. If the limit has 1892 * frame count is greater than the limit. If the limit has
@@ -1942,7 +1897,7 @@ static struct atm_vcc *lec_arp_resolve(struct lec_priv *priv,
1942 entry->packets_flooded < 1897 entry->packets_flooded <
1943 priv->maximum_unknown_frame_count) { 1898 priv->maximum_unknown_frame_count) {
1944 entry->packets_flooded++; 1899 entry->packets_flooded++;
1945 pr_debug("LEC_ARP: Flooding..\n"); 1900 pr_debug("Flooding..\n");
1946 found = priv->mcast_vcc; 1901 found = priv->mcast_vcc;
1947 goto out; 1902 goto out;
1948 } 1903 }
@@ -1953,13 +1908,13 @@ static struct atm_vcc *lec_arp_resolve(struct lec_priv *priv,
1953 */ 1908 */
1954 lec_arp_hold(entry); 1909 lec_arp_hold(entry);
1955 *ret_entry = entry; 1910 *ret_entry = entry;
1956 pr_debug("lec: entry->status %d entry->vcc %p\n", entry->status, 1911 pr_debug("entry->status %d entry->vcc %p\n", entry->status,
1957 entry->vcc); 1912 entry->vcc);
1958 found = NULL; 1913 found = NULL;
1959 } else { 1914 } else {
1960 /* No matching entry was found */ 1915 /* No matching entry was found */
1961 entry = make_entry(priv, mac_to_find); 1916 entry = make_entry(priv, mac_to_find);
1962 pr_debug("LEC_ARP: Making entry\n"); 1917 pr_debug("Making entry\n");
1963 if (!entry) { 1918 if (!entry) {
1964 found = priv->mcast_vcc; 1919 found = priv->mcast_vcc;
1965 goto out; 1920 goto out;
@@ -1996,13 +1951,14 @@ lec_addr_delete(struct lec_priv *priv, const unsigned char *atm_addr,
1996 struct lec_arp_table *entry; 1951 struct lec_arp_table *entry;
1997 int i; 1952 int i;
1998 1953
1999 pr_debug("lec_addr_delete\n"); 1954 pr_debug("\n");
2000 spin_lock_irqsave(&priv->lec_arp_lock, flags); 1955 spin_lock_irqsave(&priv->lec_arp_lock, flags);
2001 for (i = 0; i < LEC_ARP_TABLE_SIZE; i++) { 1956 for (i = 0; i < LEC_ARP_TABLE_SIZE; i++) {
2002 hlist_for_each_entry_safe(entry, node, next, &priv->lec_arp_tables[i], next) { 1957 hlist_for_each_entry_safe(entry, node, next,
2003 if (!memcmp(atm_addr, entry->atm_addr, ATM_ESA_LEN) 1958 &priv->lec_arp_tables[i], next) {
2004 && (permanent || 1959 if (!memcmp(atm_addr, entry->atm_addr, ATM_ESA_LEN) &&
2005 !(entry->flags & LEC_PERMANENT_FLAG))) { 1960 (permanent ||
1961 !(entry->flags & LEC_PERMANENT_FLAG))) {
2006 lec_arp_remove(priv, entry); 1962 lec_arp_remove(priv, entry);
2007 lec_arp_put(entry); 1963 lec_arp_put(entry);
2008 } 1964 }
@@ -2027,10 +1983,8 @@ lec_arp_update(struct lec_priv *priv, const unsigned char *mac_addr,
2027 struct lec_arp_table *entry, *tmp; 1983 struct lec_arp_table *entry, *tmp;
2028 int i; 1984 int i;
2029 1985
2030 pr_debug("lec:%s", (targetless_le_arp) ? "targetless " : " "); 1986 pr_debug("%smac:%pM\n",
2031 pr_debug("lec_arp_update mac:%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x\n", 1987 (targetless_le_arp) ? "targetless " : "", mac_addr);
2032 mac_addr[0], mac_addr[1], mac_addr[2], mac_addr[3],
2033 mac_addr[4], mac_addr[5]);
2034 1988
2035 spin_lock_irqsave(&priv->lec_arp_lock, flags); 1989 spin_lock_irqsave(&priv->lec_arp_lock, flags);
2036 entry = lec_arp_find(priv, mac_addr); 1990 entry = lec_arp_find(priv, mac_addr);
@@ -2040,7 +1994,8 @@ lec_arp_update(struct lec_priv *priv, const unsigned char *mac_addr,
2040 * we have no entry in the cache. 7.1.30 1994 * we have no entry in the cache. 7.1.30
2041 */ 1995 */
2042 if (!hlist_empty(&priv->lec_arp_empty_ones)) { 1996 if (!hlist_empty(&priv->lec_arp_empty_ones)) {
2043 hlist_for_each_entry_safe(entry, node, next, &priv->lec_arp_empty_ones, next) { 1997 hlist_for_each_entry_safe(entry, node, next,
1998 &priv->lec_arp_empty_ones, next) {
2044 if (memcmp(entry->atm_addr, atm_addr, ATM_ESA_LEN) == 0) { 1999 if (memcmp(entry->atm_addr, atm_addr, ATM_ESA_LEN) == 0) {
2045 hlist_del(&entry->next); 2000 hlist_del(&entry->next);
2046 del_timer(&entry->timer); 2001 del_timer(&entry->timer);
@@ -2084,7 +2039,8 @@ lec_arp_update(struct lec_priv *priv, const unsigned char *mac_addr,
2084 memcpy(entry->atm_addr, atm_addr, ATM_ESA_LEN); 2039 memcpy(entry->atm_addr, atm_addr, ATM_ESA_LEN);
2085 del_timer(&entry->timer); 2040 del_timer(&entry->timer);
2086 for (i = 0; i < LEC_ARP_TABLE_SIZE; i++) { 2041 for (i = 0; i < LEC_ARP_TABLE_SIZE; i++) {
2087 hlist_for_each_entry(tmp, node, &priv->lec_arp_tables[i], next) { 2042 hlist_for_each_entry(tmp, node,
2043 &priv->lec_arp_tables[i], next) {
2088 if (entry != tmp && 2044 if (entry != tmp &&
2089 !memcmp(tmp->atm_addr, atm_addr, ATM_ESA_LEN)) { 2045 !memcmp(tmp->atm_addr, atm_addr, ATM_ESA_LEN)) {
2090 /* Vcc to this host exists */ 2046 /* Vcc to this host exists */
@@ -2129,14 +2085,13 @@ lec_vcc_added(struct lec_priv *priv, const struct atmlec_ioc *ioc_data,
2129 int i, found_entry = 0; 2085 int i, found_entry = 0;
2130 2086
2131 spin_lock_irqsave(&priv->lec_arp_lock, flags); 2087 spin_lock_irqsave(&priv->lec_arp_lock, flags);
2088 /* Vcc for Multicast Forward. No timer, LANEv2 7.1.20 and 2.3.5.3 */
2132 if (ioc_data->receive == 2) { 2089 if (ioc_data->receive == 2) {
2133 /* Vcc for Multicast Forward. No timer, LANEv2 7.1.20 and 2.3.5.3 */
2134
2135 pr_debug("LEC_ARP: Attaching mcast forward\n"); 2090 pr_debug("LEC_ARP: Attaching mcast forward\n");
2136#if 0 2091#if 0
2137 entry = lec_arp_find(priv, bus_mac); 2092 entry = lec_arp_find(priv, bus_mac);
2138 if (!entry) { 2093 if (!entry) {
2139 printk("LEC_ARP: Multicast entry not found!\n"); 2094 pr_info("LEC_ARP: Multicast entry not found!\n");
2140 goto out; 2095 goto out;
2141 } 2096 }
2142 memcpy(entry->atm_addr, ioc_data->atm_addr, ATM_ESA_LEN); 2097 memcpy(entry->atm_addr, ioc_data->atm_addr, ATM_ESA_LEN);
@@ -2157,19 +2112,17 @@ lec_vcc_added(struct lec_priv *priv, const struct atmlec_ioc *ioc_data,
2157 * Vcc which we don't want to make default vcc, 2112 * Vcc which we don't want to make default vcc,
2158 * attach it anyway. 2113 * attach it anyway.
2159 */ 2114 */
2160 pr_debug 2115 pr_debug("LEC_ARP:Attaching data direct, not default: %2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x\n",
2161 ("LEC_ARP:Attaching data direct, not default: " 2116 ioc_data->atm_addr[0], ioc_data->atm_addr[1],
2162 "%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x\n", 2117 ioc_data->atm_addr[2], ioc_data->atm_addr[3],
2163 ioc_data->atm_addr[0], ioc_data->atm_addr[1], 2118 ioc_data->atm_addr[4], ioc_data->atm_addr[5],
2164 ioc_data->atm_addr[2], ioc_data->atm_addr[3], 2119 ioc_data->atm_addr[6], ioc_data->atm_addr[7],
2165 ioc_data->atm_addr[4], ioc_data->atm_addr[5], 2120 ioc_data->atm_addr[8], ioc_data->atm_addr[9],
2166 ioc_data->atm_addr[6], ioc_data->atm_addr[7], 2121 ioc_data->atm_addr[10], ioc_data->atm_addr[11],
2167 ioc_data->atm_addr[8], ioc_data->atm_addr[9], 2122 ioc_data->atm_addr[12], ioc_data->atm_addr[13],
2168 ioc_data->atm_addr[10], ioc_data->atm_addr[11], 2123 ioc_data->atm_addr[14], ioc_data->atm_addr[15],
2169 ioc_data->atm_addr[12], ioc_data->atm_addr[13], 2124 ioc_data->atm_addr[16], ioc_data->atm_addr[17],
2170 ioc_data->atm_addr[14], ioc_data->atm_addr[15], 2125 ioc_data->atm_addr[18], ioc_data->atm_addr[19]);
2171 ioc_data->atm_addr[16], ioc_data->atm_addr[17],
2172 ioc_data->atm_addr[18], ioc_data->atm_addr[19]);
2173 entry = make_entry(priv, bus_mac); 2126 entry = make_entry(priv, bus_mac);
2174 if (entry == NULL) 2127 if (entry == NULL)
2175 goto out; 2128 goto out;
@@ -2185,29 +2138,28 @@ lec_vcc_added(struct lec_priv *priv, const struct atmlec_ioc *ioc_data,
2185 dump_arp_table(priv); 2138 dump_arp_table(priv);
2186 goto out; 2139 goto out;
2187 } 2140 }
2188 pr_debug 2141 pr_debug("LEC_ARP:Attaching data direct, default: %2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x\n",
2189 ("LEC_ARP:Attaching data direct, default: " 2142 ioc_data->atm_addr[0], ioc_data->atm_addr[1],
2190 "%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x\n", 2143 ioc_data->atm_addr[2], ioc_data->atm_addr[3],
2191 ioc_data->atm_addr[0], ioc_data->atm_addr[1], 2144 ioc_data->atm_addr[4], ioc_data->atm_addr[5],
2192 ioc_data->atm_addr[2], ioc_data->atm_addr[3], 2145 ioc_data->atm_addr[6], ioc_data->atm_addr[7],
2193 ioc_data->atm_addr[4], ioc_data->atm_addr[5], 2146 ioc_data->atm_addr[8], ioc_data->atm_addr[9],
2194 ioc_data->atm_addr[6], ioc_data->atm_addr[7], 2147 ioc_data->atm_addr[10], ioc_data->atm_addr[11],
2195 ioc_data->atm_addr[8], ioc_data->atm_addr[9], 2148 ioc_data->atm_addr[12], ioc_data->atm_addr[13],
2196 ioc_data->atm_addr[10], ioc_data->atm_addr[11], 2149 ioc_data->atm_addr[14], ioc_data->atm_addr[15],
2197 ioc_data->atm_addr[12], ioc_data->atm_addr[13], 2150 ioc_data->atm_addr[16], ioc_data->atm_addr[17],
2198 ioc_data->atm_addr[14], ioc_data->atm_addr[15], 2151 ioc_data->atm_addr[18], ioc_data->atm_addr[19]);
2199 ioc_data->atm_addr[16], ioc_data->atm_addr[17],
2200 ioc_data->atm_addr[18], ioc_data->atm_addr[19]);
2201 for (i = 0; i < LEC_ARP_TABLE_SIZE; i++) { 2152 for (i = 0; i < LEC_ARP_TABLE_SIZE; i++) {
2202 hlist_for_each_entry(entry, node, &priv->lec_arp_tables[i], next) { 2153 hlist_for_each_entry(entry, node,
2154 &priv->lec_arp_tables[i], next) {
2203 if (memcmp 2155 if (memcmp
2204 (ioc_data->atm_addr, entry->atm_addr, 2156 (ioc_data->atm_addr, entry->atm_addr,
2205 ATM_ESA_LEN) == 0) { 2157 ATM_ESA_LEN) == 0) {
2206 pr_debug("LEC_ARP: Attaching data direct\n"); 2158 pr_debug("LEC_ARP: Attaching data direct\n");
2207 pr_debug("Currently -> Vcc: %d, Rvcc:%d\n", 2159 pr_debug("Currently -> Vcc: %d, Rvcc:%d\n",
2208 entry->vcc ? entry->vcc->vci : 0, 2160 entry->vcc ? entry->vcc->vci : 0,
2209 entry->recv_vcc ? entry->recv_vcc-> 2161 entry->recv_vcc ? entry->recv_vcc->
2210 vci : 0); 2162 vci : 0);
2211 found_entry = 1; 2163 found_entry = 1;
2212 del_timer(&entry->timer); 2164 del_timer(&entry->timer);
2213 entry->vcc = vcc; 2165 entry->vcc = vcc;
@@ -2279,19 +2231,21 @@ static void lec_flush_complete(struct lec_priv *priv, unsigned long tran_id)
2279 struct lec_arp_table *entry; 2231 struct lec_arp_table *entry;
2280 int i; 2232 int i;
2281 2233
2282 pr_debug("LEC:lec_flush_complete %lx\n", tran_id); 2234 pr_debug("%lx\n", tran_id);
2283restart: 2235restart:
2284 spin_lock_irqsave(&priv->lec_arp_lock, flags); 2236 spin_lock_irqsave(&priv->lec_arp_lock, flags);
2285 for (i = 0; i < LEC_ARP_TABLE_SIZE; i++) { 2237 for (i = 0; i < LEC_ARP_TABLE_SIZE; i++) {
2286 hlist_for_each_entry(entry, node, &priv->lec_arp_tables[i], next) { 2238 hlist_for_each_entry(entry, node,
2287 if (entry->flush_tran_id == tran_id 2239 &priv->lec_arp_tables[i], next) {
2288 && entry->status == ESI_FLUSH_PENDING) { 2240 if (entry->flush_tran_id == tran_id &&
2241 entry->status == ESI_FLUSH_PENDING) {
2289 struct sk_buff *skb; 2242 struct sk_buff *skb;
2290 struct atm_vcc *vcc = entry->vcc; 2243 struct atm_vcc *vcc = entry->vcc;
2291 2244
2292 lec_arp_hold(entry); 2245 lec_arp_hold(entry);
2293 spin_unlock_irqrestore(&priv->lec_arp_lock, flags); 2246 spin_unlock_irqrestore(&priv->lec_arp_lock,
2294 while ((skb = skb_dequeue(&entry->tx_wait)) != NULL) 2247 flags);
2248 while ((skb = skb_dequeue(&entry->tx_wait)))
2295 lec_send(vcc, skb); 2249 lec_send(vcc, skb);
2296 entry->last_used = jiffies; 2250 entry->last_used = jiffies;
2297 entry->status = ESI_FORWARD_DIRECT; 2251 entry->status = ESI_FORWARD_DIRECT;
@@ -2316,11 +2270,12 @@ lec_set_flush_tran_id(struct lec_priv *priv,
2316 2270
2317 spin_lock_irqsave(&priv->lec_arp_lock, flags); 2271 spin_lock_irqsave(&priv->lec_arp_lock, flags);
2318 for (i = 0; i < LEC_ARP_TABLE_SIZE; i++) 2272 for (i = 0; i < LEC_ARP_TABLE_SIZE; i++)
2319 hlist_for_each_entry(entry, node, &priv->lec_arp_tables[i], next) { 2273 hlist_for_each_entry(entry, node,
2274 &priv->lec_arp_tables[i], next) {
2320 if (!memcmp(atm_addr, entry->atm_addr, ATM_ESA_LEN)) { 2275 if (!memcmp(atm_addr, entry->atm_addr, ATM_ESA_LEN)) {
2321 entry->flush_tran_id = tran_id; 2276 entry->flush_tran_id = tran_id;
2322 pr_debug("Set flush transaction id to %lx for %p\n", 2277 pr_debug("Set flush transaction id to %lx for %p\n",
2323 tran_id, entry); 2278 tran_id, entry);
2324 } 2279 }
2325 } 2280 }
2326 spin_unlock_irqrestore(&priv->lec_arp_lock, flags); 2281 spin_unlock_irqrestore(&priv->lec_arp_lock, flags);
@@ -2336,7 +2291,8 @@ static int lec_mcast_make(struct lec_priv *priv, struct atm_vcc *vcc)
2336 struct lec_vcc_priv *vpriv; 2291 struct lec_vcc_priv *vpriv;
2337 int err = 0; 2292 int err = 0;
2338 2293
2339 if (!(vpriv = kmalloc(sizeof(struct lec_vcc_priv), GFP_KERNEL))) 2294 vpriv = kmalloc(sizeof(struct lec_vcc_priv), GFP_KERNEL);
2295 if (!vpriv)
2340 return -ENOMEM; 2296 return -ENOMEM;
2341 vpriv->xoff = 0; 2297 vpriv->xoff = 0;
2342 vpriv->old_pop = vcc->pop; 2298 vpriv->old_pop = vcc->pop;
@@ -2376,18 +2332,19 @@ static void lec_vcc_close(struct lec_priv *priv, struct atm_vcc *vcc)
2376 spin_lock_irqsave(&priv->lec_arp_lock, flags); 2332 spin_lock_irqsave(&priv->lec_arp_lock, flags);
2377 2333
2378 for (i = 0; i < LEC_ARP_TABLE_SIZE; i++) { 2334 for (i = 0; i < LEC_ARP_TABLE_SIZE; i++) {
2379 hlist_for_each_entry_safe(entry, node, next, &priv->lec_arp_tables[i], next) { 2335 hlist_for_each_entry_safe(entry, node, next,
2336 &priv->lec_arp_tables[i], next) {
2380 if (vcc == entry->vcc) { 2337 if (vcc == entry->vcc) {
2381 lec_arp_remove(priv, entry); 2338 lec_arp_remove(priv, entry);
2382 lec_arp_put(entry); 2339 lec_arp_put(entry);
2383 if (priv->mcast_vcc == vcc) { 2340 if (priv->mcast_vcc == vcc)
2384 priv->mcast_vcc = NULL; 2341 priv->mcast_vcc = NULL;
2385 }
2386 } 2342 }
2387 } 2343 }
2388 } 2344 }
2389 2345
2390 hlist_for_each_entry_safe(entry, node, next, &priv->lec_arp_empty_ones, next) { 2346 hlist_for_each_entry_safe(entry, node, next,
2347 &priv->lec_arp_empty_ones, next) {
2391 if (entry->vcc == vcc) { 2348 if (entry->vcc == vcc) {
2392 lec_arp_clear_vccs(entry); 2349 lec_arp_clear_vccs(entry);
2393 del_timer(&entry->timer); 2350 del_timer(&entry->timer);
@@ -2396,7 +2353,8 @@ static void lec_vcc_close(struct lec_priv *priv, struct atm_vcc *vcc)
2396 } 2353 }
2397 } 2354 }
2398 2355
2399 hlist_for_each_entry_safe(entry, node, next, &priv->lec_no_forward, next) { 2356 hlist_for_each_entry_safe(entry, node, next,
2357 &priv->lec_no_forward, next) {
2400 if (entry->recv_vcc == vcc) { 2358 if (entry->recv_vcc == vcc) {
2401 lec_arp_clear_vccs(entry); 2359 lec_arp_clear_vccs(entry);
2402 del_timer(&entry->timer); 2360 del_timer(&entry->timer);
@@ -2437,14 +2395,16 @@ lec_arp_check_empties(struct lec_priv *priv,
2437 src = hdr->h_source; 2395 src = hdr->h_source;
2438 2396
2439 spin_lock_irqsave(&priv->lec_arp_lock, flags); 2397 spin_lock_irqsave(&priv->lec_arp_lock, flags);
2440 hlist_for_each_entry_safe(entry, node, next, &priv->lec_arp_empty_ones, next) { 2398 hlist_for_each_entry_safe(entry, node, next,
2399 &priv->lec_arp_empty_ones, next) {
2441 if (vcc == entry->vcc) { 2400 if (vcc == entry->vcc) {
2442 del_timer(&entry->timer); 2401 del_timer(&entry->timer);
2443 memcpy(entry->mac_addr, src, ETH_ALEN); 2402 memcpy(entry->mac_addr, src, ETH_ALEN);
2444 entry->status = ESI_FORWARD_DIRECT; 2403 entry->status = ESI_FORWARD_DIRECT;
2445 entry->last_used = jiffies; 2404 entry->last_used = jiffies;
2446 /* We might have got an entry */ 2405 /* We might have got an entry */
2447 if ((tmp = lec_arp_find(priv, src))) { 2406 tmp = lec_arp_find(priv, src);
2407 if (tmp) {
2448 lec_arp_remove(priv, tmp); 2408 lec_arp_remove(priv, tmp);
2449 lec_arp_put(tmp); 2409 lec_arp_put(tmp);
2450 } 2410 }
diff --git a/net/atm/mpc.c b/net/atm/mpc.c
index 38a6cb0863f0..436f2e177657 100644
--- a/net/atm/mpc.c
+++ b/net/atm/mpc.c
@@ -1,5 +1,8 @@
1#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
2
1#include <linux/kernel.h> 3#include <linux/kernel.h>
2#include <linux/string.h> 4#include <linux/string.h>
5#include <linux/slab.h>
3#include <linux/timer.h> 6#include <linux/timer.h>
4#include <linux/init.h> 7#include <linux/init.h>
5#include <linux/bitops.h> 8#include <linux/bitops.h>
@@ -13,8 +16,8 @@
13#include <net/sock.h> 16#include <net/sock.h>
14#include <linux/skbuff.h> 17#include <linux/skbuff.h>
15#include <linux/ip.h> 18#include <linux/ip.h>
19#include <linux/uaccess.h>
16#include <asm/byteorder.h> 20#include <asm/byteorder.h>
17#include <asm/uaccess.h>
18#include <net/checksum.h> /* for ip_fast_csum() */ 21#include <net/checksum.h> /* for ip_fast_csum() */
19#include <net/arp.h> 22#include <net/arp.h>
20#include <net/dst.h> 23#include <net/dst.h>
@@ -36,31 +39,47 @@
36 */ 39 */
37 40
38#if 0 41#if 0
39#define dprintk printk /* debug */ 42#define dprintk(format, args...) \
43 printk(KERN_DEBUG "mpoa:%s: " format, __func__, ##args)
44#define dprintk_cont(format, args...) printk(KERN_CONT format, ##args)
40#else 45#else
41#define dprintk(format,args...) 46#define dprintk(format, args...) \
47 do { if (0) \
48 printk(KERN_DEBUG "mpoa:%s: " format, __func__, ##args);\
49 } while (0)
50#define dprintk_cont(format, args...) \
51 do { if (0) printk(KERN_CONT format, ##args); } while (0)
42#endif 52#endif
43 53
44#if 0 54#if 0
45#define ddprintk printk /* more debug */ 55#define ddprintk(format, args...) \
56 printk(KERN_DEBUG "mpoa:%s: " format, __func__, ##args)
57#define ddprintk_cont(format, args...) printk(KERN_CONT format, ##args)
46#else 58#else
47#define ddprintk(format,args...) 59#define ddprintk(format, args...) \
60 do { if (0) \
61 printk(KERN_DEBUG "mpoa:%s: " format, __func__, ##args);\
62 } while (0)
63#define ddprintk_cont(format, args...) \
64 do { if (0) printk(KERN_CONT format, ##args); } while (0)
48#endif 65#endif
49 66
50
51
52#define MPOA_TAG_LEN 4 67#define MPOA_TAG_LEN 4
53 68
54/* mpc_daemon -> kernel */ 69/* mpc_daemon -> kernel */
55static void MPOA_trigger_rcvd (struct k_message *msg, struct mpoa_client *mpc); 70static void MPOA_trigger_rcvd(struct k_message *msg, struct mpoa_client *mpc);
56static void MPOA_res_reply_rcvd(struct k_message *msg, struct mpoa_client *mpc); 71static void MPOA_res_reply_rcvd(struct k_message *msg, struct mpoa_client *mpc);
57static void ingress_purge_rcvd(struct k_message *msg, struct mpoa_client *mpc); 72static void ingress_purge_rcvd(struct k_message *msg, struct mpoa_client *mpc);
58static void egress_purge_rcvd(struct k_message *msg, struct mpoa_client *mpc); 73static void egress_purge_rcvd(struct k_message *msg, struct mpoa_client *mpc);
59static void mps_death(struct k_message *msg, struct mpoa_client *mpc); 74static void mps_death(struct k_message *msg, struct mpoa_client *mpc);
60static void clean_up(struct k_message *msg, struct mpoa_client *mpc, int action); 75static void clean_up(struct k_message *msg, struct mpoa_client *mpc,
61static void MPOA_cache_impos_rcvd(struct k_message *msg, struct mpoa_client *mpc); 76 int action);
62static void set_mpc_ctrl_addr_rcvd(struct k_message *mesg, struct mpoa_client *mpc); 77static void MPOA_cache_impos_rcvd(struct k_message *msg,
63static void set_mps_mac_addr_rcvd(struct k_message *mesg, struct mpoa_client *mpc); 78 struct mpoa_client *mpc);
79static void set_mpc_ctrl_addr_rcvd(struct k_message *mesg,
80 struct mpoa_client *mpc);
81static void set_mps_mac_addr_rcvd(struct k_message *mesg,
82 struct mpoa_client *mpc);
64 83
65static const uint8_t *copy_macs(struct mpoa_client *mpc, 84static const uint8_t *copy_macs(struct mpoa_client *mpc,
66 const uint8_t *router_mac, 85 const uint8_t *router_mac,
@@ -74,10 +93,11 @@ static int msg_from_mpoad(struct atm_vcc *vcc, struct sk_buff *skb);
74 93
75static void mpc_push(struct atm_vcc *vcc, struct sk_buff *skb); 94static void mpc_push(struct atm_vcc *vcc, struct sk_buff *skb);
76static netdev_tx_t mpc_send_packet(struct sk_buff *skb, 95static netdev_tx_t mpc_send_packet(struct sk_buff *skb,
77 struct net_device *dev); 96 struct net_device *dev);
78static int mpoa_event_listener(struct notifier_block *mpoa_notifier, unsigned long event, void *dev); 97static int mpoa_event_listener(struct notifier_block *mpoa_notifier,
98 unsigned long event, void *dev);
79static void mpc_timer_refresh(void); 99static void mpc_timer_refresh(void);
80static void mpc_cache_check( unsigned long checking_time ); 100static void mpc_cache_check(unsigned long checking_time);
81 101
82static struct llc_snap_hdr llc_snap_mpoa_ctrl = { 102static struct llc_snap_hdr llc_snap_mpoa_ctrl = {
83 0xaa, 0xaa, 0x03, 103 0xaa, 0xaa, 0x03,
@@ -167,7 +187,7 @@ struct atm_mpoa_qos *atm_mpoa_add_qos(__be32 dst_ip, struct atm_qos *qos)
167 187
168 entry = kmalloc(sizeof(struct atm_mpoa_qos), GFP_KERNEL); 188 entry = kmalloc(sizeof(struct atm_mpoa_qos), GFP_KERNEL);
169 if (entry == NULL) { 189 if (entry == NULL) {
170 printk("mpoa: atm_mpoa_add_qos: out of memory\n"); 190 pr_info("mpoa: out of memory\n");
171 return entry; 191 return entry;
172 } 192 }
173 193
@@ -185,10 +205,9 @@ struct atm_mpoa_qos *atm_mpoa_search_qos(__be32 dst_ip)
185 struct atm_mpoa_qos *qos; 205 struct atm_mpoa_qos *qos;
186 206
187 qos = qos_head; 207 qos = qos_head;
188 while( qos != NULL ){ 208 while (qos) {
189 if(qos->ipaddr == dst_ip) { 209 if (qos->ipaddr == dst_ip)
190 break; 210 break;
191 }
192 qos = qos->next; 211 qos = qos->next;
193 } 212 }
194 213
@@ -200,10 +219,10 @@ struct atm_mpoa_qos *atm_mpoa_search_qos(__be32 dst_ip)
200 */ 219 */
201int atm_mpoa_delete_qos(struct atm_mpoa_qos *entry) 220int atm_mpoa_delete_qos(struct atm_mpoa_qos *entry)
202{ 221{
203
204 struct atm_mpoa_qos *curr; 222 struct atm_mpoa_qos *curr;
205 223
206 if (entry == NULL) return 0; 224 if (entry == NULL)
225 return 0;
207 if (entry == qos_head) { 226 if (entry == qos_head) {
208 qos_head = qos_head->next; 227 qos_head = qos_head->next;
209 kfree(entry); 228 kfree(entry);
@@ -234,9 +253,17 @@ void atm_mpoa_disp_qos(struct seq_file *m)
234 253
235 while (qos != NULL) { 254 while (qos != NULL) {
236 seq_printf(m, "%pI4\n %-7d %-7d %-7d %-7d %-7d\n %-7d %-7d %-7d %-7d %-7d\n", 255 seq_printf(m, "%pI4\n %-7d %-7d %-7d %-7d %-7d\n %-7d %-7d %-7d %-7d %-7d\n",
237 &qos->ipaddr, 256 &qos->ipaddr,
238 qos->qos.txtp.max_pcr, qos->qos.txtp.pcr, qos->qos.txtp.min_pcr, qos->qos.txtp.max_cdv, qos->qos.txtp.max_sdu, 257 qos->qos.txtp.max_pcr,
239 qos->qos.rxtp.max_pcr, qos->qos.rxtp.pcr, qos->qos.rxtp.min_pcr, qos->qos.rxtp.max_cdv, qos->qos.rxtp.max_sdu); 258 qos->qos.txtp.pcr,
259 qos->qos.txtp.min_pcr,
260 qos->qos.txtp.max_cdv,
261 qos->qos.txtp.max_sdu,
262 qos->qos.rxtp.max_pcr,
263 qos->qos.rxtp.pcr,
264 qos->qos.rxtp.min_pcr,
265 qos->qos.rxtp.max_cdv,
266 qos->qos.rxtp.max_sdu);
240 qos = qos->next; 267 qos = qos->next;
241 } 268 }
242} 269}
@@ -256,7 +283,7 @@ static struct mpoa_client *alloc_mpc(void)
256{ 283{
257 struct mpoa_client *mpc; 284 struct mpoa_client *mpc;
258 285
259 mpc = kzalloc(sizeof (struct mpoa_client), GFP_KERNEL); 286 mpc = kzalloc(sizeof(struct mpoa_client), GFP_KERNEL);
260 if (mpc == NULL) 287 if (mpc == NULL)
261 return NULL; 288 return NULL;
262 rwlock_init(&mpc->ingress_lock); 289 rwlock_init(&mpc->ingress_lock);
@@ -266,7 +293,7 @@ static struct mpoa_client *alloc_mpc(void)
266 293
267 mpc->parameters.mpc_p1 = MPC_P1; 294 mpc->parameters.mpc_p1 = MPC_P1;
268 mpc->parameters.mpc_p2 = MPC_P2; 295 mpc->parameters.mpc_p2 = MPC_P2;
269 memset(mpc->parameters.mpc_p3,0,sizeof(mpc->parameters.mpc_p3)); 296 memset(mpc->parameters.mpc_p3, 0, sizeof(mpc->parameters.mpc_p3));
270 mpc->parameters.mpc_p4 = MPC_P4; 297 mpc->parameters.mpc_p4 = MPC_P4;
271 mpc->parameters.mpc_p5 = MPC_P5; 298 mpc->parameters.mpc_p5 = MPC_P5;
272 mpc->parameters.mpc_p6 = MPC_P6; 299 mpc->parameters.mpc_p6 = MPC_P6;
@@ -286,9 +313,9 @@ static struct mpoa_client *alloc_mpc(void)
286static void start_mpc(struct mpoa_client *mpc, struct net_device *dev) 313static void start_mpc(struct mpoa_client *mpc, struct net_device *dev)
287{ 314{
288 315
289 dprintk("mpoa: (%s) start_mpc:\n", mpc->dev->name); 316 dprintk("(%s)\n", mpc->dev->name);
290 if (!dev->netdev_ops) 317 if (!dev->netdev_ops)
291 printk("mpoa: (%s) start_mpc not starting\n", dev->name); 318 pr_info("(%s) not starting\n", dev->name);
292 else { 319 else {
293 mpc->old_ops = dev->netdev_ops; 320 mpc->old_ops = dev->netdev_ops;
294 mpc->new_ops = *mpc->old_ops; 321 mpc->new_ops = *mpc->old_ops;
@@ -300,14 +327,14 @@ static void start_mpc(struct mpoa_client *mpc, struct net_device *dev)
300static void stop_mpc(struct mpoa_client *mpc) 327static void stop_mpc(struct mpoa_client *mpc)
301{ 328{
302 struct net_device *dev = mpc->dev; 329 struct net_device *dev = mpc->dev;
303 dprintk("mpoa: (%s) stop_mpc:", mpc->dev->name); 330 dprintk("(%s)", mpc->dev->name);
304 331
305 /* Lets not nullify lec device's dev->hard_start_xmit */ 332 /* Lets not nullify lec device's dev->hard_start_xmit */
306 if (dev->netdev_ops != &mpc->new_ops) { 333 if (dev->netdev_ops != &mpc->new_ops) {
307 dprintk(" mpc already stopped, not fatal\n"); 334 dprintk_cont(" mpc already stopped, not fatal\n");
308 return; 335 return;
309 } 336 }
310 dprintk("\n"); 337 dprintk_cont("\n");
311 338
312 dev->netdev_ops = mpc->old_ops; 339 dev->netdev_ops = mpc->old_ops;
313 mpc->old_ops = NULL; 340 mpc->old_ops = NULL;
@@ -319,25 +346,18 @@ static const char *mpoa_device_type_string(char type) __attribute__ ((unused));
319 346
320static const char *mpoa_device_type_string(char type) 347static const char *mpoa_device_type_string(char type)
321{ 348{
322 switch(type) { 349 switch (type) {
323 case NON_MPOA: 350 case NON_MPOA:
324 return "non-MPOA device"; 351 return "non-MPOA device";
325 break;
326 case MPS: 352 case MPS:
327 return "MPS"; 353 return "MPS";
328 break;
329 case MPC: 354 case MPC:
330 return "MPC"; 355 return "MPC";
331 break;
332 case MPS_AND_MPC: 356 case MPS_AND_MPC:
333 return "both MPS and MPC"; 357 return "both MPS and MPC";
334 break;
335 default:
336 return "unspecified (non-MPOA) device";
337 break;
338 } 358 }
339 359
340 return ""; /* not reached */ 360 return "unspecified (non-MPOA) device";
341} 361}
342 362
343/* 363/*
@@ -362,26 +382,28 @@ static void lane2_assoc_ind(struct net_device *dev, const u8 *mac_addr,
362 struct mpoa_client *mpc; 382 struct mpoa_client *mpc;
363 383
364 mpoa_device_type = number_of_mps_macs = 0; /* silence gcc */ 384 mpoa_device_type = number_of_mps_macs = 0; /* silence gcc */
365 dprintk("mpoa: (%s) lane2_assoc_ind: received TLV(s), ", dev->name); 385 dprintk("(%s) received TLV(s), ", dev->name);
366 dprintk("total length of all TLVs %d\n", sizeoftlvs); 386 dprintk("total length of all TLVs %d\n", sizeoftlvs);
367 mpc = find_mpc_by_lec(dev); /* Sampo-Fix: moved here from below */ 387 mpc = find_mpc_by_lec(dev); /* Sampo-Fix: moved here from below */
368 if (mpc == NULL) { 388 if (mpc == NULL) {
369 printk("mpoa: (%s) lane2_assoc_ind: no mpc\n", dev->name); 389 pr_info("(%s) no mpc\n", dev->name);
370 return; 390 return;
371 } 391 }
372 end_of_tlvs = tlvs + sizeoftlvs; 392 end_of_tlvs = tlvs + sizeoftlvs;
373 while (end_of_tlvs - tlvs >= 5) { 393 while (end_of_tlvs - tlvs >= 5) {
374 type = (tlvs[0] << 24) | (tlvs[1] << 16) | (tlvs[2] << 8) | tlvs[3]; 394 type = ((tlvs[0] << 24) | (tlvs[1] << 16) |
395 (tlvs[2] << 8) | tlvs[3]);
375 length = tlvs[4]; 396 length = tlvs[4];
376 tlvs += 5; 397 tlvs += 5;
377 dprintk(" type 0x%x length %02x\n", type, length); 398 dprintk(" type 0x%x length %02x\n", type, length);
378 if (tlvs + length > end_of_tlvs) { 399 if (tlvs + length > end_of_tlvs) {
379 printk("TLV value extends past its buffer, aborting parse\n"); 400 pr_info("TLV value extends past its buffer, aborting parse\n");
380 return; 401 return;
381 } 402 }
382 403
383 if (type == 0) { 404 if (type == 0) {
384 printk("mpoa: (%s) lane2_assoc_ind: TLV type was 0, returning\n", dev->name); 405 pr_info("mpoa: (%s) TLV type was 0, returning\n",
406 dev->name);
385 return; 407 return;
386 } 408 }
387 409
@@ -391,39 +413,48 @@ static void lane2_assoc_ind(struct net_device *dev, const u8 *mac_addr,
391 } 413 }
392 mpoa_device_type = *tlvs++; 414 mpoa_device_type = *tlvs++;
393 number_of_mps_macs = *tlvs++; 415 number_of_mps_macs = *tlvs++;
394 dprintk("mpoa: (%s) MPOA device type '%s', ", dev->name, mpoa_device_type_string(mpoa_device_type)); 416 dprintk("(%s) MPOA device type '%s', ",
417 dev->name, mpoa_device_type_string(mpoa_device_type));
395 if (mpoa_device_type == MPS_AND_MPC && 418 if (mpoa_device_type == MPS_AND_MPC &&
396 length < (42 + number_of_mps_macs*ETH_ALEN)) { /* :) */ 419 length < (42 + number_of_mps_macs*ETH_ALEN)) { /* :) */
397 printk("\nmpoa: (%s) lane2_assoc_ind: short MPOA Device Type TLV\n", 420 pr_info("(%s) short MPOA Device Type TLV\n",
398 dev->name); 421 dev->name);
399 continue; 422 continue;
400 } 423 }
401 if ((mpoa_device_type == MPS || mpoa_device_type == MPC) 424 if ((mpoa_device_type == MPS || mpoa_device_type == MPC) &&
402 && length < 22 + number_of_mps_macs*ETH_ALEN) { 425 length < 22 + number_of_mps_macs*ETH_ALEN) {
403 printk("\nmpoa: (%s) lane2_assoc_ind: short MPOA Device Type TLV\n", 426 pr_info("(%s) short MPOA Device Type TLV\n", dev->name);
404 dev->name);
405 continue; 427 continue;
406 } 428 }
407 if (mpoa_device_type != MPS && mpoa_device_type != MPS_AND_MPC) { 429 if (mpoa_device_type != MPS &&
408 dprintk("ignoring non-MPS device\n"); 430 mpoa_device_type != MPS_AND_MPC) {
409 if (mpoa_device_type == MPC) tlvs += 20; 431 dprintk("ignoring non-MPS device ");
432 if (mpoa_device_type == MPC)
433 tlvs += 20;
410 continue; /* we are only interested in MPSs */ 434 continue; /* we are only interested in MPSs */
411 } 435 }
412 if (number_of_mps_macs == 0 && mpoa_device_type == MPS_AND_MPC) { 436 if (number_of_mps_macs == 0 &&
413 printk("\nmpoa: (%s) lane2_assoc_ind: MPS_AND_MPC has zero MACs\n", dev->name); 437 mpoa_device_type == MPS_AND_MPC) {
438 pr_info("(%s) MPS_AND_MPC has zero MACs\n", dev->name);
414 continue; /* someone should read the spec */ 439 continue; /* someone should read the spec */
415 } 440 }
416 dprintk("this MPS has %d MAC addresses\n", number_of_mps_macs); 441 dprintk_cont("this MPS has %d MAC addresses\n",
442 number_of_mps_macs);
417 443
418 /* ok, now we can go and tell our daemon the control address of MPS */ 444 /*
445 * ok, now we can go and tell our daemon
446 * the control address of MPS
447 */
419 send_set_mps_ctrl_addr(tlvs, mpc); 448 send_set_mps_ctrl_addr(tlvs, mpc);
420 449
421 tlvs = copy_macs(mpc, mac_addr, tlvs, number_of_mps_macs, mpoa_device_type); 450 tlvs = copy_macs(mpc, mac_addr, tlvs,
422 if (tlvs == NULL) return; 451 number_of_mps_macs, mpoa_device_type);
452 if (tlvs == NULL)
453 return;
423 } 454 }
424 if (end_of_tlvs - tlvs != 0) 455 if (end_of_tlvs - tlvs != 0)
425 printk("mpoa: (%s) lane2_assoc_ind: ignoring %Zd bytes of trailing TLV carbage\n", 456 pr_info("(%s) ignoring %Zd bytes of trailing TLV garbage\n",
426 dev->name, end_of_tlvs - tlvs); 457 dev->name, end_of_tlvs - tlvs);
427 return; 458 return;
428} 459}
429 460
@@ -441,11 +472,12 @@ static const uint8_t *copy_macs(struct mpoa_client *mpc,
441 num_macs = (mps_macs > 1) ? mps_macs : 1; 472 num_macs = (mps_macs > 1) ? mps_macs : 1;
442 473
443 if (mpc->number_of_mps_macs != num_macs) { /* need to reallocate? */ 474 if (mpc->number_of_mps_macs != num_macs) { /* need to reallocate? */
444 if (mpc->number_of_mps_macs != 0) kfree(mpc->mps_macs); 475 if (mpc->number_of_mps_macs != 0)
476 kfree(mpc->mps_macs);
445 mpc->number_of_mps_macs = 0; 477 mpc->number_of_mps_macs = 0;
446 mpc->mps_macs = kmalloc(num_macs*ETH_ALEN, GFP_KERNEL); 478 mpc->mps_macs = kmalloc(num_macs * ETH_ALEN, GFP_KERNEL);
447 if (mpc->mps_macs == NULL) { 479 if (mpc->mps_macs == NULL) {
448 printk("mpoa: (%s) copy_macs: out of mem\n", mpc->dev->name); 480 pr_info("(%s) out of mem\n", mpc->dev->name);
449 return NULL; 481 return NULL;
450 } 482 }
451 } 483 }
@@ -478,24 +510,30 @@ static int send_via_shortcut(struct sk_buff *skb, struct mpoa_client *mpc)
478 iph = (struct iphdr *)buff; 510 iph = (struct iphdr *)buff;
479 ipaddr = iph->daddr; 511 ipaddr = iph->daddr;
480 512
481 ddprintk("mpoa: (%s) send_via_shortcut: ipaddr 0x%x\n", mpc->dev->name, ipaddr); 513 ddprintk("(%s) ipaddr 0x%x\n",
514 mpc->dev->name, ipaddr);
482 515
483 entry = mpc->in_ops->get(ipaddr, mpc); 516 entry = mpc->in_ops->get(ipaddr, mpc);
484 if (entry == NULL) { 517 if (entry == NULL) {
485 entry = mpc->in_ops->add_entry(ipaddr, mpc); 518 entry = mpc->in_ops->add_entry(ipaddr, mpc);
486 if (entry != NULL) mpc->in_ops->put(entry); 519 if (entry != NULL)
520 mpc->in_ops->put(entry);
487 return 1; 521 return 1;
488 } 522 }
489 if (mpc->in_ops->cache_hit(entry, mpc) != OPEN){ /* threshold not exceeded or VCC not ready */ 523 /* threshold not exceeded or VCC not ready */
490 ddprintk("mpoa: (%s) send_via_shortcut: cache_hit: returns != OPEN\n", mpc->dev->name); 524 if (mpc->in_ops->cache_hit(entry, mpc) != OPEN) {
525 ddprintk("(%s) cache_hit: returns != OPEN\n",
526 mpc->dev->name);
491 mpc->in_ops->put(entry); 527 mpc->in_ops->put(entry);
492 return 1; 528 return 1;
493 } 529 }
494 530
495 ddprintk("mpoa: (%s) send_via_shortcut: using shortcut\n", mpc->dev->name); 531 ddprintk("(%s) using shortcut\n",
532 mpc->dev->name);
496 /* MPOA spec A.1.4, MPOA client must decrement IP ttl at least by one */ 533 /* MPOA spec A.1.4, MPOA client must decrement IP ttl at least by one */
497 if (iph->ttl <= 1) { 534 if (iph->ttl <= 1) {
498 ddprintk("mpoa: (%s) send_via_shortcut: IP ttl = %u, using LANE\n", mpc->dev->name, iph->ttl); 535 ddprintk("(%s) IP ttl = %u, using LANE\n",
536 mpc->dev->name, iph->ttl);
499 mpc->in_ops->put(entry); 537 mpc->in_ops->put(entry);
500 return 1; 538 return 1;
501 } 539 }
@@ -504,15 +542,18 @@ static int send_via_shortcut(struct sk_buff *skb, struct mpoa_client *mpc)
504 iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl); 542 iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl);
505 543
506 if (entry->ctrl_info.tag != 0) { 544 if (entry->ctrl_info.tag != 0) {
507 ddprintk("mpoa: (%s) send_via_shortcut: adding tag 0x%x\n", mpc->dev->name, entry->ctrl_info.tag); 545 ddprintk("(%s) adding tag 0x%x\n",
546 mpc->dev->name, entry->ctrl_info.tag);
508 tagged_llc_snap_hdr.tag = entry->ctrl_info.tag; 547 tagged_llc_snap_hdr.tag = entry->ctrl_info.tag;
509 skb_pull(skb, ETH_HLEN); /* get rid of Eth header */ 548 skb_pull(skb, ETH_HLEN); /* get rid of Eth header */
510 skb_push(skb, sizeof(tagged_llc_snap_hdr)); /* add LLC/SNAP header */ 549 skb_push(skb, sizeof(tagged_llc_snap_hdr));
550 /* add LLC/SNAP header */
511 skb_copy_to_linear_data(skb, &tagged_llc_snap_hdr, 551 skb_copy_to_linear_data(skb, &tagged_llc_snap_hdr,
512 sizeof(tagged_llc_snap_hdr)); 552 sizeof(tagged_llc_snap_hdr));
513 } else { 553 } else {
514 skb_pull(skb, ETH_HLEN); /* get rid of Eth header */ 554 skb_pull(skb, ETH_HLEN); /* get rid of Eth header */
515 skb_push(skb, sizeof(struct llc_snap_hdr)); /* add LLC/SNAP header + tag */ 555 skb_push(skb, sizeof(struct llc_snap_hdr));
556 /* add LLC/SNAP header + tag */
516 skb_copy_to_linear_data(skb, &llc_snap_mpoa_data, 557 skb_copy_to_linear_data(skb, &llc_snap_mpoa_data,
517 sizeof(struct llc_snap_hdr)); 558 sizeof(struct llc_snap_hdr));
518 } 559 }
@@ -537,8 +578,8 @@ static netdev_tx_t mpc_send_packet(struct sk_buff *skb,
537 int i = 0; 578 int i = 0;
538 579
539 mpc = find_mpc_by_lec(dev); /* this should NEVER fail */ 580 mpc = find_mpc_by_lec(dev); /* this should NEVER fail */
540 if(mpc == NULL) { 581 if (mpc == NULL) {
541 printk("mpoa: (%s) mpc_send_packet: no MPC found\n", dev->name); 582 pr_info("(%s) no MPC found\n", dev->name);
542 goto non_ip; 583 goto non_ip;
543 } 584 }
544 585
@@ -554,14 +595,15 @@ static netdev_tx_t mpc_send_packet(struct sk_buff *skb,
554 goto non_ip; 595 goto non_ip;
555 596
556 while (i < mpc->number_of_mps_macs) { 597 while (i < mpc->number_of_mps_macs) {
557 if (!compare_ether_addr(eth->h_dest, (mpc->mps_macs + i*ETH_ALEN))) 598 if (!compare_ether_addr(eth->h_dest,
558 if ( send_via_shortcut(skb, mpc) == 0 ) /* try shortcut */ 599 (mpc->mps_macs + i*ETH_ALEN)))
559 return NETDEV_TX_OK; /* success! */ 600 if (send_via_shortcut(skb, mpc) == 0) /* try shortcut */
601 return NETDEV_TX_OK;
560 i++; 602 i++;
561 } 603 }
562 604
563 non_ip: 605non_ip:
564 return mpc->old_ops->ndo_start_xmit(skb,dev); 606 return mpc->old_ops->ndo_start_xmit(skb, dev);
565} 607}
566 608
567static int atm_mpoa_vcc_attach(struct atm_vcc *vcc, void __user *arg) 609static int atm_mpoa_vcc_attach(struct atm_vcc *vcc, void __user *arg)
@@ -574,7 +616,8 @@ static int atm_mpoa_vcc_attach(struct atm_vcc *vcc, void __user *arg)
574 616
575 bytes_left = copy_from_user(&ioc_data, arg, sizeof(struct atmmpc_ioc)); 617 bytes_left = copy_from_user(&ioc_data, arg, sizeof(struct atmmpc_ioc));
576 if (bytes_left != 0) { 618 if (bytes_left != 0) {
577 printk("mpoa: mpc_vcc_attach: Short read (missed %d bytes) from userland\n", bytes_left); 619 pr_info("mpoa:Short read (missed %d bytes) from userland\n",
620 bytes_left);
578 return -EFAULT; 621 return -EFAULT;
579 } 622 }
580 ipaddr = ioc_data.ipaddr; 623 ipaddr = ioc_data.ipaddr;
@@ -587,18 +630,20 @@ static int atm_mpoa_vcc_attach(struct atm_vcc *vcc, void __user *arg)
587 630
588 if (ioc_data.type == MPC_SOCKET_INGRESS) { 631 if (ioc_data.type == MPC_SOCKET_INGRESS) {
589 in_entry = mpc->in_ops->get(ipaddr, mpc); 632 in_entry = mpc->in_ops->get(ipaddr, mpc);
590 if (in_entry == NULL || in_entry->entry_state < INGRESS_RESOLVED) { 633 if (in_entry == NULL ||
591 printk("mpoa: (%s) mpc_vcc_attach: did not find RESOLVED entry from ingress cache\n", 634 in_entry->entry_state < INGRESS_RESOLVED) {
635 pr_info("(%s) did not find RESOLVED entry from ingress cache\n",
592 mpc->dev->name); 636 mpc->dev->name);
593 if (in_entry != NULL) mpc->in_ops->put(in_entry); 637 if (in_entry != NULL)
638 mpc->in_ops->put(in_entry);
594 return -EINVAL; 639 return -EINVAL;
595 } 640 }
596 printk("mpoa: (%s) mpc_vcc_attach: attaching ingress SVC, entry = %pI4\n", 641 pr_info("(%s) attaching ingress SVC, entry = %pI4\n",
597 mpc->dev->name, &in_entry->ctrl_info.in_dst_ip); 642 mpc->dev->name, &in_entry->ctrl_info.in_dst_ip);
598 in_entry->shortcut = vcc; 643 in_entry->shortcut = vcc;
599 mpc->in_ops->put(in_entry); 644 mpc->in_ops->put(in_entry);
600 } else { 645 } else {
601 printk("mpoa: (%s) mpc_vcc_attach: attaching egress SVC\n", mpc->dev->name); 646 pr_info("(%s) attaching egress SVC\n", mpc->dev->name);
602 } 647 }
603 648
604 vcc->proto_data = mpc->dev; 649 vcc->proto_data = mpc->dev;
@@ -618,27 +663,27 @@ static void mpc_vcc_close(struct atm_vcc *vcc, struct net_device *dev)
618 663
619 mpc = find_mpc_by_lec(dev); 664 mpc = find_mpc_by_lec(dev);
620 if (mpc == NULL) { 665 if (mpc == NULL) {
621 printk("mpoa: (%s) mpc_vcc_close: close for unknown MPC\n", dev->name); 666 pr_info("(%s) close for unknown MPC\n", dev->name);
622 return; 667 return;
623 } 668 }
624 669
625 dprintk("mpoa: (%s) mpc_vcc_close:\n", dev->name); 670 dprintk("(%s)\n", dev->name);
626 in_entry = mpc->in_ops->get_by_vcc(vcc, mpc); 671 in_entry = mpc->in_ops->get_by_vcc(vcc, mpc);
627 if (in_entry) { 672 if (in_entry) {
628 dprintk("mpoa: (%s) mpc_vcc_close: ingress SVC closed ip = %pI4\n", 673 dprintk("(%s) ingress SVC closed ip = %pI4\n",
629 mpc->dev->name, &in_entry->ctrl_info.in_dst_ip); 674 mpc->dev->name, &in_entry->ctrl_info.in_dst_ip);
630 in_entry->shortcut = NULL; 675 in_entry->shortcut = NULL;
631 mpc->in_ops->put(in_entry); 676 mpc->in_ops->put(in_entry);
632 } 677 }
633 eg_entry = mpc->eg_ops->get_by_vcc(vcc, mpc); 678 eg_entry = mpc->eg_ops->get_by_vcc(vcc, mpc);
634 if (eg_entry) { 679 if (eg_entry) {
635 dprintk("mpoa: (%s) mpc_vcc_close: egress SVC closed\n", mpc->dev->name); 680 dprintk("(%s) egress SVC closed\n", mpc->dev->name);
636 eg_entry->shortcut = NULL; 681 eg_entry->shortcut = NULL;
637 mpc->eg_ops->put(eg_entry); 682 mpc->eg_ops->put(eg_entry);
638 } 683 }
639 684
640 if (in_entry == NULL && eg_entry == NULL) 685 if (in_entry == NULL && eg_entry == NULL)
641 dprintk("mpoa: (%s) mpc_vcc_close: unused vcc closed\n", dev->name); 686 dprintk("(%s) unused vcc closed\n", dev->name);
642 687
643 return; 688 return;
644} 689}
@@ -652,18 +697,19 @@ static void mpc_push(struct atm_vcc *vcc, struct sk_buff *skb)
652 __be32 tag; 697 __be32 tag;
653 char *tmp; 698 char *tmp;
654 699
655 ddprintk("mpoa: (%s) mpc_push:\n", dev->name); 700 ddprintk("(%s)\n", dev->name);
656 if (skb == NULL) { 701 if (skb == NULL) {
657 dprintk("mpoa: (%s) mpc_push: null skb, closing VCC\n", dev->name); 702 dprintk("(%s) null skb, closing VCC\n", dev->name);
658 mpc_vcc_close(vcc, dev); 703 mpc_vcc_close(vcc, dev);
659 return; 704 return;
660 } 705 }
661 706
662 skb->dev = dev; 707 skb->dev = dev;
663 if (memcmp(skb->data, &llc_snap_mpoa_ctrl, sizeof(struct llc_snap_hdr)) == 0) { 708 if (memcmp(skb->data, &llc_snap_mpoa_ctrl,
709 sizeof(struct llc_snap_hdr)) == 0) {
664 struct sock *sk = sk_atm(vcc); 710 struct sock *sk = sk_atm(vcc);
665 711
666 dprintk("mpoa: (%s) mpc_push: control packet arrived\n", dev->name); 712 dprintk("(%s) control packet arrived\n", dev->name);
667 /* Pass control packets to daemon */ 713 /* Pass control packets to daemon */
668 skb_queue_tail(&sk->sk_receive_queue, skb); 714 skb_queue_tail(&sk->sk_receive_queue, skb);
669 sk->sk_data_ready(sk, skb->len); 715 sk->sk_data_ready(sk, skb->len);
@@ -675,20 +721,22 @@ static void mpc_push(struct atm_vcc *vcc, struct sk_buff *skb)
675 721
676 mpc = find_mpc_by_lec(dev); 722 mpc = find_mpc_by_lec(dev);
677 if (mpc == NULL) { 723 if (mpc == NULL) {
678 printk("mpoa: (%s) mpc_push: unknown MPC\n", dev->name); 724 pr_info("(%s) unknown MPC\n", dev->name);
679 return; 725 return;
680 } 726 }
681 727
682 if (memcmp(skb->data, &llc_snap_mpoa_data_tagged, sizeof(struct llc_snap_hdr)) == 0) { /* MPOA tagged data */ 728 if (memcmp(skb->data, &llc_snap_mpoa_data_tagged,
683 ddprintk("mpoa: (%s) mpc_push: tagged data packet arrived\n", dev->name); 729 sizeof(struct llc_snap_hdr)) == 0) { /* MPOA tagged data */
730 ddprintk("(%s) tagged data packet arrived\n", dev->name);
684 731
685 } else if (memcmp(skb->data, &llc_snap_mpoa_data, sizeof(struct llc_snap_hdr)) == 0) { /* MPOA data */ 732 } else if (memcmp(skb->data, &llc_snap_mpoa_data,
686 printk("mpoa: (%s) mpc_push: non-tagged data packet arrived\n", dev->name); 733 sizeof(struct llc_snap_hdr)) == 0) { /* MPOA data */
687 printk(" mpc_push: non-tagged data unsupported, purging\n"); 734 pr_info("(%s) Unsupported non-tagged data packet arrived. Purging\n",
735 dev->name);
688 dev_kfree_skb_any(skb); 736 dev_kfree_skb_any(skb);
689 return; 737 return;
690 } else { 738 } else {
691 printk("mpoa: (%s) mpc_push: garbage arrived, purging\n", dev->name); 739 pr_info("(%s) garbage arrived, purging\n", dev->name);
692 dev_kfree_skb_any(skb); 740 dev_kfree_skb_any(skb);
693 return; 741 return;
694 } 742 }
@@ -698,8 +746,8 @@ static void mpc_push(struct atm_vcc *vcc, struct sk_buff *skb)
698 746
699 eg = mpc->eg_ops->get_by_tag(tag, mpc); 747 eg = mpc->eg_ops->get_by_tag(tag, mpc);
700 if (eg == NULL) { 748 if (eg == NULL) {
701 printk("mpoa: (%s) mpc_push: Didn't find egress cache entry, tag = %u\n", 749 pr_info("mpoa: (%s) Didn't find egress cache entry, tag = %u\n",
702 dev->name,tag); 750 dev->name, tag);
703 purge_egress_shortcut(vcc, NULL); 751 purge_egress_shortcut(vcc, NULL);
704 dev_kfree_skb_any(skb); 752 dev_kfree_skb_any(skb);
705 return; 753 return;
@@ -711,13 +759,15 @@ static void mpc_push(struct atm_vcc *vcc, struct sk_buff *skb)
711 */ 759 */
712 if (eg->shortcut == NULL) { 760 if (eg->shortcut == NULL) {
713 eg->shortcut = vcc; 761 eg->shortcut = vcc;
714 printk("mpoa: (%s) mpc_push: egress SVC in use\n", dev->name); 762 pr_info("(%s) egress SVC in use\n", dev->name);
715 } 763 }
716 764
717 skb_pull(skb, sizeof(struct llc_snap_hdr) + sizeof(tag)); /* get rid of LLC/SNAP header */ 765 skb_pull(skb, sizeof(struct llc_snap_hdr) + sizeof(tag));
718 new_skb = skb_realloc_headroom(skb, eg->ctrl_info.DH_length); /* LLC/SNAP is shorter than MAC header :( */ 766 /* get rid of LLC/SNAP header */
767 new_skb = skb_realloc_headroom(skb, eg->ctrl_info.DH_length);
768 /* LLC/SNAP is shorter than MAC header :( */
719 dev_kfree_skb_any(skb); 769 dev_kfree_skb_any(skb);
720 if (new_skb == NULL){ 770 if (new_skb == NULL) {
721 mpc->eg_ops->put(eg); 771 mpc->eg_ops->put(eg);
722 return; 772 return;
723 } 773 }
@@ -750,7 +800,7 @@ static struct atm_dev mpc_dev = {
750 /* members not explicitly initialised will be 0 */ 800 /* members not explicitly initialised will be 0 */
751}; 801};
752 802
753static int atm_mpoa_mpoad_attach (struct atm_vcc *vcc, int arg) 803static int atm_mpoa_mpoad_attach(struct atm_vcc *vcc, int arg)
754{ 804{
755 struct mpoa_client *mpc; 805 struct mpoa_client *mpc;
756 struct lec_priv *priv; 806 struct lec_priv *priv;
@@ -770,15 +820,16 @@ static int atm_mpoa_mpoad_attach (struct atm_vcc *vcc, int arg)
770 820
771 mpc = find_mpc_by_itfnum(arg); 821 mpc = find_mpc_by_itfnum(arg);
772 if (mpc == NULL) { 822 if (mpc == NULL) {
773 dprintk("mpoa: mpoad_attach: allocating new mpc for itf %d\n", arg); 823 dprintk("allocating new mpc for itf %d\n", arg);
774 mpc = alloc_mpc(); 824 mpc = alloc_mpc();
775 if (mpc == NULL) 825 if (mpc == NULL)
776 return -ENOMEM; 826 return -ENOMEM;
777 mpc->dev_num = arg; 827 mpc->dev_num = arg;
778 mpc->dev = find_lec_by_itfnum(arg); /* NULL if there was no lec */ 828 mpc->dev = find_lec_by_itfnum(arg);
829 /* NULL if there was no lec */
779 } 830 }
780 if (mpc->mpoad_vcc) { 831 if (mpc->mpoad_vcc) {
781 printk("mpoa: mpoad_attach: mpoad is already present for itf %d\n", arg); 832 pr_info("mpoad is already present for itf %d\n", arg);
782 return -EADDRINUSE; 833 return -EADDRINUSE;
783 } 834 }
784 835
@@ -794,8 +845,8 @@ static int atm_mpoa_mpoad_attach (struct atm_vcc *vcc, int arg)
794 mpc->mpoad_vcc = vcc; 845 mpc->mpoad_vcc = vcc;
795 vcc->dev = &mpc_dev; 846 vcc->dev = &mpc_dev;
796 vcc_insert_socket(sk_atm(vcc)); 847 vcc_insert_socket(sk_atm(vcc));
797 set_bit(ATM_VF_META,&vcc->flags); 848 set_bit(ATM_VF_META, &vcc->flags);
798 set_bit(ATM_VF_READY,&vcc->flags); 849 set_bit(ATM_VF_READY, &vcc->flags);
799 850
800 if (mpc->dev) { 851 if (mpc->dev) {
801 char empty[ATM_ESA_LEN]; 852 char empty[ATM_ESA_LEN];
@@ -805,7 +856,7 @@ static int atm_mpoa_mpoad_attach (struct atm_vcc *vcc, int arg)
805 /* set address if mpcd e.g. gets killed and restarted. 856 /* set address if mpcd e.g. gets killed and restarted.
806 * If we do not do it now we have to wait for the next LE_ARP 857 * If we do not do it now we have to wait for the next LE_ARP
807 */ 858 */
808 if ( memcmp(mpc->mps_ctrl_addr, empty, ATM_ESA_LEN) != 0 ) 859 if (memcmp(mpc->mps_ctrl_addr, empty, ATM_ESA_LEN) != 0)
809 send_set_mps_ctrl_addr(mpc->mps_ctrl_addr, mpc); 860 send_set_mps_ctrl_addr(mpc->mps_ctrl_addr, mpc);
810 } 861 }
811 862
@@ -817,7 +868,7 @@ static void send_set_mps_ctrl_addr(const char *addr, struct mpoa_client *mpc)
817{ 868{
818 struct k_message mesg; 869 struct k_message mesg;
819 870
820 memcpy (mpc->mps_ctrl_addr, addr, ATM_ESA_LEN); 871 memcpy(mpc->mps_ctrl_addr, addr, ATM_ESA_LEN);
821 872
822 mesg.type = SET_MPS_CTRL_ADDR; 873 mesg.type = SET_MPS_CTRL_ADDR;
823 memcpy(mesg.MPS_ctrl, addr, ATM_ESA_LEN); 874 memcpy(mesg.MPS_ctrl, addr, ATM_ESA_LEN);
@@ -833,11 +884,11 @@ static void mpoad_close(struct atm_vcc *vcc)
833 884
834 mpc = find_mpc_by_vcc(vcc); 885 mpc = find_mpc_by_vcc(vcc);
835 if (mpc == NULL) { 886 if (mpc == NULL) {
836 printk("mpoa: mpoad_close: did not find MPC\n"); 887 pr_info("did not find MPC\n");
837 return; 888 return;
838 } 889 }
839 if (!mpc->mpoad_vcc) { 890 if (!mpc->mpoad_vcc) {
840 printk("mpoa: mpoad_close: close for non-present mpoad\n"); 891 pr_info("close for non-present mpoad\n");
841 return; 892 return;
842 } 893 }
843 894
@@ -857,7 +908,7 @@ static void mpoad_close(struct atm_vcc *vcc)
857 kfree_skb(skb); 908 kfree_skb(skb);
858 } 909 }
859 910
860 printk("mpoa: (%s) going down\n", 911 pr_info("(%s) going down\n",
861 (mpc->dev) ? mpc->dev->name : "<unknown>"); 912 (mpc->dev) ? mpc->dev->name : "<unknown>");
862 module_put(THIS_MODULE); 913 module_put(THIS_MODULE);
863 914
@@ -871,61 +922,61 @@ static int msg_from_mpoad(struct atm_vcc *vcc, struct sk_buff *skb)
871{ 922{
872 923
873 struct mpoa_client *mpc = find_mpc_by_vcc(vcc); 924 struct mpoa_client *mpc = find_mpc_by_vcc(vcc);
874 struct k_message *mesg = (struct k_message*)skb->data; 925 struct k_message *mesg = (struct k_message *)skb->data;
875 atomic_sub(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); 926 atomic_sub(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
876 927
877 if (mpc == NULL) { 928 if (mpc == NULL) {
878 printk("mpoa: msg_from_mpoad: no mpc found\n"); 929 pr_info("no mpc found\n");
879 return 0; 930 return 0;
880 } 931 }
881 dprintk("mpoa: (%s) msg_from_mpoad:", (mpc->dev) ? mpc->dev->name : "<unknown>"); 932 dprintk("(%s)", mpc->dev ? mpc->dev->name : "<unknown>");
882 switch(mesg->type) { 933 switch (mesg->type) {
883 case MPOA_RES_REPLY_RCVD: 934 case MPOA_RES_REPLY_RCVD:
884 dprintk(" mpoa_res_reply_rcvd\n"); 935 dprintk_cont("mpoa_res_reply_rcvd\n");
885 MPOA_res_reply_rcvd(mesg, mpc); 936 MPOA_res_reply_rcvd(mesg, mpc);
886 break; 937 break;
887 case MPOA_TRIGGER_RCVD: 938 case MPOA_TRIGGER_RCVD:
888 dprintk(" mpoa_trigger_rcvd\n"); 939 dprintk_cont("mpoa_trigger_rcvd\n");
889 MPOA_trigger_rcvd(mesg, mpc); 940 MPOA_trigger_rcvd(mesg, mpc);
890 break; 941 break;
891 case INGRESS_PURGE_RCVD: 942 case INGRESS_PURGE_RCVD:
892 dprintk(" nhrp_purge_rcvd\n"); 943 dprintk_cont("nhrp_purge_rcvd\n");
893 ingress_purge_rcvd(mesg, mpc); 944 ingress_purge_rcvd(mesg, mpc);
894 break; 945 break;
895 case EGRESS_PURGE_RCVD: 946 case EGRESS_PURGE_RCVD:
896 dprintk(" egress_purge_reply_rcvd\n"); 947 dprintk_cont("egress_purge_reply_rcvd\n");
897 egress_purge_rcvd(mesg, mpc); 948 egress_purge_rcvd(mesg, mpc);
898 break; 949 break;
899 case MPS_DEATH: 950 case MPS_DEATH:
900 dprintk(" mps_death\n"); 951 dprintk_cont("mps_death\n");
901 mps_death(mesg, mpc); 952 mps_death(mesg, mpc);
902 break; 953 break;
903 case CACHE_IMPOS_RCVD: 954 case CACHE_IMPOS_RCVD:
904 dprintk(" cache_impos_rcvd\n"); 955 dprintk_cont("cache_impos_rcvd\n");
905 MPOA_cache_impos_rcvd(mesg, mpc); 956 MPOA_cache_impos_rcvd(mesg, mpc);
906 break; 957 break;
907 case SET_MPC_CTRL_ADDR: 958 case SET_MPC_CTRL_ADDR:
908 dprintk(" set_mpc_ctrl_addr\n"); 959 dprintk_cont("set_mpc_ctrl_addr\n");
909 set_mpc_ctrl_addr_rcvd(mesg, mpc); 960 set_mpc_ctrl_addr_rcvd(mesg, mpc);
910 break; 961 break;
911 case SET_MPS_MAC_ADDR: 962 case SET_MPS_MAC_ADDR:
912 dprintk(" set_mps_mac_addr\n"); 963 dprintk_cont("set_mps_mac_addr\n");
913 set_mps_mac_addr_rcvd(mesg, mpc); 964 set_mps_mac_addr_rcvd(mesg, mpc);
914 break; 965 break;
915 case CLEAN_UP_AND_EXIT: 966 case CLEAN_UP_AND_EXIT:
916 dprintk(" clean_up_and_exit\n"); 967 dprintk_cont("clean_up_and_exit\n");
917 clean_up(mesg, mpc, DIE); 968 clean_up(mesg, mpc, DIE);
918 break; 969 break;
919 case RELOAD: 970 case RELOAD:
920 dprintk(" reload\n"); 971 dprintk_cont("reload\n");
921 clean_up(mesg, mpc, RELOAD); 972 clean_up(mesg, mpc, RELOAD);
922 break; 973 break;
923 case SET_MPC_PARAMS: 974 case SET_MPC_PARAMS:
924 dprintk(" set_mpc_params\n"); 975 dprintk_cont("set_mpc_params\n");
925 mpc->parameters = mesg->content.params; 976 mpc->parameters = mesg->content.params;
926 break; 977 break;
927 default: 978 default:
928 dprintk(" unknown message %d\n", mesg->type); 979 dprintk_cont("unknown message %d\n", mesg->type);
929 break; 980 break;
930 } 981 }
931 kfree_skb(skb); 982 kfree_skb(skb);
@@ -940,7 +991,7 @@ int msg_to_mpoad(struct k_message *mesg, struct mpoa_client *mpc)
940 struct sock *sk; 991 struct sock *sk;
941 992
942 if (mpc == NULL || !mpc->mpoad_vcc) { 993 if (mpc == NULL || !mpc->mpoad_vcc) {
943 printk("mpoa: msg_to_mpoad: mesg %d to a non-existent mpoad\n", mesg->type); 994 pr_info("mesg %d to a non-existent mpoad\n", mesg->type);
944 return -ENXIO; 995 return -ENXIO;
945 } 996 }
946 997
@@ -958,7 +1009,8 @@ int msg_to_mpoad(struct k_message *mesg, struct mpoa_client *mpc)
958 return 0; 1009 return 0;
959} 1010}
960 1011
961static int mpoa_event_listener(struct notifier_block *mpoa_notifier, unsigned long event, void *dev_ptr) 1012static int mpoa_event_listener(struct notifier_block *mpoa_notifier,
1013 unsigned long event, void *dev_ptr)
962{ 1014{
963 struct net_device *dev; 1015 struct net_device *dev;
964 struct mpoa_client *mpc; 1016 struct mpoa_client *mpc;
@@ -980,25 +1032,24 @@ static int mpoa_event_listener(struct notifier_block *mpoa_notifier, unsigned lo
980 priv->lane2_ops->associate_indicator = lane2_assoc_ind; 1032 priv->lane2_ops->associate_indicator = lane2_assoc_ind;
981 mpc = find_mpc_by_itfnum(priv->itfnum); 1033 mpc = find_mpc_by_itfnum(priv->itfnum);
982 if (mpc == NULL) { 1034 if (mpc == NULL) {
983 dprintk("mpoa: mpoa_event_listener: allocating new mpc for %s\n", 1035 dprintk("allocating new mpc for %s\n", dev->name);
984 dev->name);
985 mpc = alloc_mpc(); 1036 mpc = alloc_mpc();
986 if (mpc == NULL) { 1037 if (mpc == NULL) {
987 printk("mpoa: mpoa_event_listener: no new mpc"); 1038 pr_info("no new mpc");
988 break; 1039 break;
989 } 1040 }
990 } 1041 }
991 mpc->dev_num = priv->itfnum; 1042 mpc->dev_num = priv->itfnum;
992 mpc->dev = dev; 1043 mpc->dev = dev;
993 dev_hold(dev); 1044 dev_hold(dev);
994 dprintk("mpoa: (%s) was initialized\n", dev->name); 1045 dprintk("(%s) was initialized\n", dev->name);
995 break; 1046 break;
996 case NETDEV_UNREGISTER: 1047 case NETDEV_UNREGISTER:
997 /* the lec device was deallocated */ 1048 /* the lec device was deallocated */
998 mpc = find_mpc_by_lec(dev); 1049 mpc = find_mpc_by_lec(dev);
999 if (mpc == NULL) 1050 if (mpc == NULL)
1000 break; 1051 break;
1001 dprintk("mpoa: device (%s) was deallocated\n", dev->name); 1052 dprintk("device (%s) was deallocated\n", dev->name);
1002 stop_mpc(mpc); 1053 stop_mpc(mpc);
1003 dev_put(mpc->dev); 1054 dev_put(mpc->dev);
1004 mpc->dev = NULL; 1055 mpc->dev = NULL;
@@ -1008,9 +1059,8 @@ static int mpoa_event_listener(struct notifier_block *mpoa_notifier, unsigned lo
1008 mpc = find_mpc_by_lec(dev); 1059 mpc = find_mpc_by_lec(dev);
1009 if (mpc == NULL) 1060 if (mpc == NULL)
1010 break; 1061 break;
1011 if (mpc->mpoad_vcc != NULL) { 1062 if (mpc->mpoad_vcc != NULL)
1012 start_mpc(mpc, dev); 1063 start_mpc(mpc, dev);
1013 }
1014 break; 1064 break;
1015 case NETDEV_DOWN: 1065 case NETDEV_DOWN:
1016 /* the dev was ifconfig'ed down */ 1066 /* the dev was ifconfig'ed down */
@@ -1020,9 +1070,8 @@ static int mpoa_event_listener(struct notifier_block *mpoa_notifier, unsigned lo
1020 mpc = find_mpc_by_lec(dev); 1070 mpc = find_mpc_by_lec(dev);
1021 if (mpc == NULL) 1071 if (mpc == NULL)
1022 break; 1072 break;
1023 if (mpc->mpoad_vcc != NULL) { 1073 if (mpc->mpoad_vcc != NULL)
1024 stop_mpc(mpc); 1074 stop_mpc(mpc);
1025 }
1026 break; 1075 break;
1027 case NETDEV_REBOOT: 1076 case NETDEV_REBOOT:
1028 case NETDEV_CHANGE: 1077 case NETDEV_CHANGE:
@@ -1049,7 +1098,7 @@ static void MPOA_trigger_rcvd(struct k_message *msg, struct mpoa_client *mpc)
1049 in_cache_entry *entry; 1098 in_cache_entry *entry;
1050 1099
1051 entry = mpc->in_ops->get(dst_ip, mpc); 1100 entry = mpc->in_ops->get(dst_ip, mpc);
1052 if(entry == NULL){ 1101 if (entry == NULL) {
1053 entry = mpc->in_ops->add_entry(dst_ip, mpc); 1102 entry = mpc->in_ops->add_entry(dst_ip, mpc);
1054 entry->entry_state = INGRESS_RESOLVING; 1103 entry->entry_state = INGRESS_RESOLVING;
1055 msg->type = SND_MPOA_RES_RQST; 1104 msg->type = SND_MPOA_RES_RQST;
@@ -1060,7 +1109,7 @@ static void MPOA_trigger_rcvd(struct k_message *msg, struct mpoa_client *mpc)
1060 return; 1109 return;
1061 } 1110 }
1062 1111
1063 if(entry->entry_state == INGRESS_INVALID){ 1112 if (entry->entry_state == INGRESS_INVALID) {
1064 entry->entry_state = INGRESS_RESOLVING; 1113 entry->entry_state = INGRESS_RESOLVING;
1065 msg->type = SND_MPOA_RES_RQST; 1114 msg->type = SND_MPOA_RES_RQST;
1066 msg->content.in_info = entry->ctrl_info; 1115 msg->content.in_info = entry->ctrl_info;
@@ -1070,7 +1119,7 @@ static void MPOA_trigger_rcvd(struct k_message *msg, struct mpoa_client *mpc)
1070 return; 1119 return;
1071 } 1120 }
1072 1121
1073 printk("mpoa: (%s) MPOA_trigger_rcvd: entry already in resolving state\n", 1122 pr_info("(%s) entry already in resolving state\n",
1074 (mpc->dev) ? mpc->dev->name : "<unknown>"); 1123 (mpc->dev) ? mpc->dev->name : "<unknown>");
1075 mpc->in_ops->put(entry); 1124 mpc->in_ops->put(entry);
1076 return; 1125 return;
@@ -1080,23 +1129,25 @@ static void MPOA_trigger_rcvd(struct k_message *msg, struct mpoa_client *mpc)
1080 * Things get complicated because we have to check if there's an egress 1129 * Things get complicated because we have to check if there's an egress
1081 * shortcut with suitable traffic parameters we could use. 1130 * shortcut with suitable traffic parameters we could use.
1082 */ 1131 */
1083static void check_qos_and_open_shortcut(struct k_message *msg, struct mpoa_client *client, in_cache_entry *entry) 1132static void check_qos_and_open_shortcut(struct k_message *msg,
1133 struct mpoa_client *client,
1134 in_cache_entry *entry)
1084{ 1135{
1085 __be32 dst_ip = msg->content.in_info.in_dst_ip; 1136 __be32 dst_ip = msg->content.in_info.in_dst_ip;
1086 struct atm_mpoa_qos *qos = atm_mpoa_search_qos(dst_ip); 1137 struct atm_mpoa_qos *qos = atm_mpoa_search_qos(dst_ip);
1087 eg_cache_entry *eg_entry = client->eg_ops->get_by_src_ip(dst_ip, client); 1138 eg_cache_entry *eg_entry = client->eg_ops->get_by_src_ip(dst_ip, client);
1088 1139
1089 if(eg_entry && eg_entry->shortcut){ 1140 if (eg_entry && eg_entry->shortcut) {
1090 if(eg_entry->shortcut->qos.txtp.traffic_class & 1141 if (eg_entry->shortcut->qos.txtp.traffic_class &
1091 msg->qos.txtp.traffic_class & 1142 msg->qos.txtp.traffic_class &
1092 (qos ? qos->qos.txtp.traffic_class : ATM_UBR | ATM_CBR)){ 1143 (qos ? qos->qos.txtp.traffic_class : ATM_UBR | ATM_CBR)) {
1093 if(eg_entry->shortcut->qos.txtp.traffic_class == ATM_UBR) 1144 if (eg_entry->shortcut->qos.txtp.traffic_class == ATM_UBR)
1094 entry->shortcut = eg_entry->shortcut; 1145 entry->shortcut = eg_entry->shortcut;
1095 else if(eg_entry->shortcut->qos.txtp.max_pcr > 0) 1146 else if (eg_entry->shortcut->qos.txtp.max_pcr > 0)
1096 entry->shortcut = eg_entry->shortcut; 1147 entry->shortcut = eg_entry->shortcut;
1097 } 1148 }
1098 if(entry->shortcut){ 1149 if (entry->shortcut) {
1099 dprintk("mpoa: (%s) using egress SVC to reach %pI4\n", 1150 dprintk("(%s) using egress SVC to reach %pI4\n",
1100 client->dev->name, &dst_ip); 1151 client->dev->name, &dst_ip);
1101 client->eg_ops->put(eg_entry); 1152 client->eg_ops->put(eg_entry);
1102 return; 1153 return;
@@ -1107,12 +1158,13 @@ static void check_qos_and_open_shortcut(struct k_message *msg, struct mpoa_clien
1107 1158
1108 /* No luck in the egress cache we must open an ingress SVC */ 1159 /* No luck in the egress cache we must open an ingress SVC */
1109 msg->type = OPEN_INGRESS_SVC; 1160 msg->type = OPEN_INGRESS_SVC;
1110 if (qos && (qos->qos.txtp.traffic_class == msg->qos.txtp.traffic_class)) 1161 if (qos &&
1111 { 1162 (qos->qos.txtp.traffic_class == msg->qos.txtp.traffic_class)) {
1112 msg->qos = qos->qos; 1163 msg->qos = qos->qos;
1113 printk("mpoa: (%s) trying to get a CBR shortcut\n",client->dev->name); 1164 pr_info("(%s) trying to get a CBR shortcut\n",
1114 } 1165 client->dev->name);
1115 else memset(&msg->qos,0,sizeof(struct atm_qos)); 1166 } else
1167 memset(&msg->qos, 0, sizeof(struct atm_qos));
1116 msg_to_mpoad(msg, client); 1168 msg_to_mpoad(msg, client);
1117 return; 1169 return;
1118} 1170}
@@ -1122,17 +1174,19 @@ static void MPOA_res_reply_rcvd(struct k_message *msg, struct mpoa_client *mpc)
1122 __be32 dst_ip = msg->content.in_info.in_dst_ip; 1174 __be32 dst_ip = msg->content.in_info.in_dst_ip;
1123 in_cache_entry *entry = mpc->in_ops->get(dst_ip, mpc); 1175 in_cache_entry *entry = mpc->in_ops->get(dst_ip, mpc);
1124 1176
1125 dprintk("mpoa: (%s) MPOA_res_reply_rcvd: ip %pI4\n", 1177 dprintk("(%s) ip %pI4\n",
1126 mpc->dev->name, &dst_ip); 1178 mpc->dev->name, &dst_ip);
1127 ddprintk("mpoa: (%s) MPOA_res_reply_rcvd() entry = %p", mpc->dev->name, entry); 1179 ddprintk("(%s) entry = %p",
1128 if(entry == NULL){ 1180 mpc->dev->name, entry);
1129 printk("\nmpoa: (%s) ARGH, received res. reply for an entry that doesn't exist.\n", mpc->dev->name); 1181 if (entry == NULL) {
1182 pr_info("(%s) ARGH, received res. reply for an entry that doesn't exist.\n",
1183 mpc->dev->name);
1130 return; 1184 return;
1131 } 1185 }
1132 ddprintk(" entry_state = %d ", entry->entry_state); 1186 ddprintk_cont(" entry_state = %d ", entry->entry_state);
1133 1187
1134 if (entry->entry_state == INGRESS_RESOLVED) { 1188 if (entry->entry_state == INGRESS_RESOLVED) {
1135 printk("\nmpoa: (%s) MPOA_res_reply_rcvd for RESOLVED entry!\n", mpc->dev->name); 1189 pr_info("(%s) RESOLVED entry!\n", mpc->dev->name);
1136 mpc->in_ops->put(entry); 1190 mpc->in_ops->put(entry);
1137 return; 1191 return;
1138 } 1192 }
@@ -1141,17 +1195,18 @@ static void MPOA_res_reply_rcvd(struct k_message *msg, struct mpoa_client *mpc)
1141 do_gettimeofday(&(entry->tv)); 1195 do_gettimeofday(&(entry->tv));
1142 do_gettimeofday(&(entry->reply_wait)); /* Used in refreshing func from now on */ 1196 do_gettimeofday(&(entry->reply_wait)); /* Used in refreshing func from now on */
1143 entry->refresh_time = 0; 1197 entry->refresh_time = 0;
1144 ddprintk("entry->shortcut = %p\n", entry->shortcut); 1198 ddprintk_cont("entry->shortcut = %p\n", entry->shortcut);
1145 1199
1146 if(entry->entry_state == INGRESS_RESOLVING && entry->shortcut != NULL){ 1200 if (entry->entry_state == INGRESS_RESOLVING &&
1201 entry->shortcut != NULL) {
1147 entry->entry_state = INGRESS_RESOLVED; 1202 entry->entry_state = INGRESS_RESOLVED;
1148 mpc->in_ops->put(entry); 1203 mpc->in_ops->put(entry);
1149 return; /* Shortcut already open... */ 1204 return; /* Shortcut already open... */
1150 } 1205 }
1151 1206
1152 if (entry->shortcut != NULL) { 1207 if (entry->shortcut != NULL) {
1153 printk("mpoa: (%s) MPOA_res_reply_rcvd: entry->shortcut != NULL, impossible!\n", 1208 pr_info("(%s) entry->shortcut != NULL, impossible!\n",
1154 mpc->dev->name); 1209 mpc->dev->name);
1155 mpc->in_ops->put(entry); 1210 mpc->in_ops->put(entry);
1156 return; 1211 return;
1157 } 1212 }
@@ -1170,14 +1225,14 @@ static void ingress_purge_rcvd(struct k_message *msg, struct mpoa_client *mpc)
1170 __be32 mask = msg->ip_mask; 1225 __be32 mask = msg->ip_mask;
1171 in_cache_entry *entry = mpc->in_ops->get_with_mask(dst_ip, mpc, mask); 1226 in_cache_entry *entry = mpc->in_ops->get_with_mask(dst_ip, mpc, mask);
1172 1227
1173 if(entry == NULL){ 1228 if (entry == NULL) {
1174 printk("mpoa: (%s) ingress_purge_rcvd: purge for a non-existing entry, ip = %pI4\n", 1229 pr_info("(%s) purge for a non-existing entry, ip = %pI4\n",
1175 mpc->dev->name, &dst_ip); 1230 mpc->dev->name, &dst_ip);
1176 return; 1231 return;
1177 } 1232 }
1178 1233
1179 do { 1234 do {
1180 dprintk("mpoa: (%s) ingress_purge_rcvd: removing an ingress entry, ip = %pI4\n", 1235 dprintk("(%s) removing an ingress entry, ip = %pI4\n",
1181 mpc->dev->name, &dst_ip); 1236 mpc->dev->name, &dst_ip);
1182 write_lock_bh(&mpc->ingress_lock); 1237 write_lock_bh(&mpc->ingress_lock);
1183 mpc->in_ops->remove_entry(entry, mpc); 1238 mpc->in_ops->remove_entry(entry, mpc);
@@ -1195,7 +1250,8 @@ static void egress_purge_rcvd(struct k_message *msg, struct mpoa_client *mpc)
1195 eg_cache_entry *entry = mpc->eg_ops->get_by_cache_id(cache_id, mpc); 1250 eg_cache_entry *entry = mpc->eg_ops->get_by_cache_id(cache_id, mpc);
1196 1251
1197 if (entry == NULL) { 1252 if (entry == NULL) {
1198 dprintk("mpoa: (%s) egress_purge_rcvd: purge for a non-existing entry\n", mpc->dev->name); 1253 dprintk("(%s) purge for a non-existing entry\n",
1254 mpc->dev->name);
1199 return; 1255 return;
1200 } 1256 }
1201 1257
@@ -1214,15 +1270,15 @@ static void purge_egress_shortcut(struct atm_vcc *vcc, eg_cache_entry *entry)
1214 struct k_message *purge_msg; 1270 struct k_message *purge_msg;
1215 struct sk_buff *skb; 1271 struct sk_buff *skb;
1216 1272
1217 dprintk("mpoa: purge_egress_shortcut: entering\n"); 1273 dprintk("entering\n");
1218 if (vcc == NULL) { 1274 if (vcc == NULL) {
1219 printk("mpoa: purge_egress_shortcut: vcc == NULL\n"); 1275 pr_info("vcc == NULL\n");
1220 return; 1276 return;
1221 } 1277 }
1222 1278
1223 skb = alloc_skb(sizeof(struct k_message), GFP_ATOMIC); 1279 skb = alloc_skb(sizeof(struct k_message), GFP_ATOMIC);
1224 if (skb == NULL) { 1280 if (skb == NULL) {
1225 printk("mpoa: purge_egress_shortcut: out of memory\n"); 1281 pr_info("out of memory\n");
1226 return; 1282 return;
1227 } 1283 }
1228 1284
@@ -1238,7 +1294,7 @@ static void purge_egress_shortcut(struct atm_vcc *vcc, eg_cache_entry *entry)
1238 sk = sk_atm(vcc); 1294 sk = sk_atm(vcc);
1239 skb_queue_tail(&sk->sk_receive_queue, skb); 1295 skb_queue_tail(&sk->sk_receive_queue, skb);
1240 sk->sk_data_ready(sk, skb->len); 1296 sk->sk_data_ready(sk, skb->len);
1241 dprintk("mpoa: purge_egress_shortcut: exiting:\n"); 1297 dprintk("exiting\n");
1242 1298
1243 return; 1299 return;
1244} 1300}
@@ -1247,14 +1303,14 @@ static void purge_egress_shortcut(struct atm_vcc *vcc, eg_cache_entry *entry)
1247 * Our MPS died. Tell our daemon to send NHRP data plane purge to each 1303 * Our MPS died. Tell our daemon to send NHRP data plane purge to each
1248 * of the egress shortcuts we have. 1304 * of the egress shortcuts we have.
1249 */ 1305 */
1250static void mps_death( struct k_message * msg, struct mpoa_client * mpc ) 1306static void mps_death(struct k_message *msg, struct mpoa_client *mpc)
1251{ 1307{
1252 eg_cache_entry *entry; 1308 eg_cache_entry *entry;
1253 1309
1254 dprintk("mpoa: (%s) mps_death:\n", mpc->dev->name); 1310 dprintk("(%s)\n", mpc->dev->name);
1255 1311
1256 if(memcmp(msg->MPS_ctrl, mpc->mps_ctrl_addr, ATM_ESA_LEN)){ 1312 if (memcmp(msg->MPS_ctrl, mpc->mps_ctrl_addr, ATM_ESA_LEN)) {
1257 printk("mpoa: (%s) mps_death: wrong MPS\n", mpc->dev->name); 1313 pr_info("(%s) wrong MPS\n", mpc->dev->name);
1258 return; 1314 return;
1259 } 1315 }
1260 1316
@@ -1273,20 +1329,21 @@ static void mps_death( struct k_message * msg, struct mpoa_client * mpc )
1273 return; 1329 return;
1274} 1330}
1275 1331
1276static void MPOA_cache_impos_rcvd( struct k_message * msg, struct mpoa_client * mpc) 1332static void MPOA_cache_impos_rcvd(struct k_message *msg,
1333 struct mpoa_client *mpc)
1277{ 1334{
1278 uint16_t holding_time; 1335 uint16_t holding_time;
1279 eg_cache_entry *entry = mpc->eg_ops->get_by_cache_id(msg->content.eg_info.cache_id, mpc); 1336 eg_cache_entry *entry = mpc->eg_ops->get_by_cache_id(msg->content.eg_info.cache_id, mpc);
1280 1337
1281 holding_time = msg->content.eg_info.holding_time; 1338 holding_time = msg->content.eg_info.holding_time;
1282 dprintk("mpoa: (%s) MPOA_cache_impos_rcvd: entry = %p, holding_time = %u\n", 1339 dprintk("(%s) entry = %p, holding_time = %u\n",
1283 mpc->dev->name, entry, holding_time); 1340 mpc->dev->name, entry, holding_time);
1284 if(entry == NULL && holding_time) { 1341 if (entry == NULL && holding_time) {
1285 entry = mpc->eg_ops->add_entry(msg, mpc); 1342 entry = mpc->eg_ops->add_entry(msg, mpc);
1286 mpc->eg_ops->put(entry); 1343 mpc->eg_ops->put(entry);
1287 return; 1344 return;
1288 } 1345 }
1289 if(holding_time){ 1346 if (holding_time) {
1290 mpc->eg_ops->update(entry, holding_time); 1347 mpc->eg_ops->update(entry, holding_time);
1291 return; 1348 return;
1292 } 1349 }
@@ -1300,7 +1357,8 @@ static void MPOA_cache_impos_rcvd( struct k_message * msg, struct mpoa_client *
1300 return; 1357 return;
1301} 1358}
1302 1359
1303static void set_mpc_ctrl_addr_rcvd(struct k_message *mesg, struct mpoa_client *mpc) 1360static void set_mpc_ctrl_addr_rcvd(struct k_message *mesg,
1361 struct mpoa_client *mpc)
1304{ 1362{
1305 struct lec_priv *priv; 1363 struct lec_priv *priv;
1306 int i, retval ; 1364 int i, retval ;
@@ -1315,34 +1373,39 @@ static void set_mpc_ctrl_addr_rcvd(struct k_message *mesg, struct mpoa_client *m
1315 memcpy(&tlv[7], mesg->MPS_ctrl, ATM_ESA_LEN); /* MPC ctrl ATM addr */ 1373 memcpy(&tlv[7], mesg->MPS_ctrl, ATM_ESA_LEN); /* MPC ctrl ATM addr */
1316 memcpy(mpc->our_ctrl_addr, mesg->MPS_ctrl, ATM_ESA_LEN); 1374 memcpy(mpc->our_ctrl_addr, mesg->MPS_ctrl, ATM_ESA_LEN);
1317 1375
1318 dprintk("mpoa: (%s) setting MPC ctrl ATM address to ", 1376 dprintk("(%s) setting MPC ctrl ATM address to",
1319 (mpc->dev) ? mpc->dev->name : "<unknown>"); 1377 mpc->dev ? mpc->dev->name : "<unknown>");
1320 for (i = 7; i < sizeof(tlv); i++) 1378 for (i = 7; i < sizeof(tlv); i++)
1321 dprintk("%02x ", tlv[i]); 1379 dprintk_cont(" %02x", tlv[i]);
1322 dprintk("\n"); 1380 dprintk_cont("\n");
1323 1381
1324 if (mpc->dev) { 1382 if (mpc->dev) {
1325 priv = netdev_priv(mpc->dev); 1383 priv = netdev_priv(mpc->dev);
1326 retval = priv->lane2_ops->associate_req(mpc->dev, mpc->dev->dev_addr, tlv, sizeof(tlv)); 1384 retval = priv->lane2_ops->associate_req(mpc->dev,
1385 mpc->dev->dev_addr,
1386 tlv, sizeof(tlv));
1327 if (retval == 0) 1387 if (retval == 0)
1328 printk("mpoa: (%s) MPOA device type TLV association failed\n", mpc->dev->name); 1388 pr_info("(%s) MPOA device type TLV association failed\n",
1389 mpc->dev->name);
1329 retval = priv->lane2_ops->resolve(mpc->dev, NULL, 1, NULL, NULL); 1390 retval = priv->lane2_ops->resolve(mpc->dev, NULL, 1, NULL, NULL);
1330 if (retval < 0) 1391 if (retval < 0)
1331 printk("mpoa: (%s) targetless LE_ARP request failed\n", mpc->dev->name); 1392 pr_info("(%s) targetless LE_ARP request failed\n",
1393 mpc->dev->name);
1332 } 1394 }
1333 1395
1334 return; 1396 return;
1335} 1397}
1336 1398
1337static void set_mps_mac_addr_rcvd(struct k_message *msg, struct mpoa_client *client) 1399static void set_mps_mac_addr_rcvd(struct k_message *msg,
1400 struct mpoa_client *client)
1338{ 1401{
1339 1402
1340 if(client->number_of_mps_macs) 1403 if (client->number_of_mps_macs)
1341 kfree(client->mps_macs); 1404 kfree(client->mps_macs);
1342 client->number_of_mps_macs = 0; 1405 client->number_of_mps_macs = 0;
1343 client->mps_macs = kmemdup(msg->MPS_ctrl, ETH_ALEN, GFP_KERNEL); 1406 client->mps_macs = kmemdup(msg->MPS_ctrl, ETH_ALEN, GFP_KERNEL);
1344 if (client->mps_macs == NULL) { 1407 if (client->mps_macs == NULL) {
1345 printk("mpoa: set_mps_mac_addr_rcvd: out of memory\n"); 1408 pr_info("out of memory\n");
1346 return; 1409 return;
1347 } 1410 }
1348 client->number_of_mps_macs = 1; 1411 client->number_of_mps_macs = 1;
@@ -1363,11 +1426,11 @@ static void clean_up(struct k_message *msg, struct mpoa_client *mpc, int action)
1363 /* FIXME: This knows too much of the cache structure */ 1426 /* FIXME: This knows too much of the cache structure */
1364 read_lock_irq(&mpc->egress_lock); 1427 read_lock_irq(&mpc->egress_lock);
1365 entry = mpc->eg_cache; 1428 entry = mpc->eg_cache;
1366 while (entry != NULL){ 1429 while (entry != NULL) {
1367 msg->content.eg_info = entry->ctrl_info; 1430 msg->content.eg_info = entry->ctrl_info;
1368 dprintk("mpoa: cache_id %u\n", entry->ctrl_info.cache_id); 1431 dprintk("cache_id %u\n", entry->ctrl_info.cache_id);
1369 msg_to_mpoad(msg, mpc); 1432 msg_to_mpoad(msg, mpc);
1370 entry = entry->next; 1433 entry = entry->next;
1371 } 1434 }
1372 read_unlock_irq(&mpc->egress_lock); 1435 read_unlock_irq(&mpc->egress_lock);
1373 1436
@@ -1386,20 +1449,22 @@ static void mpc_timer_refresh(void)
1386 return; 1449 return;
1387} 1450}
1388 1451
1389static void mpc_cache_check( unsigned long checking_time ) 1452static void mpc_cache_check(unsigned long checking_time)
1390{ 1453{
1391 struct mpoa_client *mpc = mpcs; 1454 struct mpoa_client *mpc = mpcs;
1392 static unsigned long previous_resolving_check_time; 1455 static unsigned long previous_resolving_check_time;
1393 static unsigned long previous_refresh_time; 1456 static unsigned long previous_refresh_time;
1394 1457
1395 while( mpc != NULL ){ 1458 while (mpc != NULL) {
1396 mpc->in_ops->clear_count(mpc); 1459 mpc->in_ops->clear_count(mpc);
1397 mpc->eg_ops->clear_expired(mpc); 1460 mpc->eg_ops->clear_expired(mpc);
1398 if(checking_time - previous_resolving_check_time > mpc->parameters.mpc_p4 * HZ ){ 1461 if (checking_time - previous_resolving_check_time >
1462 mpc->parameters.mpc_p4 * HZ) {
1399 mpc->in_ops->check_resolving(mpc); 1463 mpc->in_ops->check_resolving(mpc);
1400 previous_resolving_check_time = checking_time; 1464 previous_resolving_check_time = checking_time;
1401 } 1465 }
1402 if(checking_time - previous_refresh_time > mpc->parameters.mpc_p5 * HZ ){ 1466 if (checking_time - previous_refresh_time >
1467 mpc->parameters.mpc_p5 * HZ) {
1403 mpc->in_ops->refresh(mpc); 1468 mpc->in_ops->refresh(mpc);
1404 previous_refresh_time = checking_time; 1469 previous_refresh_time = checking_time;
1405 } 1470 }
@@ -1410,7 +1475,8 @@ static void mpc_cache_check( unsigned long checking_time )
1410 return; 1475 return;
1411} 1476}
1412 1477
1413static int atm_mpoa_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) 1478static int atm_mpoa_ioctl(struct socket *sock, unsigned int cmd,
1479 unsigned long arg)
1414{ 1480{
1415 int err = 0; 1481 int err = 0;
1416 struct atm_vcc *vcc = ATM_SD(sock); 1482 struct atm_vcc *vcc = ATM_SD(sock);
@@ -1422,21 +1488,20 @@ static int atm_mpoa_ioctl(struct socket *sock, unsigned int cmd, unsigned long a
1422 return -EPERM; 1488 return -EPERM;
1423 1489
1424 switch (cmd) { 1490 switch (cmd) {
1425 case ATMMPC_CTRL: 1491 case ATMMPC_CTRL:
1426 err = atm_mpoa_mpoad_attach(vcc, (int)arg); 1492 err = atm_mpoa_mpoad_attach(vcc, (int)arg);
1427 if (err >= 0) 1493 if (err >= 0)
1428 sock->state = SS_CONNECTED; 1494 sock->state = SS_CONNECTED;
1429 break; 1495 break;
1430 case ATMMPC_DATA: 1496 case ATMMPC_DATA:
1431 err = atm_mpoa_vcc_attach(vcc, (void __user *)arg); 1497 err = atm_mpoa_vcc_attach(vcc, (void __user *)arg);
1432 break; 1498 break;
1433 default: 1499 default:
1434 break; 1500 break;
1435 } 1501 }
1436 return err; 1502 return err;
1437} 1503}
1438 1504
1439
1440static struct atm_ioctl atm_ioctl_ops = { 1505static struct atm_ioctl atm_ioctl_ops = {
1441 .owner = THIS_MODULE, 1506 .owner = THIS_MODULE,
1442 .ioctl = atm_mpoa_ioctl, 1507 .ioctl = atm_mpoa_ioctl,
@@ -1447,9 +1512,9 @@ static __init int atm_mpoa_init(void)
1447 register_atm_ioctl(&atm_ioctl_ops); 1512 register_atm_ioctl(&atm_ioctl_ops);
1448 1513
1449 if (mpc_proc_init() != 0) 1514 if (mpc_proc_init() != 0)
1450 printk(KERN_INFO "mpoa: failed to initialize /proc/mpoa\n"); 1515 pr_info("failed to initialize /proc/mpoa\n");
1451 1516
1452 printk("mpc.c: " __DATE__ " " __TIME__ " initialized\n"); 1517 pr_info("mpc.c: " __DATE__ " " __TIME__ " initialized\n");
1453 1518
1454 return 0; 1519 return 0;
1455} 1520}
@@ -1476,15 +1541,15 @@ static void __exit atm_mpoa_cleanup(void)
1476 if (priv->lane2_ops != NULL) 1541 if (priv->lane2_ops != NULL)
1477 priv->lane2_ops->associate_indicator = NULL; 1542 priv->lane2_ops->associate_indicator = NULL;
1478 } 1543 }
1479 ddprintk("mpoa: cleanup_module: about to clear caches\n"); 1544 ddprintk("about to clear caches\n");
1480 mpc->in_ops->destroy_cache(mpc); 1545 mpc->in_ops->destroy_cache(mpc);
1481 mpc->eg_ops->destroy_cache(mpc); 1546 mpc->eg_ops->destroy_cache(mpc);
1482 ddprintk("mpoa: cleanup_module: caches cleared\n"); 1547 ddprintk("caches cleared\n");
1483 kfree(mpc->mps_macs); 1548 kfree(mpc->mps_macs);
1484 memset(mpc, 0, sizeof(struct mpoa_client)); 1549 memset(mpc, 0, sizeof(struct mpoa_client));
1485 ddprintk("mpoa: cleanup_module: about to kfree %p\n", mpc); 1550 ddprintk("about to kfree %p\n", mpc);
1486 kfree(mpc); 1551 kfree(mpc);
1487 ddprintk("mpoa: cleanup_module: next mpc is at %p\n", tmp); 1552 ddprintk("next mpc is at %p\n", tmp);
1488 mpc = tmp; 1553 mpc = tmp;
1489 } 1554 }
1490 1555
@@ -1492,7 +1557,7 @@ static void __exit atm_mpoa_cleanup(void)
1492 qos_head = NULL; 1557 qos_head = NULL;
1493 while (qos != NULL) { 1558 while (qos != NULL) {
1494 nextqos = qos->next; 1559 nextqos = qos->next;
1495 dprintk("mpoa: cleanup_module: freeing qos entry %p\n", qos); 1560 dprintk("freeing qos entry %p\n", qos);
1496 kfree(qos); 1561 kfree(qos);
1497 qos = nextqos; 1562 qos = nextqos;
1498 } 1563 }
diff --git a/net/atm/mpoa_caches.c b/net/atm/mpoa_caches.c
index 4504a4b339bb..e773d8336918 100644
--- a/net/atm/mpoa_caches.c
+++ b/net/atm/mpoa_caches.c
@@ -1,5 +1,6 @@
1#include <linux/types.h> 1#include <linux/types.h>
2#include <linux/atmmpc.h> 2#include <linux/atmmpc.h>
3#include <linux/slab.h>
3#include <linux/time.h> 4#include <linux/time.h>
4 5
5#include "mpoa_caches.h" 6#include "mpoa_caches.h"
@@ -11,15 +12,23 @@
11 */ 12 */
12 13
13#if 0 14#if 0
14#define dprintk printk /* debug */ 15#define dprintk(format, args...) \
16 printk(KERN_DEBUG "mpoa:%s: " format, __FILE__, ##args) /* debug */
15#else 17#else
16#define dprintk(format,args...) 18#define dprintk(format, args...) \
19 do { if (0) \
20 printk(KERN_DEBUG "mpoa:%s: " format, __FILE__, ##args);\
21 } while (0)
17#endif 22#endif
18 23
19#if 0 24#if 0
20#define ddprintk printk /* more debug */ 25#define ddprintk(format, args...) \
26 printk(KERN_DEBUG "mpoa:%s: " format, __FILE__, ##args) /* debug */
21#else 27#else
22#define ddprintk(format,args...) 28#define ddprintk(format, args...) \
29 do { if (0) \
30 printk(KERN_DEBUG "mpoa:%s: " format, __FILE__, ##args);\
31 } while (0)
23#endif 32#endif
24 33
25static in_cache_entry *in_cache_get(__be32 dst_ip, 34static in_cache_entry *in_cache_get(__be32 dst_ip,
@@ -29,8 +38,8 @@ static in_cache_entry *in_cache_get(__be32 dst_ip,
29 38
30 read_lock_bh(&client->ingress_lock); 39 read_lock_bh(&client->ingress_lock);
31 entry = client->in_cache; 40 entry = client->in_cache;
32 while(entry != NULL){ 41 while (entry != NULL) {
33 if( entry->ctrl_info.in_dst_ip == dst_ip ){ 42 if (entry->ctrl_info.in_dst_ip == dst_ip) {
34 atomic_inc(&entry->use); 43 atomic_inc(&entry->use);
35 read_unlock_bh(&client->ingress_lock); 44 read_unlock_bh(&client->ingress_lock);
36 return entry; 45 return entry;
@@ -50,8 +59,8 @@ static in_cache_entry *in_cache_get_with_mask(__be32 dst_ip,
50 59
51 read_lock_bh(&client->ingress_lock); 60 read_lock_bh(&client->ingress_lock);
52 entry = client->in_cache; 61 entry = client->in_cache;
53 while(entry != NULL){ 62 while (entry != NULL) {
54 if((entry->ctrl_info.in_dst_ip & mask) == (dst_ip & mask )){ 63 if ((entry->ctrl_info.in_dst_ip & mask) == (dst_ip & mask)) {
55 atomic_inc(&entry->use); 64 atomic_inc(&entry->use);
56 read_unlock_bh(&client->ingress_lock); 65 read_unlock_bh(&client->ingress_lock);
57 return entry; 66 return entry;
@@ -65,14 +74,14 @@ static in_cache_entry *in_cache_get_with_mask(__be32 dst_ip,
65} 74}
66 75
67static in_cache_entry *in_cache_get_by_vcc(struct atm_vcc *vcc, 76static in_cache_entry *in_cache_get_by_vcc(struct atm_vcc *vcc,
68 struct mpoa_client *client ) 77 struct mpoa_client *client)
69{ 78{
70 in_cache_entry *entry; 79 in_cache_entry *entry;
71 80
72 read_lock_bh(&client->ingress_lock); 81 read_lock_bh(&client->ingress_lock);
73 entry = client->in_cache; 82 entry = client->in_cache;
74 while(entry != NULL){ 83 while (entry != NULL) {
75 if(entry->shortcut == vcc) { 84 if (entry->shortcut == vcc) {
76 atomic_inc(&entry->use); 85 atomic_inc(&entry->use);
77 read_unlock_bh(&client->ingress_lock); 86 read_unlock_bh(&client->ingress_lock);
78 return entry; 87 return entry;
@@ -90,14 +99,14 @@ static in_cache_entry *in_cache_add_entry(__be32 dst_ip,
90 in_cache_entry *entry = kzalloc(sizeof(in_cache_entry), GFP_KERNEL); 99 in_cache_entry *entry = kzalloc(sizeof(in_cache_entry), GFP_KERNEL);
91 100
92 if (entry == NULL) { 101 if (entry == NULL) {
93 printk("mpoa: mpoa_caches.c: new_in_cache_entry: out of memory\n"); 102 pr_info("mpoa: mpoa_caches.c: new_in_cache_entry: out of memory\n");
94 return NULL; 103 return NULL;
95 } 104 }
96 105
97 dprintk("mpoa: mpoa_caches.c: adding an ingress entry, ip = %pI4\n", &dst_ip); 106 dprintk("adding an ingress entry, ip = %pI4\n", &dst_ip);
98 107
99 atomic_set(&entry->use, 1); 108 atomic_set(&entry->use, 1);
100 dprintk("mpoa: mpoa_caches.c: new_in_cache_entry: about to lock\n"); 109 dprintk("new_in_cache_entry: about to lock\n");
101 write_lock_bh(&client->ingress_lock); 110 write_lock_bh(&client->ingress_lock);
102 entry->next = client->in_cache; 111 entry->next = client->in_cache;
103 entry->prev = NULL; 112 entry->prev = NULL;
@@ -115,7 +124,7 @@ static in_cache_entry *in_cache_add_entry(__be32 dst_ip,
115 atomic_inc(&entry->use); 124 atomic_inc(&entry->use);
116 125
117 write_unlock_bh(&client->ingress_lock); 126 write_unlock_bh(&client->ingress_lock);
118 dprintk("mpoa: mpoa_caches.c: new_in_cache_entry: unlocked\n"); 127 dprintk("new_in_cache_entry: unlocked\n");
119 128
120 return entry; 129 return entry;
121} 130}
@@ -126,39 +135,41 @@ static int cache_hit(in_cache_entry *entry, struct mpoa_client *mpc)
126 struct k_message msg; 135 struct k_message msg;
127 136
128 entry->count++; 137 entry->count++;
129 if(entry->entry_state == INGRESS_RESOLVED && entry->shortcut != NULL) 138 if (entry->entry_state == INGRESS_RESOLVED && entry->shortcut != NULL)
130 return OPEN; 139 return OPEN;
131 140
132 if(entry->entry_state == INGRESS_REFRESHING){ 141 if (entry->entry_state == INGRESS_REFRESHING) {
133 if(entry->count > mpc->parameters.mpc_p1){ 142 if (entry->count > mpc->parameters.mpc_p1) {
134 msg.type = SND_MPOA_RES_RQST; 143 msg.type = SND_MPOA_RES_RQST;
135 msg.content.in_info = entry->ctrl_info; 144 msg.content.in_info = entry->ctrl_info;
136 memcpy(msg.MPS_ctrl, mpc->mps_ctrl_addr, ATM_ESA_LEN); 145 memcpy(msg.MPS_ctrl, mpc->mps_ctrl_addr, ATM_ESA_LEN);
137 qos = atm_mpoa_search_qos(entry->ctrl_info.in_dst_ip); 146 qos = atm_mpoa_search_qos(entry->ctrl_info.in_dst_ip);
138 if (qos != NULL) msg.qos = qos->qos; 147 if (qos != NULL)
148 msg.qos = qos->qos;
139 msg_to_mpoad(&msg, mpc); 149 msg_to_mpoad(&msg, mpc);
140 do_gettimeofday(&(entry->reply_wait)); 150 do_gettimeofday(&(entry->reply_wait));
141 entry->entry_state = INGRESS_RESOLVING; 151 entry->entry_state = INGRESS_RESOLVING;
142 } 152 }
143 if(entry->shortcut != NULL) 153 if (entry->shortcut != NULL)
144 return OPEN; 154 return OPEN;
145 return CLOSED; 155 return CLOSED;
146 } 156 }
147 157
148 if(entry->entry_state == INGRESS_RESOLVING && entry->shortcut != NULL) 158 if (entry->entry_state == INGRESS_RESOLVING && entry->shortcut != NULL)
149 return OPEN; 159 return OPEN;
150 160
151 if( entry->count > mpc->parameters.mpc_p1 && 161 if (entry->count > mpc->parameters.mpc_p1 &&
152 entry->entry_state == INGRESS_INVALID){ 162 entry->entry_state == INGRESS_INVALID) {
153 dprintk("mpoa: (%s) mpoa_caches.c: threshold exceeded for ip %pI4, sending MPOA res req\n", 163 dprintk("(%s) threshold exceeded for ip %pI4, sending MPOA res req\n",
154 mpc->dev->name, &entry->ctrl_info.in_dst_ip); 164 mpc->dev->name, &entry->ctrl_info.in_dst_ip);
155 entry->entry_state = INGRESS_RESOLVING; 165 entry->entry_state = INGRESS_RESOLVING;
156 msg.type = SND_MPOA_RES_RQST; 166 msg.type = SND_MPOA_RES_RQST;
157 memcpy(msg.MPS_ctrl, mpc->mps_ctrl_addr, ATM_ESA_LEN ); 167 memcpy(msg.MPS_ctrl, mpc->mps_ctrl_addr, ATM_ESA_LEN);
158 msg.content.in_info = entry->ctrl_info; 168 msg.content.in_info = entry->ctrl_info;
159 qos = atm_mpoa_search_qos(entry->ctrl_info.in_dst_ip); 169 qos = atm_mpoa_search_qos(entry->ctrl_info.in_dst_ip);
160 if (qos != NULL) msg.qos = qos->qos; 170 if (qos != NULL)
161 msg_to_mpoad( &msg, mpc); 171 msg.qos = qos->qos;
172 msg_to_mpoad(&msg, mpc);
162 do_gettimeofday(&(entry->reply_wait)); 173 do_gettimeofday(&(entry->reply_wait));
163 } 174 }
164 175
@@ -185,7 +196,7 @@ static void in_cache_remove_entry(in_cache_entry *entry,
185 struct k_message msg; 196 struct k_message msg;
186 197
187 vcc = entry->shortcut; 198 vcc = entry->shortcut;
188 dprintk("mpoa: mpoa_caches.c: removing an ingress entry, ip = %pI4\n", 199 dprintk("removing an ingress entry, ip = %pI4\n",
189 &entry->ctrl_info.in_dst_ip); 200 &entry->ctrl_info.in_dst_ip);
190 201
191 if (entry->prev != NULL) 202 if (entry->prev != NULL)
@@ -195,14 +206,15 @@ static void in_cache_remove_entry(in_cache_entry *entry,
195 if (entry->next != NULL) 206 if (entry->next != NULL)
196 entry->next->prev = entry->prev; 207 entry->next->prev = entry->prev;
197 client->in_ops->put(entry); 208 client->in_ops->put(entry);
198 if(client->in_cache == NULL && client->eg_cache == NULL){ 209 if (client->in_cache == NULL && client->eg_cache == NULL) {
199 msg.type = STOP_KEEP_ALIVE_SM; 210 msg.type = STOP_KEEP_ALIVE_SM;
200 msg_to_mpoad(&msg,client); 211 msg_to_mpoad(&msg, client);
201 } 212 }
202 213
203 /* Check if the egress side still uses this VCC */ 214 /* Check if the egress side still uses this VCC */
204 if (vcc != NULL) { 215 if (vcc != NULL) {
205 eg_cache_entry *eg_entry = client->eg_ops->get_by_vcc(vcc, client); 216 eg_cache_entry *eg_entry = client->eg_ops->get_by_vcc(vcc,
217 client);
206 if (eg_entry != NULL) { 218 if (eg_entry != NULL) {
207 client->eg_ops->put(eg_entry); 219 client->eg_ops->put(eg_entry);
208 return; 220 return;
@@ -213,7 +225,6 @@ static void in_cache_remove_entry(in_cache_entry *entry,
213 return; 225 return;
214} 226}
215 227
216
217/* Call this every MPC-p2 seconds... Not exactly correct solution, 228/* Call this every MPC-p2 seconds... Not exactly correct solution,
218 but an easy one... */ 229 but an easy one... */
219static void clear_count_and_expired(struct mpoa_client *client) 230static void clear_count_and_expired(struct mpoa_client *client)
@@ -225,12 +236,12 @@ static void clear_count_and_expired(struct mpoa_client *client)
225 236
226 write_lock_bh(&client->ingress_lock); 237 write_lock_bh(&client->ingress_lock);
227 entry = client->in_cache; 238 entry = client->in_cache;
228 while(entry != NULL){ 239 while (entry != NULL) {
229 entry->count=0; 240 entry->count = 0;
230 next_entry = entry->next; 241 next_entry = entry->next;
231 if((now.tv_sec - entry->tv.tv_sec) 242 if ((now.tv_sec - entry->tv.tv_sec)
232 > entry->ctrl_info.holding_time){ 243 > entry->ctrl_info.holding_time) {
233 dprintk("mpoa: mpoa_caches.c: holding time expired, ip = %pI4\n", 244 dprintk("holding time expired, ip = %pI4\n",
234 &entry->ctrl_info.in_dst_ip); 245 &entry->ctrl_info.in_dst_ip);
235 client->in_ops->remove_entry(entry, client); 246 client->in_ops->remove_entry(entry, client);
236 } 247 }
@@ -250,33 +261,38 @@ static void check_resolving_entries(struct mpoa_client *client)
250 struct timeval now; 261 struct timeval now;
251 struct k_message msg; 262 struct k_message msg;
252 263
253 do_gettimeofday( &now ); 264 do_gettimeofday(&now);
254 265
255 read_lock_bh(&client->ingress_lock); 266 read_lock_bh(&client->ingress_lock);
256 entry = client->in_cache; 267 entry = client->in_cache;
257 while( entry != NULL ){ 268 while (entry != NULL) {
258 if(entry->entry_state == INGRESS_RESOLVING){ 269 if (entry->entry_state == INGRESS_RESOLVING) {
259 if(now.tv_sec - entry->hold_down.tv_sec < client->parameters.mpc_p6){ 270 if ((now.tv_sec - entry->hold_down.tv_sec) <
260 entry = entry->next; /* Entry in hold down */ 271 client->parameters.mpc_p6) {
272 entry = entry->next; /* Entry in hold down */
261 continue; 273 continue;
262 } 274 }
263 if( (now.tv_sec - entry->reply_wait.tv_sec) > 275 if ((now.tv_sec - entry->reply_wait.tv_sec) >
264 entry->retry_time ){ 276 entry->retry_time) {
265 entry->retry_time = MPC_C1*( entry->retry_time ); 277 entry->retry_time = MPC_C1 * (entry->retry_time);
266 if(entry->retry_time > client->parameters.mpc_p5){ 278 /*
267 /* Retry time maximum exceeded, put entry in hold down. */ 279 * Retry time maximum exceeded,
280 * put entry in hold down.
281 */
282 if (entry->retry_time > client->parameters.mpc_p5) {
268 do_gettimeofday(&(entry->hold_down)); 283 do_gettimeofday(&(entry->hold_down));
269 entry->retry_time = client->parameters.mpc_p4; 284 entry->retry_time = client->parameters.mpc_p4;
270 entry = entry->next; 285 entry = entry->next;
271 continue; 286 continue;
272 } 287 }
273 /* Ask daemon to send a resolution request. */ 288 /* Ask daemon to send a resolution request. */
274 memset(&(entry->hold_down),0,sizeof(struct timeval)); 289 memset(&(entry->hold_down), 0, sizeof(struct timeval));
275 msg.type = SND_MPOA_RES_RTRY; 290 msg.type = SND_MPOA_RES_RTRY;
276 memcpy(msg.MPS_ctrl, client->mps_ctrl_addr, ATM_ESA_LEN); 291 memcpy(msg.MPS_ctrl, client->mps_ctrl_addr, ATM_ESA_LEN);
277 msg.content.in_info = entry->ctrl_info; 292 msg.content.in_info = entry->ctrl_info;
278 qos = atm_mpoa_search_qos(entry->ctrl_info.in_dst_ip); 293 qos = atm_mpoa_search_qos(entry->ctrl_info.in_dst_ip);
279 if (qos != NULL) msg.qos = qos->qos; 294 if (qos != NULL)
295 msg.qos = qos->qos;
280 msg_to_mpoad(&msg, client); 296 msg_to_mpoad(&msg, client);
281 do_gettimeofday(&(entry->reply_wait)); 297 do_gettimeofday(&(entry->reply_wait));
282 } 298 }
@@ -292,16 +308,17 @@ static void refresh_entries(struct mpoa_client *client)
292 struct timeval now; 308 struct timeval now;
293 struct in_cache_entry *entry = client->in_cache; 309 struct in_cache_entry *entry = client->in_cache;
294 310
295 ddprintk("mpoa: mpoa_caches.c: refresh_entries\n"); 311 ddprintk("refresh_entries\n");
296 do_gettimeofday(&now); 312 do_gettimeofday(&now);
297 313
298 read_lock_bh(&client->ingress_lock); 314 read_lock_bh(&client->ingress_lock);
299 while( entry != NULL ){ 315 while (entry != NULL) {
300 if( entry->entry_state == INGRESS_RESOLVED ){ 316 if (entry->entry_state == INGRESS_RESOLVED) {
301 if(!(entry->refresh_time)) 317 if (!(entry->refresh_time))
302 entry->refresh_time = (2*(entry->ctrl_info.holding_time))/3; 318 entry->refresh_time = (2 * (entry->ctrl_info.holding_time))/3;
303 if( (now.tv_sec - entry->reply_wait.tv_sec) > entry->refresh_time ){ 319 if ((now.tv_sec - entry->reply_wait.tv_sec) >
304 dprintk("mpoa: mpoa_caches.c: refreshing an entry.\n"); 320 entry->refresh_time) {
321 dprintk("refreshing an entry.\n");
305 entry->entry_state = INGRESS_REFRESHING; 322 entry->entry_state = INGRESS_REFRESHING;
306 323
307 } 324 }
@@ -314,21 +331,22 @@ static void refresh_entries(struct mpoa_client *client)
314static void in_destroy_cache(struct mpoa_client *mpc) 331static void in_destroy_cache(struct mpoa_client *mpc)
315{ 332{
316 write_lock_irq(&mpc->ingress_lock); 333 write_lock_irq(&mpc->ingress_lock);
317 while(mpc->in_cache != NULL) 334 while (mpc->in_cache != NULL)
318 mpc->in_ops->remove_entry(mpc->in_cache, mpc); 335 mpc->in_ops->remove_entry(mpc->in_cache, mpc);
319 write_unlock_irq(&mpc->ingress_lock); 336 write_unlock_irq(&mpc->ingress_lock);
320 337
321 return; 338 return;
322} 339}
323 340
324static eg_cache_entry *eg_cache_get_by_cache_id(__be32 cache_id, struct mpoa_client *mpc) 341static eg_cache_entry *eg_cache_get_by_cache_id(__be32 cache_id,
342 struct mpoa_client *mpc)
325{ 343{
326 eg_cache_entry *entry; 344 eg_cache_entry *entry;
327 345
328 read_lock_irq(&mpc->egress_lock); 346 read_lock_irq(&mpc->egress_lock);
329 entry = mpc->eg_cache; 347 entry = mpc->eg_cache;
330 while(entry != NULL){ 348 while (entry != NULL) {
331 if(entry->ctrl_info.cache_id == cache_id){ 349 if (entry->ctrl_info.cache_id == cache_id) {
332 atomic_inc(&entry->use); 350 atomic_inc(&entry->use);
333 read_unlock_irq(&mpc->egress_lock); 351 read_unlock_irq(&mpc->egress_lock);
334 return entry; 352 return entry;
@@ -348,7 +366,7 @@ static eg_cache_entry *eg_cache_get_by_tag(__be32 tag, struct mpoa_client *mpc)
348 366
349 read_lock_irqsave(&mpc->egress_lock, flags); 367 read_lock_irqsave(&mpc->egress_lock, flags);
350 entry = mpc->eg_cache; 368 entry = mpc->eg_cache;
351 while (entry != NULL){ 369 while (entry != NULL) {
352 if (entry->ctrl_info.tag == tag) { 370 if (entry->ctrl_info.tag == tag) {
353 atomic_inc(&entry->use); 371 atomic_inc(&entry->use);
354 read_unlock_irqrestore(&mpc->egress_lock, flags); 372 read_unlock_irqrestore(&mpc->egress_lock, flags);
@@ -362,14 +380,15 @@ static eg_cache_entry *eg_cache_get_by_tag(__be32 tag, struct mpoa_client *mpc)
362} 380}
363 381
364/* This can be called from any context since it saves CPU flags */ 382/* This can be called from any context since it saves CPU flags */
365static eg_cache_entry *eg_cache_get_by_vcc(struct atm_vcc *vcc, struct mpoa_client *mpc) 383static eg_cache_entry *eg_cache_get_by_vcc(struct atm_vcc *vcc,
384 struct mpoa_client *mpc)
366{ 385{
367 unsigned long flags; 386 unsigned long flags;
368 eg_cache_entry *entry; 387 eg_cache_entry *entry;
369 388
370 read_lock_irqsave(&mpc->egress_lock, flags); 389 read_lock_irqsave(&mpc->egress_lock, flags);
371 entry = mpc->eg_cache; 390 entry = mpc->eg_cache;
372 while (entry != NULL){ 391 while (entry != NULL) {
373 if (entry->shortcut == vcc) { 392 if (entry->shortcut == vcc) {
374 atomic_inc(&entry->use); 393 atomic_inc(&entry->use);
375 read_unlock_irqrestore(&mpc->egress_lock, flags); 394 read_unlock_irqrestore(&mpc->egress_lock, flags);
@@ -382,14 +401,15 @@ static eg_cache_entry *eg_cache_get_by_vcc(struct atm_vcc *vcc, struct mpoa_clie
382 return NULL; 401 return NULL;
383} 402}
384 403
385static eg_cache_entry *eg_cache_get_by_src_ip(__be32 ipaddr, struct mpoa_client *mpc) 404static eg_cache_entry *eg_cache_get_by_src_ip(__be32 ipaddr,
405 struct mpoa_client *mpc)
386{ 406{
387 eg_cache_entry *entry; 407 eg_cache_entry *entry;
388 408
389 read_lock_irq(&mpc->egress_lock); 409 read_lock_irq(&mpc->egress_lock);
390 entry = mpc->eg_cache; 410 entry = mpc->eg_cache;
391 while(entry != NULL){ 411 while (entry != NULL) {
392 if(entry->latest_ip_addr == ipaddr) { 412 if (entry->latest_ip_addr == ipaddr) {
393 atomic_inc(&entry->use); 413 atomic_inc(&entry->use);
394 read_unlock_irq(&mpc->egress_lock); 414 read_unlock_irq(&mpc->egress_lock);
395 return entry; 415 return entry;
@@ -421,7 +441,7 @@ static void eg_cache_remove_entry(eg_cache_entry *entry,
421 struct k_message msg; 441 struct k_message msg;
422 442
423 vcc = entry->shortcut; 443 vcc = entry->shortcut;
424 dprintk("mpoa: mpoa_caches.c: removing an egress entry.\n"); 444 dprintk("removing an egress entry.\n");
425 if (entry->prev != NULL) 445 if (entry->prev != NULL)
426 entry->prev->next = entry->next; 446 entry->prev->next = entry->next;
427 else 447 else
@@ -429,9 +449,9 @@ static void eg_cache_remove_entry(eg_cache_entry *entry,
429 if (entry->next != NULL) 449 if (entry->next != NULL)
430 entry->next->prev = entry->prev; 450 entry->next->prev = entry->prev;
431 client->eg_ops->put(entry); 451 client->eg_ops->put(entry);
432 if(client->in_cache == NULL && client->eg_cache == NULL){ 452 if (client->in_cache == NULL && client->eg_cache == NULL) {
433 msg.type = STOP_KEEP_ALIVE_SM; 453 msg.type = STOP_KEEP_ALIVE_SM;
434 msg_to_mpoad(&msg,client); 454 msg_to_mpoad(&msg, client);
435 } 455 }
436 456
437 /* Check if the ingress side still uses this VCC */ 457 /* Check if the ingress side still uses this VCC */
@@ -447,20 +467,21 @@ static void eg_cache_remove_entry(eg_cache_entry *entry,
447 return; 467 return;
448} 468}
449 469
450static eg_cache_entry *eg_cache_add_entry(struct k_message *msg, struct mpoa_client *client) 470static eg_cache_entry *eg_cache_add_entry(struct k_message *msg,
471 struct mpoa_client *client)
451{ 472{
452 eg_cache_entry *entry = kzalloc(sizeof(eg_cache_entry), GFP_KERNEL); 473 eg_cache_entry *entry = kzalloc(sizeof(eg_cache_entry), GFP_KERNEL);
453 474
454 if (entry == NULL) { 475 if (entry == NULL) {
455 printk("mpoa: mpoa_caches.c: new_eg_cache_entry: out of memory\n"); 476 pr_info("out of memory\n");
456 return NULL; 477 return NULL;
457 } 478 }
458 479
459 dprintk("mpoa: mpoa_caches.c: adding an egress entry, ip = %pI4, this should be our IP\n", 480 dprintk("adding an egress entry, ip = %pI4, this should be our IP\n",
460 &msg->content.eg_info.eg_dst_ip); 481 &msg->content.eg_info.eg_dst_ip);
461 482
462 atomic_set(&entry->use, 1); 483 atomic_set(&entry->use, 1);
463 dprintk("mpoa: mpoa_caches.c: new_eg_cache_entry: about to lock\n"); 484 dprintk("new_eg_cache_entry: about to lock\n");
464 write_lock_irq(&client->egress_lock); 485 write_lock_irq(&client->egress_lock);
465 entry->next = client->eg_cache; 486 entry->next = client->eg_cache;
466 entry->prev = NULL; 487 entry->prev = NULL;
@@ -472,18 +493,18 @@ static eg_cache_entry *eg_cache_add_entry(struct k_message *msg, struct mpoa_cli
472 entry->ctrl_info = msg->content.eg_info; 493 entry->ctrl_info = msg->content.eg_info;
473 do_gettimeofday(&(entry->tv)); 494 do_gettimeofday(&(entry->tv));
474 entry->entry_state = EGRESS_RESOLVED; 495 entry->entry_state = EGRESS_RESOLVED;
475 dprintk("mpoa: mpoa_caches.c: new_eg_cache_entry cache_id %lu\n", ntohl(entry->ctrl_info.cache_id)); 496 dprintk("new_eg_cache_entry cache_id %u\n",
476 dprintk("mpoa: mpoa_caches.c: mps_ip = %pI4\n", 497 ntohl(entry->ctrl_info.cache_id));
477 &entry->ctrl_info.mps_ip); 498 dprintk("mps_ip = %pI4\n", &entry->ctrl_info.mps_ip);
478 atomic_inc(&entry->use); 499 atomic_inc(&entry->use);
479 500
480 write_unlock_irq(&client->egress_lock); 501 write_unlock_irq(&client->egress_lock);
481 dprintk("mpoa: mpoa_caches.c: new_eg_cache_entry: unlocked\n"); 502 dprintk("new_eg_cache_entry: unlocked\n");
482 503
483 return entry; 504 return entry;
484} 505}
485 506
486static void update_eg_cache_entry(eg_cache_entry * entry, uint16_t holding_time) 507static void update_eg_cache_entry(eg_cache_entry *entry, uint16_t holding_time)
487{ 508{
488 do_gettimeofday(&(entry->tv)); 509 do_gettimeofday(&(entry->tv));
489 entry->entry_state = EGRESS_RESOLVED; 510 entry->entry_state = EGRESS_RESOLVED;
@@ -502,13 +523,14 @@ static void clear_expired(struct mpoa_client *client)
502 523
503 write_lock_irq(&client->egress_lock); 524 write_lock_irq(&client->egress_lock);
504 entry = client->eg_cache; 525 entry = client->eg_cache;
505 while(entry != NULL){ 526 while (entry != NULL) {
506 next_entry = entry->next; 527 next_entry = entry->next;
507 if((now.tv_sec - entry->tv.tv_sec) 528 if ((now.tv_sec - entry->tv.tv_sec)
508 > entry->ctrl_info.holding_time){ 529 > entry->ctrl_info.holding_time) {
509 msg.type = SND_EGRESS_PURGE; 530 msg.type = SND_EGRESS_PURGE;
510 msg.content.eg_info = entry->ctrl_info; 531 msg.content.eg_info = entry->ctrl_info;
511 dprintk("mpoa: mpoa_caches.c: egress_cache: holding time expired, cache_id = %lu.\n",ntohl(entry->ctrl_info.cache_id)); 532 dprintk("egress_cache: holding time expired, cache_id = %u.\n",
533 ntohl(entry->ctrl_info.cache_id));
512 msg_to_mpoad(&msg, client); 534 msg_to_mpoad(&msg, client);
513 client->eg_ops->remove_entry(entry, client); 535 client->eg_ops->remove_entry(entry, client);
514 } 536 }
@@ -522,7 +544,7 @@ static void clear_expired(struct mpoa_client *client)
522static void eg_destroy_cache(struct mpoa_client *mpc) 544static void eg_destroy_cache(struct mpoa_client *mpc)
523{ 545{
524 write_lock_irq(&mpc->egress_lock); 546 write_lock_irq(&mpc->egress_lock);
525 while(mpc->eg_cache != NULL) 547 while (mpc->eg_cache != NULL)
526 mpc->eg_ops->remove_entry(mpc->eg_cache, mpc); 548 mpc->eg_ops->remove_entry(mpc->eg_cache, mpc);
527 write_unlock_irq(&mpc->egress_lock); 549 write_unlock_irq(&mpc->egress_lock);
528 550
@@ -530,7 +552,6 @@ static void eg_destroy_cache(struct mpoa_client *mpc)
530} 552}
531 553
532 554
533
534static struct in_cache_ops ingress_ops = { 555static struct in_cache_ops ingress_ops = {
535 in_cache_add_entry, /* add_entry */ 556 in_cache_add_entry, /* add_entry */
536 in_cache_get, /* get */ 557 in_cache_get, /* get */
diff --git a/net/atm/mpoa_proc.c b/net/atm/mpoa_proc.c
index 1a0f5ccea9c4..53e500292271 100644
--- a/net/atm/mpoa_proc.c
+++ b/net/atm/mpoa_proc.c
@@ -1,3 +1,4 @@
1#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
1 2
2#ifdef CONFIG_PROC_FS 3#ifdef CONFIG_PROC_FS
3#include <linux/errno.h> 4#include <linux/errno.h>
@@ -8,9 +9,10 @@
8#include <linux/proc_fs.h> 9#include <linux/proc_fs.h>
9#include <linux/time.h> 10#include <linux/time.h>
10#include <linux/seq_file.h> 11#include <linux/seq_file.h>
11#include <asm/uaccess.h> 12#include <linux/uaccess.h>
12#include <linux/atmmpc.h> 13#include <linux/atmmpc.h>
13#include <linux/atm.h> 14#include <linux/atm.h>
15#include <linux/gfp.h>
14#include "mpc.h" 16#include "mpc.h"
15#include "mpoa_caches.h" 17#include "mpoa_caches.h"
16 18
@@ -20,9 +22,23 @@
20 */ 22 */
21 23
22#if 1 24#if 1
23#define dprintk printk /* debug */ 25#define dprintk(format, args...) \
26 printk(KERN_DEBUG "mpoa:%s: " format, __FILE__, ##args) /* debug */
24#else 27#else
25#define dprintk(format,args...) 28#define dprintk(format, args...) \
29 do { if (0) \
30 printk(KERN_DEBUG "mpoa:%s: " format, __FILE__, ##args);\
31 } while (0)
32#endif
33
34#if 0
35#define ddprintk(format, args...) \
36 printk(KERN_DEBUG "mpoa:%s: " format, __FILE__, ##args) /* debug */
37#else
38#define ddprintk(format, args...) \
39 do { if (0) \
40 printk(KERN_DEBUG "mpoa:%s: " format, __FILE__, ##args);\
41 } while (0)
26#endif 42#endif
27 43
28#define STAT_FILE_NAME "mpc" /* Our statistic file's name */ 44#define STAT_FILE_NAME "mpc" /* Our statistic file's name */
@@ -51,42 +67,37 @@ static const struct file_operations mpc_file_operations = {
51/* 67/*
52 * Returns the state of an ingress cache entry as a string 68 * Returns the state of an ingress cache entry as a string
53 */ 69 */
54static const char *ingress_state_string(int state){ 70static const char *ingress_state_string(int state)
55 switch(state) { 71{
72 switch (state) {
56 case INGRESS_RESOLVING: 73 case INGRESS_RESOLVING:
57 return "resolving "; 74 return "resolving ";
58 break;
59 case INGRESS_RESOLVED: 75 case INGRESS_RESOLVED:
60 return "resolved "; 76 return "resolved ";
61 break;
62 case INGRESS_INVALID: 77 case INGRESS_INVALID:
63 return "invalid "; 78 return "invalid ";
64 break;
65 case INGRESS_REFRESHING: 79 case INGRESS_REFRESHING:
66 return "refreshing "; 80 return "refreshing ";
67 break;
68 default:
69 return "";
70 } 81 }
82
83 return "";
71} 84}
72 85
73/* 86/*
74 * Returns the state of an egress cache entry as a string 87 * Returns the state of an egress cache entry as a string
75 */ 88 */
76static const char *egress_state_string(int state){ 89static const char *egress_state_string(int state)
77 switch(state) { 90{
91 switch (state) {
78 case EGRESS_RESOLVED: 92 case EGRESS_RESOLVED:
79 return "resolved "; 93 return "resolved ";
80 break;
81 case EGRESS_PURGE: 94 case EGRESS_PURGE:
82 return "purge "; 95 return "purge ";
83 break;
84 case EGRESS_INVALID: 96 case EGRESS_INVALID:
85 return "invalid "; 97 return "invalid ";
86 break;
87 default:
88 return "";
89 } 98 }
99
100 return "";
90} 101}
91 102
92/* 103/*
@@ -123,7 +134,6 @@ static void mpc_stop(struct seq_file *m, void *v)
123static int mpc_show(struct seq_file *m, void *v) 134static int mpc_show(struct seq_file *m, void *v)
124{ 135{
125 struct mpoa_client *mpc = v; 136 struct mpoa_client *mpc = v;
126 unsigned char *temp;
127 int i; 137 int i;
128 in_cache_entry *in_entry; 138 in_cache_entry *in_entry;
129 eg_cache_entry *eg_entry; 139 eg_cache_entry *eg_entry;
@@ -140,15 +150,17 @@ static int mpc_show(struct seq_file *m, void *v)
140 do_gettimeofday(&now); 150 do_gettimeofday(&now);
141 151
142 for (in_entry = mpc->in_cache; in_entry; in_entry = in_entry->next) { 152 for (in_entry = mpc->in_cache; in_entry; in_entry = in_entry->next) {
143 temp = (unsigned char *)&in_entry->ctrl_info.in_dst_ip; 153 sprintf(ip_string, "%pI4", &in_entry->ctrl_info.in_dst_ip);
144 sprintf(ip_string,"%d.%d.%d.%d", temp[0], temp[1], temp[2], temp[3]);
145 seq_printf(m, "%-16s%s%-14lu%-12u", 154 seq_printf(m, "%-16s%s%-14lu%-12u",
146 ip_string, 155 ip_string,
147 ingress_state_string(in_entry->entry_state), 156 ingress_state_string(in_entry->entry_state),
148 in_entry->ctrl_info.holding_time-(now.tv_sec-in_entry->tv.tv_sec), 157 in_entry->ctrl_info.holding_time -
149 in_entry->packets_fwded); 158 (now.tv_sec-in_entry->tv.tv_sec),
159 in_entry->packets_fwded);
150 if (in_entry->shortcut) 160 if (in_entry->shortcut)
151 seq_printf(m, " %-3d %-3d",in_entry->shortcut->vpi,in_entry->shortcut->vci); 161 seq_printf(m, " %-3d %-3d",
162 in_entry->shortcut->vpi,
163 in_entry->shortcut->vci);
152 seq_printf(m, "\n"); 164 seq_printf(m, "\n");
153 } 165 }
154 166
@@ -156,21 +168,23 @@ static int mpc_show(struct seq_file *m, void *v)
156 seq_printf(m, "Egress Entries:\nIngress MPC ATM addr\nCache-id State Holding time Packets recvd Latest IP addr VPI VCI\n"); 168 seq_printf(m, "Egress Entries:\nIngress MPC ATM addr\nCache-id State Holding time Packets recvd Latest IP addr VPI VCI\n");
157 for (eg_entry = mpc->eg_cache; eg_entry; eg_entry = eg_entry->next) { 169 for (eg_entry = mpc->eg_cache; eg_entry; eg_entry = eg_entry->next) {
158 unsigned char *p = eg_entry->ctrl_info.in_MPC_data_ATM_addr; 170 unsigned char *p = eg_entry->ctrl_info.in_MPC_data_ATM_addr;
159 for(i = 0; i < ATM_ESA_LEN; i++) 171 for (i = 0; i < ATM_ESA_LEN; i++)
160 seq_printf(m, "%02x", p[i]); 172 seq_printf(m, "%02x", p[i]);
161 seq_printf(m, "\n%-16lu%s%-14lu%-15u", 173 seq_printf(m, "\n%-16lu%s%-14lu%-15u",
162 (unsigned long)ntohl(eg_entry->ctrl_info.cache_id), 174 (unsigned long)ntohl(eg_entry->ctrl_info.cache_id),
163 egress_state_string(eg_entry->entry_state), 175 egress_state_string(eg_entry->entry_state),
164 (eg_entry->ctrl_info.holding_time-(now.tv_sec-eg_entry->tv.tv_sec)), 176 (eg_entry->ctrl_info.holding_time -
177 (now.tv_sec-eg_entry->tv.tv_sec)),
165 eg_entry->packets_rcvd); 178 eg_entry->packets_rcvd);
166 179
167 /* latest IP address */ 180 /* latest IP address */
168 temp = (unsigned char *)&eg_entry->latest_ip_addr; 181 sprintf(ip_string, "%pI4", &eg_entry->latest_ip_addr);
169 sprintf(ip_string, "%d.%d.%d.%d", temp[0], temp[1], temp[2], temp[3]);
170 seq_printf(m, "%-16s", ip_string); 182 seq_printf(m, "%-16s", ip_string);
171 183
172 if (eg_entry->shortcut) 184 if (eg_entry->shortcut)
173 seq_printf(m, " %-3d %-3d",eg_entry->shortcut->vpi,eg_entry->shortcut->vci); 185 seq_printf(m, " %-3d %-3d",
186 eg_entry->shortcut->vpi,
187 eg_entry->shortcut->vci);
174 seq_printf(m, "\n"); 188 seq_printf(m, "\n");
175 } 189 }
176 seq_printf(m, "\n"); 190 seq_printf(m, "\n");
@@ -258,12 +272,9 @@ static int parse_qos(const char *buff)
258 qos.rxtp.max_pcr = rx_pcr; 272 qos.rxtp.max_pcr = rx_pcr;
259 qos.rxtp.max_sdu = rx_sdu; 273 qos.rxtp.max_sdu = rx_sdu;
260 qos.aal = ATM_AAL5; 274 qos.aal = ATM_AAL5;
261 dprintk("mpoa: mpoa_proc.c: parse_qos(): setting qos paramameters to tx=%d,%d rx=%d,%d\n", 275 dprintk("parse_qos(): setting qos paramameters to tx=%d,%d rx=%d,%d\n",
262 qos.txtp.max_pcr, 276 qos.txtp.max_pcr, qos.txtp.max_sdu,
263 qos.txtp.max_sdu, 277 qos.rxtp.max_pcr, qos.rxtp.max_sdu);
264 qos.rxtp.max_pcr,
265 qos.rxtp.max_sdu
266 );
267 278
268 atm_mpoa_add_qos(ipaddr, &qos); 279 atm_mpoa_add_qos(ipaddr, &qos);
269 return 1; 280 return 1;
@@ -278,7 +289,7 @@ int mpc_proc_init(void)
278 289
279 p = proc_create(STAT_FILE_NAME, 0, atm_proc_root, &mpc_file_operations); 290 p = proc_create(STAT_FILE_NAME, 0, atm_proc_root, &mpc_file_operations);
280 if (!p) { 291 if (!p) {
281 printk(KERN_ERR "Unable to initialize /proc/atm/%s\n", STAT_FILE_NAME); 292 pr_err("Unable to initialize /proc/atm/%s\n", STAT_FILE_NAME);
282 return -ENOMEM; 293 return -ENOMEM;
283 } 294 }
284 return 0; 295 return 0;
@@ -289,10 +300,9 @@ int mpc_proc_init(void)
289 */ 300 */
290void mpc_proc_clean(void) 301void mpc_proc_clean(void)
291{ 302{
292 remove_proc_entry(STAT_FILE_NAME,atm_proc_root); 303 remove_proc_entry(STAT_FILE_NAME, atm_proc_root);
293} 304}
294 305
295
296#endif /* CONFIG_PROC_FS */ 306#endif /* CONFIG_PROC_FS */
297 307
298 308
diff --git a/net/atm/pppoatm.c b/net/atm/pppoatm.c
index 0af84cd4f65b..e49bb6d948a1 100644
--- a/net/atm/pppoatm.c
+++ b/net/atm/pppoatm.c
@@ -33,9 +33,12 @@
33 * These hooks are not yet available in ppp_generic 33 * These hooks are not yet available in ppp_generic
34 */ 34 */
35 35
36#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
37
36#include <linux/module.h> 38#include <linux/module.h>
37#include <linux/init.h> 39#include <linux/init.h>
38#include <linux/skbuff.h> 40#include <linux/skbuff.h>
41#include <linux/slab.h>
39#include <linux/atm.h> 42#include <linux/atm.h>
40#include <linux/atmdev.h> 43#include <linux/atmdev.h>
41#include <linux/capability.h> 44#include <linux/capability.h>
@@ -132,7 +135,7 @@ static void pppoatm_unassign_vcc(struct atm_vcc *atmvcc)
132static void pppoatm_push(struct atm_vcc *atmvcc, struct sk_buff *skb) 135static void pppoatm_push(struct atm_vcc *atmvcc, struct sk_buff *skb)
133{ 136{
134 struct pppoatm_vcc *pvcc = atmvcc_to_pvcc(atmvcc); 137 struct pppoatm_vcc *pvcc = atmvcc_to_pvcc(atmvcc);
135 pr_debug("pppoatm push\n"); 138 pr_debug("\n");
136 if (skb == NULL) { /* VCC was closed */ 139 if (skb == NULL) { /* VCC was closed */
137 pr_debug("removing ATMPPP VCC %p\n", pvcc); 140 pr_debug("removing ATMPPP VCC %p\n", pvcc);
138 pppoatm_unassign_vcc(atmvcc); 141 pppoatm_unassign_vcc(atmvcc);
@@ -165,17 +168,17 @@ static void pppoatm_push(struct atm_vcc *atmvcc, struct sk_buff *skb)
165 pvcc->chan.mtu += LLC_LEN; 168 pvcc->chan.mtu += LLC_LEN;
166 break; 169 break;
167 } 170 }
168 pr_debug("Couldn't autodetect yet " 171 pr_debug("Couldn't autodetect yet (skb: %02X %02X %02X %02X %02X %02X)\n",
169 "(skb: %02X %02X %02X %02X %02X %02X)\n", 172 skb->data[0], skb->data[1], skb->data[2],
170 skb->data[0], skb->data[1], skb->data[2], 173 skb->data[3], skb->data[4], skb->data[5]);
171 skb->data[3], skb->data[4], skb->data[5]);
172 goto error; 174 goto error;
173 case e_vc: 175 case e_vc:
174 break; 176 break;
175 } 177 }
176 ppp_input(&pvcc->chan, skb); 178 ppp_input(&pvcc->chan, skb);
177 return; 179 return;
178 error: 180
181error:
179 kfree_skb(skb); 182 kfree_skb(skb);
180 ppp_input_error(&pvcc->chan, 0); 183 ppp_input_error(&pvcc->chan, 0);
181} 184}
@@ -194,7 +197,7 @@ static int pppoatm_send(struct ppp_channel *chan, struct sk_buff *skb)
194{ 197{
195 struct pppoatm_vcc *pvcc = chan_to_pvcc(chan); 198 struct pppoatm_vcc *pvcc = chan_to_pvcc(chan);
196 ATM_SKB(skb)->vcc = pvcc->atmvcc; 199 ATM_SKB(skb)->vcc = pvcc->atmvcc;
197 pr_debug("pppoatm_send (skb=0x%p, vcc=0x%p)\n", skb, pvcc->atmvcc); 200 pr_debug("(skb=0x%p, vcc=0x%p)\n", skb, pvcc->atmvcc);
198 if (skb->data[0] == '\0' && (pvcc->flags & SC_COMP_PROT)) 201 if (skb->data[0] == '\0' && (pvcc->flags & SC_COMP_PROT))
199 (void) skb_pull(skb, 1); 202 (void) skb_pull(skb, 1);
200 switch (pvcc->encaps) { /* LLC encapsulation needed */ 203 switch (pvcc->encaps) { /* LLC encapsulation needed */
@@ -208,7 +211,8 @@ static int pppoatm_send(struct ppp_channel *chan, struct sk_buff *skb)
208 goto nospace; 211 goto nospace;
209 } 212 }
210 kfree_skb(skb); 213 kfree_skb(skb);
211 if ((skb = n) == NULL) 214 skb = n;
215 if (skb == NULL)
212 return DROP_PACKET; 216 return DROP_PACKET;
213 } else if (!atm_may_send(pvcc->atmvcc, skb->truesize)) 217 } else if (!atm_may_send(pvcc->atmvcc, skb->truesize))
214 goto nospace; 218 goto nospace;
@@ -226,11 +230,11 @@ static int pppoatm_send(struct ppp_channel *chan, struct sk_buff *skb)
226 230
227 atomic_add(skb->truesize, &sk_atm(ATM_SKB(skb)->vcc)->sk_wmem_alloc); 231 atomic_add(skb->truesize, &sk_atm(ATM_SKB(skb)->vcc)->sk_wmem_alloc);
228 ATM_SKB(skb)->atm_options = ATM_SKB(skb)->vcc->atm_options; 232 ATM_SKB(skb)->atm_options = ATM_SKB(skb)->vcc->atm_options;
229 pr_debug("atm_skb(%p)->vcc(%p)->dev(%p)\n", skb, ATM_SKB(skb)->vcc, 233 pr_debug("atm_skb(%p)->vcc(%p)->dev(%p)\n",
230 ATM_SKB(skb)->vcc->dev); 234 skb, ATM_SKB(skb)->vcc, ATM_SKB(skb)->vcc->dev);
231 return ATM_SKB(skb)->vcc->send(ATM_SKB(skb)->vcc, skb) 235 return ATM_SKB(skb)->vcc->send(ATM_SKB(skb)->vcc, skb)
232 ? DROP_PACKET : 1; 236 ? DROP_PACKET : 1;
233 nospace: 237nospace:
234 /* 238 /*
235 * We don't have space to send this SKB now, but we might have 239 * We don't have space to send this SKB now, but we might have
236 * already applied SC_COMP_PROT compression, so may need to undo 240 * already applied SC_COMP_PROT compression, so may need to undo
@@ -289,7 +293,8 @@ static int pppoatm_assign_vcc(struct atm_vcc *atmvcc, void __user *arg)
289 (be.encaps == e_vc ? 0 : LLC_LEN); 293 (be.encaps == e_vc ? 0 : LLC_LEN);
290 pvcc->wakeup_tasklet = tasklet_proto; 294 pvcc->wakeup_tasklet = tasklet_proto;
291 pvcc->wakeup_tasklet.data = (unsigned long) &pvcc->chan; 295 pvcc->wakeup_tasklet.data = (unsigned long) &pvcc->chan;
292 if ((err = ppp_register_channel(&pvcc->chan)) != 0) { 296 err = ppp_register_channel(&pvcc->chan);
297 if (err != 0) {
293 kfree(pvcc); 298 kfree(pvcc);
294 return err; 299 return err;
295 } 300 }
diff --git a/net/atm/proc.c b/net/atm/proc.c
index ab8419a324b6..696e218436e5 100644
--- a/net/atm/proc.c
+++ b/net/atm/proc.c
@@ -22,17 +22,18 @@
22#include <linux/netdevice.h> 22#include <linux/netdevice.h>
23#include <linux/atmclip.h> 23#include <linux/atmclip.h>
24#include <linux/init.h> /* for __init */ 24#include <linux/init.h> /* for __init */
25#include <linux/slab.h>
25#include <net/net_namespace.h> 26#include <net/net_namespace.h>
26#include <net/atmclip.h> 27#include <net/atmclip.h>
27#include <asm/uaccess.h> 28#include <linux/uaccess.h>
29#include <linux/param.h> /* for HZ */
28#include <asm/atomic.h> 30#include <asm/atomic.h>
29#include <asm/param.h> /* for HZ */
30#include "resources.h" 31#include "resources.h"
31#include "common.h" /* atm_proc_init prototype */ 32#include "common.h" /* atm_proc_init prototype */
32#include "signaling.h" /* to get sigd - ugly too */ 33#include "signaling.h" /* to get sigd - ugly too */
33 34
34static ssize_t proc_dev_atm_read(struct file *file,char __user *buf,size_t count, 35static ssize_t proc_dev_atm_read(struct file *file, char __user *buf,
35 loff_t *pos); 36 size_t count, loff_t *pos);
36 37
37static const struct file_operations proc_atm_dev_ops = { 38static const struct file_operations proc_atm_dev_ops = {
38 .owner = THIS_MODULE, 39 .owner = THIS_MODULE,
@@ -43,9 +44,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
43 const struct k_atm_aal_stats *stats) 44 const struct k_atm_aal_stats *stats)
44{ 45{
45 seq_printf(seq, "%s ( %d %d %d %d %d )", aal, 46 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
46 atomic_read(&stats->tx),atomic_read(&stats->tx_err), 47 atomic_read(&stats->tx), atomic_read(&stats->tx_err),
47 atomic_read(&stats->rx),atomic_read(&stats->rx_err), 48 atomic_read(&stats->rx), atomic_read(&stats->rx_err),
48 atomic_read(&stats->rx_drop)); 49 atomic_read(&stats->rx_drop));
49} 50}
50 51
51static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev) 52static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
@@ -151,8 +152,8 @@ static void *vcc_seq_next(struct seq_file *seq, void *v, loff_t *pos)
151 152
152static void pvc_info(struct seq_file *seq, struct atm_vcc *vcc) 153static void pvc_info(struct seq_file *seq, struct atm_vcc *vcc)
153{ 154{
154 static const char *const class_name[] = 155 static const char *const class_name[] = {
155 {"off","UBR","CBR","VBR","ABR"}; 156 "off", "UBR", "CBR", "VBR", "ABR"};
156 static const char *const aal_name[] = { 157 static const char *const aal_name[] = {
157 "---", "1", "2", "3/4", /* 0- 3 */ 158 "---", "1", "2", "3/4", /* 0- 3 */
158 "???", "5", "???", "???", /* 4- 7 */ 159 "???", "5", "???", "???", /* 4- 7 */
@@ -160,11 +161,12 @@ static void pvc_info(struct seq_file *seq, struct atm_vcc *vcc)
160 "???", "0", "???", "???"}; /* 12-15 */ 161 "???", "0", "???", "???"}; /* 12-15 */
161 162
162 seq_printf(seq, "%3d %3d %5d %-3s %7d %-5s %7d %-6s", 163 seq_printf(seq, "%3d %3d %5d %-3s %7d %-5s %7d %-6s",
163 vcc->dev->number,vcc->vpi,vcc->vci, 164 vcc->dev->number, vcc->vpi, vcc->vci,
164 vcc->qos.aal >= ARRAY_SIZE(aal_name) ? "err" : 165 vcc->qos.aal >= ARRAY_SIZE(aal_name) ? "err" :
165 aal_name[vcc->qos.aal],vcc->qos.rxtp.min_pcr, 166 aal_name[vcc->qos.aal], vcc->qos.rxtp.min_pcr,
166 class_name[vcc->qos.rxtp.traffic_class],vcc->qos.txtp.min_pcr, 167 class_name[vcc->qos.rxtp.traffic_class],
167 class_name[vcc->qos.txtp.traffic_class]); 168 vcc->qos.txtp.min_pcr,
169 class_name[vcc->qos.txtp.traffic_class]);
168 if (test_bit(ATM_VF_IS_CLIP, &vcc->flags)) { 170 if (test_bit(ATM_VF_IS_CLIP, &vcc->flags)) {
169 struct clip_vcc *clip_vcc = CLIP_VCC(vcc); 171 struct clip_vcc *clip_vcc = CLIP_VCC(vcc);
170 struct net_device *dev; 172 struct net_device *dev;
@@ -195,19 +197,20 @@ static void vcc_info(struct seq_file *seq, struct atm_vcc *vcc)
195 seq_printf(seq, "%3d %3d %5d ", vcc->dev->number, vcc->vpi, 197 seq_printf(seq, "%3d %3d %5d ", vcc->dev->number, vcc->vpi,
196 vcc->vci); 198 vcc->vci);
197 switch (sk->sk_family) { 199 switch (sk->sk_family) {
198 case AF_ATMPVC: 200 case AF_ATMPVC:
199 seq_printf(seq, "PVC"); 201 seq_printf(seq, "PVC");
200 break; 202 break;
201 case AF_ATMSVC: 203 case AF_ATMSVC:
202 seq_printf(seq, "SVC"); 204 seq_printf(seq, "SVC");
203 break; 205 break;
204 default: 206 default:
205 seq_printf(seq, "%3d", sk->sk_family); 207 seq_printf(seq, "%3d", sk->sk_family);
206 } 208 }
207 seq_printf(seq, " %04lx %5d %7d/%7d %7d/%7d [%d]\n", vcc->flags, sk->sk_err, 209 seq_printf(seq, " %04lx %5d %7d/%7d %7d/%7d [%d]\n",
208 sk_wmem_alloc_get(sk), sk->sk_sndbuf, 210 vcc->flags, sk->sk_err,
209 sk_rmem_alloc_get(sk), sk->sk_rcvbuf, 211 sk_wmem_alloc_get(sk), sk->sk_sndbuf,
210 atomic_read(&sk->sk_refcnt)); 212 sk_rmem_alloc_get(sk), sk->sk_rcvbuf,
213 atomic_read(&sk->sk_refcnt));
211} 214}
212 215
213static void svc_info(struct seq_file *seq, struct atm_vcc *vcc) 216static void svc_info(struct seq_file *seq, struct atm_vcc *vcc)
@@ -236,7 +239,7 @@ static int atm_dev_seq_show(struct seq_file *seq, void *v)
236 "Itf Type ESI/\"MAC\"addr " 239 "Itf Type ESI/\"MAC\"addr "
237 "AAL(TX,err,RX,err,drop) ... [refcnt]\n"; 240 "AAL(TX,err,RX,err,drop) ... [refcnt]\n";
238 241
239 if (v == SEQ_START_TOKEN) 242 if (v == &atm_devs)
240 seq_puts(seq, atm_dev_banner); 243 seq_puts(seq, atm_dev_banner);
241 else { 244 else {
242 struct atm_dev *dev = list_entry(v, struct atm_dev, dev_list); 245 struct atm_dev *dev = list_entry(v, struct atm_dev, dev_list);
@@ -376,32 +379,35 @@ static ssize_t proc_dev_atm_read(struct file *file, char __user *buf,
376 unsigned long page; 379 unsigned long page;
377 int length; 380 int length;
378 381
379 if (count == 0) return 0; 382 if (count == 0)
383 return 0;
380 page = get_zeroed_page(GFP_KERNEL); 384 page = get_zeroed_page(GFP_KERNEL);
381 if (!page) return -ENOMEM; 385 if (!page)
386 return -ENOMEM;
382 dev = PDE(file->f_path.dentry->d_inode)->data; 387 dev = PDE(file->f_path.dentry->d_inode)->data;
383 if (!dev->ops->proc_read) 388 if (!dev->ops->proc_read)
384 length = -EINVAL; 389 length = -EINVAL;
385 else { 390 else {
386 length = dev->ops->proc_read(dev,pos,(char *) page); 391 length = dev->ops->proc_read(dev, pos, (char *)page);
387 if (length > count) length = -EINVAL; 392 if (length > count)
393 length = -EINVAL;
388 } 394 }
389 if (length >= 0) { 395 if (length >= 0) {
390 if (copy_to_user(buf,(char *) page,length)) length = -EFAULT; 396 if (copy_to_user(buf, (char *)page, length))
397 length = -EFAULT;
391 (*pos)++; 398 (*pos)++;
392 } 399 }
393 free_page(page); 400 free_page(page);
394 return length; 401 return length;
395} 402}
396 403
397
398struct proc_dir_entry *atm_proc_root; 404struct proc_dir_entry *atm_proc_root;
399EXPORT_SYMBOL(atm_proc_root); 405EXPORT_SYMBOL(atm_proc_root);
400 406
401 407
402int atm_proc_dev_register(struct atm_dev *dev) 408int atm_proc_dev_register(struct atm_dev *dev)
403{ 409{
404 int digits,num; 410 int digits, num;
405 int error; 411 int error;
406 412
407 /* No proc info */ 413 /* No proc info */
@@ -410,26 +416,28 @@ int atm_proc_dev_register(struct atm_dev *dev)
410 416
411 error = -ENOMEM; 417 error = -ENOMEM;
412 digits = 0; 418 digits = 0;
413 for (num = dev->number; num; num /= 10) digits++; 419 for (num = dev->number; num; num /= 10)
414 if (!digits) digits++; 420 digits++;
421 if (!digits)
422 digits++;
415 423
416 dev->proc_name = kmalloc(strlen(dev->type) + digits + 2, GFP_KERNEL); 424 dev->proc_name = kmalloc(strlen(dev->type) + digits + 2, GFP_KERNEL);
417 if (!dev->proc_name) 425 if (!dev->proc_name)
418 goto err_out; 426 goto err_out;
419 sprintf(dev->proc_name,"%s:%d",dev->type, dev->number); 427 sprintf(dev->proc_name, "%s:%d", dev->type, dev->number);
420 428
421 dev->proc_entry = proc_create_data(dev->proc_name, 0, atm_proc_root, 429 dev->proc_entry = proc_create_data(dev->proc_name, 0, atm_proc_root,
422 &proc_atm_dev_ops, dev); 430 &proc_atm_dev_ops, dev);
423 if (!dev->proc_entry) 431 if (!dev->proc_entry)
424 goto err_free_name; 432 goto err_free_name;
425 return 0; 433 return 0;
434
426err_free_name: 435err_free_name:
427 kfree(dev->proc_name); 436 kfree(dev->proc_name);
428err_out: 437err_out:
429 return error; 438 return error;
430} 439}
431 440
432
433void atm_proc_dev_deregister(struct atm_dev *dev) 441void atm_proc_dev_deregister(struct atm_dev *dev)
434{ 442{
435 if (!dev->ops->proc_read) 443 if (!dev->ops->proc_read)
diff --git a/net/atm/pvc.c b/net/atm/pvc.c
index d4c024504f99..437ee70c5e62 100644
--- a/net/atm/pvc.c
+++ b/net/atm/pvc.c
@@ -17,32 +17,35 @@
17#include "common.h" /* common for PVCs and SVCs */ 17#include "common.h" /* common for PVCs and SVCs */
18 18
19 19
20static int pvc_shutdown(struct socket *sock,int how) 20static int pvc_shutdown(struct socket *sock, int how)
21{ 21{
22 return 0; 22 return 0;
23} 23}
24 24
25 25static int pvc_bind(struct socket *sock, struct sockaddr *sockaddr,
26static int pvc_bind(struct socket *sock,struct sockaddr *sockaddr, 26 int sockaddr_len)
27 int sockaddr_len)
28{ 27{
29 struct sock *sk = sock->sk; 28 struct sock *sk = sock->sk;
30 struct sockaddr_atmpvc *addr; 29 struct sockaddr_atmpvc *addr;
31 struct atm_vcc *vcc; 30 struct atm_vcc *vcc;
32 int error; 31 int error;
33 32
34 if (sockaddr_len != sizeof(struct sockaddr_atmpvc)) return -EINVAL; 33 if (sockaddr_len != sizeof(struct sockaddr_atmpvc))
35 addr = (struct sockaddr_atmpvc *) sockaddr; 34 return -EINVAL;
36 if (addr->sap_family != AF_ATMPVC) return -EAFNOSUPPORT; 35 addr = (struct sockaddr_atmpvc *)sockaddr;
36 if (addr->sap_family != AF_ATMPVC)
37 return -EAFNOSUPPORT;
37 lock_sock(sk); 38 lock_sock(sk);
38 vcc = ATM_SD(sock); 39 vcc = ATM_SD(sock);
39 if (!test_bit(ATM_VF_HASQOS, &vcc->flags)) { 40 if (!test_bit(ATM_VF_HASQOS, &vcc->flags)) {
40 error = -EBADFD; 41 error = -EBADFD;
41 goto out; 42 goto out;
42 } 43 }
43 if (test_bit(ATM_VF_PARTIAL,&vcc->flags)) { 44 if (test_bit(ATM_VF_PARTIAL, &vcc->flags)) {
44 if (vcc->vpi != ATM_VPI_UNSPEC) addr->sap_addr.vpi = vcc->vpi; 45 if (vcc->vpi != ATM_VPI_UNSPEC)
45 if (vcc->vci != ATM_VCI_UNSPEC) addr->sap_addr.vci = vcc->vci; 46 addr->sap_addr.vpi = vcc->vpi;
47 if (vcc->vci != ATM_VCI_UNSPEC)
48 addr->sap_addr.vci = vcc->vci;
46 } 49 }
47 error = vcc_connect(sock, addr->sap_addr.itf, addr->sap_addr.vpi, 50 error = vcc_connect(sock, addr->sap_addr.itf, addr->sap_addr.vpi,
48 addr->sap_addr.vci); 51 addr->sap_addr.vci);
@@ -51,11 +54,10 @@ out:
51 return error; 54 return error;
52} 55}
53 56
54 57static int pvc_connect(struct socket *sock, struct sockaddr *sockaddr,
55static int pvc_connect(struct socket *sock,struct sockaddr *sockaddr, 58 int sockaddr_len, int flags)
56 int sockaddr_len,int flags)
57{ 59{
58 return pvc_bind(sock,sockaddr,sockaddr_len); 60 return pvc_bind(sock, sockaddr, sockaddr_len);
59} 61}
60 62
61static int pvc_setsockopt(struct socket *sock, int level, int optname, 63static int pvc_setsockopt(struct socket *sock, int level, int optname,
@@ -70,7 +72,6 @@ static int pvc_setsockopt(struct socket *sock, int level, int optname,
70 return error; 72 return error;
71} 73}
72 74
73
74static int pvc_getsockopt(struct socket *sock, int level, int optname, 75static int pvc_getsockopt(struct socket *sock, int level, int optname,
75 char __user *optval, int __user *optlen) 76 char __user *optval, int __user *optlen)
76{ 77{
@@ -83,16 +84,16 @@ static int pvc_getsockopt(struct socket *sock, int level, int optname,
83 return error; 84 return error;
84} 85}
85 86
86 87static int pvc_getname(struct socket *sock, struct sockaddr *sockaddr,
87static int pvc_getname(struct socket *sock,struct sockaddr *sockaddr, 88 int *sockaddr_len, int peer)
88 int *sockaddr_len,int peer)
89{ 89{
90 struct sockaddr_atmpvc *addr; 90 struct sockaddr_atmpvc *addr;
91 struct atm_vcc *vcc = ATM_SD(sock); 91 struct atm_vcc *vcc = ATM_SD(sock);
92 92
93 if (!vcc->dev || !test_bit(ATM_VF_ADDR,&vcc->flags)) return -ENOTCONN; 93 if (!vcc->dev || !test_bit(ATM_VF_ADDR, &vcc->flags))
94 return -ENOTCONN;
94 *sockaddr_len = sizeof(struct sockaddr_atmpvc); 95 *sockaddr_len = sizeof(struct sockaddr_atmpvc);
95 addr = (struct sockaddr_atmpvc *) sockaddr; 96 addr = (struct sockaddr_atmpvc *)sockaddr;
96 addr->sap_family = AF_ATMPVC; 97 addr->sap_family = AF_ATMPVC;
97 addr->sap_addr.itf = vcc->dev->number; 98 addr->sap_addr.itf = vcc->dev->number;
98 addr->sap_addr.vpi = vcc->vpi; 99 addr->sap_addr.vpi = vcc->vpi;
@@ -100,7 +101,6 @@ static int pvc_getname(struct socket *sock,struct sockaddr *sockaddr,
100 return 0; 101 return 0;
101} 102}
102 103
103
104static const struct proto_ops pvc_proto_ops = { 104static const struct proto_ops pvc_proto_ops = {
105 .family = PF_ATMPVC, 105 .family = PF_ATMPVC,
106 .owner = THIS_MODULE, 106 .owner = THIS_MODULE,
@@ -127,7 +127,8 @@ static const struct proto_ops pvc_proto_ops = {
127}; 127};
128 128
129 129
130static int pvc_create(struct net *net, struct socket *sock,int protocol) 130static int pvc_create(struct net *net, struct socket *sock, int protocol,
131 int kern)
131{ 132{
132 if (net != &init_net) 133 if (net != &init_net)
133 return -EAFNOSUPPORT; 134 return -EAFNOSUPPORT;
@@ -136,8 +137,7 @@ static int pvc_create(struct net *net, struct socket *sock,int protocol)
136 return vcc_create(net, sock, protocol, PF_ATMPVC); 137 return vcc_create(net, sock, protocol, PF_ATMPVC);
137} 138}
138 139
139 140static const struct net_proto_family pvc_family_ops = {
140static struct net_proto_family pvc_family_ops = {
141 .family = PF_ATMPVC, 141 .family = PF_ATMPVC,
142 .create = pvc_create, 142 .create = pvc_create,
143 .owner = THIS_MODULE, 143 .owner = THIS_MODULE,
diff --git a/net/atm/raw.c b/net/atm/raw.c
index cbfcc71a17b1..b4f7b9ff3c74 100644
--- a/net/atm/raw.c
+++ b/net/atm/raw.c
@@ -2,6 +2,7 @@
2 2
3/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */ 3/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
4 4
5#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
5 6
6#include <linux/module.h> 7#include <linux/module.h>
7#include <linux/atmdev.h> 8#include <linux/atmdev.h>
@@ -9,6 +10,7 @@
9#include <linux/kernel.h> 10#include <linux/kernel.h>
10#include <linux/skbuff.h> 11#include <linux/skbuff.h>
11#include <linux/mm.h> 12#include <linux/mm.h>
13#include <linux/slab.h>
12 14
13#include "common.h" 15#include "common.h"
14#include "protocols.h" 16#include "protocols.h"
@@ -17,7 +19,7 @@
17 * SKB == NULL indicates that the link is being closed 19 * SKB == NULL indicates that the link is being closed
18 */ 20 */
19 21
20static void atm_push_raw(struct atm_vcc *vcc,struct sk_buff *skb) 22static void atm_push_raw(struct atm_vcc *vcc, struct sk_buff *skb)
21{ 23{
22 if (skb) { 24 if (skb) {
23 struct sock *sk = sk_atm(vcc); 25 struct sock *sk = sk_atm(vcc);
@@ -27,36 +29,33 @@ static void atm_push_raw(struct atm_vcc *vcc,struct sk_buff *skb)
27 } 29 }
28} 30}
29 31
30 32static void atm_pop_raw(struct atm_vcc *vcc, struct sk_buff *skb)
31static void atm_pop_raw(struct atm_vcc *vcc,struct sk_buff *skb)
32{ 33{
33 struct sock *sk = sk_atm(vcc); 34 struct sock *sk = sk_atm(vcc);
34 35
35 pr_debug("APopR (%d) %d -= %d\n", vcc->vci, 36 pr_debug("(%d) %d -= %d\n",
36 sk_wmem_alloc_get(sk), skb->truesize); 37 vcc->vci, sk_wmem_alloc_get(sk), skb->truesize);
37 atomic_sub(skb->truesize, &sk->sk_wmem_alloc); 38 atomic_sub(skb->truesize, &sk->sk_wmem_alloc);
38 dev_kfree_skb_any(skb); 39 dev_kfree_skb_any(skb);
39 sk->sk_write_space(sk); 40 sk->sk_write_space(sk);
40} 41}
41 42
42 43static int atm_send_aal0(struct atm_vcc *vcc, struct sk_buff *skb)
43static int atm_send_aal0(struct atm_vcc *vcc,struct sk_buff *skb)
44{ 44{
45 /* 45 /*
46 * Note that if vpi/vci are _ANY or _UNSPEC the below will 46 * Note that if vpi/vci are _ANY or _UNSPEC the below will
47 * still work 47 * still work
48 */ 48 */
49 if (!capable(CAP_NET_ADMIN) && 49 if (!capable(CAP_NET_ADMIN) &&
50 (((u32 *) skb->data)[0] & (ATM_HDR_VPI_MASK | ATM_HDR_VCI_MASK)) != 50 (((u32 *)skb->data)[0] & (ATM_HDR_VPI_MASK | ATM_HDR_VCI_MASK)) !=
51 ((vcc->vpi << ATM_HDR_VPI_SHIFT) | (vcc->vci << ATM_HDR_VCI_SHIFT))) 51 ((vcc->vpi << ATM_HDR_VPI_SHIFT) |
52 { 52 (vcc->vci << ATM_HDR_VCI_SHIFT))) {
53 kfree_skb(skb); 53 kfree_skb(skb);
54 return -EADDRNOTAVAIL; 54 return -EADDRNOTAVAIL;
55 } 55 }
56 return vcc->dev->ops->send(vcc,skb); 56 return vcc->dev->ops->send(vcc, skb);
57} 57}
58 58
59
60int atm_init_aal0(struct atm_vcc *vcc) 59int atm_init_aal0(struct atm_vcc *vcc)
61{ 60{
62 vcc->push = atm_push_raw; 61 vcc->push = atm_push_raw;
@@ -66,7 +65,6 @@ int atm_init_aal0(struct atm_vcc *vcc)
66 return 0; 65 return 0;
67} 66}
68 67
69
70int atm_init_aal34(struct atm_vcc *vcc) 68int atm_init_aal34(struct atm_vcc *vcc)
71{ 69{
72 vcc->push = atm_push_raw; 70 vcc->push = atm_push_raw;
@@ -76,7 +74,6 @@ int atm_init_aal34(struct atm_vcc *vcc)
76 return 0; 74 return 0;
77} 75}
78 76
79
80int atm_init_aal5(struct atm_vcc *vcc) 77int atm_init_aal5(struct atm_vcc *vcc)
81{ 78{
82 vcc->push = atm_push_raw; 79 vcc->push = atm_push_raw;
@@ -85,6 +82,4 @@ int atm_init_aal5(struct atm_vcc *vcc)
85 vcc->send = vcc->dev->ops->send; 82 vcc->send = vcc->dev->ops->send;
86 return 0; 83 return 0;
87} 84}
88
89
90EXPORT_SYMBOL(atm_init_aal5); 85EXPORT_SYMBOL(atm_init_aal5);
diff --git a/net/atm/resources.c b/net/atm/resources.c
index 56b7322ff461..d29e58261511 100644
--- a/net/atm/resources.c
+++ b/net/atm/resources.c
@@ -7,6 +7,7 @@
7 * 2002/01 - don't free the whole struct sock on sk->destruct time, 7 * 2002/01 - don't free the whole struct sock on sk->destruct time,
8 * use the default destruct function initialized by sock_init_data */ 8 * use the default destruct function initialized by sock_init_data */
9 9
10#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
10 11
11#include <linux/ctype.h> 12#include <linux/ctype.h>
12#include <linux/string.h> 13#include <linux/string.h>
@@ -18,6 +19,7 @@
18#include <linux/capability.h> 19#include <linux/capability.h>
19#include <linux/delay.h> 20#include <linux/delay.h>
20#include <linux/mutex.h> 21#include <linux/mutex.h>
22#include <linux/slab.h>
21 23
22#include <net/sock.h> /* for struct sock */ 24#include <net/sock.h> /* for struct sock */
23 25
@@ -70,7 +72,7 @@ struct atm_dev *atm_dev_lookup(int number)
70 mutex_unlock(&atm_dev_mutex); 72 mutex_unlock(&atm_dev_mutex);
71 return dev; 73 return dev;
72} 74}
73 75EXPORT_SYMBOL(atm_dev_lookup);
74 76
75struct atm_dev *atm_dev_register(const char *type, const struct atmdev_ops *ops, 77struct atm_dev *atm_dev_register(const char *type, const struct atmdev_ops *ops,
76 int number, unsigned long *flags) 78 int number, unsigned long *flags)
@@ -79,13 +81,13 @@ struct atm_dev *atm_dev_register(const char *type, const struct atmdev_ops *ops,
79 81
80 dev = __alloc_atm_dev(type); 82 dev = __alloc_atm_dev(type);
81 if (!dev) { 83 if (!dev) {
82 printk(KERN_ERR "atm_dev_register: no space for dev %s\n", 84 pr_err("no space for dev %s\n", type);
83 type);
84 return NULL; 85 return NULL;
85 } 86 }
86 mutex_lock(&atm_dev_mutex); 87 mutex_lock(&atm_dev_mutex);
87 if (number != -1) { 88 if (number != -1) {
88 if ((inuse = __atm_dev_lookup(number))) { 89 inuse = __atm_dev_lookup(number);
90 if (inuse) {
89 atm_dev_put(inuse); 91 atm_dev_put(inuse);
90 mutex_unlock(&atm_dev_mutex); 92 mutex_unlock(&atm_dev_mutex);
91 kfree(dev); 93 kfree(dev);
@@ -109,16 +111,12 @@ struct atm_dev *atm_dev_register(const char *type, const struct atmdev_ops *ops,
109 atomic_set(&dev->refcnt, 1); 111 atomic_set(&dev->refcnt, 1);
110 112
111 if (atm_proc_dev_register(dev) < 0) { 113 if (atm_proc_dev_register(dev) < 0) {
112 printk(KERN_ERR "atm_dev_register: " 114 pr_err("atm_proc_dev_register failed for dev %s\n", type);
113 "atm_proc_dev_register failed for dev %s\n",
114 type);
115 goto out_fail; 115 goto out_fail;
116 } 116 }
117 117
118 if (atm_register_sysfs(dev) < 0) { 118 if (atm_register_sysfs(dev) < 0) {
119 printk(KERN_ERR "atm_dev_register: " 119 pr_err("atm_register_sysfs failed for dev %s\n", type);
120 "atm_register_sysfs failed for dev %s\n",
121 type);
122 atm_proc_dev_deregister(dev); 120 atm_proc_dev_deregister(dev);
123 goto out_fail; 121 goto out_fail;
124 } 122 }
@@ -134,7 +132,7 @@ out_fail:
134 dev = NULL; 132 dev = NULL;
135 goto out; 133 goto out;
136} 134}
137 135EXPORT_SYMBOL(atm_dev_register);
138 136
139void atm_dev_deregister(struct atm_dev *dev) 137void atm_dev_deregister(struct atm_dev *dev)
140{ 138{
@@ -156,7 +154,7 @@ void atm_dev_deregister(struct atm_dev *dev)
156 154
157 atm_dev_put(dev); 155 atm_dev_put(dev);
158} 156}
159 157EXPORT_SYMBOL(atm_dev_deregister);
160 158
161static void copy_aal_stats(struct k_atm_aal_stats *from, 159static void copy_aal_stats(struct k_atm_aal_stats *from,
162 struct atm_aal_stats *to) 160 struct atm_aal_stats *to)
@@ -166,7 +164,6 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
166#undef __HANDLE_ITEM 164#undef __HANDLE_ITEM
167} 165}
168 166
169
170static void subtract_aal_stats(struct k_atm_aal_stats *from, 167static void subtract_aal_stats(struct k_atm_aal_stats *from,
171 struct atm_aal_stats *to) 168 struct atm_aal_stats *to)
172{ 169{
@@ -175,8 +172,8 @@ static void subtract_aal_stats(struct k_atm_aal_stats *from,
175#undef __HANDLE_ITEM 172#undef __HANDLE_ITEM
176} 173}
177 174
178 175static int fetch_stats(struct atm_dev *dev, struct atm_dev_stats __user *arg,
179static int fetch_stats(struct atm_dev *dev, struct atm_dev_stats __user *arg, int zero) 176 int zero)
180{ 177{
181 struct atm_dev_stats tmp; 178 struct atm_dev_stats tmp;
182 int error = 0; 179 int error = 0;
@@ -194,7 +191,6 @@ static int fetch_stats(struct atm_dev *dev, struct atm_dev_stats __user *arg, in
194 return error ? -EFAULT : 0; 191 return error ? -EFAULT : 0;
195} 192}
196 193
197
198int atm_dev_ioctl(unsigned int cmd, void __user *arg, int compat) 194int atm_dev_ioctl(unsigned int cmd, void __user *arg, int compat)
199{ 195{
200 void __user *buf; 196 void __user *buf;
@@ -210,50 +206,49 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg, int compat)
210#endif 206#endif
211 207
212 switch (cmd) { 208 switch (cmd) {
213 case ATM_GETNAMES: 209 case ATM_GETNAMES:
214 210 if (compat) {
215 if (compat) {
216#ifdef CONFIG_COMPAT 211#ifdef CONFIG_COMPAT
217 struct compat_atm_iobuf __user *ciobuf = arg; 212 struct compat_atm_iobuf __user *ciobuf = arg;
218 compat_uptr_t cbuf; 213 compat_uptr_t cbuf;
219 iobuf_len = &ciobuf->length; 214 iobuf_len = &ciobuf->length;
220 if (get_user(cbuf, &ciobuf->buffer)) 215 if (get_user(cbuf, &ciobuf->buffer))
221 return -EFAULT; 216 return -EFAULT;
222 buf = compat_ptr(cbuf); 217 buf = compat_ptr(cbuf);
223#endif 218#endif
224 } else { 219 } else {
225 struct atm_iobuf __user *iobuf = arg; 220 struct atm_iobuf __user *iobuf = arg;
226 iobuf_len = &iobuf->length; 221 iobuf_len = &iobuf->length;
227 if (get_user(buf, &iobuf->buffer)) 222 if (get_user(buf, &iobuf->buffer))
228 return -EFAULT;
229 }
230 if (get_user(len, iobuf_len))
231 return -EFAULT; 223 return -EFAULT;
232 mutex_lock(&atm_dev_mutex); 224 }
233 list_for_each(p, &atm_devs) 225 if (get_user(len, iobuf_len))
234 size += sizeof(int); 226 return -EFAULT;
235 if (size > len) { 227 mutex_lock(&atm_dev_mutex);
236 mutex_unlock(&atm_dev_mutex); 228 list_for_each(p, &atm_devs)
237 return -E2BIG; 229 size += sizeof(int);
238 } 230 if (size > len) {
239 tmp_buf = kmalloc(size, GFP_ATOMIC); 231 mutex_unlock(&atm_dev_mutex);
240 if (!tmp_buf) { 232 return -E2BIG;
241 mutex_unlock(&atm_dev_mutex); 233 }
242 return -ENOMEM; 234 tmp_buf = kmalloc(size, GFP_ATOMIC);
243 } 235 if (!tmp_buf) {
244 tmp_p = tmp_buf;
245 list_for_each(p, &atm_devs) {
246 dev = list_entry(p, struct atm_dev, dev_list);
247 *tmp_p++ = dev->number;
248 }
249 mutex_unlock(&atm_dev_mutex); 236 mutex_unlock(&atm_dev_mutex);
250 error = ((copy_to_user(buf, tmp_buf, size)) || 237 return -ENOMEM;
251 put_user(size, iobuf_len)) 238 }
252 ? -EFAULT : 0; 239 tmp_p = tmp_buf;
253 kfree(tmp_buf); 240 list_for_each(p, &atm_devs) {
254 return error; 241 dev = list_entry(p, struct atm_dev, dev_list);
255 default: 242 *tmp_p++ = dev->number;
256 break; 243 }
244 mutex_unlock(&atm_dev_mutex);
245 error = ((copy_to_user(buf, tmp_buf, size)) ||
246 put_user(size, iobuf_len))
247 ? -EFAULT : 0;
248 kfree(tmp_buf);
249 return error;
250 default:
251 break;
257 } 252 }
258 253
259 if (compat) { 254 if (compat) {
@@ -282,166 +277,167 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg, int compat)
282 if (get_user(number, &sioc->number)) 277 if (get_user(number, &sioc->number))
283 return -EFAULT; 278 return -EFAULT;
284 } 279 }
285 if (!(dev = try_then_request_module(atm_dev_lookup(number), 280
286 "atm-device-%d", number))) 281 dev = try_then_request_module(atm_dev_lookup(number), "atm-device-%d",
282 number);
283 if (!dev)
287 return -ENODEV; 284 return -ENODEV;
288 285
289 switch (cmd) { 286 switch (cmd) {
290 case ATM_GETTYPE: 287 case ATM_GETTYPE:
291 size = strlen(dev->type) + 1; 288 size = strlen(dev->type) + 1;
292 if (copy_to_user(buf, dev->type, size)) { 289 if (copy_to_user(buf, dev->type, size)) {
293 error = -EFAULT; 290 error = -EFAULT;
294 goto done; 291 goto done;
295 } 292 }
296 break; 293 break;
297 case ATM_GETESI: 294 case ATM_GETESI:
298 size = ESI_LEN; 295 size = ESI_LEN;
299 if (copy_to_user(buf, dev->esi, size)) { 296 if (copy_to_user(buf, dev->esi, size)) {
300 error = -EFAULT; 297 error = -EFAULT;
301 goto done; 298 goto done;
302 } 299 }
303 break; 300 break;
304 case ATM_SETESI: 301 case ATM_SETESI:
305 { 302 {
306 int i; 303 int i;
307 304
308 for (i = 0; i < ESI_LEN; i++) 305 for (i = 0; i < ESI_LEN; i++)
309 if (dev->esi[i]) { 306 if (dev->esi[i]) {
310 error = -EEXIST; 307 error = -EEXIST;
311 goto done;
312 }
313 }
314 /* fall through */
315 case ATM_SETESIF:
316 {
317 unsigned char esi[ESI_LEN];
318
319 if (!capable(CAP_NET_ADMIN)) {
320 error = -EPERM;
321 goto done;
322 }
323 if (copy_from_user(esi, buf, ESI_LEN)) {
324 error = -EFAULT;
325 goto done;
326 }
327 memcpy(dev->esi, esi, ESI_LEN);
328 error = ESI_LEN;
329 goto done;
330 }
331 case ATM_GETSTATZ:
332 if (!capable(CAP_NET_ADMIN)) {
333 error = -EPERM;
334 goto done;
335 }
336 /* fall through */
337 case ATM_GETSTAT:
338 size = sizeof(struct atm_dev_stats);
339 error = fetch_stats(dev, buf, cmd == ATM_GETSTATZ);
340 if (error)
341 goto done;
342 break;
343 case ATM_GETCIRANGE:
344 size = sizeof(struct atm_cirange);
345 if (copy_to_user(buf, &dev->ci_range, size)) {
346 error = -EFAULT;
347 goto done;
348 }
349 break;
350 case ATM_GETLINKRATE:
351 size = sizeof(int);
352 if (copy_to_user(buf, &dev->link_rate, size)) {
353 error = -EFAULT;
354 goto done;
355 }
356 break;
357 case ATM_RSTADDR:
358 if (!capable(CAP_NET_ADMIN)) {
359 error = -EPERM;
360 goto done;
361 }
362 atm_reset_addr(dev, ATM_ADDR_LOCAL);
363 break;
364 case ATM_ADDADDR:
365 case ATM_DELADDR:
366 case ATM_ADDLECSADDR:
367 case ATM_DELLECSADDR:
368 if (!capable(CAP_NET_ADMIN)) {
369 error = -EPERM;
370 goto done;
371 }
372 {
373 struct sockaddr_atmsvc addr;
374
375 if (copy_from_user(&addr, buf, sizeof(addr))) {
376 error = -EFAULT;
377 goto done;
378 }
379 if (cmd == ATM_ADDADDR || cmd == ATM_ADDLECSADDR)
380 error = atm_add_addr(dev, &addr,
381 (cmd == ATM_ADDADDR ?
382 ATM_ADDR_LOCAL : ATM_ADDR_LECS));
383 else
384 error = atm_del_addr(dev, &addr,
385 (cmd == ATM_DELADDR ?
386 ATM_ADDR_LOCAL : ATM_ADDR_LECS));
387 goto done; 308 goto done;
388 } 309 }
389 case ATM_GETADDR: 310 }
390 case ATM_GETLECSADDR: 311 /* fall through */
391 error = atm_get_addr(dev, buf, len, 312 case ATM_SETESIF:
392 (cmd == ATM_GETADDR ? 313 {
314 unsigned char esi[ESI_LEN];
315
316 if (!capable(CAP_NET_ADMIN)) {
317 error = -EPERM;
318 goto done;
319 }
320 if (copy_from_user(esi, buf, ESI_LEN)) {
321 error = -EFAULT;
322 goto done;
323 }
324 memcpy(dev->esi, esi, ESI_LEN);
325 error = ESI_LEN;
326 goto done;
327 }
328 case ATM_GETSTATZ:
329 if (!capable(CAP_NET_ADMIN)) {
330 error = -EPERM;
331 goto done;
332 }
333 /* fall through */
334 case ATM_GETSTAT:
335 size = sizeof(struct atm_dev_stats);
336 error = fetch_stats(dev, buf, cmd == ATM_GETSTATZ);
337 if (error)
338 goto done;
339 break;
340 case ATM_GETCIRANGE:
341 size = sizeof(struct atm_cirange);
342 if (copy_to_user(buf, &dev->ci_range, size)) {
343 error = -EFAULT;
344 goto done;
345 }
346 break;
347 case ATM_GETLINKRATE:
348 size = sizeof(int);
349 if (copy_to_user(buf, &dev->link_rate, size)) {
350 error = -EFAULT;
351 goto done;
352 }
353 break;
354 case ATM_RSTADDR:
355 if (!capable(CAP_NET_ADMIN)) {
356 error = -EPERM;
357 goto done;
358 }
359 atm_reset_addr(dev, ATM_ADDR_LOCAL);
360 break;
361 case ATM_ADDADDR:
362 case ATM_DELADDR:
363 case ATM_ADDLECSADDR:
364 case ATM_DELLECSADDR:
365 {
366 struct sockaddr_atmsvc addr;
367
368 if (!capable(CAP_NET_ADMIN)) {
369 error = -EPERM;
370 goto done;
371 }
372
373 if (copy_from_user(&addr, buf, sizeof(addr))) {
374 error = -EFAULT;
375 goto done;
376 }
377 if (cmd == ATM_ADDADDR || cmd == ATM_ADDLECSADDR)
378 error = atm_add_addr(dev, &addr,
379 (cmd == ATM_ADDADDR ?
393 ATM_ADDR_LOCAL : ATM_ADDR_LECS)); 380 ATM_ADDR_LOCAL : ATM_ADDR_LECS));
394 if (error < 0) 381 else
395 goto done; 382 error = atm_del_addr(dev, &addr,
396 size = error; 383 (cmd == ATM_DELADDR ?
397 /* may return 0, but later on size == 0 means "don't 384 ATM_ADDR_LOCAL : ATM_ADDR_LECS));
398 write the length" */ 385 goto done;
399 error = put_user(size, sioc_len) 386 }
400 ? -EFAULT : 0; 387 case ATM_GETADDR:
388 case ATM_GETLECSADDR:
389 error = atm_get_addr(dev, buf, len,
390 (cmd == ATM_GETADDR ?
391 ATM_ADDR_LOCAL : ATM_ADDR_LECS));
392 if (error < 0)
393 goto done;
394 size = error;
395 /* may return 0, but later on size == 0 means "don't
396 write the length" */
397 error = put_user(size, sioc_len) ? -EFAULT : 0;
398 goto done;
399 case ATM_SETLOOP:
400 if (__ATM_LM_XTRMT((int) (unsigned long) buf) &&
401 __ATM_LM_XTLOC((int) (unsigned long) buf) >
402 __ATM_LM_XTRMT((int) (unsigned long) buf)) {
403 error = -EINVAL;
404 goto done;
405 }
406 /* fall through */
407 case ATM_SETCIRANGE:
408 case SONET_GETSTATZ:
409 case SONET_SETDIAG:
410 case SONET_CLRDIAG:
411 case SONET_SETFRAMING:
412 if (!capable(CAP_NET_ADMIN)) {
413 error = -EPERM;
401 goto done; 414 goto done;
402 case ATM_SETLOOP: 415 }
403 if (__ATM_LM_XTRMT((int) (unsigned long) buf) && 416 /* fall through */
404 __ATM_LM_XTLOC((int) (unsigned long) buf) > 417 default:
405 __ATM_LM_XTRMT((int) (unsigned long) buf)) { 418 if (compat) {
419#ifdef CONFIG_COMPAT
420 if (!dev->ops->compat_ioctl) {
406 error = -EINVAL; 421 error = -EINVAL;
407 goto done; 422 goto done;
408 } 423 }
409 /* fall through */ 424 size = dev->ops->compat_ioctl(dev, cmd, buf);
410 case ATM_SETCIRANGE:
411 case SONET_GETSTATZ:
412 case SONET_SETDIAG:
413 case SONET_CLRDIAG:
414 case SONET_SETFRAMING:
415 if (!capable(CAP_NET_ADMIN)) {
416 error = -EPERM;
417 goto done;
418 }
419 /* fall through */
420 default:
421 if (compat) {
422#ifdef CONFIG_COMPAT
423 if (!dev->ops->compat_ioctl) {
424 error = -EINVAL;
425 goto done;
426 }
427 size = dev->ops->compat_ioctl(dev, cmd, buf);
428#endif 425#endif
429 } else { 426 } else {
430 if (!dev->ops->ioctl) { 427 if (!dev->ops->ioctl) {
431 error = -EINVAL; 428 error = -EINVAL;
432 goto done;
433 }
434 size = dev->ops->ioctl(dev, cmd, buf);
435 }
436 if (size < 0) {
437 error = (size == -ENOIOCTLCMD ? -EINVAL : size);
438 goto done; 429 goto done;
439 } 430 }
431 size = dev->ops->ioctl(dev, cmd, buf);
432 }
433 if (size < 0) {
434 error = (size == -ENOIOCTLCMD ? -EINVAL : size);
435 goto done;
436 }
440 } 437 }
441 438
442 if (size) 439 if (size)
443 error = put_user(size, sioc_len) 440 error = put_user(size, sioc_len) ? -EFAULT : 0;
444 ? -EFAULT : 0;
445 else 441 else
446 error = 0; 442 error = 0;
447done: 443done:
@@ -449,21 +445,10 @@ done:
449 return error; 445 return error;
450} 446}
451 447
452static __inline__ void *dev_get_idx(loff_t left)
453{
454 struct list_head *p;
455
456 list_for_each(p, &atm_devs) {
457 if (!--left)
458 break;
459 }
460 return (p != &atm_devs) ? p : NULL;
461}
462
463void *atm_dev_seq_start(struct seq_file *seq, loff_t *pos) 448void *atm_dev_seq_start(struct seq_file *seq, loff_t *pos)
464{ 449{
465 mutex_lock(&atm_dev_mutex); 450 mutex_lock(&atm_dev_mutex);
466 return *pos ? dev_get_idx(*pos) : SEQ_START_TOKEN; 451 return seq_list_start_head(&atm_devs, *pos);
467} 452}
468 453
469void atm_dev_seq_stop(struct seq_file *seq, void *v) 454void atm_dev_seq_stop(struct seq_file *seq, void *v)
@@ -473,13 +458,5 @@ void atm_dev_seq_stop(struct seq_file *seq, void *v)
473 458
474void *atm_dev_seq_next(struct seq_file *seq, void *v, loff_t *pos) 459void *atm_dev_seq_next(struct seq_file *seq, void *v, loff_t *pos)
475{ 460{
476 ++*pos; 461 return seq_list_next(v, &atm_devs, pos);
477 v = (v == SEQ_START_TOKEN)
478 ? atm_devs.next : ((struct list_head *)v)->next;
479 return (v == &atm_devs) ? NULL : v;
480} 462}
481
482
483EXPORT_SYMBOL(atm_dev_register);
484EXPORT_SYMBOL(atm_dev_deregister);
485EXPORT_SYMBOL(atm_dev_lookup);
diff --git a/net/atm/signaling.c b/net/atm/signaling.c
index 229921400522..6ba6e466ee54 100644
--- a/net/atm/signaling.c
+++ b/net/atm/signaling.c
@@ -2,6 +2,7 @@
2 2
3/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */ 3/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
4 4
5#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
5 6
6#include <linux/errno.h> /* error codes */ 7#include <linux/errno.h> /* error codes */
7#include <linux/kernel.h> /* printk */ 8#include <linux/kernel.h> /* printk */
@@ -13,11 +14,11 @@
13#include <linux/atmsvc.h> 14#include <linux/atmsvc.h>
14#include <linux/atmdev.h> 15#include <linux/atmdev.h>
15#include <linux/bitops.h> 16#include <linux/bitops.h>
17#include <linux/slab.h>
16 18
17#include "resources.h" 19#include "resources.h"
18#include "signaling.h" 20#include "signaling.h"
19 21
20
21#undef WAIT_FOR_DEMON /* #define this if system calls on SVC sockets 22#undef WAIT_FOR_DEMON /* #define this if system calls on SVC sockets
22 should block until the demon runs. 23 should block until the demon runs.
23 Danger: may cause nasty hangs if the demon 24 Danger: may cause nasty hangs if the demon
@@ -28,60 +29,59 @@ struct atm_vcc *sigd = NULL;
28static DECLARE_WAIT_QUEUE_HEAD(sigd_sleep); 29static DECLARE_WAIT_QUEUE_HEAD(sigd_sleep);
29#endif 30#endif
30 31
31
32static void sigd_put_skb(struct sk_buff *skb) 32static void sigd_put_skb(struct sk_buff *skb)
33{ 33{
34#ifdef WAIT_FOR_DEMON 34#ifdef WAIT_FOR_DEMON
35 DECLARE_WAITQUEUE(wait,current); 35 DECLARE_WAITQUEUE(wait, current);
36 36
37 add_wait_queue(&sigd_sleep,&wait); 37 add_wait_queue(&sigd_sleep, &wait);
38 while (!sigd) { 38 while (!sigd) {
39 set_current_state(TASK_UNINTERRUPTIBLE); 39 set_current_state(TASK_UNINTERRUPTIBLE);
40 pr_debug("atmsvc: waiting for signaling demon...\n"); 40 pr_debug("atmsvc: waiting for signaling daemon...\n");
41 schedule(); 41 schedule();
42 } 42 }
43 current->state = TASK_RUNNING; 43 current->state = TASK_RUNNING;
44 remove_wait_queue(&sigd_sleep,&wait); 44 remove_wait_queue(&sigd_sleep, &wait);
45#else 45#else
46 if (!sigd) { 46 if (!sigd) {
47 pr_debug("atmsvc: no signaling demon\n"); 47 pr_debug("atmsvc: no signaling daemon\n");
48 kfree_skb(skb); 48 kfree_skb(skb);
49 return; 49 return;
50 } 50 }
51#endif 51#endif
52 atm_force_charge(sigd,skb->truesize); 52 atm_force_charge(sigd, skb->truesize);
53 skb_queue_tail(&sk_atm(sigd)->sk_receive_queue,skb); 53 skb_queue_tail(&sk_atm(sigd)->sk_receive_queue, skb);
54 sk_atm(sigd)->sk_data_ready(sk_atm(sigd), skb->len); 54 sk_atm(sigd)->sk_data_ready(sk_atm(sigd), skb->len);
55} 55}
56 56
57 57static void modify_qos(struct atm_vcc *vcc, struct atmsvc_msg *msg)
58static void modify_qos(struct atm_vcc *vcc,struct atmsvc_msg *msg)
59{ 58{
60 struct sk_buff *skb; 59 struct sk_buff *skb;
61 60
62 if (test_bit(ATM_VF_RELEASED,&vcc->flags) || 61 if (test_bit(ATM_VF_RELEASED, &vcc->flags) ||
63 !test_bit(ATM_VF_READY,&vcc->flags)) 62 !test_bit(ATM_VF_READY, &vcc->flags))
64 return; 63 return;
65 msg->type = as_error; 64 msg->type = as_error;
66 if (!vcc->dev->ops->change_qos) msg->reply = -EOPNOTSUPP; 65 if (!vcc->dev->ops->change_qos)
66 msg->reply = -EOPNOTSUPP;
67 else { 67 else {
68 /* should lock VCC */ 68 /* should lock VCC */
69 msg->reply = vcc->dev->ops->change_qos(vcc,&msg->qos, 69 msg->reply = vcc->dev->ops->change_qos(vcc, &msg->qos,
70 msg->reply); 70 msg->reply);
71 if (!msg->reply) msg->type = as_okay; 71 if (!msg->reply)
72 msg->type = as_okay;
72 } 73 }
73 /* 74 /*
74 * Should probably just turn around the old skb. But the, the buffer 75 * Should probably just turn around the old skb. But the, the buffer
75 * space accounting needs to follow the change too. Maybe later. 76 * space accounting needs to follow the change too. Maybe later.
76 */ 77 */
77 while (!(skb = alloc_skb(sizeof(struct atmsvc_msg),GFP_KERNEL))) 78 while (!(skb = alloc_skb(sizeof(struct atmsvc_msg), GFP_KERNEL)))
78 schedule(); 79 schedule();
79 *(struct atmsvc_msg *) skb_put(skb,sizeof(struct atmsvc_msg)) = *msg; 80 *(struct atmsvc_msg *)skb_put(skb, sizeof(struct atmsvc_msg)) = *msg;
80 sigd_put_skb(skb); 81 sigd_put_skb(skb);
81} 82}
82 83
83 84static int sigd_send(struct atm_vcc *vcc, struct sk_buff *skb)
84static int sigd_send(struct atm_vcc *vcc,struct sk_buff *skb)
85{ 85{
86 struct atmsvc_msg *msg; 86 struct atmsvc_msg *msg;
87 struct atm_vcc *session_vcc; 87 struct atm_vcc *session_vcc;
@@ -90,69 +90,68 @@ static int sigd_send(struct atm_vcc *vcc,struct sk_buff *skb)
90 msg = (struct atmsvc_msg *) skb->data; 90 msg = (struct atmsvc_msg *) skb->data;
91 atomic_sub(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); 91 atomic_sub(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
92 vcc = *(struct atm_vcc **) &msg->vcc; 92 vcc = *(struct atm_vcc **) &msg->vcc;
93 pr_debug("sigd_send %d (0x%lx)\n",(int) msg->type, 93 pr_debug("%d (0x%lx)\n", (int)msg->type, (unsigned long)vcc);
94 (unsigned long) vcc);
95 sk = sk_atm(vcc); 94 sk = sk_atm(vcc);
96 95
97 switch (msg->type) { 96 switch (msg->type) {
98 case as_okay: 97 case as_okay:
99 sk->sk_err = -msg->reply; 98 sk->sk_err = -msg->reply;
100 clear_bit(ATM_VF_WAITING, &vcc->flags); 99 clear_bit(ATM_VF_WAITING, &vcc->flags);
101 if (!*vcc->local.sas_addr.prv && 100 if (!*vcc->local.sas_addr.prv && !*vcc->local.sas_addr.pub) {
102 !*vcc->local.sas_addr.pub) { 101 vcc->local.sas_family = AF_ATMSVC;
103 vcc->local.sas_family = AF_ATMSVC; 102 memcpy(vcc->local.sas_addr.prv,
104 memcpy(vcc->local.sas_addr.prv, 103 msg->local.sas_addr.prv, ATM_ESA_LEN);
105 msg->local.sas_addr.prv,ATM_ESA_LEN); 104 memcpy(vcc->local.sas_addr.pub,
106 memcpy(vcc->local.sas_addr.pub, 105 msg->local.sas_addr.pub, ATM_E164_LEN + 1);
107 msg->local.sas_addr.pub,ATM_E164_LEN+1); 106 }
108 } 107 session_vcc = vcc->session ? vcc->session : vcc;
109 session_vcc = vcc->session ? vcc->session : vcc; 108 if (session_vcc->vpi || session_vcc->vci)
110 if (session_vcc->vpi || session_vcc->vci) break;
111 session_vcc->itf = msg->pvc.sap_addr.itf;
112 session_vcc->vpi = msg->pvc.sap_addr.vpi;
113 session_vcc->vci = msg->pvc.sap_addr.vci;
114 if (session_vcc->vpi || session_vcc->vci)
115 session_vcc->qos = msg->qos;
116 break;
117 case as_error:
118 clear_bit(ATM_VF_REGIS,&vcc->flags);
119 clear_bit(ATM_VF_READY,&vcc->flags);
120 sk->sk_err = -msg->reply;
121 clear_bit(ATM_VF_WAITING, &vcc->flags);
122 break; 109 break;
123 case as_indicate: 110 session_vcc->itf = msg->pvc.sap_addr.itf;
124 vcc = *(struct atm_vcc **) &msg->listen_vcc; 111 session_vcc->vpi = msg->pvc.sap_addr.vpi;
125 sk = sk_atm(vcc); 112 session_vcc->vci = msg->pvc.sap_addr.vci;
126 pr_debug("as_indicate!!!\n"); 113 if (session_vcc->vpi || session_vcc->vci)
127 lock_sock(sk); 114 session_vcc->qos = msg->qos;
128 if (sk_acceptq_is_full(sk)) { 115 break;
129 sigd_enq(NULL,as_reject,vcc,NULL,NULL); 116 case as_error:
130 dev_kfree_skb(skb); 117 clear_bit(ATM_VF_REGIS, &vcc->flags);
131 goto as_indicate_complete; 118 clear_bit(ATM_VF_READY, &vcc->flags);
132 } 119 sk->sk_err = -msg->reply;
133 sk->sk_ack_backlog++; 120 clear_bit(ATM_VF_WAITING, &vcc->flags);
134 skb_queue_tail(&sk->sk_receive_queue, skb); 121 break;
135 pr_debug("waking sk->sk_sleep 0x%p\n", sk->sk_sleep); 122 case as_indicate:
136 sk->sk_state_change(sk); 123 vcc = *(struct atm_vcc **)&msg->listen_vcc;
124 sk = sk_atm(vcc);
125 pr_debug("as_indicate!!!\n");
126 lock_sock(sk);
127 if (sk_acceptq_is_full(sk)) {
128 sigd_enq(NULL, as_reject, vcc, NULL, NULL);
129 dev_kfree_skb(skb);
130 goto as_indicate_complete;
131 }
132 sk->sk_ack_backlog++;
133 skb_queue_tail(&sk->sk_receive_queue, skb);
134 pr_debug("waking sk->sk_sleep 0x%p\n", sk->sk_sleep);
135 sk->sk_state_change(sk);
137as_indicate_complete: 136as_indicate_complete:
138 release_sock(sk); 137 release_sock(sk);
139 return 0; 138 return 0;
140 case as_close: 139 case as_close:
141 set_bit(ATM_VF_RELEASED,&vcc->flags); 140 set_bit(ATM_VF_RELEASED, &vcc->flags);
142 vcc_release_async(vcc, msg->reply); 141 vcc_release_async(vcc, msg->reply);
143 goto out; 142 goto out;
144 case as_modify: 143 case as_modify:
145 modify_qos(vcc,msg); 144 modify_qos(vcc, msg);
146 break; 145 break;
147 case as_addparty: 146 case as_addparty:
148 case as_dropparty: 147 case as_dropparty:
149 sk->sk_err_soft = msg->reply; /* < 0 failure, otherwise ep_ref */ 148 sk->sk_err_soft = msg->reply;
150 clear_bit(ATM_VF_WAITING, &vcc->flags); 149 /* < 0 failure, otherwise ep_ref */
151 break; 150 clear_bit(ATM_VF_WAITING, &vcc->flags);
152 default: 151 break;
153 printk(KERN_ALERT "sigd_send: bad message type %d\n", 152 default:
154 (int) msg->type); 153 pr_alert("bad message type %d\n", (int)msg->type);
155 return -EINVAL; 154 return -EINVAL;
156 } 155 }
157 sk->sk_state_change(sk); 156 sk->sk_state_change(sk);
158out: 157out:
@@ -160,48 +159,52 @@ out:
160 return 0; 159 return 0;
161} 160}
162 161
163 162void sigd_enq2(struct atm_vcc *vcc, enum atmsvc_msg_type type,
164void sigd_enq2(struct atm_vcc *vcc,enum atmsvc_msg_type type, 163 struct atm_vcc *listen_vcc, const struct sockaddr_atmpvc *pvc,
165 struct atm_vcc *listen_vcc,const struct sockaddr_atmpvc *pvc, 164 const struct sockaddr_atmsvc *svc, const struct atm_qos *qos,
166 const struct sockaddr_atmsvc *svc,const struct atm_qos *qos,int reply) 165 int reply)
167{ 166{
168 struct sk_buff *skb; 167 struct sk_buff *skb;
169 struct atmsvc_msg *msg; 168 struct atmsvc_msg *msg;
170 static unsigned session = 0; 169 static unsigned session = 0;
171 170
172 pr_debug("sigd_enq %d (0x%p)\n",(int) type,vcc); 171 pr_debug("%d (0x%p)\n", (int)type, vcc);
173 while (!(skb = alloc_skb(sizeof(struct atmsvc_msg),GFP_KERNEL))) 172 while (!(skb = alloc_skb(sizeof(struct atmsvc_msg), GFP_KERNEL)))
174 schedule(); 173 schedule();
175 msg = (struct atmsvc_msg *) skb_put(skb,sizeof(struct atmsvc_msg)); 174 msg = (struct atmsvc_msg *)skb_put(skb, sizeof(struct atmsvc_msg));
176 memset(msg,0,sizeof(*msg)); 175 memset(msg, 0, sizeof(*msg));
177 msg->type = type; 176 msg->type = type;
178 *(struct atm_vcc **) &msg->vcc = vcc; 177 *(struct atm_vcc **) &msg->vcc = vcc;
179 *(struct atm_vcc **) &msg->listen_vcc = listen_vcc; 178 *(struct atm_vcc **) &msg->listen_vcc = listen_vcc;
180 msg->reply = reply; 179 msg->reply = reply;
181 if (qos) msg->qos = *qos; 180 if (qos)
182 if (vcc) msg->sap = vcc->sap; 181 msg->qos = *qos;
183 if (svc) msg->svc = *svc; 182 if (vcc)
184 if (vcc) msg->local = vcc->local; 183 msg->sap = vcc->sap;
185 if (pvc) msg->pvc = *pvc; 184 if (svc)
185 msg->svc = *svc;
186 if (vcc)
187 msg->local = vcc->local;
188 if (pvc)
189 msg->pvc = *pvc;
186 if (vcc) { 190 if (vcc) {
187 if (type == as_connect && test_bit(ATM_VF_SESSION, &vcc->flags)) 191 if (type == as_connect && test_bit(ATM_VF_SESSION, &vcc->flags))
188 msg->session = ++session; 192 msg->session = ++session;
189 /* every new pmp connect gets the next session number */ 193 /* every new pmp connect gets the next session number */
190 } 194 }
191 sigd_put_skb(skb); 195 sigd_put_skb(skb);
192 if (vcc) set_bit(ATM_VF_REGIS,&vcc->flags); 196 if (vcc)
197 set_bit(ATM_VF_REGIS, &vcc->flags);
193} 198}
194 199
195 200void sigd_enq(struct atm_vcc *vcc, enum atmsvc_msg_type type,
196void sigd_enq(struct atm_vcc *vcc,enum atmsvc_msg_type type, 201 struct atm_vcc *listen_vcc, const struct sockaddr_atmpvc *pvc,
197 struct atm_vcc *listen_vcc,const struct sockaddr_atmpvc *pvc, 202 const struct sockaddr_atmsvc *svc)
198 const struct sockaddr_atmsvc *svc)
199{ 203{
200 sigd_enq2(vcc,type,listen_vcc,pvc,svc,vcc ? &vcc->qos : NULL,0); 204 sigd_enq2(vcc, type, listen_vcc, pvc, svc, vcc ? &vcc->qos : NULL, 0);
201 /* other ISP applications may use "reply" */ 205 /* other ISP applications may use "reply" */
202} 206}
203 207
204
205static void purge_vcc(struct atm_vcc *vcc) 208static void purge_vcc(struct atm_vcc *vcc)
206{ 209{
207 if (sk_atm(vcc)->sk_family == PF_ATMSVC && 210 if (sk_atm(vcc)->sk_family == PF_ATMSVC &&
@@ -212,21 +215,20 @@ static void purge_vcc(struct atm_vcc *vcc)
212 } 215 }
213} 216}
214 217
215
216static void sigd_close(struct atm_vcc *vcc) 218static void sigd_close(struct atm_vcc *vcc)
217{ 219{
218 struct hlist_node *node; 220 struct hlist_node *node;
219 struct sock *s; 221 struct sock *s;
220 int i; 222 int i;
221 223
222 pr_debug("sigd_close\n"); 224 pr_debug("\n");
223 sigd = NULL; 225 sigd = NULL;
224 if (skb_peek(&sk_atm(vcc)->sk_receive_queue)) 226 if (skb_peek(&sk_atm(vcc)->sk_receive_queue))
225 printk(KERN_ERR "sigd_close: closing with requests pending\n"); 227 pr_err("closing with requests pending\n");
226 skb_queue_purge(&sk_atm(vcc)->sk_receive_queue); 228 skb_queue_purge(&sk_atm(vcc)->sk_receive_queue);
227 229
228 read_lock(&vcc_sklist_lock); 230 read_lock(&vcc_sklist_lock);
229 for(i = 0; i < VCC_HTABLE_SIZE; ++i) { 231 for (i = 0; i < VCC_HTABLE_SIZE; ++i) {
230 struct hlist_head *head = &vcc_hash[i]; 232 struct hlist_head *head = &vcc_hash[i];
231 233
232 sk_for_each(s, node, head) { 234 sk_for_each(s, node, head) {
@@ -238,13 +240,11 @@ static void sigd_close(struct atm_vcc *vcc)
238 read_unlock(&vcc_sklist_lock); 240 read_unlock(&vcc_sklist_lock);
239} 241}
240 242
241
242static struct atmdev_ops sigd_dev_ops = { 243static struct atmdev_ops sigd_dev_ops = {
243 .close = sigd_close, 244 .close = sigd_close,
244 .send = sigd_send 245 .send = sigd_send
245}; 246};
246 247
247
248static struct atm_dev sigd_dev = { 248static struct atm_dev sigd_dev = {
249 .ops = &sigd_dev_ops, 249 .ops = &sigd_dev_ops,
250 .type = "sig", 250 .type = "sig",
@@ -252,16 +252,16 @@ static struct atm_dev sigd_dev = {
252 .lock = __SPIN_LOCK_UNLOCKED(sigd_dev.lock) 252 .lock = __SPIN_LOCK_UNLOCKED(sigd_dev.lock)
253}; 253};
254 254
255
256int sigd_attach(struct atm_vcc *vcc) 255int sigd_attach(struct atm_vcc *vcc)
257{ 256{
258 if (sigd) return -EADDRINUSE; 257 if (sigd)
259 pr_debug("sigd_attach\n"); 258 return -EADDRINUSE;
259 pr_debug("\n");
260 sigd = vcc; 260 sigd = vcc;
261 vcc->dev = &sigd_dev; 261 vcc->dev = &sigd_dev;
262 vcc_insert_socket(sk_atm(vcc)); 262 vcc_insert_socket(sk_atm(vcc));
263 set_bit(ATM_VF_META,&vcc->flags); 263 set_bit(ATM_VF_META, &vcc->flags);
264 set_bit(ATM_VF_READY,&vcc->flags); 264 set_bit(ATM_VF_READY, &vcc->flags);
265#ifdef WAIT_FOR_DEMON 265#ifdef WAIT_FOR_DEMON
266 wake_up(&sigd_sleep); 266 wake_up(&sigd_sleep);
267#endif 267#endif
diff --git a/net/atm/svc.c b/net/atm/svc.c
index f90d143c4b25..3ba9a45a51ac 100644
--- a/net/atm/svc.c
+++ b/net/atm/svc.c
@@ -2,6 +2,7 @@
2 2
3/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */ 3/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
4 4
5#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
5 6
6#include <linux/string.h> 7#include <linux/string.h>
7#include <linux/net.h> /* struct socket, struct proto_ops */ 8#include <linux/net.h> /* struct socket, struct proto_ops */
@@ -18,14 +19,15 @@
18#include <linux/atmdev.h> 19#include <linux/atmdev.h>
19#include <linux/bitops.h> 20#include <linux/bitops.h>
20#include <net/sock.h> /* for sock_no_* */ 21#include <net/sock.h> /* for sock_no_* */
21#include <asm/uaccess.h> 22#include <linux/uaccess.h>
22 23
23#include "resources.h" 24#include "resources.h"
24#include "common.h" /* common for PVCs and SVCs */ 25#include "common.h" /* common for PVCs and SVCs */
25#include "signaling.h" 26#include "signaling.h"
26#include "addr.h" 27#include "addr.h"
27 28
28static int svc_create(struct net *net, struct socket *sock,int protocol); 29static int svc_create(struct net *net, struct socket *sock, int protocol,
30 int kern);
29 31
30/* 32/*
31 * Note: since all this is still nicely synchronized with the signaling demon, 33 * Note: since all this is still nicely synchronized with the signaling demon,
@@ -34,25 +36,25 @@ static int svc_create(struct net *net, struct socket *sock,int protocol);
34 */ 36 */
35 37
36 38
37static int svc_shutdown(struct socket *sock,int how) 39static int svc_shutdown(struct socket *sock, int how)
38{ 40{
39 return 0; 41 return 0;
40} 42}
41 43
42
43static void svc_disconnect(struct atm_vcc *vcc) 44static void svc_disconnect(struct atm_vcc *vcc)
44{ 45{
45 DEFINE_WAIT(wait); 46 DEFINE_WAIT(wait);
46 struct sk_buff *skb; 47 struct sk_buff *skb;
47 struct sock *sk = sk_atm(vcc); 48 struct sock *sk = sk_atm(vcc);
48 49
49 pr_debug("svc_disconnect %p\n",vcc); 50 pr_debug("%p\n", vcc);
50 if (test_bit(ATM_VF_REGIS,&vcc->flags)) { 51 if (test_bit(ATM_VF_REGIS, &vcc->flags)) {
51 prepare_to_wait(sk->sk_sleep, &wait, TASK_UNINTERRUPTIBLE); 52 prepare_to_wait(sk->sk_sleep, &wait, TASK_UNINTERRUPTIBLE);
52 sigd_enq(vcc,as_close,NULL,NULL,NULL); 53 sigd_enq(vcc, as_close, NULL, NULL, NULL);
53 while (!test_bit(ATM_VF_RELEASED,&vcc->flags) && sigd) { 54 while (!test_bit(ATM_VF_RELEASED, &vcc->flags) && sigd) {
54 schedule(); 55 schedule();
55 prepare_to_wait(sk->sk_sleep, &wait, TASK_UNINTERRUPTIBLE); 56 prepare_to_wait(sk->sk_sleep, &wait,
57 TASK_UNINTERRUPTIBLE);
56 } 58 }
57 finish_wait(sk->sk_sleep, &wait); 59 finish_wait(sk->sk_sleep, &wait);
58 } 60 }
@@ -61,35 +63,35 @@ static void svc_disconnect(struct atm_vcc *vcc)
61 while ((skb = skb_dequeue(&sk->sk_receive_queue)) != NULL) { 63 while ((skb = skb_dequeue(&sk->sk_receive_queue)) != NULL) {
62 atm_return(vcc, skb->truesize); 64 atm_return(vcc, skb->truesize);
63 pr_debug("LISTEN REL\n"); 65 pr_debug("LISTEN REL\n");
64 sigd_enq2(NULL,as_reject,vcc,NULL,NULL,&vcc->qos,0); 66 sigd_enq2(NULL, as_reject, vcc, NULL, NULL, &vcc->qos, 0);
65 dev_kfree_skb(skb); 67 dev_kfree_skb(skb);
66 } 68 }
67 clear_bit(ATM_VF_REGIS, &vcc->flags); 69 clear_bit(ATM_VF_REGIS, &vcc->flags);
68 /* ... may retry later */ 70 /* ... may retry later */
69} 71}
70 72
71
72static int svc_release(struct socket *sock) 73static int svc_release(struct socket *sock)
73{ 74{
74 struct sock *sk = sock->sk; 75 struct sock *sk = sock->sk;
75 struct atm_vcc *vcc; 76 struct atm_vcc *vcc;
76 77
77 if (sk) { 78 if (sk) {
78 vcc = ATM_SD(sock); 79 vcc = ATM_SD(sock);
79 pr_debug("svc_release %p\n", vcc); 80 pr_debug("%p\n", vcc);
80 clear_bit(ATM_VF_READY, &vcc->flags); 81 clear_bit(ATM_VF_READY, &vcc->flags);
81 /* VCC pointer is used as a reference, so we must not free it 82 /*
82 (thereby subjecting it to re-use) before all pending connections 83 * VCC pointer is used as a reference,
83 are closed */ 84 * so we must not free it (thereby subjecting it to re-use)
85 * before all pending connections are closed
86 */
84 svc_disconnect(vcc); 87 svc_disconnect(vcc);
85 vcc_release(sock); 88 vcc_release(sock);
86 } 89 }
87 return 0; 90 return 0;
88} 91}
89 92
90 93static int svc_bind(struct socket *sock, struct sockaddr *sockaddr,
91static int svc_bind(struct socket *sock,struct sockaddr *sockaddr, 94 int sockaddr_len)
92 int sockaddr_len)
93{ 95{
94 DEFINE_WAIT(wait); 96 DEFINE_WAIT(wait);
95 struct sock *sk = sock->sk; 97 struct sock *sk = sock->sk;
@@ -114,38 +116,37 @@ static int svc_bind(struct socket *sock,struct sockaddr *sockaddr,
114 error = -EAFNOSUPPORT; 116 error = -EAFNOSUPPORT;
115 goto out; 117 goto out;
116 } 118 }
117 clear_bit(ATM_VF_BOUND,&vcc->flags); 119 clear_bit(ATM_VF_BOUND, &vcc->flags);
118 /* failing rebind will kill old binding */ 120 /* failing rebind will kill old binding */
119 /* @@@ check memory (de)allocation on rebind */ 121 /* @@@ check memory (de)allocation on rebind */
120 if (!test_bit(ATM_VF_HASQOS,&vcc->flags)) { 122 if (!test_bit(ATM_VF_HASQOS, &vcc->flags)) {
121 error = -EBADFD; 123 error = -EBADFD;
122 goto out; 124 goto out;
123 } 125 }
124 vcc->local = *addr; 126 vcc->local = *addr;
125 set_bit(ATM_VF_WAITING, &vcc->flags); 127 set_bit(ATM_VF_WAITING, &vcc->flags);
126 prepare_to_wait(sk->sk_sleep, &wait, TASK_UNINTERRUPTIBLE); 128 prepare_to_wait(sk->sk_sleep, &wait, TASK_UNINTERRUPTIBLE);
127 sigd_enq(vcc,as_bind,NULL,NULL,&vcc->local); 129 sigd_enq(vcc, as_bind, NULL, NULL, &vcc->local);
128 while (test_bit(ATM_VF_WAITING, &vcc->flags) && sigd) { 130 while (test_bit(ATM_VF_WAITING, &vcc->flags) && sigd) {
129 schedule(); 131 schedule();
130 prepare_to_wait(sk->sk_sleep, &wait, TASK_UNINTERRUPTIBLE); 132 prepare_to_wait(sk->sk_sleep, &wait, TASK_UNINTERRUPTIBLE);
131 } 133 }
132 finish_wait(sk->sk_sleep, &wait); 134 finish_wait(sk->sk_sleep, &wait);
133 clear_bit(ATM_VF_REGIS,&vcc->flags); /* doesn't count */ 135 clear_bit(ATM_VF_REGIS, &vcc->flags); /* doesn't count */
134 if (!sigd) { 136 if (!sigd) {
135 error = -EUNATCH; 137 error = -EUNATCH;
136 goto out; 138 goto out;
137 } 139 }
138 if (!sk->sk_err) 140 if (!sk->sk_err)
139 set_bit(ATM_VF_BOUND,&vcc->flags); 141 set_bit(ATM_VF_BOUND, &vcc->flags);
140 error = -sk->sk_err; 142 error = -sk->sk_err;
141out: 143out:
142 release_sock(sk); 144 release_sock(sk);
143 return error; 145 return error;
144} 146}
145 147
146 148static int svc_connect(struct socket *sock, struct sockaddr *sockaddr,
147static int svc_connect(struct socket *sock,struct sockaddr *sockaddr, 149 int sockaddr_len, int flags)
148 int sockaddr_len,int flags)
149{ 150{
150 DEFINE_WAIT(wait); 151 DEFINE_WAIT(wait);
151 struct sock *sk = sock->sk; 152 struct sock *sk = sock->sk;
@@ -153,7 +154,7 @@ static int svc_connect(struct socket *sock,struct sockaddr *sockaddr,
153 struct atm_vcc *vcc = ATM_SD(sock); 154 struct atm_vcc *vcc = ATM_SD(sock);
154 int error; 155 int error;
155 156
156 pr_debug("svc_connect %p\n",vcc); 157 pr_debug("%p\n", vcc);
157 lock_sock(sk); 158 lock_sock(sk);
158 if (sockaddr_len != sizeof(struct sockaddr_atmsvc)) { 159 if (sockaddr_len != sizeof(struct sockaddr_atmsvc)) {
159 error = -EINVAL; 160 error = -EINVAL;
@@ -201,7 +202,7 @@ static int svc_connect(struct socket *sock,struct sockaddr *sockaddr,
201 vcc->remote = *addr; 202 vcc->remote = *addr;
202 set_bit(ATM_VF_WAITING, &vcc->flags); 203 set_bit(ATM_VF_WAITING, &vcc->flags);
203 prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE); 204 prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE);
204 sigd_enq(vcc,as_connect,NULL,NULL,&vcc->remote); 205 sigd_enq(vcc, as_connect, NULL, NULL, &vcc->remote);
205 if (flags & O_NONBLOCK) { 206 if (flags & O_NONBLOCK) {
206 finish_wait(sk->sk_sleep, &wait); 207 finish_wait(sk->sk_sleep, &wait);
207 sock->state = SS_CONNECTING; 208 sock->state = SS_CONNECTING;
@@ -212,7 +213,8 @@ static int svc_connect(struct socket *sock,struct sockaddr *sockaddr,
212 while (test_bit(ATM_VF_WAITING, &vcc->flags) && sigd) { 213 while (test_bit(ATM_VF_WAITING, &vcc->flags) && sigd) {
213 schedule(); 214 schedule();
214 if (!signal_pending(current)) { 215 if (!signal_pending(current)) {
215 prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE); 216 prepare_to_wait(sk->sk_sleep, &wait,
217 TASK_INTERRUPTIBLE);
216 continue; 218 continue;
217 } 219 }
218 pr_debug("*ABORT*\n"); 220 pr_debug("*ABORT*\n");
@@ -228,20 +230,22 @@ static int svc_connect(struct socket *sock,struct sockaddr *sockaddr,
228 * Kernel <--okay---- Demon 230 * Kernel <--okay---- Demon
229 * Kernel <--close--- Demon 231 * Kernel <--close--- Demon
230 */ 232 */
231 sigd_enq(vcc,as_close,NULL,NULL,NULL); 233 sigd_enq(vcc, as_close, NULL, NULL, NULL);
232 while (test_bit(ATM_VF_WAITING, &vcc->flags) && sigd) { 234 while (test_bit(ATM_VF_WAITING, &vcc->flags) && sigd) {
233 prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE); 235 prepare_to_wait(sk->sk_sleep, &wait,
236 TASK_INTERRUPTIBLE);
234 schedule(); 237 schedule();
235 } 238 }
236 if (!sk->sk_err) 239 if (!sk->sk_err)
237 while (!test_bit(ATM_VF_RELEASED,&vcc->flags) 240 while (!test_bit(ATM_VF_RELEASED, &vcc->flags) &&
238 && sigd) { 241 sigd) {
239 prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE); 242 prepare_to_wait(sk->sk_sleep, &wait,
243 TASK_INTERRUPTIBLE);
240 schedule(); 244 schedule();
241 } 245 }
242 clear_bit(ATM_VF_REGIS,&vcc->flags); 246 clear_bit(ATM_VF_REGIS, &vcc->flags);
243 clear_bit(ATM_VF_RELEASED,&vcc->flags); 247 clear_bit(ATM_VF_RELEASED, &vcc->flags);
244 clear_bit(ATM_VF_CLOSE,&vcc->flags); 248 clear_bit(ATM_VF_CLOSE, &vcc->flags);
245 /* we're gone now but may connect later */ 249 /* we're gone now but may connect later */
246 error = -EINTR; 250 error = -EINTR;
247 break; 251 break;
@@ -269,37 +273,37 @@ static int svc_connect(struct socket *sock,struct sockaddr *sockaddr,
269/* 273/*
270 * #endif 274 * #endif
271 */ 275 */
272 if (!(error = vcc_connect(sock, vcc->itf, vcc->vpi, vcc->vci))) 276 error = vcc_connect(sock, vcc->itf, vcc->vpi, vcc->vci);
277 if (!error)
273 sock->state = SS_CONNECTED; 278 sock->state = SS_CONNECTED;
274 else 279 else
275 (void) svc_disconnect(vcc); 280 (void)svc_disconnect(vcc);
276out: 281out:
277 release_sock(sk); 282 release_sock(sk);
278 return error; 283 return error;
279} 284}
280 285
281 286static int svc_listen(struct socket *sock, int backlog)
282static int svc_listen(struct socket *sock,int backlog)
283{ 287{
284 DEFINE_WAIT(wait); 288 DEFINE_WAIT(wait);
285 struct sock *sk = sock->sk; 289 struct sock *sk = sock->sk;
286 struct atm_vcc *vcc = ATM_SD(sock); 290 struct atm_vcc *vcc = ATM_SD(sock);
287 int error; 291 int error;
288 292
289 pr_debug("svc_listen %p\n",vcc); 293 pr_debug("%p\n", vcc);
290 lock_sock(sk); 294 lock_sock(sk);
291 /* let server handle listen on unbound sockets */ 295 /* let server handle listen on unbound sockets */
292 if (test_bit(ATM_VF_SESSION,&vcc->flags)) { 296 if (test_bit(ATM_VF_SESSION, &vcc->flags)) {
293 error = -EINVAL; 297 error = -EINVAL;
294 goto out; 298 goto out;
295 } 299 }
296 if (test_bit(ATM_VF_LISTEN, &vcc->flags)) { 300 if (test_bit(ATM_VF_LISTEN, &vcc->flags)) {
297 error = -EADDRINUSE; 301 error = -EADDRINUSE;
298 goto out; 302 goto out;
299 } 303 }
300 set_bit(ATM_VF_WAITING, &vcc->flags); 304 set_bit(ATM_VF_WAITING, &vcc->flags);
301 prepare_to_wait(sk->sk_sleep, &wait, TASK_UNINTERRUPTIBLE); 305 prepare_to_wait(sk->sk_sleep, &wait, TASK_UNINTERRUPTIBLE);
302 sigd_enq(vcc,as_listen,NULL,NULL,&vcc->local); 306 sigd_enq(vcc, as_listen, NULL, NULL, &vcc->local);
303 while (test_bit(ATM_VF_WAITING, &vcc->flags) && sigd) { 307 while (test_bit(ATM_VF_WAITING, &vcc->flags) && sigd) {
304 schedule(); 308 schedule();
305 prepare_to_wait(sk->sk_sleep, &wait, TASK_UNINTERRUPTIBLE); 309 prepare_to_wait(sk->sk_sleep, &wait, TASK_UNINTERRUPTIBLE);
@@ -309,7 +313,7 @@ static int svc_listen(struct socket *sock,int backlog)
309 error = -EUNATCH; 313 error = -EUNATCH;
310 goto out; 314 goto out;
311 } 315 }
312 set_bit(ATM_VF_LISTEN,&vcc->flags); 316 set_bit(ATM_VF_LISTEN, &vcc->flags);
313 vcc_insert_socket(sk); 317 vcc_insert_socket(sk);
314 sk->sk_max_ack_backlog = backlog > 0 ? backlog : ATM_BACKLOG_DEFAULT; 318 sk->sk_max_ack_backlog = backlog > 0 ? backlog : ATM_BACKLOG_DEFAULT;
315 error = -sk->sk_err; 319 error = -sk->sk_err;
@@ -318,8 +322,7 @@ out:
318 return error; 322 return error;
319} 323}
320 324
321 325static int svc_accept(struct socket *sock, struct socket *newsock, int flags)
322static int svc_accept(struct socket *sock,struct socket *newsock,int flags)
323{ 326{
324 struct sock *sk = sock->sk; 327 struct sock *sk = sock->sk;
325 struct sk_buff *skb; 328 struct sk_buff *skb;
@@ -330,21 +333,22 @@ static int svc_accept(struct socket *sock,struct socket *newsock,int flags)
330 333
331 lock_sock(sk); 334 lock_sock(sk);
332 335
333 error = svc_create(sock_net(sk), newsock,0); 336 error = svc_create(sock_net(sk), newsock, 0, 0);
334 if (error) 337 if (error)
335 goto out; 338 goto out;
336 339
337 new_vcc = ATM_SD(newsock); 340 new_vcc = ATM_SD(newsock);
338 341
339 pr_debug("svc_accept %p -> %p\n",old_vcc,new_vcc); 342 pr_debug("%p -> %p\n", old_vcc, new_vcc);
340 while (1) { 343 while (1) {
341 DEFINE_WAIT(wait); 344 DEFINE_WAIT(wait);
342 345
343 prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE); 346 prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE);
344 while (!(skb = skb_dequeue(&sk->sk_receive_queue)) && 347 while (!(skb = skb_dequeue(&sk->sk_receive_queue)) &&
345 sigd) { 348 sigd) {
346 if (test_bit(ATM_VF_RELEASED,&old_vcc->flags)) break; 349 if (test_bit(ATM_VF_RELEASED, &old_vcc->flags))
347 if (test_bit(ATM_VF_CLOSE,&old_vcc->flags)) { 350 break;
351 if (test_bit(ATM_VF_CLOSE, &old_vcc->flags)) {
348 error = -sk->sk_err; 352 error = -sk->sk_err;
349 break; 353 break;
350 } 354 }
@@ -359,7 +363,8 @@ static int svc_accept(struct socket *sock,struct socket *newsock,int flags)
359 error = -ERESTARTSYS; 363 error = -ERESTARTSYS;
360 break; 364 break;
361 } 365 }
362 prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE); 366 prepare_to_wait(sk->sk_sleep, &wait,
367 TASK_INTERRUPTIBLE);
363 } 368 }
364 finish_wait(sk->sk_sleep, &wait); 369 finish_wait(sk->sk_sleep, &wait);
365 if (error) 370 if (error)
@@ -368,31 +373,34 @@ static int svc_accept(struct socket *sock,struct socket *newsock,int flags)
368 error = -EUNATCH; 373 error = -EUNATCH;
369 goto out; 374 goto out;
370 } 375 }
371 msg = (struct atmsvc_msg *) skb->data; 376 msg = (struct atmsvc_msg *)skb->data;
372 new_vcc->qos = msg->qos; 377 new_vcc->qos = msg->qos;
373 set_bit(ATM_VF_HASQOS,&new_vcc->flags); 378 set_bit(ATM_VF_HASQOS, &new_vcc->flags);
374 new_vcc->remote = msg->svc; 379 new_vcc->remote = msg->svc;
375 new_vcc->local = msg->local; 380 new_vcc->local = msg->local;
376 new_vcc->sap = msg->sap; 381 new_vcc->sap = msg->sap;
377 error = vcc_connect(newsock, msg->pvc.sap_addr.itf, 382 error = vcc_connect(newsock, msg->pvc.sap_addr.itf,
378 msg->pvc.sap_addr.vpi, msg->pvc.sap_addr.vci); 383 msg->pvc.sap_addr.vpi,
384 msg->pvc.sap_addr.vci);
379 dev_kfree_skb(skb); 385 dev_kfree_skb(skb);
380 sk->sk_ack_backlog--; 386 sk->sk_ack_backlog--;
381 if (error) { 387 if (error) {
382 sigd_enq2(NULL,as_reject,old_vcc,NULL,NULL, 388 sigd_enq2(NULL, as_reject, old_vcc, NULL, NULL,
383 &old_vcc->qos,error); 389 &old_vcc->qos, error);
384 error = error == -EAGAIN ? -EBUSY : error; 390 error = error == -EAGAIN ? -EBUSY : error;
385 goto out; 391 goto out;
386 } 392 }
387 /* wait should be short, so we ignore the non-blocking flag */ 393 /* wait should be short, so we ignore the non-blocking flag */
388 set_bit(ATM_VF_WAITING, &new_vcc->flags); 394 set_bit(ATM_VF_WAITING, &new_vcc->flags);
389 prepare_to_wait(sk_atm(new_vcc)->sk_sleep, &wait, TASK_UNINTERRUPTIBLE); 395 prepare_to_wait(sk_atm(new_vcc)->sk_sleep, &wait,
390 sigd_enq(new_vcc,as_accept,old_vcc,NULL,NULL); 396 TASK_UNINTERRUPTIBLE);
397 sigd_enq(new_vcc, as_accept, old_vcc, NULL, NULL);
391 while (test_bit(ATM_VF_WAITING, &new_vcc->flags) && sigd) { 398 while (test_bit(ATM_VF_WAITING, &new_vcc->flags) && sigd) {
392 release_sock(sk); 399 release_sock(sk);
393 schedule(); 400 schedule();
394 lock_sock(sk); 401 lock_sock(sk);
395 prepare_to_wait(sk_atm(new_vcc)->sk_sleep, &wait, TASK_UNINTERRUPTIBLE); 402 prepare_to_wait(sk_atm(new_vcc)->sk_sleep, &wait,
403 TASK_UNINTERRUPTIBLE);
396 } 404 }
397 finish_wait(sk_atm(new_vcc)->sk_sleep, &wait); 405 finish_wait(sk_atm(new_vcc)->sk_sleep, &wait);
398 if (!sigd) { 406 if (!sigd) {
@@ -412,39 +420,37 @@ out:
412 return error; 420 return error;
413} 421}
414 422
415 423static int svc_getname(struct socket *sock, struct sockaddr *sockaddr,
416static int svc_getname(struct socket *sock,struct sockaddr *sockaddr, 424 int *sockaddr_len, int peer)
417 int *sockaddr_len,int peer)
418{ 425{
419 struct sockaddr_atmsvc *addr; 426 struct sockaddr_atmsvc *addr;
420 427
421 *sockaddr_len = sizeof(struct sockaddr_atmsvc); 428 *sockaddr_len = sizeof(struct sockaddr_atmsvc);
422 addr = (struct sockaddr_atmsvc *) sockaddr; 429 addr = (struct sockaddr_atmsvc *) sockaddr;
423 memcpy(addr,peer ? &ATM_SD(sock)->remote : &ATM_SD(sock)->local, 430 memcpy(addr, peer ? &ATM_SD(sock)->remote : &ATM_SD(sock)->local,
424 sizeof(struct sockaddr_atmsvc)); 431 sizeof(struct sockaddr_atmsvc));
425 return 0; 432 return 0;
426} 433}
427 434
428 435int svc_change_qos(struct atm_vcc *vcc, struct atm_qos *qos)
429int svc_change_qos(struct atm_vcc *vcc,struct atm_qos *qos)
430{ 436{
431 struct sock *sk = sk_atm(vcc); 437 struct sock *sk = sk_atm(vcc);
432 DEFINE_WAIT(wait); 438 DEFINE_WAIT(wait);
433 439
434 set_bit(ATM_VF_WAITING, &vcc->flags); 440 set_bit(ATM_VF_WAITING, &vcc->flags);
435 prepare_to_wait(sk->sk_sleep, &wait, TASK_UNINTERRUPTIBLE); 441 prepare_to_wait(sk->sk_sleep, &wait, TASK_UNINTERRUPTIBLE);
436 sigd_enq2(vcc,as_modify,NULL,NULL,&vcc->local,qos,0); 442 sigd_enq2(vcc, as_modify, NULL, NULL, &vcc->local, qos, 0);
437 while (test_bit(ATM_VF_WAITING, &vcc->flags) && 443 while (test_bit(ATM_VF_WAITING, &vcc->flags) &&
438 !test_bit(ATM_VF_RELEASED, &vcc->flags) && sigd) { 444 !test_bit(ATM_VF_RELEASED, &vcc->flags) && sigd) {
439 schedule(); 445 schedule();
440 prepare_to_wait(sk->sk_sleep, &wait, TASK_UNINTERRUPTIBLE); 446 prepare_to_wait(sk->sk_sleep, &wait, TASK_UNINTERRUPTIBLE);
441 } 447 }
442 finish_wait(sk->sk_sleep, &wait); 448 finish_wait(sk->sk_sleep, &wait);
443 if (!sigd) return -EUNATCH; 449 if (!sigd)
450 return -EUNATCH;
444 return -sk->sk_err; 451 return -sk->sk_err;
445} 452}
446 453
447
448static int svc_setsockopt(struct socket *sock, int level, int optname, 454static int svc_setsockopt(struct socket *sock, int level, int optname,
449 char __user *optval, unsigned int optlen) 455 char __user *optval, unsigned int optlen)
450{ 456{
@@ -454,37 +460,35 @@ static int svc_setsockopt(struct socket *sock, int level, int optname,
454 460
455 lock_sock(sk); 461 lock_sock(sk);
456 switch (optname) { 462 switch (optname) {
457 case SO_ATMSAP: 463 case SO_ATMSAP:
458 if (level != SOL_ATM || optlen != sizeof(struct atm_sap)) { 464 if (level != SOL_ATM || optlen != sizeof(struct atm_sap)) {
459 error = -EINVAL; 465 error = -EINVAL;
460 goto out; 466 goto out;
461 } 467 }
462 if (copy_from_user(&vcc->sap, optval, optlen)) { 468 if (copy_from_user(&vcc->sap, optval, optlen)) {
463 error = -EFAULT; 469 error = -EFAULT;
464 goto out; 470 goto out;
465 } 471 }
466 set_bit(ATM_VF_HASSAP, &vcc->flags); 472 set_bit(ATM_VF_HASSAP, &vcc->flags);
467 break; 473 break;
468 case SO_MULTIPOINT: 474 case SO_MULTIPOINT:
469 if (level != SOL_ATM || optlen != sizeof(int)) { 475 if (level != SOL_ATM || optlen != sizeof(int)) {
470 error = -EINVAL; 476 error = -EINVAL;
471 goto out; 477 goto out;
472 } 478 }
473 if (get_user(value, (int __user *) optval)) { 479 if (get_user(value, (int __user *)optval)) {
474 error = -EFAULT; 480 error = -EFAULT;
475 goto out; 481 goto out;
476 } 482 }
477 if (value == 1) { 483 if (value == 1)
478 set_bit(ATM_VF_SESSION, &vcc->flags); 484 set_bit(ATM_VF_SESSION, &vcc->flags);
479 } else if (value == 0) { 485 else if (value == 0)
480 clear_bit(ATM_VF_SESSION, &vcc->flags); 486 clear_bit(ATM_VF_SESSION, &vcc->flags);
481 } else { 487 else
482 error = -EINVAL; 488 error = -EINVAL;
483 } 489 break;
484 break; 490 default:
485 default: 491 error = vcc_setsockopt(sock, level, optname, optval, optlen);
486 error = vcc_setsockopt(sock, level, optname,
487 optval, optlen);
488 } 492 }
489 493
490out: 494out:
@@ -492,9 +496,8 @@ out:
492 return error; 496 return error;
493} 497}
494 498
495 499static int svc_getsockopt(struct socket *sock, int level, int optname,
496static int svc_getsockopt(struct socket *sock,int level,int optname, 500 char __user *optval, int __user *optlen)
497 char __user *optval,int __user *optlen)
498{ 501{
499 struct sock *sk = sock->sk; 502 struct sock *sk = sock->sk;
500 int error = 0, len; 503 int error = 0, len;
@@ -521,7 +524,6 @@ out:
521 return error; 524 return error;
522} 525}
523 526
524
525static int svc_addparty(struct socket *sock, struct sockaddr *sockaddr, 527static int svc_addparty(struct socket *sock, struct sockaddr *sockaddr,
526 int sockaddr_len, int flags) 528 int sockaddr_len, int flags)
527{ 529{
@@ -540,7 +542,7 @@ static int svc_addparty(struct socket *sock, struct sockaddr *sockaddr,
540 error = -EINPROGRESS; 542 error = -EINPROGRESS;
541 goto out; 543 goto out;
542 } 544 }
543 pr_debug("svc_addparty added wait queue\n"); 545 pr_debug("added wait queue\n");
544 while (test_bit(ATM_VF_WAITING, &vcc->flags) && sigd) { 546 while (test_bit(ATM_VF_WAITING, &vcc->flags) && sigd) {
545 schedule(); 547 schedule();
546 prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE); 548 prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE);
@@ -552,7 +554,6 @@ out:
552 return error; 554 return error;
553} 555}
554 556
555
556static int svc_dropparty(struct socket *sock, int ep_ref) 557static int svc_dropparty(struct socket *sock, int ep_ref)
557{ 558{
558 DEFINE_WAIT(wait); 559 DEFINE_WAIT(wait);
@@ -579,7 +580,6 @@ out:
579 return error; 580 return error;
580} 581}
581 582
582
583static int svc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) 583static int svc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
584{ 584{
585 int error, ep_ref; 585 int error, ep_ref;
@@ -587,29 +587,31 @@ static int svc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
587 struct atm_vcc *vcc = ATM_SD(sock); 587 struct atm_vcc *vcc = ATM_SD(sock);
588 588
589 switch (cmd) { 589 switch (cmd) {
590 case ATM_ADDPARTY: 590 case ATM_ADDPARTY:
591 if (!test_bit(ATM_VF_SESSION, &vcc->flags)) 591 if (!test_bit(ATM_VF_SESSION, &vcc->flags))
592 return -EINVAL; 592 return -EINVAL;
593 if (copy_from_user(&sa, (void __user *) arg, sizeof(sa))) 593 if (copy_from_user(&sa, (void __user *) arg, sizeof(sa)))
594 return -EFAULT; 594 return -EFAULT;
595 error = svc_addparty(sock, (struct sockaddr *) &sa, sizeof(sa), 0); 595 error = svc_addparty(sock, (struct sockaddr *)&sa, sizeof(sa),
596 break; 596 0);
597 case ATM_DROPPARTY: 597 break;
598 if (!test_bit(ATM_VF_SESSION, &vcc->flags)) 598 case ATM_DROPPARTY:
599 return -EINVAL; 599 if (!test_bit(ATM_VF_SESSION, &vcc->flags))
600 if (copy_from_user(&ep_ref, (void __user *) arg, sizeof(int))) 600 return -EINVAL;
601 return -EFAULT; 601 if (copy_from_user(&ep_ref, (void __user *) arg, sizeof(int)))
602 error = svc_dropparty(sock, ep_ref); 602 return -EFAULT;
603 break; 603 error = svc_dropparty(sock, ep_ref);
604 default: 604 break;
605 error = vcc_ioctl(sock, cmd, arg); 605 default:
606 error = vcc_ioctl(sock, cmd, arg);
606 } 607 }
607 608
608 return error; 609 return error;
609} 610}
610 611
611#ifdef CONFIG_COMPAT 612#ifdef CONFIG_COMPAT
612static int svc_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) 613static int svc_compat_ioctl(struct socket *sock, unsigned int cmd,
614 unsigned long arg)
613{ 615{
614 /* The definition of ATM_ADDPARTY uses the size of struct atm_iobuf. 616 /* The definition of ATM_ADDPARTY uses the size of struct atm_iobuf.
615 But actually it takes a struct sockaddr_atmsvc, which doesn't need 617 But actually it takes a struct sockaddr_atmsvc, which doesn't need
@@ -650,23 +652,24 @@ static const struct proto_ops svc_proto_ops = {
650}; 652};
651 653
652 654
653static int svc_create(struct net *net, struct socket *sock,int protocol) 655static int svc_create(struct net *net, struct socket *sock, int protocol,
656 int kern)
654{ 657{
655 int error; 658 int error;
656 659
657 if (net != &init_net) 660 if (!net_eq(net, &init_net))
658 return -EAFNOSUPPORT; 661 return -EAFNOSUPPORT;
659 662
660 sock->ops = &svc_proto_ops; 663 sock->ops = &svc_proto_ops;
661 error = vcc_create(net, sock, protocol, AF_ATMSVC); 664 error = vcc_create(net, sock, protocol, AF_ATMSVC);
662 if (error) return error; 665 if (error)
666 return error;
663 ATM_SD(sock)->local.sas_family = AF_ATMSVC; 667 ATM_SD(sock)->local.sas_family = AF_ATMSVC;
664 ATM_SD(sock)->remote.sas_family = AF_ATMSVC; 668 ATM_SD(sock)->remote.sas_family = AF_ATMSVC;
665 return 0; 669 return 0;
666} 670}
667 671
668 672static const struct net_proto_family svc_family_ops = {
669static struct net_proto_family svc_family_ops = {
670 .family = PF_ATMSVC, 673 .family = PF_ATMSVC,
671 .create = svc_create, 674 .create = svc_create,
672 .owner = THIS_MODULE, 675 .owner = THIS_MODULE,
generated by cgit v1.2.2 (git 2.25.0) at 2025-04-04 01:45:39 -0400