Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 67003
b: refs/heads/master
c: f2cade1
h: refs/heads/master
i:
  67001: 5b1f74a
  66999: ab332ac
v: v3
  • Loading branch information
Mark Brown authored and David S. Miller committed Oct 10, 2007
1 parent 9ace672 commit c11df93
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 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: 9265fabf0d4c3d0a52e169d4b9149d52fd91db69
refs/heads/master: f2cade13371f3ca80c5479c284e6455c681c8a0c
4 changes: 2 additions & 2 deletions trunk/drivers/net/natsemi.c
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ static int full_duplex[MAX_UNITS];
#define TX_TIMEOUT (2*HZ)

#define NATSEMI_HW_TIMEOUT 400
#define NATSEMI_TIMER_FREQ 3*HZ
#define NATSEMI_TIMER_FREQ 5*HZ
#define NATSEMI_PG0_NREGS 64
#define NATSEMI_RFDR_NREGS 8
#define NATSEMI_PG1_NREGS 4
Expand Down Expand Up @@ -1798,7 +1798,7 @@ static void netdev_timer(unsigned long data)
struct net_device *dev = (struct net_device *)data;
struct netdev_private *np = netdev_priv(dev);
void __iomem * ioaddr = ns_ioaddr(dev);
int next_tick = 5*HZ;
int next_tick = NATSEMI_TIMER_FREQ;

if (netif_msg_timer(np)) {
/* DO NOT read the IntrStatus register,
Expand Down

0 comments on commit c11df93

Please sign in to comment.