Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
networking
Manage
Activity
Members
Plan
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CodeLinaro
femto5g
oss
system
feeds
networking
Commits
555ad404
Commit
555ad404
authored
9 years ago
by
Linux Build Service Account
Browse files
Options
Downloads
Plain Diff
Merge AU_LINUX_QSDK_COCONUT_TARGET_ALL.3.0.870 on remote branch
Change-Id: I80d15752adaf7d9a19dcccb4cb65097247a6b11a
parents
a50cc734
38f55cc0
Branches
qsdk/caf_migration/release/coconut_ath10k_bl_cs
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
rstp/patches/90-fixes-linux-hang-using-brctl-enable-stp.patch
+24
-0
24 additions, 0 deletions
.../patches/90-fixes-linux-hang-using-brctl-enable-stp.patch
with
24 additions
and
0 deletions
rstp/patches/90-fixes-linux-hang-using-brctl-enable-stp.patch
0 → 100644
+
24
−
0
View file @
555ad404
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}"
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment