Changeset 136 for trunk

Timestamp:

04/08/07 15:42:28 (21 months ago)

Author:

dragorn

Message:

Rolled in patch from JohnyCsh? which handles int and char rfmontx privs on rt2570

Files:

• trunk/rt2570inject.c (modified) (2 diffs)

trunk/rt2570inject.c

@@ -30 +30 @@
 int tx80211_rt2570_init(struct tx80211 *in_tx)
 {
-
         in_tx->capabilities = tx80211_rt2570_capabilities();
         in_tx->open_callthrough = &rt2570_open;
@@ -56 +55 @@
 int rt2570_open(struct tx80211 *in_tx)
 {
-
         char errstr[TX80211_STATUS_MAX];
 
-        /* Call private ioctl "rfmontx" to enable raw TX */
-        if (iwconfig_set_intpriv(in_tx->ifname, "rfmontx", 1, 0, errstr) != 0) {
-                snprintf(in_tx->errstr, TX80211_STATUS_MAX,
-                                "Error enabling rfmontx private ioctl: %s\n",
-                                errstr);
-                return -1;
-        }
+        /* Call rfmontx to enable raw tx.
+         * Some drivers prefer set_intpriv, others charpriv.  Try both.
+         */
 
-        return(wtinj_open(in_tx));
+        if (iwconfig_set_charpriv(in_tx->ifname, "rfmontx", "1", errstr) >= 0)
+                return(wtinj_open(in_tx));
+
+        if (iwconfig_set_intpriv(in_tx->ifname, "rfmontx", 1, 0, errstr) >= 0)
+                return(wtinj_open(in_tx));
+
+        /* If we reach this point, failed to enable rfmontx */  
+
+        fprintf(stderr, "Error enabling rfmontx private ioctl: %s\n", errstr);
+        return -1;
 }