diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-10-17 20:02:07 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-10-17 20:02:07 +0200 |
| commit | 9f96da4dd2ccf685b506a21104cb13b1aadd907a (patch) | |
| tree | 5d9eff61123f096e2434a9d36e6fdbd4cc5c6292 /net/mac80211/key.c | |
| parent | tcp: tcp_transmit_skb() optimizations (diff) | |
| parent | rt2x00: rt2800lib: remove duplicate rf_vals for RF3053 (diff) | |
| download | linux-9f96da4dd2ccf685b506a21104cb13b1aadd907a.tar.xz linux-9f96da4dd2ccf685b506a21104cb13b1aadd907a.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'net/mac80211/key.c')
| -rw-r--r-- | net/mac80211/key.c | 2 |
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; |