From 3311ff9bee5b3c5bd1f06289cac046eebd0b0ed1 Mon Sep 17 00:00:00 2001
From: Arik Nemtsov <arik@wizery.com>
Date: Thu, 10 May 2012 12:13:24 +0300
Subject: [PATCH] --- yaml --- r: 314065 b: refs/heads/master c:
 30e2dd798dbd5929f981ec0c77ab8567e8859ad9 h: refs/heads/master i:   314063:
 c1cd2684c39a6449204fde98d21620e918f680bd v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/net/wireless/ti/wl18xx/main.c | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 31de5c19fe45..5c21f291bec2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c809f888370d87129d17028d515bb025fe94175
+refs/heads/master: 30e2dd798dbd5929f981ec0c77ab8567e8859ad9
diff --git a/trunk/drivers/net/wireless/ti/wl18xx/main.c b/trunk/drivers/net/wireless/ti/wl18xx/main.c
index fef872608e00..40ed53c02866 100644
--- a/trunk/drivers/net/wireless/ti/wl18xx/main.c
+++ b/trunk/drivers/net/wireless/ti/wl18xx/main.c
@@ -458,6 +458,17 @@ wl18xx_get_rx_buf_align(struct wl1271 *wl, u32 rx_desc)
 	return WLCORE_RX_BUF_ALIGNED;
 }
 
+static u32 wl18xx_get_rx_packet_len(struct wl1271 *wl, void *rx_data,
+				    u32 data_len)
+{
+	struct wl1271_rx_descriptor *desc = rx_data;
+
+	/* invalid packet */
+	if (data_len < sizeof(*desc))
+		return 0;
+
+	return data_len - sizeof(*desc);
+}
 
 static struct wlcore_ops wl18xx_ops = {
 	.identify_chip	= wl18xx_identify_chip,
@@ -468,6 +479,7 @@ static struct wlcore_ops wl18xx_ops = {
 	.set_tx_desc_blocks = wl18xx_set_tx_desc_blocks,
 	.set_tx_desc_data_len = wl18xx_set_tx_desc_data_len,
 	.get_rx_buf_align = wl18xx_get_rx_buf_align,
+	.get_rx_packet_len = wl18xx_get_rx_packet_len,
 };
 
 int __devinit wl18xx_probe(struct platform_device *pdev)