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

Commit e61a8fd5 authored by Franky Lin's avatar Franky Lin Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: remove SOFTAP code from fullmac 



Dead code removal.

Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c0569981

drivers/staging/brcm80211/brcmfmac/dhd.h

+0 −12
Original line number Diff line number Diff line
@@ -707,18 +707,6 @@ static inline void MUTEX_UNLOCK(struct brcmf_pub *drvr) 
{

}



static inline void MUTEX_LOCK_SOFTAP_SET_INIT(struct brcmf_pub *drvr)

{

}



static inline void MUTEX_LOCK_SOFTAP_SET(struct brcmf_pub *drvr)

{

}



static inline void MUTEX_UNLOCK_SOFTAP_SET(struct brcmf_pub *drvr)

{

}



static inline void MUTEX_LOCK_WL_SCAN_SET_INIT(void)

{

}

drivers/staging/brcm80211/brcmfmac/dhd_linux.c

+0 −21
Original line number Diff line number Diff line
@@ -314,10 +314,6 @@ _brcmf_set_mac_address(struct brcmf_info *drvr_priv, int ifidx, u8 *addr) 
	return ret;

}



#ifdef SOFTAP

static struct net_device *ap_net_dev;

#endif



/* Virtual interfaces only ((ifp && ifp->info && ifp->idx == true) */

static void brcmf_op_if(struct brcmf_if *ifp)

{
@@ -357,18 +353,6 @@ static void brcmf_op_if(struct brcmf_if *ifp) 
					  err);

				ret = -EOPNOTSUPP;

			} else {

#ifdef SOFTAP

				/* semaphore that the soft AP CODE

					 waits on */

				struct semaphore ap_eth_sema;



				/* save ptr to wl0.1 netdev for use

					 in wl_iw.c  */

				ap_net_dev = ifp->net;

				/* signal to the SOFTAP 'sleeper' thread,

					 wl0.1 is ready */

				up(&ap_eth_sema);

#endif

				brcmf_dbg(TRACE, " ==== pid:%x, net_device for if:%s created ===\n",

					  current->pid, ifp->net->name);

				ifp->state = 0;
@@ -395,11 +379,6 @@ static void brcmf_op_if(struct brcmf_if *ifp) 


		drvr_priv->iflist[ifp->idx] = NULL;

		kfree(ifp);

#ifdef SOFTAP

		if (ifp->net == ap_net_dev)

			ap_net_dev = NULL;	/*  NULL  SOFTAP global

							 wl0.1 as well */

#endif				/*  SOFTAP */

	}

}