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
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
ia64
/
hp
/
sim
/
simeth.c
diff --git
a/arch/ia64/hp/sim/simeth.c
b/arch/ia64/hp/sim/simeth.c
index
3c9c307
..
ae84a10
100644
(file)
--- a/
arch/ia64/hp/sim/simeth.c
+++ b/
arch/ia64/hp/sim/simeth.c
@@
-20,7
+20,7
@@
#include <linux/if_arp.h>
#include <linux/skbuff.h>
#include <linux/notifier.h>
#include <linux/if_arp.h>
#include <linux/skbuff.h>
#include <linux/notifier.h>
-#include <
asm
/bitops.h>
+#include <
linux
/bitops.h>
#include <asm/system.h>
#include <asm/irq.h>
#include <asm/system.h>
#include <asm/irq.h>
@@
-286,7
+286,7
@@
static __inline__ int dev_is_ethdev(struct net_device *dev)
static int
simeth_device_event(struct notifier_block *this,unsigned long event, void *ptr)
{
static int
simeth_device_event(struct notifier_block *this,unsigned long event, void *ptr)
{
- struct net_device *dev =
(struct net_device *)
ptr;
+ struct net_device *dev = ptr;
struct simeth_local *local;
struct in_device *in_dev;
struct in_ifaddr **ifap = NULL;
struct simeth_local *local;
struct in_device *in_dev;
struct in_ifaddr **ifap = NULL;
@@
-382,7
+382,7
@@
frame_print(unsigned char *from, unsigned char *frame, int len)
static int
simeth_tx(struct sk_buff *skb, struct net_device *dev)
{
static int
simeth_tx(struct sk_buff *skb, struct net_device *dev)
{
- struct simeth_local *local =
(struct simeth_local *)
dev->priv;
+ struct simeth_local *local = dev->priv;
#if 0
/* ensure we have at least ETH_ZLEN bytes (min frame size) */
#if 0
/* ensure we have at least ETH_ZLEN bytes (min frame size) */
@@
-446,7
+446,7
@@
simeth_rx(struct net_device *dev)
int len;
int rcv_count = SIMETH_RECV_MAX;
int len;
int rcv_count = SIMETH_RECV_MAX;
- local =
(struct simeth_local *)
dev->priv;
+ local = dev->priv;
/*
* the loop concept has been borrowed from other drivers
* looks to me like it's a throttling thing to avoid pushing to many
/*
* the loop concept has been borrowed from other drivers
* looks to me like it's a throttling thing to avoid pushing to many
@@
-515,7
+515,7
@@
simeth_interrupt(int irq, void *dev_id, struct pt_regs * regs)
static struct net_device_stats *
simeth_get_stats(struct net_device *dev)
{
static struct net_device_stats *
simeth_get_stats(struct net_device *dev)
{
- struct simeth_local
*local = (struct simeth_local *)
dev->priv;
+ struct simeth_local
*local =
dev->priv;
return &local->stats;
}
return &local->stats;
}