hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

madwifi: add a patch for detecting vendor / device name information (only implemented for WiSoC at the moment) 

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13027 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Felix Fietkau 2008-10-23 01:07:42 +00:00
parent ad0b1add52
commit 0ca081e124
4 changed files with 326 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

317
package/madwifi/patches/384-hwdetect.patch Normal file
View File

@ -0,0 +1,317 @@
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
@@ -62,6 +62,7 @@
#include <linux/if_arp.h>
#include <linux/rtnetlink.h>
#include <linux/time.h>
+#include <linux/pci.h>
#include <asm/uaccess.h>
#include "if_ethersubr.h" /* for ETHER_IS_MULTICAST */
@@ -401,6 +402,15 @@ static int outdoor = -1;
static int xchanmode = -1;
static int beacon_cal = 1;
+static const struct ath_hw_detect generic_hw_info = {
+ .vendor_name = "Unknown",
+ .card_name = "Generic",
+ .vendor = PCI_ANY_ID,
+ .id = PCI_ANY_ID,
+ .subvendor = PCI_ANY_ID,
+ .subid = PCI_ANY_ID
+};
+
static const char *hal_status_desc[] = {
"No error",
"No hardware present or device not yet supported",
@@ -542,6 +552,8 @@ ath_attach(u_int16_t devid, struct net_d
DPRINTF(sc, ATH_DEBUG_ANY, "%s: devid 0x%x\n", __func__, devid);
#endif
+ sc->sc_hwinfo = &generic_hw_info;
+
/* Allocate space for dynamically determined maximum VAP count */
sc->sc_bslot =
kmalloc(ath_maxvaps * sizeof(struct ieee80211vap*), GFP_KERNEL);
@@ -1508,6 +1520,28 @@ ath_vap_create(struct ieee80211com *ic,
return vap;
}
+void
+ath_hw_detect(struct ath_softc *sc, const struct ath_hw_detect *cards, int n_cards, u32 vendor, u32 id, u32 subvendor, u32 subid)
+{
+ int i;
+
+ for (i = 0; i < n_cards; i++) {
+ const struct ath_hw_detect *c = &cards[i];
+
+ if ((c->vendor != PCI_ANY_ID) && c->vendor != vendor)
+ continue;
+ if ((c->id != PCI_ANY_ID) && c->id != id)
+ continue;
+ if ((c->subvendor != PCI_ANY_ID) && c->subvendor != subvendor)
+ continue;
+ if ((c->subid != PCI_ANY_ID) && c->subid != subid)
+ continue;
+
+ sc->sc_hwinfo = c;
+ break;
+ }
+}
+
static void
ath_vap_delete(struct ieee80211vap *vap)
{
@@ -10819,6 +10853,12 @@ ath_ioctl(struct net_device *dev, struct
* is to add module parameters.
*/
+/* sysctls for hardware info */
+enum {
+ ATH_CARD_VENDOR,
+ ATH_CARD_NAME,
+};
+
/*
* Dynamic (i.e. per-device) sysctls. These are automatically
* mirrored in /proc/sys.
@@ -10898,6 +10938,38 @@ ath_sysctl_get_intmit(struct ath_softc *
}
static int
+ATH_SYSCTL_DECL(ath_sysctl_hwinfo, ctl, write, filp, buffer, lenp, ppos)
+{
+ struct ath_softc *sc = ctl->extra1;
+ struct ath_hal *ah = sc->sc_ah;
+ int ret = 0;
+
+ if (write)
+ return -EINVAL;
+
+ ATH_LOCK(sc);
+ switch((long)ctl->extra2) {
+ case ATH_CARD_VENDOR:
+ ctl->data = (char *)sc->sc_hwinfo->vendor_name;
+ break;
+ case ATH_CARD_NAME:
+ ctl->data = (char *)sc->sc_hwinfo->card_name;
+ break;
+ default:
+ ret = -EINVAL;
+ break;
+ }
+ if (ret == 0) {
+ ctl->maxlen = strlen(ctl->data);
+ ret = ATH_SYSCTL_PROC_DOSTRING(ctl, write, filp,
+ buffer, lenp, ppos);
+ }
+ ATH_UNLOCK(sc);
+
+ return ret;
+}
+
+static int
ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl, write, filp, buffer, lenp, ppos)
{
struct ath_softc *sc = ctl->extra1;
@@ -11177,6 +11249,24 @@ static int maxint = 0x7fffffff; /* 32-b
static const ctl_table ath_sysctl_template[] = {
{ .ctl_name = CTL_AUTO,
+ .procname = "dev_vendor",
+ .mode = 0644,
+ .proc_handler = ath_sysctl_hwinfo,
+ .strategy = &sysctl_string,
+ .data = "N/A",
+ .maxlen = 1,
+ .extra2 = (void *)ATH_CARD_VENDOR,
+ },
+ { .ctl_name = CTL_AUTO,
+ .procname = "dev_name",
+ .mode = 0644,
+ .proc_handler = ath_sysctl_hwinfo,
+ .strategy = &sysctl_string,
+ .data = "N/A",
+ .maxlen = 1,
+ .extra2 = (void *)ATH_CARD_NAME,
+ },
+ { .ctl_name = CTL_AUTO,
.procname = "slottime",
.mode = 0644,
.proc_handler = ath_sysctl_halparam,
--- a/ath/if_athvar.h
+++ b/ath/if_athvar.h
@@ -168,12 +168,16 @@ static inline struct net_device *_alloc_
void __user *buffer, size_t *lenp)
#define ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \
proc_dointvec(ctl, write, filp, buffer, lenp)
+#define ATH_SYSCTL_PROC_DOSTRING(ctl, write, filp, buffer, lenp, ppos) \
+ proc_dostring(ctl, write, filp, buffer, lenp)
#else /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,8) */
#define ATH_SYSCTL_DECL(f, ctl, write, filp, buffer, lenp, ppos) \
f(ctl_table *ctl, int write, struct file *filp, \
void __user *buffer, size_t *lenp, loff_t *ppos)
#define ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \
proc_dointvec(ctl, write, filp, buffer, lenp, ppos)
+#define ATH_SYSCTL_PROC_DOSTRING(ctl, write, filp, buffer, lenp, ppos) \
+ proc_dostring(ctl, write, filp, buffer, lenp, ppos)
#endif
#define ATH_TIMEOUT 1000
@@ -469,6 +473,7 @@ struct ath_hal;
struct ath_desc;
struct ath_ratectrl;
struct ath_tx99;
+struct ath_hw_detect;
struct proc_dir_entry;
/*
@@ -629,6 +634,7 @@ struct ath_softc {
struct ath_ratectrl *sc_rc; /* tx rate control support */
struct ath_tx99 *sc_tx99; /* tx99 support */
void (*sc_setdefantenna)(struct ath_softc *, u_int);
+ const struct ath_hw_detect *sc_hwinfo;
unsigned int sc_invalid:1; /* being detached */
unsigned int sc_mrretry:1; /* multi-rate retry support */
@@ -929,4 +935,15 @@ int ar_device(int devid);
void ath_radar_detected(struct ath_softc *sc, const char* message);
+struct ath_hw_detect {
+ const char *vendor_name;
+ const char *card_name;
+ u32 vendor;
+ u32 id;
+ u32 subvendor;
+ u32 subid;
+};
+
+extern void ath_hw_detect(struct ath_softc *sc, const struct ath_hw_detect *cards, int n_cards, u32 vendor, u32 id, u32 subvendor, u32 subid);
+
#endif /* _DEV_ATH_ATHVAR_H */
--- a/ath/if_ath_ahb.c
+++ b/ath/if_ath_ahb.c
@@ -20,6 +20,7 @@
#include <linux/netdevice.h>
#include <linux/cache.h>
#include <linux/platform_device.h>
+#include <linux/pci.h>
#include <asm/io.h>
#include <asm/uaccess.h>
@@ -181,12 +182,97 @@ exit_ath_wmac(u_int16_t wlanNum, struct
return 0;
}
+static const char ubnt[] = "Ubiquiti Networks";
+static const struct ath_hw_detect cards[] = {
+ {
+ .vendor_name = ubnt,
+ .card_name = "PowerStation2 (18V)",
+ .vendor = PCI_ANY_ID,
+ .id = PCI_ANY_ID,
+ .subvendor = PCI_ANY_ID,
+ .subid = 0xb102,
+ },
+ {
+ .vendor_name = ubnt,
+ .card_name = "PowerStation2 (16D)",
+ .vendor = PCI_ANY_ID,
+ .id = PCI_ANY_ID,
+ .subvendor = PCI_ANY_ID,
+ .subid = 0xb202,
+ },
+ {
+ .vendor_name = ubnt,
+ .card_name = "PowerStation2 (EXT)",
+ .vendor = PCI_ANY_ID,
+ .id = PCI_ANY_ID,
+ .subvendor = PCI_ANY_ID,
+ .subid = 0xb302,
+ },
+ {
+ .vendor_name = ubnt,
+ .card_name = "PowerStation5 (22V)",
+ .vendor = PCI_ANY_ID,
+ .id = PCI_ANY_ID,
+ .subvendor = PCI_ANY_ID,
+ .subid = 0xb105,
+ },
+ {
+ .vendor_name = ubnt,
+ .card_name = "PowerStation5 (EXT)",
+ .vendor = PCI_ANY_ID,
+ .id = PCI_ANY_ID,
+ .subvendor = PCI_ANY_ID,
+ .subid = 0xb305,
+ },
+ {
+ .vendor_name = ubnt,
+ .card_name = "WispStation5",
+ .vendor = PCI_ANY_ID,
+ .id = PCI_ANY_ID,
+ .subvendor = PCI_ANY_ID,
+ .subid = 0xa105,
+ },
+ {
+ .vendor_name = ubnt,
+ .card_name = "LiteStation2",
+ .vendor = PCI_ANY_ID,
+ .id = PCI_ANY_ID,
+ .subvendor = PCI_ANY_ID,
+ .subid = 0xa002,
+ },
+ {
+ .vendor_name = ubnt,
+ .card_name = "LiteStation5",
+ .vendor = PCI_ANY_ID,
+ .id = PCI_ANY_ID,
+ .subvendor = PCI_ANY_ID,
+ .subid = 0xa005,
+ },
+ {
+ .vendor_name = ubnt,
+ .card_name = "NanoStation2",
+ .vendor = PCI_ANY_ID,
+ .id = PCI_ANY_ID,
+ .subvendor = PCI_ANY_ID,
+ .subid = 0xc002,
+ },
+ {
+ .vendor_name = ubnt,
+ .card_name = "NanoStation5",
+ .vendor = PCI_ANY_ID,
+ .id = PCI_ANY_ID,
+ .subvendor = PCI_ANY_ID,
+ .subid = 0xc005,
+ },
+};
+
static int
init_ath_wmac(u_int16_t devid, u_int16_t wlanNum, struct ar531x_config *config)
{
const char *athname;
struct net_device *dev;
struct ath_ahb_softc *sc;
+ u16 *radio_data;
if (((wlanNum != 0) && (wlanNum != 1)) ||
(sclist[wlanNum] != NULL))
@@ -248,6 +334,16 @@ init_ath_wmac(u_int16_t devid, u_int16_t
sc->aps_sc.sc_softled = 1; /* SoftLED over GPIO */
sc->aps_sc.sc_ledpin = config->board->sysLedGpio;
sc->aps_sc.sc_invalid = 0;
+ radio_data = (u16 *) config->radio;
+ if (radio_data) {
+ u16 vendor, id, subvendor, subid;
+ vendor = radio_data[1];
+ id = radio_data[0];
+ subvendor = radio_data[8];
+ subid = radio_data[7];
+ ath_hw_detect(&sc->aps_sc, cards, ARRAY_SIZE(cards), vendor, id, subvendor, subid);
+ }
+
return 0;
bad4:

4
package/madwifi/patches/406-monitor_r3711.patch
View File

@ -1,6 +1,6 @@
--- a/ath/if_ath.c --- a/ath/if_ath.c
+++ b/ath/if_ath.c +++ b/ath/if_ath.c
@@ -6440,7 +6440,7 @@ @@ -6474,7 +6474,7 @@ ath_capture(struct net_device *dev, cons
/* Never copy the SKB, as it is ours on the RX side, and this is the /* Never copy the SKB, as it is ours on the RX side, and this is the
* last process on the TX side and we only modify our own headers. */ * last process on the TX side and we only modify our own headers. */
@ -9,7 +9,7 @@
if (tskb == NULL) { if (tskb == NULL) {
DPRINTF(sc, ATH_DEBUG_ANY, DPRINTF(sc, ATH_DEBUG_ANY,
"Dropping; ath_skb_removepad failed!\n"); "Dropping; ath_skb_removepad failed!\n");
@@ -6448,6 +6448,8 @@ @@ -6482,6 +6482,8 @@ ath_capture(struct net_device *dev, cons
} }
ieee80211_input_monitor(ic, tskb, bf, tx, tsf, sc); ieee80211_input_monitor(ic, tskb, bf, tx, tsf, sc);

6
package/madwifi/patches/408-changeset_r3337.patch
View File

@ -1,6 +1,6 @@
--- a/THANKS --- a/THANKS
+++ b/THANKS +++ b/THANKS
@@ -129,6 +129,7 @@ @@ -129,6 +129,7 @@ Derek J Smithies
jhansen jhansen
Benoit Papillault Benoit Papillault
Russell Harmon Russell Harmon
@ -10,7 +10,7 @@
Please let us know if you think your name should be mentioned here! Please let us know if you think your name should be mentioned here!
--- a/ath/if_ath.c --- a/ath/if_ath.c
+++ b/ath/if_ath.c +++ b/ath/if_ath.c
@@ -3059,7 +3059,7 @@ @@ -3093,7 +3093,7 @@ ath_tx_startraw(struct net_device *dev,
struct ath_softc *sc = dev->priv; struct ath_softc *sc = dev->priv;
struct ath_hal *ah = sc->sc_ah; struct ath_hal *ah = sc->sc_ah;
struct ieee80211_phy_params *ph = (struct ieee80211_phy_params *) struct ieee80211_phy_params *ph = (struct ieee80211_phy_params *)
@ -21,7 +21,7 @@
HAL_PKT_TYPE atype; HAL_PKT_TYPE atype;
--- a/net80211/ieee80211_monitor.c --- a/net80211/ieee80211_monitor.c
+++ b/net80211/ieee80211_monitor.c +++ b/net80211/ieee80211_monitor.c
@@ -128,8 +128,8 @@ @@ -128,8 +128,8 @@ struct ar5212_openbsd_desc {
void void
ieee80211_monitor_encap(struct ieee80211vap *vap, struct sk_buff *skb) ieee80211_monitor_encap(struct ieee80211vap *vap, struct sk_buff *skb)
{ {

8
package/madwifi/patches/450-new_hal.patch
View File

@ -1,6 +1,6 @@
--- a/ath_hal/ah_os.h --- a/ath_hal/ah_os.h
+++ b/ath_hal/ah_os.h +++ b/ath_hal/ah_os.h
@@ -156,80 +156,23 @@ @@ -156,80 +156,23 @@ extern u_int32_t __ahdecl ath_hal_getupt
#endif #endif
#endif /* AH_BYTE_ORDER */ #endif /* AH_BYTE_ORDER */
@ -93,7 +93,7 @@
* The functions in this section are not intended to be invoked by MadWifi * The functions in this section are not intended to be invoked by MadWifi
--- a/ath/if_ath.c --- a/ath/if_ath.c
+++ b/ath/if_ath.c +++ b/ath/if_ath.c
@@ -593,6 +593,14 @@ @@ -605,6 +605,14 @@ ath_attach(u_int16_t devid, struct net_d
} }
sc->sc_ah = ah; sc->sc_ah = ah;
@ -108,7 +108,7 @@
/* /*
* Check if the MAC has multi-rate retry support. * Check if the MAC has multi-rate retry support.
* We do this by trying to setup a fake extended * We do this by trying to setup a fake extended
@@ -7453,7 +7461,7 @@ @@ -7487,7 +7495,7 @@ ath_txq_setup(struct ath_softc *sc, int
if (qtype == HAL_TX_QUEUE_UAPSD) if (qtype == HAL_TX_QUEUE_UAPSD)
qi.tqi_qflags = HAL_TXQ_TXDESCINT_ENABLE; qi.tqi_qflags = HAL_TXQ_TXDESCINT_ENABLE;
else else
@ -119,7 +119,7 @@
if (qnum == -1) { if (qnum == -1) {
--- a/ath_hal/ah_os.c --- a/ath_hal/ah_os.c
+++ b/ath_hal/ah_os.c +++ b/ath_hal/ah_os.c
@@ -126,6 +126,13 @@ @@ -126,6 +126,13 @@ ath_hal_printf(struct ath_hal *ah, const
} }
EXPORT_SYMBOL(ath_hal_printf); EXPORT_SYMBOL(ath_hal_printf);