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

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

Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next

parents ecbbec2e 8acbcddb

drivers/net/wireless/mac80211_hwsim.c

+1 −1
Original line number Diff line number Diff line
@@ -2223,7 +2223,7 @@ static int __init init_mac80211_hwsim(void) 
				IEEE80211_VHT_CAP_RXSTBC_2 |

				IEEE80211_VHT_CAP_RXSTBC_3 |

				IEEE80211_VHT_CAP_RXSTBC_4 |

				IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT;

				IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK;

			sband->vht_cap.vht_mcs.rx_mcs_map =

				cpu_to_le16(IEEE80211_VHT_MCS_SUPPORT_0_8 << 0 |

					    IEEE80211_VHT_MCS_SUPPORT_0_8 << 2 |

drivers/net/wireless/rt2x00/rt2800lib.c

+2 −1
Original line number Diff line number Diff line
@@ -5090,7 +5090,8 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev) 
	    IEEE80211_HW_SUPPORTS_PS |

	    IEEE80211_HW_PS_NULLFUNC_STACK |

	    IEEE80211_HW_AMPDU_AGGREGATION |

	    IEEE80211_HW_REPORTS_TX_ACK_STATUS;

	    IEEE80211_HW_REPORTS_TX_ACK_STATUS |

	    IEEE80211_HW_TEARDOWN_AGGR_ON_BAR_FAIL;



	/*

	 * Don't set IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING for USB devices

drivers/net/wireless/rt2x00/rt2x00dev.c

+3 −4
Original line number Diff line number Diff line
@@ -392,10 +392,9 @@ void rt2x00lib_txdone(struct queue_entry *entry, 
		tx_info->flags |= IEEE80211_TX_STAT_AMPDU;

		tx_info->status.ampdu_len = 1;

		tx_info->status.ampdu_ack_len = success ? 1 : 0;

		/*

		 * TODO: Need to tear down BA session here

		 * if not successful.

		 */



		if (!success)

			tx_info->flags |= IEEE80211_TX_STAT_AMPDU_NO_BACK;

	}



	if (rate_flags & IEEE80211_TX_RC_USE_RTS_CTS) {

include/linux/ieee80211.h

+28 −26
Original line number Diff line number Diff line
@@ -1272,7 +1272,9 @@ struct ieee80211_vht_operation { 
#define IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE			0x00100000

#define IEEE80211_VHT_CAP_VHT_TXOP_PS				0x00200000

#define IEEE80211_VHT_CAP_HTC_VHT				0x00400000

#define IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT          0x00800000

#define IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT	23

#define IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK	\

		(7 << IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT)

#define IEEE80211_VHT_CAP_VHT_LINK_ADAPTATION_VHT_UNSOL_MFB	0x08000000

#define IEEE80211_VHT_CAP_VHT_LINK_ADAPTATION_VHT_MRQ_MFB	0x0c000000

#define IEEE80211_VHT_CAP_RX_ANTENNA_PATTERN			0x10000000

include/net/mac80211.h

+5 −0
Original line number Diff line number Diff line
@@ -1369,6 +1369,10 @@ struct ieee80211_tx_control { 
 * @IEEE80211_HW_P2P_DEV_ADDR_FOR_INTF: Use the P2P Device address for any

 *	P2P Interface. This will be honoured even if more than one interface

 *	is supported.

 *

 * @IEEE80211_HW_TEARDOWN_AGGR_ON_BAR_FAIL: On this hardware TX BA session

 *	should be tear down once BAR frame will not be acked.

 *

 */

enum ieee80211_hw_flags {

	IEEE80211_HW_HAS_RATE_CONTROL			= 1<<0,
@@ -1397,6 +1401,7 @@ enum ieee80211_hw_flags { 
	IEEE80211_HW_TX_AMPDU_SETUP_IN_HW		= 1<<23,

	IEEE80211_HW_SCAN_WHILE_IDLE			= 1<<24,

	IEEE80211_HW_P2P_DEV_ADDR_FOR_INTF		= 1<<25,

	IEEE80211_HW_TEARDOWN_AGGR_ON_BAR_FAIL		= 1<<26,

};



/**