From 477e366cb3e34b1edb0a37ba4618cdbb64918e19 Mon Sep 17 00:00:00 2001 From: Richard Cochran Date: Sat, 6 Aug 2011 21:03:04 +0000 Subject: [PATCH] --- yaml --- r: 262775 b: refs/heads/master c: 8028837d71ba9904b17281b40f94b93e947fbe38 h: refs/heads/master i: 262773: ab98b23ee961507861ba847f0c389d19f6c697d7 262771: f7f5218462bb214475c7da2530de85b138f916de 262767: 1795e2e19e9642634ea5da626eb6d59fb03840a5 v: v3 --- [refs] | 2 +- trunk/drivers/net/phy/dp83640.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ae769a3e22e3..343cc84638d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cbc056602c7c63620c86904c431ff6b61e029dcc +refs/heads/master: 8028837d71ba9904b17281b40f94b93e947fbe38 diff --git a/trunk/drivers/net/phy/dp83640.c b/trunk/drivers/net/phy/dp83640.c index 2cd8dc5847b4..cb6e0b486b1e 100644 --- a/trunk/drivers/net/phy/dp83640.c +++ b/trunk/drivers/net/phy/dp83640.c @@ -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 @@ -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)