| @@ -330,16 +330,6 @@ static void device_init_registers(struct vnt_private *pDevice) · 329 unmodified lines |
| 330 | 330 | /* zonetype initial */ |
| 331 | 331 | pDevice->byOriginalZonetype = pDevice->abyEEPROM[EEP_OFS_ZONETYPE]; |
| 332 | 332 | |
| 333 | | − /* Get RFType */ |
| 334 | | − pDevice->byRFType = SROMbyReadEmbedded(pDevice->PortOffset, EEP_OFS_RFTYPE); |
| 335 | | − |
| 336 | | − /* force change RevID for VT3253 emu */ |
| 337 | | − if ((pDevice->byRFType & RF_EMU) != 0) |
| 338 | | − pDevice->byRevId = 0x80; |
| 339 | | − |
| 340 | | − pDevice->byRFType &= RF_MASK; |
| 341 | | − pr_debug("pDevice->byRFType = %x\n", pDevice->byRFType); |
| 342 | | − |
| 343 | 333 | if (!pDevice->bZoneRegExist) |
| 344 | 334 | pDevice->byZoneType = pDevice->abyEEPROM[EEP_OFS_ZONETYPE]; |
| 345 | 335 | |
| @@ -1187,12 +1177,14 @@ static int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb) · 841 unmodified lines |
| 1187 | 1177 | { |
| 1188 | 1178 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; |
| 1189 | 1179 | PSTxDesc head_td; |
| 1190 | | − u32 dma_idx = TYPE_AC0DMA; |
| 1180 | + u32 dma_idx; |
| 1191 | 1181 | unsigned long flags; |
| 1192 | 1182 | |
| 1193 | 1183 | spin_lock_irqsave(&priv->lock, flags); |
| 1194 | 1184 | |
| 1195 | | − if (!ieee80211_is_data(hdr->frame_control)) |
| 1185 | + if (ieee80211_is_data(hdr->frame_control)) |
| 1186 | + dma_idx = TYPE_AC0DMA; |
| 1187 | + else |
| 1196 | 1188 | dma_idx = TYPE_TXDMA0; |
| 1197 | 1189 | |
| 1198 | 1190 | if (AVAIL_TD(priv, dma_idx) < 1) { |
| @@ -1206,6 +1198,9 @@ static int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb) · 7 unmodified lines |
| 1206 | 1198 | |
| 1207 | 1199 | head_td->pTDInfo->skb = skb; |
| 1208 | 1200 | |
| 1201 | + if (dma_idx == TYPE_AC0DMA) |
| 1202 | + head_td->pTDInfo->byFlags = TD_FLAGS_NETIF_SKB; |
| 1203 | + |
| 1209 | 1204 | priv->iTDUsed[dma_idx]++; |
| 1210 | 1205 | |
| 1211 | 1206 | /* Take ownership */ |
| @@ -1234,13 +1229,10 @@ static int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb) · 22 unmodified lines |
| 1234 | 1229 | |
| 1235 | 1230 | head_td->buff_addr = cpu_to_le32(head_td->pTDInfo->skb_dma); |
| 1236 | 1231 | |
| 1237 | | − if (dma_idx == TYPE_AC0DMA) { |
| 1238 | | − head_td->pTDInfo->byFlags = TD_FLAGS_NETIF_SKB; |
| 1239 | | − |
| 1232 | + if (head_td->pTDInfo->byFlags & TD_FLAGS_NETIF_SKB) |
| 1240 | 1233 | MACvTransmitAC0(priv->PortOffset); |
| 1241 | | − } else { |
| 1234 | + else |
| 1242 | 1235 | MACvTransmit0(priv->PortOffset); |
| 1243 | | − } |
| 1244 | 1236 | |
| 1245 | 1237 | spin_unlock_irqrestore(&priv->lock, flags); |
| 1246 | 1238 | |
| @@ -1778,6 +1770,12 @@ vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent) · 531 unmodified lines |
| 1778 | 1770 | MACvInitialize(priv->PortOffset); |
| 1779 | 1771 | MACvReadEtherAddress(priv->PortOffset, priv->abyCurrentNetAddr); |
| 1780 | 1772 | |
| 1773 | + /* Get RFType */ |
| 1774 | + priv->byRFType = SROMbyReadEmbedded(priv->PortOffset, EEP_OFS_RFTYPE); |
| 1775 | + priv->byRFType &= RF_MASK; |
| 1776 | + |
| 1777 | + dev_dbg(&pcid->dev, "RF Type = %x\n", priv->byRFType); |
| 1778 | + |
| 1781 | 1779 | device_get_options(priv); |
| 1782 | 1780 | device_set_options(priv); |
| 1783 | 1781 | /* Mask out the options cannot be set to the chip */ |