mac80211: fix mesh sta teardown

Browse source

The patch "mac80211: clean up mesh sta allocation warning"
moved some mesh initialization into a path which is only
called when the kernel handles peering. This causes a hang
when mac80211 tries to clean up a userspace-allocated
station entry and delete a timer which has never been
initialized.

To avoid this, only do any mesh sta peering teardown if
the kernel is actually handling it.

The same is true when quiescing before suspend.

Signed-off-by: Thomas Pedersen <thomas@cozybit.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

...

This commit is contained in:

Thomas Pedersen 2013-02-06 10:17:21 -08:00 • committed by Johannes Berg

parent 077f897a8b

commit 45b5028e86

4 changed files with 35 additions and 10 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

25

net/mac80211/mesh.c

View file

3

net/mac80211/mesh.h

View file

8

net/mac80211/mesh_plink.c

View file

9

net/mac80211/sta_info.c

View file