[Xen-changelog] Merged.

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

# HG changeset patch
# User emellor@xxxxxxxxxxxxxxxxxxxxxx
# Node ID 9ee811544c408f0d6ba2370bbd44125c99dd7237
# Parent  b8bca5421d5c20ab6ca262613495938ac83d675c
Merged.

diff -r b8bca5421d5c -r 9ee811544c40 
linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
--- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c      Wed Nov 23 
19:31:14 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c      Wed Nov 23 
19:31:22 2005
@@ -155,6 +155,8 @@
           (_list)[0]  = (_list)[_id];                          \
           (unsigned short)_id; })
 
+#define DEBUG 1
+
 #ifdef DEBUG
 static char *be_state_name[] = {
        [BEST_CLOSED]       = "closed",
@@ -900,7 +902,7 @@
 {
        struct netfront_info *np = netdev_priv(dev);
        np->user_state = UST_CLOSED;
-       netif_stop_queue(np->netdev);
+       netif_stop_queue(dev);
        return 0;
 }
 
@@ -1163,8 +1165,6 @@
        struct netfront_info *info = dev->data;
 
        DPRINTK("netfront_closing: %s removed\n", dev->nodename);
-
-       close_netdev(info);
 
        xenbus_switch_state(dev, NULL, XenbusStateClosed);
 }
diff -r b8bca5421d5c -r 9ee811544c40 tools/examples/block
--- a/tools/examples/block      Wed Nov 23 19:31:14 2005
+++ b/tools/examples/block      Wed Nov 23 19:31:22 2005
@@ -2,12 +2,6 @@
 
 dir=$(dirname "$0")
 . "$dir/block-common.sh"
-
-case "$command" in
-    online | offline)
-        exit 0
-        ;;
-esac
 
 expand_dev() {
   local dev
diff -r b8bca5421d5c -r 9ee811544c40 tools/examples/block-common.sh
--- a/tools/examples/block-common.sh    Wed Nov 23 19:31:14 2005
+++ b/tools/examples/block-common.sh    Wed Nov 23 19:31:22 2005
@@ -21,9 +21,7 @@
 
 findCommand "$@"
 
-if [ "$command" != "online" ]  &&
-   [ "$command" != "offline" ] &&
-   [ "$command" != "add" ]     &&
+if [ "$command" != "add" ] &&
    [ "$command" != "remove" ]
 then
   log err "Invalid command: $command"
diff -r b8bca5421d5c -r 9ee811544c40 tools/examples/block-enbd
--- a/tools/examples/block-enbd Wed Nov 23 19:31:14 2005
+++ b/tools/examples/block-enbd Wed Nov 23 19:31:22 2005
@@ -11,7 +11,7 @@
 . "$dir/block-common.sh"
 
 case "$command" in
-  bind)
+  add)
     for dev in /dev/nd*; do
       if nbd-client $2:$3 $dev; then
         write_dev $dev
@@ -20,7 +20,7 @@
     done
     exit 1
     ;;
-  unbind)
+  remove)
     nbd-client -d $2
     exit 0
     ;;
diff -r b8bca5421d5c -r 9ee811544c40 tools/examples/block-nbd
--- a/tools/examples/block-nbd  Wed Nov 23 19:31:14 2005
+++ b/tools/examples/block-nbd  Wed Nov 23 19:31:22 2005
@@ -11,7 +11,7 @@
 . "$dir/block-common.sh"
 
 case "$command" in
-  bind)
+  add)
     for dev in /dev/nbd*; do
       if nbd-client $2 $3 $dev; then
         write_dev $dev
@@ -20,7 +20,7 @@
     done
     exit 1
     ;;
-  unbind)
+  remove)
     nbd-client -d $2
     exit 0
     ;;

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