diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2009-08-27 13:55:20 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-28 23:41:39 -0700 |
| commit | c3d2f52dd40b5b6c122329dac32dc0e0351f0598 (patch) | |
| tree | 35c21d1bd0e107934f20e72732a5a3a523b1fdbe /net | |
| parent | 63adc6fb8ac0dee0020d6ad73e0d44f4306e1e34 (diff) | |
| download | linux-3.10-c3d2f52dd40b5b6c122329dac32dc0e0351f0598.tar.gz linux-3.10-c3d2f52dd40b5b6c122329dac32dc0e0351f0598.tar.bz2 linux-3.10-c3d2f52dd40b5b6c122329dac32dc0e0351f0598.zip | |
pktgen: increase version
Increase module version, and cleanup module info.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -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 51b1e61d302..42e4cce08a9 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -169,9 +169,7 @@ #include <asm/dma.h> #include <asm/div64.h> /* do_div */ -#define VERSION \ - "pktgen v2.70: Packet Generator for packet performance testing.\n" - +#define VERSION "2.72" #define IP_NAME_SZ 32 #define MAX_MPLS_LABELS 16 /* This is the max label stack depth */ #define MPLS_STACK_BOTTOM htonl(0x00000100) @@ -422,7 +420,8 @@ static inline int ktime_lt(const ktime_t cmp1, const ktime_t cmp2) return cmp1.tv64 < cmp2.tv64; } -static const char version[] __initconst = VERSION; +static const char version[] = + "pktgen " VERSION ": Packet Generator for packet performance testing.\n"; static int pktgen_remove_device(struct pktgen_thread *t, struct pktgen_dev *i); static int pktgen_add_device(struct pktgen_thread *t, const char *ifname); @@ -459,7 +458,7 @@ static struct notifier_block pktgen_notifier_block = { static int pgctrl_show(struct seq_file *seq, void *v) { - seq_puts(seq, VERSION); + seq_puts(seq, version); return 0; } @@ -3852,10 +3851,15 @@ static void __exit pg_cleanup(void) module_init(pg_init); module_exit(pg_cleanup); -MODULE_AUTHOR("Robert Olsson <robert.olsson@its.uu.se"); +MODULE_AUTHOR("Robert Olsson <robert.olsson@its.uu.se>"); MODULE_DESCRIPTION("Packet Generator tool"); MODULE_LICENSE("GPL"); +MODULE_VERSION(VERSION); module_param(pg_count_d, int, 0); +MODULE_PARM_DESC(pg_count_d, "Default number of packets to inject"); module_param(pg_delay_d, int, 0); +MODULE_PARM_DESC(pg_delay_d, "Default delay between packets (nanoseconds)"); module_param(pg_clone_skb_d, int, 0); +MODULE_PARM_DESC(pg_clone_skb_d, "Default number of copies of the same packet"); module_param(debug, int, 0); +MODULE_PARM_DESC(debug, "Enable debugging of pktgen module"); |