Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openwrt
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
Freifunk Luebeck
openwrt
Commits
23f460ab
Commit
23f460ab
authored
12 years ago
by
Felix Fietkau
Browse files
Options
Downloads
Patches
Plain Diff
mac80211: another fix for monitor mode handling (fixes #13071)
SVN-Revision: 35846
parent
89be702b
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
package/mac80211/patches/300-pending_work.patch
+23
-3
23 additions, 3 deletions
package/mac80211/patches/300-pending_work.patch
with
23 additions
and
3 deletions
package/mac80211/patches/300-pending_work.patch
+
23
−
3
View file @
23f460ab
...
@@ -175,7 +175,17 @@
...
@@ -175,7 +175,17 @@
u32 changed = 0;
u32 changed = 0;
int res;
int res;
u32 hw_reconf_flags = 0;
u32 hw_reconf_flags = 0;
@@ -595,30 +594,8 @@
int ieee80211_do_open(struct wireless_de
@@ -541,6 +540,9 @@
int ieee80211_do_open(struct wireless_de
ieee80211_adjust_monitor_flags(sdata, 1);
ieee80211_configure_filter(local);
+ mutex_lock(&local->mtx);
+ ieee80211_recalc_idle(local);
+ mutex_unlock(&local->mtx);
netif_carrier_on(dev);
break;
@@ -595,30 +597,8 @@
int ieee80211_do_open(struct wireless_de
set_bit(SDATA_STATE_RUNNING, &sdata->state);
set_bit(SDATA_STATE_RUNNING, &sdata->state);
...
@@ -207,7 +217,17 @@
...
@@ -207,7 +217,17 @@
/*
/*
* set_multicast_list will be invoked by the networking core
* set_multicast_list will be invoked by the networking core
@@ -1022,6 +999,72 @@
static void ieee80211_if_setup(struct ne
@@ -817,6 +797,9 @@
static void ieee80211_do_stop(struct iee
ieee80211_adjust_monitor_flags(sdata, -1);
ieee80211_configure_filter(local);
+ mutex_lock(&local->mtx);
+ ieee80211_recalc_idle(local);
+ mutex_unlock(&local->mtx);
break;
case NL80211_IFTYPE_P2P_DEVICE:
/* relies on synchronize_rcu() below */
@@ -1022,6 +1005,72 @@
static void ieee80211_if_setup(struct ne
dev->destructor = free_netdev;
dev->destructor = free_netdev;
}
}
...
@@ -280,7 +300,7 @@
...
@@ -280,7 +300,7 @@
static void ieee80211_iface_work(struct work_struct *work)
static void ieee80211_iface_work(struct work_struct *work)
{
{
struct ieee80211_sub_if_data *sdata =
struct ieee80211_sub_if_data *sdata =
@@ -1126,6 +11
69
,9 @@
static void ieee80211_iface_work(struct
@@ -1126,6 +11
75
,9 @@
static void ieee80211_iface_work(struct
break;
break;
ieee80211_mesh_rx_queued_mgmt(sdata, skb);
ieee80211_mesh_rx_queued_mgmt(sdata, skb);
break;
break;
...
...
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