This patch adjusts multi-line comments to “net/” kernel coding style in wl_netdev.c, since the driver depends on WLAN. Signed-off-by: Jelena Bjelja <jelena.bjelja.ing@xxxxxxxxx> --- drivers/staging/wlags49_h2/wl_netdev.c | 351 ++++++++++++++++++-------------- 1 file changed, 203 insertions(+), 148 deletions(-) diff --git a/drivers/staging/wlags49_h2/wl_netdev.c b/drivers/staging/wlags49_h2/wl_netdev.c index 9fb12f3..eaff3b7 100644 --- a/drivers/staging/wlags49_h2/wl_netdev.c +++ b/drivers/staging/wlags49_h2/wl_netdev.c @@ -1,4 +1,4 @@ -/******************************************************************************* +/* ***************************************************************************** * Agere Systems Inc. * Wireless device driver for Linux (wlags49). * @@ -57,11 +57,13 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - ******************************************************************************/ + * ***************************************************************************** + */ -/******************************************************************************* +/* ***************************************************************************** * include files - ******************************************************************************/ + * ***************************************************************************** + */ #include <wl_version.h> #include <linux/module.h> @@ -125,9 +127,10 @@ /* MODULE_PARM(mtu, "i"); */ /* MODULE_PARM_DESC(mtu, "MTU"); */ -/******************************************************************************* +/* ***************************************************************************** * macros - ******************************************************************************/ + * ***************************************************************************** + */ #define BLOCK_INPUT(buf, len) \ do { \ desc->buf_addr = buf; \ @@ -137,13 +140,14 @@ #define BLOCK_INPUT_DMA(buf, len) memcpy(buf, desc_next->buf_addr, pktlen) -/******************************************************************************* +/* ***************************************************************************** * function prototypes - ******************************************************************************/ + * ***************************************************************************** + */ -/******************************************************************************* +/* ***************************************************************************** * wl_init() - ******************************************************************************* + * ***************************************************************************** * * DESCRIPTION: * @@ -159,7 +163,8 @@ * 0 on success * errno value otherwise * - ******************************************************************************/ + * ***************************************************************************** + */ int wl_init(struct net_device *dev) { /* unsigned long flags; */ @@ -176,9 +181,9 @@ int wl_init(struct net_device *dev) } /* wl_init */ /*============================================================================*/ -/******************************************************************************* +/* ***************************************************************************** * wl_config() - ******************************************************************************* + * ***************************************************************************** * * DESCRIPTION: * @@ -194,7 +199,8 @@ int wl_init(struct net_device *dev) * 0 on success * errno otherwise * - ******************************************************************************/ + * ***************************************************************************** + */ int wl_config(struct net_device *dev, struct ifmap *map) { DBG_PARAM(DbgInfo, "dev", "%s (0x%p)", dev->name, dev); @@ -208,9 +214,9 @@ int wl_config(struct net_device *dev, struct ifmap *map) } /* wl_config */ /*============================================================================*/ -/******************************************************************************* +/* ***************************************************************************** * wl_stats() - ******************************************************************************* + * ***************************************************************************** * * DESCRIPTION: * @@ -225,7 +231,8 @@ int wl_config(struct net_device *dev, struct ifmap *map) * a pointer to a net_device_stats structure containing the network * statistics. * - ******************************************************************************/ + * ***************************************************************************** + */ struct net_device_stats *wl_stats(struct net_device *dev) { #ifdef USE_WDS @@ -268,9 +275,9 @@ struct net_device_stats *wl_stats(struct net_device *dev) } /* wl_stats */ /*============================================================================*/ -/******************************************************************************* +/* ***************************************************************************** * wl_open() - ******************************************************************************* + * ***************************************************************************** * * DESCRIPTION: * @@ -285,7 +292,8 @@ struct net_device_stats *wl_stats(struct net_device *dev) * 0 on success * errno otherwise * - ******************************************************************************/ + * ***************************************************************************** + */ int wl_open(struct net_device *dev) { int status = HCF_SUCCESS; @@ -358,9 +366,9 @@ int wl_open(struct net_device *dev) } /* wl_open */ /*============================================================================*/ -/******************************************************************************* +/* ***************************************************************************** * wl_close() - ******************************************************************************* + * ***************************************************************************** * * DESCRIPTION: * @@ -375,7 +383,8 @@ int wl_open(struct net_device *dev) * 0 on success * errno otherwise * - ******************************************************************************/ + * **************************************************************************** + */ int wl_close(struct net_device *dev) { struct wl_private *lp = wl_priv(dev); @@ -391,11 +400,11 @@ int wl_close(struct net_device *dev) WL_WDS_NETIF_CARRIER_OFF(lp); /* Shutdown the adapter: - Disable adapter interrupts - Stop Tx/Rx - Update statistics - Set low power mode - */ + * Disable adapter interrupts + * Stop Tx/Rx + * Update statistics + * Set low power mode + */ wl_lock(lp, &flags); @@ -443,9 +452,9 @@ static struct ethtool_ops wl_ethtool_ops = { }; -/******************************************************************************* +/* ***************************************************************************** * wl_ioctl() - ******************************************************************************* + * ***************************************************************************** * * DESCRIPTION: * @@ -462,7 +471,8 @@ static struct ethtool_ops wl_ethtool_ops = { * 0 on success * errno value otherwise * - ******************************************************************************/ + * ***************************************************************************** + */ int wl_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { struct wl_private *lp = wl_priv(dev); @@ -541,9 +551,9 @@ void wl_poll(struct net_device *dev) } #endif -/******************************************************************************* +/* ***************************************************************************** * wl_tx_timeout() - ******************************************************************************* + * ***************************************************************************** * * DESCRIPTION: * @@ -557,7 +567,8 @@ void wl_poll(struct net_device *dev) * * N/A * - ******************************************************************************/ + * ***************************************************************************** + */ void wl_tx_timeout(struct net_device *dev) { #ifdef USE_WDS @@ -579,8 +590,9 @@ void wl_tx_timeout(struct net_device *dev) } #endif /* USE_RTS */ - /* Figure out which device (the "root" device or WDS port) this timeout - is for */ + /* Figure out which device (the "root" device or WDS port) this timeout + * is for + */ #ifdef USE_WDS for (count = 0; count < NUM_WDS_PORTS; count++) { @@ -588,7 +600,8 @@ void wl_tx_timeout(struct net_device *dev) pStats = &(lp->wds_port[count].stats); /* Break the loop so that we can use the counter to access WDS - information in the private structure */ + * information in the private structure + */ break; } } @@ -606,9 +619,9 @@ void wl_tx_timeout(struct net_device *dev) } /* wl_tx_timeout */ /*============================================================================*/ -/******************************************************************************* +/* ***************************************************************************** * wl_send() - ******************************************************************************* + * ***************************************************************************** * * DESCRIPTION: * @@ -623,7 +636,8 @@ void wl_tx_timeout(struct net_device *dev) * 0 on success * 1 on error * - ******************************************************************************/ + * **************************************************************************** + */ int wl_send(struct wl_private *lp) { @@ -643,8 +657,9 @@ int wl_send(struct wl_private *lp) return FALSE; } - /* Check for the availability of FIDs; if none are available, don't take any - frames off the txQ */ + /* Check for the availability of FIDs; if none are available, + * don't take any frames off the txQ + */ if (lp->hcfCtx.IFB_RscInd == 0) return FALSE; @@ -709,7 +724,8 @@ int wl_send(struct wl_private *lp) #endif /* USE_WDS */ /* Free the skb and perform queue cleanup, as the buffer was - transmitted successfully */ + * transmitted successfully + */ dev_kfree_skb(lp->txF.skb); lp->txF.skb = NULL; @@ -720,9 +736,9 @@ int wl_send(struct wl_private *lp) } /* wl_send */ /*============================================================================*/ -/******************************************************************************* +/* ***************************************************************************** * wl_tx() - ******************************************************************************* + * ***************************************************************************** * * DESCRIPTION: * @@ -738,7 +754,8 @@ int wl_send(struct wl_private *lp) * 0 on success * 1 on error * - ******************************************************************************/ + * ***************************************************************************** + */ int wl_tx(struct sk_buff *skb, struct net_device *dev, int port) { unsigned long flags; @@ -809,9 +826,9 @@ int wl_tx(struct sk_buff *skb, struct net_device *dev, int port) } /* wl_tx */ /*============================================================================*/ -/******************************************************************************* +/* ***************************************************************************** * wl_rx() - ******************************************************************************* + * ***************************************************************************** * * DESCRIPTION: * @@ -826,7 +843,8 @@ int wl_tx(struct sk_buff *skb, struct net_device *dev, int port) * 0 on success * 1 on error * - ******************************************************************************/ + * **************************************************************************** + */ int wl_rx(struct net_device *dev) { int port; @@ -892,11 +910,11 @@ int wl_rx(struct net_device *dev) desc->next_desc_addr = NULL; /* -#define BLOCK_INPUT(buf, len) \ - desc->buf_addr = buf; \ - desc->BUF_SIZE = len; \ - status = hcf_rcv_msg(&(lp->hcfCtx), desc, 0) -*/ + * #define BLOCK_INPUT(buf, len) \ + * desc->buf_addr = buf; \ + * desc->BUF_SIZE = len; \ + * status = hcf_rcv_msg(&(lp->hcfCtx), desc, 0) + */ GET_PACKET(skb->dev, skb, pktlen); @@ -954,9 +972,9 @@ int wl_rx(struct net_device *dev) } /* wl_rx */ /*============================================================================*/ -/******************************************************************************* +/* ***************************************************************************** * wl_multicast() - ******************************************************************************* + * ***************************************************************************** * * DESCRIPTION: * @@ -970,13 +988,18 @@ int wl_rx(struct net_device *dev) * * N/A * - ******************************************************************************/ + * **************************************************************************** + */ #ifdef NEW_MULTICAST void wl_multicast(struct net_device *dev) { -#if 1 /*;? (HCF_TYPE) & HCF_TYPE_STA ;?should we return an error status in AP mode */ -/* ;?seems reasonable that even an AP-only driver could afford this small additional footprint */ +#if 1 + /* ;? (HCF_TYPE) & HCF_TYPE_STA ;?should we return an error status in + * AP mode + * ;?seems reasonable that even an AP-only driver could afford this + * small additional footprint + */ int x; struct netdev_hw_addr *ha; @@ -1024,9 +1047,11 @@ void wl_multicast(struct net_device *dev) hcf_put_info(&(lp->hcfCtx), (LTVP)&(lp->ltvRecord)); } else if ((netdev_mc_count(dev) > HCF_MAX_MULTICAST) || (dev->flags & IFF_ALLMULTI)) { - /* Shutting off this filter will enable all multicast frames to - be sent up from the device; however, this is a static RID, so - a call to wl_apply() is needed */ + /* Shutting off this filter will enable all + * multicast frames to be sent up from the + * device; however, this is a static RID, so + * a call to wl_apply() is needed + */ lp->ltvRecord.len = 2; lp->ltvRecord.typ = CFG_CNF_RX_ALL_GROUP_ADDR; lp->ltvRecord.u.u16[0] = CNV_INT_TO_LITTLE(0); @@ -1058,9 +1083,11 @@ void wl_multicast(struct net_device *dev) DBG_PRINT("Disabling Multicast mode\n"); hcf_put_info(&(lp->hcfCtx), (LTVP)&(lp->ltvRecord)); - /* Turning on this filter will prevent all multicast frames from - being sent up from the device; however, this is a static RID, - so a call to wl_apply() is needed */ + /* Turning on this filter will prevent all + * multicast frames from being sent up from the + * device; however, this is a static RID, + * so a call to wl_apply() is needed + */ lp->ltvRecord.len = 2; lp->ltvRecord.typ = CFG_CNF_RX_ALL_GROUP_ADDR; lp->ltvRecord.u.u16[0] = CNV_INT_TO_LITTLE(1); @@ -1109,9 +1136,9 @@ static const struct net_device_ops wl_netdev_ops = { #endif }; -/******************************************************************************* +/* ***************************************************************************** * wl_device_alloc() - ******************************************************************************* + * ***************************************************************************** * * DESCRIPTION: * @@ -1127,7 +1154,8 @@ static const struct net_device_ops wl_netdev_ops = { * a pointer to an allocated and initialized net_device struct for this * device. * - ******************************************************************************/ + * ***************************************************************************** + */ struct net_device *wl_device_alloc(void) { struct net_device *dev = NULL; @@ -1138,8 +1166,10 @@ struct net_device *wl_device_alloc(void) if (!dev) return NULL; - /* Initialize the 'next' pointer in the struct. Currently only used for PCI, - but do it here just in case it's used for other buses in the future */ + /* Initialize the 'next' pointer in the struct. Currently only used for + * PCI, but do it here just in case it's used for other buses in the + * future + */ lp = wl_priv(dev); @@ -1171,9 +1201,9 @@ struct net_device *wl_device_alloc(void) } /* wl_device_alloc */ /*============================================================================*/ -/******************************************************************************* +/* ***************************************************************************** * wl_device_dealloc() - ******************************************************************************* + * ***************************************************************************** * * DESCRIPTION: * @@ -1188,7 +1218,8 @@ struct net_device *wl_device_alloc(void) * * N/A * - ******************************************************************************/ + * ***************************************************************************** + */ void wl_device_dealloc(struct net_device *dev) { /* struct wl_private *lp = wl_priv(dev); */ @@ -1200,9 +1231,9 @@ void wl_device_dealloc(struct net_device *dev) } /* wl_device_dealloc */ /*============================================================================*/ -/******************************************************************************* +/* ***************************************************************************** * wl_tx_port0() - ******************************************************************************* + * ***************************************************************************** * * DESCRIPTION: * @@ -1217,7 +1248,8 @@ void wl_device_dealloc(struct net_device *dev) * * N/A * - ******************************************************************************/ + * ***************************************************************************** + */ int wl_tx_port0(struct sk_buff *skb, struct net_device *dev) { DBG_TX(DbgInfo, "Tx on Port 0\n"); @@ -1231,9 +1263,9 @@ int wl_tx_port0(struct sk_buff *skb, struct net_device *dev) #ifdef USE_WDS -/******************************************************************************* +/* ***************************************************************************** * wl_tx_port1() - ******************************************************************************* + * ***************************************************************************** * * DESCRIPTION: * @@ -1248,7 +1280,8 @@ int wl_tx_port0(struct sk_buff *skb, struct net_device *dev) * * N/A * - ******************************************************************************/ + * ***************************************************************************** + */ int wl_tx_port1(struct sk_buff *skb, struct net_device *dev) { DBG_TX(DbgInfo, "Tx on Port 1\n"); @@ -1256,9 +1289,9 @@ int wl_tx_port1(struct sk_buff *skb, struct net_device *dev) } /* wl_tx_port1 */ /*============================================================================*/ -/******************************************************************************* +/* ***************************************************************************** * wl_tx_port2() - ******************************************************************************* + * ***************************************************************************** * * DESCRIPTION: * @@ -1273,7 +1306,8 @@ int wl_tx_port1(struct sk_buff *skb, struct net_device *dev) * * N/A * - ******************************************************************************/ + * ***************************************************************************** + */ int wl_tx_port2(struct sk_buff *skb, struct net_device *dev) { DBG_TX(DbgInfo, "Tx on Port 2\n"); @@ -1281,9 +1315,9 @@ int wl_tx_port2(struct sk_buff *skb, struct net_device *dev) } /* wl_tx_port2 */ /*============================================================================*/ -/******************************************************************************* +/* ***************************************************************************** * wl_tx_port3() - ******************************************************************************* + * ***************************************************************************** * * DESCRIPTION: * @@ -1298,7 +1332,8 @@ int wl_tx_port2(struct sk_buff *skb, struct net_device *dev) * * N/A * - ******************************************************************************/ + * ***************************************************************************** + */ int wl_tx_port3(struct sk_buff *skb, struct net_device *dev) { DBG_TX(DbgInfo, "Tx on Port 3\n"); @@ -1306,9 +1341,9 @@ int wl_tx_port3(struct sk_buff *skb, struct net_device *dev) } /* wl_tx_port3 */ /*============================================================================*/ -/******************************************************************************* +/* ***************************************************************************** * wl_tx_port4() - ******************************************************************************* + * ***************************************************************************** * * DESCRIPTION: * @@ -1323,7 +1358,8 @@ int wl_tx_port3(struct sk_buff *skb, struct net_device *dev) * * N/A * - ******************************************************************************/ + * ***************************************************************************** + */ int wl_tx_port4(struct sk_buff *skb, struct net_device *dev) { DBG_TX(DbgInfo, "Tx on Port 4\n"); @@ -1331,9 +1367,9 @@ int wl_tx_port4(struct sk_buff *skb, struct net_device *dev) } /* wl_tx_port4 */ /*============================================================================*/ -/******************************************************************************* +/* ***************************************************************************** * wl_tx_port5() - ******************************************************************************* + * ***************************************************************************** * * DESCRIPTION: * @@ -1348,7 +1384,8 @@ int wl_tx_port4(struct sk_buff *skb, struct net_device *dev) * * N/A * - ******************************************************************************/ + * ***************************************************************************** + */ int wl_tx_port5(struct sk_buff *skb, struct net_device *dev) { DBG_TX(DbgInfo, "Tx on Port 5\n"); @@ -1356,9 +1393,9 @@ int wl_tx_port5(struct sk_buff *skb, struct net_device *dev) } /* wl_tx_port5 */ /*============================================================================*/ -/******************************************************************************* +/* ***************************************************************************** * wl_tx_port6() - ******************************************************************************* + * ***************************************************************************** * * DESCRIPTION: * @@ -1373,7 +1410,8 @@ int wl_tx_port5(struct sk_buff *skb, struct net_device *dev) * * N/A * - ******************************************************************************/ + * ***************************************************************************** + */ int wl_tx_port6(struct sk_buff *skb, struct net_device *dev) { DBG_TX(DbgInfo, "Tx on Port 6\n"); @@ -1381,9 +1419,9 @@ int wl_tx_port6(struct sk_buff *skb, struct net_device *dev) } /* wl_tx_port6 */ /*============================================================================*/ -/******************************************************************************* +/* ***************************************************************************** * wl_wds_device_alloc() - ******************************************************************************* + * ***************************************************************************** * * DESCRIPTION: * @@ -1399,14 +1437,16 @@ int wl_tx_port6(struct sk_buff *skb, struct net_device *dev) * N/A, but will place pointers to the allocated and initialized net_device * structs in the private adapter structure. * - ******************************************************************************/ + * ***************************************************************************** + */ void wl_wds_device_alloc(struct wl_private *lp) { int count; - /* WDS support requires additional net_device structs to be allocated, - so that user space apps can use these virtual devices to specify the - port on which to Tx/Rx */ + /* WDS support requires additional net_device structs to be allocated, + * so that user space apps can use these virtual devices to specify the + * port on which to Tx/Rx + */ for (count = 0; count < NUM_WDS_PORTS; count++) { struct net_device *dev_wds = NULL; @@ -1418,13 +1458,15 @@ void wl_wds_device_alloc(struct wl_private *lp) lp->wds_port[count].dev = dev_wds; - /* Re-use wl_init for all the devices, as it currently does nothing, but - is required. Re-use the stats/tx_timeout handler for all as well; the - WDS port which is requesting these operations can be determined by - the net_device pointer. Set the private member of all devices to point - to the same net_device struct; that way, all information gets - funnelled through the one "real" net_device. Name the WDS ports - "wds<n>" */ + /* Re-use wl_init for all the devices, as it currently does + * nothing, but is required. Re-use the stats/tx_timeout handler + * for all as well; the WDS port which is requesting these + * operations can be determined by the net_device pointer. Set + * the private member of all devices to point to the same + * net_device struct; that way, all information gets funnelled + * through the one "real" net_device. + * Name the WDS ports"wds<n>" + */ lp->wds_port[count].dev->init = &wl_init; lp->wds_port[count].dev->get_stats = &wl_stats; lp->wds_port[count].dev->tx_timeout = &wl_tx_timeout; @@ -1446,9 +1488,9 @@ void wl_wds_device_alloc(struct wl_private *lp) } /* wl_wds_device_alloc */ /*============================================================================*/ -/******************************************************************************* +/* ***************************************************************************** * wl_wds_device_dealloc() - ******************************************************************************* + * ***************************************************************************** * * DESCRIPTION: * @@ -1462,7 +1504,8 @@ void wl_wds_device_alloc(struct wl_private *lp) * * N/A * - ******************************************************************************/ + * ***************************************************************************** + */ void wl_wds_device_dealloc(struct wl_private *lp) { int count; @@ -1485,9 +1528,9 @@ void wl_wds_device_dealloc(struct wl_private *lp) } /* wl_wds_device_dealloc */ /*============================================================================*/ -/******************************************************************************* +/* ***************************************************************************** * wl_wds_netif_start_queue() - ******************************************************************************* + * ***************************************************************************** * * DESCRIPTION: * @@ -1502,7 +1545,8 @@ void wl_wds_device_dealloc(struct wl_private *lp) * * N/A * - ******************************************************************************/ + * ***************************************************************************** + */ void wl_wds_netif_start_queue(struct wl_private *lp) { int count; @@ -1520,9 +1564,9 @@ void wl_wds_netif_start_queue(struct wl_private *lp) } /* wl_wds_netif_start_queue */ /*============================================================================*/ -/******************************************************************************* +/* ***************************************************************************** * wl_wds_netif_stop_queue() - ******************************************************************************* + * ***************************************************************************** * * DESCRIPTION: * @@ -1537,7 +1581,8 @@ void wl_wds_netif_start_queue(struct wl_private *lp) * * N/A * - ******************************************************************************/ + * ***************************************************************************** + */ void wl_wds_netif_stop_queue(struct wl_private *lp) { int count; @@ -1555,9 +1600,9 @@ void wl_wds_netif_stop_queue(struct wl_private *lp) } /* wl_wds_netif_stop_queue */ /*============================================================================*/ -/******************************************************************************* +/* ***************************************************************************** * wl_wds_netif_wake_queue() - ******************************************************************************* + * ***************************************************************************** * * DESCRIPTION: * @@ -1572,7 +1617,8 @@ void wl_wds_netif_stop_queue(struct wl_private *lp) * * N/A * - ******************************************************************************/ + * ***************************************************************************** + */ void wl_wds_netif_wake_queue(struct wl_private *lp) { int count; @@ -1590,9 +1636,9 @@ void wl_wds_netif_wake_queue(struct wl_private *lp) } /* wl_wds_netif_wake_queue */ /*============================================================================*/ -/******************************************************************************* +/* ***************************************************************************** * wl_wds_netif_carrier_on() - ******************************************************************************* + * ***************************************************************************** * * DESCRIPTION: * @@ -1607,7 +1653,8 @@ void wl_wds_netif_wake_queue(struct wl_private *lp) * * N/A * - ******************************************************************************/ + * ***************************************************************************** + */ void wl_wds_netif_carrier_on(struct wl_private *lp) { int count; @@ -1622,9 +1669,9 @@ void wl_wds_netif_carrier_on(struct wl_private *lp) } /* wl_wds_netif_carrier_on */ /*============================================================================*/ -/******************************************************************************* +/* ***************************************************************************** * wl_wds_netif_carrier_off() - ******************************************************************************* + * ***************************************************************************** * * DESCRIPTION: * @@ -1639,7 +1686,8 @@ void wl_wds_netif_carrier_on(struct wl_private *lp) * * N/A * - ******************************************************************************/ + * ***************************************************************************** + */ void wl_wds_netif_carrier_off(struct wl_private *lp) { int count; @@ -1657,9 +1705,9 @@ void wl_wds_netif_carrier_off(struct wl_private *lp) #endif /* USE_WDS */ #ifdef ENABLE_DMA -/******************************************************************************* +/* ***************************************************************************** * wl_send_dma() - ******************************************************************************* + * ***************************************************************************** * * DESCRIPTION: * @@ -1676,7 +1724,8 @@ void wl_wds_netif_carrier_off(struct wl_private *lp) * 0 on success * 1 on error * - ******************************************************************************/ + * **************************************************************************** + */ int wl_send_dma(struct wl_private *lp, struct sk_buff *skb, int port) { int len; @@ -1743,9 +1792,9 @@ int wl_send_dma(struct wl_private *lp, struct sk_buff *skb, int port) } /* wl_send_dma */ /*============================================================================*/ -/******************************************************************************* +/* ***************************************************************************** * wl_rx_dma() - ******************************************************************************* + * ***************************************************************************** * * DESCRIPTION: * @@ -1760,7 +1809,8 @@ int wl_send_dma(struct wl_private *lp, struct sk_buff *skb, int port) * 0 on success * 1 on error * - ******************************************************************************/ + * ***************************************************************************** + */ int wl_rx_dma(struct net_device *dev) { int port; @@ -1793,23 +1843,28 @@ int wl_rx_dma(struct net_device *dev) if (desc != NULL) { /* Check and see if we rcvd. a WMP frame */ /* - if (((*(hcf_8 *)&desc->buf_addr[HFS_STAT]) & - (HFS_STAT_MSG_TYPE | HFS_STAT_ERR)) == HFS_STAT_WMP_MSG) - { - DBG_TRACE(DbgInfo, "Got a WMP frame\n"); - - x.len = sizeof(CFG_MB_INFO_RANGE2_STRCT) / sizeof(hcf_16); - x.typ = CFG_MB_INFO; - x.base_typ = CFG_WMP; - x.frag_cnt = 2; - x.frag_buf[0].frag_len = GET_BUF_CNT(descp) / sizeof(hcf_16); - x.frag_buf[0].frag_addr = (hcf_8 *) descp->buf_addr ; - x.frag_buf[1].frag_len = (GET_BUF_CNT(descp->next_desc_addr) + 1) / sizeof(hcf_16); - x.frag_buf[1].frag_addr = (hcf_8 *) descp->next_desc_addr->buf_addr ; - - hcf_put_info(&(lp->hcfCtx), (LTVP)&x); - } - */ + * if (((*(hcf_8 *)&desc->buf_addr[HFS_STAT]) & + * (HFS_STAT_MSG_TYPE | HFS_STAT_ERR)) == + * HFS_STAT_WMP_MSG) + * { + * DBG_TRACE(DbgInfo, "Got a WMP frame\n"); + * x.len = sizeof(CFG_MB_INFO_RANGE2_STRCT) / + * sizeof(hcf_16); + * x.typ = CFG_MB_INFO; + * x.base_typ = CFG_WMP; + * x.frag_cnt = 2; + * x.frag_buf[0].frag_len = GET_BUF_CNT(descp) / + * sizeof(hcf_16); + * x.frag_buf[0].frag_addr = (hcf_8 *) + * descp->buf_addr ; + * x.frag_buf[1].frag_len = + * (GET_BUF_CNT(descp->next_desc_addr) +1)/ + * sizeof(hcf_16); + * x.frag_buf[1].frag_addr = (hcf_8 *) + * descp->next_desc_addr->buf_addr ; + * hcf_put_info(&(lp->hcfCtx), (LTVP)&x); + * } + */ desc_next = desc->next_desc_addr; /* Make sure the buffer isn't empty */ -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html