iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: wilc1000: set bssid with mode

Browse Source 
This patch add new argument mode to wilc_wlan_set_bssid and define mode in
struct wilc_vif also. The mode is used by get_if_handler function to get proper
netdevice for each mode.
The get_if_handler is changed together. Remove invalid handle codes and
add mode condition to get netdevice for the mode.

Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Glen Lee 2016-01-25 16:35:15 +09:00 committed by Greg Kroah-Hartman
parent e32737e9da
commit ba615f1ef9
4 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/staging/wilc1000/linux_wlan.c
View File

@ -288,26 +288,19 @@ static struct net_device *get_if_handler(struct wilc *wilc, u8 *mac_header)
bssid = mac_header + 10; bssid = mac_header + 10;
bssid1 = mac_header + 4; bssid1 = mac_header + 4;
for (i = 0; i < wilc->vif_num; i++) for (i = 0; i < wilc->vif_num; i++) {
if (!memcmp(bssid1, wilc->vif[i]->bssid, ETH_ALEN) || if (wilc->vif[i]->mode == STATION_MODE)
!memcmp(bssid, wilc->vif[i]->bssid, ETH_ALEN)) if (!memcmp(bssid, wilc->vif[i]->bssid, ETH_ALEN))
return wilc->vif[i]->ndev; return wilc->vif[i]->ndev;
if (wilc->vif[i]->mode == AP_MODE)
if (!memcmp(bssid1, wilc->vif[i]->bssid, ETH_ALEN))
return wilc->vif[i]->ndev;
}
PRINT_INFO(INIT_DBG, "Invalide handle\n");
for (i = 0; i < 25; i++)
PRINT_D(INIT_DBG, "%02x ", mac_header[i]);
bssid = mac_header + 18;
bssid1 = mac_header + 12;
for (i = 0; i < wilc->vif_num; i++)
if (!memcmp(bssid1, wilc->vif[i]->bssid, ETH_ALEN) ||
!memcmp(bssid, wilc->vif[i]->bssid, ETH_ALEN))
return wilc->vif[i]->ndev;
PRINT_INFO(INIT_DBG, "\n");
return NULL; return NULL;
} }
int wilc_wlan_set_bssid(struct net_device *wilc_netdev, u8 *bssid) int wilc_wlan_set_bssid(struct net_device *wilc_netdev, u8 *bssid, u8 mode)
{ {
int i = 0; int i = 0;
int ret = -1; int ret = -1;
@ -320,6 +313,7 @@ int wilc_wlan_set_bssid(struct net_device *wilc_netdev, u8 *bssid)
for (i = 0; i < wilc->vif_num; i++) for (i = 0; i < wilc->vif_num; i++)
if (wilc->vif[i]->ndev == wilc_netdev) { if (wilc->vif[i]->ndev == wilc_netdev) {
memcpy(wilc->vif[i]->bssid, bssid, 6); memcpy(wilc->vif[i]->bssid, bssid, 6);
wilc->vif[i]->mode = mode;
ret = 0; ret = 0;
break; break;
} }

13
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
View File

@ -524,7 +524,8 @@ static void CfgConnectResult(enum conn_event enuConnDisconnEvent,
if ((u8MacStatus == MAC_DISCONNECTED) && if ((u8MacStatus == MAC_DISCONNECTED) &&
(pstrConnectInfo->u16ConnectStatus == SUCCESSFUL_STATUSCODE)) { (pstrConnectInfo->u16ConnectStatus == SUCCESSFUL_STATUSCODE)) {
u16ConnectStatus = WLAN_STATUS_UNSPECIFIED_FAILURE; u16ConnectStatus = WLAN_STATUS_UNSPECIFIED_FAILURE;
wilc_wlan_set_bssid(priv->dev, NullBssid); wilc_wlan_set_bssid(priv->dev, NullBssid,
STATION_MODE);
eth_zero_addr(wilc_connected_ssid); eth_zero_addr(wilc_connected_ssid);
if (!pstrWFIDrv->p2p_connect) if (!pstrWFIDrv->p2p_connect)
@ -577,7 +578,7 @@ static void CfgConnectResult(enum conn_event enuConnDisconnEvent,
p2p_recv_random = 0x00; p2p_recv_random = 0x00;
wilc_ie = false; wilc_ie = false;
eth_zero_addr(priv->au8AssociatedBss); eth_zero_addr(priv->au8AssociatedBss);
wilc_wlan_set_bssid(priv->dev, NullBssid); wilc_wlan_set_bssid(priv->dev, NullBssid, STATION_MODE);
eth_zero_addr(wilc_connected_ssid); eth_zero_addr(wilc_connected_ssid);
if (!pstrWFIDrv->p2p_connect) if (!pstrWFIDrv->p2p_connect)
@ -903,7 +904,7 @@ static int connect(struct wiphy *wiphy, struct net_device *dev,
if (!pstrWFIDrv->p2p_connect) if (!pstrWFIDrv->p2p_connect)
wlan_channel = pstrNetworkInfo->u8channel; wlan_channel = pstrNetworkInfo->u8channel;
wilc_wlan_set_bssid(dev, pstrNetworkInfo->au8bssid); wilc_wlan_set_bssid(dev, pstrNetworkInfo->au8bssid, STATION_MODE);
s32Error = wilc_set_join_req(vif, pstrNetworkInfo->au8bssid, sme->ssid, s32Error = wilc_set_join_req(vif, pstrNetworkInfo->au8bssid, sme->ssid,
sme->ssid_len, sme->ie, sme->ie_len, sme->ssid_len, sme->ie, sme->ie_len,
@ -937,7 +938,7 @@ static int disconnect(struct wiphy *wiphy, struct net_device *dev, u16 reason_co
pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv; pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv;
if (!pstrWFIDrv->p2p_connect) if (!pstrWFIDrv->p2p_connect)
wlan_channel = INVALID_CHANNEL; wlan_channel = INVALID_CHANNEL;
wilc_wlan_set_bssid(priv->dev, NullBssid); wilc_wlan_set_bssid(priv->dev, NullBssid, STATION_MODE);
PRINT_D(CFG80211_DBG, "Disconnecting with reason code(%d)\n", reason_code); PRINT_D(CFG80211_DBG, "Disconnecting with reason code(%d)\n", reason_code);
@ -2400,7 +2401,7 @@ static int start_ap(struct wiphy *wiphy, struct net_device *dev,
if (s32Error != 0) if (s32Error != 0)
PRINT_ER("Error in setting channel\n"); PRINT_ER("Error in setting channel\n");
wilc_wlan_set_bssid(dev, wl->vif[0]->src_addr); wilc_wlan_set_bssid(dev, wl->vif[0]->src_addr, AP_MODE);
s32Error = wilc_add_beacon(vif, settings->beacon_interval, s32Error = wilc_add_beacon(vif, settings->beacon_interval,
settings->dtim_period, beacon->head_len, settings->dtim_period, beacon->head_len,
@ -2444,7 +2445,7 @@ static int stop_ap(struct wiphy *wiphy, struct net_device *dev)
PRINT_D(HOSTAPD_DBG, "Deleting beacon\n"); PRINT_D(HOSTAPD_DBG, "Deleting beacon\n");
wilc_wlan_set_bssid(dev, NullBssid); wilc_wlan_set_bssid(dev, NullBssid, AP_MODE);
s32Error = wilc_del_beacon(vif); s32Error = wilc_del_beacon(vif);

3
drivers/staging/wilc1000/wilc_wfi_netdevice.h
View File

@ -160,6 +160,7 @@ struct wilc_vif {
u8 bssid[ETH_ALEN]; u8 bssid[ETH_ALEN];
struct host_if_drv *hif_drv; struct host_if_drv *hif_drv;
struct net_device *ndev; struct net_device *ndev;
u8 mode;
}; };
struct wilc { struct wilc {
@ -236,6 +237,6 @@ int wilc_netdev_init(struct wilc **wilc, struct device *, int io_type, int gpio,
void wilc1000_wlan_deinit(struct net_device *dev); void wilc1000_wlan_deinit(struct net_device *dev);
void WILC_WFI_mgmt_rx(struct wilc *wilc, u8 *buff, u32 size); void WILC_WFI_mgmt_rx(struct wilc *wilc, u8 *buff, u32 size);
int wilc_wlan_get_firmware(struct net_device *dev); int wilc_wlan_get_firmware(struct net_device *dev);
int wilc_wlan_set_bssid(struct net_device *wilc_netdev, u8 *bssid); int wilc_wlan_set_bssid(struct net_device *wilc_netdev, u8 *bssid, u8 mode);
#endif #endif

1
drivers/staging/wilc1000/wilc_wlan.h
View File

@ -293,7 +293,6 @@ int wilc_mac_xmit(struct sk_buff *skb, struct net_device *dev);
int wilc_mac_open(struct net_device *ndev); int wilc_mac_open(struct net_device *ndev);
int wilc_mac_close(struct net_device *ndev); int wilc_mac_close(struct net_device *ndev);
int wilc_wlan_set_bssid(struct net_device *wilc_netdev, u8 *pBSSID);
void WILC_WFI_p2p_rx(struct net_device *dev, u8 *buff, u32 size); void WILC_WFI_p2p_rx(struct net_device *dev, u8 *buff, u32 size);
void host_wakeup_notify(struct wilc *wilc); void host_wakeup_notify(struct wilc *wilc);
void host_sleep_notify(struct wilc *wilc); void host_sleep_notify(struct wilc *wilc);