Changeset 163

Timestamp:

08/16/08 15:03:23 (3 months ago)

Author:

dragorn

Message:

Expanded d80211 into mac80211 and added multiple other cards (from diff sent on irc

by someone who I can't find in the logs, and the original diff was broken so the
actions were recreated)

Location:

trunk

Files:

• Makefile.in (modified) (1 diff)
• lorcon.3 (modified) (1 diff)
• mac80211inject.c (moved) (moved from trunk/d80211inject.c) (4 diffs)
• mac80211inject.h (moved) (moved from trunk/d80211inject.h) (2 diffs)
• tx80211.c (modified) (4 diffs)
• tx80211.h (modified) (1 diff)

trunk/Makefile.in

@@ -32 +32 @@
                  hapinject.lo rt2500inject.lo rtlinject.lo \
                  rt2570inject.lo airpinject.lo rt73inject.lo \
-                 rt61inject.lo zd1211rwinject.lo d80211inject.lo \
+                 rt61inject.lo zd1211rwinject.lo mac80211inject.lo \
                  bcm43xxinject.lo tx80211.lo \
                  lorcon_packasm.lo lorcon_forge.lo 

trunk/lorcon.3

@@ -204 +204 @@
 Indicates the Linux bcm43xx kernel drivers.  The string "bcm43xx" may be used to indicate the use of this driver.
 .TP
-.B INJ_D80211
+.B INJ_MAC80211
 Generic driver for Linux Mac80211 wireless layer drivers, which require a cutting-edge kernel.  Multiple device names are aliased to this driver, including "ath5k" and "iwlwifi".  Future Linux support will be concentrated on this driver.
 .TP

trunk/mac80211inject.c

@@ -25 +25 @@
 #ifdef SYS_LINUX
 
-#include "d80211inject.h"
+#include "mac80211inject.h"
 #include "wtinject.h"
 
-int tx80211_d80211_init(struct tx80211 *in_tx)
+int tx80211_mac80211_init(struct tx80211 *in_tx)
 {
-        in_tx->capabilities = tx80211_d80211_capabilities();
+        in_tx->capabilities = tx80211_mac80211_capabilities();
         in_tx->open_callthrough = &wtinj_open;
         in_tx->close_callthrough = &wtinj_close;
@@ -37 +37 @@
         in_tx->getchan_callthrough = &wtinj_getchannel;
         in_tx->setchan_callthrough = &wtinj_setchannel;
-        in_tx->txpacket_callthrough = &tx80211_d80211_send;
+        in_tx->txpacket_callthrough = &tx80211_mac80211_send;
         in_tx->setfuncmode_callthrough = &wtinj_setfuncmode;
 
@@ -43 +43 @@
 }
 
