[kernel] r19744 - in dists/squeeze/linux-2.6/debian: . patches/bugfix/all patches/series
Ben Hutchings
benh at alioth.debian.org
Sat Jan 19 03:19:26 UTC 2013
Author: benh
Date: Sat Jan 19 03:19:24 2013
New Revision: 19744
Log:
Fix some bugs in staging drivers that gcc has been warning us about for years
Added:
dists/squeeze/linux-2.6/debian/patches/bugfix/all/staging-fix-usbip-printk-format-warning.patch
dists/squeeze/linux-2.6/debian/patches/bugfix/all/staging-fix-wlan-ng-printk-format-warning.patch
dists/squeeze/linux-2.6/debian/patches/bugfix/all/staging-rtl8192e-Use-skb_tail_pointer.patch
dists/squeeze/linux-2.6/debian/patches/bugfix/all/staging-speakup-fix-printk-format-warning.patch
dists/squeeze/linux-2.6/debian/patches/bugfix/all/staging-usbip-changed-function-return-type-to-void.patch
Modified:
dists/squeeze/linux-2.6/debian/changelog
dists/squeeze/linux-2.6/debian/patches/series/47
Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog Sat Jan 19 00:43:17 2013 (r19743)
+++ dists/squeeze/linux-2.6/debian/changelog Sat Jan 19 03:19:24 2013 (r19744)
@@ -81,6 +81,11 @@
* [x86] drm/i915: Attempt to fix watermark setup on 85x (v2)
(Closes: #661696)
* [x86] isci: Backport changes up to Linux 3.2.35 (Closes: #698094)
+ * [amd64] rtl8192e: Fix transmit on 64-bit architectures (Closes: #698473)
+ * [x86] usbip: Fix loss of isochronous packets that require padding
+ (Closes: #698474)
+ * staging: Fix various log messages that were broken on 64-bit architectures
+ (Closes: #698475)
[ Jonathan Nieder ]
* megaraid_sas: Backport changes up to Linux 3.0.56 (Closes: #666108)
Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/staging-fix-usbip-printk-format-warning.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/staging-fix-usbip-printk-format-warning.patch Sat Jan 19 03:19:24 2013 (r19744)
@@ -0,0 +1,25 @@
+From: Randy Dunlap <randy.dunlap at oracle.com>
+Date: Thu, 7 Jul 2011 10:49:54 -0700
+Subject: staging: fix usbip printk format warning
+
+commit 6394c5a0379d0733396edd9452e31282e0684a3c upstream.
+
+Fix usbip printk format warning for size_t:
+
+drivers/staging/usbip/stub_tx.c:236: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'size_t'
+
+Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+[bwh: Backported to 2.6.32: adjusted context]
+---
+--- a/drivers/staging/usbip/stub_tx.c
++++ b/drivers/staging/usbip/stub_tx.c
+@@ -237,7 +237,7 @@ static int stub_send_ret_submit(struct stub_device *sdev)
+
+ if (txsize != sizeof(pdu_header) + urb->actual_length) {
+ dev_err(&sdev->interface->dev,
+- "actual length of urb (%d) does not match iso packet sizes (%d)\n",
++ "actual length of urb (%d) does not match iso packet sizes %zu\n",
+ urb->actual_length, txsize-sizeof(pdu_header));
+ kfree(iov);
+ usbip_event_add(&sdev->ud, SDEV_EVENT_ERROR_TCP);
Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/staging-fix-wlan-ng-printk-format-warning.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/staging-fix-wlan-ng-printk-format-warning.patch Sat Jan 19 03:19:24 2013 (r19744)
@@ -0,0 +1,29 @@
+From: Randy Dunlap <randy.dunlap at oracle.com>
+Date: Thu, 25 Feb 2010 09:55:03 -0800
+Subject: Staging: fix wlan-ng printk format warning
+
+commit 83a0f9bc658b20b06740691d9ee711c5d14b6e8a upstream.
+
+Fix prism2fw.c printk format warning:
+
+drivers/staging/wlan-ng/prism2fw.c:209: warning: format '%d' expects type 'int', but argument 3 has type 'size_t'
+
+Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+---
+ drivers/staging/wlan-ng/prism2fw.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/staging/wlan-ng/prism2fw.c b/drivers/staging/wlan-ng/prism2fw.c
+index baa20a7..b576012 100644
+--- a/drivers/staging/wlan-ng/prism2fw.c
++++ b/drivers/staging/wlan-ng/prism2fw.c
+@@ -205,7 +205,7 @@ int prism2_fwtry(struct usb_device *udev, wlandevice_t *wlandev)
+ return 1;
+ }
+
+- printk(KERN_INFO "prism2_usb: %s will be processed, size %d\n",
++ printk(KERN_INFO "prism2_usb: %s will be processed, size %zu\n",
+ PRISM2_USB_FWFILE, fw_entry->size);
+ prism2_fwapply((const struct ihex_binrec *)fw_entry->data, wlandev);
+
Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/staging-rtl8192e-Use-skb_tail_pointer.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/staging-rtl8192e-Use-skb_tail_pointer.patch Sat Jan 19 03:19:24 2013 (r19744)
@@ -0,0 +1,52 @@
+From: Jeff Mahoney <jeffm at suse.com>
+Date: Mon, 11 Jan 2010 10:54:27 -0500
+Subject: Staging: rtl8192e: Use skb_tail_pointer
+
+commit 1c7ec2e8e0fb6e8acda4f6b9a682cf7f8e650e2f upstream.
+
+rtl8192e uses skb->tail directly. This patch uses the tail pointer macros
+instead.
+
+Signed-off-by: Jeff Mahoney <jeffm at suse.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+---
+ drivers/staging/rtl8192e/r8192E_core.c | 5 ++---
+ drivers/staging/rtl8192e/r819xE_cmdpkt.c | 2 +-
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c
+index 50c7602..886105d 100644
+--- a/drivers/staging/rtl8192e/r8192E_core.c
++++ b/drivers/staging/rtl8192e/r8192E_core.c
+@@ -1807,7 +1807,7 @@ static short rtl8192_alloc_rx_desc_ring(struct net_device *dev)
+ return 0;
+ priv->rx_buf[i] = skb;
+ mapping = (dma_addr_t *)skb->cb;
+- *mapping = pci_map_single(priv->pdev, skb->tail,//skb_tail_pointer(skb),
++ *mapping = pci_map_single(priv->pdev, skb_tail_pointer(skb),
+ priv->rxbuffersize, PCI_DMA_FROMDEVICE);
+
+ entry->BufferAddress = cpu_to_le32(*mapping);
+@@ -6287,8 +6287,7 @@ static void rtl8192_rx(struct net_device *dev)
+
+ skb = new_skb;
+ priv->rx_buf[priv->rx_idx] = skb;
+- *((dma_addr_t *) skb->cb) = pci_map_single(priv->pdev, skb->tail, priv->rxbuffersize, PCI_DMA_FROMDEVICE);
+-// *((dma_addr_t *) skb->cb) = pci_map_single(priv->pdev, skb_tail_pointer(skb), priv->rxbuffersize, PCI_DMA_FROMDEVICE);
++ *((dma_addr_t *) skb->cb) = pci_map_single(priv->pdev, skb_tail_pointer(skb), priv->rxbuffersize, PCI_DMA_FROMDEVICE);
+ }
+
+ }
+diff --git a/drivers/staging/rtl8192e/r819xE_cmdpkt.c b/drivers/staging/rtl8192e/r819xE_cmdpkt.c
+index 2aaa4e1..87c334f 100644
+--- a/drivers/staging/rtl8192e/r819xE_cmdpkt.c
++++ b/drivers/staging/rtl8192e/r819xE_cmdpkt.c
+@@ -135,7 +135,7 @@ RT_STATUS cmpk_message_handle_tx(
+ * Transform from little endian to big endian
+ * and pending zero
+ */
+- seg_ptr = skb->tail;
++ seg_ptr = skb_tail_pointer(skb);
+ for(i=0 ; i < frag_length; i+=4) {
+ *seg_ptr++ = ((i+0)<frag_length)?code_virtual_address[i+3]:0;
+ *seg_ptr++ = ((i+1)<frag_length)?code_virtual_address[i+2]:0;
Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/staging-speakup-fix-printk-format-warning.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/staging-speakup-fix-printk-format-warning.patch Sat Jan 19 03:19:24 2013 (r19744)
@@ -0,0 +1,30 @@
+From: Randy Dunlap <randy.dunlap at oracle.com>
+Date: Wed, 13 Oct 2010 13:10:49 -0700
+Subject: staging: speakup: fix printk format warning
+
+commit 0a652b96287ef61c97a2acab2bcc3d0f319b50e4 upstream.
+
+Fix printk format warning:
+
+drivers/staging/speakup/serialio.c:44: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'long unsigned int'
+
+Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
+Cc: <speakup at braille.uwo.ca>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+---
+ drivers/staging/speakup/serialio.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/staging/speakup/serialio.c b/drivers/staging/speakup/serialio.c
+index bafd62f..65772ec 100644
+--- a/drivers/staging/speakup/serialio.c
++++ b/drivers/staging/speakup/serialio.c
+@@ -41,7 +41,7 @@ struct serial_state *spk_serial_init(int index)
+ __release_region(&ioport_resource, ser->port, 8);
+ err = synth_request_region(ser->port, 8);
+ if (err) {
+- pr_warn("Unable to allocate port at %x, errno %i", ser->port, err);
++ pr_warn("Unable to allocate port at %lx, errno %i", ser->port, err);
+ return NULL;
+ }
+ }
Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/staging-usbip-changed-function-return-type-to-void.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/staging-usbip-changed-function-return-type-to-void.patch Sat Jan 19 03:19:24 2013 (r19744)
@@ -0,0 +1,76 @@
+From: Bart Westgeest <bart at elbrys.com>
+Date: Mon, 23 Jan 2012 10:55:46 -0500
+Subject: staging: usbip: changed function return type to void
+
+commit ac2b41acfa3efe4650102067a99251587a806d70 upstream.
+
+The function usbip_pad_iso never returns anything but 0 (success).
+
+Signed-off-by: Bart Westgeest <bart at elbrys.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
+[bwh: Backported to 2.6.32: adjust context]
+---
+--- a/drivers/staging/usbip/usbip_common.c
++++ b/drivers/staging/usbip/usbip_common.c
+@@ -961,26 +961,25 @@ EXPORT_SYMBOL_GPL(usbip_recv_iso);
+ * buffer and iso packets need to be stored and be in propeper endian in urb
+ * before calling this function
+ */
+-int usbip_pad_iso(struct usbip_device *ud, struct urb *urb)
++void usbip_pad_iso(struct usbip_device *ud, struct urb *urb)
+ {
+ int np = urb->number_of_packets;
+ int i;
+- int ret;
+ int actualoffset = urb->actual_length;
+
+ if (!usb_pipeisoc(urb->pipe))
+- return 0;
++ return;
+
+ /* if no packets or length of data is 0, then nothing to unpack */
+ if (np == 0 || urb->actual_length == 0)
+- return 0;
++ return;
+
+ /*
+ * if actual_length is transfer_buffer_length then no padding is
+ * present.
+ */
+ if (urb->actual_length == urb->transfer_buffer_length)
+- return 0;
++ return;
+
+ /*
+ * loop over all packets from last to first (to prevent overwritting
+@@ -992,7 +991,6 @@ int usbip_pad_iso(struct usbip_device *ud, struct urb *urb)
+ urb->transfer_buffer + actualoffset,
+ urb->iso_frame_desc[i].actual_length);
+ }
+- return ret;
+ }
+ EXPORT_SYMBOL_GPL(usbip_pad_iso);
+
+--- a/drivers/staging/usbip/usbip_common.h
++++ b/drivers/staging/usbip/usbip_common.h
+@@ -394,7 +394,7 @@ void usbip_header_correct_endian(struct usbip_header *pdu, int send);
+ /* some members of urb must be substituted before. */
+ int usbip_recv_iso(struct usbip_device *ud, struct urb *urb);
+ /* some members of urb must be substituted before. */
+-int usbip_pad_iso(struct usbip_device *ud, struct urb *urb);
++void usbip_pad_iso(struct usbip_device *ud, struct urb *urb);
+ void *usbip_alloc_iso_desc_pdu(struct urb *urb, ssize_t *bufflen);
+
+
+--- a/drivers/staging/usbip/vhci_rx.c
++++ b/drivers/staging/usbip/vhci_rx.c
+@@ -99,8 +99,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
+ return;
+
+ /* restore the padding in iso packets */
+- if (usbip_pad_iso(ud, urb) < 0)
+- return;
++ usbip_pad_iso(ud, urb);
+
+ if (usbip_dbg_flag_vhci_rx)
+ usbip_dump_urb(urb);
Modified: dists/squeeze/linux-2.6/debian/patches/series/47
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/47 Sat Jan 19 00:43:17 2013 (r19743)
+++ dists/squeeze/linux-2.6/debian/patches/series/47 Sat Jan 19 03:19:24 2013 (r19744)
@@ -171,7 +171,9 @@
+ bugfix/x86/x86-Don-t-use-the-EFI-reboot-method-by-default.patch
+ debian/random-Avoid-ABI-change-in-irq_desc.patch
+ debian/epoll-Avoid-ABI-change-in-file.patch
+
+ bugfix/x86/drm-i915-Attempt-to-fix-watermark-setup-on-85x-v2.patch
+
+ features/x86/isci/0002-treewide-remove-extra-semicolons-from-various-parts-.patch
+ features/x86/isci/0005-SCSI-isci-fix-support-for-large-smp-requests.patch
+ features/x86/isci/0006-SCSI-isci-fix-missed-unlock-in-apc_agent_timeout.patch
@@ -193,3 +195,9 @@
+ features/x86/isci/0023-isci-fix-oem-parameter-validation-on-single-controll.patch
+ features/x86/isci/0024-isci-fix-isci_pci_probe-generates-warning-on-efi-fai.patch
+ features/x86/isci/0025-isci-copy-fis-0x34-response-into-proper-buffer.patch
+
++ bugfix/all/staging-rtl8192e-Use-skb_tail_pointer.patch
++ bugfix/all/staging-fix-usbip-printk-format-warning.patch
++ bugfix/all/staging-usbip-changed-function-return-type-to-void.patch
++ bugfix/all/staging-speakup-fix-printk-format-warning.patch
++ bugfix/all/staging-fix-wlan-ng-printk-format-warning.patch
More information about the Kernel-svn-changes
mailing list