diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/netconsole.c | 2 | ||||
| -rw-r--r-- | drivers/net/pppoe.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index 66e74f7402610f..bf58db29e2ed63 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -107,7 +107,7 @@ static int init_netconsole(void) if(!configured) { printk("netconsole: not configured, aborting\n"); - return -EINVAL; + return 0; } if(netpoll_setup(&np)) diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c index 475dc930380f63..0d101a18026a31 100644 --- a/drivers/net/pppoe.c +++ b/drivers/net/pppoe.c @@ -861,6 +861,9 @@ static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb) * give dev_queue_xmit something it can free. */ skb2 = skb_clone(skb, GFP_ATOMIC); + + if (skb2 == NULL) + goto abort; } ph = (struct pppoe_hdr *) skb_push(skb2, sizeof(struct pppoe_hdr)); |