Home » Mailing list archives » git-commits-head » 2009 » May » 15

rtl8187: use DMA-aware buffers with usb_control_msg

Previous thread: mac80211: avoid NULL ptr deref when finding max_rates in PID and minstrel by Linux Kernel Mailing List on Friday, May 15, 2009 - 12:59 pm. (1 message)

Next thread: [libata] sata_sx4: convert to new exception handling methods by Linux Kernel Mailing List on Friday, May 15, 2009 - 12:59 pm. (1 message)
[view original message]
From: Linux Kernel Mailing List
Subject: rtl8187: use DMA-aware buffers with usb_control_msg
Date: Friday, May 15, 2009 - 12:59 pm

Gitweb:     http://git.kernel.org/linus/9be6f0d40d9191e6fe7e45551c7d1c1614472b53
Commit:     9be6f0d40d9191e6fe7e45551c7d1c1614472b53
Parent:     621ad7c96aa138cfeab53cd4debc5a4e08b2189b
Author:     John W. Linville <linville@tuxdriver.com>
AuthorDate: Wed May 6 13:57:27 2009 -0400
Committer:  John W. Linville <linville@tuxdriver.com>
CommitDate: Mon May 11 15:07:01 2009 -0400

    rtl8187: use DMA-aware buffers with usb_control_msg
    
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
 drivers/net/wireless/rtl818x/rtl8187.h         |   57 ++++++++++++++++++------
 drivers/net/wireless/rtl818x/rtl8187_dev.c     |   13 +++++-
 drivers/net/wireless/rtl818x/rtl8187_rtl8225.c |    8 +++-
 3 files changed, 62 insertions(+), 16 deletions(-)

diff --git a/drivers/net/wireless/rtl818x/rtl8187.h b/drivers/net/wireless/rtl818x/rtl8187.h
index 9718f61..edeff82 100644
--- a/drivers/net/wireless/rtl818x/rtl8187.h
+++ b/drivers/net/wireless/rtl818x/rtl8187.h
@@ -120,6 +120,12 @@ struct rtl8187_priv {
 		__le64 buf;
 		struct sk_buff_head queue;
 	} b_tx_status; /* This queue is used by both -b and non-b devices */
+	struct mutex io_mutex;
+	union {
+		u8 bits8;
+		__le16 bits16;
+		__le32 bits32;
+	} *io_dmabuf;
 };
 
 void rtl8187_write_phy(struct ieee80211_hw *dev, u8 addr, u32 data);
@@ -129,10 +135,14 @@ static inline u8 rtl818x_ioread8_idx(struct rtl8187_priv *priv,
 {
 	u8 val;
 
+	mutex_lock(&priv->io_mutex);
 	usb_control_msg(priv->udev, usb_rcvctrlpipe(priv->udev, 0),
 			RTL8187_REQ_GET_REG, RTL8187_REQT_READ,
-			(unsigned long)addr, idx & 0x03, &val,
-			sizeof(val), HZ / 2);
+			(unsigned long)addr, idx & 0x03,
+			&priv->io_dmabuf->bits8, sizeof(val), HZ / 2);
+
+	val = priv->io_dmabuf->bits8;
+	mutex_unlock(&priv->io_mutex);
 
 	return val;
 }
@@ -147,10 +157,14 @@ static inline u16 rtl818x_ioread16_idx(struct rtl8187_priv *priv,
 {
 	__le16 val;
 
+	mutex_lock(&priv->io_mutex);
 	usb_control_msg(priv->udev, usb_rcvctrlpipe(priv->udev, ...
[ message continues ]
Previous thread: mac80211: avoid NULL ptr deref when finding max_rates in PID and minstrel by Linux Kernel Mailing List on Friday, May 15, 2009 - 12:59 pm. (1 message)

Next thread: [libata] sata_sx4: convert to new exception handling methods by Linux Kernel Mailing List on Friday, May 15, 2009 - 12:59 pm. (1 message)