Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 262775
b: refs/heads/master
c: 8028837
h: refs/heads/master
i:
  262773: ab98b23
  262771: f7f5218
  262767: 1795e2e
v: v3
  • Loading branch information
Richard Cochran authored and David S. Miller committed Aug 8, 2011
1 parent 339ddea commit 477e366
Show file tree
Hide file tree
Showing 2 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: cbc056602c7c63620c86904c431ff6b61e029dcc
refs/heads/master: 8028837d71ba9904b17281b40f94b93e947fbe38
5 changes: 2 additions & 3 deletions trunk/drivers/net/phy/dp83640.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@
#define PAGESEL 0x13
#define LAYER4 0x02
#define LAYER2 0x01
#define MAX_RXTS 4
#define MAX_TXTS 4
#define MAX_RXTS 64
#define N_EXT_TS 1
#define PSF_PTPVER 2
#define PSF_EVNT 0x4000
Expand Down Expand Up @@ -218,7 +217,7 @@ static void phy2rxts(struct phy_rxts *p, struct rxts *rxts)
rxts->seqid = p->seqid;
rxts->msgtype = (p->msgtype >> 12) & 0xf;
rxts->hash = p->msgtype & 0x0fff;
rxts->tmo = jiffies + HZ;
rxts->tmo = jiffies + 2;
}

static u64 phy2txts(struct phy_txts *p)
Expand Down

0 comments on commit 477e366

Please sign in to comment.