]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
net/hsr: Remove left-over never-true conditional code.
authorArvid Brodin <arvid.brodin@alten.se>
Fri, 11 Jul 2014 16:21:12 +0000 (18:21 +0200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 11 Jul 2014 22:04:40 +0000 (15:04 -0700)
MacAddressB is an array (unsigned char MacAddressB[ETH_ALEN]) and is allocated
as a part of *node_dst (which is a struct hsr_node). So the condition is always
false.

Detected by Dan Carpenter.

Signed-off-by: Arvid Brodin <arvid.brodin@alten.se>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/hsr/hsr_framereg.c

index c709c13842cb3d4c0e8e95c0019cd1769193f27c..bace124d14ef570375b96fbde362b2f6f059f630 100644 (file)
@@ -290,10 +290,6 @@ void hsr_addr_subst_dest(struct hsr_node *node_src, struct sk_buff *skb,
        }
        if (port->type != node_dst->AddrB_port)
                return;
-       if (!node_dst->MacAddressB) {
-               WARN_ONCE(1, "%s: No MacAddressB\n", __func__);
-               return;
-       }
 
        ether_addr_copy(eth_hdr(skb)->h_dest, node_dst->MacAddressB);
 }