Skip to content
Snippets Groups Projects
Commit 555ad404 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge AU_LINUX_QSDK_COCONUT_TARGET_ALL.3.0.870 on remote branch

Change-Id: I80d15752adaf7d9a19dcccb4cb65097247a6b11a
parents a50cc734 38f55cc0
No related tags found
No related merge requests found
diff -Nur a/bridge-stp rstp-2011-10-11/bridge-stp
--- a/bridge-stp 2015-09-11 15:07:22.317566056 -0700
+++ rstp-2011-10-11/bridge-stp 2015-09-11 16:17:16.365671676 -0700
@@ -50,12 +50,17 @@
daemon
}
+#when kernel start stp, we can't start the rstp again.
+#otherwise it will cause deadlock issue
+checkpid $pid_file || exit 1
+
case $2 in
start)
- daemon
- exec /sbin/rstpctl rstp $bridge on ;;
+ exec /sbin/rstpctl rstp $bridge on
+ ;;
stop)
- exec /sbin/rstpctl rstp $bridge off ;;
+ exec /sbin/rstpctl rstp $bridge off
+ ;;
*)
echo "Unknown action:" $2
echo "Usage: bridge-stp <bridge> {start|stop}"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment