diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-20 04:17:45 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-20 04:17:45 +0200 |
| commit | d06838de4a015c7c4844ad3fcf63ad5e2c17b234 (patch) | |
| tree | ac8c5fa24458e7c6d33ceef89260a955a6ccaac8 /Documentation/networking/scaling.txt | |
| parent | staging: android: ion: Improve memory alloc style (diff) | |
| parent | Linux 4.12-rc6 (diff) | |
| download | linux-d06838de4a015c7c4844ad3fcf63ad5e2c17b234.tar.xz linux-d06838de4a015c7c4844ad3fcf63ad5e2c17b234.zip | |
Merge 4.12-rc6 into staging-next
We want the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/networking/scaling.txt')
| -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 59f4db2a0c85..f55639d71d35 100644 --- a/Documentation/networking/scaling.txt +++ b/Documentation/networking/scaling.txt @@ -122,7 +122,7 @@ associated flow of the packet. The hash is either provided by hardware or will be computed in the stack. Capable hardware can pass the hash in the receive descriptor for the packet; this would usually be the same hash used for RSS (e.g. computed Toeplitz hash). The hash is saved in -skb->rx_hash and can be used elsewhere in the stack as a hash of the +skb->hash and can be used elsewhere in the stack as a hash of the packet’s flow. Each receive hardware queue has an associated list of CPUs to which |