Skip to content

Commit ee89bab

Browse files
Amerigo Wangdavem330
authored andcommitted
net: move and rename netif_notify_peers()
I believe net/core/dev.c is a better place for netif_notify_peers(), because other net event notify functions also stay in this file. And rename it to netdev_notify_peers(). Cc: David S. Miller <[email protected]> Cc: Ian Campbell <[email protected]> Signed-off-by: Cong Wang <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 0f48917 commit ee89bab

File tree

6 files changed

+22
-23
lines changed

6 files changed

+22
-23
lines changed

drivers/net/hyperv/netvsc_drv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ static void netvsc_send_garp(struct work_struct *w)
400400
ndev_ctx = container_of(w, struct net_device_context, dwork.work);
401401
net_device = hv_get_drvdata(ndev_ctx->device_ctx);
402402
net = net_device->ndev;
403-
netif_notify_peers(net);
403+
netdev_notify_peers(net);
404404
}
405405

406406

drivers/net/virtio_net.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -993,7 +993,7 @@ static void virtnet_config_changed_work(struct work_struct *work)
993993
goto done;
994994

995995
if (v & VIRTIO_NET_S_ANNOUNCE) {
996-
netif_notify_peers(vi->dev);
996+
netdev_notify_peers(vi->dev);
997997
virtnet_ack_link_announce(vi);
998998
}
999999

drivers/net/xen-netfront.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1731,7 +1731,7 @@ static void netback_changed(struct xenbus_device *dev,
17311731
break;
17321732

17331733
case XenbusStateConnected:
1734-
netif_notify_peers(netdev);
1734+
netdev_notify_peers(netdev);
17351735
break;
17361736

17371737
case XenbusStateClosing:

include/linux/netdevice.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2246,8 +2246,6 @@ extern void netif_carrier_on(struct net_device *dev);
22462246

22472247
extern void netif_carrier_off(struct net_device *dev);
22482248

2249-
extern void netif_notify_peers(struct net_device *dev);
2250-
22512249
/**
22522250
* netif_dormant_on - mark device as dormant.
22532251
* @dev: network device
@@ -2596,6 +2594,7 @@ extern void __dev_set_rx_mode(struct net_device *dev);
25962594
extern int dev_set_promiscuity(struct net_device *dev, int inc);
25972595
extern int dev_set_allmulti(struct net_device *dev, int inc);
25982596
extern void netdev_state_change(struct net_device *dev);
2597+
extern void netdev_notify_peers(struct net_device *dev);
25992598
extern int netdev_bonding_change(struct net_device *dev,
26002599
unsigned long event);
26012600
extern void netdev_features_change(struct net_device *dev);

net/core/dev.c

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1106,6 +1106,24 @@ void netdev_state_change(struct net_device *dev)
11061106
}
11071107
EXPORT_SYMBOL(netdev_state_change);
11081108

1109+
/**
1110+
* netdev_notify_peers - notify network peers about existence of @dev
1111+
* @dev: network device
1112+
*
1113+
* Generate traffic such that interested network peers are aware of
1114+
* @dev, such as by generating a gratuitous ARP. This may be used when
1115+
* a device wants to inform the rest of the network about some sort of
1116+
* reconfiguration such as a failover event or virtual machine
1117+
* migration.
1118+
*/
1119+
void netdev_notify_peers(struct net_device *dev)
1120+
{
1121+
rtnl_lock();
1122+
call_netdevice_notifiers(NETDEV_NOTIFY_PEERS, dev);
1123+
rtnl_unlock();
1124+
}
1125+
EXPORT_SYMBOL(netdev_notify_peers);
1126+
11091127
int netdev_bonding_change(struct net_device *dev, unsigned long event)
11101128
{
11111129
return call_netdevice_notifiers(event, dev);

net/sched/sch_generic.c

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -324,24 +324,6 @@ void netif_carrier_off(struct net_device *dev)
324324
}
325325
EXPORT_SYMBOL(netif_carrier_off);
326326

327-
/**
328-
* netif_notify_peers - notify network peers about existence of @dev
329-
* @dev: network device
330-
*
331-
* Generate traffic such that interested network peers are aware of
332-
* @dev, such as by generating a gratuitous ARP. This may be used when
333-
* a device wants to inform the rest of the network about some sort of
334-
* reconfiguration such as a failover event or virtual machine
335-
* migration.
336-
*/
337-
void netif_notify_peers(struct net_device *dev)
338-
{
339-
rtnl_lock();
340-
call_netdevice_notifiers(NETDEV_NOTIFY_PEERS, dev);
341-
rtnl_unlock();
342-
}
343-
EXPORT_SYMBOL(netif_notify_peers);
344-
345327
/* "NOOP" scheduler: the best scheduler, recommended for all interfaces
346328
under all circumstances. It is difficult to invent anything faster or
347329
cheaper.

0 commit comments

Comments
 (0)