From 24f1755b2ea3d7d7e4cbea89212534e867ad9d54 Mon Sep 17 00:00:00 2001 From: Jeff Mahoney Date: Mon, 11 Jan 2010 10:54:27 -0500 Subject: [PATCH] --- yaml --- r: 186646 b: refs/heads/master c: 1c7ec2e8e0fb6e8acda4f6b9a682cf7f8e650e2f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/rtl8192e/r8192E_core.c | 5 ++--- trunk/drivers/staging/rtl8192e/r819xE_cmdpkt.c | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d7271efa9914..57d0b6e1f5bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 53cf8743d227283e78c27ada407b506014c9223d +refs/heads/master: 1c7ec2e8e0fb6e8acda4f6b9a682cf7f8e650e2f diff --git a/trunk/drivers/staging/rtl8192e/r8192E_core.c b/trunk/drivers/staging/rtl8192e/r8192E_core.c index 50c760284df4..886105db8b7c 100644 --- a/trunk/drivers/staging/rtl8192e/r8192E_core.c +++ b/trunk/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/trunk/drivers/staging/rtl8192e/r819xE_cmdpkt.c b/trunk/drivers/staging/rtl8192e/r819xE_cmdpkt.c index 2aaa4e1bb375..87c334fb7333 100644 --- a/trunk/drivers/staging/rtl8192e/r819xE_cmdpkt.c +++ b/trunk/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)