diff --git a/libwifi/chlist.c b/libwifi/chlist.c index 321036c2a019e8d2fa72fc1715bbd201568b30a2..efe4530ca81d9f93c020cb36967cb136a170d320 100644 --- a/libwifi/chlist.c +++ b/libwifi/chlist.c @@ -105,7 +105,7 @@ static struct region_to_chlist g_region_chlist[] = { /* 36 ~ 64, 149 ~ 165 */ #define A_REG_0 0 -/* 36 ~ 64, 100 ~ 140 */ +/* 36 ~ 68, 96 ~ 140 */ #define A_REG_1 1 /* 36 ~ 64 */ @@ -153,7 +153,7 @@ struct chlist a_reg0_chlist[] = { }; struct chlist a_reg1_chlist[] = { - {36, 8}, {100, 11}, {0, 0} + {36, 9}, {96, 12}, {0, 0} }; struct chlist a_reg2_chlist[] = { @@ -210,8 +210,8 @@ static struct region_to_chlist a_region_chlist[] = { #define a_region_chlist_num (sizeof(a_region_chlist)/sizeof(a_region_chlist[0])) static const uint32_t def_chlist_a[] = {36, 40, 44, 48, - 52, 56, 60, 64, - 100, 104, 108, 112, + 52, 56, 60, 64, 68, + 96, 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140, 149, 153, 157, 161, 165, 169, 173}; @@ -557,15 +557,17 @@ static struct wifi_opclass wifi_opclass_global[] = { {44, {44}}}}}, { 117, 117, BAND_5, BW40, EXTCH_BELOW, {23, 2, {{40, {40}}, {48, {48}}}}}, - { 118, 118, BAND_5, BW20, EXTCH_NONE, {23, 4, {{52, {52}}, + { 118, 118, BAND_5, BW20, EXTCH_NONE, {23, 5, {{52, {52}}, {56, {56}}, {60, {60}}, - {64, {64}}}}}, + {64, {64}}, + {68, {68}}}}}, { 119, 119, BAND_5, BW40, EXTCH_ABOVE, {23, 2, {{52, {52}}, {60, {60}}}}}, { 120, 120, BAND_5, BW40, EXTCH_BELOW, {23, 2, {{56, {56}}, {64, {64}}}}}, - { 121, 121, BAND_5, BW20, EXTCH_NONE, {30, 12, {{100, {100}}, + { 121, 121, BAND_5, BW20, EXTCH_NONE, {30, 13, {{96, {96}}, + {100, {100}}, {104, {104}}, {108, {108}}, {112, {112}}, @@ -766,8 +768,8 @@ static struct wifi_opclass wifi_opclass_global[] = { static struct wifi_opclass wifi_opclass_eu[] = { { 1, 115, BAND_5, BW20, EXTCH_NONE, {23, 4, {{36}, {40}, {44}, {48}}}}, - { 2, 118, BAND_5, BW20, EXTCH_NONE, {23, 4, {{52}, {56}, {60}, {64}}}}, - { 3, 121, BAND_5, BW20, EXTCH_NONE, {30, 11, {{100}, {104}, {108}, {112}, {116}, {120}, {124}, \ + { 2, 118, BAND_5, BW20, EXTCH_NONE, {23, 5, {{52}, {56}, {60}, {64}, {68}}}}, + { 3, 121, BAND_5, BW20, EXTCH_NONE, {30, 12, {{96}, {100}, {104}, {108}, {112}, {116}, {120}, {124}, \ {128}, {132}, {136}, {140}}}}, { 4, 81, BAND_2, BW20, EXTCH_NONE, {20, 13, {{1}, {2}, {3}, {4}, {5}, {6}, {7}, {8}, {9}, {10}, {11}, {12}, {13}}}}, { 5, 116, BAND_5, BW40, EXTCH_ABOVE, {23, 2, {{36}, {44}}}}, @@ -1180,6 +1182,8 @@ const int *chan2list(int chan, int bw) {.bw = 20, .chans = {56, 0}}, {.bw = 20, .chans = {60, 0}}, {.bw = 20, .chans = {64, 0}}, + {.bw = 20, .chans = {68, 0}}, + {.bw = 20, .chans = {96, 0}}, {.bw = 20, .chans = {100, 0}}, {.bw = 20, .chans = {104, 0}}, {.bw = 20, .chans = {108, 0}},