mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 10:40:03 +01:00
Merged.
This commit is contained in:
emellor@leeni.uk.xensource.com committed
1 parent
3ad90d3df7
commit
d64896a9f0
5 files changed
+8
-16
No files matched your search
@@ -155,6 +155,8 @@ struct netfront_info
|
||||
(_list)[0] = (_list)[_id]; \
|
||||
(unsigned short)_id; })
|
||||
|
||||
#define DEBUG 1
|
||||
|
||||
#ifdef DEBUG
|
||||
static char *be_state_name[] = {
|
||||
[BEST_CLOSED] = "closed",
|
||||
@@ -900,7 +902,7 @@ static int network_close(struct net_device *dev)
|
||||
{
|
||||
struct netfront_info *np = netdev_priv(dev);
|
||||
np->user_state = UST_CLOSED;
|
||||
netif_stop_queue(np->netdev);
|
||||
netif_stop_queue(dev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1164,8 +1166,6 @@ static void netfront_closing(struct xenbus_device *dev)
|
||||
|
||||
DPRINTK("netfront_closing: %s removed\n", dev->nodename);
|
||||
|
||||
close_netdev(info);
|
||||
|
||||
xenbus_switch_state(dev, NULL, XenbusStateClosed);
|
||||
}
|
||||
|
||||
|
||||
@@ -3,12 +3,6 @@
|
||||
dir=$(dirname "$0")
|
||||
. "$dir/block-common.sh"
|
||||
|
||||
case "$command" in
|
||||
online | offline)
|
||||
exit 0
|
||||
;;
|
||||
esac
|
||||
|
||||
expand_dev() {
|
||||
local dev
|
||||
case $1 in
|
||||
|
||||
@@ -21,9 +21,7 @@ dir=$(dirname "$0")
|
||||
|
||||
findCommand "$@"
|
||||
|
||||
if [ "$command" != "online" ] &&
|
||||
[ "$command" != "offline" ] &&
|
||||
[ "$command" != "add" ] &&
|
||||
if [ "$command" != "add" ] &&
|
||||
[ "$command" != "remove" ]
|
||||
then
|
||||
log err "Invalid command: $command"
|
||||
|
||||
@@ -11,7 +11,7 @@ dir=$(dirname "$0")
|
||||
. "$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 @@ case "$command" in
|
||||
done
|
||||
exit 1
|
||||
;;
|
||||
unbind)
|
||||
remove)
|
||||
nbd-client -d $2
|
||||
exit 0
|
||||
;;
|
||||
|
||||
@@ -11,7 +11,7 @@ dir=$(dirname "$0")
|
||||
. "$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 @@ case "$command" in
|
||||
done
|
||||
exit 1
|
||||
;;
|
||||
unbind)
|
||||
remove)
|
||||
nbd-client -d $2
|
||||
exit 0
|
||||
;;
|
||||
|
||||