staging: wilc1000: remove excessive blank lines (15e7681a) · Commits · 戴 / test

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

+0 −15

Original line number	Original line	Diff line number	Diff line
	@@ -84,7 +84,6 @@ static const struct wiphy_wowlan_support wowlan_support = {
	#define TCP_ACK_FILTER_LINK_SPEED_THRESH 54		#define TCP_ACK_FILTER_LINK_SPEED_THRESH 54
	#define DEFAULT_LINK_SPEED 72		#define DEFAULT_LINK_SPEED 72


	#define IS_MANAGMEMENT 0x100		#define IS_MANAGMEMENT 0x100
	#define IS_MANAGMEMENT_CALLBACK 0x080		#define IS_MANAGMEMENT_CALLBACK 0x080
	#define IS_MGMT_STATUS_SUCCES 0x040		#define IS_MGMT_STATUS_SUCCES 0x040
	@@ -163,7 +162,6 @@ static struct ieee80211_supported_band WILC_WFI_band_2ghz = {
	.n_bitrates = ARRAY_SIZE(ieee80211_bitrates),		.n_bitrates = ARRAY_SIZE(ieee80211_bitrates),
	};		};


	struct add_key_params {		struct add_key_params {
	u8 key_idx;		u8 key_idx;
	bool pairwise;		bool pairwise;
	@@ -281,7 +279,6 @@ static void remove_network_from_shadow(unsigned long arg)
	unsigned long now = jiffies;		unsigned long now = jiffies;
	int i, j;		int i, j;


	for (i = 0; i < last_scanned_cnt; i++) {		for (i = 0; i < last_scanned_cnt; i++) {
	if (time_after(now, last_scanned_shadow[i].time_scan +		if (time_after(now, last_scanned_shadow[i].time_scan +
	(unsigned long)(SCAN_RESULT_EXPIRE))) {		(unsigned long)(SCAN_RESULT_EXPIRE))) {
	@@ -526,7 +523,6 @@ static void CfgConnectResult(enum conn_event enuConnDisconnEvent,

	memcpy(priv->au8AssociatedBss, pstrConnectInfo->bssid, ETH_ALEN);		memcpy(priv->au8AssociatedBss, pstrConnectInfo->bssid, ETH_ALEN);


	for (i = 0; i < last_scanned_cnt; i++) {		for (i = 0; i < last_scanned_cnt; i++) {
	if (memcmp(last_scanned_shadow[i].bssid,		if (memcmp(last_scanned_shadow[i].bssid,
	pstrConnectInfo->bssid,		pstrConnectInfo->bssid,
	@@ -626,7 +622,6 @@ static int scan(struct wiphy wiphy, struct cfg80211_scan_request request)
	return -ENOMEM;		return -ENOMEM;
	strHiddenNetwork.n_ssids = request->n_ssids;		strHiddenNetwork.n_ssids = request->n_ssids;


	for (i = 0; i < request->n_ssids; i++) {		for (i = 0; i < request->n_ssids; i++) {
	if (request->ssids[i].ssid_len != 0) {		if (request->ssids[i].ssid_len != 0) {
	strHiddenNetwork.net_info[i].ssid = kmalloc(request->ssids[i].ssid_len, GFP_KERNEL);		strHiddenNetwork.net_info[i].ssid = kmalloc(request->ssids[i].ssid_len, GFP_KERNEL);
	@@ -927,8 +922,6 @@ static int add_key(struct wiphy wiphy, struct net_device netdev, u8 key_index,
	priv->wilc_ptk[key_index]->seq = NULL;		priv->wilc_ptk[key_index]->seq = NULL;
	}		}



	if (!pairwise) {		if (!pairwise) {
	if (params->cipher == WLAN_CIPHER_SUITE_TKIP)		if (params->cipher == WLAN_CIPHER_SUITE_TKIP)
	u8gmode = ENCRYPT_ENABLED \| WPA \| TKIP;		u8gmode = ENCRYPT_ENABLED \| WPA \| TKIP;
	@@ -968,7 +961,6 @@ static int add_key(struct wiphy wiphy, struct net_device netdev, u8 key_index,
	else		else
	u8pmode = priv->wilc_groupkey \| AES;		u8pmode = priv->wilc_groupkey \| AES;


	if (params->key_len > 16 && params->cipher == WLAN_CIPHER_SUITE_TKIP) {		if (params->key_len > 16 && params->cipher == WLAN_CIPHER_SUITE_TKIP) {
	pu8TxMic = params->key + 24;		pu8TxMic = params->key + 24;
	pu8RxMic = params->key + 16;		pu8RxMic = params->key + 16;
	@@ -1153,7 +1145,6 @@ static int get_key(struct wiphy wiphy, struct net_device netdev, u8 key_index,

	priv = wiphy_priv(wiphy);		priv = wiphy_priv(wiphy);


	if (!pairwise) {		if (!pairwise) {
	key_params.key = priv->wilc_gtk[key_index]->key;		key_params.key = priv->wilc_gtk[key_index]->key;
	key_params.cipher = priv->wilc_gtk[key_index]->cipher;		key_params.cipher = priv->wilc_gtk[key_index]->cipher;
	@@ -1298,7 +1289,6 @@ static int set_pmksa(struct wiphy wiphy, struct net_device netdev,

	vif = netdev_priv(priv->dev);		vif = netdev_priv(priv->dev);


	for (i = 0; i < priv->pmkid_list.numpmkid; i++) {		for (i = 0; i < priv->pmkid_list.numpmkid; i++) {
	if (!memcmp(pmksa->bssid, priv->pmkid_list.pmkidlist[i].bssid,		if (!memcmp(pmksa->bssid, priv->pmkid_list.pmkidlist[i].bssid,
	ETH_ALEN)) {		ETH_ALEN)) {
	@@ -1511,7 +1501,6 @@ void WILC_WFI_p2p_rx(struct net_device dev, u8 buff, u32 size)
	}		}
	}		}


	if ((buff[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_REQ \|\| buff[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_RSP) && (wilc_ie)) {		if ((buff[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_REQ \|\| buff[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_RSP) && (wilc_ie)) {
	cfg80211_rx_mgmt(priv->wdev, s32Freq, 0, buff, size - 7, 0);		cfg80211_rx_mgmt(priv->wdev, s32Freq, 0, buff, size - 7, 0);
	return;		return;
	@@ -1533,7 +1522,6 @@ static void WILC_WFI_mgmt_tx_complete(void *priv, int status)
	{		{
	struct p2p_mgmt_data *pv_data = priv;		struct p2p_mgmt_data *pv_data = priv;


	kfree(pv_data->buff);		kfree(pv_data->buff);
	kfree(pv_data);		kfree(pv_data);
	}		}
	@@ -1653,7 +1641,6 @@ static int mgmt_tx(struct wiphy *wiphy,
	memcpy(mgmt_tx->buff, buf, len);		memcpy(mgmt_tx->buff, buf, len);
	mgmt_tx->size = len;		mgmt_tx->size = len;


	if (ieee80211_is_probe_resp(mgmt->frame_control)) {		if (ieee80211_is_probe_resp(mgmt->frame_control)) {
	wilc_set_mac_chnl_num(vif, chan->hw_value);		wilc_set_mac_chnl_num(vif, chan->hw_value);
	curr_channel = chan->hw_value;		curr_channel = chan->hw_value;
	@@ -1832,7 +1819,6 @@ static int set_power_mgmt(struct wiphy wiphy, struct net_device dev,
	if (wilc_enable_ps)		if (wilc_enable_ps)
	wilc_set_power_mgmt(vif, enabled, timeout);		wilc_set_power_mgmt(vif, enabled, timeout);


	return 0;		return 0;
	}		}

	@@ -2094,7 +2080,6 @@ static struct wireless_dev add_virtual_intf(struct wiphy wiphy,
	priv = wiphy_priv(wiphy);		priv = wiphy_priv(wiphy);
	vif = netdev_priv(priv->wdev->netdev);		vif = netdev_priv(priv->wdev->netdev);


	if (type == NL80211_IFTYPE_MONITOR) {		if (type == NL80211_IFTYPE_MONITOR) {
	new_ifc = WILC_WFI_init_mon_interface(name, vif->ndev);		new_ifc = WILC_WFI_init_mon_interface(name, vif->ndev);
	if (new_ifc) {		if (new_ifc) {

Admin message