-int tx80211_d80211_capabilities()
+int tx80211_mac80211_capabilities()
 {
         return (TX80211_CAP_SNIFF | TX80211_CAP_TRANSMIT |
@@ -51 +51 @@
 }
 
-int tx80211_d80211_send(struct tx80211 *in_tx, struct tx80211_packet *in_pkt)
+int tx80211_mac80211_send(struct tx80211 *in_tx, struct tx80211_packet *in_pkt)
 {
         struct tx80211_packet mwng_pkt;

trunk/mac80211inject.h

@@ -19 +19 @@
 */
 
-#ifndef __D80211INJECT_H__
-#define __D80211INJECT_H__
+#ifndef __MAC80211INJECT_H__
+#define __MAC80211INJECT_H__
 
 #ifdef HAVE_CONFIG_H
@@ -56 +56 @@
 #include "wtinject.h"
 
-int tx80211_d80211_init(struct tx80211 *in_tx);
-int tx80211_d80211_send(struct tx80211 *in_tx, struct tx80211_packet *in_pkt);
+int tx80211_mac80211_init(struct tx80211 *in_tx);
+int tx80211_mac80211_send(struct tx80211 *in_tx, struct tx80211_packet *in_pkt);
 
-int tx80211_d80211_capabilities();
+int tx80211_mac80211_capabilities();
 
 #endif /* linux */

trunk/tx80211.c

@@ -120 +120 @@
 
         ret->cardnames[ret->num_cards] = strdup("rt2570");
-        ret->descriptions[ret->num_cards] = strdup("Raylink 2570 802.11b");
+        ret->descriptions[ret->num_cards] = strdup("Ralink 2570 802.11b");
         ret->capabilities[ret->num_cards] = tx80211_rt2570_capabilities();
         ret->num_cards++;
 
         ret->cardnames[ret->num_cards] = strdup("rt2500");
-        ret->descriptions[ret->num_cards] = strdup("Raylink 2500 802.11b");
+        ret->descriptions[ret->num_cards] = strdup("Ralink 2500 802.11b");
         ret->capabilities[ret->num_cards] = tx80211_rt2500_capabilities();
         ret->num_cards++;
 
         ret->cardnames[ret->num_cards] = strdup("rt73");
-        ret->descriptions[ret->num_cards] = strdup("Raylink 73 802.11g USB");
+        ret->descriptions[ret->num_cards] = strdup("Ralink 73 802.11g USB");
         ret->capabilities[ret->num_cards] = tx80211_rt73_capabilities();
         ret->num_cards++;
 
         ret->cardnames[ret->num_cards] = strdup("rt61");
-        ret->descriptions[ret->num_cards] = strdup("Raylink 61 pre-N PC Card");
+        ret->descriptions[ret->num_cards] = strdup("Ralink 61 pre-N PC Card");
         ret->capabilities[ret->num_cards] = tx80211_rt61_capabilities();
         ret->num_cards++;
@@ -150 +150 @@
 
         ret->cardnames[ret->num_cards] = strdup("d80211");
-        ret->descriptions[ret->num_cards] = strdup("Linux generic d80211");
-        ret->capabilities[ret->num_cards] = tx80211_d80211_capabilities();
+        ret->descriptions[ret->num_cards] = strdup("Linux generic mac80211");
+        ret->capabilities[ret->num_cards] = tx80211_mac80211_capabilities();
+        ret->num_cards++;
+
+        ret->cardnames[ret->num_cards] = strdup("mac80211");
+        ret->descriptions[ret->num_cards] = strdup("Linux generic mac80211");
+        ret->capabilities[ret->num_cards] = tx80211_mac80211_capabilities();
         ret->num_cards++;
 
         ret->cardnames[ret->num_cards] = strdup("ath5k");
-        ret->descriptions[ret->num_cards] = strdup("Ath5k Atheros");
-        ret->capabilities[ret->num_cards] = tx80211_d80211_capabilities();
+        ret->descriptions[ret->num_cards] = strdup("Ath5k Atheros (mac80211)");
+        ret->capabilities[ret->num_cards] = tx80211_mac80211_capabilities();
         ret->num_cards++;
 
         ret->cardnames[ret->num_cards] = strdup("iwlwifi");
-        ret->descriptions[ret->num_cards] = strdup("iwlwifi Intel");
-        ret->capabilities[ret->num_cards] = tx80211_d80211_capabilities();
-        ret->num_cards++;
+        ret->descriptions[ret->num_cards] = strdup("iwlwifi Intel (mac80211)");
+        ret->capabilities[ret->num_cards] = tx80211_mac80211_capabilities();
+        ret->num_cards++;
+
+        ret->cardnames[ret->num_cards] = strdup("iwl-agn");
+        ret->descriptions[ret->num_cards] = strdup("iwlwifi Intel (mac80211)");
+        ret->capabilities[ret->num_cards] = tx80211_mac80211_capabilities();
+        ret->num_cards++;
+
+        ret->cardnames[ret->num_cards] = strdup("iwl4965");
+        ret->descriptions[ret->num_cards] = strdup("iwlwifi Intel (mac80211)");
+        ret->capabilities[ret->num_cards] = tx80211_mac80211_capabilities();
+        ret->num_cards++;
+
+        ret->cardnames[ret->num_cards] = strdup("iwl5000");
+        ret->descriptions[ret->num_cards] = strdup("iwlwifi Intel (mac80211)");
+        ret->capabilities[ret->num_cards] = tx80211_mac80211_capabilities();
+        ret->num_cards++;
+
+        ret->cardnames[ret->num_cards] = strdup("b43");
+        ret->descriptions[ret->num_cards] = strdup("Broadcom b43 (mac80211)");
+        ret->capabilities[ret->num_cards] = tx80211_mac80211_capabilities();
+        ret->num_cards++;
+
+        ret->cardnames[ret->num_cards] = strdup("b43-legacy");
+        ret->descriptions[ret->num_cards] = strdup("Broadcom b43-legacy (mac80211)");
+        ret->capabilities[ret->num_cards] = tx80211_mac80211_capabilities();
+        ret->num_cards++;
+
+        ret->cardnames[ret->num_cards] = strdup("rt2x00");
+        ret->descriptions[ret->num_cards] = strdup("Realtek 2x00 (mac80211)");
+        ret->capabilities[ret->num_cards] = tx80211_mac80211_capabilities();
+        ret->num_cards++;
+
+        ret->cardnames[ret->num_cards] = strdup("rt2500pci");
+        ret->descriptions[ret->num_cards] = strdup("Realtek 2500 PCI (mac80211)");
+        ret->capabilities[ret->num_cards] = tx80211_mac80211_capabilities();
+        ret->num_cards++;
+
+        ret->cardnames[ret->num_cards] = strdup("rt2500usb");
+        ret->descriptions[ret->num_cards] = strdup("Realtek 2500 USB (mac80211)");
+        ret->capabilities[ret->num_cards] = tx80211_mac80211_capabilities();
+        ret->num_cards++;
+
+        ret->cardnames[ret->num_cards] = strdup("rt61pci");
+        ret->descriptions[ret->num_cards] = strdup("Realtek 61 PCI (mac80211)");
+        ret->capabilities[ret->num_cards] = tx80211_mac80211_capabilities();
+        ret->num_cards++;
+
+
 
 #endif /* SYS_LINUX */
@@ -244 +296 @@
                 return INJ_BCM43XX;
 
-        if (!strcasecmp(in_str, "ath5k") || 
-                !strcasecmp(in_str, "iwlwifi") ||
-                !strcasecmp(in_str, "d80211"))
-                return INJ_D80211;
+        if (!strcasecmp(in_str, "ath5k") || !strcasecmp(in_str, "ath9k") ||
+                !strcasecmp(in_str, "iwlwifi") || !strcasecmp(in_str, "iwlagn") ||
+                !strcasecmp(in_str, "iwl-agn") || !strcasecmp(in_str, "iwl3945") ||
+                !strcasecmp(in_str, "iwl4965") || !strcasecmp(in_str, "iwl5000") ||
+                !strcasecmp(in_str, "mac80211") || !strcasecmp(in_str, "d80211") ||
+                !strcasecmp(in_str, "rt2x00") || !strcasecmp(in_str, "rt2400pci") ||
+                !strcasecmp(in_str, "rt2500pci") || strcasecmp(in_str, "rt2500usb") ||
+                !strcasecmp(in_str, "rt61pci") || strcasecmp(in_str, "rt73usb") ||
+                !strcasecmp(in_str, "b43") || !strcasecmp(in_str, "b43legacy") ||
+                !strcasecmp(in_str, "rtl8180") || !strcasecmp(in_str, "rtl8187"))
+                return INJ_MAC80211;
 
 #endif /* SYS_LINUX */
@@ -325 +384 @@
                 break;
 
-        case INJ_D80211:
-                ret = tx80211_d80211_init(in_tx);
+        case INJ_MAC80211:
+                ret = tx80211_mac80211_init(in_tx);
                 break;
 

trunk/tx80211.h

@@ -224 +224 @@
 #define INJ_ZD1211RW    13
 #define INJ_BCM43XX     14
-#define INJ_D80211              15
+#define INJ_MAC80211    15
 /*
 * No-one should test for INJ_MAX, test for INJ_NODRIVER instead