ia64/xen-unstable

changeset 9414:b89a155ecd2c

Update and extend netif transmit/receive flag names.

Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Thu Mar 23 10:46:28 2006 +0100 (2006-03-23)
parents d81636a6fa9f
children 72b469303d6d
files linux-2.6-xen-sparse/drivers/xen/netback/netback.c linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c xen/include/public/io/netif.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/netback/netback.c	Wed Mar 22 19:18:42 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netback/netback.c	Thu Mar 23 10:46:28 2006 +0100
     1.3 @@ -331,7 +331,7 @@ static void net_rx_action(unsigned long 
     1.4  		if (make_rx_response(netif, id, status,
     1.5  				     (unsigned long)skb->data & ~PAGE_MASK,
     1.6  				     size, skb->proto_csum_valid ?
     1.7 -				     NETRXF_csum_valid : 0) &&
     1.8 +				     NETRXF_data_validated : 0) &&
     1.9  		    (rx_notify[irq] == 0)) {
    1.10  			rx_notify[irq] = 1;
    1.11  			notify_list[notify_nr++] = irq;
     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Wed Mar 22 19:18:42 2006 +0100
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Thu Mar 23 10:46:28 2006 +0100
     2.3 @@ -811,7 +811,7 @@ static int netif_poll(struct net_device 
     2.4  		skb->len  = rx->status;
     2.5  		skb->tail = skb->data + skb->len;
     2.6  
     2.7 -		if (rx->flags & NETRXF_csum_valid)
     2.8 +		if (rx->flags & NETRXF_data_validated)
     2.9  			skb->ip_summed = CHECKSUM_UNNECESSARY;
    2.10  
    2.11  		np->stats.rx_packets++;
     3.1 --- a/xen/include/public/io/netif.h	Wed Mar 22 19:18:42 2006 +0100
     3.2 +++ b/xen/include/public/io/netif.h	Thu Mar 23 10:46:28 2006 +0100
     3.3 @@ -20,8 +20,12 @@
     3.4   */
     3.5  
     3.6  /* Protocol checksum field is blank in the packet (hardware offload)? */
     3.7 -#define _NETTXF_csum_blank (0)
     3.8 -#define  NETTXF_csum_blank (1U<<_NETTXF_csum_blank)
     3.9 +#define _NETTXF_csum_blank     (0)
    3.10 +#define  NETTXF_csum_blank     (1U<<_NETTXF_csum_blank)
    3.11 +
    3.12 +/* Packet data has been validated against protocol checksum. */
    3.13 +#define _NETTXF_data_validated (1)
    3.14 +#define  NETTXF_data_validated (1U<<_NETTXF_data_validated)
    3.15  
    3.16  typedef struct netif_tx_request {
    3.17      grant_ref_t gref;      /* Reference to buffer page */
    3.18 @@ -41,9 +45,13 @@ typedef struct {
    3.19      grant_ref_t gref;      /* Reference to incoming granted frame */
    3.20  } netif_rx_request_t;
    3.21  
    3.22 -/* Protocol checksum already validated (e.g., performed by hardware)? */
    3.23 -#define _NETRXF_csum_valid (0)
    3.24 -#define  NETRXF_csum_valid (1U<<_NETRXF_csum_valid)
    3.25 +/* Packet data has been validated against protocol checksum. */
    3.26 +#define _NETRXF_data_validated (0)
    3.27 +#define  NETRXF_data_validated (1U<<_NETRXF_data_validated)
    3.28 +
    3.29 +/* Protocol checksum field is blank in the packet (hardware offload)? */
    3.30 +#define _NETRXF_csum_blank     (1)
    3.31 +#define  NETRXF_csum_blank     (1U<<_NETRXF_csum_blank)
    3.32  
    3.33  typedef struct {
    3.34      uint16_t id;