| Date | Fri, 30 Jul 2010 10:29:27 -0700 | From | Greg KH <> | Subject | [002/140] net/dccp: expansion of error code size |
| |
2.6.33-stable review patch. If anyone has any objections, please let us know.
------------------
From: Yoichi Yuasa <yuasa@linux-mips.org>
[ Upstream commit d9b52dc6fd1fbb2bad645cbc86a60f984c1cb179 ]
Because MIPS's EDQUOT value is 1133(0x46d). It's larger than u8.
Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- net/dccp/input.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
--- a/net/dccp/input.c +++ b/net/dccp/input.c @@ -123,9 +123,9 @@ static int dccp_rcv_closereq(struct sock return queued; } -static u8 dccp_reset_code_convert(const u8 code) +static u16 dccp_reset_code_convert(const u8 code) { - const u8 error_code[] = { + const u16 error_code[] = { [DCCP_RESET_CODE_CLOSED] = 0, /* normal termination */ [DCCP_RESET_CODE_UNSPECIFIED] = 0, /* nothing known */ [DCCP_RESET_CODE_ABORTED] = ECONNRESET, @@ -147,7 +147,7 @@ static u8 dccp_reset_code_convert(const static void dccp_rcv_reset(struct sock *sk, struct sk_buff *skb) { - u8 err = dccp_reset_code_convert(dccp_hdr_reset(skb)->dccph_reset_code); + u16 err = dccp_reset_code_convert(dccp_hdr_reset(skb)->dccph_reset_code); sk->sk_err = err;
|