diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /net/x25/x25_in.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'net/x25/x25_in.c')
| -rw-r--r-- | net/x25/x25_in.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/x25/x25_in.c b/net/x25/x25_in.c index 26146874b839..eed50e10f09b 100644 --- a/net/x25/x25_in.c +++ b/net/x25/x25_in.c | |||
| @@ -106,7 +106,8 @@ static int x25_state1_machine(struct sock *sk, struct sk_buff *skb, int frametyp | |||
| 106 | skb_pull(skb, x25_addr_ntoa(skb->data, &source_addr, &dest_addr)); | 106 | skb_pull(skb, x25_addr_ntoa(skb->data, &source_addr, &dest_addr)); |
| 107 | skb_pull(skb, | 107 | skb_pull(skb, |
| 108 | x25_parse_facilities(skb, &x25->facilities, | 108 | x25_parse_facilities(skb, &x25->facilities, |
| 109 | &x25->vc_facil_mask)); | 109 | &x25->dte_facilities, |
| 110 | &x25->vc_facil_mask)); | ||
| 110 | /* | 111 | /* |
| 111 | * Copy any Call User Data. | 112 | * Copy any Call User Data. |
| 112 | */ | 113 | */ |