Ehud Gavron wrote:
> I had hoped this would be the cure so I don't have to undo the 85a83d26
> commit patch by patch.
>
> However, while this did not solve the problem it DID show a new error:
> bcm43xx_mac80211: ASSERTION FAILED (bcm43xx_status(dev) ==
> BCM43xx_STAT_STARTED) at:
> drivers/net/wireless/bcm43xx-mac80211/bcm43xx_main.c:1377:bcm43xx_interrupt_tasklet()
>
>
>
> Is that a clue to bigger things, or a problem with this patch? dmesg and
> tcpdump (of garbage) included along with a log of what I did with the
> git "test" tree to get there.
>
> [EMAIL PROTECTED] test]# git checkout -f
> [EMAIL PROTECTED] test]# cat > patch-2007-aug-08-lfinger.txt
> --- wireless-dev.orig/drivers/net/wireless/bcm43xx-mac80211/bcm43xx_main.c
> +++ wireless-dev/drivers/net/wireless/bcm43xx-mac80211/bcm43xx_main.c
> @@ -1503,7 +1503,7 @@ static void bcm43xx_interrupt_ack(struct
> /* Interrupt handler top-half */
> static irqreturn_t bcm43xx_interrupt_handler(int irq, void *dev_id)
> {
> - irqreturn_t ret = IRQ_NONE;
> + irqreturn_t ret = IRQ_HANDLED;
> struct bcm43xx_wldev *dev = dev_id;
> u32 reason;
>
> @@ -1512,12 +1512,11 @@ static irqreturn_t bcm43xx_interrupt_han
>
> spin_lock(&dev->wl->irq_lock);
>
> - if (bcm43xx_status(dev) < BCM43xx_STAT_STARTED)
> - goto out;
> reason = bcm43xx_read32(dev, BCM43xx_MMIO_GEN_IRQ_REASON);
> - if (reason == 0xffffffff) /* shared IRQ */
> + if (reason == 0xffffffff) { /* shared IRQ */
> + ret = IRQ_NONE;
> goto out;
> - ret = IRQ_HANDLED;
> + }
> reason &= bcm43xx_read32(dev, BCM43xx_MMIO_GEN_IRQ_MASK);
> if (!reason)
> goto out;
> [EMAIL PROTECTED] test]# patch -p1 < patch-2007-aug-08-lfinger.txt
> patching file drivers/net/wireless/bcm43xx-mac80211/bcm43xx_main.c
> Hunk #1 FAILED at 1503.
> Hunk #2 FAILED at 1512.
> 2 out of 2 hunks FAILED -- saving rejects to file
> drivers/net/wireless/bcm43xx-mac80211/bcm43xx_main.c.rej
The patch failed, but it shouldn't have. Have you done a 'git bisect reset'
since we finished the
bisecting? That would be a problem. Just in case, do the following:
git bisect reset
git checkout -f
git pull
Then apply the patch. If you get any REJECTS, please let me know. I'll hold off
on analyzing those
assertions until the code is in a known state.
Larry
_______________________________________________
Bcm43xx-dev mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/bcm43xx-dev
