aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ti/wl12xx
diff options
context:
space:
mode:
authorArik Nemtsov <arik@wizery.com>2011-12-12 05:18:17 -0500
committerLuciano Coelho <coelho@ti.com>2012-04-12 01:44:00 -0400
commit4158149c24e6f933809bc6fe03dbc3fb218b935b (patch)
tree2b1212ad37ae03129645d3c1fa32770f25a4fe1e /drivers/net/wireless/ti/wl12xx
parentb14684a00439b7b154e63be9446fba19281b8bbc (diff)
wlcore/wl12xx: add hw op for getting rx packet data length
There is a difference in the way chip families report the length of data in a single Rx packet. Abstract this into a HW op. Refactor the Rx data handling function to allocate the correct size for the data, and avoid trimming the skb. Signed-off-by: Arik Nemtsov <arik@wizery.com> Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/ti/wl12xx')
-rw-r--r--drivers/net/wireless/ti/wl12xx/main.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
index e4fab2662662..5f81aaf19d97 100644
--- a/drivers/net/wireless/ti/wl12xx/main.c
+++ b/drivers/net/wireless/ti/wl12xx/main.c
@@ -776,6 +776,19 @@ wl12xx_get_rx_buf_align(struct wl1271 *wl, u32 rx_desc)
776 return WLCORE_RX_BUF_ALIGNED; 776 return WLCORE_RX_BUF_ALIGNED;
777} 777}
778 778
779static u32 wl12xx_get_rx_packet_len(struct wl1271 *wl, void *rx_data,
780 u32 data_len)
781{
782 struct wl1271_rx_descriptor *desc = rx_data;
783
784 /* invalid packet */
785 if (data_len < sizeof(*desc) ||
786 data_len < sizeof(*desc) + desc->pad_len)
787 return 0;
788
789 return data_len - sizeof(*desc) - desc->pad_len;
790}
791
779static bool wl12xx_mac_in_fuse(struct wl1271 *wl) 792static bool wl12xx_mac_in_fuse(struct wl1271 *wl)
780{ 793{
781 bool supported = false; 794 bool supported = false;
@@ -848,6 +861,7 @@ static struct wlcore_ops wl12xx_ops = {
848 .set_tx_desc_blocks = wl12xx_set_tx_desc_blocks, 861 .set_tx_desc_blocks = wl12xx_set_tx_desc_blocks,
849 .set_tx_desc_data_len = wl12xx_set_tx_desc_data_len, 862 .set_tx_desc_data_len = wl12xx_set_tx_desc_data_len,
850 .get_rx_buf_align = wl12xx_get_rx_buf_align, 863 .get_rx_buf_align = wl12xx_get_rx_buf_align,
864 .get_rx_packet_len = wl12xx_get_rx_packet_len,
851 .get_pg_ver = wl12xx_get_pg_ver, 865 .get_pg_ver = wl12xx_get_pg_ver,
852 .get_mac = wl12xx_get_mac, 866 .get_mac = wl12xx_get_mac,
853}; 867};