| To: | "YOSHIFUJI Hideaki / _$B5HF#1QL@" <yoshfuji@xxxxxxxxxxxxxx>, "David S. Miller" <davem@xxxxxxxxxx> |
|---|---|
| Subject: | [PATCH] IPV6 debug printk error and missing release in error path |
| From: | Stephen Hemminger <shemminger@xxxxxxxx> |
| Date: | Fri, 19 Dec 2003 13:24:31 -0800 |
| Cc: | netdev@xxxxxxxxxxx |
| Organization: | Open Source Development Lab |
| Sender: | netdev-bounce@xxxxxxxxxxx |
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;
}
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | Re: e100 in net-drivers-2.5-exp, Jeff Garzik |
|---|---|
| Next by Date: | [PATCH] Bogus return status in drivers/net/tg3.c, Francois Romieu |
| Previous by Thread: | [PATCH] make tg3 NAPI support configurable, Greg Banks |
| Next by Thread: | Re: [PATCH] IPV6 debug printk error and missing release in error path, David S. Miller |
| Indexes: | [Date] [Thread] [Top] [All Lists] |