diff options
| author | Franky Lin | 2011-09-01 11:17:09 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-09-07 01:38:52 +0200 |
| commit | debc71cd897b63880385e208e83714cb028e2177 (patch) | |
| tree | 744f9b57c9c0db0d754b5af89022877710b96371 /drivers/staging/brcm80211 | |
| parent | staging: brcm80211: remove static function declaration in bcmsdh_sdmmc (diff) | |
| download | kernel-qcow2-linux-debc71cd897b63880385e208e83714cb028e2177.tar.gz kernel-qcow2-linux-debc71cd897b63880385e208e83714cb028e2177.tar.xz kernel-qcow2-linux-debc71cd897b63880385e208e83714cb028e2177.zip | |
staging: brcm80211: remove static function declaration in dhd_linux
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>
Diffstat (limited to 'drivers/staging/brcm80211')
| -rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 40 |
1 files changed, 17 insertions, 23 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c index 46f75b7f7bef..7121b1658e95 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c @@ -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; @@ -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) { @@ -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); |