From b73a8037ca2fee411f942334b0216923851c8d7f Mon Sep 17 00:00:00 2001 From: Stanislaw Gruszka Date: Tue, 27 Jul 2010 10:48:17 -0400 Subject: [PATCH] --- yaml --- r: 203895 b: refs/heads/master c: ac59b496d9fd0b7425219e8dc5d4f1f6f0083efc h: refs/heads/master i: 203893: a4a16826f9467e4737d7cd7601f11e7569b3cea6 203891: 690408cc05194d91f227c1a8da301bd0e9cb4b4a 203887: c36bfc8e4df0ec3add0ce50901dcb6a2fee7e039 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/rt2x00/rt2500usb.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d1d6626d9365..4e89f12282c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1279f5edb6d25f2a955696fdec1ac96ca5bcb121 +refs/heads/master: ac59b496d9fd0b7425219e8dc5d4f1f6f0083efc diff --git a/trunk/drivers/net/wireless/rt2x00/rt2500usb.c b/trunk/drivers/net/wireless/rt2x00/rt2500usb.c index 27942455ddcc..08240f813ef4 100644 --- a/trunk/drivers/net/wireless/rt2x00/rt2500usb.c +++ b/trunk/drivers/net/wireless/rt2x00/rt2500usb.c @@ -817,6 +817,7 @@ static int rt2500usb_init_registers(struct rt2x00_dev *rt2x00dev) rt2500usb_register_write(rt2x00dev, MAC_CSR8, reg); rt2500usb_register_read(rt2x00dev, TXRX_CSR0, ®); + rt2x00_set_field16(®, TXRX_CSR0_ALGORITHM, CIPHER_NONE); rt2x00_set_field16(®, TXRX_CSR0_IV_OFFSET, IEEE80211_HEADER); rt2x00_set_field16(®, TXRX_CSR0_KEY_ID, 0); rt2500usb_register_write(rt2x00dev, TXRX_CSR0, reg);