kni: rename variable
PATCH 1/1 kni: rename variable
All global variables in kernel should be prefixed by the same to avoid any symbol conflics. Rename dflt_carrier to kni_default_carrier.
Fixes 89397a01ce4a ("kni: set default carrier state of interface")
Signed-off-by Stephen Hemminger <[email protected]>
--- kernel/linux/kni/kni_dev.h | 2 +- kernel/linux/kni/kni_misc.c | 10 +++++----- kernel/linux/kni/kni_net.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-)
kernel/linux/kni/kni_dev.h +1 -1
@@ -32,7 +32,7 @@#define MBUF_BURST_SZ 32/* Default carrier state for created KNI network interfaces */ -extern uint32_t dflt_carrier; +extern uint32_t kni_dflt_carrier;/** * A structure describing the private information for a kni device.
kernel/linux/kni/kni_misc.c +5 -5
@@ -39,7 +39,7 @@ static uint32_t multiple_kthread_on;/* Default carrier state for created KNI network interfaces */ static char *carrier; -uint32_t dflt_carrier; +uint32_t kni_dflt_carrier;#define KNI_DEV_IN_USE_BIT_NUM 0/* Bit number for device in use */
@@ -554,14 +554,14 @@ static int __initkni_parse_carrier_state (void) {if (!carrier) { - dflt_carrier =0 ; + kni_dflt_carrier =0 ;return 0 ; }if (strcmp (carrier,"off" ) ==0 ) - dflt_carrier =0 ; + kni_dflt_carrier =0 ;else if (strcmp (carrier,"on" ) ==0 ) - dflt_carrier =1 ; + kni_dflt_carrier =1 ;else return -1 ;
@@ -588,7 +588,7 @@ kni_init(void)return -EINVAL ; } -if (dflt_carrier ==0 ) +if (kni_dflt_carrier ==0 )pr_debug ("Default carrier state set to off.\n" );else pr_debug ("Default carrier state set to on.\n" );
kernel/linux/kni/kni_net.c +1 -1
@@ -158,7 +158,7 @@ kni_net_open(struct net_device *dev)struct kni_dev *kni =netdev_priv (dev);netif_start_queue (dev); -if (dflt_carrier ==1 ) +if (kni_dflt_carrier ==1 )netif_carrier_on (dev);else netif_carrier_off (dev);
Signature · 1 line
2.20.1
Quoted 7 lines · Stephen Hemminger
All global variables in kernel should be prefixed by the same to avoid any symbol conflics. Rename
dflt_carriertokni_default_carrier.Fixes 89397a01ce4a ("kni: set default carrier state of interface")Signed-off-by Stephen Hemminger <[email protected]>
Acked-by Ferruh Yigit <[email protected]>
Thomas Monjalon
Applied14/01/2020 19:43, Ferruh Yigit:
Quoted 10 lines · Stephen Hemminger
Quoted 7 lines
All global variables in kernel should be prefixed by the same to avoid any symbol conflics. Rename
dflt_carriertokni_default_carrier.Fixes 89397a01ce4a ("kni: set default carrier state of interface")Signed-off-by Stephen Hemminger <[email protected]>Acked-by Ferruh Yigit <[email protected]>
Applied, thanks