aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless/core.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2007-12-18 20:03:29 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 17:59:48 -0500
commit41ade00f21a72d30911c6351a93823a491fffa39 (patch)
treed7e4e29c0d757414a5bad9089b1509fd5352ed8f /net/wireless/core.c
parenta1464ab61e66c96f9cffea335755de850fe8bdbd (diff)
cfg80211/nl80211: introduce key handling
This introduces key handling to cfg80211/nl80211. Default and group keys can be added, changed and removed; sequence counters for each key can be retrieved. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wireless/core.c')
-rw-r--r--net/wireless/core.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c
index febc33bc9c09..cfc5fc5f9e75 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -184,6 +184,9 @@ struct wiphy *wiphy_new(struct cfg80211_ops *ops, int sizeof_priv)
184 struct cfg80211_registered_device *drv; 184 struct cfg80211_registered_device *drv;
185 int alloc_size; 185 int alloc_size;
186 186
187 WARN_ON(!ops->add_key && ops->del_key);
188 WARN_ON(ops->add_key && !ops->del_key);
189
187 alloc_size = sizeof(*drv) + sizeof_priv; 190 alloc_size = sizeof(*drv) + sizeof_priv;
188 191
189 drv = kzalloc(alloc_size, GFP_KERNEL); 192 drv = kzalloc(alloc_size, GFP_KERNEL);