Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 53287
b: refs/heads/master
c: 3f5d987
h: refs/heads/master
i:
  53285: 7d8ff22
  53283: dbda454
  53279: 3391d25
v: v3
  • Loading branch information
Geert Uytterhoeven authored and Linus Torvalds committed May 5, 2007
1 parent 48411d4 commit 31abdd2
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bff832cda7bd1a861fd43813c3037119e50e7d93
refs/heads/master: 3f5d987e62412ce6540b97b622b03ca9c1677eee
4 changes: 1 addition & 3 deletions trunk/drivers/net/a2065.c
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,6 @@ static int lance_start_xmit (struct sk_buff *skb, struct net_device *dev)
volatile struct lance_init_block *ib = lp->init_block;
int entry, skblen, len;
int status = 0;
static int outs;
unsigned long flags;

skblen = skb->len;
Expand Down Expand Up @@ -607,8 +606,7 @@ static int lance_start_xmit (struct sk_buff *skb, struct net_device *dev)
/* Now, give the packet to the lance */
ib->btx_ring [entry].tmd1_bits = (LE_T1_POK|LE_T1_OWN);
lp->tx_new = (lp->tx_new+1) & lp->tx_ring_mod_mask;

outs++;
lp->stats.tx_bytes += skblen;

if (TX_BUFFS_AVAIL <= 0)
netif_stop_queue(dev);
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/net/ariadne.c
Original file line number Diff line number Diff line change
Expand Up @@ -677,6 +677,7 @@ static int ariadne_start_xmit(struct sk_buff *skb, struct net_device *dev)
priv->cur_tx -= TX_RING_SIZE;
priv->dirty_tx -= TX_RING_SIZE;
}
priv->stats.tx_bytes += len;

/* Trigger an immediate send poll. */
lance->RAP = CSR0; /* PCnet-ISA Controller Status */
Expand Down

0 comments on commit 31abdd2

Please sign in to comment.