| Message ID | 1447010328-5661-1-git-send-email-panayiotis.tembriotis@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On Sun, Nov 08, 2015 at 09:18:48PM +0200, Panayiotis Tembriotis wrote: > Remove excess new line characters as suggested by checkpatch.pl: > ERROR: else should follow close brace '}' > ERROR: that open brace { should be on the previous line > > Signed-off-by: Panayiotis Tembriotis <panayiotis.tembriotis@gmail.com> > --- > drivers/staging/wilc1000/wilc_wlan.c | 10 +++------- > 1 file changed, 3 insertions(+), 7 deletions(-) Does not apply against my latest tree :( -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c index c02665747705..9966ac8d7ceb 100644 --- a/drivers/staging/wilc1000/wilc_wlan.c +++ b/drivers/staging/wilc1000/wilc_wlan.c @@ -1056,15 +1056,13 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *pu32TxqCount) memcpy(&txb[offset], &header, 4); if (tqe->type == WILC_CFG_PKT) { buffer_offset = ETH_CONFIG_PKT_HDR_OFFSET; - } - else if (tqe->type == WILC_NET_PKT) { + } else if (tqe->type == WILC_NET_PKT) { char *pBSSID = ((struct tx_complete_data *)(tqe->priv))->pBssid; buffer_offset = ETH_ETHERNET_HDR_OFFSET; /* copy the bssid at the sart of the buffer */ memcpy(&txb[offset + 4], pBSSID, 6); - } - else { + } else { buffer_offset = HOST_HDR_OFFSET; } @@ -1183,9 +1181,7 @@ static void wilc_wlan_handle_rxq(struct wilc *wilc) pkt_offset &= ~(IS_MANAGMEMENT | IS_MANAGMEMENT_CALLBACK | IS_MGMT_STATUS_SUCCES); WILC_WFI_mgmt_rx(wilc, &buffer[offset + HOST_HDR_OFFSET], pkt_len); - } - else - { + } else { if (!is_cfg_packet) { if (pkt_len > 0) {
Remove excess new line characters as suggested by checkpatch.pl: ERROR: else should follow close brace '}' ERROR: that open brace { should be on the previous line Signed-off-by: Panayiotis Tembriotis <panayiotis.tembriotis@gmail.com> --- drivers/staging/wilc1000/wilc_wlan.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)