diff options
| author | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2006-03-23 10:46:28 +0100 |
|---|---|---|
| committer | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2006-03-23 10:46:28 +0100 |
| commit | e12d3cd71994fa5d053bebda8ea90adccd139c2f (patch) | |
| tree | 4b5077feff6afca28cf84be04830cf0ef9ae63a4 | |
| parent | fed2a3f4c431e7497e5bb2e309f14e5082f31d3f (diff) | |
| download | xen-e12d3cd71994fa5d053bebda8ea90adccd139c2f.tar.gz xen-e12d3cd71994fa5d053bebda8ea90adccd139c2f.tar.bz2 xen-e12d3cd71994fa5d053bebda8ea90adccd139c2f.zip | |
Update and extend netif transmit/receive flag names.
Signed-off-by: Keir Fraser <keir@xensource.com>
| -rw-r--r-- | linux-2.6-xen-sparse/drivers/xen/netback/netback.c | 2 | ||||
| -rw-r--r-- | linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c | 2 | ||||
| -rw-r--r-- | xen/include/public/io/netif.h | 18 |
3 files changed, 15 insertions, 7 deletions
diff --git a/linux-2.6-xen-sparse/drivers/xen/netback/netback.c b/linux-2.6-xen-sparse/drivers/xen/netback/netback.c index 5b19f6356d..41d4bf90d2 100644 --- a/linux-2.6-xen-sparse/drivers/xen/netback/netback.c +++ b/linux-2.6-xen-sparse/drivers/xen/netback/netback.c @@ -331,7 +331,7 @@ static void net_rx_action(unsigned long unused) if (make_rx_response(netif, id, status, (unsigned long)skb->data & ~PAGE_MASK, size, skb->proto_csum_valid ? - NETRXF_csum_valid : 0) && + NETRXF_data_validated : 0) && (rx_notify[irq] == 0)) { rx_notify[irq] = 1; notify_list[notify_nr++] = irq; diff --git a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c index 8c9f49f6e2..220e9aa343 100644 --- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c +++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c @@ -811,7 +811,7 @@ static int netif_poll(struct net_device *dev, int *pbudget) skb->len = rx->status; skb->tail = skb->data + skb->len; - if (rx->flags & NETRXF_csum_valid) + if (rx->flags & NETRXF_data_validated) skb->ip_summed = CHECKSUM_UNNECESSARY; np->stats.rx_packets++; diff --git a/xen/include/public/io/netif.h b/xen/include/public/io/netif.h index dcb9b46d0e..c9bcc778fa 100644 --- a/xen/include/public/io/netif.h +++ b/xen/include/public/io/netif.h @@ -20,8 +20,12 @@ */ /* Protocol checksum field is blank in the packet (hardware offload)? */ -#define _NETTXF_csum_blank (0) -#define NETTXF_csum_blank (1U<<_NETTXF_csum_blank) +#define _NETTXF_csum_blank (0) +#define NETTXF_csum_blank (1U<<_NETTXF_csum_blank) + +/* Packet data has been validated against protocol checksum. */ +#define _NETTXF_data_validated (1) +#define NETTXF_data_validated (1U<<_NETTXF_data_validated) typedef struct netif_tx_request { grant_ref_t gref; /* Reference to buffer page */ @@ -41,9 +45,13 @@ typedef struct { grant_ref_t gref; /* Reference to incoming granted frame */ } netif_rx_request_t; -/* Protocol checksum already validated (e.g., performed by hardware)? */ -#define _NETRXF_csum_valid (0) -#define NETRXF_csum_valid (1U<<_NETRXF_csum_valid) +/* Packet data has been validated against protocol checksum. */ +#define _NETRXF_data_validated (0) +#define NETRXF_data_validated (1U<<_NETRXF_data_validated) + +/* Protocol checksum field is blank in the packet (hardware offload)? */ +#define _NETRXF_csum_blank (1) +#define NETRXF_csum_blank (1U<<_NETRXF_csum_blank) typedef struct { uint16_t id; |