diff options
| author | Grygorii Strashko <grygorii.strashko@ti.com> | 2017-07-28 17:30:05 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-01 15:22:55 -0700 |
| commit | a93439cce2c1d31469e8245c504dbb6d1bed8749 (patch) | |
| tree | 8606eb38d70d18f42c12285cebd08c84c2e3693d /drivers/net/ethernet | |
| parent | 0d5f54fec0a18eea5e4ac005646fd2bc2118636c (diff) | |
| download | linux-a93439cce2c1d31469e8245c504dbb6d1bed8749.tar.bz2 | |
net: ethernet: ti: cpts: fix fifo read in cpts_find_ts
Now the call chain
cpts_find_ts()
|- cpts_fifo_read(cpts, CPTS_EV_PUSH)
will stop reading CPTS FIFO if PUSH event is found. But this is not
expected and CPTS FIFI should be completely drained here. This is most
probably copy-paste error and it has no negative impact as CPTS_EV_PUSH
should not be present in FIFO without TS_PUSH request and
cpts_systim_read() and cpts_find_ts() synchronized by spin_lock.
Correct above by calling cpts_fifo_read() with -1 parameter, so it will
read all CPTS event from FIFO.
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/ti/cpts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ti/cpts.c b/drivers/net/ethernet/ti/cpts.c index 95a0076773b3..c2121d214f08 100644 --- a/drivers/net/ethernet/ti/cpts.c +++ b/drivers/net/ethernet/ti/cpts.c @@ -364,7 +364,7 @@ static u64 cpts_find_ts(struct cpts *cpts, struct sk_buff *skb, int ev_type) return 0; spin_lock_irqsave(&cpts->lock, flags); - cpts_fifo_read(cpts, CPTS_EV_PUSH); + cpts_fifo_read(cpts, -1); list_for_each_safe(this, next, &cpts->events) { event = list_entry(this, struct cpts_event, list); if (event_expired(event)) { |