xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net

Browse Source
This commit is contained in:
David S. Miller
2020-01-19 22:10:04 +01:00
parent 4ee9e6e027 7008ee1210
commit b3f7e3f23a
406 changed files with 3094 additions and 2611 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
net/core/devlink.c
View File

@@ -6438,7 +6438,7 @@ static bool devlink_port_type_should_warn(struct devlink_port *devlink_port)
devlink_port->attrs.flavour != DEVLINK_PORT_FLAVOUR_DSA;
}
#define DEVLINK_PORT_TYPE_WARN_TIMEOUT (HZ * 30)
#define DEVLINK_PORT_TYPE_WARN_TIMEOUT (HZ * 3600)
static void devlink_port_type_warn_schedule(struct devlink_port *devlink_port)
{
@@ -7595,7 +7595,7 @@ void devlink_region_destroy(struct devlink_region *region)
EXPORT_SYMBOL_GPL(devlink_region_destroy);
/**
* devlink_region_shapshot_id_get - get snapshot ID
* devlink_region_snapshot_id_get - get snapshot ID
*
* This callback should be called when adding a new snapshot,
* Driver should use the same id for multiple snapshots taken
@@ -7603,7 +7603,7 @@ EXPORT_SYMBOL_GPL(devlink_region_destroy);
*
* @devlink: devlink
*/
u32 devlink_region_shapshot_id_get(struct devlink *devlink)
u32 devlink_region_snapshot_id_get(struct devlink *devlink)
{
u32 id;
@@ -7613,7 +7613,7 @@ u32 devlink_region_shapshot_id_get(struct devlink *devlink)
return id;
}
EXPORT_SYMBOL_GPL(devlink_region_shapshot_id_get);
EXPORT_SYMBOL_GPL(devlink_region_snapshot_id_get);
/**
* devlink_region_snapshot_create - create a new snapshot