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/raw.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/raw.c')
| -rw-r--r-- | net/ipv4/raw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index a86c7ae71881..bfec521c717f 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c | |||
| @@ -387,7 +387,7 @@ static int raw_send_hdrinc(struct sock *sk, struct flowi4 *fl4, | |||
| 387 | iph->check = 0; | 387 | iph->check = 0; |
| 388 | iph->tot_len = htons(length); | 388 | iph->tot_len = htons(length); |
| 389 | if (!iph->id) | 389 | if (!iph->id) |
| 390 | ip_select_ident(iph, &rt->dst, NULL); | 390 | ip_select_ident(skb, &rt->dst, NULL); |
| 391 | 391 | ||
| 392 | iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl); | 392 | iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl); |
| 393 | } | 393 | } |