diff options
| author | Greg Kroah-Hartman | 2012-09-17 02:17:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-09-17 02:17:25 +0200 |
| commit | 6a2a2cdd57d11ee3117539b846a45df6efbd35b1 (patch) | |
| tree | b6ab218810666a75d6612bde4d4a224118c0834c /drivers/staging/rtl8712 | |
| parent | Staging: bcm: Fix udelay related compilation error (diff) | |
| parent | Linux 3.6-rc6 (diff) | |
| download | kernel-qcow2-linux-6a2a2cdd57d11ee3117539b846a45df6efbd35b1.tar.gz kernel-qcow2-linux-6a2a2cdd57d11ee3117539b846a45df6efbd35b1.tar.xz kernel-qcow2-linux-6a2a2cdd57d11ee3117539b846a45df6efbd35b1.zip | |
Merge 3.6-rc6 into staging-next
This pulls in the staging tree fixes in 3.6-rc6 into our branch to resolve the
merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8712')
| -rw-r--r-- | drivers/staging/rtl8712/recv_linux.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/staging/rtl8712/recv_linux.c b/drivers/staging/rtl8712/recv_linux.c index 0e26d5f6cf2d..495ee1205e02 100644 --- a/drivers/staging/rtl8712/recv_linux.c +++ b/drivers/staging/rtl8712/recv_linux.c @@ -117,13 +117,8 @@ void r8712_recv_indicatepkt(struct _adapter *padapter, if (skb == NULL) goto _recv_indicatepkt_drop; skb->data = precv_frame->u.hdr.rx_data; -#ifdef NET_SKBUFF_DATA_USES_OFFSET - skb->tail = (sk_buff_data_t)(precv_frame->u.hdr.rx_tail - - precv_frame->u.hdr.rx_head); -#else - skb->tail = (sk_buff_data_t)precv_frame->u.hdr.rx_tail; -#endif skb->len = precv_frame->u.hdr.len; + skb_set_tail_pointer(skb, skb->len); if ((pattrib->tcpchk_valid == 1) && (pattrib->tcp_chkrpt == 1)) skb->ip_summed = CHECKSUM_UNNECESSARY; else |