mac80211: stop plink timer only on mesh interfaces
authorThomas Pedersen <thomas@cozybit.com>
Mon, 4 Feb 2013 22:12:41 +0000 (14:12 -0800)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 5 Feb 2013 10:00:09 +0000 (11:00 +0100)
commitaa5a1b8e68c95151fd249a3b5ec444c6b0aa2f1c
treea789a412a0633b759bf11b4c1395c99380063fe5
parent3f52b7e328c526fa7a592af9bf5772c591ed38a4
mac80211: stop plink timer only on mesh interfaces

Since mesh_plink_quiesce() would unconditionally delete
the plink timer, and the timer initialization was recently
moved into the mesh code path, suspending with a non-mesh
interface now causes a crash. Fix this by only deleting
the plink timer for mesh interfaces.

Reported-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Tested-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Thomas Pedersen <thomas@cozybit.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/mesh_plink.c