diff options
| author | kaf24@freefall.cl.cam.ac.uk <kaf24@freefall.cl.cam.ac.uk> | 2004-11-13 15:49:25 +0000 |
|---|---|---|
| committer | kaf24@freefall.cl.cam.ac.uk <kaf24@freefall.cl.cam.ac.uk> | 2004-11-13 15:49:25 +0000 |
| commit | d2d8210fc1e90400d59f21da8e7dc1922a4afffa (patch) | |
| tree | 547f5149ce521ede8575bf9469304577b82d68fc | |
| parent | bc764e321ef6473ecd38e93a6ce7049f5afdf396 (diff) | |
| parent | a8056c42f6ba609e6de06c4e5fbf637b1153f3bb (diff) | |
| download | xen-d2d8210fc1e90400d59f21da8e7dc1922a4afffa.tar.gz xen-d2d8210fc1e90400d59f21da8e7dc1922a4afffa.tar.bz2 xen-d2d8210fc1e90400d59f21da8e7dc1922a4afffa.zip | |
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
| -rw-r--r-- | linux-2.6.9-xen-sparse/drivers/xen/netback/netback.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linux-2.6.9-xen-sparse/drivers/xen/netback/netback.c b/linux-2.6.9-xen-sparse/drivers/xen/netback/netback.c index 143ccff364..1e114bd556 100644 --- a/linux-2.6.9-xen-sparse/drivers/xen/netback/netback.c +++ b/linux-2.6.9-xen-sparse/drivers/xen/netback/netback.c @@ -41,7 +41,6 @@ static unsigned char rx_notify[NR_EVENT_CHANNELS]; static unsigned long mmap_vstart; #define MMAP_VADDR(_req) (mmap_vstart + ((_req) * PAGE_SIZE)) -#define PKT_MIN_LEN (ETH_HLEN + 20) #define PKT_PROT_LEN 64 static struct { @@ -500,7 +499,7 @@ static void net_tx_action(unsigned long unused) netif_schedule_work(netif); - if ( unlikely(txreq.size <= PKT_MIN_LEN) || + if ( unlikely(txreq.size < ETH_HLEN) || unlikely(txreq.size > ETH_FRAME_LEN) ) { DPRINTK("Bad packet size: %d\n", txreq.size); |