Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6750140d authored by Leo Kim's avatar Leo Kim Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: renames u8IfIdx of wilc_vif structure 



This patch renames u8IfIdx variable of wilc_vif structure to idx
to avoid camelcase.

Signed-off-by: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b6ba7e89

drivers/staging/wilc1000/host_interface.c

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ static int host_int_get_ipaddress(struct wilc_vif *vif, u8 *ip_addr, u8 idx); 
 */

int wilc_get_vif_idx(struct wilc_vif *vif)

{

	return vif->u8IfIdx + 1;

	return vif->idx + 1;

}



/* We need to minus 1 from idx which is from wilc device to get real index

drivers/staging/wilc1000/linux_wlan.c

+4 −4
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static int dev_state_ev_handler(struct notifier_block *this, 
		netdev_dbg(dev, "IP add=%d:%d:%d:%d\n",

			   ip_addr_buf[0], ip_addr_buf[1],

			   ip_addr_buf[2], ip_addr_buf[3]);

		wilc_setup_ipaddress(vif, ip_addr_buf, vif->u8IfIdx);

		wilc_setup_ipaddress(vif, ip_addr_buf, vif->idx);



		break;
@@ -129,7 +129,7 @@ static int dev_state_ev_handler(struct notifier_block *this, 
			   ip_addr_buf[0], ip_addr_buf[1],

			   ip_addr_buf[2], ip_addr_buf[3]);



		wilc_setup_ipaddress(vif, ip_addr_buf, vif->u8IfIdx);

		wilc_setup_ipaddress(vif, ip_addr_buf, vif->idx);



		break;
@@ -1104,7 +1104,7 @@ int wilc_mac_xmit(struct sk_buff *skb, struct net_device *ndev) 


	vif->netstats.tx_packets++;

	vif->netstats.tx_bytes += tx_data->size;

	tx_data->bssid = wilc->vif[vif->u8IfIdx]->bssid;

	tx_data->bssid = wilc->vif[vif->idx]->bssid;

	queue_count = wilc_wlan_txq_add_net_pkt(ndev, (void *)tx_data,

						tx_data->buff, tx_data->size,

						linux_wlan_tx_complete);
@@ -1360,7 +1360,7 @@ int wilc_netdev_init(struct wilc **wilc, struct device *dev, int io_type, 
		else

			strcpy(ndev->name, "p2p%d");



		vif->u8IfIdx = wl->vif_num;

		vif->idx = wl->vif_num;

		vif->wilc = *wilc;

		wl->vif[i] = vif;

		wl->vif[wl->vif_num]->ndev = ndev;

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

+1 −1
Original line number Diff line number Diff line
@@ -2197,7 +2197,7 @@ static int start_ap(struct wiphy *wiphy, struct net_device *dev, 
	if (s32Error != 0)

		PRINT_ER("Error in setting channel\n");



	wilc_wlan_set_bssid(dev, wl->vif[vif->u8IfIdx]->src_addr, AP_MODE);

	wilc_wlan_set_bssid(dev, wl->vif[vif->idx]->src_addr, AP_MODE);

	wilc_set_power_mgmt(vif, 0, 0);



	s32Error = wilc_add_beacon(vif, settings->beacon_interval,

drivers/staging/wilc1000/wilc_wfi_netdevice.h

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ typedef struct { 
} struct_frame_reg;



struct wilc_vif {

	u8 u8IfIdx;

	u8 idx;

	u8 iftype;

	int monitor_flag;

	int mac_opened;