fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / net / decnet / dn_nsp_in.c

diff --git a/net/decnet/dn_nsp_in.c b/net/decnet/dn_nsp_in.c
index 86f7f3b..39a6cf7 100644 (file)
--- a/net/decnet/dn_nsp_in.c
+++ b/net/decnet/dn_nsp_in.c
@@ -360,9 +360,9 @@ static void dn_nsp_conn_conf(struct sock *sk, struct sk_buff *skb)
                        scp->max_window = decnet_no_fc_max_cwnd;
 
                if (skb->len > 0) {
-                       unsigned char dlen = *skb->data;
+                       u16 dlen = *skb->data;
                        if ((dlen <= 16) && (dlen <= skb->len)) {
-                               scp->conndata_in.opt_optl = dn_htons((__u16)dlen);
+                               scp->conndata_in.opt_optl = dn_htons(dlen);
                                memcpy(scp->conndata_in.opt_data, skb->data + 1, dlen);
                        }
                }
@@ -404,9 +404,9 @@ static void dn_nsp_disc_init(struct sock *sk, struct sk_buff *skb)
        memset(scp->discdata_in.opt_data, 0, 16);
 
        if (skb->len > 0) {
-               unsigned char dlen = *skb->data;
+               u16 dlen = *skb->data;
                if ((dlen <= 16) && (dlen <= skb->len)) {
-                       scp->discdata_in.opt_optl = dn_htons((__u16)dlen);
+                       scp->discdata_in.opt_optl = dn_htons(dlen);
                        memcpy(scp->discdata_in.opt_data, skb->data + 1, dlen);
                }
        }
@@ -586,7 +586,7 @@ static __inline__ int dn_queue_skb(struct sock *sk, struct sk_buff *skb, int sig
                goto out;
         }
 
-       err = sk_filter(sk, skb, 0);
+       err = sk_filter(sk, skb);
        if (err)
                goto out;
 
@@ -804,7 +804,7 @@ got_it:
                                goto free_out;
                }
 
-               return sk_receive_skb(sk, skb);
+               return sk_receive_skb(sk, skb, 0);
        }
 
        return dn_nsp_no_socket(skb, reason);