diff --git a/[refs] b/[refs] index cd525ebfe14a..f00f358e2348 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 51e99158d261a5ec5772ca89b935c3daa270b07c +refs/heads/master: 85b9e4fe13de9b35af1dbd50acc5f4978b9119ee diff --git a/trunk/net/mac80211/ht.c b/trunk/net/mac80211/ht.c index 5f510a13b9f0..c5c0c5271096 100644 --- a/trunk/net/mac80211/ht.c +++ b/trunk/net/mac80211/ht.c @@ -469,7 +469,7 @@ int ieee80211_start_tx_ba_session(struct ieee80211_hw *hw, u8 *ra, u16 tid) struct ieee80211_sub_if_data *sdata; u16 start_seq_num; u8 *state; - int ret; + int ret = 0; if ((tid >= STA_TID_NUM) || !(hw->flags & IEEE80211_HW_AMPDU_AGGREGATION)) return -EINVAL;