redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

brcmfmac: rename structure brcmf_cfg80211_priv

Browse source 
Renamed structure to brcmf_cfg80211_info as it is not really a
private structure since it is exposed in header file.

Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Arend van Spriel 2012-09-27 14:17:55 +02:00 committed by John W. Linville
parent 1a87334239
commit 27a68fe391
3 changed files with 610 additions and 611 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/wireless/brcm80211/brcmfmac/dhd.h
View file

@ -614,7 +614,7 @@ struct brcmf_pub {
/* Linkage ponters */ /* Linkage ponters */
struct brcmf_bus *bus_if; struct brcmf_bus *bus_if;
struct brcmf_proto *prot; struct brcmf_proto *prot;
struct brcmf_cfg80211_priv *config; struct brcmf_cfg80211_info *config;
struct device *dev; /* fullmac dongle device pointer */ struct device *dev; /* fullmac dongle device pointer */
/* Internal brcmf items */ /* Internal brcmf items */

1183
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
View file

File diff suppressed because it is too large Load diff

36
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
View file

@ -176,11 +176,11 @@ struct brcmf_cfg80211_conf {
}; };
/* forward declaration */ /* forward declaration */
struct brcmf_cfg80211_priv; struct brcmf_cfg80211_info;
/* cfg80211 main event loop */ /* cfg80211 main event loop */
struct brcmf_cfg80211_event_loop { struct brcmf_cfg80211_event_loop {
s32(*handler[BRCMF_E_LAST]) (struct brcmf_cfg80211_priv *cfg_priv, s32(*handler[BRCMF_E_LAST]) (struct brcmf_cfg80211_info *cfg,
struct net_device *ndev, struct net_device *ndev,
const struct brcmf_event_msg *e, const struct brcmf_event_msg *e,
void *data); void *data);
@ -238,7 +238,7 @@ struct brcmf_cfg80211_profile {
/* dongle iscan event loop */ /* dongle iscan event loop */
struct brcmf_cfg80211_iscan_eloop { struct brcmf_cfg80211_iscan_eloop {
s32 (*handler[WL_SCAN_ERSULTS_LAST]) s32 (*handler[WL_SCAN_ERSULTS_LAST])
(struct brcmf_cfg80211_priv *cfg_priv); (struct brcmf_cfg80211_info *cfg);
}; };
/* dongle iscan controller */ /* dongle iscan controller */
@ -381,7 +381,7 @@ struct brcmf_pno_scanresults_le {
}; };
/** /**
* struct brcmf_cfg80211_priv - dongle private data of cfg80211 interface * struct brcmf_cfg80211_info - dongle private data of cfg80211 interface
* *
* @wdev: representing wl cfg80211 device. * @wdev: representing wl cfg80211 device.
* @conf: dongle configuration. * @conf: dongle configuration.
@ -424,7 +424,7 @@ struct brcmf_pno_scanresults_le {
* @ap_info: host ap information. * @ap_info: host ap information.
* @ci: used to link this structure to netdev private data. * @ci: used to link this structure to netdev private data.
*/ */
struct brcmf_cfg80211_priv { struct brcmf_cfg80211_info {
struct wireless_dev *wdev; struct wireless_dev *wdev;
struct brcmf_cfg80211_conf *conf; struct brcmf_cfg80211_conf *conf;
struct cfg80211_scan_request *scan_request; struct cfg80211_scan_request *scan_request;
@ -466,49 +466,49 @@ struct brcmf_cfg80211_priv {
struct ap_info *ap_info; struct ap_info *ap_info;
}; };
static inline struct wiphy *cfg_to_wiphy(struct brcmf_cfg80211_priv *w) static inline struct wiphy *cfg_to_wiphy(struct brcmf_cfg80211_info *w)
{ {
return w->wdev->wiphy; return w->wdev->wiphy;
} }
static inline struct brcmf_cfg80211_priv *wiphy_to_cfg(struct wiphy *w) static inline struct brcmf_cfg80211_info *wiphy_to_cfg(struct wiphy *w)
{ {
return (struct brcmf_cfg80211_priv *)(wiphy_priv(w)); return (struct brcmf_cfg80211_info *)(wiphy_priv(w));
} }
static inline struct brcmf_cfg80211_priv *wdev_to_cfg(struct wireless_dev *wd) static inline struct brcmf_cfg80211_info *wdev_to_cfg(struct wireless_dev *wd)
{ {
return (struct brcmf_cfg80211_priv *)(wdev_priv(wd)); return (struct brcmf_cfg80211_info *)(wdev_priv(wd));
} }
static inline struct net_device *cfg_to_ndev(struct brcmf_cfg80211_priv *cfg) static inline struct net_device *cfg_to_ndev(struct brcmf_cfg80211_info *cfg)
{ {
return cfg->wdev->netdev; return cfg->wdev->netdev;
} }
static inline struct brcmf_cfg80211_priv *ndev_to_cfg(struct net_device *ndev) static inline struct brcmf_cfg80211_info *ndev_to_cfg(struct net_device *ndev)
{ {
return wdev_to_cfg(ndev->ieee80211_ptr); return wdev_to_cfg(ndev->ieee80211_ptr);
} }
#define iscan_to_cfg(i) ((struct brcmf_cfg80211_priv *)(i->data)) #define iscan_to_cfg(i) ((struct brcmf_cfg80211_info *)(i->data))
#define cfg_to_iscan(w) (w->iscan) #define cfg_to_iscan(w) (w->iscan)
static inline struct static inline struct
brcmf_cfg80211_connect_info *cfg_to_conn(struct brcmf_cfg80211_priv *cfg) brcmf_cfg80211_connect_info *cfg_to_conn(struct brcmf_cfg80211_info *cfg)
{ {
return &cfg->conn_info; return &cfg->conn_info;
} }
struct brcmf_cfg80211_priv *brcmf_cfg80211_attach(struct net_device *ndev, struct brcmf_cfg80211_info *brcmf_cfg80211_attach(struct net_device *ndev,
struct device *busdev, struct device *busdev,
struct brcmf_pub *drvr); struct brcmf_pub *drvr);
void brcmf_cfg80211_detach(struct brcmf_cfg80211_priv *cfg_priv); void brcmf_cfg80211_detach(struct brcmf_cfg80211_info *cfg);
/* event handler from dongle */ /* event handler from dongle */
void brcmf_cfg80211_event(struct net_device *ndev, void brcmf_cfg80211_event(struct net_device *ndev,
const struct brcmf_event_msg *e, void *data); const struct brcmf_event_msg *e, void *data);
s32 brcmf_cfg80211_up(struct brcmf_cfg80211_priv *cfg_priv); s32 brcmf_cfg80211_up(struct brcmf_cfg80211_info *cfg);
s32 brcmf_cfg80211_down(struct brcmf_cfg80211_priv *cfg_priv); s32 brcmf_cfg80211_down(struct brcmf_cfg80211_info *cfg);
#endif /* _wl_cfg80211_h_ */ #endif /* _wl_cfg80211_h_ */