diff options
| author | Ingo Molnar <[email protected]> | 2025-04-16 05:03:04 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2025-04-16 05:03:58 +0000 |
| commit | 06e09002bc1d46505d6b3bd947ebaf3cec7acab8 (patch) | |
| tree | da8b8a243b23ed3e5d9d790878924d65bc463b14 /net/core/dev.c | |
| parent | x86/cpufeatures: Shorten X86_FEATURE_AMD_HETEROGENEOUS_CORES (diff) | |
| parent | Merge tag 'edac_urgent_for_v6.15_rc3' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| download | kernel-06e09002bc1d46505d6b3bd947ebaf3cec7acab8.tar.gz kernel-06e09002bc1d46505d6b3bd947ebaf3cec7acab8.zip | |
Merge branch 'linus' into x86/cpu, to resolve conflicts
Conflicts:
tools/arch/x86/include/asm/cpufeatures.h
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 0608605cfc24..75e104322ad5 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1518,15 +1518,7 @@ void netdev_features_change(struct net_device *dev) } EXPORT_SYMBOL(netdev_features_change); -/** - * netdev_state_change - device changes state - * @dev: device to cause notification - * - * Called to indicate a device has changed state. This function calls - * the notifier chains for netdev_chain and sends a NEWLINK message - * to the routing socket. - */ -void netdev_state_change(struct net_device *dev) +void netif_state_change(struct net_device *dev) { if (dev->flags & IFF_UP) { struct netdev_notifier_change_info change_info = { @@ -1538,7 +1530,6 @@ void netdev_state_change(struct net_device *dev) rtmsg_ifinfo(RTM_NEWLINK, dev, 0, GFP_KERNEL, 0, NULL); } } -EXPORT_SYMBOL(netdev_state_change); /** * __netdev_notify_peers - notify network peers about existence of @dev, |