diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-20 05:27:41 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-20 05:27:41 -0400 |
| commit | 2b1c4354de72ced917d2f3fe88117613f992234b (patch) | |
| tree | 3e7643cad45d94e3c331366418532043bd4fa5a9 /Documentation | |
| parent | 5e140dfc1fe87eae27846f193086724806b33c7d (diff) | |
| parent | 170ebf85160dd128e1c4206cc197cce7d1424705 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/virtio_net.c
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/filesystems/proc.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt index a87be42f8211..830bad7cce0f 100644 --- a/Documentation/filesystems/proc.txt +++ b/Documentation/filesystems/proc.txt | |||
| @@ -1478,6 +1478,13 @@ of problems on the network like duplicate address or bad checksums. Normally, | |||
| 1478 | this should be enabled, but if the problem persists the messages can be | 1478 | this should be enabled, but if the problem persists the messages can be |
| 1479 | disabled. | 1479 | disabled. |
| 1480 | 1480 | ||
| 1481 | netdev_budget | ||
| 1482 | ------------- | ||
| 1483 | |||
| 1484 | Maximum number of packets taken from all interfaces in one polling cycle (NAPI | ||
| 1485 | poll). In one polling cycle interfaces which are registered to polling are | ||
| 1486 | probed in a round-robin manner. The limit of packets in one such probe can be | ||
| 1487 | set per-device via sysfs class/net/<device>/weight . | ||
| 1481 | 1488 | ||
| 1482 | netdev_max_backlog | 1489 | netdev_max_backlog |
| 1483 | ------------------ | 1490 | ------------------ |