Staging: wlan-ng: Remove typedef hfa384x_t
PATCH 1/1 Staging: wlan-ng: Remove typedef hfa384x_t
Remove typedef hfa384x_t and replace its uses in the code using script.
Signed-off-by Vatika Harlalka <[email protected]>
--- drivers/staging/wlan-ng/hfa384x.h | 64 ++++++------ drivers/staging/wlan-ng/hfa384x_usb.c | 178 +++++++++++++++++----------------- drivers/staging/wlan-ng/prism2mgmt.c | 20 ++-- drivers/staging/wlan-ng/prism2mgmt.h | 4 +- drivers/staging/wlan-ng/prism2mib.c | 36 +++---- drivers/staging/wlan-ng/prism2sta.c | 40 ++++---- drivers/staging/wlan-ng/prism2usb.c | 8 +- 7 files changed, 175 insertions(+), 175 deletions(-)
drivers/staging/wlan-ng/hfa384x.h +32 -32
@@ -1218,7 +1218,7 @@ struct prism2sta_accesslist {u8 addr1[WLAN_ACCESS_MAX ][ETH_ALEN ]; }; -typedef struct hfa384x { +struct hfa384x {/* USB support data */ struct usb_device *usb;struct urb rx_urb;
@@ -1353,27 +1353,27 @@ typedef struct hfa384x {struct prism2sta_accesslist allow;/* Allowed station list. */ struct prism2sta_accesslist deny;/* Denied station list. */ -} hfa384x_t; +}; -void hfa384x_create (hfa384x_t *hw,struct usb_device *usb); -void hfa384x_destroy (hfa384x_t *hw); +void hfa384x_create (struct hfa384x *hw,struct usb_device *usb); +void hfa384x_destroy (struct hfa384x *hw);int -hfa384x_corereset (hfa384x_t *hw,int holdtime,int settletime,int genesis); -int hfa384x_drvr_commtallies (hfa384x_t *hw); -int hfa384x_drvr_disable (hfa384x_t *hw,u16 macport); -int hfa384x_drvr_enable (hfa384x_t *hw,u16 macport); -int hfa384x_drvr_flashdl_enable (hfa384x_t *hw); -int hfa384x_drvr_flashdl_disable (hfa384x_t *hw); -int hfa384x_drvr_flashdl_write (hfa384x_t *hw,u32 daddr,void *buf,u32 len); -int hfa384x_drvr_getconfig (hfa384x_t *hw,u16 rid,void *buf,u16 len); -int hfa384x_drvr_ramdl_enable (hfa384x_t *hw,u32 exeaddr); -int hfa384x_drvr_ramdl_disable (hfa384x_t *hw); -int hfa384x_drvr_ramdl_write (hfa384x_t *hw,u32 daddr,void *buf,u32 len); -int hfa384x_drvr_readpda (hfa384x_t *hw,void *buf,unsigned int len); -int hfa384x_drvr_setconfig (hfa384x_t *hw,u16 rid,void *buf,u16 len); - -static inline int hfa384x_drvr_getconfig16 (hfa384x_t *hw,u16 rid,void *val) +hfa384x_corereset (struct hfa384x *hw,int holdtime,int settletime,int genesis); +int hfa384x_drvr_commtallies (struct hfa384x *hw); +int hfa384x_drvr_disable (struct hfa384x *hw,u16 macport); +int hfa384x_drvr_enable (struct hfa384x *hw,u16 macport); +int hfa384x_drvr_flashdl_enable (struct hfa384x *hw); +int hfa384x_drvr_flashdl_disable (struct hfa384x *hw); +int hfa384x_drvr_flashdl_write (struct hfa384x *hw,u32 daddr,void *buf,u32 len); +int hfa384x_drvr_getconfig (struct hfa384x *hw,u16 rid,void *buf,u16 len); +int hfa384x_drvr_ramdl_enable (struct hfa384x *hw,u32 exeaddr); +int hfa384x_drvr_ramdl_disable (struct hfa384x *hw); +int hfa384x_drvr_ramdl_write (struct hfa384x *hw,u32 daddr,void *buf,u32 len); +int hfa384x_drvr_readpda (struct hfa384x *hw,void *buf,unsigned int len); +int hfa384x_drvr_setconfig (struct hfa384x *hw,u16 rid,void *buf,u16 len); + +static inline int hfa384x_drvr_getconfig16 (struct hfa384x *hw,u16 rid,void *val) {int result =0 ;
@@ -1383,7 +1383,7 @@ static inline int hfa384x_drvr_getconfig16(hfa384x_t *hw, u16 rid, void *val)return result; } -static inline int hfa384x_drvr_setconfig16 (hfa384x_t *hw,u16 rid,u16 val) +static inline int hfa384x_drvr_setconfig16 (struct hfa384x *hw,u16 rid,u16 val) {u16 value =cpu_to_le16 (val);
@@ -1391,17 +1391,17 @@ static inline int hfa384x_drvr_setconfig16(hfa384x_t *hw, u16 rid, u16 val) }int -hfa384x_drvr_getconfig_async (hfa384x_t *hw, +hfa384x_drvr_getconfig_async (struct hfa384x *hw,u16 rid,ctlx_usercb_t usercb,void *usercb_data);int -hfa384x_drvr_setconfig_async (hfa384x_t *hw, +hfa384x_drvr_setconfig_async (struct hfa384x *hw,u16 rid,void *buf,u16 len,ctlx_usercb_t usercb,void *usercb_data);static inline int -hfa384x_drvr_setconfig16_async (hfa384x_t *hw,u16 rid,u16 val) +hfa384x_drvr_setconfig16_async (struct hfa384x *hw,u16 rid,u16 val) {u16 value =cpu_to_le16 (val);
@@ -1409,20 +1409,20 @@ hfa384x_drvr_setconfig16_async(hfa384x_t *hw, u16 rid, u16 val) NULL, NULL); } -int hfa384x_drvr_start (hfa384x_t *hw); -int hfa384x_drvr_stop (hfa384x_t *hw); +int hfa384x_drvr_start (struct hfa384x *hw); +int hfa384x_drvr_stop (struct hfa384x *hw);int -hfa384x_drvr_txframe (hfa384x_t *hw,struct sk_buff *skb, +hfa384x_drvr_txframe (struct hfa384x *hw,struct sk_buff *skb,union p80211_hdr *p80211_hdr,struct p80211_metawep *p80211_wep);void hfa384x_tx_timeout (wlandevice_t *wlandev); -int hfa384x_cmd_initialize (hfa384x_t *hw); -int hfa384x_cmd_enable (hfa384x_t *hw,u16 macport); -int hfa384x_cmd_disable (hfa384x_t *hw,u16 macport); -int hfa384x_cmd_allocate (hfa384x_t *hw,u16 len); -int hfa384x_cmd_monitor (hfa384x_t *hw,u16 enable); +int hfa384x_cmd_initialize (struct hfa384x *hw); +int hfa384x_cmd_enable (struct hfa384x *hw,u16 macport); +int hfa384x_cmd_disable (struct hfa384x *hw,u16 macport); +int hfa384x_cmd_allocate (struct hfa384x *hw,u16 len); +int hfa384x_cmd_monitor (struct hfa384x *hw,u16 enable);int -hfa384x_cmd_download (hfa384x_t *hw, +hfa384x_cmd_download (struct hfa384x *hw,u16 mode,u16 lowaddr,u16 highaddr,u16 codelen);#endif /*__KERNEL__ */
drivers/staging/wlan-ng/hfa384x_usb.c +89 -89
682 lines not on this page · raw message
drivers/staging/wlan-ng/prism2mgmt.c +10 -10
@@ -116,7 +116,7 @@int prism2mgmt_scan (wlandevice_t *wlandev,void *msgp) {int result =0 ; -hfa384x_t *hw = wlandev->priv; +struct hfa384x *hw = wlandev->priv;struct p80211msg_dot11req_scan *msg = msgp;u16 roamingmode, word;int i, timeout;
@@ -370,7 +370,7 @@ int prism2mgmt_scan_results(wlandevice_t *wlandev, void *msgp) {int result =0 ;struct p80211msg_dot11req_scan_results *req; -hfa384x_t *hw = wlandev->priv; +struct hfa384x *hw = wlandev->priv;hfa384x_HScanResultSub_t *item =NULL ;int count;
@@ -528,7 +528,7 @@ exit:int prism2mgmt_start (wlandevice_t *wlandev,void *msgp) {int result =0 ; -hfa384x_t *hw = wlandev->priv; +struct hfa384x *hw = wlandev->priv;struct p80211msg_dot11req_start *msg = msgp;p80211pstrd_t *pstr;
@@ -710,7 +710,7 @@ done:----------------------------------------------------------------*/ int prism2mgmt_readpda (wlandevice_t *wlandev,void *msgp) { -hfa384x_t *hw = wlandev->priv; +struct hfa384x *hw = wlandev->priv;struct p80211msg_p2req_readpda *msg = msgp;int result;
@@ -776,7 +776,7 @@ int prism2mgmt_readpda(wlandevice_t *wlandev, void *msgp)----------------------------------------------------------------*/ int prism2mgmt_ramdl_state (wlandevice_t *wlandev,void *msgp) { -hfa384x_t *hw = wlandev->priv; +struct hfa384x *hw = wlandev->priv;struct p80211msg_p2req_ramdl_state *msg = msgp;if (wlandev->msdstate !=WLAN_MSD_FWLOAD ) {
@@ -831,7 +831,7 @@ int prism2mgmt_ramdl_state(wlandevice_t *wlandev, void *msgp)----------------------------------------------------------------*/ int prism2mgmt_ramdl_write (wlandevice_t *wlandev,void *msgp) { -hfa384x_t *hw = wlandev->priv; +struct hfa384x *hw = wlandev->priv;struct p80211msg_p2req_ramdl_write *msg = msgp;u32 addr;u32 len;
@@ -893,7 +893,7 @@ int prism2mgmt_ramdl_write(wlandevice_t *wlandev, void *msgp)int prism2mgmt_flashdl_state (wlandevice_t *wlandev,void *msgp) {int result =0 ; -hfa384x_t *hw = wlandev->priv; +struct hfa384x *hw = wlandev->priv;struct p80211msg_p2req_flashdl_state *msg = msgp;if (wlandev->msdstate !=WLAN_MSD_FWLOAD ) {
@@ -963,7 +963,7 @@ int prism2mgmt_flashdl_state(wlandevice_t *wlandev, void *msgp)----------------------------------------------------------------*/ int prism2mgmt_flashdl_write (wlandevice_t *wlandev,void *msgp) { -hfa384x_t *hw = wlandev->priv; +struct hfa384x *hw = wlandev->priv;struct p80211msg_p2req_flashdl_write *msg = msgp;u32 addr;u32 len;
@@ -1023,7 +1023,7 @@ int prism2mgmt_flashdl_write(wlandevice_t *wlandev, void *msgp)----------------------------------------------------------------*/ int prism2mgmt_autojoin (wlandevice_t *wlandev,void *msgp) { -hfa384x_t *hw = wlandev->priv; +struct hfa384x *hw = wlandev->priv;int result =0 ;u16 reg;u16 port_type;
@@ -1097,7 +1097,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)int result =0 ;struct p80211msg_lnxreq_wlansniff *msg = msgp; -hfa384x_t *hw = wlandev->priv; +struct hfa384x *hw = wlandev->priv;u16 word; msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
drivers/staging/wlan-ng/prism2mgmt.h +2 -2
@@ -98,10 +98,10 @@ void prism2mgmt_bytestr2pstr(struct hfa384x_bytestr *bytestr, p80211pstrd_t *pstr);/* functions to convert Group Addresses */ -void prism2mgmt_get_grpaddr (u32 did,p80211pstrd_t *pstr,hfa384x_t *priv); +void prism2mgmt_get_grpaddr (u32 did,p80211pstrd_t *pstr,struct hfa384x *priv);int prism2mgmt_set_grpaddr (u32 did,u8 *prism2buf,p80211pstrd_t *pstr, -hfa384x_t *priv); +struct hfa384x *priv);int prism2mgmt_get_grpaddr_index (u32 did);void prism2sta_processing_defer (struct work_struct *data);
drivers/staging/wlan-ng/prism2mib.c +18 -18
@@ -88,61 +88,61 @@ struct mibrec {int (*func)(struct mibrec *mib,int isget,wlandevice_t *wlandev, -hfa384x_t *hw, +struct hfa384x *hw,struct p80211msg_dot11req_mibset *msg,void *data); };static int prism2mib_bytearea2pstr (struct mibrec *mib,int isget,wlandevice_t *wlandev, -hfa384x_t *hw, +struct hfa384x *hw,struct p80211msg_dot11req_mibset *msg,void *data);static int prism2mib_uint32 (struct mibrec *mib,int isget,wlandevice_t *wlandev, -hfa384x_t *hw, +struct hfa384x *hw,struct p80211msg_dot11req_mibset *msg,void *data);static int prism2mib_flag (struct mibrec *mib,int isget,wlandevice_t *wlandev, -hfa384x_t *hw, +struct hfa384x *hw,struct p80211msg_dot11req_mibset *msg,void *data);static int prism2mib_wepdefaultkey (struct mibrec *mib,int isget,wlandevice_t *wlandev, -hfa384x_t *hw, +struct hfa384x *hw,struct p80211msg_dot11req_mibset *msg,void *data);static int prism2mib_privacyinvoked (struct mibrec *mib,int isget,wlandevice_t *wlandev, -hfa384x_t *hw, +struct hfa384x *hw,struct p80211msg_dot11req_mibset *msg,void *data);static int prism2mib_excludeunencrypted (struct mibrec *mib,int isget,wlandevice_t *wlandev, -hfa384x_t *hw, +struct hfa384x *hw,struct p80211msg_dot11req_mibset *msg,void *data);static int prism2mib_fragmentationthreshold (struct mibrec *mib,int isget,wlandevice_t *wlandev, -hfa384x_t *hw, +struct hfa384x *hw,struct p80211msg_dot11req_mibset *msg,void *data);static int prism2mib_priv (struct mibrec *mib,int isget,wlandevice_t *wlandev, -hfa384x_t *hw, +struct hfa384x *hw,struct p80211msg_dot11req_mibset *msg,void *data);static struct mibrec mibtab[] = {
@@ -259,7 +259,7 @@ static struct mibrec mibtab[] = {int prism2mgmt_mibset_mibget (wlandevice_t *wlandev,void *msgp) { -hfa384x_t *hw = wlandev->priv; +struct hfa384x *hw = wlandev->priv;int result, isget;struct mibrec *mib;
@@ -374,7 +374,7 @@ done:static int prism2mib_bytearea2pstr (struct mibrec *mib,int isget,wlandevice_t *wlandev, -hfa384x_t *hw, +struct hfa384x *hw,struct p80211msg_dot11req_mibset *msg,void *data) {
@@ -424,7 +424,7 @@ static int prism2mib_bytearea2pstr(struct mibrec *mib,static int prism2mib_uint32 (struct mibrec *mib,int isget,wlandevice_t *wlandev, -hfa384x_t *hw, +struct hfa384x *hw,struct p80211msg_dot11req_mibset *msg,void *data) {int result;
@@ -471,7 +471,7 @@ static int prism2mib_uint32(struct mibrec *mib,static int prism2mib_flag (struct mibrec *mib,int isget,wlandevice_t *wlandev, -hfa384x_t *hw, +struct hfa384x *hw,struct p80211msg_dot11req_mibset *msg,void *data) {int result;
@@ -528,7 +528,7 @@ static int prism2mib_flag(struct mibrec *mib,static int prism2mib_wepdefaultkey (struct mibrec *mib,int isget,wlandevice_t *wlandev, -hfa384x_t *hw, +struct hfa384x *hw,struct p80211msg_dot11req_mibset *msg,void *data) {
@@ -578,7 +578,7 @@ static int prism2mib_wepdefaultkey(struct mibrec *mib,static int prism2mib_privacyinvoked (struct mibrec *mib,int isget,wlandevice_t *wlandev, -hfa384x_t *hw, +struct hfa384x *hw,struct p80211msg_dot11req_mibset *msg,void *data) {
@@ -620,7 +620,7 @@ static int prism2mib_privacyinvoked(struct mibrec *mib,static int prism2mib_excludeunencrypted (struct mibrec *mib,int isget,wlandevice_t *wlandev, -hfa384x_t *hw, +struct hfa384x *hw,struct p80211msg_dot11req_mibset *msg,void *data) {
@@ -656,7 +656,7 @@ static int prism2mib_excludeunencrypted(struct mibrec *mib,static int prism2mib_fragmentationthreshold (struct mibrec *mib,int isget,wlandevice_t *wlandev, -hfa384x_t *hw, +struct hfa384x *hw,struct p80211msg_dot11req_mibset *msg,void *data) {
@@ -705,7 +705,7 @@ static int prism2mib_fragmentationthreshold(struct mibrec *mib,static int prism2mib_priv (struct mibrec *mib,int isget,wlandevice_t *wlandev, -hfa384x_t *hw, +struct hfa384x *hw,struct p80211msg_dot11req_mibset *msg,void *data) {p80211pstrd_t *pstr = (p80211pstrd_t *) data;
drivers/staging/wlan-ng/prism2sta.c +20 -20
@@ -241,7 +241,7 @@ static int prism2sta_txframe(wlandevice_t *wlandev, struct sk_buff *skb,union p80211_hdr *p80211_hdr, struct p80211_metawep *p80211_wep) { - hfa384x_t *hw = (hfa384x_t *) wlandev->priv; + struct hfa384x *hw = (struct hfa384x *) wlandev->priv;/* If necessary, set the 802.11 WEP bit */ if ((wlandev->hostwep & (HOSTWEP_PRIVACYINVOKED | HOSTWEP_ENCRYPT)) ==
@@ -278,7 +278,7 @@ static int prism2sta_txframe(wlandevice_t *wlandev, struct sk_buff *skb,----------------------------------------------------------------*/ static int prism2sta_mlmerequest (wlandevice_t *wlandev,struct p80211msg *msg) { -hfa384x_t *hw = (hfa384x_t *) wlandev->priv; +struct hfa384x *hw = (struct hfa384x *) wlandev->priv;int result =0 ;
@@ -408,7 +408,7 @@ static int prism2sta_mlmerequest(wlandevice_t *wlandev, struct p80211msg *msg)----------------------------------------------------------------*/ u32 prism2sta_ifstate (wlandevice_t *wlandev,u32 ifstate) { -hfa384x_t *hw = (hfa384x_t *) wlandev->priv; +struct hfa384x *hw = (struct hfa384x *) wlandev->priv;u32 result; result = P80211ENUM_resultcode_implementation_failure;
@@ -578,7 +578,7 @@ u32 prism2sta_ifstate(wlandevice_t *wlandev, u32 ifstate)static int prism2sta_getcardinfo (wlandevice_t *wlandev) {int result =0 ; -hfa384x_t *hw = (hfa384x_t *) wlandev->priv; +struct hfa384x *hw = (struct hfa384x *) wlandev->priv;u16 temp;u8 snum[HFA384x_RID_NICSERIALNUMBER_LEN];
@@ -899,7 +899,7 @@ done:----------------------------------------------------------------*/ static int prism2sta_globalsetup (wlandevice_t *wlandev) { -hfa384x_t *hw = (hfa384x_t *) wlandev->priv; +struct hfa384x *hw = (struct hfa384x *) wlandev->priv;/* Set the maximum frame size */ return hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFMAXDATALEN,
@@ -909,7 +909,7 @@ static int prism2sta_globalsetup(wlandevice_t *wlandev)static int prism2sta_setmulticast (wlandevice_t *wlandev,netdevice_t *dev) {int result =0 ; -hfa384x_t *hw = (hfa384x_t *) wlandev->priv; +struct hfa384x *hw = (struct hfa384x *) wlandev->priv;u16 promisc;
@@ -973,7 +973,7 @@ static void prism2sta_inf_handover(wlandevice_t *wlandev,static void prism2sta_inf_tallies (wlandevice_t *wlandev,hfa384x_InfFrame_t *inf) { -hfa384x_t *hw = (hfa384x_t *) wlandev->priv; +struct hfa384x *hw = (struct hfa384x *) wlandev->priv;u16 *src16;u32 *dst;u32 *src32;
@@ -1020,7 +1020,7 @@ static void prism2sta_inf_scanresults(wlandevice_t *wlandev, hfa384x_InfFrame_t *inf) { -hfa384x_t *hw = (hfa384x_t *) wlandev->priv; +struct hfa384x *hw = (struct hfa384x *) wlandev->priv;int nbss;hfa384x_ScanResult_t *sr = &(inf->info.scanresult);int i;
@@ -1075,7 +1075,7 @@ static void prism2sta_inf_scanresults(wlandevice_t *wlandev,static void prism2sta_inf_hostscanresults (wlandevice_t *wlandev,hfa384x_InfFrame_t *inf) { -hfa384x_t *hw = (hfa384x_t *) wlandev->priv; +struct hfa384x *hw = (struct hfa384x *) wlandev->priv;int nbss; nbss = (inf->framelen -3 ) /32 ;
@@ -1116,7 +1116,7 @@ static void prism2sta_inf_hostscanresults(wlandevice_t *wlandev,static void prism2sta_inf_chinforesults (wlandevice_t *wlandev,hfa384x_InfFrame_t *inf) { -hfa384x_t *hw = (hfa384x_t *) wlandev->priv; +struct hfa384x *hw = (struct hfa384x *) wlandev->priv;unsigned int i, n; hw->channel_info.results.scanchannels =
@@ -1158,7 +1158,7 @@ static void prism2sta_inf_chinforesults(wlandevice_t *wlandev,void prism2sta_processing_defer (struct work_struct *data) { - hfa384x_t *hw = container_of(data, struct hfa384x, link_bh); + struct hfa384x *hw = container_of(data, struct hfa384x, link_bh);wlandevice_t *wlandev = hw->wlandev;hfa384x_bytestr32_t ssid;int result;
@@ -1429,7 +1429,7 @@ void prism2sta_processing_defer(struct work_struct *data)static void prism2sta_inf_linkstatus (wlandevice_t *wlandev,hfa384x_InfFrame_t *inf) { -hfa384x_t *hw = (hfa384x_t *) wlandev->priv; +struct hfa384x *hw = (struct hfa384x *) wlandev->priv; hw->link_status_new =le16_to_cpu (inf->info.linkstatus.linkstatus);
@@ -1457,7 +1457,7 @@ static void prism2sta_inf_linkstatus(wlandevice_t *wlandev,static void prism2sta_inf_assocstatus (wlandevice_t *wlandev,hfa384x_InfFrame_t *inf) { -hfa384x_t *hw = (hfa384x_t *) wlandev->priv; +struct hfa384x *hw = (struct hfa384x *) wlandev->priv;hfa384x_AssocStatus_t rec;int i;
@@ -1518,7 +1518,7 @@ static void prism2sta_inf_assocstatus(wlandevice_t *wlandev,static void prism2sta_inf_authreq (wlandevice_t *wlandev,hfa384x_InfFrame_t *inf) { -hfa384x_t *hw = (hfa384x_t *) wlandev->priv; +struct hfa384x *hw = (struct hfa384x *) wlandev->priv;struct sk_buff *skb; skb =dev_alloc_skb (sizeof (*inf));
@@ -1533,7 +1533,7 @@ static void prism2sta_inf_authreq(wlandevice_t *wlandev,static void prism2sta_inf_authreq_defer (wlandevice_t *wlandev,hfa384x_InfFrame_t *inf) { -hfa384x_t *hw = (hfa384x_t *) wlandev->priv; +struct hfa384x *hw = (struct hfa384x *) wlandev->priv;hfa384x_authenticateStation_data_t rec;int i, added, result, cnt;
@@ -1706,7 +1706,7 @@ static void prism2sta_inf_authreq_defer(wlandevice_t *wlandev,static void prism2sta_inf_psusercnt (wlandevice_t *wlandev,hfa384x_InfFrame_t *inf) { -hfa384x_t *hw = (hfa384x_t *) wlandev->priv; +struct hfa384x *hw = (struct hfa384x *) wlandev->priv; hw->psusercount =le16_to_cpu (inf->info.psusercnt.usercnt); }
@@ -1887,11 +1887,11 @@ void prism2sta_ev_alloc(wlandevice_t *wlandev)static wlandevice_t *create_wlan (void ) {wlandevice_t *wlandev =NULL ; -hfa384x_t *hw =NULL ; +struct hfa384x *hw =NULL ;/* Alloc our structures */ wlandev =kzalloc (sizeof (wlandevice_t),GFP_KERNEL ); - hw =kzalloc (sizeof (hfa384x_t),GFP_KERNEL ); + hw =kzalloc (sizeof (struct hfa384x ),GFP_KERNEL );if (!wlandev || !hw) {pr_err ("%s: Memory allocation failure.\n" , dev_info);
@@ -1922,7 +1922,7 @@ static wlandevice_t *create_wlan(void)void prism2sta_commsqual_defer (struct work_struct *data) { - hfa384x_t *hw = container_of(data, struct hfa384x, commsqual_bh); + struct hfa384x *hw = container_of(data, struct hfa384x, commsqual_bh);wlandevice_t *wlandev = hw->wlandev;hfa384x_bytestr32_t ssid;struct p80211msg_dot11req_mibget msg;
@@ -2011,7 +2011,7 @@ void prism2sta_commsqual_defer(struct work_struct *data)void prism2sta_commsqual_timer (unsigned long data) { -hfa384x_t *hw = (hfa384x_t *) data; +struct hfa384x *hw = (struct hfa384x *) data;schedule_work (&hw->commsqual_bh); }
drivers/staging/wlan-ng/prism2usb.c +4 -4
@@ -62,7 +62,7 @@ static int prism2sta_probe_usb(struct usb_interface *interface,struct usb_device *dev;wlandevice_t *wlandev =NULL ; -hfa384x_t *hw =NULL ; +struct hfa384x *hw =NULL ;int result =0 ; dev =interface_to_usbdev (interface);
@@ -143,7 +143,7 @@ static void prism2sta_disconnect_usb(struct usb_interface *interface)struct list_head *temp;unsigned long flags; -hfa384x_t *hw = wlandev->priv; +struct hfa384x *hw = wlandev->priv;if (!hw) goto exit;
@@ -226,7 +226,7 @@ exit:static int prism2sta_suspend (struct usb_interface *interface,pm_message_t message) { -hfa384x_t *hw =NULL ; +struct hfa384x *hw =NULL ;wlandevice_t *wlandev; wlandev = (wlandevice_t *)usb_get_intfdata (interface);
@@ -249,7 +249,7 @@ static int prism2sta_suspend(struct usb_interface *interface,static int prism2sta_resume (struct usb_interface *interface) {int result =0 ; -hfa384x_t *hw =NULL ; +struct hfa384x *hw =NULL ;wlandevice_t *wlandev; wlandev = (wlandevice_t *)usb_get_intfdata (interface);
Signature · 1 line
1.9.1
Greg KH
maintainerQuoted 4 lines · Vatika Harlalka
Remove typedef
hfa384x_tand replace its uses in the code using script.Signed-off-by Vatika Harlalka <[email protected]>
Quoted 9 lines
--- drivers/staging/wlan-ng/hfa384x.h | 64 ++++++------ drivers/staging/wlan-ng/hfa384x_usb.c | 178 +++++++++++++++++----------------- drivers/staging/wlan-ng/prism2mgmt.c | 20 ++-- drivers/staging/wlan-ng/prism2mgmt.h | 4 +- drivers/staging/wlan-ng/prism2mib.c | 36 +++---- drivers/staging/wlan-ng/prism2sta.c | 40 ++++---- drivers/staging/wlan-ng/prism2usb.c | 8 +- 7 files changed, 175 insertions(+), 175 deletions(-)
This still doesn't apply :(
Hi Greg
I have done git fetch and git rebase so I'm not sure why this still does not apply.
Could you suggest some other reason?
Thanks :)
Greg KH
maintainerQuoted 5 lines · Vatika Harlalka
Hi Greg
I have done git fetch and git rebase so I'm not sure why this still does not apply.
Could you suggest some other reason?
Thanks :)
No idea, sorry, try emailing it to yourself and if it doesn't apply that way, look at why it doesn't apply. "force" patch it and fix up the pieces manually and then diff that diff against your original diff (messy, and complex, but it will work.) If that doesn't make sense, I really don't know what to suggest, sorry.
greg k-h
Hi Greg
I refreshed my branch against yours and successfully applied the patch with git apply. To double check, I also cloned the repo again and applied it there as well and applied it there again and it was not giving me any error.
I have attached the patch that I used for this checking.
Kindly guide me as to what could be the possible reasons for this? Thanks :)
From b50c4a4fe89fdb0ca7c0c5f8f891388b30d955c6 Mon Sep 17 00:00:00 2001
From: Vatika Harlalka <[email protected]>
Date: Fri, 27 Mar 2015 12:29:21 +0530
Subject: [PATCH] Staging: wlan-ng: typedef
Signed-off-by Vatika Harlalka <[email protected]>
--- drivers/staging/wlan-ng/hfa384x.h | 64 ++++++------ drivers/staging/wlan-ng/hfa384x_usb.c | 178 +++++++++++++++++----------------- drivers/staging/wlan-ng/prism2mgmt.c | 20 ++-- drivers/staging/wlan-ng/prism2mgmt.h | 4 +- drivers/staging/wlan-ng/prism2mib.c | 36 +++---- drivers/staging/wlan-ng/prism2sta.c | 40 ++++---- drivers/staging/wlan-ng/prism2usb.c | 8 +- 7 files changed, 175 insertions(+), 175 deletions(-)
drivers/staging/wlan-ng/hfa384x.h +32 -32
@@ -1218,7 +1218,7 @@ struct prism2sta_accesslist {u8 addr1[WLAN_ACCESS_MAX ][ETH_ALEN ]; }; -typedef struct hfa384x { +struct hfa384x {/* USB support data */ struct usb_device *usb;struct urb rx_urb;
@@ -1353,27 +1353,27 @@ typedef struct hfa384x {struct prism2sta_accesslist allow;/* Allowed station list. */ struct prism2sta_accesslist deny;/* Denied station list. */ -} hfa384x_t; +}; -void hfa384x_create (hfa384x_t *hw,struct usb_device *usb); -void hfa384x_destroy (hfa384x_t *hw); +void hfa384x_create (struct hfa384x *hw,struct usb_device *usb); +void hfa384x_destroy (struct hfa384x *hw);int -hfa384x_corereset (hfa384x_t *hw,int holdtime,int settletime,int genesis); -int hfa384x_drvr_commtallies (hfa384x_t *hw); -int hfa384x_drvr_disable (hfa384x_t *hw,u16 macport); -int hfa384x_drvr_enable (hfa384x_t *hw,u16 macport); -int hfa384x_drvr_flashdl_enable (hfa384x_t *hw); -int hfa384x_drvr_flashdl_disable (hfa384x_t *hw); -int hfa384x_drvr_flashdl_write (hfa384x_t *hw,u32 daddr,void *buf,u32 len); -int hfa384x_drvr_getconfig (hfa384x_t *hw,u16 rid,void *buf,u16 len); -int hfa384x_drvr_ramdl_enable (hfa384x_t *hw,u32 exeaddr); -int hfa384x_drvr_ramdl_disable (hfa384x_t *hw); -int hfa384x_drvr_ramdl_write (hfa384x_t *hw,u32 daddr,void *buf,u32 len); -int hfa384x_drvr_readpda (hfa384x_t *hw,void *buf,unsigned int len); -int hfa384x_drvr_setconfig (hfa384x_t *hw,u16 rid,void *buf,u16 len); - -static inline int hfa384x_drvr_getconfig16 (hfa384x_t *hw,u16 rid,void *val) +hfa384x_corereset (struct hfa384x *hw,int holdtime,int settletime,int genesis); +int hfa384x_drvr_commtallies (struct hfa384x *hw); +int hfa384x_drvr_disable (struct hfa384x *hw,u16 macport); +int hfa384x_drvr_enable (struct hfa384x *hw,u16 macport); +int hfa384x_drvr_flashdl_enable (struct hfa384x *hw); +int hfa384x_drvr_flashdl_disable (struct hfa384x *hw); +int hfa384x_drvr_flashdl_write (struct hfa384x *hw,u32 daddr,void *buf,u32 len); +int hfa384x_drvr_getconfig (struct hfa384x *hw,u16 rid,void *buf,u16 len); +int hfa384x_drvr_ramdl_enable (struct hfa384x *hw,u32 exeaddr); +int hfa384x_drvr_ramdl_disable (struct hfa384x *hw); +int hfa384x_drvr_ramdl_write (struct hfa384x *hw,u32 daddr,void *buf,u32 len); +int hfa384x_drvr_readpda (struct hfa384x *hw,void *buf,unsigned int len); +int hfa384x_drvr_setconfig (struct hfa384x *hw,u16 rid,void *buf,u16 len); + +static inline int hfa384x_drvr_getconfig16 (struct hfa384x *hw,u16 rid,void *val) {int result =0 ;
@@ -1383,7 +1383,7 @@ static inline int hfa384x_drvr_getconfig16(hfa384x_t *hw, u16 rid, void *val)return result; } -static inline int hfa384x_drvr_setconfig16 (hfa384x_t *hw,u16 rid,u16 val) +static inline int hfa384x_drvr_setconfig16 (struct hfa384x *hw,u16 rid,u16 val) {u16 value =cpu_to_le16 (val);
@@ -1391,17 +1391,17 @@ static inline int hfa384x_drvr_setconfig16(hfa384x_t *hw, u16 rid, u16 val) }int -hfa384x_drvr_getconfig_async (hfa384x_t *hw, +hfa384x_drvr_getconfig_async (struct hfa384x *hw,u16 rid,ctlx_usercb_t usercb,void *usercb_data);int -hfa384x_drvr_setconfig_async (hfa384x_t *hw, +hfa384x_drvr_setconfig_async (struct hfa384x *hw,u16 rid,void *buf,u16 len,ctlx_usercb_t usercb,void *usercb_data);static inline int -hfa384x_drvr_setconfig16_async (hfa384x_t *hw,u16 rid,u16 val) +hfa384x_drvr_setconfig16_async (struct hfa384x *hw,u16 rid,u16 val) {u16 value =cpu_to_le16 (val);
@@ -1409,21 +1409,21 @@ hfa384x_drvr_setconfig16_async(hfa384x_t *hw, u16 rid, u16 val) NULL, NULL); } -int hfa384x_drvr_start (hfa384x_t *hw); -int hfa384x_drvr_stop (hfa384x_t *hw); +int hfa384x_drvr_start (struct hfa384x *hw); +int hfa384x_drvr_stop (struct hfa384x *hw);int -hfa384x_drvr_txframe (hfa384x_t *hw,struct sk_buff *skb, +hfa384x_drvr_txframe (struct hfa384x *hw,struct sk_buff *skb,union p80211_hdr *p80211_hdr,struct p80211_metawep *p80211_wep);void hfa384x_tx_timeout (wlandevice_t *wlandev); -int hfa384x_cmd_initialize (hfa384x_t *hw); -int hfa384x_cmd_enable (hfa384x_t *hw,u16 macport); -int hfa384x_cmd_disable (hfa384x_t *hw,u16 macport); -int hfa384x_cmd_allocate (hfa384x_t *hw,u16 len); -int hfa384x_cmd_monitor (hfa384x_t *hw,u16 enable); +int hfa384x_cmd_initialize (struct hfa384x *hw); +int hfa384x_cmd_enable (struct hfa384x *hw,u16 macport); +int hfa384x_cmd_disable (struct hfa384x *hw,u16 macport); +int hfa384x_cmd_allocate (struct hfa384x *hw,u16 len); +int hfa384x_cmd_monitor (struct hfa384x *hw,u16 enable);int -hfa384x_cmd_download (hfa384x_t *hw, +hfa384x_cmd_download (struct hfa384x *hw,u16 mode,u16 lowaddr,u16 highaddr,u16 codelen);#endif /*__KERNEL__ */
drivers/staging/wlan-ng/hfa384x_usb.c +89 -89
682 lines not on this page · raw message
drivers/staging/wlan-ng/prism2mgmt.c +10 -10
@@ -116,7 +116,7 @@int prism2mgmt_scan (wlandevice_t *wlandev,void *msgp) {int result =0 ; -hfa384x_t *hw = wlandev->priv; +struct hfa384x *hw = wlandev->priv;struct p80211msg_dot11req_scan *msg = msgp;u16 roamingmode, word;int i, timeout;
@@ -370,7 +370,7 @@ int prism2mgmt_scan_results(wlandevice_t *wlandev, void *msgp) {int result =0 ;struct p80211msg_dot11req_scan_results *req; -hfa384x_t *hw = wlandev->priv; +struct hfa384x *hw = wlandev->priv;hfa384x_HScanResultSub_t *item =NULL ;int count;
@@ -528,7 +528,7 @@ exit:int prism2mgmt_start (wlandevice_t *wlandev,void *msgp) {int result =0 ; -hfa384x_t *hw = wlandev->priv; +struct hfa384x *hw = wlandev->priv;struct p80211msg_dot11req_start *msg = msgp;p80211pstrd_t *pstr;
@@ -710,7 +710,7 @@ done:----------------------------------------------------------------*/ int prism2mgmt_readpda (wlandevice_t *wlandev,void *msgp) { -hfa384x_t *hw = wlandev->priv; +struct hfa384x *hw = wlandev->priv;struct p80211msg_p2req_readpda *msg = msgp;int result;
@@ -776,7 +776,7 @@ int prism2mgmt_readpda(wlandevice_t *wlandev, void *msgp)----------------------------------------------------------------*/ int prism2mgmt_ramdl_state (wlandevice_t *wlandev,void *msgp) { -hfa384x_t *hw = wlandev->priv; +struct hfa384x *hw = wlandev->priv;struct p80211msg_p2req_ramdl_state *msg = msgp;if (wlandev->msdstate !=WLAN_MSD_FWLOAD ) {
@@ -831,7 +831,7 @@ int prism2mgmt_ramdl_state(wlandevice_t *wlandev, void *msgp)----------------------------------------------------------------*/ int prism2mgmt_ramdl_write (wlandevice_t *wlandev,void *msgp) { -hfa384x_t *hw = wlandev->priv; +struct hfa384x *hw = wlandev->priv;struct p80211msg_p2req_ramdl_write *msg = msgp;u32 addr;u32 len;
@@ -893,7 +893,7 @@ int prism2mgmt_ramdl_write(wlandevice_t *wlandev, void *msgp)int prism2mgmt_flashdl_state (wlandevice_t *wlandev,void *msgp) {int result =0 ; -hfa384x_t *hw = wlandev->priv; +struct hfa384x *hw = wlandev->priv;struct p80211msg_p2req_flashdl_state *msg = msgp;if (wlandev->msdstate !=WLAN_MSD_FWLOAD ) {
@@ -963,7 +963,7 @@ int prism2mgmt_flashdl_state(wlandevice_t *wlandev, void *msgp)----------------------------------------------------------------*/ int prism2mgmt_flashdl_write (wlandevice_t *wlandev,void *msgp) { -hfa384x_t *hw = wlandev->priv; +struct hfa384x *hw = wlandev->priv;struct p80211msg_p2req_flashdl_write *msg = msgp;u32 addr;u32 len;
@@ -1023,7 +1023,7 @@ int prism2mgmt_flashdl_write(wlandevice_t *wlandev, void *msgp)----------------------------------------------------------------*/ int prism2mgmt_autojoin (wlandevice_t *wlandev,void *msgp) { -hfa384x_t *hw = wlandev->priv; +struct hfa384x *hw = wlandev->priv;int result =0 ;u16 reg;u16 port_type;
@@ -1097,7 +1097,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)int result =0 ;struct p80211msg_lnxreq_wlansniff *msg = msgp; -hfa384x_t *hw = wlandev->priv; +struct hfa384x *hw = wlandev->priv;u16 word; msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
drivers/staging/wlan-ng/prism2mgmt.h +2 -2
@@ -98,10 +98,10 @@ void prism2mgmt_bytestr2pstr(struct hfa384x_bytestr *bytestr, p80211pstrd_t *pstr);/* functions to convert Group Addresses */ -void prism2mgmt_get_grpaddr (u32 did,p80211pstrd_t *pstr,hfa384x_t *priv); +void prism2mgmt_get_grpaddr (u32 did,p80211pstrd_t *pstr,struct hfa384x *priv);int prism2mgmt_set_grpaddr (u32 did,u8 *prism2buf,p80211pstrd_t *pstr, -hfa384x_t *priv); +struct hfa384x *priv);int prism2mgmt_get_grpaddr_index (u32 did);void prism2sta_processing_defer (struct work_struct *data);
drivers/staging/wlan-ng/prism2mib.c +18 -18
@@ -88,61 +88,61 @@ struct mibrec {int (*func)(struct mibrec *mib,int isget,wlandevice_t *wlandev, -hfa384x_t *hw, +struct hfa384x *hw,struct p80211msg_dot11req_mibset *msg,void *data); };static int prism2mib_bytearea2pstr (struct mibrec *mib,int isget,wlandevice_t *wlandev, -hfa384x_t *hw, +struct hfa384x *hw,struct p80211msg_dot11req_mibset *msg,void *data);static int prism2mib_uint32 (struct mibrec *mib,int isget,wlandevice_t *wlandev, -hfa384x_t *hw, +struct hfa384x *hw,struct p80211msg_dot11req_mibset *msg,void *data);static int prism2mib_flag (struct mibrec *mib,int isget,wlandevice_t *wlandev, -hfa384x_t *hw, +struct hfa384x *hw,struct p80211msg_dot11req_mibset *msg,void *data);static int prism2mib_wepdefaultkey (struct mibrec *mib,int isget,wlandevice_t *wlandev, -hfa384x_t *hw, +struct hfa384x *hw,struct p80211msg_dot11req_mibset *msg,void *data);static int prism2mib_privacyinvoked (struct mibrec *mib,int isget,wlandevice_t *wlandev, -hfa384x_t *hw, +struct hfa384x *hw,struct p80211msg_dot11req_mibset *msg,void *data);static int prism2mib_excludeunencrypted (struct mibrec *mib,int isget,wlandevice_t *wlandev, -hfa384x_t *hw, +struct hfa384x *hw,struct p80211msg_dot11req_mibset *msg,void *data);static int prism2mib_fragmentationthreshold (struct mibrec *mib,int isget,wlandevice_t *wlandev, -hfa384x_t *hw, +struct hfa384x *hw,struct p80211msg_dot11req_mibset *msg,void *data);static int prism2mib_priv (struct mibrec *mib,int isget,wlandevice_t *wlandev, -hfa384x_t *hw, +struct hfa384x *hw,struct p80211msg_dot11req_mibset *msg,void *data);static struct mibrec mibtab[] = {
@@ -259,7 +259,7 @@ static struct mibrec mibtab[] = {int prism2mgmt_mibset_mibget (wlandevice_t *wlandev,void *msgp) { -hfa384x_t *hw = wlandev->priv; +struct hfa384x *hw = wlandev->priv;int result, isget;struct mibrec *mib;
@@ -374,7 +374,7 @@ done:static int prism2mib_bytearea2pstr (struct mibrec *mib,int isget,wlandevice_t *wlandev, -hfa384x_t *hw, +struct hfa384x *hw,struct p80211msg_dot11req_mibset *msg,void *data) {
@@ -424,7 +424,7 @@ static int prism2mib_bytearea2pstr(struct mibrec *mib,static int prism2mib_uint32 (struct mibrec *mib,int isget,wlandevice_t *wlandev, -hfa384x_t *hw, +struct hfa384x *hw,struct p80211msg_dot11req_mibset *msg,void *data) {int result;
@@ -471,7 +471,7 @@ static int prism2mib_uint32(struct mibrec *mib,static int prism2mib_flag (struct mibrec *mib,int isget,wlandevice_t *wlandev, -hfa384x_t *hw, +struct hfa384x *hw,struct p80211msg_dot11req_mibset *msg,void *data) {int result;
@@ -528,7 +528,7 @@ static int prism2mib_flag(struct mibrec *mib,static int prism2mib_wepdefaultkey (struct mibrec *mib,int isget,wlandevice_t *wlandev, -hfa384x_t *hw, +struct hfa384x *hw,struct p80211msg_dot11req_mibset *msg,void *data) {
@@ -578,7 +578,7 @@ static int prism2mib_wepdefaultkey(struct mibrec *mib,static int prism2mib_privacyinvoked (struct mibrec *mib,int isget,wlandevice_t *wlandev, -hfa384x_t *hw, +struct hfa384x *hw,struct p80211msg_dot11req_mibset *msg,void *data) {
@@ -620,7 +620,7 @@ static int prism2mib_privacyinvoked(struct mibrec *mib,static int prism2mib_excludeunencrypted (struct mibrec *mib,int isget,wlandevice_t *wlandev, -hfa384x_t *hw, +struct hfa384x *hw,struct p80211msg_dot11req_mibset *msg,void *data) {
@@ -656,7 +656,7 @@ static int prism2mib_excludeunencrypted(struct mibrec *mib,static int prism2mib_fragmentationthreshold (struct mibrec *mib,int isget,wlandevice_t *wlandev, -hfa384x_t *hw, +struct hfa384x *hw,struct p80211msg_dot11req_mibset *msg,void *data) {
@@ -705,7 +705,7 @@ static int prism2mib_fragmentationthreshold(struct mibrec *mib,static int prism2mib_priv (struct mibrec *mib,int isget,wlandevice_t *wlandev, -hfa384x_t *hw, +struct hfa384x *hw,struct p80211msg_dot11req_mibset *msg,void *data) {p80211pstrd_t *pstr = (p80211pstrd_t *) data;
drivers/staging/wlan-ng/prism2sta.c +20 -20
@@ -242,7 +242,7 @@ static int prism2sta_txframe(wlandevice_t *wlandev, struct sk_buff *skb,union p80211_hdr *p80211_hdr, struct p80211_metawep *p80211_wep) { - hfa384x_t *hw = (hfa384x_t *) wlandev->priv; + struct hfa384x *hw = (struct hfa384x *) wlandev->priv;/* If necessary, set the 802.11 WEP bit */ if ((wlandev->hostwep & (HOSTWEP_PRIVACYINVOKED | HOSTWEP_ENCRYPT)) ==
@@ -279,7 +279,7 @@ static int prism2sta_txframe(wlandevice_t *wlandev, struct sk_buff *skb,----------------------------------------------------------------*/ static int prism2sta_mlmerequest (wlandevice_t *wlandev,struct p80211msg *msg) { -hfa384x_t *hw = (hfa384x_t *) wlandev->priv; +struct hfa384x *hw = (struct hfa384x *) wlandev->priv;int result =0 ;
@@ -409,7 +409,7 @@ static int prism2sta_mlmerequest(wlandevice_t *wlandev, struct p80211msg *msg)----------------------------------------------------------------*/ u32 prism2sta_ifstate (wlandevice_t *wlandev,u32 ifstate) { -hfa384x_t *hw = (hfa384x_t *) wlandev->priv; +struct hfa384x *hw = (struct hfa384x *) wlandev->priv;u32 result; result = P80211ENUM_resultcode_implementation_failure;
@@ -579,7 +579,7 @@ u32 prism2sta_ifstate(wlandevice_t *wlandev, u32 ifstate)static int prism2sta_getcardinfo (wlandevice_t *wlandev) {int result =0 ; -hfa384x_t *hw = (hfa384x_t *) wlandev->priv; +struct hfa384x *hw = (struct hfa384x *) wlandev->priv;u16 temp;u8 snum[HFA384x_RID_NICSERIALNUMBER_LEN];
@@ -900,7 +900,7 @@ done:----------------------------------------------------------------*/ static int prism2sta_globalsetup (wlandevice_t *wlandev) { -hfa384x_t *hw = (hfa384x_t *) wlandev->priv; +struct hfa384x *hw = (struct hfa384x *) wlandev->priv;/* Set the maximum frame size */ return hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFMAXDATALEN,
@@ -910,7 +910,7 @@ static int prism2sta_globalsetup(wlandevice_t *wlandev)static int prism2sta_setmulticast (wlandevice_t *wlandev,netdevice_t *dev) {int result =0 ; -hfa384x_t *hw = (hfa384x_t *) wlandev->priv; +struct hfa384x *hw = (struct hfa384x *) wlandev->priv;u16 promisc;
@@ -974,7 +974,7 @@ static void prism2sta_inf_handover(wlandevice_t *wlandev,static void prism2sta_inf_tallies (wlandevice_t *wlandev,hfa384x_InfFrame_t *inf) { -hfa384x_t *hw = (hfa384x_t *) wlandev->priv; +struct hfa384x *hw = (struct hfa384x *) wlandev->priv;u16 *src16;u32 *dst;u32 *src32;
@@ -1021,7 +1021,7 @@ static void prism2sta_inf_scanresults(wlandevice_t *wlandev, hfa384x_InfFrame_t *inf) { -hfa384x_t *hw = (hfa384x_t *) wlandev->priv; +struct hfa384x *hw = (struct hfa384x *) wlandev->priv;int nbss;hfa384x_ScanResult_t *sr = &(inf->info.scanresult);int i;
@@ -1076,7 +1076,7 @@ static void prism2sta_inf_scanresults(wlandevice_t *wlandev,static void prism2sta_inf_hostscanresults (wlandevice_t *wlandev,hfa384x_InfFrame_t *inf) { -hfa384x_t *hw = (hfa384x_t *) wlandev->priv; +struct hfa384x *hw = (struct hfa384x *) wlandev->priv;int nbss; nbss = (inf->framelen -3 ) /32 ;
@@ -1117,7 +1117,7 @@ static void prism2sta_inf_hostscanresults(wlandevice_t *wlandev,static void prism2sta_inf_chinforesults (wlandevice_t *wlandev,hfa384x_InfFrame_t *inf) { -hfa384x_t *hw = (hfa384x_t *) wlandev->priv; +struct hfa384x *hw = (struct hfa384x *) wlandev->priv;unsigned int i, n; hw->channel_info.results.scanchannels =
@@ -1159,7 +1159,7 @@ static void prism2sta_inf_chinforesults(wlandevice_t *wlandev,void prism2sta_processing_defer (struct work_struct *data) { - hfa384x_t *hw = container_of(data, struct hfa384x, link_bh); + struct hfa384x *hw = container_of(data, struct hfa384x, link_bh);wlandevice_t *wlandev = hw->wlandev;hfa384x_bytestr32_t ssid;int result;
@@ -1430,7 +1430,7 @@ void prism2sta_processing_defer(struct work_struct *data)static void prism2sta_inf_linkstatus (wlandevice_t *wlandev,hfa384x_InfFrame_t *inf) { -hfa384x_t *hw = (hfa384x_t *) wlandev->priv; +struct hfa384x *hw = (struct hfa384x *) wlandev->priv; hw->link_status_new =le16_to_cpu (inf->info.linkstatus.linkstatus);
@@ -1458,7 +1458,7 @@ static void prism2sta_inf_linkstatus(wlandevice_t *wlandev,static void prism2sta_inf_assocstatus (wlandevice_t *wlandev,hfa384x_InfFrame_t *inf) { -hfa384x_t *hw = (hfa384x_t *) wlandev->priv; +struct hfa384x *hw = (struct hfa384x *) wlandev->priv;hfa384x_AssocStatus_t rec;int i;
@@ -1519,7 +1519,7 @@ static void prism2sta_inf_assocstatus(wlandevice_t *wlandev,static void prism2sta_inf_authreq (wlandevice_t *wlandev,hfa384x_InfFrame_t *inf) { -hfa384x_t *hw = (hfa384x_t *) wlandev->priv; +struct hfa384x *hw = (struct hfa384x *) wlandev->priv;struct sk_buff *skb; skb =dev_alloc_skb (sizeof (*inf));
@@ -1534,7 +1534,7 @@ static void prism2sta_inf_authreq(wlandevice_t *wlandev,static void prism2sta_inf_authreq_defer (wlandevice_t *wlandev,hfa384x_InfFrame_t *inf) { -hfa384x_t *hw = (hfa384x_t *) wlandev->priv; +struct hfa384x *hw = (struct hfa384x *) wlandev->priv;hfa384x_authenticateStation_data_t rec;int i, added, result, cnt;
@@ -1707,7 +1707,7 @@ static void prism2sta_inf_authreq_defer(wlandevice_t *wlandev,static void prism2sta_inf_psusercnt (wlandevice_t *wlandev,hfa384x_InfFrame_t *inf) { -hfa384x_t *hw = (hfa384x_t *) wlandev->priv; +struct hfa384x *hw = (struct hfa384x *) wlandev->priv; hw->psusercount =le16_to_cpu (inf->info.psusercnt.usercnt); }
@@ -1888,11 +1888,11 @@ void prism2sta_ev_alloc(wlandevice_t *wlandev)static wlandevice_t *create_wlan (void ) {wlandevice_t *wlandev =NULL ; -hfa384x_t *hw =NULL ; +struct hfa384x *hw =NULL ;/* Alloc our structures */ wlandev =kzalloc (sizeof (wlandevice_t),GFP_KERNEL ); - hw =kzalloc (sizeof (hfa384x_t),GFP_KERNEL ); + hw =kzalloc (sizeof (struct hfa384x ),GFP_KERNEL );if (!wlandev || !hw) {pr_err ("%s: Memory allocation failure.\n" , dev_info);
@@ -1923,7 +1923,7 @@ static wlandevice_t *create_wlan(void)void prism2sta_commsqual_defer (struct work_struct *data) { - hfa384x_t *hw = container_of(data, struct hfa384x, commsqual_bh); + struct hfa384x *hw = container_of(data, struct hfa384x, commsqual_bh);wlandevice_t *wlandev = hw->wlandev;hfa384x_bytestr32_t ssid;struct p80211msg_dot11req_mibget msg;
@@ -2012,7 +2012,7 @@ void prism2sta_commsqual_defer(struct work_struct *data)void prism2sta_commsqual_timer (unsigned long data) { -hfa384x_t *hw = (hfa384x_t *) data; +struct hfa384x *hw = (struct hfa384x *) data;schedule_work (&hw->commsqual_bh); }
drivers/staging/wlan-ng/prism2usb.c +4 -4
@@ -62,7 +62,7 @@ static int prism2sta_probe_usb(struct usb_interface *interface,struct usb_device *dev;wlandevice_t *wlandev =NULL ; -hfa384x_t *hw =NULL ; +struct hfa384x *hw =NULL ;int result =0 ; dev =interface_to_usbdev (interface);
@@ -143,7 +143,7 @@ static void prism2sta_disconnect_usb(struct usb_interface *interface)struct list_head *temp;unsigned long flags; -hfa384x_t *hw = wlandev->priv; +struct hfa384x *hw = wlandev->priv;if (!hw) goto exit;
@@ -226,7 +226,7 @@ exit:static int prism2sta_suspend (struct usb_interface *interface,pm_message_t message) { -hfa384x_t *hw =NULL ; +struct hfa384x *hw =NULL ;wlandevice_t *wlandev; wlandev = (wlandevice_t *)usb_get_intfdata (interface);
@@ -249,7 +249,7 @@ static int prism2sta_suspend(struct usb_interface *interface,static int prism2sta_resume (struct usb_interface *interface) {int result =0 ; -hfa384x_t *hw =NULL ; +struct hfa384x *hw =NULL ;wlandevice_t *wlandev; wlandev = (wlandevice_t *)usb_get_intfdata (interface);
Signature · 1 line
1.9.1
Greg KH
maintainerQuoted 11 lines · Vatika Harlalka
Hi Greg
I refreshed my branch against yours and successfully applied the patch with git apply. To double check, I also cloned the repo again and applied it there as well and applied it there again and it was not giving me any error.
I have attached the patch that I used for this checking.Kindly guide me as to what could be the possible reasons for this? Thanks :)
Quoted 6 lines
From
b50c4a4fe89fdb0ca7c0c5f8f891388b30d955c6Mon Sep 17 00:00:00 2001
From: Vatika Harlalka <[email protected]>
Date: Fri, 27 Mar 2015 12:29:21 +0530
Subject: [PATCH] Staging: wlan-ng: typedefSigned-off-by Vatika Harlalka <[email protected]>
This patch worked, as an attachment. I don't know, try sending it again, I can't take it like this (hint, no changelog, wrong subject, etc.)
thanks,
greg k-h