git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 2.0 rc7
[linux-2.6.git]
/
net
/
x25
/
x25_in.c
diff --git
a/net/x25/x25_in.c
b/net/x25/x25_in.c
index
7b7697c
..
b0197c7
100644
(file)
--- a/
net/x25/x25_in.c
+++ b/
net/x25/x25_in.c
@@
-34,7
+34,7
@@
static int x25_queue_rx_frame(struct sock *sk, struct sk_buff *skb, int more)
{
struct sk_buff *skbo, *skbn = skb;
static int x25_queue_rx_frame(struct sock *sk, struct sk_buff *skb, int more)
{
struct sk_buff *skbo, *skbn = skb;
- struct x25_
opt
*x25 = x25_sk(sk);
+ struct x25_
sock
*x25 = x25_sk(sk);
if (more) {
x25->fraglen += skb->len;
if (more) {
x25->fraglen += skb->len;
@@
-89,7
+89,7
@@
static int x25_state1_machine(struct sock *sk, struct sk_buff *skb, int frametyp
switch (frametype) {
case X25_CALL_ACCEPTED: {
switch (frametype) {
case X25_CALL_ACCEPTED: {
- struct x25_
opt
*x25 = x25_sk(sk);
+ struct x25_
sock
*x25 = x25_sk(sk);
x25_stop_timer(sk);
x25->condition = 0x00;
x25_stop_timer(sk);
x25->condition = 0x00;
@@
-165,7
+165,7
@@
static int x25_state3_machine(struct sock *sk, struct sk_buff *skb, int frametyp
{
int queued = 0;
int modulus;
{
int queued = 0;
int modulus;
- struct x25_
opt
*x25 = x25_sk(sk);
+ struct x25_
sock
*x25 = x25_sk(sk);
modulus = (x25->neighbour->extended) ? X25_EMODULUS : X25_SMODULUS;
modulus = (x25->neighbour->extended) ? X25_EMODULUS : X25_SMODULUS;
@@
-295,7
+295,7
@@
static int x25_state4_machine(struct sock *sk, struct sk_buff *skb, int frametyp
case X25_RESET_REQUEST:
x25_write_internal(sk, X25_RESET_CONFIRMATION);
case X25_RESET_CONFIRMATION: {
case X25_RESET_REQUEST:
x25_write_internal(sk, X25_RESET_CONFIRMATION);
case X25_RESET_CONFIRMATION: {
- struct x25_
opt
*x25 = x25_sk(sk);
+ struct x25_
sock
*x25 = x25_sk(sk);
x25_stop_timer(sk);
x25->condition = 0x00;
x25_stop_timer(sk);
x25->condition = 0x00;
@@
-322,7
+322,7
@@
static int x25_state4_machine(struct sock *sk, struct sk_buff *skb, int frametyp
/* Higher level upcall for a LAPB frame */
int x25_process_rx_frame(struct sock *sk, struct sk_buff *skb)
{
/* Higher level upcall for a LAPB frame */
int x25_process_rx_frame(struct sock *sk, struct sk_buff *skb)
{
- struct x25_
opt
*x25 = x25_sk(sk);
+ struct x25_
sock
*x25 = x25_sk(sk);
int queued = 0, frametype, ns, nr, q, d, m;
if (x25->state == X25_STATE_0)
int queued = 0, frametype, ns, nr, q, d, m;
if (x25->state == X25_STATE_0)