git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...
[safe/jmp/linux-2.6]
/
arch
/
um
/
drivers
/
net_kern.c
diff --git
a/arch/um/drivers/net_kern.c
b/arch/um/drivers/net_kern.c
index
3b44b47
..
f053726
100644
(file)
--- a/
arch/um/drivers/net_kern.c
+++ b/
arch/um/drivers/net_kern.c
@@
-16,6
+16,7
@@
#include <linux/platform_device.h>
#include <linux/rtnetlink.h>
#include <linux/skbuff.h>
#include <linux/platform_device.h>
#include <linux/rtnetlink.h>
#include <linux/skbuff.h>
+#include <linux/slab.h>
#include <linux/spinlock.h>
#include "init.h"
#include "irq_kern.h"
#include <linux/spinlock.h>
#include "init.h"
#include "irq_kern.h"
@@
-245,7
+246,7
@@
static int uml_net_start_xmit(struct sk_buff *skb, struct net_device *dev)
dev_kfree_skb(skb);
dev_kfree_skb(skb);
- return
0
;
+ return
NETDEV_TX_OK
;
}
static void uml_net_set_multicast_list(struct net_device *dev)
}
static void uml_net_set_multicast_list(struct net_device *dev)
@@
-285,7
+286,7
@@
static void uml_net_get_drvinfo(struct net_device *dev,
strcpy(info->version, "42");
}
strcpy(info->version, "42");
}
-static struct ethtool_ops uml_net_ethtool_ops = {
+static
const
struct ethtool_ops uml_net_ethtool_ops = {
.get_drvinfo = uml_net_get_drvinfo,
.get_link = ethtool_op_get_link,
};
.get_drvinfo = uml_net_get_drvinfo,
.get_link = ethtool_op_get_link,
};
@@
-533,7
+534,7
@@
static int eth_parse(char *str, int *index_out, char **str_out,
char **error_out)
{
char *end;
char **error_out)
{
char *end;
- int n, err = -EINVAL;
;
+ int n, err = -EINVAL;
n = simple_strtoul(str, &end, 0);
if (end == str) {
n = simple_strtoul(str, &end, 0);
if (end == str) {