lkml.org 
[lkml]   [2012]   [Mar]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 20/41] vmxnet3: Fix transport header size
    3.2-stable review patch.  If anyone has any objections, please let me know.

    ------------------


    From: Shreyas Bhatewara <sbhatewara@vmware.com>

    [ Upstream commit efead8710aad9e384730ecf25eae0287878840d7 ]

    Fix transport header size

    Fix the transpoert header size for UDP packets.

    Signed-off-by: Shreyas N Bhatewara <sbhatewara@vmware.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/vmxnet3/vmxnet3_drv.c | 7 +------
    drivers/net/vmxnet3/vmxnet3_int.h | 4 ++--
    2 files changed, 3 insertions(+), 8 deletions(-)

    --- a/drivers/net/vmxnet3/vmxnet3_drv.c
    +++ b/drivers/net/vmxnet3/vmxnet3_drv.c
    @@ -830,13 +830,8 @@ vmxnet3_parse_and_copy_hdr(struct sk_buf
    ctx->l4_hdr_size = ((struct tcphdr *)
    skb_transport_header(skb))->doff * 4;
    else if (iph->protocol == IPPROTO_UDP)
    - /*
    - * Use tcp header size so that bytes to
    - * be copied are more than required by
    - * the device.
    - */
    ctx->l4_hdr_size =
    - sizeof(struct tcphdr);
    + sizeof(struct udphdr);
    else
    ctx->l4_hdr_size = 0;
    } else {
    --- a/drivers/net/vmxnet3/vmxnet3_int.h
    +++ b/drivers/net/vmxnet3/vmxnet3_int.h
    @@ -70,10 +70,10 @@
    /*
    * Version numbers
    */
    -#define VMXNET3_DRIVER_VERSION_STRING "1.1.18.0-k"
    +#define VMXNET3_DRIVER_VERSION_STRING "1.1.29.0-k"

    /* a 32-bit int, each byte encode a verion number in VMXNET3_DRIVER_VERSION */
    -#define VMXNET3_DRIVER_VERSION_NUM 0x01011200
    +#define VMXNET3_DRIVER_VERSION_NUM 0x01011D00

    #if defined(CONFIG_PCI_MSI)
    /* RSS only makes sense if MSI-X is supported. */



    \
     
     \ /
      Last update: 2012-03-17 00:43    [W:4.566 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site