diff options
author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2007-02-09 09:24:36 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-02-11 02:19:25 -0500 |
commit | 4ec93edb14fe5fdee9fae6335f2cbba204627eac (patch) | |
tree | b768f96942b5d19f5bc36b47262c42a8a7acdd7f /net/core/pktgen.c | |
parent | 9d6f229fc45b6ac268020c0c8eff29e94bb34381 (diff) |
[NET] CORE: Fix whitespace errors.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/pktgen.c')
-rw-r--r-- | net/core/pktgen.c | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/net/core/pktgen.c b/net/core/pktgen.c index 04d4b93c68eb..c2818e07a4bd 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c | |||
@@ -15,7 +15,7 @@ | |||
15 | * | 15 | * |
16 | * | 16 | * |
17 | * A tool for loading the network with preconfigurated packets. | 17 | * A tool for loading the network with preconfigurated packets. |
18 | * The tool is implemented as a linux module. Parameters are output | 18 | * The tool is implemented as a linux module. Parameters are output |
19 | * device, delay (to hard_xmit), number of packets, and whether | 19 | * device, delay (to hard_xmit), number of packets, and whether |
20 | * to use multiple SKBs or just the same one. | 20 | * to use multiple SKBs or just the same one. |
21 | * pktgen uses the installed interface's output routine. | 21 | * pktgen uses the installed interface's output routine. |
@@ -44,14 +44,14 @@ | |||
44 | * * Add IOCTL interface to easily get counters & configuration. | 44 | * * Add IOCTL interface to easily get counters & configuration. |
45 | * --Ben Greear <greearb@candelatech.com> | 45 | * --Ben Greear <greearb@candelatech.com> |
46 | * | 46 | * |
47 | * Renamed multiskb to clone_skb and cleaned up sending core for two distinct | 47 | * Renamed multiskb to clone_skb and cleaned up sending core for two distinct |
48 | * skb modes. A clone_skb=0 mode for Ben "ranges" work and a clone_skb != 0 | 48 | * skb modes. A clone_skb=0 mode for Ben "ranges" work and a clone_skb != 0 |
49 | * as a "fastpath" with a configurable number of clones after alloc's. | 49 | * as a "fastpath" with a configurable number of clones after alloc's. |
50 | * clone_skb=0 means all packets are allocated this also means ranges time | 50 | * clone_skb=0 means all packets are allocated this also means ranges time |
51 | * stamps etc can be used. clone_skb=100 means 1 malloc is followed by 100 | 51 | * stamps etc can be used. clone_skb=100 means 1 malloc is followed by 100 |
52 | * clones. | 52 | * clones. |
53 | * | 53 | * |
54 | * Also moved to /proc/net/pktgen/ | 54 | * Also moved to /proc/net/pktgen/ |
55 | * --ro | 55 | * --ro |
56 | * | 56 | * |
57 | * Sept 10: Fixed threading/locking. Lots of bone-headed and more clever | 57 | * Sept 10: Fixed threading/locking. Lots of bone-headed and more clever |
@@ -60,28 +60,28 @@ | |||
60 | * | 60 | * |
61 | * Integrated to 2.5.x 021029 --Lucio Maciel (luciomaciel@zipmail.com.br) | 61 | * Integrated to 2.5.x 021029 --Lucio Maciel (luciomaciel@zipmail.com.br) |
62 | * | 62 | * |
63 | * | 63 | * |
64 | * 021124 Finished major redesign and rewrite for new functionality. | 64 | * 021124 Finished major redesign and rewrite for new functionality. |
65 | * See Documentation/networking/pktgen.txt for how to use this. | 65 | * See Documentation/networking/pktgen.txt for how to use this. |
66 | * | 66 | * |
67 | * The new operation: | 67 | * The new operation: |
68 | * For each CPU one thread/process is created at start. This process checks | 68 | * For each CPU one thread/process is created at start. This process checks |
69 | * for running devices in the if_list and sends packets until count is 0 it | 69 | * for running devices in the if_list and sends packets until count is 0 it |
70 | * also the thread checks the thread->control which is used for inter-process | 70 | * also the thread checks the thread->control which is used for inter-process |
71 | * communication. controlling process "posts" operations to the threads this | 71 | * communication. controlling process "posts" operations to the threads this |
72 | * way. The if_lock should be possible to remove when add/rem_device is merged | 72 | * way. The if_lock should be possible to remove when add/rem_device is merged |
73 | * into this too. | 73 | * into this too. |
74 | * | 74 | * |
75 | * By design there should only be *one* "controlling" process. In practice | 75 | * By design there should only be *one* "controlling" process. In practice |
76 | * multiple write accesses gives unpredictable result. Understood by "write" | 76 | * multiple write accesses gives unpredictable result. Understood by "write" |
77 | * to /proc gives result code thats should be read be the "writer". | 77 | * to /proc gives result code thats should be read be the "writer". |
78 | * For practical use this should be no problem. | 78 | * For practical use this should be no problem. |
79 | * | 79 | * |
80 | * Note when adding devices to a specific CPU there good idea to also assign | 80 | * Note when adding devices to a specific CPU there good idea to also assign |
81 | * /proc/irq/XX/smp_affinity so TX-interrupts gets bound to the same CPU. | 81 | * /proc/irq/XX/smp_affinity so TX-interrupts gets bound to the same CPU. |
82 | * --ro | 82 | * --ro |
83 | * | 83 | * |
84 | * Fix refcount off by one if first packet fails, potential null deref, | 84 | * Fix refcount off by one if first packet fails, potential null deref, |
85 | * memleak 030710- KJP | 85 | * memleak 030710- KJP |
86 | * | 86 | * |
87 | * First "ranges" functionality for ipv6 030726 --ro | 87 | * First "ranges" functionality for ipv6 030726 --ro |
@@ -89,22 +89,22 @@ | |||
89 | * Included flow support. 030802 ANK. | 89 | * Included flow support. 030802 ANK. |
90 | * | 90 | * |
91 | * Fixed unaligned access on IA-64 Grant Grundler <grundler@parisc-linux.org> | 91 | * Fixed unaligned access on IA-64 Grant Grundler <grundler@parisc-linux.org> |
92 | * | 92 | * |
93 | * Remove if fix from added Harald Welte <laforge@netfilter.org> 040419 | 93 | * Remove if fix from added Harald Welte <laforge@netfilter.org> 040419 |
94 | * ia64 compilation fix from Aron Griffis <aron@hp.com> 040604 | 94 | * ia64 compilation fix from Aron Griffis <aron@hp.com> 040604 |
95 | * | 95 | * |
96 | * New xmit() return, do_div and misc clean up by Stephen Hemminger | 96 | * New xmit() return, do_div and misc clean up by Stephen Hemminger |
97 | * <shemminger@osdl.org> 040923 | 97 | * <shemminger@osdl.org> 040923 |
98 | * | 98 | * |
99 | * Randy Dunlap fixed u64 printk compiler waring | 99 | * Randy Dunlap fixed u64 printk compiler waring |
100 | * | 100 | * |
101 | * Remove FCS from BW calculation. Lennert Buytenhek <buytenh@wantstofly.org> | 101 | * Remove FCS from BW calculation. Lennert Buytenhek <buytenh@wantstofly.org> |
102 | * New time handling. Lennert Buytenhek <buytenh@wantstofly.org> 041213 | 102 | * New time handling. Lennert Buytenhek <buytenh@wantstofly.org> 041213 |
103 | * | 103 | * |
104 | * Corrections from Nikolai Malykh (nmalykh@bilim.com) | 104 | * Corrections from Nikolai Malykh (nmalykh@bilim.com) |
105 | * Removed unused flags F_SET_SRCMAC & F_SET_SRCIP 041230 | 105 | * Removed unused flags F_SET_SRCMAC & F_SET_SRCIP 041230 |
106 | * | 106 | * |
107 | * interruptible_sleep_on_timeout() replaced Nishanth Aravamudan <nacc@us.ibm.com> | 107 | * interruptible_sleep_on_timeout() replaced Nishanth Aravamudan <nacc@us.ibm.com> |
108 | * 050103 | 108 | * 050103 |
109 | * | 109 | * |
110 | * MPLS support by Steven Whitehouse <steve@chygwyn.com> | 110 | * MPLS support by Steven Whitehouse <steve@chygwyn.com> |
@@ -456,7 +456,7 @@ static inline __u64 pg_div64(__u64 n, __u64 base) | |||
456 | /* | 456 | /* |
457 | * How do we know if the architecture we are running on | 457 | * How do we know if the architecture we are running on |
458 | * supports division with 64 bit base? | 458 | * supports division with 64 bit base? |
459 | * | 459 | * |
460 | */ | 460 | */ |
461 | #if defined(__sparc_v9__) || defined(__powerpc64__) || defined(__alpha__) || defined(__x86_64__) || defined(__ia64__) | 461 | #if defined(__sparc_v9__) || defined(__powerpc64__) || defined(__alpha__) || defined(__x86_64__) || defined(__ia64__) |
462 | 462 | ||
@@ -529,7 +529,7 @@ static struct notifier_block pktgen_notifier_block = { | |||
529 | }; | 529 | }; |
530 | 530 | ||
531 | /* | 531 | /* |
532 | * /proc handling functions | 532 | * /proc handling functions |
533 | * | 533 | * |
534 | */ | 534 | */ |
535 | 535 | ||
@@ -1979,7 +1979,7 @@ static void pktgen_setup_inject(struct pktgen_dev *pkt_dev) | |||
1979 | 1979 | ||
1980 | if (pkt_dev->flags & F_IPV6) { | 1980 | if (pkt_dev->flags & F_IPV6) { |
1981 | /* | 1981 | /* |
1982 | * Skip this automatic address setting until locks or functions | 1982 | * Skip this automatic address setting until locks or functions |
1983 | * gets exported | 1983 | * gets exported |
1984 | */ | 1984 | */ |
1985 | 1985 | ||
@@ -2477,10 +2477,10 @@ static struct sk_buff *fill_packet_ipv4(struct net_device *odev, | |||
2477 | } | 2477 | } |
2478 | 2478 | ||
2479 | /* | 2479 | /* |
2480 | * scan_ip6, fmt_ip taken from dietlibc-0.21 | 2480 | * scan_ip6, fmt_ip taken from dietlibc-0.21 |
2481 | * Author Felix von Leitner <felix-dietlibc@fefe.de> | 2481 | * Author Felix von Leitner <felix-dietlibc@fefe.de> |
2482 | * | 2482 | * |
2483 | * Slightly modified for kernel. | 2483 | * Slightly modified for kernel. |
2484 | * Should be candidate for net/ipv4/utils.c | 2484 | * Should be candidate for net/ipv4/utils.c |
2485 | * --ro | 2485 | * --ro |
2486 | */ | 2486 | */ |
@@ -3256,7 +3256,7 @@ static __inline__ void pktgen_xmit(struct pktgen_dev *pkt_dev) | |||
3256 | out:; | 3256 | out:; |
3257 | } | 3257 | } |
3258 | 3258 | ||
3259 | /* | 3259 | /* |
3260 | * Main loop of the thread goes here | 3260 | * Main loop of the thread goes here |
3261 | */ | 3261 | */ |
3262 | 3262 | ||
@@ -3365,8 +3365,8 @@ static struct pktgen_dev *pktgen_find_dev(struct pktgen_thread *t, | |||
3365 | return pkt_dev; | 3365 | return pkt_dev; |
3366 | } | 3366 | } |
3367 | 3367 | ||
3368 | /* | 3368 | /* |
3369 | * Adds a dev at front of if_list. | 3369 | * Adds a dev at front of if_list. |
3370 | */ | 3370 | */ |
3371 | 3371 | ||
3372 | static int add_dev_to_thread(struct pktgen_thread *t, | 3372 | static int add_dev_to_thread(struct pktgen_thread *t, |
@@ -3510,8 +3510,8 @@ static int __init pktgen_create_thread(int cpu) | |||
3510 | return 0; | 3510 | return 0; |
3511 | } | 3511 | } |
3512 | 3512 | ||
3513 | /* | 3513 | /* |
3514 | * Removes a device from the thread if_list. | 3514 | * Removes a device from the thread if_list. |
3515 | */ | 3515 | */ |
3516 | static void _rem_dev_from_if_list(struct pktgen_thread *t, | 3516 | static void _rem_dev_from_if_list(struct pktgen_thread *t, |
3517 | struct pktgen_dev *pkt_dev) | 3517 | struct pktgen_dev *pkt_dev) |