diff --git a/[refs] b/[refs] index cee24e7e592e..8a3d973cbea9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ab17c45b566b8a4a87ceac6cd6c6d77857189ab +refs/heads/master: 8b1c814d65ae3219ee19d39ad6097f3d5249c23d diff --git a/trunk/net/mac80211/sta_info.h b/trunk/net/mac80211/sta_info.h index d13a44b935e2..d75c870fae65 100644 --- a/trunk/net/mac80211/sta_info.h +++ b/trunk/net/mac80211/sta_info.h @@ -65,7 +65,6 @@ enum ieee80211_sta_info_flags { #define HT_AGG_STATE_OPERATIONAL (HT_ADDBA_REQUESTED_MSK | \ HT_ADDBA_DRV_READY_MSK | \ HT_ADDBA_RECEIVED_MSK) -#define HT_AGG_STATE_DEBUGFS_CTL BIT(7) /** * struct tid_ampdu_tx - TID aggregation information (Tx).