Skip to content

Commit

Permalink
staging: brcm80211: remove static function declaration in dhd_linux
Browse files Browse the repository at this point in the history
Reshuffle function order in dhd_linux of fullmac to get rid of
static function declaration

Reported-by: Johannes Berg <johannes@sipsolutions.net>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Franky Lin authored and Greg Kroah-Hartman committed Sep 6, 2011
1 parent bc4fbda commit debc71c
Showing 1 changed file with 17 additions and 23 deletions.
40 changes: 17 additions & 23 deletions drivers/staging/brcm80211/brcmfmac/dhd_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,6 @@ uint brcmf_radio_up = 1;
char iface_name[IFNAMSIZ] = "wlan";
module_param_string(iface_name, iface_name, IFNAMSIZ, 0);

static int brcmf_toe_get(struct brcmf_info *drvr_priv, int idx, u32 *toe_ol);
static int brcmf_toe_set(struct brcmf_info *drvr_priv, int idx, u32 toe_ol);
static int brcmf_host_event(struct brcmf_info *drvr_priv, int *ifidx,
void *pktdata, struct brcmf_event_msg *event_ptr,
void **data_ptr);

static int brcmf_net2idx(struct brcmf_info *drvr_priv, struct net_device *net)
{
int i = 0;
Expand Down Expand Up @@ -600,6 +594,23 @@ void brcmf_txflowcontrol(struct brcmf_pub *drvr, int ifidx, bool state)
netif_wake_queue(net);
}

static int brcmf_host_event(struct brcmf_info *drvr_priv, int *ifidx,
void *pktdata, struct brcmf_event_msg *event,
void **data)
{
int bcmerror = 0;

bcmerror = brcmf_c_host_event(drvr_priv, ifidx, pktdata, event, data);
if (bcmerror != 0)
return bcmerror;

if (drvr_priv->iflist[*ifidx]->net)
brcmf_cfg80211_event(drvr_priv->iflist[*ifidx]->net,
event, *data);

return bcmerror;
}

void brcmf_rx_frame(struct brcmf_pub *drvr, int ifidx, struct sk_buff *skb,
int numpkt)
{
Expand Down Expand Up @@ -1483,23 +1494,6 @@ int brcmf_os_proto_unblock(struct brcmf_pub *drvr)
return 0;
}

static int brcmf_host_event(struct brcmf_info *drvr_priv, int *ifidx,
void *pktdata, struct brcmf_event_msg *event,
void **data)
{
int bcmerror = 0;

bcmerror = brcmf_c_host_event(drvr_priv, ifidx, pktdata, event, data);
if (bcmerror != 0)
return bcmerror;

if (drvr_priv->iflist[*ifidx]->net)
brcmf_cfg80211_event(drvr_priv->iflist[*ifidx]->net,
event, *data);

return bcmerror;
}

int brcmf_netdev_reset(struct net_device *dev, u8 flag)
{
struct brcmf_info *drvr_priv = *(struct brcmf_info **)netdev_priv(dev);
Expand Down

0 comments on commit debc71c

Please sign in to comment.