diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-21 02:31:25 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-21 02:31:25 +0200 |
| commit | 86c2fe1e3adacec9204c03f2b056b49534ecf0ed (patch) | |
| tree | 9d6a2c3f3802cd83d5a266df1d2576bd77aaad93 /drivers/net/wireless/rt2x00/rt2x00debug.c | |
| parent | net: fix rtable leak in net/ipv4/route.c (diff) | |
| parent | wireless: beyond ARRAY_SIZE of intf->crypto_stats (diff) | |
| download | linux-86c2fe1e3adacec9204c03f2b056b49534ecf0ed.tar.xz linux-86c2fe1e3adacec9204c03f2b056b49534ecf0ed.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00debug.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00debug.c b/drivers/net/wireless/rt2x00/rt2x00debug.c index 07d378ef0b46..7b3ee8c2eaef 100644 --- a/drivers/net/wireless/rt2x00/rt2x00debug.c +++ b/drivers/net/wireless/rt2x00/rt2x00debug.c @@ -138,7 +138,7 @@ void rt2x00debug_update_crypto(struct rt2x00_dev *rt2x00dev, if (cipher == CIPHER_TKIP_NO_MIC) cipher = CIPHER_TKIP; - if (cipher == CIPHER_NONE || cipher > CIPHER_MAX) + if (cipher == CIPHER_NONE || cipher >= CIPHER_MAX) return; /* Remove CIPHER_NONE index */ |