diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-22 10:56:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-22 10:56:23 -0800 |
| commit | 36177ba655c238e33400cc2837a28720b62784bd (patch) | |
| tree | c285738397f0272f1e0e973c5e6a53b2e8da74b1 /net/x25/x25_in.c | |
| parent | 2152f8536668a957ea3214735b4761e7b22ef7d8 (diff) | |
| parent | 056755f4d73d49b4adcbb8ecdaf75138cf166bd3 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[TG3]: Bump driver version and reldate.
[TG3]: Skip phy power down on some devices
[TG3]: Fix SRAM access during tg3_init_one()
[X25]: dte facilities 32 64 ioctl conversion
[X25]: allow ITU-T DTE facilities for x25
[X25]: fix kernel error message 64 bit kernel
[X25]: ioctl conversion 32 bit user to 64 bit kernel
[NET]: socket timestamp 32 bit handler for 64 bit kernel
[NET]: allow 32 bit socket ioctl in 64 bit kernel
[BLUETOOTH]: Return negative error constant
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 26146874b83..eed50e10f09 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 skb_pull(skb, x25_addr_ntoa(skb->data, &source_addr, &dest_addr)); skb_pull(skb, x25_parse_facilities(skb, &x25->facilities, - &x25->vc_facil_mask)); + &x25->dte_facilities, + &x25->vc_facil_mask)); /* * Copy any Call User Data. */ |