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
USB: fix locking in idmouse
[safe/jmp/linux-2.6]
/
drivers
/
net
/
ni65.c
diff --git
a/drivers/net/ni65.c
b/drivers/net/ni65.c
index
1578f4d
..
3edc971
100644
(file)
--- a/
drivers/net/ni65.c
+++ b/
drivers/net/ni65.c
@@
-183,7
+183,7
@@
static struct card {
short addr_offset;
unsigned char *vendor_id;
char *cardname;
short addr_offset;
unsigned char *vendor_id;
char *cardname;
- long config;
+
unsigned
long config;
} cards[] = {
{
.id0 = NI65_ID0,
} cards[] = {
{
.id0 = NI65_ID0,
@@
-550,7
+550,6
@@
static int __init ni65_probe1(struct net_device *dev,int ioaddr)
}
dev->base_addr = ioaddr;
}
dev->base_addr = ioaddr;
- SET_MODULE_OWNER(dev);
dev->open = ni65_open;
dev->stop = ni65_close;
dev->hard_start_xmit = ni65_send_packet;
dev->open = ni65_open;
dev->stop = ni65_close;
dev->hard_start_xmit = ni65_send_packet;
@@
-610,7
+609,6
@@
static void *ni65_alloc_mem(struct net_device *dev,char *what,int size,int type)
printk(KERN_WARNING "%s: unable to allocate %s memory.\n",dev->name,what);
return NULL;
}
printk(KERN_WARNING "%s: unable to allocate %s memory.\n",dev->name,what);
return NULL;
}
- skb->dev = dev;
skb_reserve(skb,2+16);
skb_put(skb,R_BUF_SIZE); /* grab the whole space .. (not necessary) */
ptr = skb->data;
skb_reserve(skb,2+16);
skb_put(skb,R_BUF_SIZE); /* grab the whole space .. (not necessary) */
ptr = skb->data;
@@
-1094,11
+1092,10
@@
static void ni65_recv_intr(struct net_device *dev,int csr0)
if(skb)
{
skb_reserve(skb,2);
if(skb)
{
skb_reserve(skb,2);
- skb->dev = dev;
#ifdef RCV_VIA_SKB
if( (unsigned long) (skb->data + R_BUF_SIZE) > 0x1000000) {
skb_put(skb,len);
#ifdef RCV_VIA_SKB
if( (unsigned long) (skb->data + R_BUF_SIZE) > 0x1000000) {
skb_put(skb,len);
-
eth_copy_and_sum(skb, (unsigned char *)(p->recv_skb[p->rmdnum]->data),len,0
);
+
skb_copy_to_linear_data(skb, (unsigned char *)(p->recv_skb[p->rmdnum]->data),len
);
}
else {
struct sk_buff *skb1 = p->recv_skb[p->rmdnum];
}
else {
struct sk_buff *skb1 = p->recv_skb[p->rmdnum];
@@
-1110,7
+1107,7
@@
static void ni65_recv_intr(struct net_device *dev,int csr0)
}
#else
skb_put(skb,len);
}
#else
skb_put(skb,len);
-
eth_copy_and_sum(skb, (unsigned char *) p->recvbounce[p->rmdnum],len,0
);
+
skb_copy_to_linear_data(skb, (unsigned char *) p->recvbounce[p->rmdnum],len
);
#endif
p->stats.rx_packets++;
p->stats.rx_bytes += len;
#endif
p->stats.rx_packets++;
p->stats.rx_bytes += len;
@@
-1178,8
+1175,9
@@
static int ni65_send_packet(struct sk_buff *skb, struct net_device *dev)
if( (unsigned long) (skb->data + skb->len) > 0x1000000) {
#endif
if( (unsigned long) (skb->data + skb->len) > 0x1000000) {
#endif
- memcpy((char *) p->tmdbounce[p->tmdbouncenum] ,(char *)skb->data,
- (skb->len > T_BUF_SIZE) ? T_BUF_SIZE : skb->len);
+ skb_copy_from_linear_data(skb, p->tmdbounce[p->tmdbouncenum],
+ skb->len > T_BUF_SIZE ? T_BUF_SIZE :
+ skb->len);
if (len > skb->len)
memset((char *)p->tmdbounce[p->tmdbouncenum]+skb->len, 0, len-skb->len);
dev_kfree_skb (skb);
if (len > skb->len)
memset((char *)p->tmdbounce[p->tmdbouncenum]+skb->len, 0, len-skb->len);
dev_kfree_skb (skb);