aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortcharding <me@tobin.cc>2017-02-09 01:56:07 -0500
committerDavid S. Miller <davem@davemloft.net>2017-02-10 13:37:49 -0500
commitf4563a75fb93d6a756416d97e13f0773ac373a24 (patch)
treeb3d493453c82bb204553f88a56770bab6cda67ac
parenteb13da1a103a808c05267816fa4d30d603bfda5e (diff)
net: Fix checkpatch, Missing a blank line after declarations
This patch fixes multiple occurrences of checkpatch WARNING: Missing a blank line after declarations. Signed-off-by: Tobin C. Harding <me@tobin.cc> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/core/dev.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index e583820c21be..363c44b9be63 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2498,6 +2498,7 @@ u16 __skb_tx_hash(const struct net_device *dev, struct sk_buff *skb,
2498 2498
2499 if (dev->num_tc) { 2499 if (dev->num_tc) {
2500 u8 tc = netdev_get_prio_tc_map(dev, skb->priority); 2500 u8 tc = netdev_get_prio_tc_map(dev, skb->priority);
2501
2501 qoffset = dev->tc_to_txq[tc].offset; 2502 qoffset = dev->tc_to_txq[tc].offset;
2502 qcount = dev->tc_to_txq[tc].count; 2503 qcount = dev->tc_to_txq[tc].count;
2503 } 2504 }
@@ -2719,9 +2720,11 @@ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb)
2719{ 2720{
2720#ifdef CONFIG_HIGHMEM 2721#ifdef CONFIG_HIGHMEM
2721 int i; 2722 int i;
2723
2722 if (!(dev->features & NETIF_F_HIGHDMA)) { 2724 if (!(dev->features & NETIF_F_HIGHDMA)) {
2723 for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { 2725 for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
2724 skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; 2726 skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
2727
2725 if (PageHighMem(skb_frag_page(frag))) 2728 if (PageHighMem(skb_frag_page(frag)))
2726 return 1; 2729 return 1;
2727 } 2730 }
@@ -2735,6 +2738,7 @@ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb)
2735 for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { 2738 for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
2736 skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; 2739 skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
2737 dma_addr_t addr = page_to_phys(skb_frag_page(frag)); 2740 dma_addr_t addr = page_to_phys(skb_frag_page(frag));
2741
2738 if (!pdev->dma_mask || addr + PAGE_SIZE - 1 > *pdev->dma_mask) 2742 if (!pdev->dma_mask || addr + PAGE_SIZE - 1 > *pdev->dma_mask)
2739 return 1; 2743 return 1;
2740 } 2744 }
@@ -3210,6 +3214,7 @@ static u16 __netdev_pick_tx(struct net_device *dev, struct sk_buff *skb)
3210 if (queue_index < 0 || skb->ooo_okay || 3214 if (queue_index < 0 || skb->ooo_okay ||
3211 queue_index >= dev->real_num_tx_queues) { 3215 queue_index >= dev->real_num_tx_queues) {
3212 int new_index = get_xps_queue(dev, skb); 3216 int new_index = get_xps_queue(dev, skb);
3217
3213 if (new_index < 0) 3218 if (new_index < 0)
3214 new_index = skb_tx_hash(dev, skb); 3219 new_index = skb_tx_hash(dev, skb);
3215 3220
@@ -3239,6 +3244,7 @@ struct netdev_queue *netdev_pick_tx(struct net_device *dev,
3239 3244
3240 if (dev->real_num_tx_queues != 1) { 3245 if (dev->real_num_tx_queues != 1) {
3241 const struct net_device_ops *ops = dev->netdev_ops; 3246 const struct net_device_ops *ops = dev->netdev_ops;
3247
3242 if (ops->ndo_select_queue) 3248 if (ops->ndo_select_queue)
3243 queue_index = ops->ndo_select_queue(dev, skb, accel_priv, 3249 queue_index = ops->ndo_select_queue(dev, skb, accel_priv,
3244 __netdev_pick_tx); 3250 __netdev_pick_tx);
@@ -3768,6 +3774,7 @@ static int netif_rx_internal(struct sk_buff *skb)
3768#endif 3774#endif
3769 { 3775 {
3770 unsigned int qtail; 3776 unsigned int qtail;
3777
3771 ret = enqueue_to_backlog(skb, get_cpu(), &qtail); 3778 ret = enqueue_to_backlog(skb, get_cpu(), &qtail);
3772 put_cpu(); 3779 put_cpu();
3773 } 3780 }
@@ -3827,6 +3834,7 @@ static __latent_entropy void net_tx_action(struct softirq_action *h)
3827 3834
3828 while (clist) { 3835 while (clist) {
3829 struct sk_buff *skb = clist; 3836 struct sk_buff *skb = clist;
3837
3830 clist = clist->next; 3838 clist = clist->next;
3831 3839
3832 WARN_ON(atomic_read(&skb->users)); 3840 WARN_ON(atomic_read(&skb->users));
@@ -5663,6 +5671,7 @@ static int netdev_adjacent_sysfs_add(struct net_device *dev,
5663 struct list_head *dev_list) 5671 struct list_head *dev_list)
5664{ 5672{
5665 char linkname[IFNAMSIZ+7]; 5673 char linkname[IFNAMSIZ+7];
5674
5666 sprintf(linkname, dev_list == &dev->adj_list.upper ? 5675 sprintf(linkname, dev_list == &dev->adj_list.upper ?
5667 "upper_%s" : "lower_%s", adj_dev->name); 5676 "upper_%s" : "lower_%s", adj_dev->name);
5668 return sysfs_create_link(&(dev->dev.kobj), &(adj_dev->dev.kobj), 5677 return sysfs_create_link(&(dev->dev.kobj), &(adj_dev->dev.kobj),
@@ -5673,6 +5682,7 @@ static void netdev_adjacent_sysfs_del(struct net_device *dev,
5673 struct list_head *dev_list) 5682 struct list_head *dev_list)
5674{ 5683{
5675 char linkname[IFNAMSIZ+7]; 5684 char linkname[IFNAMSIZ+7];
5685
5676 sprintf(linkname, dev_list == &dev->adj_list.upper ? 5686 sprintf(linkname, dev_list == &dev->adj_list.upper ?
5677 "upper_%s" : "lower_%s", name); 5687 "upper_%s" : "lower_%s", name);
5678 sysfs_remove_link(&(dev->dev.kobj), linkname); 5688 sysfs_remove_link(&(dev->dev.kobj), linkname);
@@ -5942,6 +5952,7 @@ void netdev_upper_dev_unlink(struct net_device *dev,
5942 struct net_device *upper_dev) 5952 struct net_device *upper_dev)
5943{ 5953{
5944 struct netdev_notifier_changeupper_info changeupper_info; 5954 struct netdev_notifier_changeupper_info changeupper_info;
5955
5945 ASSERT_RTNL(); 5956 ASSERT_RTNL();
5946 5957
5947 changeupper_info.upper_dev = upper_dev; 5958 changeupper_info.upper_dev = upper_dev;
@@ -6659,6 +6670,7 @@ EXPORT_SYMBOL(dev_change_xdp_fd);
6659static int dev_new_index(struct net *net) 6670static int dev_new_index(struct net *net)
6660{ 6671{
6661 int ifindex = net->ifindex; 6672 int ifindex = net->ifindex;
6673
6662 for (;;) { 6674 for (;;) {
6663 if (++ifindex <= 0) 6675 if (++ifindex <= 0)
6664 ifindex = 1; 6676 ifindex = 1;
@@ -7072,6 +7084,7 @@ void netif_tx_stop_all_queues(struct net_device *dev)
7072 7084
7073 for (i = 0; i < dev->num_tx_queues; i++) { 7085 for (i = 0; i < dev->num_tx_queues; i++) {
7074 struct netdev_queue *txq = netdev_get_tx_queue(dev, i); 7086 struct netdev_queue *txq = netdev_get_tx_queue(dev, i);
7087
7075 netif_tx_stop_queue(txq); 7088 netif_tx_stop_queue(txq);
7076 } 7089 }
7077} 7090}