diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2009-04-23 18:52:52 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-05-06 15:14:37 -0400 |
| commit | 2448798133d747ad339e57099e32a1d1e68aca1c (patch) | |
| tree | ee09385f5dca9e243c38f5f888baa02605423bd7 /net/mac80211/tkip.c | |
| parent | 2d0ddec5b2b859f06116f631fc0ffe94fbceb556 (diff) | |
| download | linux-stable-2448798133d747ad339e57099e32a1d1e68aca1c.tar.gz linux-stable-2448798133d747ad339e57099e32a1d1e68aca1c.tar.bz2 linux-stable-2448798133d747ad339e57099e32a1d1e68aca1c.zip | |
mac80211: add driver ops wrappers
In order to later add tracing or verifications to the driver
calls mac80211 makes, this patch adds static inline wrappers
for all operations.
All calls are now written as
drv_<op>(local, ...);
instead of
local->ops-><op>(&local->hw, ...);
Where necessary, the wrappers also do existence checking and
return default values as appropriate.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/tkip.c')
| -rw-r--r-- | net/mac80211/tkip.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/tkip.c b/net/mac80211/tkip.c index 38fa111d2dc6..964b7faa7f17 100644 --- a/net/mac80211/tkip.c +++ b/net/mac80211/tkip.c @@ -13,6 +13,7 @@ #include <asm/unaligned.h> #include <net/mac80211.h> +#include "driver-ops.h" #include "key.h" #include "tkip.h" #include "wep.h" @@ -307,9 +308,8 @@ int ieee80211_tkip_decrypt_data(struct crypto_blkcipher *tfm, if (is_multicast_ether_addr(ra)) sta_addr = bcast; - key->local->ops->update_tkip_key( - local_to_hw(key->local), &key->conf, - sta_addr, iv32, key->u.tkip.rx[queue].p1k); + drv_update_tkip_key(key->local, &key->conf, sta_addr, + iv32, key->u.tkip.rx[queue].p1k); } } |