Commit f43aa410 authored by Alan Cox's avatar Alan Cox Committed by David S. Miller

[AX25]: Revert to 2.6.9 behavior.

I suspect given that someone made the change for a reason that there
should probably be a sysctl to switch between AX.25 (as 2.6.9) and "kind
of routed AX.25-ish" (as 2.6.10).
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f07143f5
...@@ -207,8 +207,16 @@ ax25_cb *ax25_find_cb(ax25_address *src_addr, ax25_address *dest_addr, ...@@ -207,8 +207,16 @@ ax25_cb *ax25_find_cb(ax25_address *src_addr, ax25_address *dest_addr,
continue; continue;
if (s->ax25_dev == NULL) if (s->ax25_dev == NULL)
continue; continue;
if (ax25cmp(&s->source_addr, src_addr) == 0 && if (ax25cmp(&s->source_addr, src_addr) == 0 && ax25cmp(&s->dest_addr, dest_addr) == 0 && s->ax25_dev->dev == dev) {
ax25cmp(&s->dest_addr, dest_addr) == 0) { if (digi != NULL && digi->ndigi != 0) {
if (s->digipeat == NULL)
continue;
if (ax25digicmp(s->digipeat, digi) != 0)
continue;
} else {
if (s->digipeat != NULL && s->digipeat->ndigi != 0)
continue;
}
ax25_cb_hold(s); ax25_cb_hold(s);
spin_unlock_bh(&ax25_list_lock); spin_unlock_bh(&ax25_list_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment