[root@xenmaster003 linux-2.6.18.x86_64]# cat drivers/xen/netback/xenbus.c.rej
***************
*** 375,418 ****
  				 dev->otherend);
  		return err;
  	}
- 	be->netif->copying_receiver = !!rx_copy;

- 	if (be->netif->dev->tx_queue_len != 0) {
  		if (xenbus_scanf(XBT_NIL, dev->otherend,
  				 "feature-rx-notify", "%d", &val) < 0)
  			val = 0;
  		if (val)
- 			be->netif->can_queue = 1;
  		else
  			/* Must be non-zero for pfifo_fast to work. */
- 			be->netif->dev->tx_queue_len = 1;
  	}

  	if (xenbus_scanf(XBT_NIL, dev->otherend, "feature-sg", "%d", &val) < 0)
  		val = 0;
- 	if (val) {
- 		be->netif->features |= NETIF_F_SG;
- 		be->netif->dev->features |= NETIF_F_SG;
- 	}

  	if (xenbus_scanf(XBT_NIL, dev->otherend, "feature-gso-tcpv4", "%d",
  			 &val) < 0)
  		val = 0;
- 	if (val) {
- 		be->netif->features |= NETIF_F_TSO;
- 		be->netif->dev->features |= NETIF_F_TSO;
- 	}

  	if (xenbus_scanf(XBT_NIL, dev->otherend, "feature-no-csum-offload",
  			 "%d", &val) < 0)
  		val = 0;
- 	if (val) {
- 		be->netif->features &= ~NETIF_F_IP_CSUM;
- 		be->netif->dev->features &= ~NETIF_F_IP_CSUM;
- 	}

  	/* Map the shared frame, irq etc. */
- 	err = netif_map(be->netif, tx_ring_ref, rx_ring_ref, evtchn);
  	if (err) {
  		xenbus_dev_fatal(dev, err,
  				 "mapping shared-frames %lu/%lu port %u",
--- 376,413 ----
  				 dev->otherend);
  		return err;
  	}
+ 	netif->copying_receiver = !!rx_copy;

+ 	if (netif->dev->tx_queue_len != 0) {
  		if (xenbus_scanf(XBT_NIL, dev->otherend,
  				 "feature-rx-notify", "%d", &val) < 0)
  			val = 0;
  		if (val)
+ 			netif->can_queue = 1;
  		else
  			/* Must be non-zero for pfifo_fast to work. */
+ 			netif->dev->tx_queue_len = 1;
  	}

  	if (xenbus_scanf(XBT_NIL, dev->otherend, "feature-sg", "%d", &val) < 0)
  		val = 0;
+ 	netif->can_sg = !!val;

  	if (xenbus_scanf(XBT_NIL, dev->otherend, "feature-gso-tcpv4", "%d",
  			 &val) < 0)
  		val = 0;
+ 	netif->gso = !!val;

  	if (xenbus_scanf(XBT_NIL, dev->otherend, "feature-no-csum-offload",
  			 "%d", &val) < 0)
  		val = 0;
+ 	netif->csum = !val;
+
+ 	/* Set dev->features */
+ 	netif_set_features(netif);

  	/* Map the shared frame, irq etc. */
+ 	err = netif_map(netif, tx_ring_ref, rx_ring_ref, evtchn);
  	if (err) {
  		xenbus_dev_fatal(dev, err,
  				 "mapping shared-frames %lu/%lu port %u",