Skip to content

Staging: rt{286,287,307}0: merge rt3070 with rt2870

Bartlomiej Zolnierkiewicz lkml 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest33 patches 5 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/33Staging: rtxxxx: unify AsicRxAntEvalTimeout()drivers/staging/rt2860/common/mlme.c+7 -720 replies
2/33Staging: rtxxxx: unify AsicSwitchChannel()drivers/staging/rt2860/common/mlme.c+9 -370 replies
3/33Staging: rtxx70: unify NICInitRT30xxRFRegisters()drivers/staging/rt2860/common/rtmp_init.c+12 -290 replies
4/33Staging: rtxxxx: RTMPGetRalinkAuthModeStr() fixesdrivers/staging/rt2860/common/cmm_info.c+0 -70 replies
5/33Staging: rt3070: update allowed channels list for Japandrivers/staging/rt2860/chlist.h+0 -50 replies
6/33Staging: rt3070: fix PID checking in RTUSBEnqueueCmdFromNdis()drivers/staging/rt2870/common/rtusb_io.c+0 -50 replies
7/33Staging: rt3070: WEP fixesdrivers/staging/rt2860/common/cmm_wpa.c drivers/staging/rt2860/common/mlme.c drivers/staging/rt2860/sta/wpa.c +1 more+4 -360 replies
8/33Staging: rt3070: AsicSetSlotTime() fixdrivers/staging/rt2860/common/mlme.c+0 -50 replies
9/33Staging: rt3070: remove needless EFUSE_TAG register readdrivers/staging/rt2860/common/rtmp_init.c drivers/staging/rt2860/rtmp.h+0 -90 replies
10/33Staging: rt3070: add remaining rt2870 device idsdrivers/staging/rt2870/2870_main_dev.c+2 -120 replies
11/33Staging: rt2870: use internal command for AsicUpdateProtect()drivers/staging/rt2860/common/cmm_data.c drivers/staging/rt2870/common/rtusb_io.c+2 -90 replies
12/33Staging: rt2870: add fRTUSB_BULK_OUT_DATA_NORMAL_5 quirkdrivers/staging/rt2870/common/2870_rtmp_init.c drivers/staging/rt2870/common/rtusb_bulk.c+1 -70 replies
13/33Staging: rt28x0: add SIOCGIWNAME support to rt_ioctl_giwscan()drivers/staging/rt2860/sta_ioctl.c+0 -20 replies
14/33Staging: rt28x0: fix GTK length check in ParseKeyData()drivers/staging/rt2860/sta/wpa.c drivers/staging/rt2860/wpa.h+0 -60 replies
15/33Staging: rt28x0: fix BPP_R66 register handlingdrivers/staging/rt2860/common/cmm_data.c+1 -20 replies
16/33Staging: rt28x0: fix fOP_STATUS_DOZE flag handlingdrivers/staging/rt2860/common/mlme.c+2 -20 replies
17/33Staging: rt28x0 fix BACapability policy handlingdrivers/staging/rt2860/common/cmm_info.c drivers/staging/rt2860/rt_profile.c+1 -120 replies
18/33Staging: rt28x0: AsicSwitchChannel() fixdrivers/staging/rt2860/common/mlme.c+0 -120 replies
19/33Staging: rt28x0: BssTableSetEntry() fixdrivers/staging/rt2860/common/mlme.c+0 -40 replies
20/33Staging: rt28x0: MlmeSelectTxRateTable() fixdrivers/staging/rt2860/common/mlme.c+1 -60 replies
21/33Staging: rt28x0: MlmeCheckPsmChange() fixdrivers/staging/rt2860/common/mlme.c+0 -20 replies
22/33Staging: rt28x0: MlmeAssocReqAction() fixes for wpa_supplicant supportdrivers/staging/rt2860/sta/assoc.c+0 -60 replies
23/33Staging: rt28x0: rt_ioctl_siwencode() fixesdrivers/staging/rt2860/sta_ioctl.c+0 -100 replies
24/33Staging: rt28x0: LinkUp() fixesdrivers/staging/rt2860/sta/connect.c+0 -60 replies
25/33Staging: rt3070: remove unused MiniportDataMMRequest()drivers/staging/rt2860/common/cmm_data.c drivers/staging/rt2860/rtmp.h+1 -1330 replies
26/33Staging: rt3070: remove unused RT_CMD_SET_* internal commandsdrivers/staging/rt2870/common/rtusb_io.c drivers/staging/rt2870/rt2870.h+0 -350 replies
27/33Staging: rt2870: remove SHOW_ADHOC_ENTRY_INFO supportdrivers/staging/rt2860/sta_ioctl.c+0 -610 replies
28/33Staging: rtxxxx: remove unused AsicAntenna{Select,Setting}()drivers/staging/rt2860/common/mlme.c drivers/staging/rt2860/common/rtmp_init.c drivers/staging/rt2860/rtmp.h+2 -1040 replies
29/33Staging: rt2870: add eFuse supportdrivers/staging/rt2860/common/eeprom.c drivers/staging/rt2860/common/rtmp_init.c drivers/staging/rt2860/rtmp.h +3 more+9 -450 replies
30/33Staging: rt2870: add Antenna Diversity supportdrivers/staging/rt2860/common/eeprom.c drivers/staging/rt2860/common/mlme.c drivers/staging/rt2860/common/rtmp_init.c +3 more+15 -460 replies
31/33Staging: rtxx70: merge rt3070 with rt2870drivers/staging/rt2860/common/cmm_info.c drivers/staging/rt2860/common/mlme.c drivers/staging/rt2860/common/rtmp_init.c +9 more+33 -1680 replies
32/33Staging: rt2870: remove old firmwaredrivers/staging/rt2870/common/firmware.h+0 -5580 replies
33/33Staging: remove no longer needed rt3070 driverdrivers/staging/Kconfig drivers/staging/Makefile drivers/staging/rt3070/2870_main_dev.c +54 more+0 -1060 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 00/33] Staging: rt{286,287,307}0: merge rt3070 with rt2870

