mac80211: move tx crypto decision
authorJohannes Berg <johannes@sipsolutions.net>
Tue, 18 Dec 2007 14:27:47 +0000 (15:27 +0100)
committerDavid S. Miller <davem@davemloft.net>
Mon, 28 Jan 2008 22:59:53 +0000 (14:59 -0800)
commit176e4f84423af3105894a7d71b23c1a16678a6be
tree7f5103c2ca716bd2ab2bbdb68ae024d189d5c9d7
parent7bbdd2d987971f9d123a2db89ed921bf02e34f9a
mac80211: move tx crypto decision

This patch moves the decision making about whether a frame is encrypted
with a certain algorithm up into the TX handlers rather than having it
in the crypto algorithm implementation.

This fixes a problem with the radiotap injection code where injecting
a non-data packet and requesting encryption could end up asking the
driver to encrypt a packet without giving it a key.

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>
net/mac80211/tx.c
net/mac80211/wep.c
net/mac80211/wpa.c