Commit e5af0561 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: remove linux version checks 



For code that is integrated into mainline Linux, checks for
the kernel version make no sense, because we know which version
we are compiling against.

This removes all checks and the associated dead code.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9535ebc5

drivers/staging/wilc1000/linux_wlan.c

+1 −87
Original line number Diff line number Diff line
@@ -180,7 +180,6 @@ linux_wlan_t *g_linux_wlan; 
wilc_wlan_oup_t *gpstrWlanOps;

WILC_Bool bEnablePS = WILC_TRUE;



#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)

static const struct net_device_ops wilc_netdev_ops = {

	.ndo_init = mac_init_fn,

	.ndo_open = mac_open,
@@ -191,37 +190,7 @@ static const struct net_device_ops wilc_netdev_ops = { 
	.ndo_set_rx_mode  = wilc_set_multicast_list,



};

#define wilc_set_netdev_ops(ndev) do { (ndev)->netdev_ops = &wilc_netdev_ops; } while (0)

#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)



static const struct net_device_ops wilc_netdev_ops = {

	.ndo_init = mac_init_fn,

	.ndo_open = mac_open,

	.ndo_stop = mac_close,

	.ndo_start_xmit = mac_xmit,

	.ndo_do_ioctl = mac_ioctl,

	.ndo_get_stats = mac_stats,

	.ndo_set_multicast_list = wilc_set_multicast_list,



};



#define wilc_set_netdev_ops(ndev) do { (ndev)->netdev_ops = &wilc_netdev_ops; } while (0)



#else



static void wilc_set_netdev_ops(struct net_device *ndev)

{



	ndev->init = mac_init_fn;

	ndev->open = mac_open;

	ndev->stop = mac_close;

	ndev->hard_start_xmit = mac_xmit;

	ndev->do_ioctl = mac_ioctl;

	ndev->get_stats = mac_stats;

	ndev->set_multicast_list = wilc_set_multicast_list,

}



#endif

#ifdef DEBUG_MODE



extern volatile int timeNo;
@@ -594,12 +563,7 @@ static void linux_wlan_msleep(uint32_t msc) 
{

	if (msc <= 4000000) {

		WILC_Uint32 u32Temp = msc * 1000;

#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)

		usleep_range(u32Temp, u32Temp);

#else

		/* This is delay not sleep !!!, has to be changed*/

		msleep(msc);

#endif

	} else {

		msleep(msc);

	}
@@ -2195,7 +2159,6 @@ struct net_device_stats *mac_stats(struct net_device *dev) 
}



/* Setup the multicast filter */

#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34)

static void wilc_set_multicast_list(struct net_device *dev)

{
@@ -2251,55 +2214,6 @@ static void wilc_set_multicast_list(struct net_device *dev) 


}



#else



static void wilc_set_multicast_list(struct net_device *dev)

{

	/* BIG Warning, Beware : Uncompiled, untested... */

	struct dev_mc_list *mc_ptr;

	int i = 0;



	if (!dev)

		return;



	PRINT_D(INIT_DBG, "Setting Multicast List. \n");

	PRINT_D(INIT_DBG, "dev->mc_count = %d\n", dev->mc_count);



	if (dev->flags & IFF_PROMISC) {

		/* Normally, we should configure the chip to retrive all packets

		 * but we don't wanna support this right now */

		/* TODO: add promiscuous mode support */

		PRINT_D(INIT_DBG, "Set promiscuous mode ON, retrive all packets \n");

		return;

	}



	/* If there's more addresses than we handle, get all multicast

	 * packets and sort them out in software. */

	if ((dev->flags & IFF_ALLMULTI) || (dev->mc_count > WILC_MULTICAST_TABLE_SIZE)) {

		PRINT_D(INIT_DBG, "Disable multicast filter, retrive all multicast packets\n");

		host_int_setup_multicast_filter((WILC_WFIDrvHandle)gWFiDrvHandle, WILC_FALSE, 0);

		return;

	}



	/* No multicast?  Just get our own stuff */

	if (dev->mc_count == 0) {

		PRINT_D(INIT_DBG, "Enable multicast filter, retrive directed packets only.\n");

		host_int_setup_multicast_filter((WILC_WFIDrvHandle)gWFiDrvHandle, WILC_TRUE, 0);

		return;

	}



	/* Store all of the multicast addresses in the hardware filter */



	for (mc_ptr = dev->mc_list; mc_ptr; mc_ptr = mc_ptr->next, i++) {

		WILC_memcpy(gau8MulticastMacAddrList[i], mc_ptr->dmi_addr, ETH_ALEN)

		i++;

	}



	host_int_setup_multicast_filter((WILC_WFIDrvHandle)gWFiDrvHandle, WILC_TRUE, (dev->mc_count));



}

#endif



static void linux_wlan_tx_complete(void *priv, int status)

{
@@ -2765,7 +2679,7 @@ int wilc_netdev_init(void) 
		nic->wilc_netdev = ndev;

		g_linux_wlan->strInterfaceInfo[g_linux_wlan->u8NoIfcs].wilc_netdev = ndev;

		g_linux_wlan->u8NoIfcs++;

		wilc_set_netdev_ops(ndev);

		ndev->netdev_ops = &wilc_netdev_ops;



		#ifdef USE_WIRELESS

		{

drivers/staging/wilc1000/wilc_sleep.c

+0 −8
Original line number Diff line number Diff line
@@ -12,11 +12,7 @@ void WILC_Sleep(WILC_Uint32 u32TimeMilliSec) 
{

	if (u32TimeMilliSec <= 4000000)	{

		WILC_Uint32 u32Temp = u32TimeMilliSec * 1000;

#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)

		usleep_range(u32Temp, u32Temp);

#else

		udelay(u32Temp);

#endif

	} else {

		msleep(u32TimeMilliSec);

	}
@@ -27,10 +23,6 @@ void WILC_Sleep(WILC_Uint32 u32TimeMilliSec) 
/* #ifdef CONFIG_WILC_SLEEP_HI_RES */

void WILC_SleepMicrosec(WILC_Uint32 u32TimeMicoSec)

{

	#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)

	usleep_range(u32TimeMicoSec, u32TimeMicoSec);

	#else

	udelay(u32TimeMicoSec);

	#endif

}

/* #endif */

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

+3 −483

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/wilc1000/wilc_wfi_cfgoperations.h

+1 −6
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ 
#define nl80211_SCAN_RESULT_EXPIRE	(3 * HZ)

#define SCAN_RESULT_EXPIRE				(40 * HZ)



#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 30)

static const u32 cipher_suites[] = {

	WLAN_CIPHER_SUITE_WEP40,

	WLAN_CIPHER_SUITE_WEP104,
@@ -76,11 +75,7 @@ static const u32 cipher_suites[] = { 
	WLAN_CIPHER_SUITE_CCMP,

	WLAN_CIPHER_SUITE_AES_CMAC,

};

#endif







#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)

static const struct ieee80211_txrx_stypes

	wilc_wfi_cfg80211_mgmt_types[NL80211_IFTYPE_MAX] = {

	[NL80211_IFTYPE_STATION] = {
@@ -110,7 +105,7 @@ static const struct ieee80211_txrx_stypes 
			BIT(IEEE80211_STYPE_DEAUTH >> 4)

	}

};

#endif



/* Time to stay on the channel */

#define WILC_WFI_DWELL_PASSIVE 100

#define WILC_WFI_DWELL_ACTIVE  40

drivers/staging/wilc1000/wilc_wfi_netdevice.h

+0 −8
Original line number Diff line number Diff line
@@ -49,12 +49,7 @@ 
#include <asm/checksum.h>

#include "host_interface.h"

#include "wilc_wlan.h"

#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 30)

#include <net/wireless.h>

#else

#include <linux/wireless.h>     /* tony, 2013-06-12 */

#endif





#define FLOW_CONTROL_LOWER_THRESHOLD	128

#define FLOW_CONTROL_UPPER_THRESHOLD	256
@@ -163,9 +158,6 @@ struct WILC_WFI_priv { 
	tstrHostIFpmkidAttr pmkid_list;

	struct WILC_WFI_stats netstats;

	WILC_Uint8 WILC_WFI_wep_default;

#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)

#define WLAN_KEY_LEN_WEP104 13

#endif

	WILC_Uint8 WILC_WFI_wep_key[4][WLAN_KEY_LEN_WEP104];

	WILC_Uint8 WILC_WFI_wep_key_len[4];

	struct net_device *real_ndev;   /* The real interface that the monitor is on */