Skip to content

Commit

Permalink
staging: brcm80211: remove SOFTAP code from fullmac
Browse files Browse the repository at this point in the history
Dead code removal.

Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Franky Lin authored and Greg Kroah-Hartman committed Sep 16, 2011
1 parent c056998 commit e61a8fd
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 33 deletions.
12 changes: 0 additions & 12 deletions drivers/staging/brcm80211/brcmfmac/dhd.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
}
Expand Down
21 changes: 0 additions & 21 deletions drivers/staging/brcm80211/brcmfmac/dhd_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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;
Expand All @@ -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 */
}
}

Expand Down

0 comments on commit e61a8fd

Please sign in to comment.