diff options
-rw-r--r-- | net/core/pktgen.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/net/core/pktgen.c b/net/core/pktgen.c index 51b1e61d3029..42e4cce08a92 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c | |||
@@ -169,9 +169,7 @@ | |||
169 | #include <asm/dma.h> | 169 | #include <asm/dma.h> |
170 | #include <asm/div64.h> /* do_div */ | 170 | #include <asm/div64.h> /* do_div */ |
171 | 171 | ||
172 | #define VERSION \ | 172 | #define VERSION "2.72" |
173 | "pktgen v2.70: Packet Generator for packet performance testing.\n" | ||
174 | |||
175 | #define IP_NAME_SZ 32 | 173 | #define IP_NAME_SZ 32 |
176 | #define MAX_MPLS_LABELS 16 /* This is the max label stack depth */ | 174 | #define MAX_MPLS_LABELS 16 /* This is the max label stack depth */ |
177 | #define MPLS_STACK_BOTTOM htonl(0x00000100) | 175 | #define MPLS_STACK_BOTTOM htonl(0x00000100) |
@@ -422,7 +420,8 @@ static inline int ktime_lt(const ktime_t cmp1, const ktime_t cmp2) | |||
422 | return cmp1.tv64 < cmp2.tv64; | 420 | return cmp1.tv64 < cmp2.tv64; |
423 | } | 421 | } |
424 | 422 | ||
425 | static const char version[] __initconst = VERSION; | 423 | static const char version[] = |
424 | "pktgen " VERSION ": Packet Generator for packet performance testing.\n"; | ||
426 | 425 | ||
427 | static int pktgen_remove_device(struct pktgen_thread *t, struct pktgen_dev *i); | 426 | static int pktgen_remove_device(struct pktgen_thread *t, struct pktgen_dev *i); |
428 | static int pktgen_add_device(struct pktgen_thread *t, const char *ifname); | 427 | static int pktgen_add_device(struct pktgen_thread *t, const char *ifname); |
@@ -459,7 +458,7 @@ static struct notifier_block pktgen_notifier_block = { | |||
459 | 458 | ||
460 | static int pgctrl_show(struct seq_file *seq, void *v) | 459 | static int pgctrl_show(struct seq_file *seq, void *v) |
461 | { | 460 | { |
462 | seq_puts(seq, VERSION); | 461 | seq_puts(seq, version); |
463 | return 0; | 462 | return 0; |
464 | } | 463 | } |
465 | 464 | ||
@@ -3852,10 +3851,15 @@ static void __exit pg_cleanup(void) | |||
3852 | module_init(pg_init); | 3851 | module_init(pg_init); |
3853 | module_exit(pg_cleanup); | 3852 | module_exit(pg_cleanup); |
3854 | 3853 | ||
3855 | MODULE_AUTHOR("Robert Olsson <robert.olsson@its.uu.se"); | 3854 | MODULE_AUTHOR("Robert Olsson <robert.olsson@its.uu.se>"); |
3856 | MODULE_DESCRIPTION("Packet Generator tool"); | 3855 | MODULE_DESCRIPTION("Packet Generator tool"); |
3857 | MODULE_LICENSE("GPL"); | 3856 | MODULE_LICENSE("GPL"); |
3857 | MODULE_VERSION(VERSION); | ||
3858 | module_param(pg_count_d, int, 0); | 3858 | module_param(pg_count_d, int, 0); |
3859 | MODULE_PARM_DESC(pg_count_d, "Default number of packets to inject"); | ||
3859 | module_param(pg_delay_d, int, 0); | 3860 | module_param(pg_delay_d, int, 0); |
3861 | MODULE_PARM_DESC(pg_delay_d, "Default delay between packets (nanoseconds)"); | ||
3860 | module_param(pg_clone_skb_d, int, 0); | 3862 | module_param(pg_clone_skb_d, int, 0); |
3863 | MODULE_PARM_DESC(pg_clone_skb_d, "Default number of copies of the same packet"); | ||
3861 | module_param(debug, int, 0); | 3864 | module_param(debug, int, 0); |
3865 | MODULE_PARM_DESC(debug, "Enable debugging of pktgen module"); | ||