diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-21 11:19:50 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-21 11:19:50 -0400 |
| commit | eb6a12c2428d21a9f3e0f1a50e927d5fd80fc3d0 (patch) | |
| tree | 5ac6f43899648abeab1d43aad3107f664e7f13d5 /net/netlabel/netlabel_cipso_v4.c | |
| parent | c4762aba0b1f72659aae9ce37b772ca8bd8f06f4 (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
Merge branch 'linus' into cpus4096-for-linus
Conflicts:
net/sunrpc/svc.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'net/netlabel/netlabel_cipso_v4.c')
| -rw-r--r-- | net/netlabel/netlabel_cipso_v4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netlabel/netlabel_cipso_v4.c b/net/netlabel/netlabel_cipso_v4.c index 9080c61b71a5..0aec318bf0ef 100644 --- a/net/netlabel/netlabel_cipso_v4.c +++ b/net/netlabel/netlabel_cipso_v4.c | |||
| @@ -591,7 +591,7 @@ list_retry: | |||
| 591 | if (nlsze_mult < 4) { | 591 | if (nlsze_mult < 4) { |
| 592 | rcu_read_unlock(); | 592 | rcu_read_unlock(); |
| 593 | kfree_skb(ans_skb); | 593 | kfree_skb(ans_skb); |
| 594 | nlsze_mult++; | 594 | nlsze_mult *= 2; |
| 595 | goto list_start; | 595 | goto list_start; |
| 596 | } | 596 | } |
| 597 | list_failure_lock: | 597 | list_failure_lock: |