Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 15694
b: refs/heads/master
c: 724bca3
h: refs/heads/master
v: v3
  • Loading branch information
shemminger@osdl.org authored and Jeff Garzik committed Sep 28, 2005
1 parent 7071a37 commit dea2cc0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 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: 5afa0a9cfb79556f45c02957e71a2ac48a5bb6a1
refs/heads/master: 724bca3ca4d2126b67dd62e64d3f97805f9672de
8 changes: 3 additions & 5 deletions trunk/drivers/net/sky2.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,8 @@
* - coalescing setting?
*
* TOTEST
* - variable ring size
* - speed setting
* - power management
* - netpoll
* - suspend/resume
*/

#include <linux/config.h>
Expand All @@ -58,7 +56,7 @@
#include "sky2.h"

#define DRV_NAME "sky2"
#define DRV_VERSION "0.5"
#define DRV_VERSION "0.6"
#define PFX DRV_NAME " "

/*
Expand Down Expand Up @@ -1159,7 +1157,7 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev)
re->idx = sky2->tx_prod;
le->ctrl |= EOP;

sky2_put_idx(sky2->hw, txqaddr[sky2->port], sky2->tx_prod,
sky2_put_idx(hw, txqaddr[sky2->port], sky2->tx_prod,
&sky2->tx_last_put, TX_RING_SIZE);

if (tx_avail(sky2) < MAX_SKB_TX_LE + 1)
Expand Down

0 comments on commit dea2cc0

Please sign in to comment.