Skip to content

Commit 303a848

Browse files
Stanislav Fomichevkuba-moo
authored andcommitted
net: s/__dev_set_mtu/__netif_set_mtu/
Commit cc34acd ("docs: net: document new locking reality") introduced netif_ vs dev_ function semantics: the former expects locked netdev, the latter takes care of the locking. We don't strictly follow this semantics on either side, but there are more dev_xxx handlers now that don't fit. Rename them to netif_xxx where appropriate. __netif_set_mtu is used only by bond, so move it into NETDEV_INTERNAL namespace. Signed-off-by: Stanislav Fomichev <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 0413a34 commit 303a848

File tree

3 files changed

+15
-11
lines changed

3 files changed

+15
-11
lines changed

drivers/net/bonding/bond_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2669,7 +2669,7 @@ static int __bond_release_one(struct net_device *bond_dev,
26692669

26702670
if (unregister) {
26712671
netdev_lock_ops(slave_dev);
2672-
__dev_set_mtu(slave_dev, slave->original_mtu);
2672+
__netif_set_mtu(slave_dev, slave->original_mtu);
26732673
netdev_unlock_ops(slave_dev);
26742674
} else {
26752675
dev_set_mtu(slave_dev, slave->original_mtu);

include/linux/netdevice.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4211,7 +4211,7 @@ int __dev_change_net_namespace(struct net_device *dev, struct net *net,
42114211
struct netlink_ext_ack *extack);
42124212
int dev_change_net_namespace(struct net_device *dev, struct net *net,
42134213
const char *pat);
4214-
int __dev_set_mtu(struct net_device *, int);
4214+
int __netif_set_mtu(struct net_device *dev, int new_mtu);
42154215
int netif_set_mtu(struct net_device *dev, int new_mtu);
42164216
int dev_set_mtu(struct net_device *, int);
42174217
int netif_pre_changeaddr_notify(struct net_device *dev, const char *addr,

net/core/dev.c

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9594,7 +9594,7 @@ int netif_change_flags(struct net_device *dev, unsigned int flags,
95949594
return ret;
95959595
}
95969596

9597-
int __dev_set_mtu(struct net_device *dev, int new_mtu)
9597+
int __netif_set_mtu(struct net_device *dev, int new_mtu)
95989598
{
95999599
const struct net_device_ops *ops = dev->netdev_ops;
96009600

@@ -9605,7 +9605,7 @@ int __dev_set_mtu(struct net_device *dev, int new_mtu)
96059605
WRITE_ONCE(dev->mtu, new_mtu);
96069606
return 0;
96079607
}
9608-
EXPORT_SYMBOL(__dev_set_mtu);
9608+
EXPORT_SYMBOL_NS_GPL(__netif_set_mtu, "NETDEV_INTERNAL");
96099609

96109610
int dev_validate_mtu(struct net_device *dev, int new_mtu,
96119611
struct netlink_ext_ack *extack)
@@ -9624,18 +9624,22 @@ int dev_validate_mtu(struct net_device *dev, int new_mtu,
96249624
}
96259625

96269626
/**
9627-
* netif_set_mtu_ext - Change maximum transfer unit
9628-
* @dev: device
9629-
* @new_mtu: new transfer unit
9630-
* @extack: netlink extended ack
9627+
* netif_set_mtu_ext() - Change maximum transfer unit
9628+
* @dev: device
9629+
* @new_mtu: new transfer unit
9630+
* @extack: netlink extended ack
96319631
*
9632-
* Change the maximum transfer size of the network device.
9632+
* Change the maximum transfer size of the network device.
9633+
*
9634+
* Return: 0 on success, -errno on failure.
96339635
*/
96349636
int netif_set_mtu_ext(struct net_device *dev, int new_mtu,
96359637
struct netlink_ext_ack *extack)
96369638
{
96379639
int err, orig_mtu;
96389640

9641+
netdev_ops_assert_locked(dev);
9642+
96399643
if (new_mtu == dev->mtu)
96409644
return 0;
96419645

@@ -9652,7 +9656,7 @@ int netif_set_mtu_ext(struct net_device *dev, int new_mtu,
96529656
return err;
96539657

96549658
orig_mtu = dev->mtu;
9655-
err = __dev_set_mtu(dev, new_mtu);
9659+
err = __netif_set_mtu(dev, new_mtu);
96569660

96579661
if (!err) {
96589662
err = call_netdevice_notifiers_mtu(NETDEV_CHANGEMTU, dev,
@@ -9662,7 +9666,7 @@ int netif_set_mtu_ext(struct net_device *dev, int new_mtu,
96629666
/* setting mtu back and notifying everyone again,
96639667
* so that they have a chance to revert changes.
96649668
*/
9665-
__dev_set_mtu(dev, orig_mtu);
9669+
__netif_set_mtu(dev, orig_mtu);
96669670
call_netdevice_notifiers_mtu(NETDEV_CHANGEMTU, dev,
96679671
new_mtu);
96689672
}

0 commit comments

Comments
 (0)