[Xen-changelog] Update and extend netif transmit/receive flag names.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID b89a155ecd2cd3e29a8a8437bd72b7f9e61ad105
# Parent  d81636a6fa9f344be1369f3d3b5712471a846083
Update and extend netif transmit/receive flag names.

Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>

diff -r d81636a6fa9f -r b89a155ecd2c 
linux-2.6-xen-sparse/drivers/xen/netback/netback.c
--- a/linux-2.6-xen-sparse/drivers/xen/netback/netback.c        Wed Mar 22 
18:18:42 2006
+++ b/linux-2.6-xen-sparse/drivers/xen/netback/netback.c        Thu Mar 23 
09:46:28 2006
@@ -331,7 +331,7 @@
                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 -r d81636a6fa9f -r b89a155ecd2c 
linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
--- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c      Wed Mar 22 
18:18:42 2006
+++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c      Thu Mar 23 
09:46:28 2006
@@ -811,7 +811,7 @@
                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 -r d81636a6fa9f -r b89a155ecd2c xen/include/public/io/netif.h
--- a/xen/include/public/io/netif.h     Wed Mar 22 18:18:42 2006
+++ b/xen/include/public/io/netif.h     Thu Mar 23 09:46:28 2006
@@ -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 @@
     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;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog