linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / net / x25 / x25_subr.c

diff --git a/net/x25/x25_subr.c b/net/x25/x25_subr.c
index 8d6220a..8be9b8f 100644 (file)
--- a/net/x25/x25_subr.c
+++ b/net/x25/x25_subr.c
@@ -190,9 +190,8 @@ void x25_write_internal(struct sock *sk, int frametype)
                        dptr    = skb_put(skb, len);
                        memcpy(dptr, addresses, len);
                        len     = x25_create_facilities(facilities,
-                                       &x25->facilities,
-                                       &x25->dte_facilities,
-                                       x25->neighbour->global_facil_mask);
+                                                       &x25->facilities,
+                                            x25->neighbour->global_facil_mask);
                        dptr    = skb_put(skb, len);
                        memcpy(dptr, facilities, len);
                        dptr = skb_put(skb, x25->calluserdata.cudlength);
@@ -207,7 +206,6 @@ void x25_write_internal(struct sock *sk, int frametype)
                        *dptr++ = 0x00;         /* Address lengths */
                        len     = x25_create_facilities(facilities,
                                                        &x25->facilities,
-                                                       &x25->dte_facilities,
                                                        x25->vc_facil_mask);
                        dptr    = skb_put(skb, len);
                        memcpy(dptr, facilities, len);