Merge tag 'char-misc-5.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux.git] / net / hsr / hsr_device.c

diff --git a/net/hsr/hsr_device.c b/net/hsr/hsr_device.c
index f509b495451a9f434a2bfee206c0adce9937a439..b01e1bae4ddc079d60ac319991fd3867216bff9a 100644 (file)
--- a/net/hsr/hsr_device.c
+++ b/net/hsr/hsr_device.c
@@ -227,8 +227,13 @@ static int hsr_dev_xmit(struct sk_buff *skb, struct net_device *dev)
        struct hsr_port *master;
 
        master = hsr_port_get_hsr(hsr, HSR_PT_MASTER);
-       skb->dev = master->dev;
-       hsr_forward_skb(skb, master);
+       if (master) {
+               skb->dev = master->dev;
+               hsr_forward_skb(skb, master);
+       } else {
+               atomic_long_inc(&dev->tx_dropped);
+               dev_kfree_skb_any(skb);
+       }
        return NETDEV_TX_OK;
 }