From: Thomas Pedersen <thomas@cozybit.com>
Date: Mon, 4 Feb 2013 22:12:41 +0000 (-0800)
Subject: mac80211: stop plink timer only on mesh interfaces
X-Git-Tag: v3.9-rc1~139^2~31^2^2~12^2~24
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa5a1b8e68c95151fd249a3b5ec444c6b0aa2f1c;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed