diff options
| author |   Fabian Frederick <fabf@skynet.be> | 2014-10-21 18:20:12 +0200 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2014-10-21 21:08:10 +0200 |
| commit | 5c6761adc77c131ef1601016f9ebbad0a9ae6d1a (patch) | |
| tree | 3a5b2d61cc99ea0256f1fb754b6e6495dafa554f /net/mac80211/debugfs_key.c | |
| parent | mac80211: minstrel_ht: add basic support for VHT rates <= 3SS@80MHz (diff) | |
| download | linux-dev-5c6761adc77c131ef1601016f9ebbad0a9ae6d1a.tar.xz linux-dev-5c6761adc77c131ef1601016f9ebbad0a9ae6d1a.zip | |
mac80211: remove unnecessary null test before debugfs_remove()
The debugfs_remove() function can safely take NULL parameters
so the additionally null test isn't required, and there's no
other reason to have it here, so remove it.
Signed-off-by: Fabian Frederick <fabf@skynet.be>
[rewrite commit message, re-introduce blank line after assert]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/debugfs_key.c')
| -rw-r--r-- | net/mac80211/debugfs_key.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/net/mac80211/debugfs_key.c b/net/mac80211/debugfs_key.c index 1521cabad3d6..5523b94c7c90 100644 --- a/net/mac80211/debugfs_key.c +++ b/net/mac80211/debugfs_key.c @@ -300,10 +300,8 @@ void ieee80211_debugfs_key_update_default(struct ieee80211_sub_if_data *sdata) lockdep_assert_held(&sdata->local->key_mtx); - if (sdata->debugfs.default_unicast_key) { - debugfs_remove(sdata->debugfs.default_unicast_key); - sdata->debugfs.default_unicast_key = NULL; - } + debugfs_remove(sdata->debugfs.default_unicast_key); + sdata->debugfs.default_unicast_key = NULL; if (sdata->default_unicast_key) { key = key_mtx_dereference(sdata->local, @@ -314,10 +312,8 @@ void ieee80211_debugfs_key_update_default(struct ieee80211_sub_if_data *sdata) sdata->vif.debugfs_dir, buf); } - if (sdata->debugfs.default_multicast_key) { - debugfs_remove(sdata->debugfs.default_multicast_key); - sdata->debugfs.default_multicast_key = NULL; - } + debugfs_remove(sdata->debugfs.default_multicast_key); + sdata->debugfs.default_multicast_key = NULL; if (sdata->default_multicast_key) { key = key_mtx_dereference(sdata->local, |