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
mlx4_core: Increase command timeout for INIT_HCA to 10 seconds
[safe/jmp/linux-2.6]
/
drivers
/
net
/
sun3_82586.c
diff --git
a/drivers/net/sun3_82586.c
b/drivers/net/sun3_82586.c
index
a3220a9
..
9b2a7f7
100644
(file)
--- a/
drivers/net/sun3_82586.c
+++ b/
drivers/net/sun3_82586.c
@@
-28,8
+28,6
@@
static int automatic_resume = 0; /* experimental .. better should be zero */
static int rfdadd = 0; /* rfdadd=1 may be better for 8K MEM cards */
static int fifo=0x8; /* don't change */
static int rfdadd = 0; /* rfdadd=1 may be better for 8K MEM cards */
static int fifo=0x8; /* don't change */
-/* #define REALLY_SLOW_IO */
-
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/string.h>
@@
-313,7
+311,6
@@
struct net_device * __init sun3_82586_probe(int unit)
sprintf(dev->name, "eth%d", unit);
netdev_boot_setup_check(dev);
}
sprintf(dev->name, "eth%d", unit);
netdev_boot_setup_check(dev);
}
- SET_MODULE_OWNER(dev);
dev->irq = IE_IRQ;
dev->base_addr = ioaddr;
dev->irq = IE_IRQ;
dev->base_addr = ioaddr;
@@
-777,10
+774,9
@@
static void sun3_82586_rcv_int(struct net_device *dev)
skb = (struct sk_buff *) dev_alloc_skb(totlen+2);
if(skb != NULL)
{
skb = (struct sk_buff *) dev_alloc_skb(totlen+2);
if(skb != NULL)
{
- skb->dev = dev;
skb_reserve(skb,2);
skb_put(skb,totlen);
skb_reserve(skb,2);
skb_put(skb,totlen);
-
eth_copy_and_sum(skb,(char *) p->base+swab32((unsigned long) rbd->buffer),totlen,0
);
+
skb_copy_to_linear_data(skb,(char *) p->base+swab32((unsigned long) rbd->buffer),totlen
);
skb->protocol=eth_type_trans(skb,dev);
netif_rx(skb);
p->stats.rx_packets++;
skb->protocol=eth_type_trans(skb,dev);
netif_rx(skb);
p->stats.rx_packets++;
@@
-1026,10
+1022,11
@@
static int sun3_82586_send_packet(struct sk_buff *skb, struct net_device *dev)
{
len = skb->len;
if (len < ETH_ZLEN) {
{
len = skb->len;
if (len < ETH_ZLEN) {
- memset((char *)p->xmit_cbuffs[p->xmit_count], 0, ETH_ZLEN);
+ memset((void *)p->xmit_cbuffs[p->xmit_count], 0,
+ ETH_ZLEN);
len = ETH_ZLEN;
}
len = ETH_ZLEN;
}
-
memcpy((char *)p->xmit_cbuffs[p->xmit_count],(char *)(skb->data),
skb->len);
+
skb_copy_from_linear_data(skb, (void *)p->xmit_cbuffs[p->xmit_count],
skb->len);
#if (NUM_XMIT_BUFFS == 1)
# ifdef NO_NOPCOMMANDS
#if (NUM_XMIT_BUFFS == 1)
# ifdef NO_NOPCOMMANDS