Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

[linux-2.6] / arch / um / drivers / pcap_user.c

diff --git a/arch/um/drivers/pcap_user.c b/arch/um/drivers/pcap_user.c
index a1747dc0ff6fbcf3cffe12ec5ba5caf12a23bd90..1316456e2a2854237ec715e0b2625d5da81c21b4 100644 (file)
--- a/arch/um/drivers/pcap_user.c
+++ b/arch/um/drivers/pcap_user.c
@@ -13,12 +13,13 @@
 #include "pcap_user.h"
 #include "user.h"
 #include "um_malloc.h"
+#include "kern_constants.h"
 
 #define MAX_PACKET (ETH_MAX_PACKET + ETH_HEADER_OTHER)
 
 #define PCAP_FD(p) (*(int *)(p))
 
-static void pcap_user_init(void *data, void *dev)
+static int pcap_user_init(void *data, void *dev)
 {
        struct pcap_data *pri = data;
        pcap_t *p;
@@ -26,13 +27,14 @@ static void pcap_user_init(void *data, void *dev)
 
        p = pcap_open_live(pri->host_if, MAX_PACKET, pri->promisc, 0, errors);
        if(p == NULL){
-               printk("pcap_user_init : pcap_open_live failed - '%s'\n", 
-                      errors);
-               return;
+               printk(UM_KERN_ERR "pcap_user_init : pcap_open_live failed - "
+                      "'%s'\n", errors);
+               return -EINVAL;
        }
 
        pri->dev = dev;
        pri->pcap = p;
+       return 0;
 }
 
 static int pcap_open(void *data)
@@ -47,13 +49,13 @@ static int pcap_open(void *data)
        if(pri->filter != NULL){
                err = dev_netmask(pri->dev, &netmask);
                if(err < 0){
-                       printk("pcap_open : dev_netmask failed\n");
+                       printk(UM_KERN_ERR "pcap_open : dev_netmask failed\n");
                        return -EIO;
                }
 
-               pri->compiled = um_kmalloc(sizeof(struct bpf_program));
+               pri->compiled = kmalloc(sizeof(struct bpf_program), UM_GFP_KERNEL);
                if(pri->compiled == NULL){
-                       printk("pcap_open : kmalloc failed\n");
+                       printk(UM_KERN_ERR "pcap_open : kmalloc failed\n");
                        return -ENOMEM;
                }
 
@@ -61,15 +63,15 @@ static int pcap_open(void *data)
                                   (struct bpf_program *) pri->compiled, 
                                   pri->filter, pri->optimize, netmask);
                if(err < 0){
-                       printk("pcap_open : pcap_compile failed - '%s'\n", 
-                              pcap_geterr(pri->pcap));
+                       printk(UM_KERN_ERR "pcap_open : pcap_compile failed - "
+                              "'%s'\n", pcap_geterr(pri->pcap));
                        return -EIO;
                }
 
                err = pcap_setfilter(pri->pcap, pri->compiled);
                if(err < 0){
-                       printk("pcap_open : pcap_setfilter failed - '%s'\n", 
-                              pcap_geterr(pri->pcap));
+                       printk(UM_KERN_ERR "pcap_open : pcap_setfilter "
+                              "failed - '%s'\n", pcap_geterr(pri->pcap));
                        return -EIO;
                }
        }
@@ -84,7 +86,8 @@ static void pcap_remove(void *data)
        if(pri->compiled != NULL)
                pcap_freecode(pri->compiled);
 
-       pcap_close(pri->pcap);
+       if(pri->pcap != NULL)
+               pcap_close(pri->pcap);
 }
 
 struct pcap_handler_data {
@@ -113,7 +116,8 @@ int pcap_user_read(int fd, void *buffer, int len, struct pcap_data *pri)
 
        n = pcap_dispatch(pri->pcap, 1, handler, (u_char *) &hdata);
        if(n < 0){
-               printk("pcap_dispatch failed - %s\n", pcap_geterr(pri->pcap));
+               printk(UM_KERN_ERR "pcap_dispatch failed - %s\n",
+                      pcap_geterr(pri->pcap));
                return -EIO;
        }
        else if(n == 0)