diff options
author | tcharding <me@tobin.cc> | 2017-02-09 01:56:06 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-02-10 13:37:48 -0500 |
commit | eb13da1a103a808c05267816fa4d30d603bfda5e (patch) | |
tree | 8fcc461504d2ee80ba870f0e457a84e88e89a524 /net/core/dev.c | |
parent | 643aa9cba0b688ffde28ac39aebec6f56fc2a8af (diff) |
net: Fix checkpatch block comments warnings
Fix multiple occurrences of checkpatch warning. WARNING: Block
comments use * on subsequent lines. Also make comment blocks
more uniform.
Signed-off-by: Tobin C. Harding <me@tobin.cc>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/dev.c')
-rw-r--r-- | net/core/dev.c | 65 |
1 files changed, 33 insertions, 32 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 60a0be743cdb..e583820c21be 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -353,10 +353,11 @@ static inline void netdev_set_addr_lockdep_class(struct net_device *dev) | |||
353 | #endif | 353 | #endif |
354 | 354 | ||
355 | /******************************************************************************* | 355 | /******************************************************************************* |
356 | * | ||
357 | * Protocol management and registration routines | ||
358 | * | ||
359 | *******************************************************************************/ | ||
356 | 360 | ||
357 | Protocol management and registration routines | ||
358 | |||
359 | *******************************************************************************/ | ||
360 | 361 | ||
361 | /* | 362 | /* |
362 | * Add a protocol ID to the list. Now that the input handler is | 363 | * Add a protocol ID to the list. Now that the input handler is |
@@ -539,10 +540,10 @@ void dev_remove_offload(struct packet_offload *po) | |||
539 | EXPORT_SYMBOL(dev_remove_offload); | 540 | EXPORT_SYMBOL(dev_remove_offload); |
540 | 541 | ||
541 | /****************************************************************************** | 542 | /****************************************************************************** |
542 | 543 | * | |
543 | Device Boot-time Settings Routines | 544 | * Device Boot-time Settings Routines |
544 | 545 | * | |
545 | *******************************************************************************/ | 546 | ******************************************************************************/ |
546 | 547 | ||
547 | /* Boot time configuration table */ | 548 | /* Boot time configuration table */ |
548 | static struct netdev_boot_setup dev_boot_setup[NETDEV_BOOT_SETUP_MAX]; | 549 | static struct netdev_boot_setup dev_boot_setup[NETDEV_BOOT_SETUP_MAX]; |
@@ -664,10 +665,10 @@ int __init netdev_boot_setup(char *str) | |||
664 | __setup("netdev=", netdev_boot_setup); | 665 | __setup("netdev=", netdev_boot_setup); |
665 | 666 | ||
666 | /******************************************************************************* | 667 | /******************************************************************************* |
667 | 668 | * | |
668 | Device Interface Subroutines | 669 | * Device Interface Subroutines |
669 | 670 | * | |
670 | *******************************************************************************/ | 671 | *******************************************************************************/ |
671 | 672 | ||
672 | /** | 673 | /** |
673 | * dev_get_iflink - get 'iflink' value of a interface | 674 | * dev_get_iflink - get 'iflink' value of a interface |
@@ -3326,16 +3327,16 @@ static int __dev_queue_xmit(struct sk_buff *skb, void *accel_priv) | |||
3326 | } | 3327 | } |
3327 | 3328 | ||
3328 | /* The device has no queue. Common case for software devices: | 3329 | /* The device has no queue. Common case for software devices: |
3329 | loopback, all the sorts of tunnels... | 3330 | * loopback, all the sorts of tunnels... |
3330 | 3331 | ||
3331 | Really, it is unlikely that netif_tx_lock protection is necessary | 3332 | * Really, it is unlikely that netif_tx_lock protection is necessary |
3332 | here. (f.e. loopback and IP tunnels are clean ignoring statistics | 3333 | * here. (f.e. loopback and IP tunnels are clean ignoring statistics |
3333 | counters.) | 3334 | * counters.) |
3334 | However, it is possible, that they rely on protection | 3335 | * However, it is possible, that they rely on protection |
3335 | made by us here. | 3336 | * made by us here. |
3336 | 3337 | ||
3337 | Check this and shot the lock. It is not prone from deadlocks. | 3338 | * Check this and shot the lock. It is not prone from deadlocks. |
3338 | Either shot noqueue qdisc, it is even simpler 8) | 3339 | *Either shot noqueue qdisc, it is even simpler 8) |
3339 | */ | 3340 | */ |
3340 | if (dev->flags & IFF_UP) { | 3341 | if (dev->flags & IFF_UP) { |
3341 | int cpu = smp_processor_id(); /* ok because BHs are off */ | 3342 | int cpu = smp_processor_id(); /* ok because BHs are off */ |
@@ -3397,9 +3398,9 @@ int dev_queue_xmit_accel(struct sk_buff *skb, void *accel_priv) | |||
3397 | EXPORT_SYMBOL(dev_queue_xmit_accel); | 3398 | EXPORT_SYMBOL(dev_queue_xmit_accel); |
3398 | 3399 | ||
3399 | 3400 | ||
3400 | /*======================================================================= | 3401 | /************************************************************************* |
3401 | Receiver routines | 3402 | * Receiver routines |
3402 | =======================================================================*/ | 3403 | *************************************************************************/ |
3403 | 3404 | ||
3404 | int netdev_max_backlog __read_mostly = 1000; | 3405 | int netdev_max_backlog __read_mostly = 1000; |
3405 | EXPORT_SYMBOL(netdev_max_backlog); | 3406 | EXPORT_SYMBOL(netdev_max_backlog); |
@@ -6359,8 +6360,8 @@ int __dev_change_flags(struct net_device *dev, unsigned int flags) | |||
6359 | } | 6360 | } |
6360 | 6361 | ||
6361 | /* NOTE: order of synchronization of IFF_PROMISC and IFF_ALLMULTI | 6362 | /* NOTE: order of synchronization of IFF_PROMISC and IFF_ALLMULTI |
6362 | is important. Some (broken) drivers set IFF_PROMISC, when | 6363 | * is important. Some (broken) drivers set IFF_PROMISC, when |
6363 | IFF_ALLMULTI is requested not asking us and not reporting. | 6364 | * IFF_ALLMULTI is requested not asking us and not reporting. |
6364 | */ | 6365 | */ |
6365 | if ((flags ^ dev->gflags) & IFF_ALLMULTI) { | 6366 | if ((flags ^ dev->gflags) & IFF_ALLMULTI) { |
6366 | int inc = (flags & IFF_ALLMULTI) ? 1 : -1; | 6367 | int inc = (flags & IFF_ALLMULTI) ? 1 : -1; |
@@ -6724,8 +6725,8 @@ static void rollback_registered_many(struct list_head *head) | |||
6724 | 6725 | ||
6725 | 6726 | ||
6726 | /* Notify protocols, that we are about to destroy | 6727 | /* Notify protocols, that we are about to destroy |
6727 | this device. They should clean all the things. | 6728 | * this device. They should clean all the things. |
6728 | */ | 6729 | */ |
6729 | call_netdevice_notifiers(NETDEV_UNREGISTER, dev); | 6730 | call_netdevice_notifiers(NETDEV_UNREGISTER, dev); |
6730 | 6731 | ||
6731 | if (!dev->rtnl_link_ops || | 6732 | if (!dev->rtnl_link_ops || |
@@ -7855,12 +7856,12 @@ int dev_change_net_namespace(struct net_device *dev, struct net *net, const char | |||
7855 | dev_shutdown(dev); | 7856 | dev_shutdown(dev); |
7856 | 7857 | ||
7857 | /* Notify protocols, that we are about to destroy | 7858 | /* Notify protocols, that we are about to destroy |
7858 | this device. They should clean all the things. | 7859 | * this device. They should clean all the things. |
7859 | 7860 | * | |
7860 | Note that dev->reg_state stays at NETREG_REGISTERED. | 7861 | * Note that dev->reg_state stays at NETREG_REGISTERED. |
7861 | This is wanted because this way 8021q and macvlan know | 7862 | * This is wanted because this way 8021q and macvlan know |
7862 | the device is just moving and can keep their slaves up. | 7863 | * the device is just moving and can keep their slaves up. |
7863 | */ | 7864 | */ |
7864 | call_netdevice_notifiers(NETDEV_UNREGISTER, dev); | 7865 | call_netdevice_notifiers(NETDEV_UNREGISTER, dev); |
7865 | rcu_barrier(); | 7866 | rcu_barrier(); |
7866 | call_netdevice_notifiers(NETDEV_UNREGISTER_FINAL, dev); | 7867 | call_netdevice_notifiers(NETDEV_UNREGISTER_FINAL, dev); |