ia64/xen-unstable

changeset 9294:9af36c14ae83

merge
author vhanquez@kneesa.uk.xensource.com
date Wed Mar 15 12:24:59 2006 +0000 (2006-03-15)
parents 250ff103c291 a5ee1cb525bb
children 96ba0a2bc9de
files
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Wed Mar 15 12:24:34 2006 +0000
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Wed Mar 15 12:24:59 2006 +0000
     1.3 @@ -845,11 +845,11 @@ static int netif_poll(struct net_device 
     1.4  	}
     1.5  
     1.6  	while ((skb = __skb_dequeue(&rxq)) != NULL) {
     1.7 -		if (skb->len > (dev->mtu + ETH_HLEN)) {
     1.8 +		if (skb->len > (dev->mtu + ETH_HLEN + 4)) {
     1.9  			if (net_ratelimit())
    1.10  				printk(KERN_INFO "Received packet too big for "
    1.11  				       "MTU (%d > %d)\n",
    1.12 -				       skb->len - ETH_HLEN, dev->mtu);
    1.13 +				       skb->len - ETH_HLEN - 4, dev->mtu);
    1.14  			skb->len  = 0;
    1.15  			skb->tail = skb->data;
    1.16  			init_skb_shinfo(skb);