Skip to content

L
linux
Commit b6b37487 authored by Jeff Garzik's avatar Jeff Garzik
Browse files
Options

Merge mandrakesoft.com:/home/jgarzik/repo/linus-2.5 

into mandrakesoft.com:/home/jgarzik/repo/net-drivers-2.5
parents 8871316f 5d67c0bb
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 20 deletions
drivers/atm/ambassador.c
View file @ b6b37487
...@@ -516,7 +516,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) { ...@@ -516,7 +516,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
// VC layer stats // VC layer stats
atomic_inc(&atm_vcc->stats->rx); atomic_inc(&atm_vcc->stats->rx);
skb->stamp = xtime; do_gettimeofday(&skb->stamp);
// end of our responsability // end of our responsability
atm_vcc->push (atm_vcc, skb); atm_vcc->push (atm_vcc, skb);
return; return;
......
drivers/atm/atmtcp.c
View file @ b6b37487
...@@ -275,7 +275,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb) ...@@ -275,7 +275,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
result = -ENOBUFS; result = -ENOBUFS;
goto done; goto done;
} }
new_skb->stamp = xtime; do_gettimeofday(&new_skb->stamp);
memcpy(skb_put(new_skb,skb->len),skb->data,skb->len); memcpy(skb_put(new_skb,skb->len),skb->data,skb->len);
out_vcc->push(out_vcc,new_skb); out_vcc->push(out_vcc,new_skb);
atomic_inc(&vcc->stats->tx); atomic_inc(&vcc->stats->tx);
......
drivers/atm/eni.c
View file @ b6b37487
...@@ -702,7 +702,7 @@ static void get_service(struct atm_dev *dev) ...@@ -702,7 +702,7 @@ static void get_service(struct atm_dev *dev)
DPRINTK("Grr, servicing VCC %ld twice\n",vci); DPRINTK("Grr, servicing VCC %ld twice\n",vci);
continue; continue;
} }
ENI_VCC(vcc)->timestamp = xtime; do_gettimeofday(&ENI_VCC(vcc)->timestamp);
ENI_VCC(vcc)->next = NULL; ENI_VCC(vcc)->next = NULL;
if (vcc->qos.rxtp.traffic_class == ATM_CBR) { if (vcc->qos.rxtp.traffic_class == ATM_CBR) {
if (eni_dev->fast) if (eni_dev->fast)
......
drivers/atm/fore200e.c
View file @ b6b37487
...@@ -1134,7 +1134,8 @@ fore200e_push_rpd(struct fore200e* fore200e, struct rpd* rpd) ...@@ -1134,7 +1134,8 @@ fore200e_push_rpd(struct fore200e* fore200e, struct rpd* rpd)
return; return;
} }
skb->stamp = vcc->timestamp = xtime; do_gettimeofday(&vcc->timestamp);
skb->stamp = vcc->timestamp;
#ifdef FORE200E_52BYTE_AAL0_SDU #ifdef FORE200E_52BYTE_AAL0_SDU
if (cell_header) { if (cell_header) {
......
drivers/atm/horizon.c
View file @ b6b37487
...@@ -1049,7 +1049,7 @@ static void rx_schedule (hrz_dev * dev, int irq) { ...@@ -1049,7 +1049,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
struct atm_vcc * vcc = ATM_SKB(skb)->vcc; struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
// VC layer stats // VC layer stats
atomic_inc(&vcc->stats->rx); atomic_inc(&vcc->stats->rx);
skb->stamp = xtime; do_gettimeofday(&skb->stamp);
// end of our responsability // end of our responsability
vcc->push (vcc, skb); vcc->push (vcc, skb);
} }
......
drivers/atm/idt77252.c
View file @ b6b37487
...@@ -1099,7 +1099,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe) ...@@ -1099,7 +1099,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
cell, ATM_CELL_PAYLOAD); cell, ATM_CELL_PAYLOAD);
ATM_SKB(sb)->vcc = vcc; ATM_SKB(sb)->vcc = vcc;
sb->stamp = xtime; do_gettimeofday(&sb->stamp);
vcc->push(vcc, sb); vcc->push(vcc, sb);
atomic_inc(&vcc->stats->rx); atomic_inc(&vcc->stats->rx);
...@@ -1177,7 +1177,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe) ...@@ -1177,7 +1177,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
skb_trim(skb, len); skb_trim(skb, len);
ATM_SKB(skb)->vcc = vcc; ATM_SKB(skb)->vcc = vcc;
skb->stamp = xtime; do_gettimeofday(&skb->stamp);
vcc->push(vcc, skb); vcc->push(vcc, skb);
atomic_inc(&vcc->stats->rx); atomic_inc(&vcc->stats->rx);
...@@ -1199,7 +1199,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe) ...@@ -1199,7 +1199,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
skb_trim(skb, len); skb_trim(skb, len);
ATM_SKB(skb)->vcc = vcc; ATM_SKB(skb)->vcc = vcc;
skb->stamp = xtime; do_gettimeofday(&skb->stamp);
vcc->push(vcc, skb); vcc->push(vcc, skb);
atomic_inc(&vcc->stats->rx); atomic_inc(&vcc->stats->rx);
...@@ -1337,7 +1337,7 @@ idt77252_rx_raw(struct idt77252_dev *card) ...@@ -1337,7 +1337,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
ATM_CELL_PAYLOAD); ATM_CELL_PAYLOAD);
ATM_SKB(sb)->vcc = vcc; ATM_SKB(sb)->vcc = vcc;
sb->stamp = xtime; do_gettimeofday(&sb->stamp);
vcc->push(vcc, sb); vcc->push(vcc, sb);
atomic_inc(&vcc->stats->rx); atomic_inc(&vcc->stats->rx);
......
drivers/atm/lanai.c
View file @ b6b37487
...@@ -1606,7 +1606,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr) ...@@ -1606,7 +1606,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
} }
skb_put(skb, size); skb_put(skb, size);
ATM_SKB(skb)->vcc = lvcc->rx.atmvcc; ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
skb->stamp = xtime; do_gettimeofday(&skb->stamp);
vcc_rx_memcpy(skb->data, lvcc, size); vcc_rx_memcpy(skb->data, lvcc, size);
lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb); lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
atomic_inc(&lvcc->rx.atmvcc->stats->rx); atomic_inc(&lvcc->rx.atmvcc->stats->rx);
......
drivers/atm/nicstar.c
View file @ b6b37487
...@@ -2264,7 +2264,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe) ...@@ -2264,7 +2264,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
memcpy(sb->tail, cell, ATM_CELL_PAYLOAD); memcpy(sb->tail, cell, ATM_CELL_PAYLOAD);
skb_put(sb, ATM_CELL_PAYLOAD); skb_put(sb, ATM_CELL_PAYLOAD);
ATM_SKB(sb)->vcc = vcc; ATM_SKB(sb)->vcc = vcc;
sb->stamp = xtime; do_gettimeofday(&sb->stamp);
vcc->push(vcc, sb); vcc->push(vcc, sb);
atomic_inc(&vcc->stats->rx); atomic_inc(&vcc->stats->rx);
cell += ATM_CELL_PAYLOAD; cell += ATM_CELL_PAYLOAD;
...@@ -2395,7 +2395,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe) ...@@ -2395,7 +2395,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
skb->destructor = ns_sb_destructor; skb->destructor = ns_sb_destructor;
#endif /* NS_USE_DESTRUCTORS */ #endif /* NS_USE_DESTRUCTORS */
ATM_SKB(skb)->vcc = vcc; ATM_SKB(skb)->vcc = vcc;
skb->stamp = xtime; do_gettimeofday(&skb->stamp);
vcc->push(vcc, skb); vcc->push(vcc, skb);
atomic_inc(&vcc->stats->rx); atomic_inc(&vcc->stats->rx);
} }
...@@ -2422,7 +2422,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe) ...@@ -2422,7 +2422,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
sb->destructor = ns_sb_destructor; sb->destructor = ns_sb_destructor;
#endif /* NS_USE_DESTRUCTORS */ #endif /* NS_USE_DESTRUCTORS */
ATM_SKB(sb)->vcc = vcc; ATM_SKB(sb)->vcc = vcc;
sb->stamp = xtime; do_gettimeofday(&sb->stamp);
vcc->push(vcc, sb); vcc->push(vcc, sb);
atomic_inc(&vcc->stats->rx); atomic_inc(&vcc->stats->rx);
} }
...@@ -2448,7 +2448,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe) ...@@ -2448,7 +2448,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
memcpy(skb->data, sb->data, NS_SMBUFSIZE); memcpy(skb->data, sb->data, NS_SMBUFSIZE);
skb_put(skb, len - NS_SMBUFSIZE); skb_put(skb, len - NS_SMBUFSIZE);
ATM_SKB(skb)->vcc = vcc; ATM_SKB(skb)->vcc = vcc;
skb->stamp = xtime; do_gettimeofday(&skb->stamp);
vcc->push(vcc, skb); vcc->push(vcc, skb);
atomic_inc(&vcc->stats->rx); atomic_inc(&vcc->stats->rx);
} }
...@@ -2554,7 +2554,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe) ...@@ -2554,7 +2554,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
#ifdef NS_USE_DESTRUCTORS #ifdef NS_USE_DESTRUCTORS
hb->destructor = ns_hb_destructor; hb->destructor = ns_hb_destructor;
#endif /* NS_USE_DESTRUCTORS */ #endif /* NS_USE_DESTRUCTORS */
hb->stamp = xtime; do_gettimeofday(&hb->stamp);
vcc->push(vcc, hb); vcc->push(vcc, hb);
atomic_inc(&vcc->stats->rx); atomic_inc(&vcc->stats->rx);
} }
......
drivers/atm/zatm.c
View file @ b6b37487
...@@ -584,7 +584,7 @@ EVENT("error code 0x%x/0x%x\n",(here[3] & uPD98401_AAL5_ES) >> ...@@ -584,7 +584,7 @@ EVENT("error code 0x%x/0x%x\n",(here[3] & uPD98401_AAL5_ES) >>
#ifdef CONFIG_ATM_ZATM_EXACT_TS #ifdef CONFIG_ATM_ZATM_EXACT_TS
skb->stamp = exact_time(zatm_dev,here[1]); skb->stamp = exact_time(zatm_dev,here[1]);
#else #else
skb->stamp = xtime; do_gettimeofday(&skb->stamp);
#endif #endif
#if 0 #if 0
printk("[-3..0] 0x%08lx 0x%08lx 0x%08lx 0x%08lx\n",((unsigned *) skb->data)[-3], printk("[-3..0] 0x%08lx 0x%08lx 0x%08lx 0x%08lx\n",((unsigned *) skb->data)[-3],
......
drivers/net/tlan.c
View file @ b6b37487
...@@ -1707,10 +1707,9 @@ u32 TLan_HandleStatusCheck( struct net_device *dev, u16 host_int ) ...@@ -1707,10 +1707,9 @@ u32 TLan_HandleStatusCheck( struct net_device *dev, u16 host_int )
printk( "TLAN: %s: Adaptor Error = 0x%x\n", dev->name, error ); printk( "TLAN: %s: Adaptor Error = 0x%x\n", dev->name, error );
TLan_ReadAndClearStats( dev, TLAN_RECORD ); TLan_ReadAndClearStats( dev, TLAN_RECORD );
outl( TLAN_HC_AD_RST, dev->base_addr + TLAN_HOST_CMD ); outl( TLAN_HC_AD_RST, dev->base_addr + TLAN_HOST_CMD );
queue_task(&priv->tlan_tqueue, &tq_immediate); schedule_task(&priv->tlan_tqueue);
mark_bh(IMMEDIATE_BH);
netif_wake_queue(dev); netif_wake_queue(dev);
ack = 0; ack = 0;
} else { } else {
......
drivers/net/wireless/orinoco.c
View file @ b6b37487
...@@ -372,6 +372,7 @@ ...@@ -372,6 +372,7 @@
#include <linux/if_arp.h> #include <linux/if_arp.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <linux/wireless.h> #include <linux/wireless.h>
#include <linux/tqueue.h>
#include "hermes.h" #include "hermes.h"
#include "hermes_rid.h" #include "hermes_rid.h"
......
drivers/net/wireless/orinoco_cs.c
View file @ b6b37487
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <linux/if_arp.h> #include <linux/if_arp.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <linux/wireless.h> #include <linux/wireless.h>
#include <linux/tqueue.h>
#include <pcmcia/version.h> #include <pcmcia/version.h>
#include <pcmcia/cs_types.h> #include <pcmcia/cs_types.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7