From: Greg Kroah-Hartman Date: Mon, 11 Feb 2013 19:30:39 +0000 (-0800) Subject: 3.0-stable patches X-Git-Tag: v3.0.64~17 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5087e1d24596570cecea4bd3a82474426bf9abc4;p=thirdparty%2Fkernel%2Fstable-queue.git 3.0-stable patches added patches: rtlwifi-fix-the-usage-of-the-wrong-variable-in-usb.c.patch --- diff --git a/queue-3.0/rtlwifi-fix-the-usage-of-the-wrong-variable-in-usb.c.patch b/queue-3.0/rtlwifi-fix-the-usage-of-the-wrong-variable-in-usb.c.patch new file mode 100644 index 00000000000..2501e30c6a4 --- /dev/null +++ b/queue-3.0/rtlwifi-fix-the-usage-of-the-wrong-variable-in-usb.c.patch @@ -0,0 +1,35 @@ +From 0a06ad8e3a1cb5311b7dbafde45410aa1bce9d40 Mon Sep 17 00:00:00 2001 +From: Larry Finger +Date: Sun, 27 Jan 2013 16:24:25 -0600 +Subject: rtlwifi: Fix the usage of the wrong variable in usb.c + +From: Larry Finger + +commit 0a06ad8e3a1cb5311b7dbafde45410aa1bce9d40 upstream. + +In routine _rtl_rx_pre_process(), skb_dequeue() is called to get an skb; +however, the wrong variable name is used in subsequent calls. + +Reported-by: Guenter Roeck +Signed-off-by: Larry Finger +Cc: Guenter Roeck +Signed-off-by: John W. Linville +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/wireless/rtlwifi/usb.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/net/wireless/rtlwifi/usb.c ++++ b/drivers/net/wireless/rtlwifi/usb.c +@@ -542,8 +542,8 @@ static void _rtl_rx_pre_process(struct i + WARN_ON(skb_queue_empty(&rx_queue)); + while (!skb_queue_empty(&rx_queue)) { + _skb = skb_dequeue(&rx_queue); +- _rtl_usb_rx_process_agg(hw, skb); +- ieee80211_rx_irqsafe(hw, skb); ++ _rtl_usb_rx_process_agg(hw, _skb); ++ ieee80211_rx_irqsafe(hw, _skb); + } + } + diff --git a/queue-3.0/series b/queue-3.0/series new file mode 100644 index 00000000000..6b8ec96a9b3 --- /dev/null +++ b/queue-3.0/series @@ -0,0 +1 @@ +rtlwifi-fix-the-usage-of-the-wrong-variable-in-usb.c.patch