From: Malcolm Priestley Date: Sat, 19 Jul 2014 11:30:12 +0000 (+0100) Subject: staging: vt6656: replace bExistSWNetAddr with exist_sw_net_addr X-Git-Tag: v3.17-rc1~123^2~432 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=35cc8f94e6e4841c6dd2e8d8fd8d49ebddd56859;p=karo-tx-linux.git staging: vt6656: replace bExistSWNetAddr with exist_sw_net_addr Always needed as u8 type. Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h index 0c18e26a38e6..9f1216df6dad 100644 --- a/drivers/staging/vt6656/device.h +++ b/drivers/staging/vt6656/device.h @@ -309,7 +309,7 @@ struct vnt_private { u8 current_net_addr[ETH_ALEN]; u8 permanent_net_addr[ETH_ALEN]; - int bExistSWNetAddr; + u8 exist_sw_net_addr; u64 qwCurrTSF; diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index 0bf207cac050..9aaa81631f80 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -125,7 +125,7 @@ static void device_set_options(struct vnt_private *priv) priv->byPacketType = priv->byBBType; priv->byAutoFBCtrl = AUTO_FB_0; priv->byPreambleType = 0; - priv->bExistSWNetAddr = false; + priv->exist_sw_net_addr = false; } /* @@ -163,7 +163,7 @@ static int device_init_registers(struct vnt_private *priv) } init_cmd->init_class = DEVICE_INIT_COLD; - init_cmd->exist_sw_net_addr = (u8) priv->bExistSWNetAddr; + init_cmd->exist_sw_net_addr = priv->exist_sw_net_addr; for (ii = 0; ii < 6; ii++) init_cmd->sw_net_addr[ii] = priv->current_net_addr[ii]; init_cmd->short_retry_limit = priv->byShortRetryLimit;