diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 20:36:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 20:36:46 -0400 |
| commit | 826509f8110049663799bc20f2b5b6170e2f78ca (patch) | |
| tree | 9d8823cf283592625b882125b4b13988f2934cc6 /drivers/atm/horizon.c | |
| parent | d992895ba2b27cf5adf1ba0ad6d27662adc54c5e (diff) | |
| parent | c530cfb1ce1e8f230744c3f3bd86771f50725053 (diff) | |
Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
Diffstat (limited to 'drivers/atm/horizon.c')
| -rw-r--r-- | drivers/atm/horizon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c index 924a2c8988bd..0cded0468003 100644 --- a/drivers/atm/horizon.c +++ b/drivers/atm/horizon.c | |||
| @@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev, int irq) { | |||
| 1034 | struct atm_vcc * vcc = ATM_SKB(skb)->vcc; | 1034 | struct atm_vcc * vcc = ATM_SKB(skb)->vcc; |
| 1035 | // VC layer stats | 1035 | // VC layer stats |
| 1036 | atomic_inc(&vcc->stats->rx); | 1036 | atomic_inc(&vcc->stats->rx); |
| 1037 | do_gettimeofday(&skb->stamp); | 1037 | __net_timestamp(skb); |
| 1038 | // end of our responsability | 1038 | // end of our responsability |
| 1039 | vcc->push (vcc, skb); | 1039 | vcc->push (vcc, skb); |
| 1040 | } | 1040 | } |