diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-03-08 15:53:47 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-03-08 15:53:47 -0500 |
| commit | cd309ab39351cfd5d0a310bd3d0eb76d0b31f66d (patch) | |
| tree | 0a9bccc45ca1a02597ab35caca8c2fe92889f0b2 /drivers/net/wireless/iwlwifi/mvm/sta.h | |
| parent | 3d5c203272b25c4391397247cdb0059a04fccddf (diff) | |
| parent | 25b9ea5c797b5d78f8ceced9ad9c7a7daf0db19c (diff) | |
| download | blackbird-op-linux-cd309ab39351cfd5d0a310bd3d0eb76d0b31f66d.tar.gz blackbird-op-linux-cd309ab39351cfd5d0a310bd3d0eb76d0b31f66d.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/sta.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/sta.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/sta.h b/drivers/net/wireless/iwlwifi/mvm/sta.h index 896f88ac8145..b0352df981e4 100644 --- a/drivers/net/wireless/iwlwifi/mvm/sta.h +++ b/drivers/net/wireless/iwlwifi/mvm/sta.h @@ -22,7 +22,7 @@ * USA * * The full GNU General Public License is included in this distribution - * in the file called LICENSE.GPL. + * in the file called COPYING. * * Contact Information: * Intel Linux Wireless <ilw@linux.intel.com> @@ -348,6 +348,8 @@ int iwl_mvm_sta_tx_agg_oper(struct iwl_mvm *mvm, struct ieee80211_vif *vif, struct ieee80211_sta *sta, u16 tid, u8 buf_size); int iwl_mvm_sta_tx_agg_stop(struct iwl_mvm *mvm, struct ieee80211_vif *vif, struct ieee80211_sta *sta, u16 tid); +int iwl_mvm_sta_tx_agg_flush(struct iwl_mvm *mvm, struct ieee80211_vif *vif, + struct ieee80211_sta *sta, u16 tid); int iwl_mvm_add_aux_sta(struct iwl_mvm *mvm); int iwl_mvm_allocate_int_sta(struct iwl_mvm *mvm, struct iwl_mvm_int_sta *sta, |
