diff --git a/[refs] b/[refs] index 71e46bac2317..5b5d36cce5ec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f860d526eb2939a1c37128900b5af2b6f3ff7f20 +refs/heads/master: 92b50c4b5b01d0ba4efcff9e85f7a76b620fe789 diff --git a/trunk/net/mac80211/Kconfig b/trunk/net/mac80211/Kconfig index 83eec7a8bd1f..4d6f8653ec88 100644 --- a/trunk/net/mac80211/Kconfig +++ b/trunk/net/mac80211/Kconfig @@ -69,6 +69,7 @@ endchoice config MAC80211_RC_DEFAULT string + default "minstrel_ht" if MAC80211_RC_DEFAULT_MINSTREL && MAC80211_RC_MINSTREL_HT default "minstrel" if MAC80211_RC_DEFAULT_MINSTREL default "pid" if MAC80211_RC_DEFAULT_PID default ""