git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
um
/
drivers
/
pcap_user.c
diff --git
a/arch/um/drivers/pcap_user.c
b/arch/um/drivers/pcap_user.c
index
edfcb29
..
11921a7
100644
(file)
--- a/
arch/um/drivers/pcap_user.c
+++ b/
arch/um/drivers/pcap_user.c
@@
-12,6
+12,7
@@
#include "net_user.h"
#include "pcap_user.h"
#include "user.h"
#include "net_user.h"
#include "pcap_user.h"
#include "user.h"
+#include "um_malloc.h"
#define MAX_PACKET (ETH_MAX_PACKET + ETH_HEADER_OTHER)
#define MAX_PACKET (ETH_MAX_PACKET + ETH_HEADER_OTHER)
@@
-120,7
+121,7
@@
int pcap_user_read(int fd, void *buffer, int len, struct pcap_data *pri)
return(hdata.len);
}
return(hdata.len);
}
-struct net_user_info pcap_user_info = {
+
const
struct net_user_info pcap_user_info = {
.init = pcap_user_init,
.open = pcap_open,
.close = NULL,
.init = pcap_user_init,
.open = pcap_open,
.close = NULL,