2 files changed, 6 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 4115a89..d560127 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,2 +21,3 @@
                 * n.a.- memoryapplet: fix crash in memoryapplet on kernels without swap support (seneca cunningham)
+        * n.a.  - networksettings: ignore hostap control interfaces wifi* (mickeyl)
 
diff --git a/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp
index 3222e50..a7b0bdc 100644
--- a/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp
@@ -191,4 +191,4 @@ void MainWindowImp::getAllInterfaces()
             struct ifreq *pifr = &ifrs[i];
-
-            ifaces += pifr->ifr_name;
+            if ( !QString( pifr->ifr_name ).startsWith( "wifi" ) ) ifaces += pifr->ifr_name;
+            else odebug << "ignoring hostap control interface " << pifr->ifr_name << oendl;
         }
@@ -208,3 +208,5 @@ void MainWindowImp::getAllInterfaces()
             {
-                ifaces += line.left(loc);
+                // ignore wifi* (hostap control interfaces)
+                if ( !line.left(loc).startsWith( "wifi" ) ) ifaces += line.left(loc);
+                else odebug << "ignoring hostap control interface " << line.left(loc) << oendl;
             }