iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ARCNET]: Fix return value from arcnet_send_packet().

Browse Source 
From: Pieter Dejaeghere <pieter@dejaeghere.net>

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Pieter Dejaeghere 2005-09-06 19:54:48 -07:00 committed by David S. Miller
parent 0a3f4358ac
commit c6bb15a0c4
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/net/arcnet/arcnet.c
View File

@ -597,7 +597,7 @@ static int arcnet_send_packet(struct sk_buff *skb, struct net_device *dev)
struct ArcProto *proto; struct ArcProto *proto;
int txbuf; int txbuf;
unsigned long flags; unsigned long flags;
int freeskb = 0; int freeskb, retval;
BUGMSG(D_DURING, BUGMSG(D_DURING,
"transmit requested (status=%Xh, txbufs=%d/%d, len=%d, protocol %x)\n", "transmit requested (status=%Xh, txbufs=%d/%d, len=%d, protocol %x)\n",
@ -615,7 +615,7 @@ static int arcnet_send_packet(struct sk_buff *skb, struct net_device *dev)
if (skb->len - ARC_HDR_SIZE > XMTU && !proto->continue_tx) { if (skb->len - ARC_HDR_SIZE > XMTU && !proto->continue_tx) {
BUGMSG(D_NORMAL, "fixme: packet too large: compensating badly!\n"); BUGMSG(D_NORMAL, "fixme: packet too large: compensating badly!\n");
dev_kfree_skb(skb); dev_kfree_skb(skb);
return 0; /* don't try again */ return NETDEV_TX_OK; /* don't try again */
} }
/* We're busy transmitting a packet... */ /* We're busy transmitting a packet... */
@ -623,8 +623,11 @@ static int arcnet_send_packet(struct sk_buff *skb, struct net_device *dev)
spin_lock_irqsave(&lp->lock, flags); spin_lock_irqsave(&lp->lock, flags);
AINTMASK(0); AINTMASK(0);
if(lp->next_tx == -1)
txbuf = get_arcbuf(dev); txbuf = get_arcbuf(dev);
else {
txbuf = -1;
}
if (txbuf != -1) { if (txbuf != -1) {
if (proto->prepare_tx(dev, pkt, skb->len, txbuf) && if (proto->prepare_tx(dev, pkt, skb->len, txbuf) &&
!proto->ack_tx) { !proto->ack_tx) {
@ -638,6 +641,8 @@ static int arcnet_send_packet(struct sk_buff *skb, struct net_device *dev)
lp->outgoing.skb = skb; lp->outgoing.skb = skb;
lp->outgoing.pkt = pkt; lp->outgoing.pkt = pkt;
freeskb = 0;
if (proto->continue_tx && if (proto->continue_tx &&
proto->continue_tx(dev, txbuf)) { proto->continue_tx(dev, txbuf)) {
BUGMSG(D_NORMAL, BUGMSG(D_NORMAL,
@ -645,10 +650,12 @@ static int arcnet_send_packet(struct sk_buff *skb, struct net_device *dev)
"(proto='%c')\n", proto->suffix); "(proto='%c')\n", proto->suffix);
} }
} }
retval = NETDEV_TX_OK;
dev->trans_start = jiffies;
lp->next_tx = txbuf; lp->next_tx = txbuf;
} else { } else {
freeskb = 1; retval = NETDEV_TX_BUSY;
freeskb = 0;
} }
BUGMSG(D_DEBUG, "%s: %d: %s, status: %x\n",__FILE__,__LINE__,__FUNCTION__,ASTATUS()); BUGMSG(D_DEBUG, "%s: %d: %s, status: %x\n",__FILE__,__LINE__,__FUNCTION__,ASTATUS());
@ -664,7 +671,7 @@ static int arcnet_send_packet(struct sk_buff *skb, struct net_device *dev)
if (freeskb) { if (freeskb) {
dev_kfree_skb(skb); dev_kfree_skb(skb);
} }
return 0; /* no need to try again */ return retval; /* no need to try again */
} }
@ -690,7 +697,6 @@ static int go_tx(struct net_device *dev)
/* start sending */ /* start sending */
ACOMMAND(TXcmd | (lp->cur_tx << 3)); ACOMMAND(TXcmd | (lp->cur_tx << 3));
dev->trans_start = jiffies;
lp->stats.tx_packets++; lp->stats.tx_packets++;
lp->lasttrans_dest = lp->lastload_dest; lp->lasttrans_dest = lp->lastload_dest;
lp->lastload_dest = 0; lp->lastload_dest = 0;
@ -917,6 +923,9 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id, struct pt_regs *regs)
BUGMSG(D_RECON, "Network reconfiguration detected (status=%Xh)\n", BUGMSG(D_RECON, "Network reconfiguration detected (status=%Xh)\n",
status); status);
/* MYRECON bit is at bit 7 of diagstatus */
if(diagstatus & 0x80)
BUGMSG(D_RECON,"Put out that recon myself\n");
/* is the RECON info empty or old? */ /* is the RECON info empty or old? */
if (!lp->first_recon || !lp->last_recon || if (!lp->first_recon || !lp->last_recon ||