Wlan-ng chanswitch

1 files changed, 4 insertions, 14 deletions

diff --git a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc
index 29dcc75..8c94cb1 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc
+++ b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc
@@ -46,6 +46,7 @@ int card_into_monitormode (pcap_t **orighandle, char *device, int cardtype)
   else if (cardtype == CARD_TYPE_NG)
   {
-      char wlanngcmd[62];
+      char wlanngcmd[80];
       snprintf(wlanngcmd, sizeof(wlanngcmd) - 1, "$(which wlanctl-ng) %s lnxreq_wlansniff channel=%d enable=true", device, 1);
+      printf ("\n %s",wlanngcmd);  
       if (system(wlanngcmd) != 0)
       {
@@ -162,7 +163,7 @@ int card_set_promisc_up (const char *device)
 int card_set_channel (const char *device, int channel, int cardtype)
 {
-    if (cardtype == CARD_TYPE_CISCO)
+    if (cardtype == CARD_TYPE_CISCO || cardtype == CARD_TYPE_NG)
     {
-            /* Cisco cards don't need channelswitching */
+            /* Cisco and wlan-ng drivers don't need channelswitching */
             return 1;
     }
@@ -200,15 +201,4 @@ int card_set_channel (const char *device, int channel, int cardtype)
            }
     }
-    else if (cardtype == CARD_TYPE_NG)
-        {
-                char wlanngcmd[62];
-                snprintf(wlanngcmd, sizeof(wlanngcmd) - 1, "$(which wlanctl-ng) %s lnxreq_wlansniff channel=%d enable=true", device, channel);
-                if (system(wlanngcmd) != 0)
-                {
-                        wl_logerr("Could not set channel %d on %s, check cardtype",channel, device);
-                        return 0;
-                }
-
-        }
     /* For undefined situations */
         return 0;