[PATCH 1/11][ATM]: always return the first interface for ATM_ITF_ANY

[chas williams - CONTRACTOR]

please apply to 2.6 -- thanks!

[ATM]: always return the first interface for ATM_ITF_ANY

From: Mitchell Blank Jr <[EMAIL PROTECTED]>
Signed-off-by: Chas Williams <[EMAIL PROTECTED]>

---
commit d86bc37841a99650cb17debfaa1ed59f7a9a4431
tree f8b60fc436ac81bfaca70363f441aaf44aa123ba
parent 03153af17b6af2d0cd77d20431b847724c594c3e
author chas williams <[EMAIL PROTECTED](none)> Sat, 26 Nov 2005 15:44:02 -0500
committer chas williams <[EMAIL PROTECTED](none)> Sat, 26 Nov 2005 15:44:02 
-0500

 net/atm/common.c |   30 ++++++++++--------------------
 1 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/net/atm/common.c b/net/atm/common.c
--- a/net/atm/common.c
+++ b/net/atm/common.c
@@ -423,33 +423,23 @@ int vcc_connect(struct socket *sock, int
        if (vcc->qos.txtp.traffic_class == ATM_ANYCLASS ||
            vcc->qos.rxtp.traffic_class == ATM_ANYCLASS)
                return -EINVAL;
-       if (itf != ATM_ITF_ANY) {
+       if (likely(itf != ATM_ITF_ANY)) {
                dev = atm_dev_lookup(itf);
-               if (!dev)
-                       return -ENODEV;
-               error = __vcc_connect(vcc, dev, vpi, vci);
-               if (error) {
-                       atm_dev_put(dev);
-                       return error;
-               }
        } else {
-               struct list_head *p, *next;
-
                dev = NULL;
                spin_lock(&atm_dev_lock);
-               list_for_each_safe(p, next, &atm_devs) {
-                       dev = list_entry(p, struct atm_dev, dev_list);
+               if (!list_empty(&atm_devs)) {
+                       dev = list_entry(atm_devs.next, struct atm_dev, 
dev_list);
                        atm_dev_hold(dev);
-                       spin_unlock(&atm_dev_lock);
-                       if (!__vcc_connect(vcc, dev, vpi, vci))
-                               break;
-                       atm_dev_put(dev);
-                       dev = NULL;
-                       spin_lock(&atm_dev_lock);
                }
                spin_unlock(&atm_dev_lock);
-               if (!dev)
-                       return -ENODEV;
+       }
+       if (!dev)
+               return -ENODEV;
+       error = __vcc_connect(vcc, dev, vpi, vci);
+       if (error) {
+               atm_dev_put(dev);
+               return error;
        }
        if (vpi == ATM_VPI_UNSPEC || vci == ATM_VCI_UNSPEC)
                set_bit(ATM_VF_PARTIAL,&vcc->flags);
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html