5 files changed, 62 insertions, 25 deletions

diff --git a/net/atm/addr.c b/net/atm/addr.c
index a30d0bf48063..3060fd0ba4b9 100644
--- a/net/atm/addr.c
+++ b/net/atm/addr.c
@@ -44,31 +44,43 @@ static void notify_sigd(struct atm_dev *dev)
         sigd_enq(NULL, as_itf_notify, NULL, &pvc, NULL);
 }
 
-void atm_reset_addr(struct atm_dev *dev)
+void atm_reset_addr(struct atm_dev *dev, enum atm_addr_type_t atype)
 {
         unsigned long flags;
         struct atm_dev_addr *this, *p;
+        struct list_head *head;
 
         spin_lock_irqsave(&dev->lock, flags);
-        list_for_each_entry_safe(this, p, &dev->local, entry) {
+        if (atype == ATM_ADDR_LECS)
+                head = &dev->lecs;
+        else
+                head = &dev->local;
+        list_for_each_entry_safe(this, p, head, entry) {
                 list_del(&this->entry);
                 kfree(this);
         }
         spin_unlock_irqrestore(&dev->lock, flags);
-        notify_sigd(dev);
+        if (head == &dev->local)
+                notify_sigd(dev);
 }
 
-int atm_add_addr(struct atm_dev *dev, struct sockaddr_atmsvc *addr)
+int atm_add_addr(struct atm_dev *dev, struct sockaddr_atmsvc *addr,
+                 enum atm_addr_type_t atype)
 {
         unsigned long flags;
         struct atm_dev_addr *this;
+        struct list_head *head;
         int error;
 
         error = check_addr(addr);
         if (error)
                 return error;
         spin_lock_irqsave(&dev->lock, flags);
-        list_for_each_entry(this, &dev->local, entry) {
+        if (atype == ATM_ADDR_LECS)
+                head = &dev->lecs;
+        else
+                head = &dev->local;
+        list_for_each_entry(this, head, entry) {
                 if (identical(&this->addr, addr)) {
                         spin_unlock_irqrestore(&dev->lock, flags);
                         return -EEXIST;
@@ -80,28 +92,36 @@ int atm_add_addr(struct atm_dev *dev, struct sockaddr_atmsvc *addr)
                 return -ENOMEM;
         }
         this->addr = *addr;
-        list_add(&this->entry, &dev->local);
+        list_add(&this->entry, head);
         spin_unlock_irqrestore(&dev->lock, flags);
-        notify_sigd(dev);
+        if (head == &dev->local)
+                notify_sigd(dev);
         return 0;
 }
 
-int atm_del_addr(struct atm_dev *dev, struct sockaddr_atmsvc *addr)
+int atm_del_addr(struct atm_dev *dev, struct sockaddr_atmsvc *addr,
+                 enum atm_addr_type_t atype)
 {
         unsigned long flags;
         struct atm_dev_addr *this;
+        struct list_head *head;
         int error;
 
         error = check_addr(addr);
         if (error)
                 return error;
         spin_lock_irqsave(&dev->lock, flags);
-        list_for_each_entry(this, &dev->local, entry) {
+        if (atype == ATM_ADDR_LECS)
+                head = &dev->lecs;
+        else
+                head = &dev->local;
+        list_for_each_entry(this, head, entry) {
                 if (identical(&this->addr, addr)) {
                         list_del(&this->entry);
                         spin_unlock_irqrestore(&dev->lock, flags);
                         kfree(this);
-                        notify_sigd(dev);
+                        if (head == &dev->local)
+                                notify_sigd(dev);
                         return 0;
                 }
         }
@@ -110,22 +130,27 @@ int atm_del_addr(struct atm_dev *dev, struct sockaddr_atmsvc *addr)
 }
 
 int atm_get_addr(struct atm_dev *dev, struct sockaddr_atmsvc __user * buf,
-                 size_t size)
+                 size_t size, enum atm_addr_type_t atype)
 {
         unsigned long flags;
         struct atm_dev_addr *this;
+        struct list_head *head;
         int total = 0, error;
         struct sockaddr_atmsvc *tmp_buf, *tmp_bufp;
 
         spin_lock_irqsave(&dev->lock, flags);
-        list_for_each_entry(this, &dev->local, entry)
+        if (atype == ATM_ADDR_LECS)
+                head = &dev->lecs;
+        else
+                head = &dev->local;
+        list_for_each_entry(this, head, entry)
             total += sizeof(struct sockaddr_atmsvc);
         tmp_buf = tmp_bufp = kmalloc(total, GFP_ATOMIC);
         if (!tmp_buf) {
                 spin_unlock_irqrestore(&dev->lock, flags);
                 return -ENOMEM;
         }
-        list_for_each_entry(this, &dev->local, entry)
+        list_for_each_entry(this, head, entry)
             memcpy(tmp_bufp++, &this->addr, sizeof(struct sockaddr_atmsvc));
         spin_unlock_irqrestore(&dev->lock, flags);
         error = total > size ? -E2BIG : total;
diff --git a/net/atm/addr.h b/net/atm/addr.h
index 3099d21feeaa..f39433ad45da 100644
--- a/net/atm/addr.h
+++ b/net/atm/addr.h
@@ -9,10 +9,12 @@
 #include <linux/atm.h>
 #include <linux/atmdev.h>
 
-
-void atm_reset_addr(struct atm_dev *dev);
-int atm_add_addr(struct atm_dev *dev,struct sockaddr_atmsvc *addr);
-int atm_del_addr(struct atm_dev *dev,struct sockaddr_atmsvc *addr);
-int atm_get_addr(struct atm_dev *dev,struct sockaddr_atmsvc __user *buf,size_t size);
+void atm_reset_addr(struct atm_dev *dev, enum atm_addr_type_t type);
+int atm_add_addr(struct atm_dev *dev, struct sockaddr_atmsvc *addr,
+                 enum atm_addr_type_t type);
+int atm_del_addr(struct atm_dev *dev, struct sockaddr_atmsvc *addr,
+                 enum atm_addr_type_t type);
+int atm_get_addr(struct atm_dev *dev, struct sockaddr_atmsvc __user *buf,
+                 size_t size, enum atm_addr_type_t type);
 
 #endif
diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
index b2113c3454ae..223c7ad5bd0f 100644
--- a/net/atm/atm_misc.c
+++ b/net/atm/atm_misc.c
@@ -25,7 +25,7 @@ int atm_charge(struct atm_vcc *vcc,int truesize)
 
 
 struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc,int pdu_size,
-    int gfp_flags)
+    gfp_t gfp_flags)
 {
         struct sock *sk = sk_atm(vcc);
         int guess = atm_guess_pdu2truesize(pdu_size);
diff --git a/net/atm/br2684.c b/net/atm/br2684.c
index 289956c4dd3e..72f3f7b8de80 100644
--- a/net/atm/br2684.c
+++ b/net/atm/br2684.c
@@ -220,7 +220,7 @@ static int br2684_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 /* netif_stop_queue(dev); */
                 dev_kfree_skb(skb);
                 read_unlock(&devs_lock);
-                return -EUNATCH;
+                return 0;
         }
         if (!br2684_xmit_vcc(skb, brdev, brvcc)) {
                 /*
diff --git a/net/atm/resources.c b/net/atm/resources.c
index a57a9268bd24..415d2615d475 100644
--- a/net/atm/resources.c
+++ b/net/atm/resources.c
@@ -40,6 +40,7 @@ static struct atm_dev *__alloc_atm_dev(const char *type)
         dev->link_rate = ATM_OC3_PCR;
         spin_lock_init(&dev->lock);
         INIT_LIST_HEAD(&dev->local);
+        INIT_LIST_HEAD(&dev->lecs);
 
         return dev;
 }
@@ -320,10 +321,12 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg)
                                 error = -EPERM;
                                 goto done;
                         }
-                        atm_reset_addr(dev);
+                        atm_reset_addr(dev, ATM_ADDR_LOCAL);
                         break;
                 case ATM_ADDADDR:
                 case ATM_DELADDR:
+                case ATM_ADDLECSADDR:
+                case ATM_DELLECSADDR:
                         if (!capable(CAP_NET_ADMIN)) {
                                 error = -EPERM;
                                 goto done;
@@ -335,14 +338,21 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg)
                                         error = -EFAULT;
                                         goto done;
                                 }
-                                if (cmd == ATM_ADDADDR)
-                                        error = atm_add_addr(dev, &addr);
+                                if (cmd == ATM_ADDADDR || cmd == ATM_ADDLECSADDR)
+                                        error = atm_add_addr(dev, &addr,
+                                                             (cmd == ATM_ADDADDR ?
+                                                              ATM_ADDR_LOCAL : ATM_ADDR_LECS));
                                 else
-                                        error = atm_del_addr(dev, &addr);
+                                        error = atm_del_addr(dev, &addr,
+                                                             (cmd == ATM_DELADDR ?
+                                                              ATM_ADDR_LOCAL : ATM_ADDR_LECS));
                                 goto done;
                         }
                 case ATM_GETADDR:
-                        error = atm_get_addr(dev, buf, len);
+                case ATM_GETLECSADDR:
+                        error = atm_get_addr(dev, buf, len,
+                                             (cmd == ATM_GETADDR ?
+                                              ATM_ADDR_LOCAL : ATM_ADDR_LECS));
                         if (error < 0)
                                 goto done;
                         size = error;