Merge tag 'v4.4.214' into 10

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / net / hsr / hsr_slave.c

diff --git a/net/hsr/hsr_slave.c b/net/hsr/hsr_slave.c
index 7d37366..7992c53 100644 (file)
--- a/net/hsr/hsr_slave.c
+++ b/net/hsr/hsr_slave.c
@@ -30,6 +30,8 @@ static rx_handler_result_t hsr_handle_frame(struct sk_buff **pskb)
 
        rcu_read_lock(); /* hsr->node_db, hsr->ports */
        port = hsr_port_get_rcu(skb->dev);
+       if (!port)
+               goto finish_pass;
 
        if (hsr_addr_is_self(port->hsr, eth_hdr(skb)->h_source)) {
                /* Directly kill frames sent by ourselves */