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
Kirill Smelkov
linux
Commits
de458ebd
Commit
de458ebd
authored
Feb 19, 2003
by
Chas Williams
Committed by
Sridhar Samudrala
Feb 19, 2003
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[ATM]: use sock timestamp
parent
7f754cf4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
7 deletions
+3
-7
include/linux/atmdev.h
include/linux/atmdev.h
+0
-1
net/atm/common.c
net/atm/common.c
+3
-6
No files found.
include/linux/atmdev.h
View file @
de458ebd
...
@@ -297,7 +297,6 @@ struct atm_vcc {
...
@@ -297,7 +297,6 @@ struct atm_vcc {
int
(
*
send
)(
struct
atm_vcc
*
vcc
,
struct
sk_buff
*
skb
);
int
(
*
send
)(
struct
atm_vcc
*
vcc
,
struct
sk_buff
*
skb
);
void
*
dev_data
;
/* per-device data */
void
*
dev_data
;
/* per-device data */
void
*
proto_data
;
/* per-protocol data */
void
*
proto_data
;
/* per-protocol data */
struct
timeval
timestamp
;
/* AAL timestamps */
struct
sk_buff_head
recvq
;
/* receive queue */
struct
sk_buff_head
recvq
;
/* receive queue */
struct
k_atm_aal_stats
*
stats
;
/* pointer to AAL stats group */
struct
k_atm_aal_stats
*
stats
;
/* pointer to AAL stats group */
wait_queue_head_t
sleep
;
/* if socket is busy */
wait_queue_head_t
sleep
;
/* if socket is busy */
...
...
net/atm/common.c
View file @
de458ebd
...
@@ -121,7 +121,6 @@ int atm_create(struct socket *sock,int protocol,int family)
...
@@ -121,7 +121,6 @@ int atm_create(struct socket *sock,int protocol,int family)
vcc
->
push_oam
=
NULL
;
vcc
->
push_oam
=
NULL
;
vcc
->
vpi
=
vcc
->
vci
=
0
;
/* no VCI/VPI yet */
vcc
->
vpi
=
vcc
->
vci
=
0
;
/* no VCI/VPI yet */
vcc
->
atm_options
=
vcc
->
aal_options
=
0
;
vcc
->
atm_options
=
vcc
->
aal_options
=
0
;
vcc
->
timestamp
.
tv_sec
=
vcc
->
timestamp
.
tv_usec
=
0
;
init_waitqueue_head
(
&
vcc
->
sleep
);
init_waitqueue_head
(
&
vcc
->
sleep
);
skb_queue_head_init
(
&
vcc
->
recvq
);
skb_queue_head_init
(
&
vcc
->
recvq
);
skb_queue_head_init
(
&
vcc
->
listenq
);
skb_queue_head_init
(
&
vcc
->
listenq
);
...
@@ -379,7 +378,7 @@ int atm_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *m,
...
@@ -379,7 +378,7 @@ int atm_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *m,
set_current_state
(
TASK_RUNNING
);
set_current_state
(
TASK_RUNNING
);
remove_wait_queue
(
&
vcc
->
sleep
,
&
wait
);
remove_wait_queue
(
&
vcc
->
sleep
,
&
wait
);
if
(
error
<=
0
)
return
error
;
if
(
error
<=
0
)
return
error
;
vcc
->
timestamp
=
skb
->
stamp
;
sock_recv_timestamp
(
m
,
vcc
->
sk
,
skb
)
;
eff_len
=
skb
->
len
>
size
?
size
:
skb
->
len
;
eff_len
=
skb
->
len
>
size
?
size
:
skb
->
len
;
if
(
skb
->
len
>
size
)
/* Not fit ? Report it... */
if
(
skb
->
len
>
size
)
/* Not fit ? Report it... */
m
->
msg_flags
|=
MSG_TRUNC
;
m
->
msg_flags
|=
MSG_TRUNC
;
...
@@ -611,13 +610,11 @@ int atm_ioctl(struct socket *sock,unsigned int cmd,unsigned long arg)
...
@@ -611,13 +610,11 @@ int atm_ioctl(struct socket *sock,unsigned int cmd,unsigned long arg)
kfree
(
tmp_buf
);
kfree
(
tmp_buf
);
goto
done
;
goto
done
;
case
SIOCGSTAMP
:
/* borrowed from IP */
case
SIOCGSTAMP
:
/* borrowed from IP */
if
(
!
vcc
->
time
stamp
.
tv_sec
)
{
if
(
!
vcc
->
sk
->
stamp
.
tv_sec
)
{
ret_val
=
-
ENOENT
;
ret_val
=
-
ENOENT
;
goto
done
;
goto
done
;
}
}
vcc
->
timestamp
.
tv_sec
+=
vcc
->
timestamp
.
tv_usec
/
1000000
;
ret_val
=
copy_to_user
((
void
*
)
arg
,
&
vcc
->
sk
->
stamp
,
vcc
->
timestamp
.
tv_usec
%=
1000000
;
ret_val
=
copy_to_user
((
void
*
)
arg
,
&
vcc
->
timestamp
,
sizeof
(
struct
timeval
))
?
-
EFAULT
:
0
;
sizeof
(
struct
timeval
))
?
-
EFAULT
:
0
;
goto
done
;
goto
done
;
case
ATM_SETSC
:
case
ATM_SETSC
:
...
...
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