From: Andrew Morton Signed-off-by: Andrew Morton --- net/ieee80211/softmac/ieee80211softmac_module.c | 8 +------- net/ieee80211/softmac/ieee80211softmac_wx.c | 6 ------ 2 files changed, 1 insertion(+), 13 deletions(-) diff -puN net/ieee80211/softmac/ieee80211softmac_module.c~git-wireless-fixup net/ieee80211/softmac/ieee80211softmac_module.c --- a/net/ieee80211/softmac/ieee80211softmac_module.c~git-wireless-fixup +++ a/net/ieee80211/softmac/ieee80211softmac_module.c @@ -265,18 +265,12 @@ void ieee80211softmac_init_bss(struct ie /* Change the default txrate to the highest possible value. * The txrate machine will lower it, if it is too high. */ -<<<<<<< HEAD/net/ieee80211/softmac/ieee80211softmac_module.c /* FIXME: We don't correctly handle backing down to lower rates, so 801.11g devices start off at 11M for now. People can manually change it if they really need to, but 11M is more reliable. Note similar logic in ieee80211softmac_wx_set_rate() */ - if (ieee->modulation & IEEE80211_CCK_MODULATION) { -======= - if (ieee->modulation & IEEE80211_OFDM_MODULATION) - txrates->user_rate = IEEE80211_OFDM_RATE_24MB; - else ->>>>>>> /net/ieee80211/softmac/ieee80211softmac_module.c + if (ieee->modulation & IEEE80211_CCK_MODULATION) txrates->user_rate = IEEE80211_CCK_RATE_11MB; txrates->default_rate = IEEE80211_CCK_RATE_1MB; diff -puN net/ieee80211/softmac/ieee80211softmac_wx.c~git-wireless-fixup net/ieee80211/softmac/ieee80211softmac_wx.c --- a/net/ieee80211/softmac/ieee80211softmac_wx.c~git-wireless-fixup +++ a/net/ieee80211/softmac/ieee80211softmac_wx.c @@ -177,18 +177,12 @@ ieee80211softmac_wx_set_rate(struct net_ int err = -EINVAL; if (in_rate == -1) { -<<<<<<< HEAD/net/ieee80211/softmac/ieee80211softmac_wx.c /* FIXME: We don't correctly handle backing down to lower rates, so 801.11g devices start off at 11M for now. People can manually change it if they really need to, but 11M is more reliable. Note similar logic in ieee80211softmac_wx_set_rate() */ if (ieee->modulation & IEEE80211_CCK_MODULATION) -======= - if (ieee->modulation & IEEE80211_OFDM_MODULATION) - in_rate = 24000000; - else ->>>>>>> /net/ieee80211/softmac/ieee80211softmac_wx.c in_rate = 11000000; } _