The patch titled rt2860/sta_ioctl.c: two branches the same in rt_ioctl_giwscan() has been removed from the -mm tree. Its filename was rt2860-sta_ioctlc-two-branches-the-same-in-rt_ioctl_giwscan.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: rt2860/sta_ioctl.c: two branches the same in rt_ioctl_giwscan() From: Roel Kluin <roel.kluin@xxxxxxxxx> Regardless of the condition, the branches execute the same code Signed-off-by: Roel Kluin <roel.kluin@xxxxxxxxx> Cc: Greg Kroah-Hartman <gregkh@xxxxxxx> Cc: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx> Cc: <devel@xxxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/staging/rt2860/sta_ioctl.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff -puN drivers/staging/rt2860/sta_ioctl.c~rt2860-sta_ioctlc-two-branches-the-same-in-rt_ioctl_giwscan drivers/staging/rt2860/sta_ioctl.c --- a/drivers/staging/rt2860/sta_ioctl.c~rt2860-sta_ioctlc-two-branches-the-same-in-rt_ioctl_giwscan +++ a/drivers/staging/rt2860/sta_ioctl.c @@ -975,10 +975,7 @@ int rt_ioctl_giwscan(struct net_device * /*================================ */ memset(&iwe, 0, sizeof(iwe)); iwe.cmd = SIOCGIWFREQ; - if (INFRA_ON(pAdapter) || ADHOC_ON(pAdapter)) - iwe.u.freq.m = pAdapter->ScanTab.BssEntry[i].Channel; - else - iwe.u.freq.m = pAdapter->ScanTab.BssEntry[i].Channel; + iwe.u.freq.m = pAdapter->ScanTab.BssEntry[i].Channel; iwe.u.freq.e = 0; iwe.u.freq.i = 0; _ Patches currently in -mm which might be from roel.kluin@xxxxxxxxx are origin.patch linux-next.patch acpi-fix-confusion-in-acpi_evaluate_string-in-comment.patch asus-acpi-remove-duplicate-comparison-of-asus_model-strings.patch thinkpad-acpi-wrong-thermal-attribute_group-removed-in-thermal_exit.patch gemini-wrong-registers-used-to-set-reg_level-in-gpio_set_irq_type.patch dma-cases-ipu_pix_fmt_bgra32-bgr32-and-abgr32-are-the-same-in-ipu_ch_param_set_size.patch powerpc-sky-cpu-redundant-or-incorrect-tests-on-unsigned.patch drivers-gpu-drm-drm_crtc_helperc-fix-setting-of-fb_changed-in-drm_crtc_helper_set_config.patch cx23885-wrong-command-printed-in-cmd_to_str.patch ia64-wrong-attribute-of-hub-chip-written-in-uv_setup.patch mtd-hot-spin-and-code-duplication-in-nand_bcm_umi_bch_read_oobecc.patch hisax-timeout-off-by-one-in-waitrecmsg.patch drivers-scsi-fnic-fnic_scsic-clean-up.patch drivers-scsi-gdthc-fix-buffer-overflow.patch drivers-scsi-lpfc-lpfc_vportc-fix-read-buffer-overflow.patch osst-fix-read-buffer-overflow.patch gdth-unmap-ccb_phys-when-scsi_add_host-fails-in-gdth_eisa_probe_one.patch ncr5380-bit-mr_dma_mode-set-twice-in-ncr5380_transfer_dma.patch scsi-pmcraid-redundant-check-in-pmcraid_check_ioctl_buffer.patch dc395x-decrease-iteration-for-tag_number-of-max_command-in-start_scsi.patch mpt2sas-fix-confusion-in-_scsih_sas_device_status_change_event.patch lpfc-two-branches-the-same-in-lpfc_decode_firmware_rev.patch paride-fix-off-by-one-test.patch musb-test-always-evaluates-to-false.patch frv-duplicate-output_buffer-of-e03.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch cryptocop-fix-assertion-in-create_output_descriptors.patch cris-v32-typo-in-crisv32_arbiter_unwatch.patch asiliantfb-fix-test-of-unsigned-in-asiliant_calc_dclk2.patch w1-fix-test-in-ds2482_wait_1wire_idle.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html