Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33b1c8c1 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6655: mac80211 conversion: add new rx functions 



vnt_receive_frame which replaces device_receive_frame

and vnt_rx_data which handles mac80211 rx data

structures ieee80211_hw, ieee80211_vif and variable rx_rate are added
in structure vnt_private

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2aef999b

drivers/staging/vt6655/device.h

+5 −1
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
#include <linux/reboot.h>

#include <linux/ethtool.h>

/* Include Wireless Extension definition and check version - Jean II */

#include <net/mac80211.h>

#include <linux/wireless.h>

#include <net/iw_handler.h>	/* New driver API */
@@ -319,7 +320,9 @@ typedef struct __device_opt { 


struct vnt_private {

	struct pci_dev *pcid;



	/* mac80211 */

	struct ieee80211_hw *hw;

	struct ieee80211_vif *vif;

/* netdev */

	struct net_device *dev;
@@ -378,6 +381,7 @@ struct vnt_private { 
	u32                         flags;



	u32                         rx_buf_sz;

	u8 rx_rate;

	int                         multicast_limit;



	pid_t			MLMEThr_pid;

drivers/staging/vt6655/device_main.c

+7 −6
Original line number Diff line number Diff line
@@ -1336,7 +1336,7 @@ static int device_rx_srv(struct vnt_private *pDevice, unsigned int uIdx) 
	     pRD = pRD->next) {

		if (works++ > 15)

			break;

		if (device_receive_frame(pDevice, pRD)) {

		if (vnt_receive_frame(pDevice, pRD)) {

			if (!device_alloc_rx_buf(pDevice, pRD)) {

				dev_err(&pDevice->pcid->dev,

					"can not allocate rx buf\n");
@@ -1344,7 +1344,6 @@ static int device_rx_srv(struct vnt_private *pDevice, unsigned int uIdx) 
			}

		}

		pRD->m_rd0RD0.f1Owner = OWNED_BY_NIC;

		pDevice->dev->last_rx = jiffies;

	}



	pDevice->pCurrRD[uIdx] = pRD;
@@ -1360,9 +1359,12 @@ static bool device_alloc_rx_buf(struct vnt_private *pDevice, PSRxDesc pRD) 
	if (pRDInfo->skb == NULL)

		return false;

	ASSERT(pRDInfo->skb);

	pRDInfo->skb->dev = pDevice->dev;

	pRDInfo->skb_dma = pci_map_single(pDevice->pcid, skb_tail_pointer(pRDInfo->skb),



	pRDInfo->skb_dma =

		pci_map_single(pDevice->pcid,

			       skb_put(pRDInfo->skb, skb_tailroom(pRDInfo->skb)),

			       pDevice->rx_buf_sz, PCI_DMA_FROMDEVICE);



	*((unsigned int *)&(pRD->m_rd0RD0)) = 0; /* FIX cast */



	pRD->m_rd0RD0.wResCount = cpu_to_le16(pDevice->rx_buf_sz);
@@ -1380,7 +1382,6 @@ bool device_alloc_frag_buf(struct vnt_private *pDevice, 
	if (pDeF->skb == NULL)

		return false;

	ASSERT(pDeF->skb);

	pDeF->skb->dev = pDevice->dev;



	return true;

}

drivers/staging/vt6655/dpc.c

+123 −0
Original line number Diff line number Diff line
@@ -1321,3 +1321,126 @@ static bool s_bAPModeRxData( 


	return true;

}



static bool vnt_rx_data(struct vnt_private *priv, struct sk_buff *skb,

			u16 bytes_received)

{

	struct ieee80211_hw *hw = priv->hw;

	struct ieee80211_supported_band *sband;

	struct ieee80211_rx_status rx_status = { 0 };

	struct ieee80211_hdr *hdr;

	__le16 fc;

	u8 *rsr, *new_rsr, *rssi;

	__le64 *tsf_time;

	u16 frame_size;

	int ii, r;

	u8 *rx_sts, *rx_rate, *sq;

	u8 *skb_data;

	u8 rate_idx = 0;

	u8 rate[MAX_RATE] = {2, 4, 11, 22, 12, 18, 24, 36, 48, 72, 96, 108};

	long rx_dbm;



	/* [31:16]RcvByteCount ( not include 4-byte Status ) */

	frame_size = le16_to_cpu(*((__le16 *)(skb->data + 2)));

	if (frame_size > 2346 || frame_size < 14) {

		dev_dbg(&priv->pcid->dev, "------- WRONG Length 1\n");

		return false;

	}



	skb_data = (u8 *)skb->data;



	rx_sts = skb_data;

	rx_rate = skb_data + 1;



	sband = hw->wiphy->bands[hw->conf.chandef.chan->band];



	for (r = RATE_1M; r < MAX_RATE; r++) {

		if (*rx_rate == rate[r])

			break;

	}



	priv->rx_rate = r;



	for (ii = 0; ii < sband->n_bitrates; ii++) {

		if (sband->bitrates[ii].hw_value == r) {

			rate_idx = ii;

				break;

		}

	}



	if (ii == sband->n_bitrates) {

		dev_dbg(&priv->pcid->dev, "Wrong RxRate %x\n", *rx_rate);

		return false;

	}



	tsf_time = (__le64 *)(skb_data + bytes_received - 12);

	sq = skb_data + bytes_received - 4;

	new_rsr = skb_data + bytes_received - 3;

	rssi = skb_data + bytes_received - 2;

	rsr = skb_data + bytes_received - 1;



	RFvRSSITodBm(priv, *rssi, &rx_dbm);



	priv->byBBPreEDRSSI = (u8)rx_dbm + 1;

	priv->uCurrRSSI = priv->byBBPreEDRSSI;



	skb_pull(skb, 4);

	skb_trim(skb, frame_size);



	rx_status.mactime = le64_to_cpu(*tsf_time);

	rx_status.band = hw->conf.chandef.chan->band;

	rx_status.signal = rx_dbm;

	rx_status.flag = 0;

	rx_status.freq = hw->conf.chandef.chan->center_freq;



	hdr = (struct ieee80211_hdr *)(skb->data);

	fc = hdr->frame_control;



	rx_status.rate_idx = rate_idx;



	if (ieee80211_has_protected(fc)) {

		if (priv->byLocalID > REV_ID_VT3253_A1)

			rx_status.flag = RX_FLAG_DECRYPTED;

	}



	if (priv->vif && priv->bDiversityEnable) {

		if (ieee80211_is_data(fc) &&

		    (frame_size > 50) && priv->vif->bss_conf.assoc)

			BBvAntennaDiversity(priv, priv->rx_rate, 0);

	}



	memcpy(IEEE80211_SKB_RXCB(skb), &rx_status, sizeof(rx_status));



	ieee80211_rx_irqsafe(priv->hw, skb);



	return true;

}



bool vnt_receive_frame(struct vnt_private *priv, PSRxDesc curr_rd)

{

	PDEVICE_RD_INFO rd_info = curr_rd->pRDInfo;

	struct sk_buff *skb;

	u16 frame_size;



	skb = rd_info->skb;



	pci_unmap_single(priv->pcid, rd_info->skb_dma,

			 priv->rx_buf_sz, PCI_DMA_FROMDEVICE);



	frame_size = le16_to_cpu(curr_rd->m_rd1RD1.wReqCount)

			- cpu_to_le16(curr_rd->m_rd0RD0.wResCount);



	if ((frame_size > 2364) || (frame_size < 33)) {

		/* Frame Size error drop this packet.*/

		dev_dbg(&priv->pcid->dev, "Wrong frame size %d\n", frame_size);

		dev_kfree_skb_irq(skb);

		return true;

	}



	if (vnt_rx_data(priv, skb, frame_size))

		return true;



	dev_kfree_skb_irq(skb);



	return true;

}

drivers/staging/vt6655/dpc.h

+2 −0
Original line number Diff line number Diff line
@@ -39,4 +39,6 @@ device_receive_frame( 
	PSRxDesc pCurrRD

);



bool vnt_receive_frame(struct vnt_private *priv, PSRxDesc curr_rd);



#endif /* __RXTX_H__ */