Hi,

The final part of rt2870 and rt3070 merge.

It adds RT3070 chipset support to rt2870 driver and removes no longer needed rt3070 driver (yes, it means one Ralink driver less in the staging tree!).

[ in the process many bugs in all Ralink drivers were fixed, RT2870 chipset
support was converted to use the new firmware and ~1.5 KLOC were removed ]

I tested it on RT2860 and RT3070 chipsets already but I would need some help from people with RT2870 hardware to verify those changes (Mike? Marcin?).

To make life easier there is also the combined patchset available at:

	http://www.kernel.org/pub/linux/kernel/people/bart/ralink-20090822.patch

which can be applied at the top of the current staging tree patch from:

	http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-07-staging-2.6.31-rc6.patch

[ which in turn applies just fine also at the top of 2.6.31-rc7 ]

Thanks!

diffstat:

 drivers/staging/rt2870/common/firmware.h                |  558 ----------------
 drivers/staging/rt3070/2870_main_dev.c                  |    1 
 drivers/staging/rt3070/Kconfig                          |    6 
 drivers/staging/rt3070/Makefile                         |   43 -
 drivers/staging/rt3070/action.h                         |    1 
 drivers/staging/rt3070/aironet.h                        |    1 
 drivers/staging/rt3070/ap.h                             |    1 
 drivers/staging/rt3070/chlist.h                         |    1 
 drivers/staging/rt3070/common/2870_rtmp_init.c          |    1 
 drivers/staging/rt3070/common/action.c                  |    1 
 drivers/staging/rt3070/common/ba_action.c               |    1 
 drivers/staging/rt3070/common/cmm_data.c                |    1 
 drivers/staging/rt3070/common/cmm_data_2870.c           |    1 
 drivers/staging/rt3070/common/cmm_info.c                |    1 
 drivers/staging/rt3070/common/cmm_sanity.c              |    1 
 drivers/staging/rt3070/common/cmm_sync.c                |    1 
 drivers/staging/rt3070/common/cmm_wpa.c                 |    1 
 drivers/staging/rt3070/common/dfs.c                     |    1 
 drivers/staging/rt3070/common/eeprom.c                  |    1 
 drivers/staging/rt3070/common/md5.c                     |    1 
 drivers/staging/rt3070/common/mlme.c                    |    1 
 drivers/staging/rt3070/common/rtmp_init.c               |    1 
 drivers/staging/rt3070/common/rtmp_tkip.c               |    1 
 drivers/staging/rt3070/common/rtmp_wep.c                |    1 
 drivers/staging/rt3070/common/rtusb_bulk.c              |    1 
 drivers/staging/rt3070/common/rtusb_data.c              |    1 
 drivers/staging/rt3070/common/rtusb_io.c                |    1 
 drivers/staging/rt3070/common/spectrum.c                |    1 
 drivers/staging/rt3070/dfs.h                            |    1 
 drivers/staging/rt3070/md5.h                            |    1 
 drivers/staging/rt3070/mlme.h                           |    1 
 drivers/staging/rt3070/oid.h                            |    1 
 drivers/staging/rt3070/rt2870.h                         |    1 
 drivers/staging/rt3070/rt28xx.h                         |    1 
 drivers/staging/rt3070/rt_config.h                      |    1 
 drivers/staging/rt3070/rt_linux.c                       |    1 
 drivers/staging/rt3070/rt_linux.h                       |    1 
 drivers/staging/rt3070/rt_main_dev.c                    |    1 
 drivers/staging/rt3070/rt_profile.c                     |    1 
 drivers/staging/rt3070/rtmp.h                           |    1 
 drivers/staging/rt3070/rtmp_ckipmic.h                   |    1 
 drivers/staging/rt3070/rtmp_def.h                       |    1 
 drivers/staging/rt3070/rtmp_type.h                      |    1 
 drivers/staging/rt3070/spectrum.h                       |    1 
 drivers/staging/rt3070/spectrum_def.h                   |    1 
 drivers/staging/rt3070/sta/aironet.c                    |    1 
 drivers/staging/rt3070/sta/assoc.c                      |    1 
 drivers/staging/rt3070/sta/auth.c                       |    1 
 drivers/staging/rt3070/sta/auth_rsp.c                   |    1 
 drivers/staging/rt3070/sta/connect.c                    |    2 
 drivers/staging/rt3070/sta/rtmp_data.c                  |    1 
 drivers/staging/rt3070/sta/sanity.c                     |    1 
 drivers/staging/rt3070/sta/sync.c                       |    1 
 drivers/staging/rt3070/sta/wpa.c                        |    1 
 drivers/staging/rt3070/sta_ioctl.c                      |    1 
 drivers/staging/rt3070/wpa.h                            |    1 
 b/drivers/staging/Kconfig                        |    2 
 b/drivers/staging/Makefile                       |    1 
 b/drivers/staging/rt2860/chlist.h                |    5 
 b/drivers/staging/rt2860/common/cmm_data.c       |  134 ---
 b/drivers/staging/rt2860/common/cmm_info.c       |   25 
 b/drivers/staging/rt2860/common/cmm_wpa.c        |   12 
 b/drivers/staging/rt2860/common/eeprom.c         |   23 
 b/drivers/staging/rt2860/common/mlme.c           |  295 --------
 b/drivers/staging/rt2860/common/rtmp_init.c      |  116 ---
 b/drivers/staging/rt2860/rt_main_dev.c           |    2 
 b/drivers/staging/rt2860/rt_profile.c            |   23 
 b/drivers/staging/rt2860/rtmp.h                  |   35 -
 b/drivers/staging/rt2860/sta/assoc.c             |    6 
 b/drivers/staging/rt2860/sta/connect.c           |    6 
 b/drivers/staging/rt2860/sta/rtmp_data.c         |    9 
 b/drivers/staging/rt2860/sta/wpa.c               |    9 
 b/drivers/staging/rt2860/sta_ioctl.c             |   81 --
 b/drivers/staging/rt2860/wpa.h                   |    1 
 b/drivers/staging/rt2870/2870_main_dev.c         |   33 
 b/drivers/staging/rt2870/Kconfig                 |    5 
 b/drivers/staging/rt2870/Makefile                |    2 
 b/drivers/staging/rt2870/common/2870_rtmp_init.c |    5 
 b/drivers/staging/rt2870/common/cmm_data_2870.c  |   30 
 b/drivers/staging/rt2870/common/rtusb_bulk.c     |    3 
 b/drivers/staging/rt2870/common/rtusb_io.c       |   54 -
 b/drivers/staging/rt2870/rt2870.h                |   27 
 82 files changed, 74 insertions(+), 1531 deletions(-)