From patchwork Thu Feb 9 06:56:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Tobin C. Harding" X-Patchwork-Id: 725981 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vJq195F2Jz9s6n for ; Thu, 9 Feb 2017 18:08:29 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=tobin.cc header.i=@tobin.cc header.b="QeBk7K1z"; dkim=pass (1024-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="BXkG/6X0"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751995AbdBIHIR (ORCPT ); Thu, 9 Feb 2017 02:08:17 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:51120 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751751AbdBIHH3 (ORCPT ); Thu, 9 Feb 2017 02:07:29 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 9750320B65; Thu, 9 Feb 2017 01:56:46 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Thu, 09 Feb 2017 01:56:46 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=tobin.cc; h=cc :date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=mesmtp; bh=c8y tVIC0P2wXlJyWYkrV6lP+hko=; b=QeBk7K1zI2iW2eFHTZ+bCanHDKlNeBI1dqs KgmzMOUU1pLApmvc/s3/sOQ42GvgWi/JyY1TdneqrAPkYLVTX6D1LSQSEEJ2Rmn5 rGBbJMAs2QI221iCJw7wpzTwWSvBWevOBLwF5gE9aYLjbM5C0sX20eNfsLku5T9e 1KDzAiUc= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=smtpout; bh=c8ytVIC0P2wXlJyWYkrV6lP+hko=; b=BXkG/ 6X0FE37KKkolvxFRiexvPk7hH9qJWhsPQvYm2kqaNNv7djRl0ikalwqreUtsc2t8 yWOyeKptpONWjg7cTXcga5V8DRDhIGn/hTTakpzeuKtehCa65BH9jYpHHuX0KEMi K0g13X8/BiqP0TzNehfLxXg3f4WjkS2sXW8gd8= X-ME-Sender: X-Sasl-enc: QZI2+mjFSO3vkmiwmLvGFa1cHuW6HYQxq/ypiXq2DVmb 1486623405 Received: from eros.fritz.box (ppp121-44-153-138.lns20.syd7.internode.on.net [121.44.153.138]) by mail.messagingengine.com (Postfix) with ESMTPA id 149C8240CC; Thu, 9 Feb 2017 01:56:42 -0500 (EST) From: "Tobin C. Harding" To: "David S. Miller" Cc: Eric Dumazet , Alexander Duyck , David Ahern , Jesper Dangaard Brouer , Jiri Pirko , stephen hemminger , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, "Tobin C. Harding" Subject: [PATCH 4/4] net: Fix checkpatch, Missing a blank line after declarations Date: Thu, 9 Feb 2017 17:56:07 +1100 Message-Id: <1486623367-28861-5-git-send-email-me@tobin.cc> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1486623367-28861-1-git-send-email-me@tobin.cc> References: <1486623367-28861-1-git-send-email-me@tobin.cc> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch fixes multiple occurrences of checkpatch WARNING: Missing a blank line after declarations. Signed-off-by: Tobin C. Harding --- net/core/dev.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/net/core/dev.c b/net/core/dev.c index 6a076a1..fa63485 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2520,6 +2520,7 @@ u16 __skb_tx_hash(const struct net_device *dev, struct sk_buff *skb, if (dev->num_tc) { u8 tc = netdev_get_prio_tc_map(dev, skb->priority); + qoffset = dev->tc_to_txq[tc].offset; qcount = dev->tc_to_txq[tc].count; } @@ -2734,9 +2735,11 @@ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb) { #ifdef CONFIG_HIGHMEM int i; + if (!(dev->features & NETIF_F_HIGHDMA)) { for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; + if (PageHighMem(skb_frag_page(frag))) return 1; } @@ -2750,6 +2753,7 @@ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb) for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; dma_addr_t addr = page_to_phys(skb_frag_page(frag)); + if (!pdev->dma_mask || addr + PAGE_SIZE - 1 > *pdev->dma_mask) return 1; } @@ -3227,6 +3231,7 @@ static u16 __netdev_pick_tx(struct net_device *dev, struct sk_buff *skb) if (queue_index < 0 || skb->ooo_okay || queue_index >= dev->real_num_tx_queues) { int new_index = get_xps_queue(dev, skb); + if (new_index < 0) new_index = skb_tx_hash(dev, skb); @@ -3256,6 +3261,7 @@ struct netdev_queue *netdev_pick_tx(struct net_device *dev, if (dev->real_num_tx_queues != 1) { const struct net_device_ops *ops = dev->netdev_ops; + if (ops->ndo_select_queue) queue_index = ops->ndo_select_queue(dev, skb, accel_priv, __netdev_pick_tx); @@ -3781,6 +3787,7 @@ static int netif_rx_internal(struct sk_buff *skb) #endif { unsigned int qtail; + ret = enqueue_to_backlog(skb, get_cpu(), &qtail); put_cpu(); } @@ -3840,6 +3847,7 @@ static __latent_entropy void net_tx_action(struct softirq_action *h) while (clist) { struct sk_buff *skb = clist; + clist = clist->next; WARN_ON(atomic_read(&skb->users)); @@ -5708,6 +5716,7 @@ static int netdev_adjacent_sysfs_add(struct net_device *dev, struct list_head *dev_list) { char linkname[IFNAMSIZ+7]; + sprintf(linkname, dev_list == &dev->adj_list.upper ? "upper_%s" : "lower_%s", adj_dev->name); return sysfs_create_link(&(dev->dev.kobj), &(adj_dev->dev.kobj), @@ -5718,6 +5727,7 @@ static void netdev_adjacent_sysfs_del(struct net_device *dev, struct list_head *dev_list) { char linkname[IFNAMSIZ+7]; + sprintf(linkname, dev_list == &dev->adj_list.upper ? "upper_%s" : "lower_%s", name); sysfs_remove_link(&(dev->dev.kobj), linkname); @@ -5987,6 +5997,7 @@ void netdev_upper_dev_unlink(struct net_device *dev, struct net_device *upper_dev) { struct netdev_notifier_changeupper_info changeupper_info; + ASSERT_RTNL(); changeupper_info.upper_dev = upper_dev; @@ -6748,6 +6759,7 @@ EXPORT_SYMBOL(dev_change_xdp_fd); static int dev_new_index(struct net *net) { int ifindex = net->ifindex; + for (;;) { if (++ifindex <= 0) ifindex = 1; @@ -7168,6 +7180,7 @@ void netif_tx_stop_all_queues(struct net_device *dev) for (i = 0; i < dev->num_tx_queues; i++) { struct netdev_queue *txq = netdev_get_tx_queue(dev, i); + netif_tx_stop_queue(txq); } }