| 1 |
diff -ur ../rt2570-cvs-2005112305/Module/rtusb_data.c ./Module/rtusb_data.c |
| 2 |
--- ../rt2570-cvs-2005112305/Module/rtusb_data.c 2005-11-04 23:53:18.000000000 +0100 |
| 3 |
+++ ./Module/rtusb_data.c 2005-11-23 14:44:16.000000000 +0100 |
| 4 |
@@ -1711,6 +1711,9 @@ |
| 5 |
struct sk_buff *skb; |
| 6 |
if ((skb = __dev_alloc_skb(2048, GFP_DMA|GFP_ATOMIC)) != NULL) |
| 7 |
{ |
| 8 |
+ if (pAdapter->PortCfg.MallowRFMONTx == TRUE) |
| 9 |
+ goto rfmontx_80211_receive; |
| 10 |
+ |
| 11 |
// setup the wlan-ng prismheader |
| 12 |
|
| 13 |
if (skb_headroom(skb) < sizeof(wlan_ng_prism2_header)) |
| 14 |
@@ -1762,6 +1765,8 @@ |
| 15 |
|
| 16 |
// end prismheader setup |
| 17 |
|
| 18 |
+ rfmontx_80211_receive: |
| 19 |
+ |
| 20 |
skb->dev = pAdapter->net; |
| 21 |
memcpy(skb_put(skb, pRxD->DataByteCnt-4), pData, pRxD->DataByteCnt-4); |
| 22 |
skb->mac.raw = skb->data; |
| 23 |
diff -ur ../rt2570-cvs-2005112305/Module/rtusb_info.c ./Module/rtusb_info.c |
| 24 |
--- ../rt2570-cvs-2005112305/Module/rtusb_info.c 2005-11-20 22:54:28.000000000 +0100 |
| 25 |
+++ ./Module/rtusb_info.c 2005-11-23 14:51:47.000000000 +0100 |
| 26 |
@@ -277,7 +277,10 @@ |
| 27 |
pAdapter->PortCfg.BssType=BSS_MONITOR; |
| 28 |
RTUSBEnqueueInternalCmd(pAdapter, RT_OID_LINK_DOWN); |
| 29 |
pAdapter->bConfigChanged = TRUE; |
| 30 |
- pAdapter->net->type = 802; // ARPHRD_IEEE80211_PRISM |
| 31 |
+ if (pAdapter->PortCfg.MallowRFMONTx == TRUE) |
| 32 |
+ pAdapter->net->type = 801; // ARPHRD_IEEE80211 |
| 33 |
+ else |
| 34 |
+ pAdapter->net->type = 802; // ARPHRD_IEEE80211_PRISM |
| 35 |
RTUSBWriteMACRegister(pAdapter, TXRX_CSR2, 0x4e); |
| 36 |
break; |
| 37 |
default: |
| 38 |
@@ -1132,9 +1135,11 @@ |
| 39 |
{ |
| 40 |
case 1: |
| 41 |
pAdapter->PortCfg.MallowRFMONTx = TRUE; |
| 42 |
+ pAdapter->net->type = 801; // ARPHRD_IEEE80211 |
| 43 |
break; |
| 44 |
case 0: |
| 45 |
pAdapter->PortCfg.MallowRFMONTx = FALSE; |
| 46 |
+ pAdapter->net->type = 802; // ARPHRD_IEEE80211_PRISM |
| 47 |
break; |
| 48 |
default: |
| 49 |
return -EOPNOTSUPP; |