staging/rt*: don't confuse user of rt3070 driver with rt2870 strings
PATCH 3/3 staging/rt*: don't confuse user of rt3070 driver with rt2870 strings
From: Marcin Slusarz <[email protected]>
Subject: [PATCH 3/3] staging/rt*: don't confuse user of rt3070 driver with rt2870 strings
Original author didn't bother to change strings for rt3070 driver. Fix it.
---
Next steps could be:
- removal of loading configuration from kernel
- removal of driver "versions"
Bart, are you preparing some patches for these drivers?
--- drivers/staging/rt2860/rt_linux.h | 33 ++++++++++++++++--------------- drivers/staging/rt2860/sta_ioctl.c | 7 +----- drivers/staging/rt2870/2870_main_dev.c | 4 +- drivers/staging/rt2870/rt2870.h | 4 +++ 4 files changed, 24 insertions(+), 24 deletions(-)
drivers/staging/rt2860/rt_linux.h +17 -16
@@ -93,22 +93,23 @@ typedef int (*HARD_START_XMIT_FUNC)(struct sk_buff *skb, struct net_device *net_// add by kathy -#ifdef RT2860 -#define STA_PROFILE_PATH "/etc/Wireless/RT2860STA/RT2860STA.dat" -#define STA_RTMP_FIRMWARE_FILE_NAME "/etc/Wireless/RT2860STA/RT2860STA.bin" -#define STA_NIC_DEVICE_NAME "RT2860STA" -#define STA_DRIVER_VERSION "1.8.1.1" -#endif -#ifdef RT2870 -#define STA_PROFILE_PATH "/etc/Wireless/RT2870STA/RT2870STA.dat" -#define STA_RT2870_IMAGE_FILE_NAME "/etc/Wireless/RT2870STA/rt2870.bin" -#define STA_NIC_DEVICE_NAME "RT2870STA" -#ifndef RT30xx -#define STA_DRIVER_VERSION "1.4.0.0" -#endif -#ifdef RT30xx -#define STA_DRIVER_VERSION "2.0.1.0" -#endif +/* order of "if defined()" is important, because for 3070 driver +both RT2870 and RT3070 are defined */ +#if defined(RT2860 ) +#define STA_PROFILE_PATH "/etc/Wireless/RT2860STA/RT2860STA.dat" +#define STA_RTMP_FIRMWARE_FILE_NAME "/etc/Wireless/RT2860STA/RT2860STA.bin" +#define STA_NIC_DEVICE_NAME "RT2860STA" +#define STA_DRIVER_VERSION "1.8.1.1" +#elif defined(RT3070 ) +#define STA_PROFILE_PATH "/etc/Wireless/RT3070STA/RT3070STA.dat" +#define STA_RT2870_IMAGE_FILE_NAME "/etc/Wireless/RT3070STA/rt2870.bin" +#define STA_NIC_DEVICE_NAME "RT3070STA" +#define STA_DRIVER_VERSION "2.0.1.0" +#elif defined(RT2870 ) +#define STA_PROFILE_PATH "/etc/Wireless/RT2870STA/RT2870STA.dat" +#define STA_RT2870_IMAGE_FILE_NAME "/etc/Wireless/RT2870STA/rt2870.bin" +#define STA_NIC_DEVICE_NAME "RT2870STA" +#define STA_DRIVER_VERSION "1.4.0.0"#endif #ifdef RT2860
drivers/staging/rt2860/sta_ioctl.c +1 -6
@@ -531,12 +531,7 @@ rt_ioctl_giwname(struct net_device *dev, char *name, char *extra) {// PRTMP_ADAPTER pAdapter = dev->ml_priv; -#ifdef RT2860 -strncpy (name,"RT2860 Wireless" ,IFNAMSIZ ); -#endif -#ifdef RT2870 -strncpy (name,"RT2870 Wireless" ,IFNAMSIZ ); -#endif // RT2870 // + strncpy(name, RT28xx_CHIP_NAME " Wireless", IFNAMSIZ);return 0 ; }
drivers/staging/rt2870/2870_main_dev.c +2 -2
@@ -45,7 +45,7 @@// *** If you have a solution for the bug in current version of driver, please mail to me. // Otherwise post to forum in ralinktech's web site(www.ralinktech.com) and let all users help you. *** MODULE_AUTHOR ("Paul Lin <[email protected]>" ); -MODULE_DESCRIPTION ("RT2870 Wireless Lan Linux Driver" ); +MODULE_DESCRIPTION (RT28xx_CHIP_NAME" Wireless LAN Linux Driver" );MODULE_LICENSE ("GPL" );#ifdef MODULE_VERSION MODULE_VERSION (STA_DRIVER_VERSION );
@@ -1418,7 +1418,7 @@ VOID RT2870_BssBeaconStart( pAd->CommonCfg.BeaconAdjust =0 ; pAd->CommonCfg.BeaconFactor =0xffffffff / (pAd->CommonCfg.BeaconPeriod <<10 ); pAd->CommonCfg.BeaconRemain = (0xffffffff % (pAd->CommonCfg.BeaconPeriod <<10 )) +1 ; -printk ("RT2870_BssBeaconStart:BeaconFactor=%d, BeaconRemain=%d!\n" , pAd->CommonCfg.BeaconFactor, pAd->CommonCfg.BeaconRemain); +printk (RT28xx_CHIP_NAME"_BssBeaconStart:BeaconFactor=%d, BeaconRemain=%d!\n" , pAd->CommonCfg.BeaconFactor, pAd->CommonCfg.BeaconRemain);RTMPSetTimer (&pAd->CommonCfg.BeaconUpdateTimer, pAd->CommonCfg.BeaconPeriod); }
drivers/staging/rt2870/rt2870.h +4 -0
@@ -523,7 +523,11 @@ extern UCHAR EpToQueue[6]; {RTUSB_SET_BULK_FLAG (pAd, fRTUSB_BULK_OUT_PSPOLL); \RTUSBKickBulkOut (pAd); } +#ifdef RT30xx +#define RT28xx_CHIP_NAME "RT3070" +#else #define RT28xx_CHIP_NAME "RT2870" +#endif #define USB_CYC_CFG 0x02a4#ifndef RT30xx#define STATUS_SUCCESS 0x00
Signature · 1 line
1.6.3.3
Quoted 8 lines · On Wednesday 08 July 2009 22:07:26 Marcin Slusarz wrote:
From: Marcin Slusarz <[email protected]>
Subject: [PATCH 3/3] staging/rt*: don't confuse user of rt3070 driver with rt2870 stringsOriginal author didn't bother to change strings for rt3070 driver. Fix it.
Signed-off-by Marcin Slusarz <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc Bartlomiej Zolnierkiewicz <[email protected]>
for all three patches
Quoted 3 lines
Next steps could be:
- removal of loading configuration from kernel
- removal of driver "versions"
- finishing unification of rt{28,30}70sta drivers (shouldn't be difficult, as it mostly requires replacing ifdefs with chipsets version checks and checking the end result with the hardware)
- finishing unification of rt28{6,7}0sta drivers (similar complexity)
Quoted 1 line
Bart, are you preparing some patches for these drivers?
Not at the moment and I would prefer to make some overdue changes to rtl8187se, rtl8192su and rt3090 first anyway..