mac80211: Fix null dereference in ieee80211_key_link()

[pandora-kernel.git] / net / mac80211 / rc80211_minstrel.c

diff --git a/net/mac80211/rc80211_minstrel.c b/net/mac80211/rc80211_minstrel.c
index 8adac67..58a8955 100644 (file)
--- a/net/mac80211/rc80211_minstrel.c
+++ b/net/mac80211/rc80211_minstrel.c
@@ -532,12 +532,21 @@ minstrel_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir)
        mp->hw = hw;
        mp->update_interval = 100;
 
+#ifdef CONFIG_MAC80211_DEBUGFS
+       mp->fixed_rate_idx = (u32) -1;
+       mp->dbg_fixed_rate = debugfs_create_u32("fixed_rate_idx",
+                       S_IRUGO | S_IWUGO, debugfsdir, &mp->fixed_rate_idx);
+#endif
+
        return mp;
 }
 
 static void
 minstrel_free(void *priv)
 {
+#ifdef CONFIG_MAC80211_DEBUGFS
+       debugfs_remove(((struct minstrel_priv *)priv)->dbg_fixed_rate);
+#endif
        kfree(priv);
 }