Commit 83a27326 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Greg Kroah-Hartman
Browse files

Staging: vt6655: remove PRIVATE_OBJ ifdefs 



Cc: Forest Bond <forest@alittletooquiet.net>
Cc: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b8bc58c5

drivers/staging/vt6655/desc.h

+0 −9
Original line number Diff line number Diff line
@@ -41,12 +41,6 @@ 
#if !defined(__TETHER_H__)

#include "tether.h"

#endif

// #ifdef PRIVATE_OBJ

//#if !defined(__DEVICE_MODULE_H)

//#include "device_module.h"

//#endif









/*---------------------  Export Definitions -------------------------*/
@@ -237,9 +231,6 @@ 


typedef struct tagDEVICE_RD_INFO {

    struct sk_buff* skb;

#ifdef PRIVATE_OBJ

    ref_sk_buff ref_skb;

#endif

    dma_addr_t  skb_dma;

    dma_addr_t  curr_desc;

} DEVICE_RD_INFO,   *PDEVICE_RD_INFO;

drivers/staging/vt6655/device.h

+0 −92
Original line number Diff line number Diff line
@@ -137,11 +137,6 @@ 
//#define	TASK_LET

//PLICE_DEBUG<-



// #ifdef PRIVATE_OBJ

//#if !defined(__DEVICE_MODULE_H)

//#include "device_module.h"

//#endif





/*---------------------  Export Definitions -------------------------*/
@@ -203,93 +198,9 @@ 




// BUILD OBJ mode

#ifdef PRIVATE_OBJ



#undef dev_kfree_skb

#undef dev_kfree_skb_irq

#undef dev_alloc_skb

#undef kfree

#undef del_timer

#undef init_timer

#undef add_timer

#undef kmalloc

#undef netif_stop_queue

#undef netif_start_queue

#undef netif_wake_queue

#undef netif_queue_stopped

#undef netif_rx

#undef netif_running

#undef udelay

#undef mdelay

#undef eth_type_trans

#undef skb_put

#undef HZ

#undef RUN_AT

#undef pci_alloc_consistent

#undef pci_free_consistent

#undef register_netdevice

#undef register_netdev

#undef unregister_netdevice

#undef unregister_netdev

#undef skb_queue_head_init

#undef skb_queue_tail

#undef skb_queue_empty

#undef free_irq

#undef copy_from_user

#undef copy_to_user

#undef spin_lock_init

#undef pci_map_single

#undef pci_unmap_single



// redefine kernel dependent fucntion

#define dev_kfree_skb       ref_dev_kfree_skb

#define dev_kfree_skb_irq   ref_dev_kfree_skb_irq

#define dev_alloc_skb       ref_dev_alloc_skb

#define kfree               ref_kfree

#define del_timer           ref_del_timer

#define init_timer          ref_init_timer

#define add_timer           ref_add_timer

#define kmalloc             ref_kmalloc

#define netif_stop_queue    ref_netif_stop_queue

#define netif_start_queue   ref_netif_start_queue

#define netif_wake_queue    ref_netif_wake_queue

#define netif_queue_stopped ref_netif_queue_stopped

#define netif_rx            ref_netif_rx

#define netif_running       ref_netif_running

#define udelay              ref_udelay

#define mdelay              ref_mdelay

#define get_jiffies()       ref_get_jiffies()

#define RUN_AT(x)           (get_jiffies()+(x))

#define HZ                  ref_HZ_tick()

#define eth_type_trans      ref_eth_type_trans

#define skb_put             ref_skb_put

#define skb_queue_head_init ref_skb_queue_head_init

#define skb_queue_tail      ref_skb_queue_tail

#define skb_queue_empty     ref_skb_queue_empty



#define pci_alloc_consistent    ref_pci_alloc_consistent

#define pci_free_consistent     ref_pci_free_consistent

#define register_netdevice      ref_register_netdevice

#define register_netdev         ref_register_netdev

#define unregister_netdevice    ref_unregister_netdevice

#define unregister_netdev       ref_unregister_netdev



#define free_irq                ref_free_irq

