diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
| commit | a56e74f546b64be93731e42d83baf5b538cc1b11 (patch) | |
| tree | 18f6dee45d801e57ac9db2a31664b0d5c0762c50 /net/ipv4/inetpeer.c | |
| parent | d08e2e09042bd3f7ef66a35cb4bb92794ab26bb2 (diff) | |
| parent | e4e7f10bfc4069925e99cc4b428c3434e30b6c3f (diff) | |
Merge branch 'arm-aesbs' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into devel-stable
Diffstat (limited to 'net/ipv4/inetpeer.c')
| -rw-r--r-- | net/ipv4/inetpeer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c index 000e3d239d64..33d5537881ed 100644 --- a/net/ipv4/inetpeer.c +++ b/net/ipv4/inetpeer.c | |||
| @@ -32,8 +32,8 @@ | |||
| 32 | * At the moment of writing this notes identifier of IP packets is generated | 32 | * At the moment of writing this notes identifier of IP packets is generated |
| 33 | * to be unpredictable using this code only for packets subjected | 33 | * to be unpredictable using this code only for packets subjected |
| 34 | * (actually or potentially) to defragmentation. I.e. DF packets less than | 34 | * (actually or potentially) to defragmentation. I.e. DF packets less than |
| 35 | * PMTU in size uses a constant ID and do not use this code (see | 35 | * PMTU in size when local fragmentation is disabled use a constant ID and do |
| 36 | * ip_select_ident() in include/net/ip.h). | 36 | * not use this code (see ip_select_ident() in include/net/ip.h). |
| 37 | * | 37 | * |
| 38 | * Route cache entries hold references to our nodes. | 38 | * Route cache entries hold references to our nodes. |
| 39 | * New cache entries get references via lookup by destination IP address in | 39 | * New cache entries get references via lookup by destination IP address in |