projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.infradead.org/hdrcleanup-2.6
[firefly-linux-kernel-4.4.55.git]
/
net
/
x25
/
x25_in.c
diff --git
a/net/x25/x25_in.c
b/net/x25/x25_in.c
index 26146874b839eedb667327b67ed85c624834409c..eed50e10f09be6f93d1f3cce4febfba0400714c0 100644
(file)
--- 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.
*/