On Friday 23 May 2008 20:20:33 Thomas Kunze wrote: > Stefanik Gábor wrote: > > Hmm... can you make the comments and variables English? You know, > > Linus Torvalds is Finnish, yet he still uses English comments and > > variable names. > > I would like to, but I can't read spanish (?). I didn't write this > patch, I googled it. > > -- > To unsubscribe from this list: send the line "unsubscribe linux-wireless" > in the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html Here goes the translation. Just trying to make myself useful :). -Andrés -- diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c index ed4317a..804f365 100644 --- a/drivers/net/wireless/hostap/hostap_cs.c +++ b/drivers/net/wireless/hostap/hostap_cs.c @@ -35,7 +35,7 @@ static int ignore_cis_vcc; module_param(ignore_cis_vcc, int, 0444); MODULE_PARM_DESC(ignore_cis_vcc, "Ignore broken CIS VCC entry"); - +int activate=0; /* struct local_info::hw_priv */ struct hostap_cs_priv { dev_node_t node; @@ -499,11 +499,13 @@ static int hostap_cs_probe(struct pcmcia_device *p_dev) PDEBUG(DEBUG_HW, "%s: setting Vcc=33 (constant)\n", dev_info); p_dev->conf.IntType = INT_MEMORY_AND_IO; - + + activate=0; ret = prism2_config(p_dev); if (ret) { PDEBUG(DEBUG_EXTRA, "prism2_config() failed\n"); } + activate=1; return ret; } diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c index cdf90c4..d79a2a5 100644 --- a/drivers/net/wireless/hostap/hostap_hw.c +++ b/drivers/net/wireless/hostap/hostap_hw.c @@ -54,6 +54,7 @@ #include "hostap.h" #include "hostap_ap.h" +extern int activate; /* #define final_version */ @@ -1497,6 +1498,8 @@ static int prism2_hw_config(struct net_device *dev, int initial) if (local->hw_downloading) return 1; + activate=1; + if (prism2_hw_init(dev, initial)) { return local->no_pri ? 0 : 1; } @@ -2628,8 +2631,15 @@ static irqreturn_t prism2_interrupt(int irq, void *dev_id) int events = 0; u16 ev; - iface = netdev_priv(dev); - local = iface->local; + + // All the input parameters are correct (not null). At the moment, this is the only way I know to detect the problem. + if (!activate) { + printk("hostap_hw.c: INTERRUPT BEFORE DEVICE INIT!\n"); + return IRQ_HANDLED; + } + + iface = netdev_priv(dev); + local = iface->local; prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_INTERRUPT, 0, 0); diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c index 3a874fc..df58aa3 100644 --- a/drivers/net/wireless/hostap/hostap_pci.c +++ b/drivers/net/wireless/hostap/hostap_pci.c @@ -19,6 +19,7 @@ #include "hostap_wlan.h" +int activate=1; static char *dev_info = "hostap_pci"; diff --git a/drivers/net/wireless/hostap/hostap_plx.c b/drivers/net/wireless/hostap/hostap_plx.c index cbf15d7..4475174 100644 --- a/drivers/net/wireless/hostap/hostap_plx.c +++ b/drivers/net/wireless/hostap/hostap_plx.c @@ -21,7 +21,7 @@ #include <asm/io.h> #include "hostap_wlan.h" - +int activate=1; static char *dev_info = "hostap_plx";
Attachment:
signature.asc
Description: This is a digitally signed message part.
