From: "John W. Linville" <linville@xxxxxxxxxxxxx> Date: Mon, 6 Feb 2012 15:18:27 -0500 > Here is a big pull request full of wireless updates intended for 3.4! > > Highlights include a round of NFC updates from Ilan Elias, a big batch > of spruce-ups from Joe Perches, and the usual round of updates from > Larry Finger (rtlwifi), Rafał Miłecki (bcma, b43), Johannes Berg > (mac80211), and a variety of other contributors. > > Please let me know if there are problems! Pulled, but there are some locations that need coding style fixups, particularly the NFC changes. It seems that the TI engineer making changes there is not capable of tabbing with spaces. So things like: if (x && y) ends up being: if (x && y) which looks like crap. Specifically: net/nfc/nci/rsp.c:151 + /* If target was active, complete the request only in deactivate_ntf */ + if ((status != NCI_STATUS_OK) || + (!test_bit(NCI_POLL_ACTIVE, &ndev->flags))) + nci_req_complete(ndev, status); net/nfc/nci/ntf.c:115 + pr_debug("bit_rate %d, sensf_res_len %d\n", + nfcf_poll->bit_rate, nfcf_poll->sensf_res_len); net/nfc/nci/ntf.c:169 + pr_debug("attrib_res_len %d\n", + nfcb_poll->attrib_res_len); ... + memcpy(nfcb_poll->attrib_res, + data, + nfcb_poll->attrib_res_len); net/nfc/nci/ntf.c:212 + memcpy(nfc_tgt.nfcid1, + ntf->rf_tech_specific_params.nfca_poll.nfcid1, + nfc_tgt.nfcid1_len); net/nfc/nci/ntf.c:290 + data = nci_extract_rf_params_nfcb_passive_poll(ndev, + &ntf, data); ... + data = nci_extract_rf_params_nfcf_passive_poll(ndev, + &ntf, data); net/nfc/netlink.c:70 + if (target->sensb_res_len > 0) + NLA_PUT(msg, NFC_ATTR_TARGET_SENSB_RES, target->sensb_res_len, + target->sensb_res); + if (target->sensf_res_len > 0) + NLA_PUT(msg, NFC_ATTR_TARGET_SENSF_RES, target->sensf_res_len, + target->sensf_res); There's a lot more, these are just a tiny example of the issues I saw in the patches contained in this pull request. Actually, it seems nobody has been paying attention to this tabbing issue at all in the entire NFC stack, so someone needs to go in there and wholesale fix all of this stuff. mwifiex had some turds too: drivers/net/wireless/mwifiex/init.c:526 dev_dbg(adapter->dev, "info: delete BSS priority table," - " index = %d, i = %d, head = %p, cur = %p\n", - priv->bss_index, i, head, *cur); + " bss_type = %d, bss_num = %d, i = %d," + " head = %p, cur = %p\n", + priv->bss_type, priv->bss_num, i, head, *cur); drivers/net/wireless/mwifiex/main.c:424 + dev_dbg(priv->adapter->dev, "data: %lu BSS(%d-%d): Data <= kernel\n", + jiffies, priv->bss_type, priv->bss_num); drivers/net/wireless/mwifiex/main.c:532 + dev_err(priv->adapter->dev, "%lu : Tx timeout, bss_type-num = %d-%d\n", + jiffies, priv->bss_type, priv->bss_num); drivers/net/wireless/mwifiex/sta_rx.c:43 + struct mwifiex_private *priv = mwifiex_get_priv_by_id(adapter, + rx_info->bss_num, rx_info->bss_type); drivers/net/wireless/mwifiex/sta_rx.c:125 + struct mwifiex_private *priv = mwifiex_get_priv_by_id(adapter, + rx_info->bss_num, rx_info->bss_type); drivers/net/wireless/mwifiex/txrx.c:131 + priv = mwifiex_get_priv_by_id(adapter, tx_info->bss_num, + tx_info->bss_type); drivers/net/wireless/mwifiex/util.c:159 + priv = mwifiex_get_priv_by_id(adapter, rx_info->bss_num, + rx_info->bss_type); and so on, and so forth, you get the idea. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html