Doug / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit 09009512e5e7ab341b1554a256f81dd512c1f4bf

Authored by Guennadi Liakhovetski
Committed by John W. Linville
1 parent b25bfda382
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

b43: fix regression in PIO case 

This patch fixes the regression, introduced by

commit 17030f48e31adde5b043741c91ba143f5f7db0fd
From: Rafał Miłecki <zajec5@gmail.com>
Date: Thu, 11 Aug 2011 17:16:27 +0200
Subject: [PATCH] b43: support new RX header, noticed to be used in 598.314+ fw

in PIO case.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

Showing 1 changed file with 13 additions and 3 deletions Side-by-side Diff

drivers/net/wireless/b43/pio.c
Diff comments   View file @ 0900951
... ... @@ -617,9 +617,19 @@
617 617 const char *err_msg = NULL;
618 618 struct b43_rxhdr_fw4 *rxhdr =
619 619 (struct b43_rxhdr_fw4 *)wl->pio_scratchspace;
  620 + size_t rxhdr_size = sizeof(*rxhdr);
620 621  
621 622 BUILD_BUG_ON(sizeof(wl->pio_scratchspace) < sizeof(*rxhdr));
622   - memset(rxhdr, 0, sizeof(*rxhdr));
  623 + switch (dev->fw.hdr_format) {
  624 + case B43_FW_HDR_410:
  625 + case B43_FW_HDR_351:
  626 + rxhdr_size -= sizeof(rxhdr->format_598) -
  627 + sizeof(rxhdr->format_351);
  628 + break;
  629 + case B43_FW_HDR_598:
  630 + break;
  631 + }
  632 + memset(rxhdr, 0, rxhdr_size);
623 633  
624 634 /* Check if we have data and wait for it to get ready. */
625 635 if (q->rev >= 8) {
626 636  
... ... @@ -657,11 +667,11 @@
657 667  
658 668 /* Get the preamble (RX header) */
659 669 if (q->rev >= 8) {
660   - b43_block_read(dev, rxhdr, sizeof(*rxhdr),
  670 + b43_block_read(dev, rxhdr, rxhdr_size,
661 671 q->mmio_base + B43_PIO8_RXDATA,
662 672 sizeof(u32));
663 673 } else {
664   - b43_block_read(dev, rxhdr, sizeof(*rxhdr),
  674 + b43_block_read(dev, rxhdr, rxhdr_size,
665 675 q->mmio_base + B43_PIO_RXDATA,
666 676 sizeof(u16));
667 677 }