lkml.org 
[lkml]   [2011]   [Jan]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[059/152] 8139cp: fix checksum broken
    2.6.36-stable review patch.  If anyone has any objections, please let us know.

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


    From: Shan Wei <shanwei@cn.fujitsu.com>

    [ Upstream commit 24b7ea9f6c9787fad885442ed0cc010f1aa69cca ]

    I am not family with RealTek RTL-8139C+ series 10/100 PCI Ethernet driver.
    I try to guess the meaning of RxProtoIP and IPFail.
    RxProtoIP stands for received IPv4 packet that upper protocol is not tcp and udp.
    !(status & IPFail) is true means that driver correctly to check checksum in IPv4 header.

    If these are right, driver will set ip_summed with CHECKSUM_UNNECESSARY for other
    upper protocol, e.g. sctp, igmp protocol. This will cause protocol stack ignores
    checksum check for packets with invalid checksum.

    This patch is only compile-test.

    Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    drivers/net/8139cp.c | 10 ++++------
    1 file changed, 4 insertions(+), 6 deletions(-)

    --- a/drivers/net/8139cp.c
    +++ b/drivers/net/8139cp.c
    @@ -490,13 +490,11 @@ static inline unsigned int cp_rx_csum_ok
    {
    unsigned int protocol = (status >> 16) & 0x3;

    - if (likely((protocol == RxProtoTCP) && (!(status & TCPFail))))
    + if (((protocol == RxProtoTCP) && !(status & TCPFail)) ||
    + ((protocol == RxProtoUDP) && !(status & UDPFail)))
    return 1;
    - else if ((protocol == RxProtoUDP) && (!(status & UDPFail)))
    - return 1;
    - else if ((protocol == RxProtoIP) && (!(status & IPFail)))
    - return 1;
    - return 0;
    + else
    + return 0;
    }

    static int cp_rx_poll(struct napi_struct *napi, int budget)



    \
     
     \ /
      Last update: 2011-01-06 01:55    [W:0.026 / U:29.676 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site