diff for duplicates of <20100308133923.GA18477@bicker> diff --git a/a/1.txt b/N1/1.txt index a028490..1763525 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -9,15 +9,18 @@ index de4b627..33a6939 100644 --- a/drivers/staging/rt2860/sta_ioctl.c +++ b/drivers/staging/rt2860/sta_ioctl.c @@ -1047,8 +1047,7 @@ int rt_ioctl_giwscan(struct net_device *dev, - if (tmpRate = 0x6c + if (tmpRate == 0x6c && pAdapter->ScanTab.BssEntry[i].HtCapabilityLen > 0) { -- int rate_count - sizeof(ralinkrate) / sizeof(__s32); +- int rate_count = +- sizeof(ralinkrate) / sizeof(__s32); + int rate_count = ARRAY_SIZE(ralinkrate); - struct rt_ht_cap_info capInfo pAdapter->ScanTab.BssEntry[i].HtCapability. + struct rt_ht_cap_info capInfo = + pAdapter->ScanTab.BssEntry[i].HtCapability. HtCapInfo; @@ -1061,10 +1060,11 @@ int rt_ioctl_giwscan(struct net_device *dev, - int rate_index 12 + ((u8)capInfo.ChannelWidth * 24) + + int rate_index = + 12 + ((u8)capInfo.ChannelWidth * 24) + ((u8)shortGI * 48) + ((u8)maxMCS); + if (rate_index < 0) @@ -26,7 +29,8 @@ index de4b627..33a6939 100644 - rate_index = rate_count; + if (rate_index >= rate_count) + rate_index = rate_count - 1; - iwe.u.bitrate.value ralinkrate[rate_index] * 500000; + iwe.u.bitrate.value = + ralinkrate[rate_index] * 500000; } @@ -2338,7 +2338,7 @@ int rt_ioctl_giwrate(struct net_device *dev, */ diff --git a/a/content_digest b/N1/content_digest index b63579e..ce7cbe5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <error27@gmail.com>\0" "Subject\0[patch] rt2860: off by one errors\0" - "Date\0Mon, 08 Mar 2010 13:39:24 +0000\0" + "Date\0Mon, 8 Mar 2010 16:39:24 +0300\0" "To\0Greg Kroah-Hartman <gregkh@suse.de>\0" "Cc\0Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>" devel@driverdev.osuosl.org @@ -19,15 +19,18 @@ "--- a/drivers/staging/rt2860/sta_ioctl.c\n" "+++ b/drivers/staging/rt2860/sta_ioctl.c\n" "@@ -1047,8 +1047,7 @@ int rt_ioctl_giwscan(struct net_device *dev,\n" - " \t\t\tif (tmpRate = 0x6c\n" + " \t\t\tif (tmpRate == 0x6c\n" " \t\t\t && pAdapter->ScanTab.BssEntry[i].HtCapabilityLen >\n" " \t\t\t 0) {\n" - "-\t\t\t\tint rate_count -\t\t\t\t sizeof(ralinkrate) / sizeof(__s32);\n" + "-\t\t\t\tint rate_count =\n" + "-\t\t\t\t sizeof(ralinkrate) / sizeof(__s32);\n" "+\t\t\t\tint rate_count = ARRAY_SIZE(ralinkrate);\n" - " \t\t\t\tstruct rt_ht_cap_info capInfo \t\t\t\t pAdapter->ScanTab.BssEntry[i].HtCapability.\n" + " \t\t\t\tstruct rt_ht_cap_info capInfo =\n" + " \t\t\t\t pAdapter->ScanTab.BssEntry[i].HtCapability.\n" " \t\t\t\t HtCapInfo;\n" "@@ -1061,10 +1060,11 @@ int rt_ioctl_giwscan(struct net_device *dev,\n" - " \t\t\t\tint rate_index \t\t\t\t 12 + ((u8)capInfo.ChannelWidth * 24) +\n" + " \t\t\t\tint rate_index =\n" + " \t\t\t\t 12 + ((u8)capInfo.ChannelWidth * 24) +\n" " \t\t\t\t ((u8)shortGI * 48) + ((u8)maxMCS);\n" "+\n" " \t\t\t\tif (rate_index < 0)\n" @@ -36,7 +39,8 @@ "-\t\t\t\t\trate_index = rate_count;\n" "+\t\t\t\tif (rate_index >= rate_count)\n" "+\t\t\t\t\trate_index = rate_count - 1;\n" - " \t\t\t\tiwe.u.bitrate.value \t\t\t\t ralinkrate[rate_index] * 500000;\n" + " \t\t\t\tiwe.u.bitrate.value =\n" + " \t\t\t\t ralinkrate[rate_index] * 500000;\n" " \t\t\t}\n" "@@ -2338,7 +2338,7 @@ int rt_ioctl_giwrate(struct net_device *dev,\n" " */\n" @@ -59,4 +63,4 @@ " \twrqu->bitrate.value = ralinkrate[rate_index] * 500000;\n" " \twrqu->bitrate.disabled = 0;" -942091b6ab3525b6b58eb8c24547066d610e9ec5d02633466a5ba191800e61fc +28dfcf3bf1a74959c5a273fe7673f63d5d14d8b6620993f66fe7be0b61432306
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.