diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-03 17:29:05 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-03 17:29:05 +0100 |
| commit | 8e9c4aa4e7bd600d30e15ec82be9b670a1ec3da9 (patch) | |
| tree | 3b19eb54c684e36feab568078018dea31c43a79f /net/sctp/input.c | |
| parent | d60336e2f136287de821901d4a1b56179a0f7b69 (diff) | |
| parent | 1d73ad298d1bfeee5d77c19e5cd667c551e30632 (diff) | |
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-fsl
Conflicts:
sound/soc/fsl/fsl_ssi.c
Diffstat (limited to 'net/sctp/input.c')
| -rw-r--r-- | net/sctp/input.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sctp/input.c b/net/sctp/input.c index 5f2068679f83..98b69bbecdd9 100644 --- a/net/sctp/input.c +++ b/net/sctp/input.c @@ -634,8 +634,7 @@ void sctp_v4_err(struct sk_buff *skb, __u32 info) break; case ICMP_REDIRECT: sctp_icmp_redirect(sk, transport, skb); - err = 0; - break; + /* Fall through to out_unlock. */ default: goto out_unlock; } |