aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin McKinney <klmckinney1@gmail.com>2012-05-26 12:05:12 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-05 00:09:22 -0400
commit2979460d7aba1dac3452edcacd7b8c4cfcf06067 (patch)
treeae4bf3f4c6ca495fd89a78717c5cb557889fff07
parentff352042ebb8f3823fb3725bc2356f6a60ce20df (diff)
Staging: bcm: Remove typedef for _MINI_ADAPTER and call directly.
This patch removes typedef for _MINI_ADAPTER, changes the name of the struct from _MINI_ADAPTER to bcm_mini_adapter. In addition, any calls to the following typedefs "MINI_ADAPTER, *PMINI_ADAPTER" are changed to call the struct directly. Signed-off-by: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat
-rw-r--r--drivers/staging/bcm/Adapter.h13
-rw-r--r--drivers/staging/bcm/Bcmchar.c12
-rw-r--r--drivers/staging/bcm/Bcmnet.c18
-rw-r--r--drivers/staging/bcm/CmHost.c50
-rw-r--r--drivers/staging/bcm/CmHost.h10
-rw-r--r--drivers/staging/bcm/DDRInit.c4
-rw-r--r--drivers/staging/bcm/DDRInit.h4
-rw-r--r--drivers/staging/bcm/HandleControlPacket.c6
-rw-r--r--drivers/staging/bcm/IPv6Protocol.c16
-rw-r--r--drivers/staging/bcm/IPv6ProtocolHdr.h2
-rw-r--r--drivers/staging/bcm/InterfaceAdapter.h2
-rw-r--r--drivers/staging/bcm/InterfaceDld.c14
-rw-r--r--drivers/staging/bcm/InterfaceIdleMode.c12
-rw-r--r--drivers/staging/bcm/InterfaceIdleMode.h10
-rw-r--r--drivers/staging/bcm/InterfaceInit.c8
-rw-r--r--drivers/staging/bcm/InterfaceIsr.c2
-rw-r--r--drivers/staging/bcm/InterfaceIsr.h4
-rw-r--r--drivers/staging/bcm/InterfaceMisc.c2
-rw-r--r--drivers/staging/bcm/InterfaceMisc.h2
-rw-r--r--drivers/staging/bcm/InterfaceRx.c6
-rw-r--r--drivers/staging/bcm/InterfaceTx.c4
-rw-r--r--drivers/staging/bcm/LeakyBucket.c10
-rw-r--r--drivers/staging/bcm/Misc.c88
-rw-r--r--drivers/staging/bcm/PHSModule.c38
-rw-r--r--drivers/staging/bcm/PHSModule.h6
-rw-r--r--drivers/staging/bcm/Prototypes.h160
-rw-r--r--drivers/staging/bcm/Qos.c42
-rw-r--r--drivers/staging/bcm/Transmit.c8
-rw-r--r--drivers/staging/bcm/hostmibs.c4
-rw-r--r--drivers/staging/bcm/led_control.c22
-rw-r--r--drivers/staging/bcm/nvm.c204
-rw-r--r--drivers/staging/bcm/sort.c4
-rw-r--r--drivers/staging/bcm/vendorspecificextn.c6
-rw-r--r--drivers/staging/bcm/vendorspecificextn.h6
34 files changed, 399 insertions, 400 deletions
diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index f269daa2d52d..11d2c5a84552 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -192,7 +192,7 @@ struct bcm_packet_info {
192 192
193struct bcm_tarang_data { 193struct bcm_tarang_data {
194 struct bcm_tarang_data *next; 194 struct bcm_tarang_data *next;
195 struct _MINI_ADAPTER *Adapter; 195 struct bcm_mini_adapter *Adapter;
196 struct sk_buff *RxAppControlHead; 196 struct sk_buff *RxAppControlHead;
197 struct sk_buff *RxAppControlTail; 197 struct sk_buff *RxAppControlTail;
198 int AppCtrlQueueLen; 198 int AppCtrlQueueLen;
@@ -208,15 +208,15 @@ struct bcm_targetdsx_buffer {
208 BOOLEAN valid; 208 BOOLEAN valid;
209}; 209};
210 210
211typedef int (*FP_FLASH_WRITE)(struct _MINI_ADAPTER *, UINT, PVOID); 211typedef int (*FP_FLASH_WRITE)(struct bcm_mini_adapter *, UINT, PVOID);
212 212
213typedef int (*FP_FLASH_WRITE_STATUS)(struct _MINI_ADAPTER *, UINT, PVOID); 213typedef int (*FP_FLASH_WRITE_STATUS)(struct bcm_mini_adapter *, UINT, PVOID);
214 214
215/* 215/*
216 * Driver adapter data structure 216 * Driver adapter data structure
217 */ 217 */
218struct _MINI_ADAPTER { 218struct bcm_mini_adapter {
219 struct _MINI_ADAPTER *next; 219 struct bcm_mini_adapter *next;
220 struct net_device *dev; 220 struct net_device *dev;
221 u32 msg_enable; 221 u32 msg_enable;
222 CHAR *caDsxReqResp; 222 CHAR *caDsxReqResp;
@@ -394,7 +394,6 @@ struct _MINI_ADAPTER {
394 UINT gpioBitMap; 394 UINT gpioBitMap;
395 S_BCM_DEBUG_STATE stDebugState; 395 S_BCM_DEBUG_STATE stDebugState;
396}; 396};
397typedef struct _MINI_ADAPTER MINI_ADAPTER, *PMINI_ADAPTER;
398 397
399#define GET_BCM_ADAPTER(net_dev) netdev_priv(net_dev) 398#define GET_BCM_ADAPTER(net_dev) netdev_priv(net_dev)
400 399
@@ -417,7 +416,7 @@ struct bcm_ddr_setting {
417 UINT ulRegAddress; 416 UINT ulRegAddress;
418 UINT ulRegValue; 417 UINT ulRegValue;
419}; 418};
420int InitAdapter(PMINI_ADAPTER psAdapter); 419int InitAdapter(struct bcm_mini_adapter *psAdapter);
421 420
422/* ===================================================================== 421/* =====================================================================
423 * Beceem vendor request codes for EP0 422 * Beceem vendor request codes for EP0
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index d1dc0c3852ab..cf411d1706b1 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -15,7 +15,7 @@
15 15
16static int bcm_char_open(struct inode *inode, struct file * filp) 16static int bcm_char_open(struct inode *inode, struct file * filp)
17{ 17{
18 PMINI_ADAPTER Adapter = NULL; 18 struct bcm_mini_adapter *Adapter = NULL;
19 struct bcm_tarang_data *pTarang = NULL; 19 struct bcm_tarang_data *pTarang = NULL;
20 20
21 Adapter = GET_BCM_ADAPTER(gblpnetdev); 21 Adapter = GET_BCM_ADAPTER(gblpnetdev);
@@ -44,7 +44,7 @@ static int bcm_char_open(struct inode *inode, struct file * filp)
44static int bcm_char_release(struct inode *inode, struct file *filp) 44static int bcm_char_release(struct inode *inode, struct file *filp)
45{ 45{
46 struct bcm_tarang_data *pTarang, *tmp, *ptmp; 46 struct bcm_tarang_data *pTarang, *tmp, *ptmp;
47 PMINI_ADAPTER Adapter = NULL; 47 struct bcm_mini_adapter *Adapter = NULL;
48 struct sk_buff *pkt, *npkt; 48 struct sk_buff *pkt, *npkt;
49 49
50 pTarang = (struct bcm_tarang_data *)filp->private_data; 50 pTarang = (struct bcm_tarang_data *)filp->private_data;
@@ -98,7 +98,7 @@ static ssize_t bcm_char_read(struct file *filp, char __user *buf, size_t size,
98 loff_t *f_pos) 98 loff_t *f_pos)
99{ 99{
100 struct bcm_tarang_data *pTarang = filp->private_data; 100 struct bcm_tarang_data *pTarang = filp->private_data;
101 PMINI_ADAPTER Adapter = pTarang->Adapter; 101 struct bcm_mini_adapter *Adapter = pTarang->Adapter;
102 struct sk_buff *Packet = NULL; 102 struct sk_buff *Packet = NULL;
103 ssize_t PktLen = 0; 103 ssize_t PktLen = 0;
104 int wait_ret_val = 0; 104 int wait_ret_val = 0;
@@ -157,7 +157,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
157{ 157{
158 struct bcm_tarang_data *pTarang = filp->private_data; 158 struct bcm_tarang_data *pTarang = filp->private_data;
159 void __user *argp = (void __user *)arg; 159 void __user *argp = (void __user *)arg;
160 PMINI_ADAPTER Adapter = pTarang->Adapter; 160 struct bcm_mini_adapter *Adapter = pTarang->Adapter;
161 INT Status = STATUS_FAILURE; 161 INT Status = STATUS_FAILURE;
162 int timeout = 0; 162 int timeout = 0;
163 IOCTL_BUFFER IoBuffer; 163 IOCTL_BUFFER IoBuffer;
@@ -2014,7 +2014,7 @@ static const struct file_operations bcm_fops = {
2014 .llseek = no_llseek, 2014 .llseek = no_llseek,
2015}; 2015};
2016 2016
2017int register_control_device_interface(PMINI_ADAPTER Adapter) 2017int register_control_device_interface(struct bcm_mini_adapter *Adapter)
2018{ 2018{
2019 2019
2020 if (Adapter->major > 0) 2020 if (Adapter->major > 0)
@@ -2039,7 +2039,7 @@ int register_control_device_interface(PMINI_ADAPTER Adapter)
2039 return 0; 2039 return 0;
2040} 2040}
2041 2041
2042void unregister_control_device_interface(PMINI_ADAPTER Adapter) 2042void unregister_control_device_interface(struct bcm_mini_adapter *Adapter)
2043{ 2043{
2044 if (Adapter->major > 0) { 2044 if (Adapter->major > 0) {
2045 device_destroy(bcm_class, MKDEV(Adapter->major, 0)); 2045 device_destroy(bcm_class, MKDEV(Adapter->major, 0));
diff --git a/drivers/staging/bcm/Bcmnet.c b/drivers/staging/bcm/Bcmnet.c
index 133e146a3dd4..6e8c7f523214 100644
--- a/drivers/staging/bcm/Bcmnet.c
+++ b/drivers/staging/bcm/Bcmnet.c
@@ -4,7 +4,7 @@ struct net_device *gblpnetdev;
4 4
5static INT bcm_open(struct net_device *dev) 5static INT bcm_open(struct net_device *dev)
6{ 6{
7 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(dev); 7 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(dev);
8 8
9 if (Adapter->fw_download_done == FALSE) { 9 if (Adapter->fw_download_done == FALSE) {
10 pr_notice(PFX "%s: link up failed (download in progress)\n", 10 pr_notice(PFX "%s: link up failed (download in progress)\n",
@@ -28,7 +28,7 @@ static INT bcm_open(struct net_device *dev)
28 28
29static INT bcm_close(struct net_device *dev) 29static INT bcm_close(struct net_device *dev)
30{ 30{
31 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(dev); 31 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(dev);
32 32
33 if (netif_msg_ifdown(Adapter)) 33 if (netif_msg_ifdown(Adapter))
34 pr_info(PFX "%s: disabling interface\n", dev->name); 34 pr_info(PFX "%s: disabling interface\n", dev->name);
@@ -59,7 +59,7 @@ static u16 bcm_select_queue(struct net_device *dev, struct sk_buff *skb)
59 59
60static netdev_tx_t bcm_transmit(struct sk_buff *skb, struct net_device *dev) 60static netdev_tx_t bcm_transmit(struct sk_buff *skb, struct net_device *dev)
61{ 61{
62 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(dev); 62 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(dev);
63 u16 qindex = skb_get_queue_mapping(skb); 63 u16 qindex = skb_get_queue_mapping(skb);
64 64
65 65
@@ -141,7 +141,7 @@ static int bcm_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
141static void bcm_get_drvinfo(struct net_device *dev, 141static void bcm_get_drvinfo(struct net_device *dev,
142 struct ethtool_drvinfo *info) 142 struct ethtool_drvinfo *info)
143{ 143{
144 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(dev); 144 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(dev);
145 PS_INTERFACE_ADAPTER psIntfAdapter = Adapter->pvInterfaceAdapter; 145 PS_INTERFACE_ADAPTER psIntfAdapter = Adapter->pvInterfaceAdapter;
146 struct usb_device *udev = interface_to_usbdev(psIntfAdapter->interface); 146 struct usb_device *udev = interface_to_usbdev(psIntfAdapter->interface);
147 147
@@ -156,21 +156,21 @@ static void bcm_get_drvinfo(struct net_device *dev,
156 156
157static u32 bcm_get_link(struct net_device *dev) 157static u32 bcm_get_link(struct net_device *dev)
158{ 158{
159 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(dev); 159 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(dev);
160 160
161 return Adapter->LinkUpStatus; 161 return Adapter->LinkUpStatus;
162} 162}
163 163
164static u32 bcm_get_msglevel(struct net_device *dev) 164static u32 bcm_get_msglevel(struct net_device *dev)
165{ 165{
166 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(dev); 166 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(dev);
167 167
168 return Adapter->msg_enable; 168 return Adapter->msg_enable;
169} 169}
170 170
171static void bcm_set_msglevel(struct net_device *dev, u32 level) 171static void bcm_set_msglevel(struct net_device *dev, u32 level)
172{ 172{
173 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(dev); 173 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(dev);
174 174
175 Adapter->msg_enable = level; 175 Adapter->msg_enable = level;
176} 176}
@@ -183,7 +183,7 @@ static const struct ethtool_ops bcm_ethtool_ops = {
183 .set_msglevel = bcm_set_msglevel, 183 .set_msglevel = bcm_set_msglevel,
184}; 184};
185 185
186int register_networkdev(PMINI_ADAPTER Adapter) 186int register_networkdev(struct bcm_mini_adapter *Adapter)
187{ 187{
188 struct net_device *net = Adapter->dev; 188 struct net_device *net = Adapter->dev;
189 PS_INTERFACE_ADAPTER IntfAdapter = Adapter->pvInterfaceAdapter; 189 PS_INTERFACE_ADAPTER IntfAdapter = Adapter->pvInterfaceAdapter;
@@ -224,7 +224,7 @@ int register_networkdev(PMINI_ADAPTER Adapter)
224 return 0; 224 return 0;
225} 225}
226 226
227void unregister_networkdev(PMINI_ADAPTER Adapter) 227void unregister_networkdev(struct bcm_mini_adapter *Adapter)
228{ 228{
229 struct net_device *net = Adapter->dev; 229 struct net_device *net = Adapter->dev;
230 PS_INTERFACE_ADAPTER IntfAdapter = Adapter->pvInterfaceAdapter; 230 PS_INTERFACE_ADAPTER IntfAdapter = Adapter->pvInterfaceAdapter;
diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c
index 7189df69d81f..189d243878c9 100644
--- a/drivers/staging/bcm/CmHost.c
+++ b/drivers/staging/bcm/CmHost.c
@@ -14,7 +14,7 @@ enum E_CLASSIFIER_ACTION {
14 eDeleteClassifier 14 eDeleteClassifier
15}; 15};
16 16
17static ULONG GetNextTargetBufferLocation(PMINI_ADAPTER Adapter, B_UINT16 tid); 17static ULONG GetNextTargetBufferLocation(struct bcm_mini_adapter *Adapter, B_UINT16 tid);
18 18
19/************************************************************ 19/************************************************************
20 * Function - SearchSfid 20 * Function - SearchSfid
@@ -28,7 +28,7 @@ static ULONG GetNextTargetBufferLocation(PMINI_ADAPTER Adapter, B_UINT16 tid);
28 * Returns - Queue index for this SFID(If matched) 28 * Returns - Queue index for this SFID(If matched)
29 * Else Invalid Queue Index(If Not matched) 29 * Else Invalid Queue Index(If Not matched)
30 ************************************************************/ 30 ************************************************************/
31int SearchSfid(PMINI_ADAPTER Adapter, UINT uiSfid) 31int SearchSfid(struct bcm_mini_adapter *Adapter, UINT uiSfid)
32{ 32{
33 int i; 33 int i;
34 34
@@ -49,7 +49,7 @@ int SearchSfid(PMINI_ADAPTER Adapter, UINT uiSfid)
49 * Returns - Queue index for the free SFID 49 * Returns - Queue index for the free SFID
50 * Else returns Invalid Index. 50 * Else returns Invalid Index.
51 ****************************************************************/ 51 ****************************************************************/
52static int SearchFreeSfid(PMINI_ADAPTER Adapter) 52static int SearchFreeSfid(struct bcm_mini_adapter *Adapter)
53{ 53{
54 int i; 54 int i;
55 55
@@ -63,12 +63,12 @@ static int SearchFreeSfid(PMINI_ADAPTER Adapter)
63/* 63/*
64 * Function: SearchClsid 64 * Function: SearchClsid
65 * Description: This routinue would search Classifier having specified ClassifierID as input parameter 65 * Description: This routinue would search Classifier having specified ClassifierID as input parameter
66 * Input parameters: PMINI_ADAPTER Adapter - Adapter Context 66 * Input parameters: struct bcm_mini_adapter *Adapter - Adapter Context
67 * unsigned int uiSfid - The SF in which the classifier is to searched 67 * unsigned int uiSfid - The SF in which the classifier is to searched
68 * B_UINT16 uiClassifierID - The classifier ID to be searched 68 * B_UINT16 uiClassifierID - The classifier ID to be searched
69 * Return: int :Classifier table index of matching entry 69 * Return: int :Classifier table index of matching entry
70 */ 70 */
71static int SearchClsid(PMINI_ADAPTER Adapter, ULONG ulSFID, B_UINT16 uiClassifierID) 71static int SearchClsid(struct bcm_mini_adapter *Adapter, ULONG ulSFID, B_UINT16 uiClassifierID)
72{ 72{
73 int i; 73 int i;
74 74
@@ -87,7 +87,7 @@ static int SearchClsid(PMINI_ADAPTER Adapter, ULONG ulSFID, B_UINT16 uiClassifi
87 * This routinue would search Free available Classifier entry in classifier table. 87 * This routinue would search Free available Classifier entry in classifier table.
88 * @return free Classifier Entry index in classifier table for specified SF 88 * @return free Classifier Entry index in classifier table for specified SF
89 */ 89 */
90static int SearchFreeClsid(PMINI_ADAPTER Adapter /**Adapter Context*/) 90static int SearchFreeClsid(struct bcm_mini_adapter *Adapter /**Adapter Context*/)
91{ 91{
92 int i; 92 int i;
93 93
@@ -99,7 +99,7 @@ static int SearchFreeClsid(PMINI_ADAPTER Adapter /**Adapter Context*/)
99 return MAX_CLASSIFIERS+1; 99 return MAX_CLASSIFIERS+1;
100} 100}
101 101
102static VOID deleteSFBySfid(PMINI_ADAPTER Adapter, UINT uiSearchRuleIndex) 102static VOID deleteSFBySfid(struct bcm_mini_adapter *Adapter, UINT uiSearchRuleIndex)
103{ 103{
104 /* deleting all the packet held in the SF */ 104 /* deleting all the packet held in the SF */
105 flush_queue(Adapter, uiSearchRuleIndex); 105 flush_queue(Adapter, uiSearchRuleIndex);
@@ -120,7 +120,7 @@ CopyIpAddrToClassifier(struct bcm_classifier_rule *pstClassifierEntry,
120 UINT nSizeOfIPAddressInBytes = IP_LENGTH_OF_ADDRESS; 120 UINT nSizeOfIPAddressInBytes = IP_LENGTH_OF_ADDRESS;
121 UCHAR *ptrClassifierIpAddress = NULL; 121 UCHAR *ptrClassifierIpAddress = NULL;
122 UCHAR *ptrClassifierIpMask = NULL; 122 UCHAR *ptrClassifierIpMask = NULL;
123 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 123 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
124 124
125 if (bIpVersion6) 125 if (bIpVersion6)
126 nSizeOfIPAddressInBytes = IPV6_ADDRESS_SIZEINBYTES; 126 nSizeOfIPAddressInBytes = IPV6_ADDRESS_SIZEINBYTES;
@@ -214,7 +214,7 @@ CopyIpAddrToClassifier(struct bcm_classifier_rule *pstClassifierEntry,
214 } 214 }
215} 215}
216 216
217void ClearTargetDSXBuffer(PMINI_ADAPTER Adapter, B_UINT16 TID, BOOLEAN bFreeAll) 217void ClearTargetDSXBuffer(struct bcm_mini_adapter *Adapter, B_UINT16 TID, BOOLEAN bFreeAll)
218{ 218{
219 int i; 219 int i;
220 220
@@ -236,7 +236,7 @@ void ClearTargetDSXBuffer(PMINI_ADAPTER Adapter, B_UINT16 TID, BOOLEAN bFreeAll)
236 * @ingroup ctrl_pkt_functions 236 * @ingroup ctrl_pkt_functions
237 * copy classifier rule into the specified SF index 237 * copy classifier rule into the specified SF index
238 */ 238 */
239static inline VOID CopyClassifierRuleToSF(PMINI_ADAPTER Adapter, stConvergenceSLTypes *psfCSType, UINT uiSearchRuleIndex, UINT nClassifierIndex) 239static inline VOID CopyClassifierRuleToSF(struct bcm_mini_adapter *Adapter, stConvergenceSLTypes *psfCSType, UINT uiSearchRuleIndex, UINT nClassifierIndex)
240{ 240{
241 struct bcm_classifier_rule *pstClassifierEntry = NULL; 241 struct bcm_classifier_rule *pstClassifierEntry = NULL;
242 /* VOID *pvPhsContext = NULL; */ 242 /* VOID *pvPhsContext = NULL; */
@@ -365,7 +365,7 @@ static inline VOID CopyClassifierRuleToSF(PMINI_ADAPTER Adapter, stConvergenceSL
365/* 365/*
366 * @ingroup ctrl_pkt_functions 366 * @ingroup ctrl_pkt_functions
367 */ 367 */
368static inline VOID DeleteClassifierRuleFromSF(PMINI_ADAPTER Adapter, UINT uiSearchRuleIndex, UINT nClassifierIndex) 368static inline VOID DeleteClassifierRuleFromSF(struct bcm_mini_adapter *Adapter, UINT uiSearchRuleIndex, UINT nClassifierIndex)
369{ 369{
370 struct bcm_classifier_rule *pstClassifierEntry = NULL; 370 struct bcm_classifier_rule *pstClassifierEntry = NULL;
371 B_UINT16 u16PacketClassificationRuleIndex; 371 B_UINT16 u16PacketClassificationRuleIndex;
@@ -396,7 +396,7 @@ static inline VOID DeleteClassifierRuleFromSF(PMINI_ADAPTER Adapter, UINT uiSear
396/* 396/*
397 * @ingroup ctrl_pkt_functions 397 * @ingroup ctrl_pkt_functions
398 */ 398 */
399VOID DeleteAllClassifiersForSF(PMINI_ADAPTER Adapter, UINT uiSearchRuleIndex) 399VOID DeleteAllClassifiersForSF(struct bcm_mini_adapter *Adapter, UINT uiSearchRuleIndex)
400{ 400{
401 struct bcm_classifier_rule *pstClassifierEntry = NULL; 401 struct bcm_classifier_rule *pstClassifierEntry = NULL;
402 int i; 402 int i;
@@ -428,7 +428,7 @@ VOID DeleteAllClassifiersForSF(PMINI_ADAPTER Adapter, UINT uiSearchRuleIndex)
428 * related data into the Adapter structure. 428 * related data into the Adapter structure.
429 * @ingroup ctrl_pkt_functions 429 * @ingroup ctrl_pkt_functions
430 */ 430 */
431static VOID CopyToAdapter(register PMINI_ADAPTER Adapter, /* <Pointer to the Adapter structure */ 431static VOID CopyToAdapter(register struct bcm_mini_adapter *Adapter, /* <Pointer to the Adapter structure */
432 register pstServiceFlowParamSI psfLocalSet, /* <Pointer to the ServiceFlowParamSI structure */ 432 register pstServiceFlowParamSI psfLocalSet, /* <Pointer to the ServiceFlowParamSI structure */
433 register UINT uiSearchRuleIndex, /* <Index of Queue, to which this data belongs */ 433 register UINT uiSearchRuleIndex, /* <Index of Queue, to which this data belongs */
434 register UCHAR ucDsxType, 434 register UCHAR ucDsxType,
@@ -836,7 +836,7 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
836 int nIndex; 836 int nIndex;
837 stLocalSFAddIndicationAlt *pstAddIndication; 837 stLocalSFAddIndicationAlt *pstAddIndication;
838 UINT nCurClassifierCnt; 838 UINT nCurClassifierCnt;
839 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 839 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
840 840
841 pstAddIndication = (stLocalSFAddIndicationAlt *)pvBuffer; 841 pstAddIndication = (stLocalSFAddIndicationAlt *)pvBuffer;
842 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "======>"); 842 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "======>");
@@ -1325,7 +1325,7 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
1325 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " bValid: 0x%X", pstAddIndication->sfActiveSet.bValid); 1325 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " bValid: 0x%X", pstAddIndication->sfActiveSet.bValid);
1326} 1326}
1327 1327
1328static inline ULONG RestoreSFParam(PMINI_ADAPTER Adapter, ULONG ulAddrSFParamSet, PUCHAR pucDestBuffer) 1328static inline ULONG RestoreSFParam(struct bcm_mini_adapter *Adapter, ULONG ulAddrSFParamSet, PUCHAR pucDestBuffer)
1329{ 1329{
1330 UINT nBytesToRead = sizeof(stServiceFlowParamSI); 1330 UINT nBytesToRead = sizeof(stServiceFlowParamSI);
1331 1331
@@ -1342,7 +1342,7 @@ static inline ULONG RestoreSFParam(PMINI_ADAPTER Adapter, ULONG ulAddrSFParamSet
1342 return 1; 1342 return 1;
1343} 1343}
1344 1344
1345static ULONG StoreSFParam(PMINI_ADAPTER Adapter, PUCHAR pucSrcBuffer, ULONG ulAddrSFParamSet) 1345static ULONG StoreSFParam(struct bcm_mini_adapter *Adapter, PUCHAR pucSrcBuffer, ULONG ulAddrSFParamSet)
1346{ 1346{
1347 UINT nBytesToWrite = sizeof(stServiceFlowParamSI); 1347 UINT nBytesToWrite = sizeof(stServiceFlowParamSI);
1348 int ret = 0; 1348 int ret = 0;
@@ -1358,7 +1358,7 @@ static ULONG StoreSFParam(PMINI_ADAPTER Adapter, PUCHAR pucSrcBuffer, ULONG ulAd
1358 return 1; 1358 return 1;
1359} 1359}
1360 1360
1361ULONG StoreCmControlResponseMessage(PMINI_ADAPTER Adapter, PVOID pvBuffer, UINT *puBufferLength) 1361ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBuffer, UINT *puBufferLength)
1362{ 1362{
1363 stLocalSFAddIndicationAlt *pstAddIndicationAlt = NULL; 1363 stLocalSFAddIndicationAlt *pstAddIndicationAlt = NULL;
1364 stLocalSFAddIndication *pstAddIndication = NULL; 1364 stLocalSFAddIndication *pstAddIndication = NULL;
@@ -1473,7 +1473,7 @@ ULONG StoreCmControlResponseMessage(PMINI_ADAPTER Adapter, PVOID pvBuffer, UINT
1473} 1473}
1474 1474
1475static inline stLocalSFAddIndicationAlt 1475static inline stLocalSFAddIndicationAlt
1476*RestoreCmControlResponseMessage(register PMINI_ADAPTER Adapter, register PVOID pvBuffer) 1476*RestoreCmControlResponseMessage(register struct bcm_mini_adapter *Adapter, register PVOID pvBuffer)
1477{ 1477{
1478 ULONG ulStatus = 0; 1478 ULONG ulStatus = 0;
1479 stLocalSFAddIndication *pstAddIndication = NULL; 1479 stLocalSFAddIndication *pstAddIndication = NULL;
@@ -1551,7 +1551,7 @@ failed_restore_sf_param:
1551 return NULL; 1551 return NULL;
1552} 1552}
1553 1553
1554ULONG SetUpTargetDsxBuffers(PMINI_ADAPTER Adapter) 1554ULONG SetUpTargetDsxBuffers(struct bcm_mini_adapter *Adapter)
1555{ 1555{
1556 ULONG ulTargetDsxBuffersBase = 0; 1556 ULONG ulTargetDsxBuffersBase = 0;
1557 ULONG ulCntTargetBuffers; 1557 ULONG ulCntTargetBuffers;
@@ -1598,7 +1598,7 @@ ULONG SetUpTargetDsxBuffers(PMINI_ADAPTER Adapter)
1598 return 1; 1598 return 1;
1599} 1599}
1600 1600
1601static ULONG GetNextTargetBufferLocation(PMINI_ADAPTER Adapter, B_UINT16 tid) 1601static ULONG GetNextTargetBufferLocation(struct bcm_mini_adapter *Adapter, B_UINT16 tid)
1602{ 1602{
1603 ULONG ulTargetDSXBufferAddress; 1603 ULONG ulTargetDSXBufferAddress;
1604 ULONG ulTargetDsxBufferIndexToUse, ulMaxTry; 1604 ULONG ulTargetDsxBufferIndexToUse, ulMaxTry;
@@ -1632,7 +1632,7 @@ static ULONG GetNextTargetBufferLocation(PMINI_ADAPTER Adapter, B_UINT16 tid)
1632 return ulTargetDSXBufferAddress; 1632 return ulTargetDSXBufferAddress;
1633} 1633}
1634 1634
1635int AllocAdapterDsxBuffer(PMINI_ADAPTER Adapter) 1635int AllocAdapterDsxBuffer(struct bcm_mini_adapter *Adapter)
1636{ 1636{
1637 /* 1637 /*
1638 * Need to Allocate memory to contain the SUPER Large structures 1638 * Need to Allocate memory to contain the SUPER Large structures
@@ -1645,7 +1645,7 @@ int AllocAdapterDsxBuffer(PMINI_ADAPTER Adapter)
1645 return 0; 1645 return 0;
1646} 1646}
1647 1647
1648int FreeAdapterDsxBuffer(PMINI_ADAPTER Adapter) 1648int FreeAdapterDsxBuffer(struct bcm_mini_adapter *Adapter)
1649{ 1649{
1650 kfree(Adapter->caDsxReqResp); 1650 kfree(Adapter->caDsxReqResp);
1651 return 0; 1651 return 0;
@@ -1657,7 +1657,7 @@ int FreeAdapterDsxBuffer(PMINI_ADAPTER Adapter)
1657 * for the Connection Management. 1657 * for the Connection Management.
1658 * @return - Queue index for the free SFID else returns Invalid Index. 1658 * @return - Queue index for the free SFID else returns Invalid Index.
1659 */ 1659 */
1660BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter, /* <Pointer to the Adapter structure */ 1660BOOLEAN CmControlResponseMessage(struct bcm_mini_adapter *Adapter, /* <Pointer to the Adapter structure */
1661 PVOID pvBuffer /* Starting Address of the Buffer, that contains the AddIndication Data */) 1661 PVOID pvBuffer /* Starting Address of the Buffer, that contains the AddIndication Data */)
1662{ 1662{
1663 stServiceFlowParamSI *psfLocalSet = NULL; 1663 stServiceFlowParamSI *psfLocalSet = NULL;
@@ -1915,7 +1915,7 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter, /* <Pointer to the Adap
1915 return TRUE; 1915 return TRUE;
1916} 1916}
1917 1917
1918int get_dsx_sf_data_to_application(PMINI_ADAPTER Adapter, UINT uiSFId, void __user *user_buffer) 1918int get_dsx_sf_data_to_application(struct bcm_mini_adapter *Adapter, UINT uiSFId, void __user *user_buffer)
1919{ 1919{
1920 int status = 0; 1920 int status = 0;
1921 struct bcm_packet_info *psSfInfo = NULL; 1921 struct bcm_packet_info *psSfInfo = NULL;
@@ -1937,7 +1937,7 @@ int get_dsx_sf_data_to_application(PMINI_ADAPTER Adapter, UINT uiSFId, void __us
1937 return STATUS_SUCCESS; 1937 return STATUS_SUCCESS;
1938} 1938}
1939 1939
1940VOID OverrideServiceFlowParams(PMINI_ADAPTER Adapter, PUINT puiBuffer) 1940VOID OverrideServiceFlowParams(struct bcm_mini_adapter *Adapter, PUINT puiBuffer)
1941{ 1941{
1942 B_UINT32 u32NumofSFsinMsg = ntohl(*(puiBuffer + 1)); 1942 B_UINT32 u32NumofSFsinMsg = ntohl(*(puiBuffer + 1));
1943 stIM_SFHostNotify *pHostInfo = NULL; 1943 stIM_SFHostNotify *pHostInfo = NULL;
diff --git a/drivers/staging/bcm/CmHost.h b/drivers/staging/bcm/CmHost.h
index 8f689769b4ba..4cc6f93f2321 100644
--- a/drivers/staging/bcm/CmHost.h
+++ b/drivers/staging/bcm/CmHost.h
@@ -148,14 +148,14 @@ typedef struct stLocalSFChangeIndicationAlt{
148 148
149}stLocalSFChangeIndicationAlt; 149}stLocalSFChangeIndicationAlt;
150 150
151ULONG StoreCmControlResponseMessage(PMINI_ADAPTER Adapter,PVOID pvBuffer,UINT *puBufferLength); 151ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBuffer,UINT *puBufferLength);
152 152
153INT AllocAdapterDsxBuffer(PMINI_ADAPTER Adapter); 153INT AllocAdapterDsxBuffer(struct bcm_mini_adapter *Adapter);
154 154
155INT FreeAdapterDsxBuffer(PMINI_ADAPTER Adapter); 155INT FreeAdapterDsxBuffer(struct bcm_mini_adapter *Adapter);
156ULONG SetUpTargetDsxBuffers(PMINI_ADAPTER Adapter); 156ULONG SetUpTargetDsxBuffers(struct bcm_mini_adapter *Adapter);
157 157
158BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter,PVOID pvBuffer); 158BOOLEAN CmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBuffer);
159 159
160 160
161#pragma pack (pop) 161#pragma pack (pop)
diff --git a/drivers/staging/bcm/DDRInit.c b/drivers/staging/bcm/DDRInit.c
index e7571da81216..8c696b64ab24 100644
--- a/drivers/staging/bcm/DDRInit.c
+++ b/drivers/staging/bcm/DDRInit.c
@@ -772,7 +772,7 @@ static struct bcm_ddr_setting asT3LPB_DDRSetting80MHz[]= {// # DPLL Clock Settin
772}; 772};
773 773
774 774
775int ddr_init(MINI_ADAPTER *Adapter) 775int ddr_init(struct bcm_mini_adapter *Adapter)
776{ 776{
777 struct bcm_ddr_setting *psDDRSetting=NULL; 777 struct bcm_ddr_setting *psDDRSetting=NULL;
778 ULONG RegCount=0; 778 ULONG RegCount=0;
@@ -1099,7 +1099,7 @@ int ddr_init(MINI_ADAPTER *Adapter)
1099 return retval; 1099 return retval;
1100} 1100}
1101 1101
1102int download_ddr_settings(PMINI_ADAPTER Adapter) 1102int download_ddr_settings(struct bcm_mini_adapter *Adapter)
1103{ 1103{
1104 struct bcm_ddr_setting *psDDRSetting=NULL; 1104 struct bcm_ddr_setting *psDDRSetting=NULL;
1105 ULONG RegCount=0; 1105 ULONG RegCount=0;
diff --git a/drivers/staging/bcm/DDRInit.h b/drivers/staging/bcm/DDRInit.h
index 550e260df539..b0196fce9255 100644
--- a/drivers/staging/bcm/DDRInit.h
+++ b/drivers/staging/bcm/DDRInit.h
@@ -3,7 +3,7 @@
3 3
4 4
5 5
6int ddr_init(PMINI_ADAPTER psAdapter); 6int ddr_init(struct bcm_mini_adapter *psAdapter);
7int download_ddr_settings(PMINI_ADAPTER psAdapter); 7int download_ddr_settings(struct bcm_mini_adapter *psAdapter);
8 8
9#endif 9#endif
diff --git a/drivers/staging/bcm/HandleControlPacket.c b/drivers/staging/bcm/HandleControlPacket.c
index 691b366bfe4f..25e5c68bfe85 100644
--- a/drivers/staging/bcm/HandleControlPacket.c
+++ b/drivers/staging/bcm/HandleControlPacket.c
@@ -11,7 +11,7 @@
11 * Enqueue the control packet for Application. 11 * Enqueue the control packet for Application.
12 * @return None 12 * @return None
13 */ 13 */
14static VOID handle_rx_control_packet(PMINI_ADAPTER Adapter, struct sk_buff *skb) 14static VOID handle_rx_control_packet(struct bcm_mini_adapter *Adapter, struct sk_buff *skb)
15{ 15{
16 struct bcm_tarang_data *pTarang = NULL; 16 struct bcm_tarang_data *pTarang = NULL;
17 BOOLEAN HighPriorityMessage = FALSE; 17 BOOLEAN HighPriorityMessage = FALSE;
@@ -154,7 +154,7 @@ static VOID handle_rx_control_packet(PMINI_ADAPTER Adapter, struct sk_buff *skb)
154 * @ingroup ctrl_pkt_functions 154 * @ingroup ctrl_pkt_functions
155 * Thread to handle control pkt reception 155 * Thread to handle control pkt reception
156 */ 156 */
157int control_packet_handler(PMINI_ADAPTER Adapter /* pointer to adapter object*/) 157int control_packet_handler(struct bcm_mini_adapter *Adapter /* pointer to adapter object*/)
158{ 158{
159 struct sk_buff *ctrl_packet = NULL; 159 struct sk_buff *ctrl_packet = NULL;
160 unsigned long flags = 0; 160 unsigned long flags = 0;
@@ -213,7 +213,7 @@ int control_packet_handler(PMINI_ADAPTER Adapter /* pointer to adapter object*/)
213 213
214INT flushAllAppQ(void) 214INT flushAllAppQ(void)
215{ 215{
216 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 216 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
217 struct bcm_tarang_data *pTarang = NULL; 217 struct bcm_tarang_data *pTarang = NULL;
218 struct sk_buff *PacketToDrop = NULL; 218 struct sk_buff *PacketToDrop = NULL;
219 for (pTarang = Adapter->pTarangs; pTarang; pTarang = pTarang->next) { 219 for (pTarang = Adapter->pTarangs; pTarang; pTarang = pTarang->next) {
diff --git a/drivers/staging/bcm/IPv6Protocol.c b/drivers/staging/bcm/IPv6Protocol.c
index 4adbf9dbf7b5..4745ddd62f5b 100644
--- a/drivers/staging/bcm/IPv6Protocol.c
+++ b/drivers/staging/bcm/IPv6Protocol.c
@@ -12,7 +12,7 @@ static UCHAR *GetNextIPV6ChainedHeader(UCHAR **ppucPayload,
12 UCHAR *pucRetHeaderPtr = NULL; 12 UCHAR *pucRetHeaderPtr = NULL;
13 UCHAR *pucPayloadPtr = NULL; 13 UCHAR *pucPayloadPtr = NULL;
14 USHORT usNextHeaderOffset = 0 ; 14 USHORT usNextHeaderOffset = 0 ;
15 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 15 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
16 16
17 if ((ppucPayload == NULL) || (*pusPayloadLength == 0) || 17 if ((ppucPayload == NULL) || (*pusPayloadLength == 0) ||
18 (*bParseDone)) { 18 (*bParseDone)) {
@@ -147,7 +147,7 @@ static UCHAR GetIpv6ProtocolPorts(UCHAR *pucPayload, USHORT *pusSrcPort,
147 BOOLEAN bDone = FALSE; 147 BOOLEAN bDone = FALSE;
148 UCHAR ucHeaderType = 0; 148 UCHAR ucHeaderType = 0;
149 UCHAR *pucNextHeader = NULL; 149 UCHAR *pucNextHeader = NULL;
150 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 150 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
151 151
152 if (!pucPayload || (usPayloadLength == 0)) 152 if (!pucPayload || (usPayloadLength == 0))
153 return 0; 153 return 0;
@@ -177,10 +177,10 @@ static UCHAR GetIpv6ProtocolPorts(UCHAR *pucPayload, USHORT *pusSrcPort,
177 177
178 178
179/* 179/*
180 * Arg 1 PMINI_ADAPTER Adapter is a pointer ot the driver contorl structure 180 * Arg 1 struct bcm_mini_adapter *Adapter is a pointer ot the driver contorl structure
181 * Arg 2 PVOID pcIpHeader is a pointer to the IP header of the packet 181 * Arg 2 PVOID pcIpHeader is a pointer to the IP header of the packet
182 */ 182 */
183USHORT IpVersion6(PMINI_ADAPTER Adapter, PVOID pcIpHeader, 183USHORT IpVersion6(struct bcm_mini_adapter *Adapter, PVOID pcIpHeader,
184 struct bcm_classifier_rule *pstClassifierRule) 184 struct bcm_classifier_rule *pstClassifierRule)
185{ 185{
186 USHORT ushDestPort = 0; 186 USHORT ushDestPort = 0;
@@ -295,7 +295,7 @@ static BOOLEAN MatchSrcIpv6Address(struct bcm_classifier_rule *pstClassifierRule
295 UINT uiIpv6AddIndex = 0; 295 UINT uiIpv6AddIndex = 0;
296 UINT uiIpv6AddrNoLongWords = 4; 296 UINT uiIpv6AddrNoLongWords = 4;
297 ULONG aulSrcIP[4]; 297 ULONG aulSrcIP[4];
298 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 298 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
299 /* 299 /*
300 * This is the no. of Src Addresses ie Range of IP Addresses contained 300 * This is the no. of Src Addresses ie Range of IP Addresses contained
301 * in the classifier rule for which we need to match 301 * in the classifier rule for which we need to match
@@ -351,7 +351,7 @@ static BOOLEAN MatchDestIpv6Address(struct bcm_classifier_rule *pstClassifierRul
351 UINT uiIpv6AddIndex = 0; 351 UINT uiIpv6AddIndex = 0;
352 UINT uiIpv6AddrNoLongWords = 4; 352 UINT uiIpv6AddrNoLongWords = 4;
353 ULONG aulDestIP[4]; 353 ULONG aulDestIP[4];
354 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 354 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
355 /* 355 /*
356 * This is the no. of Destination Addresses 356 * This is the no. of Destination Addresses
357 * ie Range of IP Addresses contained in the classifier rule 357 * ie Range of IP Addresses contained in the classifier rule
@@ -406,7 +406,7 @@ VOID DumpIpv6Address(ULONG *puIpv6Address)
406{ 406{
407 UINT uiIpv6AddrNoLongWords = 4; 407 UINT uiIpv6AddrNoLongWords = 4;
408 UINT uiIpv6AddIndex = 0; 408 UINT uiIpv6AddIndex = 0;
409 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 409 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
410 for (uiIpv6AddIndex = 0; uiIpv6AddIndex < uiIpv6AddrNoLongWords; uiIpv6AddIndex++) { 410 for (uiIpv6AddIndex = 0; uiIpv6AddIndex < uiIpv6AddrNoLongWords; uiIpv6AddIndex++) {
411 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, 411 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL,
412 ":%lx", puIpv6Address[uiIpv6AddIndex]); 412 ":%lx", puIpv6Address[uiIpv6AddIndex]);
@@ -418,7 +418,7 @@ static VOID DumpIpv6Header(IPV6Header *pstIpv6Header)
418{ 418{
419 UCHAR ucVersion; 419 UCHAR ucVersion;
420 UCHAR ucPrio; 420 UCHAR ucPrio;
421 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 421 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
422 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, 422 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL,
423 "----Ipv6 Header---"); 423 "----Ipv6 Header---");
424 ucVersion = pstIpv6Header->ucVersionPrio & 0xf0; 424 ucVersion = pstIpv6Header->ucVersionPrio & 0xf0;
diff --git a/drivers/staging/bcm/IPv6ProtocolHdr.h b/drivers/staging/bcm/IPv6ProtocolHdr.h
index 369b55316c79..8ba88a5b081c 100644
--- a/drivers/staging/bcm/IPv6ProtocolHdr.h
+++ b/drivers/staging/bcm/IPv6ProtocolHdr.h
@@ -102,7 +102,7 @@ typedef enum _E_IPADDR_CONTEXT
102 102
103//Function Prototypes 103//Function Prototypes
104 104
105USHORT IpVersion6(PMINI_ADAPTER Adapter, /**< Pointer to the driver control structure */ 105USHORT IpVersion6(struct bcm_mini_adapter *Adapter, /**< Pointer to the driver control structure */
106 PVOID pcIpHeader, /**<Pointer to the IP Hdr of the packet*/ 106 PVOID pcIpHeader, /**<Pointer to the IP Hdr of the packet*/
107 struct bcm_classifier_rule *pstClassifierRule ); 107 struct bcm_classifier_rule *pstClassifierRule );
108 108
diff --git a/drivers/staging/bcm/InterfaceAdapter.h b/drivers/staging/bcm/InterfaceAdapter.h
index 6397c20f4f6a..4607c265d981 100644
--- a/drivers/staging/bcm/InterfaceAdapter.h
+++ b/drivers/staging/bcm/InterfaceAdapter.h
@@ -85,7 +85,7 @@ typedef struct _S_INTERFACE_ADAPTER
85 atomic_t uNumRcbUsed; 85 atomic_t uNumRcbUsed;
86 atomic_t uCurrRcb; 86 atomic_t uCurrRcb;
87 87
88 PMINI_ADAPTER psAdapter; 88 struct bcm_mini_adapter *psAdapter;
89 BOOLEAN bFlashBoot; 89 BOOLEAN bFlashBoot;
90 BOOLEAN bHighSpeedDevice ; 90 BOOLEAN bHighSpeedDevice ;
91 91
diff --git a/drivers/staging/bcm/InterfaceDld.c b/drivers/staging/bcm/InterfaceDld.c
index cb0e72ee0789..3a89e33733ee 100644
--- a/drivers/staging/bcm/InterfaceDld.c
+++ b/drivers/staging/bcm/InterfaceDld.c
@@ -7,7 +7,7 @@ int InterfaceFileDownload(PVOID arg, struct file *flp, unsigned int on_chip_loc)
7 int errno = 0, len = 0; /* ,is_config_file = 0 */ 7 int errno = 0, len = 0; /* ,is_config_file = 0 */
8 loff_t pos = 0; 8 loff_t pos = 0;
9 PS_INTERFACE_ADAPTER psIntfAdapter = (PS_INTERFACE_ADAPTER)arg; 9 PS_INTERFACE_ADAPTER psIntfAdapter = (PS_INTERFACE_ADAPTER)arg;
10 /* PMINI_ADAPTER Adapter = psIntfAdapter->psAdapter; */ 10 /* struct bcm_mini_adapter *Adapter = psIntfAdapter->psAdapter; */
11 char *buff = kmalloc(MAX_TRANSFER_CTRL_BYTE_USB, GFP_KERNEL); 11 char *buff = kmalloc(MAX_TRANSFER_CTRL_BYTE_USB, GFP_KERNEL);
12 12
13 if (!buff) 13 if (!buff)
@@ -132,7 +132,7 @@ exit:
132 return Status; 132 return Status;
133} 133}
134 134
135static int bcm_download_config_file(PMINI_ADAPTER Adapter, struct bcm_firmware_info *psFwInfo) 135static int bcm_download_config_file(struct bcm_mini_adapter *Adapter, struct bcm_firmware_info *psFwInfo)
136{ 136{
137 int retval = STATUS_SUCCESS; 137 int retval = STATUS_SUCCESS;
138 B_UINT32 value = 0; 138 B_UINT32 value = 0;
@@ -208,7 +208,7 @@ static int bcm_download_config_file(PMINI_ADAPTER Adapter, struct bcm_firmware_i
208static int bcm_compare_buff_contents(unsigned char *readbackbuff, unsigned char *buff, unsigned int len) 208static int bcm_compare_buff_contents(unsigned char *readbackbuff, unsigned char *buff, unsigned int len)
209{ 209{
210 int retval = STATUS_SUCCESS; 210 int retval = STATUS_SUCCESS;
211 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 211 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
212 if ((len-sizeof(unsigned int)) < 4) { 212 if ((len-sizeof(unsigned int)) < 4) {
213 if (memcmp(readbackbuff , buff, len)) 213 if (memcmp(readbackbuff , buff, len))
214 retval = -EINVAL; 214 retval = -EINVAL;
@@ -229,7 +229,7 @@ static int bcm_compare_buff_contents(unsigned char *readbackbuff, unsigned char
229 return retval; 229 return retval;
230} 230}
231 231
232int bcm_ioctl_fw_download(PMINI_ADAPTER Adapter, struct bcm_firmware_info *psFwInfo) 232int bcm_ioctl_fw_download(struct bcm_mini_adapter *Adapter, struct bcm_firmware_info *psFwInfo)
233{ 233{
234 int retval = STATUS_SUCCESS; 234 int retval = STATUS_SUCCESS;
235 PUCHAR buff = NULL; 235 PUCHAR buff = NULL;
@@ -278,7 +278,7 @@ error:
278 return retval; 278 return retval;
279} 279}
280 280
281static INT buffDnld(PMINI_ADAPTER Adapter, PUCHAR mappedbuffer, UINT u32FirmwareLength, ULONG u32StartingAddress) 281static INT buffDnld(struct bcm_mini_adapter *Adapter, PUCHAR mappedbuffer, UINT u32FirmwareLength, ULONG u32StartingAddress)
282{ 282{
283 unsigned int len = 0; 283 unsigned int len = 0;
284 int retval = STATUS_SUCCESS; 284 int retval = STATUS_SUCCESS;
@@ -299,7 +299,7 @@ static INT buffDnld(PMINI_ADAPTER Adapter, PUCHAR mappedbuffer, UINT u32Firmware
299 return retval; 299 return retval;
300} 300}
301 301
302static INT buffRdbkVerify(PMINI_ADAPTER Adapter, PUCHAR mappedbuffer, UINT u32FirmwareLength, ULONG u32StartingAddress) 302static INT buffRdbkVerify(struct bcm_mini_adapter *Adapter, PUCHAR mappedbuffer, UINT u32FirmwareLength, ULONG u32StartingAddress)
303{ 303{
304 UINT len = u32FirmwareLength; 304 UINT len = u32FirmwareLength;
305 INT retval = STATUS_SUCCESS; 305 INT retval = STATUS_SUCCESS;
@@ -334,7 +334,7 @@ static INT buffRdbkVerify(PMINI_ADAPTER Adapter, PUCHAR mappedbuffer, UINT u32Fi
334 return retval; 334 return retval;
335} 335}
336 336
337INT buffDnldVerify(PMINI_ADAPTER Adapter, unsigned char *mappedbuffer, unsigned int u32FirmwareLength, unsigned long u32StartingAddress) 337INT buffDnldVerify(struct bcm_mini_adapter *Adapter, unsigned char *mappedbuffer, unsigned int u32FirmwareLength, unsigned long u32StartingAddress)
338{ 338{
339 INT status = STATUS_SUCCESS; 339 INT status = STATUS_SUCCESS;
340 340
diff --git a/drivers/staging/bcm/InterfaceIdleMode.c b/drivers/staging/bcm/InterfaceIdleMode.c
index faeb03e62c06..4f2f490921e1 100644
--- a/drivers/staging/bcm/InterfaceIdleMode.c
+++ b/drivers/staging/bcm/InterfaceIdleMode.c
@@ -7,7 +7,7 @@ Description: This is the hardware specific Function for waking up HW device fr
7 A software abort pattern is written to the device to wake it and necessary power state 7 A software abort pattern is written to the device to wake it and necessary power state
8 transitions from host are performed here. 8 transitions from host are performed here.
9 9
10Input parameters: IN PMINI_ADAPTER Adapter - Miniport Adapter Context 10Input parameters: IN struct bcm_mini_adapter *Adapter - Miniport Adapter Context
11 11
12 12
13Return: BCM_STATUS_SUCCESS - If Wakeup of the HW Interface was successful. 13Return: BCM_STATUS_SUCCESS - If Wakeup of the HW Interface was successful.
@@ -22,7 +22,7 @@ Description: This is the hardware specific Function for responding to Idle mod
22 Necessary power state transitions from host for idle mode or other device specific 22 Necessary power state transitions from host for idle mode or other device specific
23 initializations are performed here. 23 initializations are performed here.
24 24
25Input parameters: IN PMINI_ADAPTER Adapter - Miniport Adapter Context 25Input parameters: IN struct bcm_mini_adapter * Adapter - Miniport Adapter Context
26 26
27 27
28Return: BCM_STATUS_SUCCESS - If Idle mode response related HW configuration was successful. 28Return: BCM_STATUS_SUCCESS - If Idle mode response related HW configuration was successful.
@@ -42,7 +42,7 @@ send to f/w with in 200 ms after the Idle/Shutdown req issued
42*/ 42*/
43 43
44 44
45int InterfaceIdleModeRespond(PMINI_ADAPTER Adapter, unsigned int* puiBuffer) 45int InterfaceIdleModeRespond(struct bcm_mini_adapter *Adapter, unsigned int* puiBuffer)
46{ 46{
47 int status = STATUS_SUCCESS; 47 int status = STATUS_SUCCESS;
48 unsigned int uiRegRead = 0; 48 unsigned int uiRegRead = 0;
@@ -147,7 +147,7 @@ int InterfaceIdleModeRespond(PMINI_ADAPTER Adapter, unsigned int* puiBuffer)
147 return status; 147 return status;
148} 148}
149 149
150static int InterfaceAbortIdlemode(PMINI_ADAPTER Adapter, unsigned int Pattern) 150static int InterfaceAbortIdlemode(struct bcm_mini_adapter *Adapter, unsigned int Pattern)
151{ 151{
152 int status = STATUS_SUCCESS; 152 int status = STATUS_SUCCESS;
153 unsigned int value; 153 unsigned int value;
@@ -246,7 +246,7 @@ static int InterfaceAbortIdlemode(PMINI_ADAPTER Adapter, unsigned int Pattern)
246 } 246 }
247 return status; 247 return status;
248} 248}
249int InterfaceIdleModeWakeup(PMINI_ADAPTER Adapter) 249int InterfaceIdleModeWakeup(struct bcm_mini_adapter *Adapter)
250{ 250{
251 ULONG Status = 0; 251 ULONG Status = 0;
252 if(Adapter->bTriedToWakeUpFromlowPowerMode) 252 if(Adapter->bTriedToWakeUpFromlowPowerMode)
@@ -263,7 +263,7 @@ int InterfaceIdleModeWakeup(PMINI_ADAPTER Adapter)
263 return Status; 263 return Status;
264} 264}
265 265
266void InterfaceHandleShutdownModeWakeup(PMINI_ADAPTER Adapter) 266void InterfaceHandleShutdownModeWakeup(struct bcm_mini_adapter *Adapter)
267{ 267{
268 unsigned int uiRegVal = 0; 268 unsigned int uiRegVal = 0;
269 INT Status = 0; 269 INT Status = 0;
diff --git a/drivers/staging/bcm/InterfaceIdleMode.h b/drivers/staging/bcm/InterfaceIdleMode.h
index 859a2ffba6b7..c3338c8a1dc8 100644
--- a/drivers/staging/bcm/InterfaceIdleMode.h
+++ b/drivers/staging/bcm/InterfaceIdleMode.h
@@ -1,14 +1,14 @@
1#ifndef _INTERFACE_IDLEMODE_H 1#ifndef _INTERFACE_IDLEMODE_H
2#define _INTERFACE_IDLEMODE_H 2#define _INTERFACE_IDLEMODE_H
3 3
4INT InterfaceIdleModeWakeup(PMINI_ADAPTER Adapter); 4INT InterfaceIdleModeWakeup(struct bcm_mini_adapter *Adapter);
5 5
6INT InterfaceIdleModeRespond(PMINI_ADAPTER Adapter, unsigned int *puiBuffer); 6INT InterfaceIdleModeRespond(struct bcm_mini_adapter *Adapter, unsigned int *puiBuffer);
7 7
8VOID InterfaceWriteIdleModeWakePattern(PMINI_ADAPTER Adapter); 8VOID InterfaceWriteIdleModeWakePattern(struct bcm_mini_adapter *Adapter);
9 9
10INT InterfaceWakeUp(PMINI_ADAPTER Adapter); 10INT InterfaceWakeUp(struct bcm_mini_adapter * Adapter);
11 11
12VOID InterfaceHandleShutdownModeWakeup(PMINI_ADAPTER Adapter); 12VOID InterfaceHandleShutdownModeWakeup(struct bcm_mini_adapter *Adapter);
13#endif 13#endif
14 14
diff --git a/drivers/staging/bcm/InterfaceInit.c b/drivers/staging/bcm/InterfaceInit.c
index 8e3c586a699c..8f85de6a57ba 100644
--- a/drivers/staging/bcm/InterfaceInit.c
+++ b/drivers/staging/bcm/InterfaceInit.c
@@ -65,7 +65,7 @@ static void InterfaceAdapterFree(PS_INTERFACE_ADAPTER psIntfAdapter)
65 AdapterFree(psIntfAdapter->psAdapter); 65 AdapterFree(psIntfAdapter->psAdapter);
66} 66}
67 67
68static void ConfigureEndPointTypesThroughEEPROM(PMINI_ADAPTER Adapter) 68static void ConfigureEndPointTypesThroughEEPROM(struct bcm_mini_adapter *Adapter)
69{ 69{
70 unsigned long ulReg = 0; 70 unsigned long ulReg = 0;
71 int bytes; 71 int bytes;
@@ -143,12 +143,12 @@ static int usbbcm_device_probe(struct usb_interface *intf, const struct usb_devi
143{ 143{
144 struct usb_device *udev = interface_to_usbdev(intf); 144 struct usb_device *udev = interface_to_usbdev(intf);
145 int retval; 145 int retval;
146 PMINI_ADAPTER psAdapter; 146 struct bcm_mini_adapter *psAdapter;
147 PS_INTERFACE_ADAPTER psIntfAdapter; 147 PS_INTERFACE_ADAPTER psIntfAdapter;
148 struct net_device *ndev; 148 struct net_device *ndev;
149 149
150 /* Reserve one extra queue for the bit-bucket */ 150 /* Reserve one extra queue for the bit-bucket */
151 ndev = alloc_etherdev_mq(sizeof(MINI_ADAPTER), NO_OF_QUEUES+1); 151 ndev = alloc_etherdev_mq(sizeof(struct bcm_mini_adapter), NO_OF_QUEUES+1);
152 if (ndev == NULL) { 152 if (ndev == NULL) {
153 dev_err(&udev->dev, DRV_NAME ": no memory for device\n"); 153 dev_err(&udev->dev, DRV_NAME ": no memory for device\n");
154 return -ENOMEM; 154 return -ENOMEM;
@@ -257,7 +257,7 @@ static int usbbcm_device_probe(struct usb_interface *intf, const struct usb_devi
257static void usbbcm_disconnect(struct usb_interface *intf) 257static void usbbcm_disconnect(struct usb_interface *intf)
258{ 258{
259 PS_INTERFACE_ADAPTER psIntfAdapter = usb_get_intfdata(intf); 259 PS_INTERFACE_ADAPTER psIntfAdapter = usb_get_intfdata(intf);
260 PMINI_ADAPTER psAdapter; 260 struct bcm_mini_adapter *psAdapter;
261 struct usb_device *udev = interface_to_usbdev(intf); 261 struct usb_device *udev = interface_to_usbdev(intf);
262 262
263 if (psIntfAdapter == NULL) 263 if (psIntfAdapter == NULL)
diff --git a/drivers/staging/bcm/InterfaceIsr.c b/drivers/staging/bcm/InterfaceIsr.c
index 67719d57256d..6ee3428daa55 100644
--- a/drivers/staging/bcm/InterfaceIsr.c
+++ b/drivers/staging/bcm/InterfaceIsr.c
@@ -5,7 +5,7 @@ static void read_int_callback(struct urb *urb/*, struct pt_regs *regs*/)
5{ 5{
6 int status = urb->status; 6 int status = urb->status;
7 PS_INTERFACE_ADAPTER psIntfAdapter = (PS_INTERFACE_ADAPTER)urb->context; 7 PS_INTERFACE_ADAPTER psIntfAdapter = (PS_INTERFACE_ADAPTER)urb->context;
8 PMINI_ADAPTER Adapter = psIntfAdapter->psAdapter ; 8 struct bcm_mini_adapter *Adapter = psIntfAdapter->psAdapter ;
9 9
10 if (netif_msg_intr(Adapter)) 10 if (netif_msg_intr(Adapter))
11 pr_info(PFX "%s: interrupt status %d\n", 11 pr_info(PFX "%s: interrupt status %d\n",
diff --git a/drivers/staging/bcm/InterfaceIsr.h b/drivers/staging/bcm/InterfaceIsr.h
index 6065a7141bca..40399788c419 100644
--- a/drivers/staging/bcm/InterfaceIsr.h
+++ b/drivers/staging/bcm/InterfaceIsr.h
@@ -7,9 +7,9 @@ int CreateInterruptUrb(PS_INTERFACE_ADAPTER psIntfAdapter);
7INT StartInterruptUrb(PS_INTERFACE_ADAPTER psIntfAdapter); 7INT StartInterruptUrb(PS_INTERFACE_ADAPTER psIntfAdapter);
8 8
9 9
10VOID InterfaceEnableInterrupt(PMINI_ADAPTER Adapter); 10VOID InterfaceEnableInterrupt(struct bcm_mini_adapter *Adapter);
11 11
12VOID InterfaceDisableInterrupt(PMINI_ADAPTER Adapter); 12VOID InterfaceDisableInterrupt(struct bcm_mini_adapter *Adapter);
13 13
14#endif 14#endif
15 15
diff --git a/drivers/staging/bcm/InterfaceMisc.c b/drivers/staging/bcm/InterfaceMisc.c
index 2218faeaf8ac..bbe909946091 100644
--- a/drivers/staging/bcm/InterfaceMisc.c
+++ b/drivers/staging/bcm/InterfaceMisc.c
@@ -133,7 +133,7 @@ INT BcmWRM(PVOID arg,
133 return InterfaceWRM((PS_INTERFACE_ADAPTER)arg, addr, buff, len); 133 return InterfaceWRM((PS_INTERFACE_ADAPTER)arg, addr, buff, len);
134} 134}
135 135
136INT Bcm_clear_halt_of_endpoints(PMINI_ADAPTER Adapter) 136INT Bcm_clear_halt_of_endpoints(struct bcm_mini_adapter *Adapter)
137{ 137{
138 PS_INTERFACE_ADAPTER psIntfAdapter = (PS_INTERFACE_ADAPTER)(Adapter->pvInterfaceAdapter); 138 PS_INTERFACE_ADAPTER psIntfAdapter = (PS_INTERFACE_ADAPTER)(Adapter->pvInterfaceAdapter);
139 INT status = STATUS_SUCCESS; 139 INT status = STATUS_SUCCESS;
diff --git a/drivers/staging/bcm/InterfaceMisc.h b/drivers/staging/bcm/InterfaceMisc.h
index 6c9e39bf9889..1dfabdc3aadd 100644
--- a/drivers/staging/bcm/InterfaceMisc.h
+++ b/drivers/staging/bcm/InterfaceMisc.h
@@ -33,7 +33,7 @@ int BcmWRM(PVOID arg,
33 PVOID buff, 33 PVOID buff,
34 INT len); 34 INT len);
35 35
36INT Bcm_clear_halt_of_endpoints(PMINI_ADAPTER Adapter); 36INT Bcm_clear_halt_of_endpoints(struct bcm_mini_adapter *Adapter);
37 37
38VOID Bcm_kill_all_URBs(PS_INTERFACE_ADAPTER psIntfAdapter); 38VOID Bcm_kill_all_URBs(PS_INTERFACE_ADAPTER psIntfAdapter);
39 39
diff --git a/drivers/staging/bcm/InterfaceRx.c b/drivers/staging/bcm/InterfaceRx.c
index 7940a2e7def2..8a9f90fbdf13 100644
--- a/drivers/staging/bcm/InterfaceRx.c
+++ b/drivers/staging/bcm/InterfaceRx.c
@@ -1,6 +1,6 @@
1#include "headers.h" 1#include "headers.h"
2 2
3static int SearchVcid(PMINI_ADAPTER Adapter,unsigned short usVcid) 3static int SearchVcid(struct bcm_mini_adapter *Adapter,unsigned short usVcid)
4{ 4{
5 int iIndex=0; 5 int iIndex=0;
6 6
@@ -45,7 +45,7 @@ static void read_bulk_callback(struct urb *urb)
45 //int idleflag = 0 ; 45 //int idleflag = 0 ;
46 PUSB_RCB pRcb = (PUSB_RCB)urb->context; 46 PUSB_RCB pRcb = (PUSB_RCB)urb->context;
47 PS_INTERFACE_ADAPTER psIntfAdapter = pRcb->psIntfAdapter; 47 PS_INTERFACE_ADAPTER psIntfAdapter = pRcb->psIntfAdapter;
48 PMINI_ADAPTER Adapter = psIntfAdapter->psAdapter; 48 struct bcm_mini_adapter *Adapter = psIntfAdapter->psAdapter;
49 struct bcm_leader *pLeader = urb->transfer_buffer; 49 struct bcm_leader *pLeader = urb->transfer_buffer;
50 50
51 if (unlikely(netif_msg_rx_status(Adapter))) 51 if (unlikely(netif_msg_rx_status(Adapter)))
@@ -232,7 +232,7 @@ Function: InterfaceRx
232Description: This is the hardware specific Function for Receiving 232Description: This is the hardware specific Function for Receiving
233 data packet/control packets from the device. 233 data packet/control packets from the device.
234 234
235Input parameters: IN PMINI_ADAPTER Adapter - Miniport Adapter Context 235Input parameters: IN struct bcm_mini_adapter *Adapter - Miniport Adapter Context
236 236
237 237
238 238
diff --git a/drivers/staging/bcm/InterfaceTx.c b/drivers/staging/bcm/InterfaceTx.c
index 3012f29cf85c..7e2b53be4d9e 100644
--- a/drivers/staging/bcm/InterfaceTx.c
+++ b/drivers/staging/bcm/InterfaceTx.c
@@ -6,9 +6,9 @@ static void write_bulk_callback(struct urb *urb/*, struct pt_regs *regs*/)
6 PUSB_TCB pTcb= (PUSB_TCB)urb->context; 6 PUSB_TCB pTcb= (PUSB_TCB)urb->context;
7 PS_INTERFACE_ADAPTER psIntfAdapter = pTcb->psIntfAdapter; 7 PS_INTERFACE_ADAPTER psIntfAdapter = pTcb->psIntfAdapter;
8 struct bcm_link_request *pControlMsg = (struct bcm_link_request *)urb->transfer_buffer; 8 struct bcm_link_request *pControlMsg = (struct bcm_link_request *)urb->transfer_buffer;
9 PMINI_ADAPTER psAdapter = psIntfAdapter->psAdapter ; 9 struct bcm_mini_adapter *psAdapter = psIntfAdapter->psAdapter ;
10 BOOLEAN bpowerDownMsg = FALSE ; 10 BOOLEAN bpowerDownMsg = FALSE ;
11 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 11 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
12 12
13 if (unlikely(netif_msg_tx_done(Adapter))) 13 if (unlikely(netif_msg_tx_done(Adapter)))
14 pr_info(PFX "%s: transmit status %d\n", Adapter->dev->name, urb->status); 14 pr_info(PFX "%s: transmit status %d\n", Adapter->dev->name, urb->status);
diff --git a/drivers/staging/bcm/LeakyBucket.c b/drivers/staging/bcm/LeakyBucket.c
index a6584d7c28bd..6e8a3279698b 100644
--- a/drivers/staging/bcm/LeakyBucket.c
+++ b/drivers/staging/bcm/LeakyBucket.c
@@ -15,7 +15,7 @@
15* Returns - None 15* Returns - None
16**********************************************************************/ 16**********************************************************************/
17 17
18static VOID UpdateTokenCount(register PMINI_ADAPTER Adapter) 18static VOID UpdateTokenCount(register struct bcm_mini_adapter *Adapter)
19{ 19{
20 ULONG liCurrentTime; 20 ULONG liCurrentTime;
21 INT i = 0; 21 INT i = 0;
@@ -75,7 +75,7 @@ static VOID UpdateTokenCount(register PMINI_ADAPTER Adapter)
75* Returns - The number of bytes allowed for transmission. 75* Returns - The number of bytes allowed for transmission.
76* 76*
77***********************************************************************/ 77***********************************************************************/
78static ULONG GetSFTokenCount(PMINI_ADAPTER Adapter, struct bcm_packet_info *psSF) 78static ULONG GetSFTokenCount(struct bcm_mini_adapter *Adapter, struct bcm_packet_info *psSF)
79{ 79{
80 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL, "IsPacketAllowedForFlow ===>"); 80 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL, "IsPacketAllowedForFlow ===>");
81 /* Validate the parameters */ 81 /* Validate the parameters */
@@ -112,7 +112,7 @@ static ULONG GetSFTokenCount(PMINI_ADAPTER Adapter, struct bcm_packet_info *psSF
112This function despatches packet from the specified queue. 112This function despatches packet from the specified queue.
113@return Zero(success) or Negative value(failure) 113@return Zero(success) or Negative value(failure)
114*/ 114*/
115static INT SendPacketFromQueue(PMINI_ADAPTER Adapter,/**<Logical Adapter*/ 115static INT SendPacketFromQueue(struct bcm_mini_adapter *Adapter,/**<Logical Adapter*/
116 struct bcm_packet_info *psSF, /**<Queue identifier*/ 116 struct bcm_packet_info *psSF, /**<Queue identifier*/
117 struct sk_buff* Packet) /**<Pointer to the packet to be sent*/ 117 struct sk_buff* Packet) /**<Pointer to the packet to be sent*/
118{ 118{
@@ -156,7 +156,7 @@ static INT SendPacketFromQueue(PMINI_ADAPTER Adapter,/**<Logical Adapter*/
156* Returns - None. 156* Returns - None.
157* 157*
158****************************************************************************/ 158****************************************************************************/
159static VOID CheckAndSendPacketFromIndex(PMINI_ADAPTER Adapter, struct bcm_packet_info *psSF) 159static VOID CheckAndSendPacketFromIndex(struct bcm_mini_adapter *Adapter, struct bcm_packet_info *psSF)
160{ 160{
161 struct sk_buff *QueuePacket=NULL; 161 struct sk_buff *QueuePacket=NULL;
162 char *pControlPacket = NULL; 162 char *pControlPacket = NULL;
@@ -273,7 +273,7 @@ static VOID CheckAndSendPacketFromIndex(PMINI_ADAPTER Adapter, struct bcm_packet
273* 273*
274* Returns - None. 274* Returns - None.
275********************************************************************/ 275********************************************************************/
276VOID transmit_packets(PMINI_ADAPTER Adapter) 276VOID transmit_packets(struct bcm_mini_adapter *Adapter)
277{ 277{
278 UINT uiPrevTotalCount = 0; 278 UINT uiPrevTotalCount = 0;
279 int iIndex = 0; 279 int iIndex = 0;
diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c
index 2772e9259f42..c36fd763310d 100644
--- a/drivers/staging/bcm/Misc.c
+++ b/drivers/staging/bcm/Misc.c
@@ -1,12 +1,12 @@
1#include "headers.h" 1#include "headers.h"
2 2
3static int BcmFileDownload(PMINI_ADAPTER Adapter, const char *path, unsigned int loc); 3static int BcmFileDownload(struct bcm_mini_adapter *Adapter, const char *path, unsigned int loc);
4static VOID doPowerAutoCorrection(PMINI_ADAPTER psAdapter); 4static VOID doPowerAutoCorrection(struct bcm_mini_adapter *psAdapter);
5static void HandleShutDownModeRequest(PMINI_ADAPTER Adapter, PUCHAR pucBuffer); 5static void HandleShutDownModeRequest(struct bcm_mini_adapter *Adapter, PUCHAR pucBuffer);
6static int bcm_parse_target_params(PMINI_ADAPTER Adapter); 6static int bcm_parse_target_params(struct bcm_mini_adapter *Adapter);
7static void beceem_protocol_reset(PMINI_ADAPTER Adapter); 7static void beceem_protocol_reset(struct bcm_mini_adapter *Adapter);
8 8
9static VOID default_wimax_protocol_initialize(PMINI_ADAPTER Adapter) 9static VOID default_wimax_protocol_initialize(struct bcm_mini_adapter *Adapter)
10{ 10{
11 UINT uiLoopIndex; 11 UINT uiLoopIndex;
12 12
@@ -24,7 +24,7 @@ static VOID default_wimax_protocol_initialize(PMINI_ADAPTER Adapter)
24 return; 24 return;
25} 25}
26 26
27INT InitAdapter(PMINI_ADAPTER psAdapter) 27INT InitAdapter(struct bcm_mini_adapter *psAdapter)
28{ 28{
29 int i = 0; 29 int i = 0;
30 INT Status = STATUS_SUCCESS; 30 INT Status = STATUS_SUCCESS;
@@ -93,7 +93,7 @@ INT InitAdapter(PMINI_ADAPTER psAdapter)
93 return STATUS_SUCCESS; 93 return STATUS_SUCCESS;
94} 94}
95 95
96VOID AdapterFree(PMINI_ADAPTER Adapter) 96VOID AdapterFree(struct bcm_mini_adapter *Adapter)
97{ 97{
98 int count; 98 int count;
99 beceem_protocol_reset(Adapter); 99 beceem_protocol_reset(Adapter);
@@ -134,7 +134,7 @@ VOID AdapterFree(PMINI_ADAPTER Adapter)
134 free_netdev(Adapter->dev); 134 free_netdev(Adapter->dev);
135} 135}
136 136
137static int create_worker_threads(PMINI_ADAPTER psAdapter) 137static int create_worker_threads(struct bcm_mini_adapter *psAdapter)
138{ 138{
139 /* Rx Control Packets Processing */ 139 /* Rx Control Packets Processing */
140 psAdapter->control_packet_handler = kthread_run((int (*)(void *)) 140 psAdapter->control_packet_handler = kthread_run((int (*)(void *))
@@ -155,7 +155,7 @@ static int create_worker_threads(PMINI_ADAPTER psAdapter)
155 return 0; 155 return 0;
156} 156}
157 157
158static struct file *open_firmware_file(PMINI_ADAPTER Adapter, const char *path) 158static struct file *open_firmware_file(struct bcm_mini_adapter *Adapter, const char *path)
159{ 159{
160 struct file *flp = NULL; 160 struct file *flp = NULL;
161 mm_segment_t oldfs; 161 mm_segment_t oldfs;
@@ -179,7 +179,7 @@ static struct file *open_firmware_file(PMINI_ADAPTER Adapter, const char *path)
179 * Path to image file 179 * Path to image file
180 * Download Address on the chip 180 * Download Address on the chip
181 */ 181 */
182static int BcmFileDownload(PMINI_ADAPTER Adapter, const char *path, unsigned int loc) 182static int BcmFileDownload(struct bcm_mini_adapter *Adapter, const char *path, unsigned int loc)
183{ 183{
184 int errorno = 0; 184 int errorno = 0;
185 struct file *flp = NULL; 185 struct file *flp = NULL;
@@ -231,7 +231,7 @@ exit_download:
231 * Logical Adapter 231 * Logical Adapter
232 * Control Packet Buffer 232 * Control Packet Buffer
233 */ 233 */
234INT CopyBufferToControlPacket(PMINI_ADAPTER Adapter, PVOID ioBuffer) 234INT CopyBufferToControlPacket(struct bcm_mini_adapter *Adapter, PVOID ioBuffer)
235{ 235{
236 struct bcm_leader *pLeader = NULL; 236 struct bcm_leader *pLeader = NULL;
237 INT Status = 0; 237 INT Status = 0;
@@ -414,7 +414,7 @@ INT CopyBufferToControlPacket(PMINI_ADAPTER Adapter, PVOID ioBuffer)
414* 414*
415* Returns - None. 415* Returns - None.
416*****************************************************************/ 416*****************************************************************/
417static VOID SendStatisticsPointerRequest(PMINI_ADAPTER Adapter, struct bcm_link_request *pstStatisticsPtrRequest) 417static VOID SendStatisticsPointerRequest(struct bcm_mini_adapter *Adapter, struct bcm_link_request *pstStatisticsPtrRequest)
418{ 418{
419 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL, "======>"); 419 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL, "======>");
420 pstStatisticsPtrRequest->Leader.Status = STATS_POINTER_REQ_STATUS; 420 pstStatisticsPtrRequest->Leader.Status = STATS_POINTER_REQ_STATUS;
@@ -436,7 +436,7 @@ static VOID SendStatisticsPointerRequest(PMINI_ADAPTER Adapter, struct bcm_link_
436* 436*
437* Returns - None. 437* Returns - None.
438*******************************************************************/ 438*******************************************************************/
439VOID LinkMessage(PMINI_ADAPTER Adapter) 439VOID LinkMessage(struct bcm_mini_adapter *Adapter)
440{ 440{
441 struct bcm_link_request *pstLinkRequest = NULL; 441 struct bcm_link_request *pstLinkRequest = NULL;
442 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LINK_UP_MSG, DBG_LVL_ALL, "=====>"); 442 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LINK_UP_MSG, DBG_LVL_ALL, "=====>");
@@ -487,7 +487,7 @@ VOID LinkMessage(PMINI_ADAPTER Adapter)
487* 487*
488* Returns - None. 488* Returns - None.
489************************************************************************/ 489************************************************************************/
490VOID StatisticsResponse(PMINI_ADAPTER Adapter, PVOID pvBuffer) 490VOID StatisticsResponse(struct bcm_mini_adapter *Adapter, PVOID pvBuffer)
491{ 491{
492 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "%s====>", __func__); 492 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "%s====>", __func__);
493 Adapter->StatisticsPointer = ntohl(*(__be32 *)pvBuffer); 493 Adapter->StatisticsPointer = ntohl(*(__be32 *)pvBuffer);
@@ -506,7 +506,7 @@ VOID StatisticsResponse(PMINI_ADAPTER Adapter, PVOID pvBuffer)
506* 506*
507* Returns - None. 507* Returns - None.
508***********************************************************************/ 508***********************************************************************/
509VOID LinkControlResponseMessage(PMINI_ADAPTER Adapter, PUCHAR pucBuffer) 509VOID LinkControlResponseMessage(struct bcm_mini_adapter *Adapter, PUCHAR pucBuffer)
510{ 510{
511 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL, "=====>"); 511 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL, "=====>");
512 512
@@ -580,7 +580,7 @@ VOID LinkControlResponseMessage(PMINI_ADAPTER Adapter, PUCHAR pucBuffer)
580 return; 580 return;
581} 581}
582 582
583void SendIdleModeResponse(PMINI_ADAPTER Adapter) 583void SendIdleModeResponse(struct bcm_mini_adapter *Adapter)
584{ 584{
585 INT status = 0, NVMAccess = 0, lowPwrAbortMsg = 0; 585 INT status = 0, NVMAccess = 0, lowPwrAbortMsg = 0;
586 struct timeval tv; 586 struct timeval tv;
@@ -679,7 +679,7 @@ void SendIdleModeResponse(PMINI_ADAPTER Adapter)
679* 679*
680* Returns - None. 680* Returns - None.
681*******************************************************************/ 681*******************************************************************/
682VOID DumpPackInfo(PMINI_ADAPTER Adapter) 682VOID DumpPackInfo(struct bcm_mini_adapter *Adapter)
683{ 683{
684 UINT uiLoopIndex = 0; 684 UINT uiLoopIndex = 0;
685 UINT uiIndex = 0; 685 UINT uiIndex = 0;
@@ -808,10 +808,10 @@ VOID DumpPackInfo(PMINI_ADAPTER Adapter)
808 return; 808 return;
809} 809}
810 810
811int reset_card_proc(PMINI_ADAPTER ps_adapter) 811int reset_card_proc(struct bcm_mini_adapter *ps_adapter)
812{ 812{
813 int retval = STATUS_SUCCESS; 813 int retval = STATUS_SUCCESS;
814 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 814 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
815 PS_INTERFACE_ADAPTER psIntfAdapter = NULL; 815 PS_INTERFACE_ADAPTER psIntfAdapter = NULL;
816 unsigned int value = 0, uiResetValue = 0; 816 unsigned int value = 0, uiResetValue = 0;
817 int bytes; 817 int bytes;
@@ -926,7 +926,7 @@ err_exit:
926 return retval; 926 return retval;
927} 927}
928 928
929int run_card_proc(PMINI_ADAPTER ps_adapter) 929int run_card_proc(struct bcm_mini_adapter *ps_adapter)
930{ 930{
931 int status = STATUS_SUCCESS; 931 int status = STATUS_SUCCESS;
932 int bytes; 932 int bytes;
@@ -953,7 +953,7 @@ int run_card_proc(PMINI_ADAPTER ps_adapter)
953 return status; 953 return status;
954} 954}
955 955
956int InitCardAndDownloadFirmware(PMINI_ADAPTER ps_adapter) 956int InitCardAndDownloadFirmware(struct bcm_mini_adapter *ps_adapter)
957{ 957{
958 int status; 958 int status;
959 UINT value = 0; 959 UINT value = 0;
@@ -1077,7 +1077,7 @@ OUT:
1077 return status; 1077 return status;
1078} 1078}
1079 1079
1080static int bcm_parse_target_params(PMINI_ADAPTER Adapter) 1080static int bcm_parse_target_params(struct bcm_mini_adapter *Adapter)
1081{ 1081{
1082 struct file *flp = NULL; 1082 struct file *flp = NULL;
1083 mm_segment_t oldfs = {0}; 1083 mm_segment_t oldfs = {0};
@@ -1128,7 +1128,7 @@ static int bcm_parse_target_params(PMINI_ADAPTER Adapter)
1128 return STATUS_SUCCESS; 1128 return STATUS_SUCCESS;
1129} 1129}
1130 1130
1131void beceem_parse_target_struct(PMINI_ADAPTER Adapter) 1131void beceem_parse_target_struct(struct bcm_mini_adapter *Adapter)
1132{ 1132{
1133 UINT uiHostDrvrCfg6 = 0, uiEEPROMFlag = 0; 1133 UINT uiHostDrvrCfg6 = 0, uiEEPROMFlag = 0;
1134 1134
@@ -1186,7 +1186,7 @@ void beceem_parse_target_struct(PMINI_ADAPTER Adapter)
1186 doPowerAutoCorrection(Adapter); 1186 doPowerAutoCorrection(Adapter);
1187} 1187}
1188 1188
1189static VOID doPowerAutoCorrection(PMINI_ADAPTER psAdapter) 1189static VOID doPowerAutoCorrection(struct bcm_mini_adapter *psAdapter)
1190{ 1190{
1191 UINT reporting_mode; 1191 UINT reporting_mode;
1192 1192
@@ -1218,7 +1218,7 @@ static VOID doPowerAutoCorrection(PMINI_ADAPTER psAdapter)
1218} 1218}
1219 1219
1220#if 0 1220#if 0
1221static unsigned char *ReadMacAddrEEPROM(PMINI_ADAPTER Adapter, ulong dwAddress) 1221static unsigned char *ReadMacAddrEEPROM(struct bcm_mini_adapter *Adapter, ulong dwAddress)
1222{ 1222{
1223 int status = 0, i = 0; 1223 int status = 0, i = 0;
1224 unsigned int temp = 0; 1224 unsigned int temp = 0;
@@ -1272,13 +1272,13 @@ static void convertEndian(B_UINT8 rwFlag, PUINT puiBuffer, UINT uiByteCount)
1272#define CACHE_ADDRESS_MASK 0x80000000 1272#define CACHE_ADDRESS_MASK 0x80000000
1273#define UNCACHE_ADDRESS_MASK 0xa0000000 1273#define UNCACHE_ADDRESS_MASK 0xa0000000
1274 1274
1275int rdm(PMINI_ADAPTER Adapter, UINT uiAddress, PCHAR pucBuff, size_t sSize) 1275int rdm(struct bcm_mini_adapter *Adapter, UINT uiAddress, PCHAR pucBuff, size_t sSize)
1276{ 1276{
1277 return Adapter->interface_rdm(Adapter->pvInterfaceAdapter, 1277 return Adapter->interface_rdm(Adapter->pvInterfaceAdapter,
1278 uiAddress, pucBuff, sSize); 1278 uiAddress, pucBuff, sSize);
1279} 1279}
1280 1280
1281int wrm(PMINI_ADAPTER Adapter, UINT uiAddress, PCHAR pucBuff, size_t sSize) 1281int wrm(struct bcm_mini_adapter *Adapter, UINT uiAddress, PCHAR pucBuff, size_t sSize)
1282{ 1282{
1283 int iRetVal; 1283 int iRetVal;
1284 1284
@@ -1287,13 +1287,13 @@ int wrm(PMINI_ADAPTER Adapter, UINT uiAddress, PCHAR pucBuff, size_t sSize)
1287 return iRetVal; 1287 return iRetVal;
1288} 1288}
1289 1289
1290int wrmalt(PMINI_ADAPTER Adapter, UINT uiAddress, PUINT pucBuff, size_t size) 1290int wrmalt(struct bcm_mini_adapter *Adapter, UINT uiAddress, PUINT pucBuff, size_t size)
1291{ 1291{
1292 convertEndian(RWM_WRITE, pucBuff, size); 1292 convertEndian(RWM_WRITE, pucBuff, size);
1293 return wrm(Adapter, uiAddress, (PUCHAR)pucBuff, size); 1293 return wrm(Adapter, uiAddress, (PUCHAR)pucBuff, size);
1294} 1294}
1295 1295
1296int rdmalt(PMINI_ADAPTER Adapter, UINT uiAddress, PUINT pucBuff, size_t size) 1296int rdmalt(struct bcm_mini_adapter *Adapter, UINT uiAddress, PUINT pucBuff, size_t size)
1297{ 1297{
1298 INT uiRetVal = 0; 1298 INT uiRetVal = 0;
1299 1299
@@ -1303,7 +1303,7 @@ int rdmalt(PMINI_ADAPTER Adapter, UINT uiAddress, PUINT pucBuff, size_t size)
1303 return uiRetVal; 1303 return uiRetVal;
1304} 1304}
1305 1305
1306int wrmWithLock(PMINI_ADAPTER Adapter, UINT uiAddress, PCHAR pucBuff, size_t sSize) 1306int wrmWithLock(struct bcm_mini_adapter *Adapter, UINT uiAddress, PCHAR pucBuff, size_t sSize)
1307{ 1307{
1308 INT status = STATUS_SUCCESS; 1308 INT status = STATUS_SUCCESS;
1309 down(&Adapter->rdmwrmsync); 1309 down(&Adapter->rdmwrmsync);
@@ -1322,7 +1322,7 @@ exit:
1322 return status; 1322 return status;
1323} 1323}
1324 1324
1325int wrmaltWithLock(PMINI_ADAPTER Adapter, UINT uiAddress, PUINT pucBuff, size_t size) 1325int wrmaltWithLock(struct bcm_mini_adapter *Adapter, UINT uiAddress, PUINT pucBuff, size_t size)
1326{ 1326{
1327 int iRetVal = STATUS_SUCCESS; 1327 int iRetVal = STATUS_SUCCESS;
1328 1328
@@ -1342,7 +1342,7 @@ exit:
1342 return iRetVal; 1342 return iRetVal;
1343} 1343}
1344 1344
1345int rdmaltWithLock(PMINI_ADAPTER Adapter, UINT uiAddress, PUINT pucBuff, size_t size) 1345int rdmaltWithLock(struct bcm_mini_adapter *Adapter, UINT uiAddress, PUINT pucBuff, size_t size)
1346{ 1346{
1347 INT uiRetVal = STATUS_SUCCESS; 1347 INT uiRetVal = STATUS_SUCCESS;
1348 1348
@@ -1361,7 +1361,7 @@ exit:
1361 return uiRetVal; 1361 return uiRetVal;
1362} 1362}
1363 1363
1364static VOID HandleShutDownModeWakeup(PMINI_ADAPTER Adapter) 1364static VOID HandleShutDownModeWakeup(struct bcm_mini_adapter *Adapter)
1365{ 1365{
1366 int clear_abort_pattern = 0, Status = 0; 1366 int clear_abort_pattern = 0, Status = 0;
1367 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, MP_SHUTDOWN, DBG_LVL_ALL, "====>\n"); 1367 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, MP_SHUTDOWN, DBG_LVL_ALL, "====>\n");
@@ -1390,7 +1390,7 @@ static VOID HandleShutDownModeWakeup(PMINI_ADAPTER Adapter)
1390 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, MP_SHUTDOWN, DBG_LVL_ALL, "<====\n"); 1390 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, MP_SHUTDOWN, DBG_LVL_ALL, "<====\n");
1391} 1391}
1392 1392
1393static VOID SendShutModeResponse(PMINI_ADAPTER Adapter) 1393static VOID SendShutModeResponse(struct bcm_mini_adapter *Adapter)
1394{ 1394{
1395 struct bcm_link_request stShutdownResponse; 1395 struct bcm_link_request stShutdownResponse;
1396 UINT NVMAccess = 0, lowPwrAbortMsg = 0; 1396 UINT NVMAccess = 0, lowPwrAbortMsg = 0;
@@ -1474,7 +1474,7 @@ static VOID SendShutModeResponse(PMINI_ADAPTER Adapter)
1474 } 1474 }
1475} 1475}
1476 1476
1477static void HandleShutDownModeRequest(PMINI_ADAPTER Adapter, PUCHAR pucBuffer) 1477static void HandleShutDownModeRequest(struct bcm_mini_adapter *Adapter, PUCHAR pucBuffer)
1478{ 1478{
1479 B_UINT32 uiResetValue = 0; 1479 B_UINT32 uiResetValue = 0;
1480 1480
@@ -1503,7 +1503,7 @@ static void HandleShutDownModeRequest(PMINI_ADAPTER Adapter, PUCHAR pucBuffer)
1503 return; 1503 return;
1504} 1504}
1505 1505
1506VOID ResetCounters(PMINI_ADAPTER Adapter) 1506VOID ResetCounters(struct bcm_mini_adapter *Adapter)
1507{ 1507{
1508 beceem_protocol_reset(Adapter); 1508 beceem_protocol_reset(Adapter);
1509 Adapter->CurrNumRecvDescs = 0; 1509 Adapter->CurrNumRecvDescs = 0;
@@ -1519,7 +1519,7 @@ VOID ResetCounters(PMINI_ADAPTER Adapter)
1519 Adapter->bShutStatus = FALSE; 1519 Adapter->bShutStatus = FALSE;
1520} 1520}
1521 1521
1522struct bcm_classifier_rule *GetFragIPClsEntry(PMINI_ADAPTER Adapter, USHORT usIpIdentification, ULONG SrcIP) 1522struct bcm_classifier_rule *GetFragIPClsEntry(struct bcm_mini_adapter *Adapter, USHORT usIpIdentification, ULONG SrcIP)
1523{ 1523{
1524 UINT uiIndex = 0; 1524 UINT uiIndex = 0;
1525 for (uiIndex = 0; uiIndex < MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES; uiIndex++) { 1525 for (uiIndex = 0; uiIndex < MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES; uiIndex++) {
@@ -1533,7 +1533,7 @@ struct bcm_classifier_rule *GetFragIPClsEntry(PMINI_ADAPTER Adapter, USHORT usIp
1533 return NULL; 1533 return NULL;
1534} 1534}
1535 1535
1536void AddFragIPClsEntry(PMINI_ADAPTER Adapter, struct bcm_fragmented_packet_info *psFragPktInfo) 1536void AddFragIPClsEntry(struct bcm_mini_adapter *Adapter, struct bcm_fragmented_packet_info *psFragPktInfo)
1537{ 1537{
1538 UINT uiIndex = 0; 1538 UINT uiIndex = 0;
1539 for (uiIndex = 0; uiIndex < MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES; uiIndex++) { 1539 for (uiIndex = 0; uiIndex < MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES; uiIndex++) {
@@ -1544,7 +1544,7 @@ void AddFragIPClsEntry(PMINI_ADAPTER Adapter, struct bcm_fragmented_packet_info
1544 } 1544 }
1545} 1545}
1546 1546
1547void DelFragIPClsEntry(PMINI_ADAPTER Adapter, USHORT usIpIdentification, ULONG SrcIp) 1547void DelFragIPClsEntry(struct bcm_mini_adapter *Adapter, USHORT usIpIdentification, ULONG SrcIp)
1548{ 1548{
1549 UINT uiIndex = 0; 1549 UINT uiIndex = 0;
1550 for (uiIndex = 0; uiIndex < MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES; uiIndex++) { 1550 for (uiIndex = 0; uiIndex < MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES; uiIndex++) {
@@ -1556,7 +1556,7 @@ void DelFragIPClsEntry(PMINI_ADAPTER Adapter, USHORT usIpIdentification, ULONG S
1556 } 1556 }
1557} 1557}
1558 1558
1559void update_per_cid_rx(PMINI_ADAPTER Adapter) 1559void update_per_cid_rx(struct bcm_mini_adapter *Adapter)
1560{ 1560{
1561 UINT qindex = 0; 1561 UINT qindex = 0;
1562 1562
@@ -1580,7 +1580,7 @@ void update_per_cid_rx(PMINI_ADAPTER Adapter)
1580 Adapter->liDrainCalculated = jiffies; 1580 Adapter->liDrainCalculated = jiffies;
1581} 1581}
1582 1582
1583void update_per_sf_desc_cnts(PMINI_ADAPTER Adapter) 1583void update_per_sf_desc_cnts(struct bcm_mini_adapter *Adapter)
1584{ 1584{
1585 INT iIndex = 0; 1585 INT iIndex = 0;
1586 u32 uibuff[MAX_TARGET_DSX_BUFFERS]; 1586 u32 uibuff[MAX_TARGET_DSX_BUFFERS];
@@ -1606,7 +1606,7 @@ void update_per_sf_desc_cnts(PMINI_ADAPTER Adapter)
1606 atomic_set(&Adapter->uiMBupdate, FALSE); 1606 atomic_set(&Adapter->uiMBupdate, FALSE);
1607} 1607}
1608 1608
1609void flush_queue(PMINI_ADAPTER Adapter, UINT iQIndex) 1609void flush_queue(struct bcm_mini_adapter *Adapter, UINT iQIndex)
1610{ 1610{
1611 struct sk_buff *PacketToDrop = NULL; 1611 struct sk_buff *PacketToDrop = NULL;
1612 struct net_device_stats *netstats = &Adapter->dev->stats; 1612 struct net_device_stats *netstats = &Adapter->dev->stats;
@@ -1630,7 +1630,7 @@ void flush_queue(PMINI_ADAPTER Adapter, UINT iQIndex)
1630 spin_unlock_bh(&Adapter->PackInfo[iQIndex].SFQueueLock); 1630 spin_unlock_bh(&Adapter->PackInfo[iQIndex].SFQueueLock);
1631} 1631}
1632 1632
1633static void beceem_protocol_reset(PMINI_ADAPTER Adapter) 1633static void beceem_protocol_reset(struct bcm_mini_adapter *Adapter)
1634{ 1634{
1635 int i; 1635 int i;
1636 if (netif_msg_link(Adapter)) 1636 if (netif_msg_link(Adapter))
diff --git a/drivers/staging/bcm/PHSModule.c b/drivers/staging/bcm/PHSModule.c
index 4aa2b71a40eb..a6e61510d278 100644
--- a/drivers/staging/bcm/PHSModule.c
+++ b/drivers/staging/bcm/PHSModule.c
@@ -58,7 +58,7 @@ Description: This routine handle PHS(Payload Header Suppression for Tx path.
58 The header data after supression is copied back to the NDIS_PACKET. 58 The header data after supression is copied back to the NDIS_PACKET.
59 59
60 60
61Input parameters: IN PMINI_ADAPTER Adapter - Miniport Adapter Context 61Input parameters: IN struct bcm_mini_adapter *Adapter - Miniport Adapter Context
62 IN Packet - NDIS packet containing data to be transmitted 62 IN Packet - NDIS packet containing data to be transmitted
63 IN USHORT Vcid - vcid pertaining to connection on which the packet is being sent.Used to 63 IN USHORT Vcid - vcid pertaining to connection on which the packet is being sent.Used to
64 identify PHS rule to be applied. 64 identify PHS rule to be applied.
@@ -69,7 +69,7 @@ Return: STATUS_SUCCESS - If the send was successful.
69 Other - If an error occured. 69 Other - If an error occured.
70*/ 70*/
71 71
72int PHSTransmit(PMINI_ADAPTER Adapter, 72int PHSTransmit(struct bcm_mini_adapter *Adapter,
73 struct sk_buff **pPacket, 73 struct sk_buff **pPacket,
74 USHORT Vcid, 74 USHORT Vcid,
75 B_UINT16 uiClassifierRuleID, 75 B_UINT16 uiClassifierRuleID,
@@ -209,7 +209,7 @@ int PHSTransmit(PMINI_ADAPTER Adapter,
209 return STATUS_SUCCESS; 209 return STATUS_SUCCESS;
210} 210}
211 211
212int PHSReceive(PMINI_ADAPTER Adapter, 212int PHSReceive(struct bcm_mini_adapter *Adapter,
213 USHORT usVcid, 213 USHORT usVcid,
214 struct sk_buff *packet, 214 struct sk_buff *packet,
215 UINT *punPacketLen, 215 UINT *punPacketLen,
@@ -273,7 +273,7 @@ int PHSReceive(PMINI_ADAPTER Adapter,
273 273
274void DumpFullPacket(UCHAR *pBuf,UINT nPktLen) 274void DumpFullPacket(UCHAR *pBuf,UINT nPktLen)
275{ 275{
276 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 276 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
277 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,"Dumping Data Packet"); 277 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,"Dumping Data Packet");
278 BCM_DEBUG_PRINT_BUFFER(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,pBuf,nPktLen); 278 BCM_DEBUG_PRINT_BUFFER(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,pBuf,nPktLen);
279} 279}
@@ -291,7 +291,7 @@ void DumpFullPacket(UCHAR *pBuf,UINT nPktLen)
291// TRUE(1) -If allocation of memory was success full. 291// TRUE(1) -If allocation of memory was success full.
292// FALSE -If allocation of memory fails. 292// FALSE -If allocation of memory fails.
293//----------------------------------------------------------------------------- 293//-----------------------------------------------------------------------------
294int phs_init(PPHS_DEVICE_EXTENSION pPhsdeviceExtension,PMINI_ADAPTER Adapter) 294int phs_init(PPHS_DEVICE_EXTENSION pPhsdeviceExtension, struct bcm_mini_adapter *Adapter)
295{ 295{
296 int i; 296 int i;
297 S_SERVICEFLOW_TABLE *pstServiceFlowTable; 297 S_SERVICEFLOW_TABLE *pstServiceFlowTable;
@@ -398,7 +398,7 @@ ULONG PhsUpdateClassifierRule(IN void* pvContext,
398 ULONG lStatus =0; 398 ULONG lStatus =0;
399 UINT nSFIndex =0 ; 399 UINT nSFIndex =0 ;
400 S_SERVICEFLOW_ENTRY *pstServiceFlowEntry = NULL; 400 S_SERVICEFLOW_ENTRY *pstServiceFlowEntry = NULL;
401 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 401 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
402 402
403 403
404 404
@@ -462,7 +462,7 @@ ULONG PhsDeletePHSRule(IN void* pvContext,IN B_UINT16 uiVcid,IN B_UINT8 u8PHSI)
462 UINT nSFIndex =0, nClsidIndex =0 ; 462 UINT nSFIndex =0, nClsidIndex =0 ;
463 S_SERVICEFLOW_ENTRY *pstServiceFlowEntry = NULL; 463 S_SERVICEFLOW_ENTRY *pstServiceFlowEntry = NULL;
464 S_CLASSIFIER_TABLE *pstClassifierRulesTable = NULL; 464 S_CLASSIFIER_TABLE *pstClassifierRulesTable = NULL;
465 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 465 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
466 466
467 467
468 PPHS_DEVICE_EXTENSION pDeviceExtension= (PPHS_DEVICE_EXTENSION)pvContext; 468 PPHS_DEVICE_EXTENSION pDeviceExtension= (PPHS_DEVICE_EXTENSION)pvContext;
@@ -528,7 +528,7 @@ ULONG PhsDeleteClassifierRule(IN void* pvContext,IN B_UINT16 uiVcid ,IN B_UINT16
528 UINT nSFIndex =0, nClsidIndex =0 ; 528 UINT nSFIndex =0, nClsidIndex =0 ;
529 S_SERVICEFLOW_ENTRY *pstServiceFlowEntry = NULL; 529 S_SERVICEFLOW_ENTRY *pstServiceFlowEntry = NULL;
530 S_CLASSIFIER_ENTRY *pstClassifierEntry = NULL; 530 S_CLASSIFIER_ENTRY *pstClassifierEntry = NULL;
531 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 531 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
532 PPHS_DEVICE_EXTENSION pDeviceExtension= (PPHS_DEVICE_EXTENSION)pvContext; 532 PPHS_DEVICE_EXTENSION pDeviceExtension= (PPHS_DEVICE_EXTENSION)pvContext;
533 533
534 if(pDeviceExtension) 534 if(pDeviceExtension)
@@ -592,7 +592,7 @@ ULONG PhsDeleteSFRules(IN void* pvContext,IN B_UINT16 uiVcid)
592 UINT nSFIndex =0, nClsidIndex =0 ; 592 UINT nSFIndex =0, nClsidIndex =0 ;
593 S_SERVICEFLOW_ENTRY *pstServiceFlowEntry = NULL; 593 S_SERVICEFLOW_ENTRY *pstServiceFlowEntry = NULL;
594 S_CLASSIFIER_TABLE *pstClassifierRulesTable = NULL; 594 S_CLASSIFIER_TABLE *pstClassifierRulesTable = NULL;
595 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 595 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
596 PPHS_DEVICE_EXTENSION pDeviceExtension= (PPHS_DEVICE_EXTENSION)pvContext; 596 PPHS_DEVICE_EXTENSION pDeviceExtension= (PPHS_DEVICE_EXTENSION)pvContext;
597 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL,"====> \n"); 597 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL,"====> \n");
598 598
@@ -684,7 +684,7 @@ ULONG PhsCompress(IN void* pvContext,
684 S_CLASSIFIER_ENTRY *pstClassifierEntry = NULL; 684 S_CLASSIFIER_ENTRY *pstClassifierEntry = NULL;
685 S_PHS_RULE *pstPhsRule = NULL; 685 S_PHS_RULE *pstPhsRule = NULL;
686 ULONG lStatus =0; 686 ULONG lStatus =0;
687 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 687 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
688 688
689 689
690 690
@@ -778,7 +778,7 @@ ULONG PhsDeCompress(IN void* pvContext,
778 S_SERVICEFLOW_ENTRY *pstServiceFlowEntry = NULL; 778 S_SERVICEFLOW_ENTRY *pstServiceFlowEntry = NULL;
779 S_PHS_RULE *pstPhsRule = NULL; 779 S_PHS_RULE *pstPhsRule = NULL;
780 UINT phsi; 780 UINT phsi;
781 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 781 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
782 PPHS_DEVICE_EXTENSION pDeviceExtension= 782 PPHS_DEVICE_EXTENSION pDeviceExtension=
783 (PPHS_DEVICE_EXTENSION)pvContext; 783 (PPHS_DEVICE_EXTENSION)pvContext;
784 784
@@ -847,7 +847,7 @@ ULONG PhsDeCompress(IN void* pvContext,
847static void free_phs_serviceflow_rules(S_SERVICEFLOW_TABLE *psServiceFlowRulesTable) 847static void free_phs_serviceflow_rules(S_SERVICEFLOW_TABLE *psServiceFlowRulesTable)
848{ 848{
849 int i,j; 849 int i,j;
850 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 850 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
851 851
852 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "=======>\n"); 852 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "=======>\n");
853 if(psServiceFlowRulesTable) 853 if(psServiceFlowRulesTable)
@@ -1057,7 +1057,7 @@ UINT CreateClassiferToPHSRuleMapping(IN B_UINT16 uiVcid,
1057 UINT uiStatus =PHS_SUCCESS; 1057 UINT uiStatus =PHS_SUCCESS;
1058 UINT nClassifierIndex = 0; 1058 UINT nClassifierIndex = 0;
1059 S_CLASSIFIER_TABLE *psaClassifiertable = NULL; 1059 S_CLASSIFIER_TABLE *psaClassifiertable = NULL;
1060 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 1060 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
1061 psaClassifiertable = pstServiceFlowEntry->pstClassifierTable; 1061 psaClassifiertable = pstServiceFlowEntry->pstClassifierTable;
1062 1062
1063 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "==>"); 1063 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "==>");
@@ -1148,7 +1148,7 @@ static UINT CreateClassifierPHSRule(IN B_UINT16 uiClsId,
1148 BOOLEAN bFreeEntryFound = FALSE; 1148 BOOLEAN bFreeEntryFound = FALSE;
1149 S_CLASSIFIER_ENTRY *psClassifierRules = NULL; 1149 S_CLASSIFIER_ENTRY *psClassifierRules = NULL;
1150 UINT nStatus = PHS_SUCCESS; 1150 UINT nStatus = PHS_SUCCESS;
1151 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 1151 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
1152 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL,"Inside CreateClassifierPHSRule"); 1152 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL,"Inside CreateClassifierPHSRule");
1153 if(psaClassifiertable == NULL) 1153 if(psaClassifiertable == NULL)
1154 { 1154 {
@@ -1259,7 +1259,7 @@ static UINT UpdateClassifierPHSRule(IN B_UINT16 uiClsId,
1259 S_PHS_RULE *pstAddPhsRule = NULL; 1259 S_PHS_RULE *pstAddPhsRule = NULL;
1260 UINT nPhsRuleIndex = 0; 1260 UINT nPhsRuleIndex = 0;
1261 BOOLEAN bPHSRuleOrphaned = FALSE; 1261 BOOLEAN bPHSRuleOrphaned = FALSE;
1262 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 1262 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
1263 psPhsRule->u8RefCnt =0; 1263 psPhsRule->u8RefCnt =0;
1264 1264
1265 /* Step 1 Deref Any Exisiting PHS Rule in this classifier Entry*/ 1265 /* Step 1 Deref Any Exisiting PHS Rule in this classifier Entry*/
@@ -1334,7 +1334,7 @@ static BOOLEAN DerefPhsRule(IN B_UINT16 uiClsId,S_CLASSIFIER_TABLE *psaClassifi
1334void DumpPhsRules(PPHS_DEVICE_EXTENSION pDeviceExtension) 1334void DumpPhsRules(PPHS_DEVICE_EXTENSION pDeviceExtension)
1335{ 1335{
1336 int i,j,k,l; 1336 int i,j,k,l;
1337 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 1337 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
1338 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\n Dumping PHS Rules : \n"); 1338 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "\n Dumping PHS Rules : \n");
1339 for(i=0;i<MAX_SERVICEFLOWS;i++) 1339 for(i=0;i<MAX_SERVICEFLOWS;i++)
1340 { 1340 {
@@ -1415,7 +1415,7 @@ int phs_decompress(unsigned char *in_buf,unsigned char *out_buf,
1415 int bit,i=0; 1415 int bit,i=0;
1416 unsigned char *phsf,*phsm; 1416 unsigned char *phsf,*phsm;
1417 int in_buf_len = *header_size-1; 1417 int in_buf_len = *header_size-1;
1418 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 1418 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
1419 in_buf++; 1419 in_buf++;
1420 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_RECEIVE,DBG_LVL_ALL,"====>\n"); 1420 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_RECEIVE,DBG_LVL_ALL,"====>\n");
1421 *header_size = 0; 1421 *header_size = 0;
@@ -1495,7 +1495,7 @@ static int phs_compress(S_PHS_RULE *phs_rule,unsigned char *in_buf
1495{ 1495{
1496 unsigned char *old_addr = out_buf; 1496 unsigned char *old_addr = out_buf;
1497 int supress = 0; 1497 int supress = 0;
1498 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 1498 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
1499 if(phs_rule == NULL) 1499 if(phs_rule == NULL)
1500 { 1500 {
1501 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_SEND, DBG_LVL_ALL,"\nphs_compress(): phs_rule null!"); 1501 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_SEND, DBG_LVL_ALL,"\nphs_compress(): phs_rule null!");
@@ -1557,7 +1557,7 @@ static int verify_suppress_phsf(unsigned char *in_buffer,unsigned char *out_buff
1557{ 1557{
1558 unsigned int size=0; 1558 unsigned int size=0;
1559 int bit,i=0; 1559 int bit,i=0;
1560 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 1560 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
1561 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_SEND, DBG_LVL_ALL,"\nCOMP:In verify_phsf PHSM - 0x%X",*phsm); 1561 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_SEND, DBG_LVL_ALL,"\nCOMP:In verify_phsf PHSM - 0x%X",*phsm);
1562 1562
1563 1563
diff --git a/drivers/staging/bcm/PHSModule.h b/drivers/staging/bcm/PHSModule.h
index c629585d0a8c..b5f21157ac47 100644
--- a/drivers/staging/bcm/PHSModule.h
+++ b/drivers/staging/bcm/PHSModule.h
@@ -1,7 +1,7 @@
1#ifndef BCM_MINIPORT_PHSMODULE_H 1#ifndef BCM_MINIPORT_PHSMODULE_H
2#define BCM_MINIPORT_PHSMODULE_H 2#define BCM_MINIPORT_PHSMODULE_H
3 3
4int PHSTransmit(PMINI_ADAPTER Adapter, 4int PHSTransmit(struct bcm_mini_adapter *Adapter,
5 struct sk_buff **pPacket, 5 struct sk_buff **pPacket,
6 USHORT Vcid, 6 USHORT Vcid,
7 B_UINT16 uiClassifierRuleID, 7 B_UINT16 uiClassifierRuleID,
@@ -9,7 +9,7 @@ int PHSTransmit(PMINI_ADAPTER Adapter,
9 PUINT PacketLen, 9 PUINT PacketLen,
10 UCHAR bEthCSSupport); 10 UCHAR bEthCSSupport);
11 11
12int PHSReceive(PMINI_ADAPTER Adapter, 12int PHSReceive(struct bcm_mini_adapter *Adapter,
13 USHORT usVcid, 13 USHORT usVcid,
14 struct sk_buff *packet, 14 struct sk_buff *packet,
15 UINT *punPacketLen, 15 UINT *punPacketLen,
@@ -25,7 +25,7 @@ void DumpFullPacket(UCHAR *pBuf,UINT nPktLen);
25void DumpPhsRules(PPHS_DEVICE_EXTENSION pDeviceExtension); 25void DumpPhsRules(PPHS_DEVICE_EXTENSION pDeviceExtension);
26 26
27 27
28int phs_init(PPHS_DEVICE_EXTENSION pPhsdeviceExtension,PMINI_ADAPTER Adapter); 28int phs_init(PPHS_DEVICE_EXTENSION pPhsdeviceExtension,struct bcm_mini_adapter *Adapter);
29 29
30int PhsCleanup(PPHS_DEVICE_EXTENSION pPHSDeviceExt); 30int PhsCleanup(PPHS_DEVICE_EXTENSION pPHSDeviceExt);
31 31
diff --git a/drivers/staging/bcm/Prototypes.h b/drivers/staging/bcm/Prototypes.h
index 42a04b95909d..3c8cc5ba2e2e 100644
--- a/drivers/staging/bcm/Prototypes.h
+++ b/drivers/staging/bcm/Prototypes.h
@@ -1,172 +1,172 @@
1#ifndef _PROTOTYPES_H_ 1#ifndef _PROTOTYPES_H_
2#define _PROTOTYPES_H_ 2#define _PROTOTYPES_H_
3 3
4VOID LinkControlResponseMessage(PMINI_ADAPTER Adapter, PUCHAR pucBuffer); 4VOID LinkControlResponseMessage(struct bcm_mini_adapter *Adapter, PUCHAR pucBuffer);
5 5
6VOID StatisticsResponse(PMINI_ADAPTER Adapter,PVOID pvBuffer); 6VOID StatisticsResponse(struct bcm_mini_adapter *Adapter,PVOID pvBuffer);
7 7
8VOID IdleModeResponse(PMINI_ADAPTER Adapter,PUINT puiBuffer); 8VOID IdleModeResponse(struct bcm_mini_adapter *Adapter,PUINT puiBuffer);
9 9
10int control_packet_handler (PMINI_ADAPTER Adapter); 10int control_packet_handler (struct bcm_mini_adapter *Adapter);
11 11
12VOID DeleteAllClassifiersForSF(PMINI_ADAPTER Adapter,UINT uiSearchRuleIndex); 12VOID DeleteAllClassifiersForSF(struct bcm_mini_adapter *Adapter,UINT uiSearchRuleIndex);
13 13
14VOID flush_all_queues(PMINI_ADAPTER Adapter); 14VOID flush_all_queues(struct bcm_mini_adapter *Adapter);
15 15
16int register_control_device_interface(PMINI_ADAPTER ps_adapter); 16int register_control_device_interface(struct bcm_mini_adapter *ps_adapter);
17 17
18void unregister_control_device_interface(PMINI_ADAPTER Adapter); 18void unregister_control_device_interface(struct bcm_mini_adapter *Adapter);
19 19
20INT CopyBufferToControlPacket(PMINI_ADAPTER Adapter,/**<Logical Adapter*/ 20INT CopyBufferToControlPacket(struct bcm_mini_adapter *Adapter,/**<Logical Adapter*/
21 PVOID ioBuffer/**<Control Packet Buffer*/ 21 PVOID ioBuffer/**<Control Packet Buffer*/
22 ); 22 );
23 23
24VOID SortPackInfo(PMINI_ADAPTER Adapter); 24VOID SortPackInfo(struct bcm_mini_adapter *Adapter);
25 25
26VOID SortClassifiers(PMINI_ADAPTER Adapter); 26VOID SortClassifiers(struct bcm_mini_adapter *Adapter);
27 27
28VOID flush_all_queues(PMINI_ADAPTER Adapter); 28VOID flush_all_queues(struct bcm_mini_adapter *Adapter);
29 29
30VOID PruneQueueAllSF(PMINI_ADAPTER Adapter); 30VOID PruneQueueAllSF(struct bcm_mini_adapter *Adapter);
31 31
32INT SearchSfid(PMINI_ADAPTER Adapter,UINT uiSfid); 32INT SearchSfid(struct bcm_mini_adapter *Adapter,UINT uiSfid);
33 33
34USHORT ClassifyPacket(PMINI_ADAPTER Adapter,struct sk_buff* skb); 34USHORT ClassifyPacket(struct bcm_mini_adapter *Adapter,struct sk_buff* skb);
35 35
36BOOLEAN MatchSrcPort(struct bcm_classifier_rule *pstClassifierRule,USHORT ushSrcPort); 36BOOLEAN MatchSrcPort(struct bcm_classifier_rule *pstClassifierRule,USHORT ushSrcPort);
37BOOLEAN MatchDestPort(struct bcm_classifier_rule *pstClassifierRule,USHORT ushSrcPort); 37BOOLEAN MatchDestPort(struct bcm_classifier_rule *pstClassifierRule,USHORT ushSrcPort);
38BOOLEAN MatchProtocol(struct bcm_classifier_rule *pstClassifierRule,UCHAR ucProtocol); 38BOOLEAN MatchProtocol(struct bcm_classifier_rule *pstClassifierRule,UCHAR ucProtocol);
39 39
40 40
41INT SetupNextSend(PMINI_ADAPTER Adapter, /**<Logical Adapter*/ 41INT SetupNextSend(struct bcm_mini_adapter *Adapter, /**<Logical Adapter*/
42 struct sk_buff *Packet, /**<data buffer*/ 42 struct sk_buff *Packet, /**<data buffer*/
43 USHORT Vcid) ; 43 USHORT Vcid) ;
44 44
45VOID LinkMessage(PMINI_ADAPTER Adapter); 45VOID LinkMessage(struct bcm_mini_adapter *Adapter);
46 46
47VOID transmit_packets(PMINI_ADAPTER Adapter); 47VOID transmit_packets(struct bcm_mini_adapter *Adapter);
48 48
49INT SendControlPacket(PMINI_ADAPTER Adapter, /**<Logical Adapter*/ 49INT SendControlPacket(struct bcm_mini_adapter *Adapter, /**<Logical Adapter*/
50 char *pControlPacket/**<Control Packet*/ 50 char *pControlPacket/**<Control Packet*/
51 ); 51 );
52 52
53 53
54int register_networkdev(PMINI_ADAPTER Adapter); 54int register_networkdev(struct bcm_mini_adapter *Adapter);
55void unregister_networkdev(PMINI_ADAPTER Adapter); 55void unregister_networkdev(struct bcm_mini_adapter *Adapter);
56 56
57INT AllocAdapterDsxBuffer(PMINI_ADAPTER Adapter); 57INT AllocAdapterDsxBuffer(struct bcm_mini_adapter *Adapter);
58 58
59VOID AdapterFree(PMINI_ADAPTER Adapter); 59VOID AdapterFree(struct bcm_mini_adapter *Adapter);
60 60
61INT FreeAdapterDsxBuffer(PMINI_ADAPTER Adapter); 61INT FreeAdapterDsxBuffer(struct bcm_mini_adapter *Adapter);
62 62
63int tx_pkt_handler(PMINI_ADAPTER Adapter); 63int tx_pkt_handler(struct bcm_mini_adapter *Adapter);
64 64
65int reset_card_proc(PMINI_ADAPTER Adapter ); 65int reset_card_proc(struct bcm_mini_adapter *Adapter );
66 66
67int run_card_proc(PMINI_ADAPTER Adapter ); 67int run_card_proc(struct bcm_mini_adapter *Adapter );
68 68
69int InitCardAndDownloadFirmware(PMINI_ADAPTER ps_adapter); 69int InitCardAndDownloadFirmware(struct bcm_mini_adapter *ps_adapter);
70 70
71 71
72INT ReadMacAddressFromNVM(PMINI_ADAPTER Adapter); 72INT ReadMacAddressFromNVM(struct bcm_mini_adapter *Adapter);
73 73
74int register_control_device_interface(PMINI_ADAPTER ps_adapter); 74int register_control_device_interface(struct bcm_mini_adapter *ps_adapter);
75 75
76void DumpPackInfo(PMINI_ADAPTER Adapter); 76void DumpPackInfo(struct bcm_mini_adapter *Adapter);
77 77
78int rdm(PMINI_ADAPTER Adapter, UINT uiAddress, PCHAR pucBuff, size_t size); 78int rdm(struct bcm_mini_adapter *Adapter, UINT uiAddress, PCHAR pucBuff, size_t size);
79 79
80int wrm(PMINI_ADAPTER Adapter, UINT uiAddress, PCHAR pucBuff, size_t size); 80int wrm(struct bcm_mini_adapter *Adapter, UINT uiAddress, PCHAR pucBuff, size_t size);
81 81
82int wrmalt (PMINI_ADAPTER Adapter, UINT uiAddress, PUINT pucBuff, size_t sSize); 82int wrmalt (struct bcm_mini_adapter *Adapter, UINT uiAddress, PUINT pucBuff, size_t sSize);
83 83
84int rdmalt (PMINI_ADAPTER Adapter, UINT uiAddress, PUINT pucBuff, size_t sSize); 84int rdmalt (struct bcm_mini_adapter *Adapter, UINT uiAddress, PUINT pucBuff, size_t sSize);
85 85
86int get_dsx_sf_data_to_application(PMINI_ADAPTER Adapter, UINT uiSFId, void __user * user_buffer); 86int get_dsx_sf_data_to_application(struct bcm_mini_adapter *Adapter, UINT uiSFId, void __user * user_buffer);
87 87
88void SendIdleModeResponse(PMINI_ADAPTER Adapter); 88void SendIdleModeResponse(struct bcm_mini_adapter *Adapter);
89 89
90 90
91int ProcessGetHostMibs(PMINI_ADAPTER Adapter, S_MIBS_HOST_STATS_MIBS *buf); 91int ProcessGetHostMibs(struct bcm_mini_adapter *Adapter, S_MIBS_HOST_STATS_MIBS *buf);
92void GetDroppedAppCntrlPktMibs(S_MIBS_HOST_STATS_MIBS *ioBuffer, struct bcm_tarang_data *pTarang); 92void GetDroppedAppCntrlPktMibs(S_MIBS_HOST_STATS_MIBS *ioBuffer, struct bcm_tarang_data *pTarang);
93void beceem_parse_target_struct(PMINI_ADAPTER Adapter); 93void beceem_parse_target_struct(struct bcm_mini_adapter *Adapter);
94 94
95int bcm_ioctl_fw_download(PMINI_ADAPTER Adapter, struct bcm_firmware_info *psFwInfo); 95int bcm_ioctl_fw_download(struct bcm_mini_adapter *Adapter, struct bcm_firmware_info *psFwInfo);
96 96
97void CopyMIBSExtendedSFParameters(PMINI_ADAPTER Adapter, 97void CopyMIBSExtendedSFParameters(struct bcm_mini_adapter *Adapter,
98 CServiceFlowParamSI *psfLocalSet, UINT uiSearchRuleIndex); 98 CServiceFlowParamSI *psfLocalSet, UINT uiSearchRuleIndex);
99 99
100VOID ResetCounters(PMINI_ADAPTER Adapter); 100VOID ResetCounters(struct bcm_mini_adapter *Adapter);
101 101
102int InitLedSettings(PMINI_ADAPTER Adapter); 102int InitLedSettings(struct bcm_mini_adapter *Adapter);
103 103
104struct bcm_classifier_rule *GetFragIPClsEntry(PMINI_ADAPTER Adapter,USHORT usIpIdentification,ULONG SrcIP); 104struct bcm_classifier_rule *GetFragIPClsEntry(struct bcm_mini_adapter *Adapter,USHORT usIpIdentification,ULONG SrcIP);
105 105
106void AddFragIPClsEntry(PMINI_ADAPTER Adapter, struct bcm_fragmented_packet_info *psFragPktInfo); 106void AddFragIPClsEntry(struct bcm_mini_adapter *Adapter, struct bcm_fragmented_packet_info *psFragPktInfo);
107 107
108void DelFragIPClsEntry(PMINI_ADAPTER Adapter,USHORT usIpIdentification,ULONG SrcIp); 108void DelFragIPClsEntry(struct bcm_mini_adapter *Adapter,USHORT usIpIdentification,ULONG SrcIp);
109 109
110void update_per_cid_rx (PMINI_ADAPTER Adapter); 110void update_per_cid_rx (struct bcm_mini_adapter *Adapter);
111 111
112void update_per_sf_desc_cnts( PMINI_ADAPTER Adapter); 112void update_per_sf_desc_cnts( struct bcm_mini_adapter *Adapter);
113 113
114void ClearTargetDSXBuffer(PMINI_ADAPTER Adapter,B_UINT16 TID,BOOLEAN bFreeAll); 114void ClearTargetDSXBuffer(struct bcm_mini_adapter *Adapter,B_UINT16 TID,BOOLEAN bFreeAll);
115 115
116 116
117void flush_queue(PMINI_ADAPTER Adapter, UINT iQIndex); 117void flush_queue(struct bcm_mini_adapter *Adapter, UINT iQIndex);
118 118
119 119
120INT flushAllAppQ(VOID); 120INT flushAllAppQ(VOID);
121 121
122 122
123INT BeceemEEPROMBulkRead( 123INT BeceemEEPROMBulkRead(
124 PMINI_ADAPTER Adapter, 124 struct bcm_mini_adapter *Adapter,
125 PUINT pBuffer, 125 PUINT pBuffer,
126 UINT uiOffset, 126 UINT uiOffset,
127 UINT uiNumBytes); 127 UINT uiNumBytes);
128 128
129 129
130 130
131INT WriteBeceemEEPROM(PMINI_ADAPTER Adapter,UINT uiEEPROMOffset, UINT uiData); 131INT WriteBeceemEEPROM(struct bcm_mini_adapter *Adapter,UINT uiEEPROMOffset, UINT uiData);
132 132
133INT PropagateCalParamsFromFlashToMemory(PMINI_ADAPTER Adapter); 133INT PropagateCalParamsFromFlashToMemory(struct bcm_mini_adapter *Adapter);
134 134
135 135
136INT BeceemEEPROMBulkWrite( 136INT BeceemEEPROMBulkWrite(
137 PMINI_ADAPTER Adapter, 137 struct bcm_mini_adapter *Adapter,
138 PUCHAR pBuffer, 138 PUCHAR pBuffer,
139 UINT uiOffset, 139 UINT uiOffset,
140 UINT uiNumBytes, 140 UINT uiNumBytes,
141 BOOLEAN bVerify); 141 BOOLEAN bVerify);
142 142
143 143
144INT ReadBeceemEEPROM(PMINI_ADAPTER Adapter,UINT dwAddress, UINT *pdwData); 144INT ReadBeceemEEPROM(struct bcm_mini_adapter *Adapter,UINT dwAddress, UINT *pdwData);
145 145
146 146
147INT BeceemNVMRead( 147INT BeceemNVMRead(
148 PMINI_ADAPTER Adapter, 148 struct bcm_mini_adapter *Adapter,
149 PUINT pBuffer, 149 PUINT pBuffer,
150 UINT uiOffset, 150 UINT uiOffset,
151 UINT uiNumBytes); 151 UINT uiNumBytes);
152 152
153INT BeceemNVMWrite( 153INT BeceemNVMWrite(
154 PMINI_ADAPTER Adapter, 154 struct bcm_mini_adapter *Adapter,
155 PUINT pBuffer, 155 PUINT pBuffer,
156 UINT uiOffset, 156 UINT uiOffset,
157 UINT uiNumBytes, 157 UINT uiNumBytes,
158 BOOLEAN bVerify); 158 BOOLEAN bVerify);
159 159
160 160
161INT BcmInitNVM(PMINI_ADAPTER Adapter); 161INT BcmInitNVM(struct bcm_mini_adapter *Adapter);
162 162
163INT BcmUpdateSectorSize(PMINI_ADAPTER Adapter,UINT uiSectorSize); 163INT BcmUpdateSectorSize(struct bcm_mini_adapter *Adapter,UINT uiSectorSize);
164BOOLEAN IsSectionExistInFlash(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL section); 164BOOLEAN IsSectionExistInFlash(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL section);
165 165
166INT BcmGetFlash2xSectionalBitMap(PMINI_ADAPTER Adapter, PFLASH2X_BITMAP psFlash2xBitMap); 166INT BcmGetFlash2xSectionalBitMap(struct bcm_mini_adapter *Adapter, PFLASH2X_BITMAP psFlash2xBitMap);
167 167
168INT BcmFlash2xBulkWrite( 168INT BcmFlash2xBulkWrite(
169 PMINI_ADAPTER Adapter, 169 struct bcm_mini_adapter *Adapter,
170 PUINT pBuffer, 170 PUINT pBuffer,
171 FLASH2X_SECTION_VAL eFlashSectionVal, 171 FLASH2X_SECTION_VAL eFlashSectionVal,
172 UINT uiOffset, 172 UINT uiOffset,
@@ -174,45 +174,45 @@ INT BcmFlash2xBulkWrite(
174 UINT bVerify); 174 UINT bVerify);
175 175
176INT BcmFlash2xBulkRead( 176INT BcmFlash2xBulkRead(
177 PMINI_ADAPTER Adapter, 177 struct bcm_mini_adapter *Adapter,
178 PUINT pBuffer, 178 PUINT pBuffer,
179 FLASH2X_SECTION_VAL eFlashSectionVal, 179 FLASH2X_SECTION_VAL eFlashSectionVal,
180 UINT uiOffsetWithinSectionVal, 180 UINT uiOffsetWithinSectionVal,
181 UINT uiNumBytes); 181 UINT uiNumBytes);
182 182
183INT BcmGetSectionValStartOffset(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlashSectionVal); 183INT BcmGetSectionValStartOffset(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFlashSectionVal);
184 184
185INT BcmSetActiveSection(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectVal); 185INT BcmSetActiveSection(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFlash2xSectVal);
186INT BcmAllocFlashCSStructure(PMINI_ADAPTER psAdapter); 186INT BcmAllocFlashCSStructure(struct bcm_mini_adapter *psAdapter);
187INT BcmDeAllocFlashCSStructure(PMINI_ADAPTER psAdapter); 187INT BcmDeAllocFlashCSStructure(struct bcm_mini_adapter *psAdapter);
188 188
189INT BcmCopyISO(PMINI_ADAPTER Adapter, FLASH2X_COPY_SECTION sCopySectStrut); 189INT BcmCopyISO(struct bcm_mini_adapter *Adapter, FLASH2X_COPY_SECTION sCopySectStrut);
190INT BcmFlash2xCorruptSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal); 190INT BcmFlash2xCorruptSig(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal);
191INT BcmFlash2xWriteSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlashSectionVal); 191INT BcmFlash2xWriteSig(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFlashSectionVal);
192INT validateFlash2xReadWrite(PMINI_ADAPTER Adapter, PFLASH2X_READWRITE psFlash2xReadWrite); 192INT validateFlash2xReadWrite(struct bcm_mini_adapter *Adapter, PFLASH2X_READWRITE psFlash2xReadWrite);
193INT IsFlash2x(PMINI_ADAPTER Adapter); 193INT IsFlash2x(struct bcm_mini_adapter *Adapter);
194INT BcmCopySection(PMINI_ADAPTER Adapter, 194INT BcmCopySection(struct bcm_mini_adapter *Adapter,
195 FLASH2X_SECTION_VAL SrcSection, 195 FLASH2X_SECTION_VAL SrcSection,
196 FLASH2X_SECTION_VAL DstSection, 196 FLASH2X_SECTION_VAL DstSection,
197 UINT offset, 197 UINT offset,
198 UINT numOfBytes); 198 UINT numOfBytes);
199 199
200 200
201BOOLEAN IsNonCDLessDevice(PMINI_ADAPTER Adapter); 201BOOLEAN IsNonCDLessDevice(struct bcm_mini_adapter *Adapter);
202 202
203 203
204VOID OverrideServiceFlowParams(PMINI_ADAPTER Adapter,PUINT puiBuffer); 204VOID OverrideServiceFlowParams(struct bcm_mini_adapter *Adapter,PUINT puiBuffer);
205 205
206int wrmaltWithLock (PMINI_ADAPTER Adapter, UINT uiAddress, PUINT pucBuff, size_t sSize); 206int wrmaltWithLock (struct bcm_mini_adapter *Adapter, UINT uiAddress, PUINT pucBuff, size_t sSize);
207int rdmaltWithLock (PMINI_ADAPTER Adapter, UINT uiAddress, PUINT pucBuff, size_t sSize); 207int rdmaltWithLock (struct bcm_mini_adapter *Adapter, UINT uiAddress, PUINT pucBuff, size_t sSize);
208 208
209int wrmWithLock(PMINI_ADAPTER Adapter, UINT uiAddress, PCHAR pucBuff, size_t size); 209int wrmWithLock(struct bcm_mini_adapter *Adapter, UINT uiAddress, PCHAR pucBuff, size_t size);
210INT buffDnldVerify(PMINI_ADAPTER Adapter, unsigned char *mappedbuffer, unsigned int u32FirmwareLength, 210INT buffDnldVerify(struct bcm_mini_adapter *Adapter, unsigned char *mappedbuffer, unsigned int u32FirmwareLength,
211 unsigned long u32StartingAddress); 211 unsigned long u32StartingAddress);
212 212
213 213
214VOID putUsbSuspend(struct work_struct *work); 214VOID putUsbSuspend(struct work_struct *work);
215BOOLEAN IsReqGpioIsLedInNVM(PMINI_ADAPTER Adapter, UINT gpios); 215BOOLEAN IsReqGpioIsLedInNVM(struct bcm_mini_adapter *Adapter, UINT gpios);
216 216
217 217
218#endif 218#endif
diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c
index 361f01182109..1b857bd887f0 100644
--- a/drivers/staging/bcm/Qos.c
+++ b/drivers/staging/bcm/Qos.c
@@ -4,13 +4,13 @@ This file contains the routines related to Quality of Service.
4*/ 4*/
5#include "headers.h" 5#include "headers.h"
6 6
7static void EThCSGetPktInfo(PMINI_ADAPTER Adapter,PVOID pvEthPayload,PS_ETHCS_PKT_INFO pstEthCsPktInfo); 7static void EThCSGetPktInfo(struct bcm_mini_adapter *Adapter,PVOID pvEthPayload,PS_ETHCS_PKT_INFO pstEthCsPktInfo);
8static BOOLEAN EThCSClassifyPkt(PMINI_ADAPTER Adapter,struct sk_buff* skb,PS_ETHCS_PKT_INFO pstEthCsPktInfo,struct bcm_classifier_rule *pstClassifierRule, B_UINT8 EthCSCupport); 8static BOOLEAN EThCSClassifyPkt(struct bcm_mini_adapter *Adapter,struct sk_buff* skb,PS_ETHCS_PKT_INFO pstEthCsPktInfo,struct bcm_classifier_rule *pstClassifierRule, B_UINT8 EthCSCupport);
9 9
10static USHORT IpVersion4(PMINI_ADAPTER Adapter, struct iphdr *iphd, 10static USHORT IpVersion4(struct bcm_mini_adapter *Adapter, struct iphdr *iphd,
11 struct bcm_classifier_rule *pstClassifierRule ); 11 struct bcm_classifier_rule *pstClassifierRule );
12 12
13static VOID PruneQueue(PMINI_ADAPTER Adapter, INT iIndex); 13static VOID PruneQueue(struct bcm_mini_adapter *Adapter, INT iIndex);
14 14
15 15
16/******************************************************************* 16/*******************************************************************
@@ -28,7 +28,7 @@ BOOLEAN MatchSrcIpAddress(struct bcm_classifier_rule *pstClassifierRule,ULONG ul
28{ 28{
29 UCHAR ucLoopIndex=0; 29 UCHAR ucLoopIndex=0;
30 30
31 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 31 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
32 32
33 ulSrcIP=ntohl(ulSrcIP); 33 ulSrcIP=ntohl(ulSrcIP);
34 if(0 == pstClassifierRule->ucIPSourceAddressLength) 34 if(0 == pstClassifierRule->ucIPSourceAddressLength)
@@ -61,7 +61,7 @@ BOOLEAN MatchSrcIpAddress(struct bcm_classifier_rule *pstClassifierRule,ULONG ul
61BOOLEAN MatchDestIpAddress(struct bcm_classifier_rule *pstClassifierRule,ULONG ulDestIP) 61BOOLEAN MatchDestIpAddress(struct bcm_classifier_rule *pstClassifierRule,ULONG ulDestIP)
62{ 62{
63 UCHAR ucLoopIndex=0; 63 UCHAR ucLoopIndex=0;
64 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 64 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
65 65
66 ulDestIP=ntohl(ulDestIP); 66 ulDestIP=ntohl(ulDestIP);
67 if(0 == pstClassifierRule->ucIPDestinationAddressLength) 67 if(0 == pstClassifierRule->ucIPDestinationAddressLength)
@@ -94,7 +94,7 @@ BOOLEAN MatchDestIpAddress(struct bcm_classifier_rule *pstClassifierRule,ULONG u
94BOOLEAN MatchTos(struct bcm_classifier_rule *pstClassifierRule,UCHAR ucTypeOfService) 94BOOLEAN MatchTos(struct bcm_classifier_rule *pstClassifierRule,UCHAR ucTypeOfService)
95{ 95{
96 96
97 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 97 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
98 if( 3 != pstClassifierRule->ucIPTypeOfServiceLength ) 98 if( 3 != pstClassifierRule->ucIPTypeOfServiceLength )
99 return TRUE; 99 return TRUE;
100 100
@@ -120,7 +120,7 @@ BOOLEAN MatchTos(struct bcm_classifier_rule *pstClassifierRule,UCHAR ucTypeOfSer
120BOOLEAN MatchProtocol(struct bcm_classifier_rule *pstClassifierRule,UCHAR ucProtocol) 120BOOLEAN MatchProtocol(struct bcm_classifier_rule *pstClassifierRule,UCHAR ucProtocol)
121{ 121{
122 UCHAR ucLoopIndex=0; 122 UCHAR ucLoopIndex=0;
123 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 123 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
124 if(0 == pstClassifierRule->ucProtocolLength) 124 if(0 == pstClassifierRule->ucProtocolLength)
125 return TRUE; 125 return TRUE;
126 for(ucLoopIndex=0;ucLoopIndex<pstClassifierRule->ucProtocolLength;ucLoopIndex++) 126 for(ucLoopIndex=0;ucLoopIndex<pstClassifierRule->ucProtocolLength;ucLoopIndex++)
@@ -150,7 +150,7 @@ BOOLEAN MatchSrcPort(struct bcm_classifier_rule *pstClassifierRule,USHORT ushSrc
150{ 150{
151 UCHAR ucLoopIndex=0; 151 UCHAR ucLoopIndex=0;
152 152
153 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 153 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
154 154
155 155
156 if(0 == pstClassifierRule->ucSrcPortRangeLength) 156 if(0 == pstClassifierRule->ucSrcPortRangeLength)
@@ -181,7 +181,7 @@ BOOLEAN MatchSrcPort(struct bcm_classifier_rule *pstClassifierRule,USHORT ushSrc
181BOOLEAN MatchDestPort(struct bcm_classifier_rule *pstClassifierRule,USHORT ushDestPort) 181BOOLEAN MatchDestPort(struct bcm_classifier_rule *pstClassifierRule,USHORT ushDestPort)
182{ 182{
183 UCHAR ucLoopIndex=0; 183 UCHAR ucLoopIndex=0;
184 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 184 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
185 185
186 if(0 == pstClassifierRule->ucDestPortRangeLength) 186 if(0 == pstClassifierRule->ucDestPortRangeLength)
187 return TRUE; 187 return TRUE;
@@ -204,7 +204,7 @@ BOOLEAN MatchDestPort(struct bcm_classifier_rule *pstClassifierRule,USHORT ushDe
204Compares IPV4 Ip address and port number 204Compares IPV4 Ip address and port number
205@return Queue Index. 205@return Queue Index.
206*/ 206*/
207static USHORT IpVersion4(PMINI_ADAPTER Adapter, 207static USHORT IpVersion4(struct bcm_mini_adapter *Adapter,
208 struct iphdr *iphd, 208 struct iphdr *iphd,
209 struct bcm_classifier_rule *pstClassifierRule) 209 struct bcm_classifier_rule *pstClassifierRule)
210{ 210{
@@ -302,7 +302,7 @@ static USHORT IpVersion4(PMINI_ADAPTER Adapter,
302 return bClassificationSucceed; 302 return bClassificationSucceed;
303} 303}
304 304
305VOID PruneQueueAllSF(PMINI_ADAPTER Adapter) 305VOID PruneQueueAllSF(struct bcm_mini_adapter *Adapter)
306{ 306{
307 UINT iIndex = 0; 307 UINT iIndex = 0;
308 308
@@ -323,7 +323,7 @@ is less than number of bytes in the queue. If so -
323drops packets from the Head till the number of bytes is 323drops packets from the Head till the number of bytes is
324less than or equal to max queue size for the queue. 324less than or equal to max queue size for the queue.
325*/ 325*/
326static VOID PruneQueue(PMINI_ADAPTER Adapter, INT iIndex) 326static VOID PruneQueue(struct bcm_mini_adapter *Adapter, INT iIndex)
327{ 327{
328 struct sk_buff* PacketToDrop=NULL; 328 struct sk_buff* PacketToDrop=NULL;
329 struct net_device_stats *netstats; 329 struct net_device_stats *netstats;
@@ -392,7 +392,7 @@ static VOID PruneQueue(PMINI_ADAPTER Adapter, INT iIndex)
392 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, PRUNE_QUEUE, DBG_LVL_ALL, "<====="); 392 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, PRUNE_QUEUE, DBG_LVL_ALL, "<=====");
393} 393}
394 394
395VOID flush_all_queues(PMINI_ADAPTER Adapter) 395VOID flush_all_queues(struct bcm_mini_adapter *Adapter)
396{ 396{
397 INT iQIndex; 397 INT iQIndex;
398 UINT uiTotalPacketLength; 398 UINT uiTotalPacketLength;
@@ -442,7 +442,7 @@ VOID flush_all_queues(PMINI_ADAPTER Adapter)
442 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "<====="); 442 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, DUMP_INFO, DBG_LVL_ALL, "<=====");
443} 443}
444 444
445USHORT ClassifyPacket(PMINI_ADAPTER Adapter,struct sk_buff* skb) 445USHORT ClassifyPacket(struct bcm_mini_adapter *Adapter,struct sk_buff* skb)
446{ 446{
447 INT uiLoopIndex=0; 447 INT uiLoopIndex=0;
448 struct bcm_classifier_rule *pstClassifierRule = NULL; 448 struct bcm_classifier_rule *pstClassifierRule = NULL;
@@ -652,7 +652,7 @@ USHORT ClassifyPacket(PMINI_ADAPTER Adapter,struct sk_buff* skb)
652static BOOLEAN EthCSMatchSrcMACAddress(struct bcm_classifier_rule *pstClassifierRule,PUCHAR Mac) 652static BOOLEAN EthCSMatchSrcMACAddress(struct bcm_classifier_rule *pstClassifierRule,PUCHAR Mac)
653{ 653{
654 UINT i=0; 654 UINT i=0;
655 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 655 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
656 if(pstClassifierRule->ucEthCSSrcMACLen==0) 656 if(pstClassifierRule->ucEthCSSrcMACLen==0)
657 return TRUE; 657 return TRUE;
658 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "%s \n",__FUNCTION__); 658 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "%s \n",__FUNCTION__);
@@ -669,7 +669,7 @@ static BOOLEAN EthCSMatchSrcMACAddress(struct bcm_classifier_rule *pstClassifier
669static BOOLEAN EthCSMatchDestMACAddress(struct bcm_classifier_rule *pstClassifierRule,PUCHAR Mac) 669static BOOLEAN EthCSMatchDestMACAddress(struct bcm_classifier_rule *pstClassifierRule,PUCHAR Mac)
670{ 670{
671 UINT i=0; 671 UINT i=0;
672 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 672 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
673 if(pstClassifierRule->ucEthCSDestMACLen==0) 673 if(pstClassifierRule->ucEthCSDestMACLen==0)
674 return TRUE; 674 return TRUE;
675 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "%s \n",__FUNCTION__); 675 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "%s \n",__FUNCTION__);
@@ -685,7 +685,7 @@ static BOOLEAN EthCSMatchDestMACAddress(struct bcm_classifier_rule *pstClassifie
685 685
686static BOOLEAN EthCSMatchEThTypeSAP(struct bcm_classifier_rule *pstClassifierRule,struct sk_buff* skb,PS_ETHCS_PKT_INFO pstEthCsPktInfo) 686static BOOLEAN EthCSMatchEThTypeSAP(struct bcm_classifier_rule *pstClassifierRule,struct sk_buff* skb,PS_ETHCS_PKT_INFO pstEthCsPktInfo)
687{ 687{
688 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 688 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
689 if((pstClassifierRule->ucEtherTypeLen==0)|| 689 if((pstClassifierRule->ucEtherTypeLen==0)||
690 (pstClassifierRule->au8EthCSEtherType[0] == 0)) 690 (pstClassifierRule->au8EthCSEtherType[0] == 0))
691 return TRUE; 691 return TRUE;
@@ -723,7 +723,7 @@ static BOOLEAN EthCSMatchVLANRules(struct bcm_classifier_rule *pstClassifierRule
723 BOOLEAN bClassificationSucceed = FALSE; 723 BOOLEAN bClassificationSucceed = FALSE;
724 USHORT usVLANID; 724 USHORT usVLANID;
725 B_UINT8 uPriority = 0; 725 B_UINT8 uPriority = 0;
726 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 726 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
727 727
728 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "%s CLS UserPrio:%x CLS VLANID:%x\n",__FUNCTION__,ntohs(*((USHORT *)pstClassifierRule->usUserPriority)),pstClassifierRule->usVLANID); 728 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "%s CLS UserPrio:%x CLS VLANID:%x\n",__FUNCTION__,ntohs(*((USHORT *)pstClassifierRule->usUserPriority)),pstClassifierRule->usVLANID);
729 729
@@ -768,7 +768,7 @@ static BOOLEAN EthCSMatchVLANRules(struct bcm_classifier_rule *pstClassifierRule
768} 768}
769 769
770 770
771static BOOLEAN EThCSClassifyPkt(PMINI_ADAPTER Adapter,struct sk_buff* skb, 771static BOOLEAN EThCSClassifyPkt(struct bcm_mini_adapter *Adapter,struct sk_buff* skb,
772 PS_ETHCS_PKT_INFO pstEthCsPktInfo, 772 PS_ETHCS_PKT_INFO pstEthCsPktInfo,
773 struct bcm_classifier_rule *pstClassifierRule, 773 struct bcm_classifier_rule *pstClassifierRule,
774 B_UINT8 EthCSCupport) 774 B_UINT8 EthCSCupport)
@@ -801,7 +801,7 @@ static BOOLEAN EThCSClassifyPkt(PMINI_ADAPTER Adapter,struct sk_buff* skb,
801 return bClassificationSucceed; 801 return bClassificationSucceed;
802} 802}
803 803
804static void EThCSGetPktInfo(PMINI_ADAPTER Adapter,PVOID pvEthPayload, 804static void EThCSGetPktInfo(struct bcm_mini_adapter *Adapter,PVOID pvEthPayload,
805 PS_ETHCS_PKT_INFO pstEthCsPktInfo) 805 PS_ETHCS_PKT_INFO pstEthCsPktInfo)
806{ 806{
807 USHORT u16Etype = ntohs(((struct bcm_eth_header *)pvEthPayload)->u16Etype); 807 USHORT u16Etype = ntohs(((struct bcm_eth_header *)pvEthPayload)->u16Etype);
diff --git a/drivers/staging/bcm/Transmit.c b/drivers/staging/bcm/Transmit.c
index 63c6a74bb1ff..5e603ce76fea 100644
--- a/drivers/staging/bcm/Transmit.c
+++ b/drivers/staging/bcm/Transmit.c
@@ -41,7 +41,7 @@ SendPacketFromQueue->SetupNextSend->bcm_cmd53
41This function dispatches control packet to the h/w interface 41This function dispatches control packet to the h/w interface
42@return zero(success) or -ve value(failure) 42@return zero(success) or -ve value(failure)
43*/ 43*/
44INT SendControlPacket(PMINI_ADAPTER Adapter, char *pControlPacket) 44INT SendControlPacket(struct bcm_mini_adapter *Adapter, char *pControlPacket)
45{ 45{
46 struct bcm_leader *PLeader = (struct bcm_leader *)pControlPacket; 46 struct bcm_leader *PLeader = (struct bcm_leader *)pControlPacket;
47 47
@@ -84,7 +84,7 @@ This function despatches the IP packets with the given vcid
84to the target via the host h/w interface. 84to the target via the host h/w interface.
85@return zero(success) or -ve value(failure) 85@return zero(success) or -ve value(failure)
86*/ 86*/
87INT SetupNextSend(PMINI_ADAPTER Adapter, struct sk_buff *Packet, USHORT Vcid) 87INT SetupNextSend(struct bcm_mini_adapter *Adapter, struct sk_buff *Packet, USHORT Vcid)
88{ 88{
89 int status=0; 89 int status=0;
90 BOOLEAN bHeaderSupressionEnabled = FALSE; 90 BOOLEAN bHeaderSupressionEnabled = FALSE;
@@ -180,7 +180,7 @@ errExit:
180 return status; 180 return status;
181} 181}
182 182
183static int tx_pending(PMINI_ADAPTER Adapter) 183static int tx_pending(struct bcm_mini_adapter *Adapter)
184{ 184{
185 return (atomic_read(&Adapter->TxPktAvail) 185 return (atomic_read(&Adapter->TxPktAvail)
186 && MINIMUM_PENDING_DESCRIPTORS < atomic_read(&Adapter->CurrNumFreeTxDesc)) 186 && MINIMUM_PENDING_DESCRIPTORS < atomic_read(&Adapter->CurrNumFreeTxDesc))
@@ -191,7 +191,7 @@ static int tx_pending(PMINI_ADAPTER Adapter)
191@ingroup tx_functions 191@ingroup tx_functions
192Transmit thread 192Transmit thread
193*/ 193*/
194int tx_pkt_handler(PMINI_ADAPTER Adapter /**< pointer to adapter object*/ 194int tx_pkt_handler(struct bcm_mini_adapter *Adapter /**< pointer to adapter object*/
195 ) 195 )
196{ 196{
197 int status = 0; 197 int status = 0;
diff --git a/drivers/staging/bcm/hostmibs.c b/drivers/staging/bcm/hostmibs.c
index 27ddcbfd5935..08d13a4dfd70 100644
--- a/drivers/staging/bcm/hostmibs.c
+++ b/drivers/staging/bcm/hostmibs.c
@@ -9,7 +9,7 @@
9 9
10#include "headers.h" 10#include "headers.h"
11 11
12INT ProcessGetHostMibs(PMINI_ADAPTER Adapter, S_MIBS_HOST_STATS_MIBS *pstHostMibs) 12INT ProcessGetHostMibs(struct bcm_mini_adapter *Adapter, S_MIBS_HOST_STATS_MIBS *pstHostMibs)
13{ 13{
14 S_SERVICEFLOW_ENTRY *pstServiceFlowEntry = NULL; 14 S_SERVICEFLOW_ENTRY *pstServiceFlowEntry = NULL;
15 S_PHS_RULE *pstPhsRule = NULL; 15 S_PHS_RULE *pstPhsRule = NULL;
@@ -101,7 +101,7 @@ VOID GetDroppedAppCntrlPktMibs(S_MIBS_HOST_STATS_MIBS *pstHostMibs, struct bcm_t
101 sizeof(S_MIBS_DROPPED_APP_CNTRL_MESSAGES)); 101 sizeof(S_MIBS_DROPPED_APP_CNTRL_MESSAGES));
102} 102}
103 103
104VOID CopyMIBSExtendedSFParameters(PMINI_ADAPTER Adapter, CServiceFlowParamSI *psfLocalSet, UINT uiSearchRuleIndex) 104VOID CopyMIBSExtendedSFParameters(struct bcm_mini_adapter *Adapter, CServiceFlowParamSI *psfLocalSet, UINT uiSearchRuleIndex)
105{ 105{
106 S_MIBS_EXTSERVICEFLOW_PARAMETERS *t = &Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable; 106 S_MIBS_EXTSERVICEFLOW_PARAMETERS *t = &Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable;
107 107
diff --git a/drivers/staging/bcm/led_control.c b/drivers/staging/bcm/led_control.c
index c7f488629722..252a1b31d618 100644
--- a/drivers/staging/bcm/led_control.c
+++ b/drivers/staging/bcm/led_control.c
@@ -13,7 +13,7 @@ static B_UINT16 CFG_CalculateChecksum(B_UINT8 *pu8Buffer, B_UINT32 u32Size)
13 return u16CheckSum; 13 return u16CheckSum;
14} 14}
15 15
16BOOLEAN IsReqGpioIsLedInNVM(PMINI_ADAPTER Adapter, UINT gpios) 16BOOLEAN IsReqGpioIsLedInNVM(struct bcm_mini_adapter *Adapter, UINT gpios)
17{ 17{
18 INT Status; 18 INT Status;
19 Status = (Adapter->gpioBitMap & gpios) ^ gpios; 19 Status = (Adapter->gpioBitMap & gpios) ^ gpios;
@@ -23,7 +23,7 @@ BOOLEAN IsReqGpioIsLedInNVM(PMINI_ADAPTER Adapter, UINT gpios)
23 return TRUE; 23 return TRUE;
24} 24}
25 25
26static INT LED_Blink(PMINI_ADAPTER Adapter, UINT GPIO_Num, UCHAR uiLedIndex, 26static INT LED_Blink(struct bcm_mini_adapter *Adapter, UINT GPIO_Num, UCHAR uiLedIndex,
27 ULONG timeout, INT num_of_time, LedEventInfo_t currdriverstate) 27 ULONG timeout, INT num_of_time, LedEventInfo_t currdriverstate)
28{ 28{
29 int Status = STATUS_SUCCESS; 29 int Status = STATUS_SUCCESS;
@@ -95,7 +95,7 @@ static INT ScaleRateofTransfer(ULONG rate)
95 95
96 96
97 97
98static INT LED_Proportional_Blink(PMINI_ADAPTER Adapter, UCHAR GPIO_Num_tx, 98static INT LED_Proportional_Blink(struct bcm_mini_adapter *Adapter, UCHAR GPIO_Num_tx,
99 UCHAR uiTxLedIndex, UCHAR GPIO_Num_rx, UCHAR uiRxLedIndex, 99 UCHAR uiTxLedIndex, UCHAR GPIO_Num_rx, UCHAR uiRxLedIndex,
100 LedEventInfo_t currdriverstate) 100 LedEventInfo_t currdriverstate)
101{ 101{
@@ -261,7 +261,7 @@ static INT LED_Proportional_Blink(PMINI_ADAPTER Adapter, UCHAR GPIO_Num_tx,
261 * <OSAL_STATUS_CODE> 261 * <OSAL_STATUS_CODE>
262 * ----------------------------------------------------------------------------- 262 * -----------------------------------------------------------------------------
263 */ 263 */
264static INT ValidateDSDParamsChecksum(PMINI_ADAPTER Adapter, ULONG ulParamOffset, 264static INT ValidateDSDParamsChecksum(struct bcm_mini_adapter *Adapter, ULONG ulParamOffset,
265 USHORT usParamLen) 265 USHORT usParamLen)
266{ 266{
267 INT Status = STATUS_SUCCESS; 267 INT Status = STATUS_SUCCESS;
@@ -347,7 +347,7 @@ exit:
347 * <OSAL_STATUS_CODE> 347 * <OSAL_STATUS_CODE>
348 * ----------------------------------------------------------------------------- 348 * -----------------------------------------------------------------------------
349 */ 349 */
350static INT ValidateHWParmStructure(PMINI_ADAPTER Adapter, ULONG ulHwParamOffset) 350static INT ValidateHWParmStructure(struct bcm_mini_adapter *Adapter, ULONG ulHwParamOffset)
351{ 351{
352 352
353 INT Status = STATUS_SUCCESS; 353 INT Status = STATUS_SUCCESS;
@@ -371,7 +371,7 @@ static INT ValidateHWParmStructure(PMINI_ADAPTER Adapter, ULONG ulHwParamOffset)
371 return Status; 371 return Status;
372} /* ValidateHWParmStructure() */ 372} /* ValidateHWParmStructure() */
373 373
374static int ReadLEDInformationFromEEPROM(PMINI_ADAPTER Adapter, 374static int ReadLEDInformationFromEEPROM(struct bcm_mini_adapter *Adapter,
375 UCHAR GPIO_Array[]) 375 UCHAR GPIO_Array[])
376{ 376{
377 int Status = STATUS_SUCCESS; 377 int Status = STATUS_SUCCESS;
@@ -477,7 +477,7 @@ static int ReadLEDInformationFromEEPROM(PMINI_ADAPTER Adapter,
477} 477}
478 478
479 479
480static int ReadConfigFileStructure(PMINI_ADAPTER Adapter, 480static int ReadConfigFileStructure(struct bcm_mini_adapter *Adapter,
481 BOOLEAN *bEnableThread) 481 BOOLEAN *bEnableThread)
482{ 482{
483 int Status = STATUS_SUCCESS; 483 int Status = STATUS_SUCCESS;
@@ -580,7 +580,7 @@ static int ReadConfigFileStructure(PMINI_ADAPTER Adapter,
580 * 580 *
581 * ----------------------------------------------------------------------------- 581 * -----------------------------------------------------------------------------
582 */ 582 */
583static VOID LedGpioInit(PMINI_ADAPTER Adapter) 583static VOID LedGpioInit(struct bcm_mini_adapter *Adapter)
584{ 584{
585 UINT uiResetValue = 0; 585 UINT uiResetValue = 0;
586 UINT uiIndex = 0; 586 UINT uiIndex = 0;
@@ -605,7 +605,7 @@ static VOID LedGpioInit(PMINI_ADAPTER Adapter)
605 Adapter->LEDInfo.bIdle_led_off = FALSE; 605 Adapter->LEDInfo.bIdle_led_off = FALSE;
606} 606}
607 607
608static INT BcmGetGPIOPinInfo(PMINI_ADAPTER Adapter, UCHAR *GPIO_num_tx, 608static INT BcmGetGPIOPinInfo(struct bcm_mini_adapter *Adapter, UCHAR *GPIO_num_tx,
609 UCHAR *GPIO_num_rx, UCHAR *uiLedTxIndex, UCHAR *uiLedRxIndex, 609 UCHAR *GPIO_num_rx, UCHAR *uiLedTxIndex, UCHAR *uiLedRxIndex,
610 LedEventInfo_t currdriverstate) 610 LedEventInfo_t currdriverstate)
611{ 611{
@@ -645,7 +645,7 @@ static INT BcmGetGPIOPinInfo(PMINI_ADAPTER Adapter, UCHAR *GPIO_num_tx,
645 } 645 }
646 return STATUS_SUCCESS; 646 return STATUS_SUCCESS;
647} 647}
648static VOID LEDControlThread(PMINI_ADAPTER Adapter) 648static VOID LEDControlThread(struct bcm_mini_adapter *Adapter)
649{ 649{
650 UINT uiIndex = 0; 650 UINT uiIndex = 0;
651 UCHAR GPIO_num = 0; 651 UCHAR GPIO_num = 0;
@@ -857,7 +857,7 @@ static VOID LEDControlThread(PMINI_ADAPTER Adapter)
857 Adapter->LEDInfo.led_thread_running = BCM_LED_THREAD_DISABLED; 857 Adapter->LEDInfo.led_thread_running = BCM_LED_THREAD_DISABLED;
858} 858}
859 859
860int InitLedSettings(PMINI_ADAPTER Adapter) 860int InitLedSettings(struct bcm_mini_adapter *Adapter)
861{ 861{
862 int Status = STATUS_SUCCESS; 862 int Status = STATUS_SUCCESS;
863 BOOLEAN bEnableThread = TRUE; 863 BOOLEAN bEnableThread = TRUE;
diff --git a/drivers/staging/bcm/nvm.c b/drivers/staging/bcm/nvm.c
index 7d703cb3c5e0..f16d3bb54c3c 100644
--- a/drivers/staging/bcm/nvm.c
+++ b/drivers/staging/bcm/nvm.c
@@ -2,54 +2,54 @@
2 2
3#define DWORD unsigned int 3#define DWORD unsigned int
4 4
5static INT BcmDoChipSelect(PMINI_ADAPTER Adapter, UINT offset); 5static INT BcmDoChipSelect(struct bcm_mini_adapter *Adapter, UINT offset);
6static INT BcmGetActiveDSD(PMINI_ADAPTER Adapter); 6static INT BcmGetActiveDSD(struct bcm_mini_adapter *Adapter);
7static INT BcmGetActiveISO(PMINI_ADAPTER Adapter); 7static INT BcmGetActiveISO(struct bcm_mini_adapter *Adapter);
8static UINT BcmGetEEPROMSize(PMINI_ADAPTER Adapter); 8static UINT BcmGetEEPROMSize(struct bcm_mini_adapter *Adapter);
9static INT BcmGetFlashCSInfo(PMINI_ADAPTER Adapter); 9static INT BcmGetFlashCSInfo(struct bcm_mini_adapter *Adapter);
10static UINT BcmGetFlashSectorSize(PMINI_ADAPTER Adapter, UINT FlashSectorSizeSig, UINT FlashSectorSize); 10static UINT BcmGetFlashSectorSize(struct bcm_mini_adapter *Adapter, UINT FlashSectorSizeSig, UINT FlashSectorSize);
11 11
12static VOID BcmValidateNvmType(PMINI_ADAPTER Adapter); 12static VOID BcmValidateNvmType(struct bcm_mini_adapter *Adapter);
13static INT BcmGetNvmSize(PMINI_ADAPTER Adapter); 13static INT BcmGetNvmSize(struct bcm_mini_adapter *Adapter);
14static UINT BcmGetFlashSize(PMINI_ADAPTER Adapter); 14static UINT BcmGetFlashSize(struct bcm_mini_adapter *Adapter);
15static NVM_TYPE BcmGetNvmType(PMINI_ADAPTER Adapter); 15static NVM_TYPE BcmGetNvmType(struct bcm_mini_adapter *Adapter);
16 16
17static INT BcmGetSectionValEndOffset(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal); 17static INT BcmGetSectionValEndOffset(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal);
18 18
19static B_UINT8 IsOffsetWritable(PMINI_ADAPTER Adapter, UINT uiOffset); 19static B_UINT8 IsOffsetWritable(struct bcm_mini_adapter *Adapter, UINT uiOffset);
20static INT IsSectionWritable(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL Section); 20static INT IsSectionWritable(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL Section);
21static INT IsSectionExistInVendorInfo(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL section); 21static INT IsSectionExistInVendorInfo(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL section);
22 22
23static INT ReadDSDPriority(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL dsd); 23static INT ReadDSDPriority(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL dsd);
24static INT ReadDSDSignature(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL dsd); 24static INT ReadDSDSignature(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL dsd);
25static INT ReadISOPriority(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL iso); 25static INT ReadISOPriority(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL iso);
26static INT ReadISOSignature(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL iso); 26static INT ReadISOSignature(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL iso);
27 27
28static INT CorruptDSDSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal); 28static INT CorruptDSDSig(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal);
29static INT CorruptISOSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal); 29static INT CorruptISOSig(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal);
30static INT SaveHeaderIfPresent(PMINI_ADAPTER Adapter, PUCHAR pBuff, UINT uiSectAlignAddr); 30static INT SaveHeaderIfPresent(struct bcm_mini_adapter *Adapter, PUCHAR pBuff, UINT uiSectAlignAddr);
31static INT WriteToFlashWithoutSectorErase(PMINI_ADAPTER Adapter, PUINT pBuff, 31static INT WriteToFlashWithoutSectorErase(struct bcm_mini_adapter *Adapter, PUINT pBuff,
32 FLASH2X_SECTION_VAL eFlash2xSectionVal, 32 FLASH2X_SECTION_VAL eFlash2xSectionVal,
33 UINT uiOffset, UINT uiNumBytes); 33 UINT uiOffset, UINT uiNumBytes);
34static FLASH2X_SECTION_VAL getHighestPriDSD(PMINI_ADAPTER Adapter); 34static FLASH2X_SECTION_VAL getHighestPriDSD(struct bcm_mini_adapter *Adapter);
35static FLASH2X_SECTION_VAL getHighestPriISO(PMINI_ADAPTER Adapter); 35static FLASH2X_SECTION_VAL getHighestPriISO(struct bcm_mini_adapter *Adapter);
36 36
37static INT BeceemFlashBulkRead( 37static INT BeceemFlashBulkRead(
38 PMINI_ADAPTER Adapter, 38 struct bcm_mini_adapter *Adapter,
39 PUINT pBuffer, 39 PUINT pBuffer,
40 UINT uiOffset, 40 UINT uiOffset,
41 UINT uiNumBytes); 41 UINT uiNumBytes);
42 42
43static INT BeceemFlashBulkWrite( 43static INT BeceemFlashBulkWrite(
44 PMINI_ADAPTER Adapter, 44 struct bcm_mini_adapter *Adapter,
45 PUINT pBuffer, 45 PUINT pBuffer,
46 UINT uiOffset, 46 UINT uiOffset,
47 UINT uiNumBytes, 47 UINT uiNumBytes,
48 BOOLEAN bVerify); 48 BOOLEAN bVerify);
49 49
50static INT GetFlashBaseAddr(PMINI_ADAPTER Adapter); 50static INT GetFlashBaseAddr(struct bcm_mini_adapter *Adapter);
51 51
52static INT ReadBeceemEEPROMBulk(PMINI_ADAPTER Adapter,UINT dwAddress, UINT *pdwData, UINT dwNumData); 52static INT ReadBeceemEEPROMBulk(struct bcm_mini_adapter *Adapter,UINT dwAddress, UINT *pdwData, UINT dwNumData);
53 53
54// Procedure: ReadEEPROMStatusRegister 54// Procedure: ReadEEPROMStatusRegister
55// 55//
@@ -62,7 +62,7 @@ static INT ReadBeceemEEPROMBulk(PMINI_ADAPTER Adapter,UINT dwAddress, UINT *pdwD
62// 62//
63//----------------------------------------------------------------------------- 63//-----------------------------------------------------------------------------
64 64
65static UCHAR ReadEEPROMStatusRegister( PMINI_ADAPTER Adapter ) 65static UCHAR ReadEEPROMStatusRegister(struct bcm_mini_adapter *Adapter )
66{ 66{
67 UCHAR uiData = 0; 67 UCHAR uiData = 0;
68 DWORD dwRetries = MAX_EEPROM_RETRIES*RETRIES_PER_DELAY; 68 DWORD dwRetries = MAX_EEPROM_RETRIES*RETRIES_PER_DELAY;
@@ -128,7 +128,7 @@ static UCHAR ReadEEPROMStatusRegister( PMINI_ADAPTER Adapter )
128// OSAL_STATUS_CODE: 128// OSAL_STATUS_CODE:
129//----------------------------------------------------------------------------- 129//-----------------------------------------------------------------------------
130 130
131INT ReadBeceemEEPROMBulk( PMINI_ADAPTER Adapter, 131INT ReadBeceemEEPROMBulk(struct bcm_mini_adapter *Adapter,
132 DWORD dwAddress, 132 DWORD dwAddress,
133 DWORD *pdwData, 133 DWORD *pdwData,
134 DWORD dwNumWords 134 DWORD dwNumWords
@@ -255,7 +255,7 @@ INT ReadBeceemEEPROMBulk( PMINI_ADAPTER Adapter,
255// OSAL_STATUS_CODE: 255// OSAL_STATUS_CODE:
256//----------------------------------------------------------------------------- 256//-----------------------------------------------------------------------------
257 257
258INT ReadBeceemEEPROM( PMINI_ADAPTER Adapter, 258INT ReadBeceemEEPROM(struct bcm_mini_adapter *Adapter,
259 DWORD uiOffset, 259 DWORD uiOffset,
260 DWORD *pBuffer 260 DWORD *pBuffer
261 ) 261 )
@@ -285,7 +285,7 @@ INT ReadBeceemEEPROM( PMINI_ADAPTER Adapter,
285 285
286 286
287 287
288INT ReadMacAddressFromNVM(PMINI_ADAPTER Adapter) 288INT ReadMacAddressFromNVM(struct bcm_mini_adapter *Adapter)
289{ 289{
290 INT Status; 290 INT Status;
291 unsigned char puMacAddr[6]; 291 unsigned char puMacAddr[6];
@@ -318,7 +318,7 @@ INT ReadMacAddressFromNVM(PMINI_ADAPTER Adapter)
318//----------------------------------------------------------------------------- 318//-----------------------------------------------------------------------------
319 319
320INT BeceemEEPROMBulkRead( 320INT BeceemEEPROMBulkRead(
321 PMINI_ADAPTER Adapter, 321 struct bcm_mini_adapter *Adapter,
322 PUINT pBuffer, 322 PUINT pBuffer,
323 UINT uiOffset, 323 UINT uiOffset,
324 UINT uiNumBytes) 324 UINT uiNumBytes)
@@ -436,7 +436,7 @@ INT BeceemEEPROMBulkRead(
436//----------------------------------------------------------------------------- 436//-----------------------------------------------------------------------------
437 437
438static INT BeceemFlashBulkRead( 438static INT BeceemFlashBulkRead(
439 PMINI_ADAPTER Adapter, 439 struct bcm_mini_adapter *Adapter,
440 PUINT pBuffer, 440 PUINT pBuffer,
441 UINT uiOffset, 441 UINT uiOffset,
442 UINT uiNumBytes) 442 UINT uiNumBytes)
@@ -518,7 +518,7 @@ static INT BeceemFlashBulkRead(
518// 518//
519//----------------------------------------------------------------------------- 519//-----------------------------------------------------------------------------
520 520
521static UINT BcmGetFlashSize(PMINI_ADAPTER Adapter) 521static UINT BcmGetFlashSize(struct bcm_mini_adapter *Adapter)
522{ 522{
523 if(IsFlash2x(Adapter)) 523 if(IsFlash2x(Adapter))
524 return (Adapter->psFlash2xCSInfo->OffsetFromDSDStartForDSDHeader + sizeof(DSD_HEADER)); 524 return (Adapter->psFlash2xCSInfo->OffsetFromDSDStartForDSDHeader + sizeof(DSD_HEADER));
@@ -541,7 +541,7 @@ static UINT BcmGetFlashSize(PMINI_ADAPTER Adapter)
541// 541//
542//----------------------------------------------------------------------------- 542//-----------------------------------------------------------------------------
543 543
544static UINT BcmGetEEPROMSize(PMINI_ADAPTER Adapter) 544static UINT BcmGetEEPROMSize(struct bcm_mini_adapter *Adapter)
545{ 545{
546 UINT uiData = 0; 546 UINT uiData = 0;
547 UINT uiIndex = 0; 547 UINT uiIndex = 0;
@@ -607,7 +607,7 @@ static UINT BcmGetEEPROMSize(PMINI_ADAPTER Adapter)
607//----------------------------------------------------------------------------- 607//-----------------------------------------------------------------------------
608 608
609 609
610static INT FlashSectorErase(PMINI_ADAPTER Adapter, 610static INT FlashSectorErase(struct bcm_mini_adapter *Adapter,
611 UINT addr, 611 UINT addr,
612 UINT numOfSectors) 612 UINT numOfSectors)
613{ 613{
@@ -672,7 +672,7 @@ static INT FlashSectorErase(PMINI_ADAPTER Adapter,
672//----------------------------------------------------------------------------- 672//-----------------------------------------------------------------------------
673 673
674static INT flashByteWrite( 674static INT flashByteWrite(
675 PMINI_ADAPTER Adapter, 675 struct bcm_mini_adapter *Adapter,
676 UINT uiOffset, 676 UINT uiOffset,
677 PVOID pData) 677 PVOID pData)
678{ 678{
@@ -762,7 +762,7 @@ static INT flashByteWrite(
762//----------------------------------------------------------------------------- 762//-----------------------------------------------------------------------------
763 763
764static INT flashWrite( 764static INT flashWrite(
765 PMINI_ADAPTER Adapter, 765 struct bcm_mini_adapter *Adapter,
766 UINT uiOffset, 766 UINT uiOffset,
767 PVOID pData) 767 PVOID pData)
768 768
@@ -848,7 +848,7 @@ static INT flashWrite(
848// 848//
849//----------------------------------------------------------------------------- 849//-----------------------------------------------------------------------------
850static INT flashByteWriteStatus( 850static INT flashByteWriteStatus(
851 PMINI_ADAPTER Adapter, 851 struct bcm_mini_adapter *Adapter,
852 UINT uiOffset, 852 UINT uiOffset,
853 PVOID pData) 853 PVOID pData)
854{ 854{
@@ -935,7 +935,7 @@ static INT flashByteWriteStatus(
935//----------------------------------------------------------------------------- 935//-----------------------------------------------------------------------------
936 936
937static INT flashWriteStatus( 937static INT flashWriteStatus(
938 PMINI_ADAPTER Adapter, 938 struct bcm_mini_adapter *Adapter,
939 UINT uiOffset, 939 UINT uiOffset,
940 PVOID pData) 940 PVOID pData)
941{ 941{
@@ -1014,7 +1014,7 @@ static INT flashWriteStatus(
1014// 1014//
1015//----------------------------------------------------------------------------- 1015//-----------------------------------------------------------------------------
1016 1016
1017static VOID BcmRestoreBlockProtectStatus(PMINI_ADAPTER Adapter,ULONG ulWriteStatus) 1017static VOID BcmRestoreBlockProtectStatus(struct bcm_mini_adapter *Adapter,ULONG ulWriteStatus)
1018{ 1018{
1019 UINT value; 1019 UINT value;
1020 value = (FLASH_CMD_WRITE_ENABLE<< 24); 1020 value = (FLASH_CMD_WRITE_ENABLE<< 24);
@@ -1037,7 +1037,7 @@ static VOID BcmRestoreBlockProtectStatus(PMINI_ADAPTER Adapter,ULONG ulWriteStat
1037// ULONG - Status value before UnProtect. 1037// ULONG - Status value before UnProtect.
1038// 1038//
1039//----------------------------------------------------------------------------- 1039//-----------------------------------------------------------------------------
1040static ULONG BcmFlashUnProtectBlock(PMINI_ADAPTER Adapter,UINT uiOffset, UINT uiLength) 1040static ULONG BcmFlashUnProtectBlock(struct bcm_mini_adapter *Adapter,UINT uiOffset, UINT uiLength)
1041{ 1041{
1042 ULONG ulStatus = 0; 1042 ULONG ulStatus = 0;
1043 ULONG ulWriteStatus = 0; 1043 ULONG ulWriteStatus = 0;
@@ -1146,7 +1146,7 @@ static ULONG BcmFlashUnProtectBlock(PMINI_ADAPTER Adapter,UINT uiOffset, UINT ui
1146//----------------------------------------------------------------------------- 1146//-----------------------------------------------------------------------------
1147 1147
1148static INT BeceemFlashBulkWrite( 1148static INT BeceemFlashBulkWrite(
1149 PMINI_ADAPTER Adapter, 1149 struct bcm_mini_adapter *Adapter,
1150 PUINT pBuffer, 1150 PUINT pBuffer,
1151 UINT uiOffset, 1151 UINT uiOffset,
1152 UINT uiNumBytes, 1152 UINT uiNumBytes,
@@ -1365,7 +1365,7 @@ BeceemFlashBulkWrite_EXIT:
1365//----------------------------------------------------------------------------- 1365//-----------------------------------------------------------------------------
1366 1366
1367static INT BeceemFlashBulkWriteStatus( 1367static INT BeceemFlashBulkWriteStatus(
1368 PMINI_ADAPTER Adapter, 1368 struct bcm_mini_adapter *Adapter,
1369 PUINT pBuffer, 1369 PUINT pBuffer,
1370 UINT uiOffset, 1370 UINT uiOffset,
1371 UINT uiNumBytes, 1371 UINT uiNumBytes,
@@ -1545,7 +1545,7 @@ BeceemFlashBulkWriteStatus_EXIT:
1545//----------------------------------------------------------------------------- 1545//-----------------------------------------------------------------------------
1546 1546
1547 1547
1548INT PropagateCalParamsFromEEPROMToMemory(PMINI_ADAPTER Adapter) 1548INT PropagateCalParamsFromEEPROMToMemory(struct bcm_mini_adapter *Adapter)
1549{ 1549{
1550 PCHAR pBuff = kmalloc(BUFFER_4K, GFP_KERNEL); 1550 PCHAR pBuff = kmalloc(BUFFER_4K, GFP_KERNEL);
1551 UINT uiEepromSize = 0; 1551 UINT uiEepromSize = 0;
@@ -1614,7 +1614,7 @@ INT PropagateCalParamsFromEEPROMToMemory(PMINI_ADAPTER Adapter)
1614// 1614//
1615//----------------------------------------------------------------------------- 1615//-----------------------------------------------------------------------------
1616 1616
1617INT PropagateCalParamsFromFlashToMemory(PMINI_ADAPTER Adapter) 1617INT PropagateCalParamsFromFlashToMemory(struct bcm_mini_adapter *Adapter)
1618{ 1618{
1619 PCHAR pBuff, pPtr; 1619 PCHAR pBuff, pPtr;
1620 UINT uiEepromSize = 0; 1620 UINT uiEepromSize = 0;
@@ -1699,7 +1699,7 @@ INT PropagateCalParamsFromFlashToMemory(PMINI_ADAPTER Adapter)
1699//----------------------------------------------------------------------------- 1699//-----------------------------------------------------------------------------
1700 1700
1701static INT BeceemEEPROMReadBackandVerify( 1701static INT BeceemEEPROMReadBackandVerify(
1702 PMINI_ADAPTER Adapter, 1702 struct bcm_mini_adapter *Adapter,
1703 PUINT pBuffer, 1703 PUINT pBuffer,
1704 UINT uiOffset, 1704 UINT uiOffset,
1705 UINT uiNumBytes) 1705 UINT uiNumBytes)
@@ -1798,7 +1798,7 @@ static VOID BcmSwapWord(UINT *ptr1) {
1798// OSAL_STATUS_CODE 1798// OSAL_STATUS_CODE
1799// 1799//
1800//----------------------------------------------------------------------------- 1800//-----------------------------------------------------------------------------
1801static INT BeceemEEPROMWritePage( PMINI_ADAPTER Adapter, UINT uiData[], UINT uiOffset ) 1801static INT BeceemEEPROMWritePage(struct bcm_mini_adapter *Adapter, UINT uiData[], UINT uiOffset )
1802{ 1802{
1803 UINT uiRetries = MAX_EEPROM_RETRIES*RETRIES_PER_DELAY; 1803 UINT uiRetries = MAX_EEPROM_RETRIES*RETRIES_PER_DELAY;
1804 UINT uiStatus = 0; 1804 UINT uiStatus = 0;
@@ -1934,7 +1934,7 @@ static INT BeceemEEPROMWritePage( PMINI_ADAPTER Adapter, UINT uiData[], UINT uiO
1934//----------------------------------------------------------------------------- 1934//-----------------------------------------------------------------------------
1935 1935
1936INT BeceemEEPROMBulkWrite( 1936INT BeceemEEPROMBulkWrite(
1937 PMINI_ADAPTER Adapter, 1937 struct bcm_mini_adapter *Adapter,
1938 PUCHAR pBuffer, 1938 PUCHAR pBuffer,
1939 UINT uiOffset, 1939 UINT uiOffset,
1940 UINT uiNumBytes, 1940 UINT uiNumBytes,
@@ -2036,7 +2036,7 @@ INT BeceemEEPROMBulkWrite(
2036//----------------------------------------------------------------------------- 2036//-----------------------------------------------------------------------------
2037 2037
2038INT BeceemNVMRead( 2038INT BeceemNVMRead(
2039 PMINI_ADAPTER Adapter, 2039 struct bcm_mini_adapter *Adapter,
2040 PUINT pBuffer, 2040 PUINT pBuffer,
2041 UINT uiOffset, 2041 UINT uiOffset,
2042 UINT uiNumBytes) 2042 UINT uiNumBytes)
@@ -2099,7 +2099,7 @@ INT BeceemNVMRead(
2099//----------------------------------------------------------------------------- 2099//-----------------------------------------------------------------------------
2100 2100
2101INT BeceemNVMWrite( 2101INT BeceemNVMWrite(
2102 PMINI_ADAPTER Adapter, 2102 struct bcm_mini_adapter *Adapter,
2103 PUINT pBuffer, 2103 PUINT pBuffer,
2104 UINT uiOffset, 2104 UINT uiOffset,
2105 UINT uiNumBytes, 2105 UINT uiNumBytes,
@@ -2233,7 +2233,7 @@ INT BeceemNVMWrite(
2233// <FAILURE> - if failed. 2233// <FAILURE> - if failed.
2234//----------------------------------------------------------------------------- 2234//-----------------------------------------------------------------------------
2235 2235
2236INT BcmUpdateSectorSize(PMINI_ADAPTER Adapter,UINT uiSectorSize) 2236INT BcmUpdateSectorSize(struct bcm_mini_adapter *Adapter,UINT uiSectorSize)
2237{ 2237{
2238 INT Status = -1; 2238 INT Status = -1;
2239 FLASH_CS_INFO sFlashCsInfo = {0}; 2239 FLASH_CS_INFO sFlashCsInfo = {0};
@@ -2308,7 +2308,7 @@ INT BcmUpdateSectorSize(PMINI_ADAPTER Adapter,UINT uiSectorSize)
2308// 2308//
2309//----------------------------------------------------------------------------- 2309//-----------------------------------------------------------------------------
2310 2310
2311static UINT BcmGetFlashSectorSize(PMINI_ADAPTER Adapter, UINT FlashSectorSizeSig, UINT FlashSectorSize) 2311static UINT BcmGetFlashSectorSize(struct bcm_mini_adapter *Adapter, UINT FlashSectorSizeSig, UINT FlashSectorSize)
2312{ 2312{
2313 UINT uiSectorSize = 0; 2313 UINT uiSectorSize = 0;
2314 UINT uiSectorSig = 0; 2314 UINT uiSectorSig = 0;
@@ -2377,7 +2377,7 @@ static UINT BcmGetFlashSectorSize(PMINI_ADAPTER Adapter, UINT FlashSectorSizeSig
2377// <OSAL_STATUS_CODE> 2377// <OSAL_STATUS_CODE>
2378//----------------------------------------------------------------------------- 2378//-----------------------------------------------------------------------------
2379 2379
2380static INT BcmInitEEPROMQueues(PMINI_ADAPTER Adapter) 2380static INT BcmInitEEPROMQueues(struct bcm_mini_adapter *Adapter)
2381{ 2381{
2382 UINT value = 0; 2382 UINT value = 0;
2383 /* CHIP Bug : Clear the Avail bits on the Read queue. The default 2383 /* CHIP Bug : Clear the Avail bits on the Read queue. The default
@@ -2413,7 +2413,7 @@ static INT BcmInitEEPROMQueues(PMINI_ADAPTER Adapter)
2413// <OSAL_STATUS_CODE> 2413// <OSAL_STATUS_CODE>
2414//----------------------------------------------------------------------------- 2414//-----------------------------------------------------------------------------
2415 2415
2416INT BcmInitNVM(PMINI_ADAPTER ps_adapter) 2416INT BcmInitNVM(struct bcm_mini_adapter *ps_adapter)
2417{ 2417{
2418 BcmValidateNvmType(ps_adapter); 2418 BcmValidateNvmType(ps_adapter);
2419 BcmInitEEPROMQueues(ps_adapter); 2419 BcmInitEEPROMQueues(ps_adapter);
@@ -2445,7 +2445,7 @@ INT BcmInitNVM(PMINI_ADAPTER ps_adapter)
2445*/ 2445*/
2446/***************************************************************************/ 2446/***************************************************************************/
2447 2447
2448static INT BcmGetNvmSize(PMINI_ADAPTER Adapter) 2448static INT BcmGetNvmSize(struct bcm_mini_adapter *Adapter)
2449{ 2449{
2450 if(Adapter->eNVMType == NVM_EEPROM) 2450 if(Adapter->eNVMType == NVM_EEPROM)
2451 { 2451 {
@@ -2469,7 +2469,7 @@ static INT BcmGetNvmSize(PMINI_ADAPTER Adapter)
2469// Returns: 2469// Returns:
2470// <VOID> 2470// <VOID>
2471//----------------------------------------------------------------------------- 2471//-----------------------------------------------------------------------------
2472static VOID BcmValidateNvmType(PMINI_ADAPTER Adapter) 2472static VOID BcmValidateNvmType(struct bcm_mini_adapter *Adapter)
2473{ 2473{
2474 2474
2475 // 2475 //
@@ -2495,7 +2495,7 @@ static VOID BcmValidateNvmType(PMINI_ADAPTER Adapter)
2495// Returns: 2495// Returns:
2496// Flash ID 2496// Flash ID
2497//----------------------------------------------------------------------------- 2497//-----------------------------------------------------------------------------
2498static ULONG BcmReadFlashRDID(PMINI_ADAPTER Adapter) 2498static ULONG BcmReadFlashRDID(struct bcm_mini_adapter *Adapter)
2499{ 2499{
2500 ULONG ulRDID = 0; 2500 ULONG ulRDID = 0;
2501 UINT value; 2501 UINT value;
@@ -2518,7 +2518,7 @@ static ULONG BcmReadFlashRDID(PMINI_ADAPTER Adapter)
2518 2518
2519} 2519}
2520 2520
2521INT BcmAllocFlashCSStructure(PMINI_ADAPTER psAdapter) 2521INT BcmAllocFlashCSStructure(struct bcm_mini_adapter *psAdapter)
2522{ 2522{
2523 if(psAdapter == NULL) 2523 if(psAdapter == NULL)
2524 { 2524 {
@@ -2552,7 +2552,7 @@ INT BcmAllocFlashCSStructure(PMINI_ADAPTER psAdapter)
2552 return STATUS_SUCCESS; 2552 return STATUS_SUCCESS;
2553} 2553}
2554 2554
2555INT BcmDeAllocFlashCSStructure(PMINI_ADAPTER psAdapter) 2555INT BcmDeAllocFlashCSStructure(struct bcm_mini_adapter *psAdapter)
2556{ 2556{
2557 if(psAdapter == NULL) 2557 if(psAdapter == NULL)
2558 { 2558 {
@@ -2565,7 +2565,7 @@ INT BcmDeAllocFlashCSStructure(PMINI_ADAPTER psAdapter)
2565 return STATUS_SUCCESS ; 2565 return STATUS_SUCCESS ;
2566} 2566}
2567 2567
2568static INT BcmDumpFlash2XCSStructure(PFLASH2X_CS_INFO psFlash2xCSInfo,PMINI_ADAPTER Adapter) 2568static INT BcmDumpFlash2XCSStructure(PFLASH2X_CS_INFO psFlash2xCSInfo,struct bcm_mini_adapter *Adapter)
2569{ 2569{
2570 UINT Index = 0; 2570 UINT Index = 0;
2571 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "**********************FLASH2X CS Structure *******************"); 2571 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "**********************FLASH2X CS Structure *******************");
@@ -2715,14 +2715,14 @@ static INT ConvertEndianOfCSStructure(PFLASH_CS_INFO psFlashCSInfo)
2715 return STATUS_SUCCESS; 2715 return STATUS_SUCCESS;
2716} 2716}
2717 2717
2718static INT IsSectionExistInVendorInfo(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL section) 2718static INT IsSectionExistInVendorInfo(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL section)
2719{ 2719{
2720 return ( Adapter->uiVendorExtnFlag && 2720 return ( Adapter->uiVendorExtnFlag &&
2721 (Adapter->psFlash2xVendorInfo->VendorSection[section].AccessFlags & FLASH2X_SECTION_PRESENT) && 2721 (Adapter->psFlash2xVendorInfo->VendorSection[section].AccessFlags & FLASH2X_SECTION_PRESENT) &&
2722 (Adapter->psFlash2xVendorInfo->VendorSection[section].OffsetFromZeroForSectionStart != UNINIT_PTR_IN_CS) ); 2722 (Adapter->psFlash2xVendorInfo->VendorSection[section].OffsetFromZeroForSectionStart != UNINIT_PTR_IN_CS) );
2723} 2723}
2724 2724
2725static VOID UpdateVendorInfo(PMINI_ADAPTER Adapter) 2725static VOID UpdateVendorInfo(struct bcm_mini_adapter *Adapter)
2726{ 2726{
2727 B_UINT32 i = 0; 2727 B_UINT32 i = 0;
2728 UINT uiSizeSection = 0; 2728 UINT uiSizeSection = 0;
@@ -2813,7 +2813,7 @@ static VOID UpdateVendorInfo(PMINI_ADAPTER Adapter)
2813// <VOID> 2813// <VOID>
2814//----------------------------------------------------------------------------- 2814//-----------------------------------------------------------------------------
2815 2815
2816static INT BcmGetFlashCSInfo(PMINI_ADAPTER Adapter) 2816static INT BcmGetFlashCSInfo(struct bcm_mini_adapter *Adapter)
2817{ 2817{
2818 //FLASH_CS_INFO sFlashCsInfo = {0}; 2818 //FLASH_CS_INFO sFlashCsInfo = {0};
2819 2819
@@ -2960,7 +2960,7 @@ static INT BcmGetFlashCSInfo(PMINI_ADAPTER Adapter)
2960// 2960//
2961//----------------------------------------------------------------------------- 2961//-----------------------------------------------------------------------------
2962 2962
2963static NVM_TYPE BcmGetNvmType(PMINI_ADAPTER Adapter) 2963static NVM_TYPE BcmGetNvmType(struct bcm_mini_adapter *Adapter)
2964{ 2964{
2965 UINT uiData = 0; 2965 UINT uiData = 0;
2966 2966
@@ -3004,7 +3004,7 @@ static NVM_TYPE BcmGetNvmType(PMINI_ADAPTER Adapter)
3004* On Failure -returns STATUS_FAILURE 3004* On Failure -returns STATUS_FAILURE
3005**/ 3005**/
3006 3006
3007INT BcmGetSectionValStartOffset(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlashSectionVal) 3007INT BcmGetSectionValStartOffset(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFlashSectionVal)
3008{ 3008{
3009 /* 3009 /*
3010 * Considering all the section for which end offset can be calculated or directly given 3010 * Considering all the section for which end offset can be calculated or directly given
@@ -3098,7 +3098,7 @@ INT BcmGetSectionValStartOffset(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlas
3098* On Failure -returns STATUS_FAILURE 3098* On Failure -returns STATUS_FAILURE
3099**/ 3099**/
3100 3100
3101INT BcmGetSectionValEndOffset(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal) 3101INT BcmGetSectionValEndOffset(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal)
3102{ 3102{
3103 INT SectEndOffset = 0 ; 3103 INT SectEndOffset = 0 ;
3104 SectEndOffset = INVALID_OFFSET; 3104 SectEndOffset = INVALID_OFFSET;
@@ -3188,7 +3188,7 @@ INT BcmGetSectionValEndOffset(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2
3188*/ 3188*/
3189 3189
3190INT BcmFlash2xBulkRead( 3190INT BcmFlash2xBulkRead(
3191 PMINI_ADAPTER Adapter, 3191 struct bcm_mini_adapter *Adapter,
3192 PUINT pBuffer, 3192 PUINT pBuffer,
3193 FLASH2X_SECTION_VAL eFlash2xSectionVal, 3193 FLASH2X_SECTION_VAL eFlash2xSectionVal,
3194 UINT uiOffsetWithinSectionVal, 3194 UINT uiOffsetWithinSectionVal,
@@ -3257,7 +3257,7 @@ INT BcmFlash2xBulkRead(
3257*/ 3257*/
3258 3258
3259INT BcmFlash2xBulkWrite( 3259INT BcmFlash2xBulkWrite(
3260 PMINI_ADAPTER Adapter, 3260 struct bcm_mini_adapter *Adapter,
3261 PUINT pBuffer, 3261 PUINT pBuffer,
3262 FLASH2X_SECTION_VAL eFlash2xSectVal, 3262 FLASH2X_SECTION_VAL eFlash2xSectVal,
3263 UINT uiOffset, 3263 UINT uiOffset,
@@ -3322,7 +3322,7 @@ INT BcmFlash2xBulkWrite(
3322* Return STATUS_SUCESS if get success in setting the right DSD else negaive error code 3322* Return STATUS_SUCESS if get success in setting the right DSD else negaive error code
3323* 3323*
3324**/ 3324**/
3325static INT BcmGetActiveDSD(PMINI_ADAPTER Adapter) 3325static INT BcmGetActiveDSD(struct bcm_mini_adapter *Adapter)
3326{ 3326{
3327 FLASH2X_SECTION_VAL uiHighestPriDSD = 0 ; 3327 FLASH2X_SECTION_VAL uiHighestPriDSD = 0 ;
3328 3328
@@ -3371,7 +3371,7 @@ static INT BcmGetActiveDSD(PMINI_ADAPTER Adapter)
3371* 3371*
3372**/ 3372**/
3373 3373
3374static INT BcmGetActiveISO(PMINI_ADAPTER Adapter) 3374static INT BcmGetActiveISO(struct bcm_mini_adapter *Adapter)
3375{ 3375{
3376 3376
3377 INT HighestPriISO = 0 ; 3377 INT HighestPriISO = 0 ;
@@ -3399,7 +3399,7 @@ static INT BcmGetActiveISO(PMINI_ADAPTER Adapter)
3399* Failure:-FALSE, offset is RO 3399* Failure:-FALSE, offset is RO
3400* 3400*
3401**/ 3401**/
3402B_UINT8 IsOffsetWritable(PMINI_ADAPTER Adapter, UINT uiOffset) 3402B_UINT8 IsOffsetWritable(struct bcm_mini_adapter *Adapter, UINT uiOffset)
3403{ 3403{
3404 UINT uiSectorNum = 0; 3404 UINT uiSectorNum = 0;
3405 UINT uiWordOfSectorPermission =0; 3405 UINT uiWordOfSectorPermission =0;
@@ -3424,7 +3424,7 @@ B_UINT8 IsOffsetWritable(PMINI_ADAPTER Adapter, UINT uiOffset)
3424 3424
3425static INT BcmDumpFlash2xSectionBitMap(PFLASH2X_BITMAP psFlash2xBitMap) 3425static INT BcmDumpFlash2xSectionBitMap(PFLASH2X_BITMAP psFlash2xBitMap)
3426{ 3426{
3427 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 3427 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
3428 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "***************Flash 2.x Section Bitmap***************"); 3428 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "***************Flash 2.x Section Bitmap***************");
3429 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"ISO_IMAGE1 :0X%x", psFlash2xBitMap->ISO_IMAGE1); 3429 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"ISO_IMAGE1 :0X%x", psFlash2xBitMap->ISO_IMAGE1);
3430 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"ISO_IMAGE2 :0X%x", psFlash2xBitMap->ISO_IMAGE2); 3430 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"ISO_IMAGE2 :0X%x", psFlash2xBitMap->ISO_IMAGE2);
@@ -3456,7 +3456,7 @@ static INT BcmDumpFlash2xSectionBitMap(PFLASH2X_BITMAP psFlash2xBitMap)
3456* Failure:- negative error code 3456* Failure:- negative error code
3457**/ 3457**/
3458 3458
3459INT BcmGetFlash2xSectionalBitMap(PMINI_ADAPTER Adapter, PFLASH2X_BITMAP psFlash2xBitMap) 3459INT BcmGetFlash2xSectionalBitMap(struct bcm_mini_adapter *Adapter, PFLASH2X_BITMAP psFlash2xBitMap)
3460{ 3460{
3461 3461
3462 3462
@@ -3752,7 +3752,7 @@ BcmSetActiveSection :- Set Active section is used to make priority field highest
3752Return Value:- Make the priorit highest else return erorr code 3752Return Value:- Make the priorit highest else return erorr code
3753 3753
3754**/ 3754**/
3755INT BcmSetActiveSection(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectVal) 3755INT BcmSetActiveSection(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFlash2xSectVal)
3756{ 3756{
3757 unsigned int SectImagePriority = 0; 3757 unsigned int SectImagePriority = 0;
3758 INT Status =STATUS_SUCCESS; 3758 INT Status =STATUS_SUCCESS;
@@ -3958,7 +3958,7 @@ BcmCopyISO - Used only for copying the ISO section
3958Return value:- SUCCESS if copies successfully else negative error code 3958Return value:- SUCCESS if copies successfully else negative error code
3959 3959
3960**/ 3960**/
3961INT BcmCopyISO(PMINI_ADAPTER Adapter, FLASH2X_COPY_SECTION sCopySectStrut) 3961INT BcmCopyISO(struct bcm_mini_adapter *Adapter, FLASH2X_COPY_SECTION sCopySectStrut)
3962{ 3962{
3963 3963
3964 PCHAR Buff = NULL; 3964 PCHAR Buff = NULL;
@@ -4289,7 +4289,7 @@ Return Value :-
4289 4289
4290 4290
4291**/ 4291**/
4292INT BcmFlash2xCorruptSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal) 4292INT BcmFlash2xCorruptSig(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal)
4293{ 4293{
4294 4294
4295 INT Status = STATUS_SUCCESS ; 4295 INT Status = STATUS_SUCCESS ;
@@ -4321,7 +4321,7 @@ Return Value :-
4321 Failure :-Return negative error code 4321 Failure :-Return negative error code
4322 4322
4323**/ 4323**/
4324INT BcmFlash2xWriteSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlashSectionVal) 4324INT BcmFlash2xWriteSig(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFlashSectionVal)
4325{ 4325{
4326 4326
4327 UINT uiSignature = 0 ; 4327 UINT uiSignature = 0 ;
@@ -4394,7 +4394,7 @@ Return values:-Return TRUE is request is valid else FALSE.
4394 4394
4395 4395
4396**/ 4396**/
4397INT validateFlash2xReadWrite(PMINI_ADAPTER Adapter, PFLASH2X_READWRITE psFlash2xReadWrite) 4397INT validateFlash2xReadWrite(struct bcm_mini_adapter *Adapter, PFLASH2X_READWRITE psFlash2xReadWrite)
4398{ 4398{
4399 UINT uiNumOfBytes = 0 ; 4399 UINT uiNumOfBytes = 0 ;
4400 UINT uiSectStartOffset = 0 ; 4400 UINT uiSectStartOffset = 0 ;
@@ -4459,7 +4459,7 @@ Return value:-
4459 return TRUE if flah2.x of hgher version else return false. 4459 return TRUE if flah2.x of hgher version else return false.
4460**/ 4460**/
4461 4461
4462INT IsFlash2x(PMINI_ADAPTER Adapter) 4462INT IsFlash2x(struct bcm_mini_adapter *Adapter)
4463{ 4463{
4464 if(Adapter->uiFlashLayoutMajorVersion >= FLASH_2X_MAJOR_NUMBER) 4464 if(Adapter->uiFlashLayoutMajorVersion >= FLASH_2X_MAJOR_NUMBER)
4465 return TRUE ; 4465 return TRUE ;
@@ -4474,7 +4474,7 @@ Return Value:-
4474 Success :- Base Address of the Flash 4474 Success :- Base Address of the Flash
4475**/ 4475**/
4476 4476
4477static INT GetFlashBaseAddr(PMINI_ADAPTER Adapter) 4477static INT GetFlashBaseAddr(struct bcm_mini_adapter *Adapter)
4478{ 4478{
4479 4479
4480 UINT uiBaseAddr = 0; 4480 UINT uiBaseAddr = 0;
@@ -4525,7 +4525,7 @@ Return Values-
4525 4525
4526**/ 4526**/
4527 4527
4528INT BcmCopySection(PMINI_ADAPTER Adapter, 4528INT BcmCopySection(struct bcm_mini_adapter *Adapter,
4529 FLASH2X_SECTION_VAL SrcSection, 4529 FLASH2X_SECTION_VAL SrcSection,
4530 FLASH2X_SECTION_VAL DstSection, 4530 FLASH2X_SECTION_VAL DstSection,
4531 UINT offset, 4531 UINT offset,
@@ -4642,7 +4642,7 @@ Return value :-
4642 4642
4643**/ 4643**/
4644 4644
4645INT SaveHeaderIfPresent(PMINI_ADAPTER Adapter, PUCHAR pBuff, UINT uiOffset) 4645INT SaveHeaderIfPresent(struct bcm_mini_adapter *Adapter, PUCHAR pBuff, UINT uiOffset)
4646{ 4646{
4647 UINT offsetToProtect = 0,HeaderSizeToProtect =0; 4647 UINT offsetToProtect = 0,HeaderSizeToProtect =0;
4648 BOOLEAN bHasHeader = FALSE ; 4648 BOOLEAN bHasHeader = FALSE ;
@@ -4715,7 +4715,7 @@ BcmDoChipSelect : This will selcet the appropriate chip for writing.
4715OutPut:- 4715OutPut:-
4716 Select the Appropriate chip and retrn status Success 4716 Select the Appropriate chip and retrn status Success
4717**/ 4717**/
4718static INT BcmDoChipSelect(PMINI_ADAPTER Adapter, UINT offset) 4718static INT BcmDoChipSelect(struct bcm_mini_adapter *Adapter, UINT offset)
4719{ 4719{
4720 UINT FlashConfig = 0; 4720 UINT FlashConfig = 0;
4721 INT ChipNum = 0; 4721 INT ChipNum = 0;
@@ -4791,7 +4791,7 @@ static INT BcmDoChipSelect(PMINI_ADAPTER Adapter, UINT offset)
4791 return STATUS_SUCCESS; 4791 return STATUS_SUCCESS;
4792 4792
4793} 4793}
4794INT ReadDSDSignature(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL dsd) 4794INT ReadDSDSignature(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL dsd)
4795{ 4795{
4796 UINT uiDSDsig = 0; 4796 UINT uiDSDsig = 0;
4797 //UINT sigoffsetInMap = 0; 4797 //UINT sigoffsetInMap = 0;
@@ -4816,7 +4816,7 @@ INT ReadDSDSignature(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL dsd)
4816 4816
4817 return uiDSDsig ; 4817 return uiDSDsig ;
4818} 4818}
4819INT ReadDSDPriority(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL dsd) 4819INT ReadDSDPriority(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL dsd)
4820{ 4820{
4821 //UINT priOffsetInMap = 0 ; 4821 //UINT priOffsetInMap = 0 ;
4822 unsigned int uiDSDPri = STATUS_FAILURE; 4822 unsigned int uiDSDPri = STATUS_FAILURE;
@@ -4839,7 +4839,7 @@ INT ReadDSDPriority(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL dsd)
4839 } 4839 }
4840 return uiDSDPri; 4840 return uiDSDPri;
4841} 4841}
4842FLASH2X_SECTION_VAL getHighestPriDSD(PMINI_ADAPTER Adapter) 4842FLASH2X_SECTION_VAL getHighestPriDSD(struct bcm_mini_adapter *Adapter)
4843{ 4843{
4844 INT DSDHighestPri = STATUS_FAILURE; 4844 INT DSDHighestPri = STATUS_FAILURE;
4845 INT DsdPri= 0 ; 4845 INT DsdPri= 0 ;
@@ -4873,7 +4873,7 @@ FLASH2X_SECTION_VAL getHighestPriDSD(PMINI_ADAPTER Adapter)
4873 return HighestPriDSD ; 4873 return HighestPriDSD ;
4874} 4874}
4875 4875
4876INT ReadISOSignature(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL iso) 4876INT ReadISOSignature(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL iso)
4877{ 4877{
4878 UINT uiISOsig = 0; 4878 UINT uiISOsig = 0;
4879 //UINT sigoffsetInMap = 0; 4879 //UINT sigoffsetInMap = 0;
@@ -4898,7 +4898,7 @@ INT ReadISOSignature(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL iso)
4898 4898
4899 return uiISOsig ; 4899 return uiISOsig ;
4900} 4900}
4901INT ReadISOPriority(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL iso) 4901INT ReadISOPriority(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL iso)
4902{ 4902{
4903 4903
4904 unsigned int ISOPri = STATUS_FAILURE; 4904 unsigned int ISOPri = STATUS_FAILURE;
@@ -4919,7 +4919,7 @@ INT ReadISOPriority(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL iso)
4919 } 4919 }
4920 return ISOPri; 4920 return ISOPri;
4921} 4921}
4922FLASH2X_SECTION_VAL getHighestPriISO(PMINI_ADAPTER Adapter) 4922FLASH2X_SECTION_VAL getHighestPriISO(struct bcm_mini_adapter *Adapter)
4923{ 4923{
4924 INT ISOHighestPri = STATUS_FAILURE; 4924 INT ISOHighestPri = STATUS_FAILURE;
4925 INT ISOPri= 0 ; 4925 INT ISOPri= 0 ;
@@ -4943,7 +4943,7 @@ FLASH2X_SECTION_VAL getHighestPriISO(PMINI_ADAPTER Adapter)
4943 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Highest ISO :%x and its Pri :%x",HighestPriISO,ISOHighestPri); 4943 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Highest ISO :%x and its Pri :%x",HighestPriISO,ISOHighestPri);
4944 return HighestPriISO ; 4944 return HighestPriISO ;
4945} 4945}
4946INT WriteToFlashWithoutSectorErase(PMINI_ADAPTER Adapter, 4946INT WriteToFlashWithoutSectorErase(struct bcm_mini_adapter *Adapter,
4947 PUINT pBuff, 4947 PUINT pBuff,
4948 FLASH2X_SECTION_VAL eFlash2xSectionVal, 4948 FLASH2X_SECTION_VAL eFlash2xSectionVal,
4949 UINT uiOffset, 4949 UINT uiOffset,
@@ -5006,7 +5006,7 @@ INT WriteToFlashWithoutSectorErase(PMINI_ADAPTER Adapter,
5006 return Status; 5006 return Status;
5007} 5007}
5008 5008
5009BOOLEAN IsSectionExistInFlash(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL section) 5009BOOLEAN IsSectionExistInFlash(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL section)
5010{ 5010{
5011 5011
5012 BOOLEAN SectionPresent = FALSE ; 5012 BOOLEAN SectionPresent = FALSE ;
@@ -5062,7 +5062,7 @@ BOOLEAN IsSectionExistInFlash(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL section
5062 } 5062 }
5063 return SectionPresent ; 5063 return SectionPresent ;
5064} 5064}
5065INT IsSectionWritable(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL Section) 5065INT IsSectionWritable(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL Section)
5066{ 5066{
5067 INT offset = STATUS_FAILURE; 5067 INT offset = STATUS_FAILURE;
5068 INT Status = FALSE; 5068 INT Status = FALSE;
@@ -5087,7 +5087,7 @@ INT IsSectionWritable(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL Section)
5087 return Status ; 5087 return Status ;
5088} 5088}
5089 5089
5090static INT CorruptDSDSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal) 5090static INT CorruptDSDSig(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal)
5091{ 5091{
5092 5092
5093 PUCHAR pBuff = NULL; 5093 PUCHAR pBuff = NULL;
@@ -5160,7 +5160,7 @@ static INT CorruptDSDSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSect
5160 return STATUS_SUCCESS ; 5160 return STATUS_SUCCESS ;
5161} 5161}
5162 5162
5163static INT CorruptISOSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal) 5163static INT CorruptISOSig(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal)
5164{ 5164{
5165 5165
5166 PUCHAR pBuff = NULL; 5166 PUCHAR pBuff = NULL;
@@ -5212,7 +5212,7 @@ static INT CorruptISOSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSect
5212 return STATUS_SUCCESS ; 5212 return STATUS_SUCCESS ;
5213} 5213}
5214 5214
5215BOOLEAN IsNonCDLessDevice(PMINI_ADAPTER Adapter) 5215BOOLEAN IsNonCDLessDevice(struct bcm_mini_adapter *Adapter)
5216{ 5216{
5217 if(Adapter->psFlash2xCSInfo->IsCDLessDeviceBootSig == NON_CDLESS_DEVICE_BOOT_SIG) 5217 if(Adapter->psFlash2xCSInfo->IsCDLessDeviceBootSig == NON_CDLESS_DEVICE_BOOT_SIG)
5218 return TRUE; 5218 return TRUE;
diff --git a/drivers/staging/bcm/sort.c b/drivers/staging/bcm/sort.c
index 5f891fa90a62..d518c4217f13 100644
--- a/drivers/staging/bcm/sort.c
+++ b/drivers/staging/bcm/sort.c
@@ -22,7 +22,7 @@ static int compare_packet_info(void const *a, void const *b)
22 return pa->u8TrafficPriority - pb->u8TrafficPriority; 22 return pa->u8TrafficPriority - pb->u8TrafficPriority;
23} 23}
24 24
25VOID SortPackInfo(PMINI_ADAPTER Adapter) 25VOID SortPackInfo(struct bcm_mini_adapter *Adapter)
26{ 26{
27 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, 27 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG,
28 DBG_LVL_ALL, "<======="); 28 DBG_LVL_ALL, "<=======");
@@ -42,7 +42,7 @@ static int compare_classifiers(void const *a, void const *b)
42 return pa->u8ClassifierRulePriority - pb->u8ClassifierRulePriority; 42 return pa->u8ClassifierRulePriority - pb->u8ClassifierRulePriority;
43} 43}
44 44
45VOID SortClassifiers(PMINI_ADAPTER Adapter) 45VOID SortClassifiers(struct bcm_mini_adapter *Adapter)
46{ 46{
47 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG, 47 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CONN_MSG,
48 DBG_LVL_ALL, "<======="); 48 DBG_LVL_ALL, "<=======");
diff --git a/drivers/staging/bcm/vendorspecificextn.c b/drivers/staging/bcm/vendorspecificextn.c
index 4178cd161da3..833883c21a22 100644
--- a/drivers/staging/bcm/vendorspecificextn.c
+++ b/drivers/staging/bcm/vendorspecificextn.c
@@ -28,7 +28,7 @@ INT vendorextnGetSectionInfo(PVOID pContext,PFLASH2X_VENDORSPECIFIC_INFO pVendo
28// STATUS_SUCCESS/STATUS_FAILURE 28// STATUS_SUCCESS/STATUS_FAILURE
29// 29//
30//----------------------------------------------------------------------------- 30//-----------------------------------------------------------------------------
31INT vendorextnInit(PMINI_ADAPTER Adapter) 31INT vendorextnInit(struct bcm_mini_adapter *Adapter)
32{ 32{
33 return STATUS_SUCCESS; 33 return STATUS_SUCCESS;
34} 34}
@@ -45,7 +45,7 @@ INT vendorextnInit(PMINI_ADAPTER Adapter)
45// STATUS_SUCCESS/STATUS_FAILURE 45// STATUS_SUCCESS/STATUS_FAILURE
46// 46//
47//----------------------------------------------------------------------------- 47//-----------------------------------------------------------------------------
48INT vendorextnExit(PMINI_ADAPTER Adapter) 48INT vendorextnExit(struct bcm_mini_adapter *Adapter)
49{ 49{
50 return STATUS_SUCCESS; 50 return STATUS_SUCCESS;
51} 51}
@@ -65,7 +65,7 @@ INT vendorextnExit(PMINI_ADAPTER Adapter)
65// STATUS_SUCCESS/STATUS_FAILURE as per the IOCTL return value 65// STATUS_SUCCESS/STATUS_FAILURE as per the IOCTL return value
66// 66//
67//-------------------------------------------------------------------------- 67//--------------------------------------------------------------------------
68INT vendorextnIoctl(PMINI_ADAPTER Adapter, UINT cmd, ULONG arg) 68INT vendorextnIoctl(struct bcm_mini_adapter *Adapter, UINT cmd, ULONG arg)
69{ 69{
70 return CONTINUE_COMMON_PATH; 70 return CONTINUE_COMMON_PATH;
71} 71}
diff --git a/drivers/staging/bcm/vendorspecificextn.h b/drivers/staging/bcm/vendorspecificextn.h
index 7ff14951f0ca..f237891b9f29 100644
--- a/drivers/staging/bcm/vendorspecificextn.h
+++ b/drivers/staging/bcm/vendorspecificextn.h
@@ -5,9 +5,9 @@
5#define CONTINUE_COMMON_PATH 0xFFFF 5#define CONTINUE_COMMON_PATH 0xFFFF
6 6
7INT vendorextnGetSectionInfo(PVOID pContext,PFLASH2X_VENDORSPECIFIC_INFO pVendorInfo); 7INT vendorextnGetSectionInfo(PVOID pContext,PFLASH2X_VENDORSPECIFIC_INFO pVendorInfo);
8INT vendorextnExit(PMINI_ADAPTER Adapter); 8INT vendorextnExit(struct bcm_mini_adapter *Adapter);
9INT vendorextnInit(PMINI_ADAPTER Adapter); 9INT vendorextnInit(struct bcm_mini_adapter *Adapter);
10INT vendorextnIoctl(PMINI_ADAPTER Adapter, UINT cmd, ULONG arg); 10INT vendorextnIoctl(struct bcm_mini_adapter *Adapter, UINT cmd, ULONG arg);
11INT vendorextnReadSection(PVOID pContext, PUCHAR pBuffer, FLASH2X_SECTION_VAL SectionVal, 11INT vendorextnReadSection(PVOID pContext, PUCHAR pBuffer, FLASH2X_SECTION_VAL SectionVal,
12 UINT offset, UINT numOfBytes); 12 UINT offset, UINT numOfBytes);
13INT vendorextnWriteSection(PVOID pContext, PUCHAR pBuffer, FLASH2X_SECTION_VAL SectionVal, 13INT vendorextnWriteSection(PVOID pContext, PUCHAR pBuffer, FLASH2X_SECTION_VAL SectionVal,
generated by cgit v1.2.2 (git 2.25.0) at 2025-09-09 08:44:09 -0400