ia64/xen-unstable

changeset 2969:0e2d163a08c8

bitkeeper revision 1.1159.170.17 (41962d055pOc5fTrHGe4fmt4cHDhjw)

Merge freefall.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into freefall.cl.cam.ac.uk:/local/scratch/kaf24/xeno
author kaf24@freefall.cl.cam.ac.uk
date Sat Nov 13 15:49:25 2004 +0000 (2004-11-13)
parents fc670b022614 ef156cd165a0
children 34da3b621a8a
files linux-2.6.9-xen-sparse/drivers/xen/netback/netback.c
line diff
     1.1 --- a/linux-2.6.9-xen-sparse/drivers/xen/netback/netback.c	Sat Nov 13 10:11:35 2004 +0000
     1.2 +++ b/linux-2.6.9-xen-sparse/drivers/xen/netback/netback.c	Sat Nov 13 15:49:25 2004 +0000
     1.3 @@ -41,7 +41,6 @@ static unsigned char rx_notify[NR_EVENT_
     1.4  static unsigned long mmap_vstart;
     1.5  #define MMAP_VADDR(_req) (mmap_vstart + ((_req) * PAGE_SIZE))
     1.6  
     1.7 -#define PKT_MIN_LEN (ETH_HLEN + 20)
     1.8  #define PKT_PROT_LEN 64
     1.9  
    1.10  static struct {
    1.11 @@ -500,7 +499,7 @@ static void net_tx_action(unsigned long 
    1.12  
    1.13          netif_schedule_work(netif);
    1.14  
    1.15 -        if ( unlikely(txreq.size <= PKT_MIN_LEN) || 
    1.16 +        if ( unlikely(txreq.size < ETH_HLEN) || 
    1.17               unlikely(txreq.size > ETH_FRAME_LEN) )
    1.18          {
    1.19              DPRINTK("Bad packet size: %d\n", txreq.size);