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

Commit 933faa43 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

parents 531efffc 6abb9cb9

Documentation/DocBook/80211.tmpl

+0 −2
Original line number Diff line number Diff line
@@ -132,9 +132,7 @@ 
!Finclude/net/cfg80211.h cfg80211_send_rx_assoc

!Finclude/net/cfg80211.h cfg80211_send_assoc_timeout

!Finclude/net/cfg80211.h cfg80211_send_deauth

!Finclude/net/cfg80211.h __cfg80211_send_deauth

!Finclude/net/cfg80211.h cfg80211_send_disassoc

!Finclude/net/cfg80211.h __cfg80211_send_disassoc

!Finclude/net/cfg80211.h cfg80211_ibss_joined

!Finclude/net/cfg80211.h cfg80211_connect_result

!Finclude/net/cfg80211.h cfg80211_roamed

drivers/net/wireless/iwlegacy/commands.h

+0 −8
Original line number Diff line number Diff line
@@ -1347,14 +1347,6 @@ struct il_rx_mpdu_res_start { 
#define TX_CMD_SEC_SHIFT	6

#define TX_CMD_SEC_KEY128	0x08



/*

 * security overhead sizes

 */

#define WEP_IV_LEN 4

#define WEP_ICV_LEN 4

#define CCMP_MIC_LEN 8

#define TKIP_ICV_LEN 4



/*

 * C_TX = 0x1c (command)

 */

drivers/net/wireless/iwlwifi/dvm/commands.h

+0 −8
Original line number Diff line number Diff line
@@ -1220,14 +1220,6 @@ struct iwl_rx_mpdu_res_start { 
#define TX_CMD_SEC_SHIFT	6

#define TX_CMD_SEC_KEY128	0x08



/*

 * security overhead sizes

 */

#define WEP_IV_LEN 4

#define WEP_ICV_LEN 4

#define CCMP_MIC_LEN 8

#define TKIP_ICV_LEN 4



/*

 * REPLY_TX = 0x1c (command)

 */

drivers/net/wireless/iwlwifi/mvm/mac80211.c

+1 −13
Original line number Diff line number Diff line
@@ -84,15 +84,6 @@ static const struct ieee80211_iface_limit iwl_mvm_limits[] = { 
		.types = BIT(NL80211_IFTYPE_STATION) |

			BIT(NL80211_IFTYPE_AP),

	},

	{

		.max = 1,

		.types = BIT(NL80211_IFTYPE_P2P_CLIENT) |

			BIT(NL80211_IFTYPE_P2P_GO),

	},

	{

		.max = 1,

		.types = BIT(NL80211_IFTYPE_P2P_DEVICE),

	},

};



static const struct ieee80211_iface_combination iwl_mvm_iface_combinations[] = {
@@ -173,10 +164,7 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) 
	hw->chanctx_data_size = sizeof(u16);



	hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |

		BIT(NL80211_IFTYPE_P2P_CLIENT) |

		BIT(NL80211_IFTYPE_AP) |

		BIT(NL80211_IFTYPE_P2P_GO) |

		BIT(NL80211_IFTYPE_P2P_DEVICE);

		BIT(NL80211_IFTYPE_AP);



	hw->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY |

			    WIPHY_FLAG_DISABLE_BEACON_HINTS |

drivers/net/wireless/iwlwifi/pcie/tx.c

+3 −3
Original line number Diff line number Diff line
@@ -224,13 +224,13 @@ static void iwl_pcie_txq_update_byte_cnt_tbl(struct iwl_trans *trans, 


	switch (sec_ctl & TX_CMD_SEC_MSK) {

	case TX_CMD_SEC_CCM:

		len += CCMP_MIC_LEN;

		len += IEEE80211_CCMP_MIC_LEN;

		break;

	case TX_CMD_SEC_TKIP:

		len += TKIP_ICV_LEN;

		len += IEEE80211_TKIP_ICV_LEN;

		break;

	case TX_CMD_SEC_WEP:

		len += WEP_IV_LEN + WEP_ICV_LEN;

		len += IEEE80211_WEP_IV_LEN + IEEE80211_WEP_ICV_LEN;

		break;

	}