diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-13 20:55:15 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-13 20:55:15 +0000 |
| commit | 1471f525455788c20b130690e0f104df451aeb43 (patch) | |
| tree | 3778beba56558beb9a9548ea5b467e9c44ea966f /net/decnet/dn_nsp_in.c | |
| parent | e80d2c5456d30ebba5b0eb8a9d33e17d815d4d83 (diff) | |
Merge with Linux 2.3.51.
Diffstat (limited to 'net/decnet/dn_nsp_in.c')
| -rw-r--r-- | net/decnet/dn_nsp_in.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/net/decnet/dn_nsp_in.c b/net/decnet/dn_nsp_in.c index 66c72b4bd..854ed0e92 100644 --- a/net/decnet/dn_nsp_in.c +++ b/net/decnet/dn_nsp_in.c @@ -70,7 +70,6 @@ #include <net/dn_nsp.h> #include <net/dn_dev.h> #include <net/dn_route.h> -#include <net/dn_raw.h> /* @@ -320,7 +319,7 @@ static void dn_nsp_disc_conf(struct sock *sk, struct sk_buff *skb) struct dn_scp *scp = &sk->protinfo.dn; unsigned short reason; - if (skb->len < 2) + if (skb->len != 2) goto out; reason = dn_ntohs(*(__u16 *)skb->data); @@ -552,10 +551,6 @@ static int dn_nsp_rx_packet(struct sk_buff *skb) if (decnet_debug_level & 2) printk(KERN_DEBUG "dn_nsp_rx: Message type 0x%02x\n", (int)cb->nsp_flags); -#ifdef CONFIG_DECNET_RAW - dn_raw_rx_nsp(skb); -#endif /* CONFIG_DECNET_RAW */ - if (skb->len < 2) goto free_out; |