#define copy_from_user          ref_copy_from_user

#define copy_to_user            ref_copy_to_user

#define spin_lock_init          ref_spin_lock_init

#define pci_map_single          ref_pci_map_single

#define pci_unmap_single        ref_pci_unmap_single

#endif





#ifdef PRIVATE_OBJ

#undef  printk

#define DEVICE_PRT(l, p, args...) {if (l<=msglevel) do {} while (0);}

//#define DEVICE_PRT(l, p, args...) {if (l<=msglevel) printk( p ,##args);}

#else

#define DEVICE_PRT(l, p, args...) {if (l<=msglevel) printk( p ,##args);}

#endif





#define	AVAIL_TD(p,q)	((p)->sOpts.nTxDescs[(q)]-((p)->iTDUsed[(q)]))
@@ -452,9 +363,6 @@ typedef struct tagSDeFragControlBlock 
    BYTE            abyAddr2[U_ETHER_ADDR_LEN];

	UINT            uLifetime;

    struct sk_buff* skb;

#ifdef PRIVATE_OBJ

    ref_sk_buff     ref_skb;

#endif

    PBYTE           pbyRxBuffer;

    UINT            cbFrameLength;

    BOOL            bInUse;

drivers/staging/vt6655/device_main.c

+0 −268

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/vt6655/dpc.c

+0 −106

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/vt6655/hostap.c

+0 −29
Original line number Diff line number Diff line
@@ -106,25 +106,6 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked) 


    DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);



#ifdef PRIVATE_OBJ

    pDevice->apdev = ref_init_apdev(dev);



    if (pDevice->apdev == NULL)

		return -ENOMEM;



	if (rtnl_locked)

		ret = register_netdevice(pDevice->apdev);

	else

		ret = register_netdev(pDevice->apdev);

	if (ret) {

		DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: register_netdevice(AP) failed!\n",

		       dev->name);

		return -1;

	}

    DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Registered netdevice %s for AP management\n",

	       dev->name, pDevice->apdev->name);



#else

    pDevice->apdev = (struct net_device *)kmalloc(sizeof(struct net_device), GFP_KERNEL);

	if (pDevice->apdev == NULL)

		return -ENOMEM;
@@ -160,7 +141,6 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked) 
	       dev->name, pDevice->apdev->name);



    KeyvInitTable(&pDevice->sKey, pDevice->PortOffset);

#endif



	return 0;

}
@@ -308,11 +288,7 @@ static int hostap_add_sta(PSDevice pDevice, 
            WLAN_GET_CAP_INFO_SHORTPREAMBLE(pMgmt->sNodeDBTable[uNodeIndex].wCapInfo);



    pMgmt->sNodeDBTable[uNodeIndex].wAID = (WORD)param->u.add_sta.aid;

#ifdef PRIVATE_OBJ

    pMgmt->sNodeDBTable[uNodeIndex].ulLastRxJiffer = get_jiffies();

#else

    pMgmt->sNodeDBTable[uNodeIndex].ulLastRxJiffer = jiffies;

#endif

    DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Add STA AID= %d \n", pMgmt->sNodeDBTable[uNodeIndex].wAID);

    DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "MAC=%2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X \n",

               param->sta_addr[0],
@@ -349,13 +325,8 @@ static int hostap_get_info_sta(PSDevice pDevice, 
	UINT uNodeIndex;



    if (BSSDBbIsSTAInNodeDB(pMgmt, param->sta_addr, &uNodeIndex)) {

#ifdef PRIVATE_OBJ

	    param->u.get_info_sta.inactive_sec =

	        (get_jiffies() - pMgmt->sNodeDBTable[uNodeIndex].ulLastRxJiffer) / HZ;

#else

	    param->u.get_info_sta.inactive_sec =

	        (jiffies - pMgmt->sNodeDBTable[uNodeIndex].ulLastRxJiffer) / HZ;

#endif

	    //param->u.get_info_sta.txexc = pMgmt->sNodeDBTable[uNodeIndex].uTxAttempts;

	}

	else {

CRA Git | Maintained and supported by SUSTech CRA and CCSE