diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-28 17:39:05 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-28 17:39:05 +0200 |
| commit | 2ef7b45a5925c54d948f858e42babb0533b9a3c5 (patch) | |
| tree | 9733a7b50854654162d9e15551a7edd74bfdef2c /Documentation | |
| parent | Merge git://bedivere.hansenpartnership.com/git/scsi-rc-fixes-2.6 (diff) | |
| parent | Merge branch 'for-davem' of git://git.infradead.org/users/linville/wireless (diff) | |
| download | linux-2ef7b45a5925c54d948f858e42babb0533b9a3c5.tar.xz linux-2ef7b45a5925c54d948f858e42babb0533b9a3c5.zip | |
Merge git://github.com/davem330/net
* git://github.com/davem330/net:
ipv6-multicast: Fix memory leak in IPv6 multicast.
ipv6: check return value for dst_alloc
net: check return value for dst_alloc
ipv6-multicast: Fix memory leak in input path.
bnx2x: add missing break in bnx2x_dcbnl_get_cap
bnx2x: fix WOL by enablement PME in config space
bnx2x: fix hw attention handling
net: fix a typo in Documentation/networking/scaling.txt
ath9k: Fix a dma warning/memory leak
rtlwifi: rtl8192cu: Fix unitialized struct
iwlagn: fix dangling scan request
batman-adv: do_bcast has to be true for broadcast packets only
cfg80211: Fix validation of AKM suites
iwlegacy: do not use interruptible waits
iwlegacy: fix command queue timeout
ath9k_hw: Fix Rx DMA stuck for AR9003 chips
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/networking/scaling.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/networking/scaling.txt b/Documentation/networking/scaling.txt index 58fd7414e6c0..8ce7c30e7230 100644 --- a/Documentation/networking/scaling.txt +++ b/Documentation/networking/scaling.txt @@ -243,7 +243,7 @@ configured. The number of entries in the global flow table is set through: The number of entries in the per-queue flow table are set through: - /sys/class/net/<dev>/queues/tx-<n>/rps_flow_cnt + /sys/class/net/<dev>/queues/rx-<n>/rps_flow_cnt == Suggested Configuration |