]> err.no Git - linux-2.6/commitdiff
[DECNET]: Fix input routing bug
authorSteven Whitehouse <swhiteho@redhat.com>
Thu, 19 Oct 2006 03:45:22 +0000 (20:45 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 19 Oct 2006 03:45:22 +0000 (20:45 -0700)
This patch fixes a silly bug that has been in the input routing code
for some time. It results in trying to send to a node directly when
the origin of the packet is via the default router.

Its been tested by Alan Kemmerer <alan.kemmerer@mittalsteel.com> who
reported the bug and its a fairly obvious fix for a typo.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Signed-off-by: Patrick Caulfield <patrick@tykepenguin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/decnet/dn_route.c

index 491429ce9394cd25ca5166eed6a8c4f8f70350bc..23489f7232d28776585f0463deda496d188d591b 100644 (file)
@@ -1275,7 +1275,6 @@ static int dn_route_input_slow(struct sk_buff *skb)
                        goto e_inval;
 
                res.type = RTN_LOCAL;
-               flags |= RTCF_DIRECTSRC;
        } else {
                __le16 src_map = fl.fld_src;
                free_res = 1;
@@ -1346,7 +1345,7 @@ static int dn_route_input_slow(struct sk_buff *skb)
                        goto make_route;
 
                /* Packet was intra-ethernet, so we know its on-link */
-               if (cb->rt_flags | DN_RT_F_IE) {
+               if (cb->rt_flags & DN_RT_F_IE) {
                        gateway = cb->src;
                        flags |= RTCF_DIRECTSRC;
                        goto make_route;