summaryrefslogtreecommitdiffstats
path: root/meta/packages/rt2860
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@openedhand.com>2008-10-01 15:15:41 +0000
committerSamuel Ortiz <sameo@openedhand.com>2008-10-01 15:15:41 +0000
commit9b52d247545fb19e6ef9813d376007e518b50e48 (patch)
tree5f838f5cc45bce1a478eb617412f14a9a6a86429 /meta/packages/rt2860
parentf36ea090d1d591ca37208f808ba40cf95d68a45d (diff)
downloadpoky-9b52d247545fb19e6ef9813d376007e518b50e48.tar.gz
rt2860: Fix iwpriv oops
Triggered by powertop, iwpriv -a oops this driver when the interface is down. git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5370 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/rt2860')
-rw-r--r--meta/packages/rt2860/rt2860-1.7.0.0/05-iwpriv.patch62
-rw-r--r--meta/packages/rt2860/rt2860_1.7.0.0.bb9
2 files changed, 67 insertions, 4 deletions
diff --git a/meta/packages/rt2860/rt2860-1.7.0.0/05-iwpriv.patch b/meta/packages/rt2860/rt2860-1.7.0.0/05-iwpriv.patch
new file mode 100644
index 0000000000..5d1ff82e0e
--- /dev/null
+++ b/meta/packages/rt2860/rt2860-1.7.0.0/05-iwpriv.patch
@@ -0,0 +1,62 @@
1---
2 src/cmm_info.c | 34 ++++++++++++++++++++--------------
3 1 file changed, 20 insertions(+), 14 deletions(-)
4
5Index: rt2860-1.7.0.0/src/cmm_info.c
6===================================================================
7--- rt2860-1.7.0.0.orig/src/cmm_info.c 2008-10-01 16:16:04.000000000 +0200
8+++ rt2860-1.7.0.0/src/cmm_info.c 2008-10-01 17:03:10.000000000 +0200
9@@ -808,33 +808,39 @@ INT Show_DescInfo_Proc(
10 #ifdef RT2860
11 INT i, QueIdx=0;
12 PRT28XX_RXD_STRUC pRxD;
13- PTXD_STRUC pTxD;
14+ PTXD_STRUC pTxD;
15 PRTMP_TX_RING pTxRing = &pAd->TxRing[QueIdx];
16 PRTMP_MGMT_RING pMgmtRing = &pAd->MgmtRing;
17- PRTMP_RX_RING pRxRing = &pAd->RxRing;
18-
19+ PRTMP_RX_RING pRxRing = &pAd->RxRing;
20+
21 for(i=0;i<TX_RING_SIZE;i++)
22 {
23 pTxD = (PTXD_STRUC) pTxRing->Cell[i].AllocVa;
24- printk("Desc #%d\n",i);
25- hex_dump("Tx Descriptor", (char *)pTxD, 16);
26- printk("pTxD->DMADONE = %x\n", pTxD->DMADONE);
27+ if (pTxD) {
28+ printk("Desc #%d\n",i);
29+ hex_dump("Tx Descriptor", (char *)pTxD, 16);
30+ printk("pTxD->DMADONE = %x\n", pTxD->DMADONE);
31+ }
32 }
33- printk("---------------------------------------------------\n");
34+
35 for(i=0;i<MGMT_RING_SIZE;i++)
36 {
37 pTxD = (PTXD_STRUC) pMgmtRing->Cell[i].AllocVa;
38- printk("Desc #%d\n",i);
39- hex_dump("Mgmt Descriptor", (char *)pTxD, 16);
40- printk("pMgmt->DMADONE = %x\n", pTxD->DMADONE);
41+ if (pTxD) {
42+ printk("Desc #%d\n",i);
43+ hex_dump("Mgmt Descriptor", (char *)pTxD, 16);
44+ printk("pMgmt->DMADONE = %x\n", pTxD->DMADONE);
45+ }
46 }
47- printk("---------------------------------------------------\n");
48+
49 for(i=0;i<RX_RING_SIZE;i++)
50 {
51 pRxD = (PRT28XX_RXD_STRUC) pRxRing->Cell[i].AllocVa;
52- printk("Desc #%d\n",i);
53- hex_dump("Rx Descriptor", (char *)pRxD, 16);
54- printk("pRxD->DDONE = %x\n", pRxD->DDONE);
55+ if (pRxD) {
56+ printk("Desc #%d\n",i);
57+ hex_dump("Rx Descriptor", (char *)pRxD, 16);
58+ printk("pRxD->DDONE = %x\n", pRxD->DDONE);
59+ }
60 }
61 #endif // RT2860 //
62
diff --git a/meta/packages/rt2860/rt2860_1.7.0.0.bb b/meta/packages/rt2860/rt2860_1.7.0.0.bb
index caa144d69d..742edb7619 100644
--- a/meta/packages/rt2860/rt2860_1.7.0.0.bb
+++ b/meta/packages/rt2860/rt2860_1.7.0.0.bb
@@ -2,13 +2,14 @@ DESCRIPTION = "Driver for the 802.11n RaLink rt2860 chipset"
2PRIORITY = "optional" 2PRIORITY = "optional"
3SECTION = "kernel/modules" 3SECTION = "kernel/modules"
4LICENSE = "GPL" 4LICENSE = "GPL"
5PR = "r0" 5PR = "r1"
6 6
7SRC_URI = "http://folks.o-hand.com/sameo/rt2860/rt2860-1.7.0.0.tar.bz2 \ 7SRC_URI = "http://folks.o-hand.com/sameo/rt2860/rt2860-1.7.0.0.tar.bz2 \
8 file://01_dev_get_by_name.patch;patch=1 \ 8 file://01_dev_get_by_name.patch;patch=1 \
9 file://02_wpa-fix.patch;patch=1" \ 9 file://02_wpa-fix.patch;patch=1 \
10 file://03-iwe_stream_add.patch;patch=1" \ 10 file://03-iwe_stream_add.patch;patch=1 \
11 file://04-pci_name.patch;patch=1" 11 file://04-pci_name.patch;patch=1 \
12 file://05-iwpriv.patch;patch=1"
12 13
13S = "${WORKDIR}/rt2860-1.7.0.0" 14S = "${WORKDIR}/rt2860-1.7.0.0"
14 15