diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-10 23:18:26 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-10 23:18:26 +0000 |
| commit | c7c4310f7fc1485925d800628bf50b3aeab535ef (patch) | |
| tree | b12aa4be0e8fb82aaaea97fb475e793e8a347c49 /net/decnet | |
| parent | 1ffd1d069ca4c5ffe16fea6175dab1b9bbb15820 (diff) | |
Merge with Linux 2.4.0-test3-pre8. Linus has accepted most of what
I've sent him, so we're very close to full integration of the MIPS
port into his sources.
Diffstat (limited to 'net/decnet')
| -rw-r--r-- | net/decnet/dn_route.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c index 5ce55ebb2..d97558a24 100644 --- a/net/decnet/dn_route.c +++ b/net/decnet/dn_route.c @@ -789,13 +789,14 @@ static int dn_route_input_slow(struct sk_buff *skb) if (dn_db->router && ((neigh = neigh_clone(dn_db->router)) != NULL)) goto add_entry; - if ((neigh = neigh_create(&dn_neigh_table, &cb->src, dev)) != NULL) { + neigh = neigh_create(&dn_neigh_table, &cb->src, dev); + if (!IS_ERR(neigh)) { if (dev->type == ARPHRD_ETHER) memcpy(neigh->ha, skb->mac.ethernet->h_source, ETH_ALEN); goto add_entry; } - return -ENOBUFS; + return PTR_ERR(neigh); non_local_input: |