diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-06 22:43:16 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-06 22:43:16 -0700 |
| commit | 7ecc59c1b7fd5749667fc31f8683099cbef38977 (patch) | |
| tree | 560d8ce48fac50758d1af6d722bc0bb0c7de2a34 /net | |
| parent | bcdce7195e0eab55b37dbd53be53057f38006380 (diff) | |
| parent | 1cec9727fbfd7baff2034796154be1a0297bcedd (diff) | |
| download | linux-3.10-7ecc59c1b7fd5749667fc31f8683099cbef38977.tar.gz linux-3.10-7ecc59c1b7fd5749667fc31f8683099cbef38977.tar.bz2 linux-3.10-7ecc59c1b7fd5749667fc31f8683099cbef38977.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/net-sysfs.c | 4 | ||||
| -rw-r--r-- | net/core/pktgen.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c index effb78410eb..4242e94ff1a 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c @@ -406,13 +406,13 @@ static ssize_t wireless_show(struct device *d, char *buf, const struct iw_statistics *iw; ssize_t ret = -EINVAL; - read_lock(&dev_base_lock); + rtnl_lock(); if (dev_isalive(dev)) { iw = get_wireless_stats(dev); if (iw) ret = (*format)(iw, buf); } - read_unlock(&dev_base_lock); + rtnl_unlock(); return ret; } diff --git a/net/core/pktgen.c b/net/core/pktgen.c index e856ab0d074..1da0e038df7 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -964,7 +964,7 @@ static ssize_t pktgen_if_write(struct file *file, if (value == 0x7FFFFFFF) pkt_dev->delay = ULLONG_MAX; else - pkt_dev->delay = (u64)value * NSEC_PER_USEC; + pkt_dev->delay = (u64)value; sprintf(pg_result, "OK: delay=%llu", (unsigned long long) pkt_dev->delay); @@ -2212,7 +2212,7 @@ static void set_cur_queue_map(struct pktgen_dev *pkt_dev) if (pkt_dev->flags & F_QUEUE_MAP_CPU) pkt_dev->cur_queue_map = smp_processor_id(); - else if (pkt_dev->queue_map_min < pkt_dev->queue_map_max) { + else if (pkt_dev->queue_map_min <= pkt_dev->queue_map_max) { __u16 t; if (pkt_dev->flags & F_QUEUE_MAP_RND) { t = random32() % |