ia64/linux-2.6.18-xen.hg

changeset 777:8081d19dce89

revert: "netfront/back: do not mark packets of length < MSS as GSO"

changeset: 774:107e10e0e07c
user: Keir Fraser <keir.fraser@citrix.com>
date: Tue Jan 13 15:17:54 2009 +0000
summary: netfront/back: do not mark packets of length < MSS as GSO

Herbert Xu suggested a better fix in the network
stack which will follow.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Wed Jan 14 14:03:42 2009 +0000 (2009-01-14)
parents 93ea69924241
children d490aa798cc4
files drivers/xen/netback/netback.c drivers/xen/netfront/netfront.c
line diff
     1.1 --- a/drivers/xen/netback/netback.c	Wed Jan 14 11:44:54 2009 +0000
     1.2 +++ b/drivers/xen/netback/netback.c	Wed Jan 14 14:03:42 2009 +0000
     1.3 @@ -1345,11 +1345,6 @@ static void net_tx_action(unsigned long 
     1.4  			skb_shinfo(skb)->frags[0].page = (void *)~0UL;
     1.5  		}
     1.6  
     1.7 -		if (skb->data_len < skb_shinfo(skb)->gso_size) {
     1.8 -			skb_shinfo(skb)->gso_size = 0;
     1.9 -			skb_shinfo(skb)->gso_type = 0;
    1.10 -		}
    1.11 -
    1.12  		__skb_queue_tail(&tx_queue, skb);
    1.13  
    1.14  		pending_cons++;
     2.1 --- a/drivers/xen/netfront/netfront.c	Wed Jan 14 11:44:54 2009 +0000
     2.2 +++ b/drivers/xen/netfront/netfront.c	Wed Jan 14 14:03:42 2009 +0000
     2.3 @@ -1439,14 +1439,6 @@ err:
     2.4  		np->stats.rx_packets++;
     2.5  		np->stats.rx_bytes += skb->len;
     2.6  
     2.7 -#if HAVE_TSO
     2.8 -		if (skb->data_len < skb_shinfo(skb)->gso_size) {
     2.9 -			skb_shinfo(skb)->gso_size = 0;
    2.10 -#if HAVE_GSO
    2.11 -			skb_shinfo(skb)->gso_type = 0;
    2.12 -#endif
    2.13 -		}
    2.14 -#endif
    2.15  		__skb_queue_tail(&rxq, skb);
    2.16  
    2.17  		np->rx.rsp_cons = ++i;