Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbe70751 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by Greg Kroah-Hartman
Browse files

staging: ath6kl: remove-typedef AR_VIRTUAL_INTERFACE_T 



remove-typedef -s AR_VIRTUAL_INTERFACE_T \
	"struct ar_virtual_interface" drivers/staging/ath6kl/

Cc: Naveen Singh <naveen.singh@atheros.com>
Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e6998a55

drivers/staging/ath6kl/os/linux/ar6000_drv.c

+6 −6
Original line number Diff line number Diff line
@@ -6402,10 +6402,10 @@ static void DoHTCSendPktsTest(AR_SOFTC_T *ar, int MapNo, HTC_ENDPOINT_ID eid, st 


int ar6000_start_ap_interface(AR_SOFTC_T *ar)

{

    AR_VIRTUAL_INTERFACE_T *arApDev;

    struct ar_virtual_interface *arApDev;



    /* Change net_device to point to AP instance */

    arApDev = (AR_VIRTUAL_INTERFACE_T *)ar->arApDev;

    arApDev = (struct ar_virtual_interface *)ar->arApDev;

    ar->arNetDev = arApDev->arNetDev;



    return 0;
@@ -6413,10 +6413,10 @@ int ar6000_start_ap_interface(AR_SOFTC_T *ar) 


int ar6000_stop_ap_interface(AR_SOFTC_T *ar)

{

    AR_VIRTUAL_INTERFACE_T *arApDev;

    struct ar_virtual_interface *arApDev;



    /* Change net_device to point to sta instance */

    arApDev = (AR_VIRTUAL_INTERFACE_T *)ar->arApDev;

    arApDev = (struct ar_virtual_interface *)ar->arApDev;

    if (arApDev) {

        ar->arNetDev = arApDev->arStaNetDev;

    }
@@ -6428,9 +6428,9 @@ int ar6000_stop_ap_interface(AR_SOFTC_T *ar) 
int ar6000_create_ap_interface(AR_SOFTC_T *ar, char *ap_ifname)

{

    struct net_device *dev;

    AR_VIRTUAL_INTERFACE_T *arApDev;

    struct ar_virtual_interface *arApDev;



    dev = alloc_etherdev(sizeof(AR_VIRTUAL_INTERFACE_T));

    dev = alloc_etherdev(sizeof(struct ar_virtual_interface));

    if (dev == NULL) {

        AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("ar6000_create_ap_interface: can't alloc etherdev\n"));

        return A_ERROR;

drivers/staging/ath6kl/os/linux/include/ar6000_drv.h

+3 −3
Original line number Diff line number Diff line
@@ -625,11 +625,11 @@ typedef struct ar6_softc { 
} AR_SOFTC_T;



#ifdef CONFIG_AP_VIRTUAL_ADAPTER_SUPPORT

typedef struct {

struct ar_virtual_interface {

    struct net_device       *arNetDev;    /* net_device pointer */

    AR_SOFTC_T              *arDev;       /* ar device pointer */

    struct net_device       *arStaNetDev; /* net_device pointer */

} AR_VIRTUAL_INTERFACE_T;

};

#endif /* CONFIG_AP_VIRTUAL_ADAPTER_SUPPORT */



#ifdef ATH6K_CONFIG_CFG80211
@@ -645,7 +645,7 @@ static inline void *ar6k_priv(struct net_device *dev) 


    if (arApNetDev == dev) {

        /* return arDev saved in virtual interface context */

        AR_VIRTUAL_INTERFACE_T *arVirDev;

        struct ar_virtual_interface *arVirDev;

        arVirDev = netdev_priv(dev);

        return arVirDev->arDev;   

    } else {