summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-08-28 19:03:36 +0200
committerJohannes Berg <johannes.berg@intel.com>2013-09-26 13:21:38 +0200
commitc5dc164df6187e845f1a7c0542f5106c74ff5a92 (patch)
tree6f2ce5afa0ed7b288004925be21b3d053748a2a2
parentc7c71066c27f2bafb2ce3b10c407c0285f56acfa (diff)
downloadlinux-c5dc164df6187e845f1a7c0542f5106c74ff5a92.tar.bz2
mac80211: use ERR_CAST()
No need for ERR_PTR(PTR_ERR()) since there's ERR_CAST, use it. Reported-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--net/mac80211/key.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index 620677e897bd..3e51dd7d98b3 100644
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -879,7 +879,7 @@ ieee80211_gtk_rekey_add(struct ieee80211_vif *vif,
keyconf->keylen, keyconf->key,
0, NULL);
if (IS_ERR(key))
- return ERR_PTR(PTR_ERR(key));
+ return ERR_CAST(key);
if (sdata->u.mgd.mfp != IEEE80211_MFP_DISABLED)
key->conf.flags |= IEEE80211_KEY_FLAG_RX_MGMT;