lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Browse Source 
Conflicts:
	drivers/net/wireless/ath/ar9170/main.c
	drivers/net/wireless/ath/ar9170/phy.c
	drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
This commit is contained in:
John W. Linville
2011-04-12 16:18:44 -04:00
parent 6ba1037c3d b37e3b6d64
commit 252f4bf400
230 changed files with 29848 additions and 12682 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/mac80211/ieee80211_i.h
View File

@@ -809,8 +809,8 @@ struct ieee80211_local {
struct rate_control_ref *rate_ctrl;
struct crypto_blkcipher *wep_tx_tfm;
struct crypto_blkcipher *wep_rx_tfm;
struct crypto_cipher *wep_tx_tfm;
struct crypto_cipher *wep_rx_tfm;
u32 wep_iv;
/* see iface.c */