projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
[powerpc.git]
/
drivers
/
s390
/
net
/
claw.c
diff --git
a/drivers/s390/net/claw.c
b/drivers/s390/net/claw.c
index
60440db
..
3092473
100644
(file)
--- a/
drivers/s390/net/claw.c
+++ b/
drivers/s390/net/claw.c
@@
-2,9
+2,9
@@
* drivers/s390/net/claw.c
* ESCON CLAW network driver
*
* drivers/s390/net/claw.c
* ESCON CLAW network driver
*
- * $Revision: 1.3
5 $ $Date: 2005/03/24 12:25:38
$
+ * $Revision: 1.3
8 $ $Date: 2005/08/29 09:47:04
$
*
*
- * Linux fo zSeries version
+ * Linux fo
r
zSeries version
* Copyright (C) 2002,2005 IBM Corporation
* Author(s) Original code written by:
* Kazuo Iimura (iimura@jp.ibm.com)
* Copyright (C) 2002,2005 IBM Corporation
* Author(s) Original code written by:
* Kazuo Iimura (iimura@jp.ibm.com)
@@
-428,15
+428,15
@@
claw_pack_skb(struct claw_privbk *privptr)
new_skb = NULL; /* assume no dice */
pkt_cnt = 0;
CLAW_DBF_TEXT(4,trace,"PackSKBe");
new_skb = NULL; /* assume no dice */
pkt_cnt = 0;
CLAW_DBF_TEXT(4,trace,"PackSKBe");
- if (
skb_queue_len(&p_ch->collect_queue) > 0
) {
+ if (
!skb_queue_empty(&p_ch->collect_queue)
) {
/* some data */
held_skb = skb_dequeue(&p_ch->collect_queue);
/* some data */
held_skb = skb_dequeue(&p_ch->collect_queue);
- if (p_env->packing != DO_PACKED)
- return held_skb;
if (held_skb)
if (held_skb)
-
atomic_dec(&held_skb->users
);
+
dev_kfree_skb_any(held_skb
);
else
return NULL;
else
return NULL;
+ if (p_env->packing != DO_PACKED)
+ return held_skb;
/* get a new SKB we will pack at least one */
new_skb = dev_alloc_skb(p_env->write_size);
if (new_skb == NULL) {
/* get a new SKB we will pack at least one */
new_skb = dev_alloc_skb(p_env->write_size);
if (new_skb == NULL) {
@@
-455,7
+455,7
@@
claw_pack_skb(struct claw_privbk *privptr)
privptr->stats.tx_packets++;
so_far += held_skb->len;
pkt_cnt++;
privptr->stats.tx_packets++;
so_far += held_skb->len;
pkt_cnt++;
- dev_kfree_skb_
irq
(held_skb);
+ dev_kfree_skb_
any
(held_skb);
held_skb = skb_dequeue(&p_ch->collect_queue);
if (held_skb)
atomic_dec(&held_skb->users);
held_skb = skb_dequeue(&p_ch->collect_queue);
if (held_skb)
atomic_dec(&held_skb->users);
@@
-1092,7
+1092,7
@@
claw_release(struct net_device *dev)
}
}
if (privptr->pk_skb != NULL) {
}
}
if (privptr->pk_skb != NULL) {
- dev_kfree_skb(privptr->pk_skb);
+ dev_kfree_skb
_any
(privptr->pk_skb);
privptr->pk_skb = NULL;
}
if(privptr->buffs_alloc != 1) {
privptr->pk_skb = NULL;
}
if(privptr->buffs_alloc != 1) {
@@
-1254,7
+1254,7
@@
claw_write_next ( struct chbk * p_ch )
privptr = (struct claw_privbk *) dev->priv;
claw_free_wrt_buf( dev );
if ((privptr->write_free_count > 0) &&
privptr = (struct claw_privbk *) dev->priv;
claw_free_wrt_buf( dev );
if ((privptr->write_free_count > 0) &&
-
(skb_queue_len(&p_ch->collect_queue) > 0
)) {
+
!skb_queue_empty(&p_ch->collect_queue
)) {
pk_skb = claw_pack_skb(privptr);
while (pk_skb != NULL) {
rc = claw_hw_tx( pk_skb, dev,1);
pk_skb = claw_pack_skb(privptr);
while (pk_skb != NULL) {
rc = claw_hw_tx( pk_skb, dev,1);
@@
-2016,7
+2016,7
@@
claw_hw_tx(struct sk_buff *skb, struct net_device *dev, long linkid)
p_buf=(struct ccwbk*)privptr->p_end_ccw;
dumpit((char *)p_buf, sizeof(struct endccw));
#endif
p_buf=(struct ccwbk*)privptr->p_end_ccw;
dumpit((char *)p_buf, sizeof(struct endccw));
#endif
- dev_kfree_skb(skb);
+ dev_kfree_skb
_any
(skb);
if (linkid==0) {
lock=LOCK_NO;
}
if (linkid==0) {
lock=LOCK_NO;
}
@@
-4061,7
+4061,7
@@
claw_purge_skb_queue(struct sk_buff_head *q)
while ((skb = skb_dequeue(q))) {
atomic_dec(&skb->users);
while ((skb = skb_dequeue(q))) {
atomic_dec(&skb->users);
- dev_kfree_skb_
irq
(skb);
+ dev_kfree_skb_
any
(skb);
}
}
}
}
@@
-4410,7
+4410,7
@@
claw_init(void)
#else
"compiled into kernel "
#endif
#else
"compiled into kernel "
#endif
- " $Revision: 1.3
5 $ $Date: 2005/03/24 12:25:38
$ \n");
+ " $Revision: 1.3
8 $ $Date: 2005/08/29 09:47:04
$ \n");
#ifdef FUNCTRACE
#ifdef FUNCTRACE