netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] IPV6 debug printk error and missing release in error path
@ 2003-12-19 21:24 Stephen Hemminger
  2003-12-22  8:16 ` David S. Miller
  0 siblings, 1 reply; 2+ messages in thread
From: Stephen Hemminger @ 2003-12-19 21:24 UTC (permalink / raw)
  To: YOSHIFUJI Hideaki / _$B5HF#1QL@, David S. Miller; +Cc: netdev

A couple of small fixes for IPV6 network discovery:
  * A NPRINTK2 in ndisc_parse_options would not compile if ND_DEBUG level was up to 3
  * missing dst_release in ndisc_send_rs error path if skb_alloc fails.

diff -Nru a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
--- a/net/ipv6/ndisc.c	Fri Dec 19 13:21:11 2003
+++ b/net/ipv6/ndisc.c	Fri Dec 19 13:21:11 2003
@@ -207,9 +207,8 @@
 		case ND_OPT_MTU:
 		case ND_OPT_REDIRECT_HDR:
 			if (ndopts->nd_opt_array[nd_opt->nd_opt_type]) {
-				ND_PRINTK2((KERN_WARNING
-					    "ndisc_parse_options(): duplicated ND6 option found: type=%d\n",
-					    nd_opt->nd_opt_type));
+				ND_PRINTK2("ndisc_parse_options(): duplicated ND6 option found: type=%d\n",
+					    nd_opt->nd_opt_type);
 			} else {
 				ndopts->nd_opt_array[nd_opt->nd_opt_type] = nd_opt;
 			}
@@ -619,6 +618,7 @@
 				  1, &err);
 	if (skb == NULL) {
 		ND_PRINTK1("send_ns: alloc skb failed\n");
+		dst_release(dst);
 		return;
 	}
 

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] IPV6 debug printk error and missing release in error path
  2003-12-19 21:24 [PATCH] IPV6 debug printk error and missing release in error path Stephen Hemminger
@ 2003-12-22  8:16 ` David S. Miller
  0 siblings, 0 replies; 2+ messages in thread
From: David S. Miller @ 2003-12-22  8:16 UTC (permalink / raw)
  To: Stephen Hemminger; +Cc: yoshfuji, netdev

On Fri, 19 Dec 2003 13:24:31 -0800
Stephen Hemminger <shemminger@osdl.org> wrote:

> A couple of small fixes for IPV6 network discovery:
>   * A NPRINTK2 in ndisc_parse_options would not compile if ND_DEBUG level was up to 3
>   * missing dst_release in ndisc_send_rs error path if skb_alloc fails.

Applied, thanks Stephen.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2003-12-22  8:16 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2003-12-19 21:24 [PATCH] IPV6 debug printk error and missing release in error path Stephen Hemminger
2003-12-22  8:16 ` David S. Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).