Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl3945-base.c

1 files changed, 5 insertions, 4 deletions

diff --git a/net/wimax/id-table.c b/net/wimax/id-table.c
index 5e685f7eda9..72273abfcb1 100644
--- a/net/wimax/id-table.c
+++ b/net/wimax/id-table.c
@@ -94,12 +94,13 @@ struct wimax_dev *wimax_dev_get_by_genl_info(
         list_for_each_entry(wimax_dev, &wimax_id_table, id_table_node) {
                 if (wimax_dev->net_dev->ifindex == ifindex) {
                         dev_hold(wimax_dev->net_dev);
-                        break;
+                        goto found;
                 }
         }
-        if (wimax_dev == NULL)
-                d_printf(1, NULL, "wimax: no devices found with ifindex %d\n",
-                         ifindex);
+        wimax_dev = NULL;
+        d_printf(1, NULL, "wimax: no devices found with ifindex %d\n",
+                 ifindex);
+found:
         spin_unlock(&wimax_id_table_lock);
         d_fnend(3, NULL, "(info %p ifindex %d) = %p\n",
                 info, ifindex, wimax_dev);