Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts: drivers/net/ethernet/cadence/macb.c drivers/net/phy/phy.c include/linux/skbuff.h net/ipv4/tcp.c net/switchdev/switchdev.c Switchdev was a case of RTNH_H_{EXTERNAL --> OFFLOAD} renaming overlapping with net-next changes of various sorts. phy.c was a case of two changes, one adding a local variable to a function whilst the second was removing one. tcp.c overlapped a deadlock fix with the addition of new tcp_info statistic values. macb.c involved the addition of two zyncq device entries. skbuff.h involved adding back ipv4_daddr to nf_bridge_info whilst net-next changes put two other existing members of that struct into a union. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -2420,6 +2420,9 @@ void rtmsg_ifinfo(int type, struct net_device *dev, unsigned int change,
|
||||
{
|
||||
struct sk_buff *skb;
|
||||
|
||||
if (dev->reg_state != NETREG_REGISTERED)
|
||||
return;
|
||||
|
||||
skb = rtmsg_ifinfo_build_skb(type, dev, change, flags);
|
||||
if (skb)
|
||||
rtmsg_ifinfo_send(skb, dev, flags);
|
||||
|
Reference in New Issue
Block a user