Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
6fc51ced
Commit
6fc51ced
authored
Sep 29, 2002
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
http://gkernel.bkbits.net/net-drivers-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
parents
ff61d1d6
63e805c8
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
22 additions
and
20 deletions
+22
-20
drivers/atm/ambassador.c
drivers/atm/ambassador.c
+1
-1
drivers/atm/atmtcp.c
drivers/atm/atmtcp.c
+1
-1
drivers/atm/eni.c
drivers/atm/eni.c
+1
-1
drivers/atm/fore200e.c
drivers/atm/fore200e.c
+2
-1
drivers/atm/horizon.c
drivers/atm/horizon.c
+1
-1
drivers/atm/idt77252.c
drivers/atm/idt77252.c
+4
-4
drivers/atm/lanai.c
drivers/atm/lanai.c
+1
-1
drivers/atm/nicstar.c
drivers/atm/nicstar.c
+5
-5
drivers/atm/zatm.c
drivers/atm/zatm.c
+1
-1
drivers/net/tlan.c
drivers/net/tlan.c
+3
-4
drivers/net/wireless/orinoco.c
drivers/net/wireless/orinoco.c
+1
-0
drivers/net/wireless/orinoco_cs.c
drivers/net/wireless/orinoco_cs.c
+1
-0
No files found.
drivers/atm/ambassador.c
View file @
6fc51ced
...
...
@@ -516,7 +516,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
// VC layer stats
atomic_inc
(
&
atm_vcc
->
stats
->
rx
);
skb
->
stamp
=
xtime
;
do_gettimeofday
(
&
skb
->
stamp
)
;
// end of our responsability
atm_vcc
->
push
(
atm_vcc
,
skb
);
return
;
...
...
drivers/atm/atmtcp.c
View file @
6fc51ced
...
...
@@ -275,7 +275,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
result
=
-
ENOBUFS
;
goto
done
;
}
new_skb
->
stamp
=
xtime
;
do_gettimeofday
(
&
new_skb
->
stamp
)
;
memcpy
(
skb_put
(
new_skb
,
skb
->
len
),
skb
->
data
,
skb
->
len
);
out_vcc
->
push
(
out_vcc
,
new_skb
);
atomic_inc
(
&
vcc
->
stats
->
tx
);
...
...
drivers/atm/eni.c
View file @
6fc51ced
...
...
@@ -702,7 +702,7 @@ static void get_service(struct atm_dev *dev)
DPRINTK
(
"Grr, servicing VCC %ld twice
\n
"
,
vci
);
continue
;
}
ENI_VCC
(
vcc
)
->
timestamp
=
xtime
;
do_gettimeofday
(
&
ENI_VCC
(
vcc
)
->
timestamp
)
;
ENI_VCC
(
vcc
)
->
next
=
NULL
;
if
(
vcc
->
qos
.
rxtp
.
traffic_class
==
ATM_CBR
)
{
if
(
eni_dev
->
fast
)
...
...
drivers/atm/fore200e.c
View file @
6fc51ced
...
...
@@ -1134,7 +1134,8 @@ fore200e_push_rpd(struct fore200e* fore200e, struct rpd* rpd)
return
;
}
skb
->
stamp
=
vcc
->
timestamp
=
xtime
;
do_gettimeofday
(
&
vcc
->
timestamp
);
skb
->
stamp
=
vcc
->
timestamp
;
#ifdef FORE200E_52BYTE_AAL0_SDU
if
(
cell_header
)
{
...
...
drivers/atm/horizon.c
View file @
6fc51ced
...
...
@@ -1049,7 +1049,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
struct
atm_vcc
*
vcc
=
ATM_SKB
(
skb
)
->
vcc
;
// VC layer stats
atomic_inc
(
&
vcc
->
stats
->
rx
);
skb
->
stamp
=
xtime
;
do_gettimeofday
(
&
skb
->
stamp
)
;
// end of our responsability
vcc
->
push
(
vcc
,
skb
);
}
...
...
drivers/atm/idt77252.c
View file @
6fc51ced
...
...
@@ -1099,7 +1099,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
cell
,
ATM_CELL_PAYLOAD
);
ATM_SKB
(
sb
)
->
vcc
=
vcc
;
sb
->
stamp
=
xtime
;
do_gettimeofday
(
&
sb
->
stamp
)
;
vcc
->
push
(
vcc
,
sb
);
atomic_inc
(
&
vcc
->
stats
->
rx
);
...
...
@@ -1177,7 +1177,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
skb_trim
(
skb
,
len
);
ATM_SKB
(
skb
)
->
vcc
=
vcc
;
skb
->
stamp
=
xtime
;
do_gettimeofday
(
&
skb
->
stamp
)
;
vcc
->
push
(
vcc
,
skb
);
atomic_inc
(
&
vcc
->
stats
->
rx
);
...
...
@@ -1199,7 +1199,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
skb_trim
(
skb
,
len
);
ATM_SKB
(
skb
)
->
vcc
=
vcc
;
skb
->
stamp
=
xtime
;
do_gettimeofday
(
&
skb
->
stamp
)
;
vcc
->
push
(
vcc
,
skb
);
atomic_inc
(
&
vcc
->
stats
->
rx
);
...
...
@@ -1337,7 +1337,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
ATM_CELL_PAYLOAD
);
ATM_SKB
(
sb
)
->
vcc
=
vcc
;
sb
->
stamp
=
xtime
;
do_gettimeofday
(
&
sb
->
stamp
)
;
vcc
->
push
(
vcc
,
sb
);
atomic_inc
(
&
vcc
->
stats
->
rx
);
...
...
drivers/atm/lanai.c
View file @
6fc51ced
...
...
@@ -1606,7 +1606,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
}
skb_put
(
skb
,
size
);
ATM_SKB
(
skb
)
->
vcc
=
lvcc
->
rx
.
atmvcc
;
skb
->
stamp
=
xtime
;
do_gettimeofday
(
&
skb
->
stamp
)
;
vcc_rx_memcpy
(
skb
->
data
,
lvcc
,
size
);
lvcc
->
rx
.
atmvcc
->
push
(
lvcc
->
rx
.
atmvcc
,
skb
);
atomic_inc
(
&
lvcc
->
rx
.
atmvcc
->
stats
->
rx
);
...
...
drivers/atm/nicstar.c
View file @
6fc51ced
...
...
@@ -2264,7 +2264,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
memcpy
(
sb
->
tail
,
cell
,
ATM_CELL_PAYLOAD
);
skb_put
(
sb
,
ATM_CELL_PAYLOAD
);
ATM_SKB
(
sb
)
->
vcc
=
vcc
;
sb
->
stamp
=
xtime
;
do_gettimeofday
(
&
sb
->
stamp
)
;
vcc
->
push
(
vcc
,
sb
);
atomic_inc
(
&
vcc
->
stats
->
rx
);
cell
+=
ATM_CELL_PAYLOAD
;
...
...
@@ -2395,7 +2395,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
skb
->
destructor
=
ns_sb_destructor
;
#endif
/* NS_USE_DESTRUCTORS */
ATM_SKB
(
skb
)
->
vcc
=
vcc
;
skb
->
stamp
=
xtime
;
do_gettimeofday
(
&
skb
->
stamp
)
;
vcc
->
push
(
vcc
,
skb
);
atomic_inc
(
&
vcc
->
stats
->
rx
);
}
...
...
@@ -2422,7 +2422,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
sb
->
destructor
=
ns_sb_destructor
;
#endif
/* NS_USE_DESTRUCTORS */
ATM_SKB
(
sb
)
->
vcc
=
vcc
;
sb
->
stamp
=
xtime
;
do_gettimeofday
(
&
sb
->
stamp
)
;
vcc
->
push
(
vcc
,
sb
);
atomic_inc
(
&
vcc
->
stats
->
rx
);
}
...
...
@@ -2448,7 +2448,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
memcpy
(
skb
->
data
,
sb
->
data
,
NS_SMBUFSIZE
);
skb_put
(
skb
,
len
-
NS_SMBUFSIZE
);
ATM_SKB
(
skb
)
->
vcc
=
vcc
;
skb
->
stamp
=
xtime
;
do_gettimeofday
(
&
skb
->
stamp
)
;
vcc
->
push
(
vcc
,
skb
);
atomic_inc
(
&
vcc
->
stats
->
rx
);
}
...
...
@@ -2554,7 +2554,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
#ifdef NS_USE_DESTRUCTORS
hb
->
destructor
=
ns_hb_destructor
;
#endif
/* NS_USE_DESTRUCTORS */
hb
->
stamp
=
xtime
;
do_gettimeofday
(
&
hb
->
stamp
)
;
vcc
->
push
(
vcc
,
hb
);
atomic_inc
(
&
vcc
->
stats
->
rx
);
}
...
...
drivers/atm/zatm.c
View file @
6fc51ced
...
...
@@ -584,7 +584,7 @@ EVENT("error code 0x%x/0x%x\n",(here[3] & uPD98401_AAL5_ES) >>
#ifdef CONFIG_ATM_ZATM_EXACT_TS
skb
->
stamp
=
exact_time
(
zatm_dev
,
here
[
1
]);
#else
skb
->
stamp
=
xtime
;
do_gettimeofday
(
&
skb
->
stamp
)
;
#endif
#if 0
printk("[-3..0] 0x%08lx 0x%08lx 0x%08lx 0x%08lx\n",((unsigned *) skb->data)[-3],
...
...
drivers/net/tlan.c
View file @
6fc51ced
...
...
@@ -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
);
TLan_ReadAndClearStats
(
dev
,
TLAN_RECORD
);
outl
(
TLAN_HC_AD_RST
,
dev
->
base_addr
+
TLAN_HOST_CMD
);
queue_task
(
&
priv
->
tlan_tqueue
,
&
tq_immediate
);
mark_bh
(
IMMEDIATE_BH
);
schedule_task
(
&
priv
->
tlan_tqueue
);
netif_wake_queue
(
dev
);
ack
=
0
;
}
else
{
...
...
drivers/net/wireless/orinoco.c
View file @
6fc51ced
...
...
@@ -372,6 +372,7 @@
#include <linux/if_arp.h>
#include <linux/etherdevice.h>
#include <linux/wireless.h>
#include <linux/tqueue.h>
#include "hermes.h"
#include "hermes_rid.h"
...
...
drivers/net/wireless/orinoco_cs.c
View file @
6fc51ced
...
...
@@ -32,6 +32,7 @@
#include <linux/if_arp.h>
#include <linux/etherdevice.h>
#include <linux/wireless.h>
#include <linux/tqueue.h>
#include <pcmcia/version.h>
#include <pcmcia/cs_types.h>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment