diff options
| author | Kalle Valo <kvalo@qca.qualcomm.com> | 2014-07-24 20:06:37 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2014-07-24 20:06:37 +0300 |
| commit | 30d88ce331d566f496fe7bea25ee560dcfd253ae (patch) | |
| tree | a1dfe71a00fad0fa20693c350557609f8ecf9d36 /net/mac80211/key.c | |
| parent | c29a380e4a8157f8bf6a91c216a77439a293c93d (diff) | |
| parent | bac9832076ee3b134bc859e07698c99276fc9459 (diff) | |
Merge remote-tracking branch 'wireless-next/master' into ath-next
Diffstat (limited to 'net/mac80211/key.c')
| -rw-r--r-- | net/mac80211/key.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/mac80211/key.c b/net/mac80211/key.c index 16d97f044a20..d808cff80153 100644 --- a/net/mac80211/key.c +++ b/net/mac80211/key.c @@ -482,9 +482,6 @@ int ieee80211_key_link(struct ieee80211_key *key, int idx, ret; bool pairwise; - if (WARN_ON(!sdata || !key)) - return -EINVAL; - pairwise = key->conf.flags & IEEE80211_KEY_FLAG_PAIRWISE; idx = key->conf.keyidx; key->local = sdata->local; |