| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394959697989910010110210310410510610710810911011111211311411511611711811912012112212312412512612712812913013113213313413513613713813914014114214314414514614714814915015115215315415515615715815916016116216316416516616716816917017117217317417517617717817918018118218318418518618718818919019119219319419519619719819920020120220320420520620720820921021121221321421521621721821922022122222322422522622722822923023123223323423523623723823924024124224324424524624724824925025125225325425525625725825926026126226326426526626726826927027127227327427527627727827928028128228328428528628728828929029129229329429529629729829930030130230330430530630730830931031131231331431531631731831932032132232332432532632732832933033133233333433533633733833934034134234334434534634734834935035135235335435535635735835936036136236336436536636736836937037137237337437537637737837938038138238338438538638738838939039139239339439539639739839940040140240340440540640740840941041141241341441541641741841942042142242342442542642742842943043143243343443543643743843944044144244344444544644744844945045145245345445545645745845946046146246346446546646746846947047147247347447547647747847948048148248348448548648748848949049149249349449549649749849950050150250350450550650750850951051151251351451551651751851952052152252352452552652752852953053153253353453553653753853954054154254354454554654754854955055155255355455555655755855956056156256356456556656756856957057157257357457557657757857958058158258358458558658758858959059159259359459559659759859960060160260360460560660760860961061161261361461561661761861962062162262362462562662762862963063163263363463563663763863964064164264364464564664764864965065165265365465565665765865966066166266366466566666766866967067167267367467567667767867968068168268368468568668768868969069169269369469569669769869970070170270370470570670770870971071171271371471571671771871972072172272372472572672772872973073173273373473573673773873974074174274374474574674774874975075175275375475575675775875976076176276376476576676776876977077177277377477577677777877978078178278378478578678778878979079179279379479579679779879980080180280380480580680780880981081181281381481581681781881982082182282382482582682782882983083183283383483583683783883984084184284384484584684784884985085185285385485585685785885986086186286386486586686786886987087187287387487587687787887988088188288388488588688788888989089189289389489589689789889990090190290390490590690790890991091191291391491591691791891992092192292392492592692792892993093193293393493593693793893994094194294394494594694794894995095195295395495595695795895996096196296396496596696796896997097197297397497597697797897998098198298398498598698798898999099199299399499599699799899910001001100210031004100510061007100810091010101110121013101410151016101710181019102010211022102310241025102610271028102910301031103210331034103510361037103810391040104110421043104410451046104710481049105010511052105310541055105610571058105910601061106210631064106510661067106810691070107110721073107410751076107710781079108010811082108310841085108610871088108910901091109210931094109510961097109810991100110111021103110411051106110711081109111011111112111311141115111611171118111911201121112211231124112511261127112811291130113111321133113411351136113711381139114011411142114311441145114611471148114911501151115211531154115511561157115811591160116111621163116411651166116711681169117011711172117311741175117611771178117911801181118211831184118511861187118811891190119111921193119411951196119711981199120012011202120312041205120612071208120912101211121212131214121512161217121812191220122112221223122412251226122712281229123012311232123312341235123612371238123912401241124212431244124512461247124812491250125112521253125412551256125712581259126012611262126312641265126612671268126912701271127212731274127512761277127812791280128112821283128412851286128712881289129012911292129312941295129612971298129913001301130213031304130513061307130813091310131113121313131413151316131713181319132013211322132313241325132613271328132913301331133213331334133513361337133813391340134113421343134413451346134713481349135013511352135313541355135613571358135913601361136213631364136513661367136813691370137113721373137413751376137713781379138013811382138313841385138613871388138913901391139213931394139513961397139813991400140114021403140414051406140714081409141014111412141314141415141614171418141914201421142214231424142514261427142814291430143114321433143414351436143714381439144014411442144314441445144614471448144914501451145214531454145514561457145814591460146114621463146414651466146714681469147014711472147314741475147614771478147914801481148214831484148514861487148814891490149114921493149414951496149714981499150015011502150315041505150615071508150915101511151215131514151515161517151815191520152115221523152415251526152715281529153015311532153315341535153615371538153915401541154215431544154515461547154815491550155115521553155415551556155715581559156015611562156315641565156615671568156915701571157215731574157515761577157815791580158115821583158415851586158715881589159015911592159315941595159615971598159916001601160216031604160516061607160816091610161116121613161416151616161716181619162016211622162316241625162616271628162916301631163216331634163516361637163816391640164116421643164416451646164716481649165016511652165316541655165616571658165916601661166216631664166516661667166816691670167116721673167416751676167716781679168016811682168316841685168616871688168916901691169216931694169516961697169816991700170117021703170417051706170717081709171017111712171317141715171617171718171917201721172217231724172517261727172817291730173117321733173417351736173717381739174017411742174317441745174617471748174917501751175217531754175517561757175817591760176117621763176417651766176717681769177017711772177317741775177617771778177917801781178217831784178517861787178817891790179117921793179417951796179717981799180018011802180318041805180618071808180918101811181218131814181518161817181818191820182118221823182418251826182718281829183018311832183318341835183618371838183918401841184218431844184518461847184818491850185118521853185418551856185718581859186018611862186318641865186618671868186918701871187218731874187518761877187818791880188118821883188418851886188718881889189018911892189318941895189618971898189919001901190219031904190519061907190819091910191119121913191419151916191719181919192019211922192319241925192619271928192919301931193219331934193519361937193819391940194119421943194419451946194719481949195019511952195319541955195619571958195919601961196219631964196519661967196819691970197119721973197419751976197719781979198019811982198319841985198619871988198919901991199219931994199519961997199819992000200120022003200420052006200720082009201020112012201320142015201620172018201920202021202220232024202520262027202820292030203120322033203420352036203720382039204020412042204320442045204620472048204920502051205220532054205520562057205820592060206120622063206420652066206720682069207020712072207320742075207620772078207920802081208220832084208520862087208820892090209120922093209420952096209720982099210021012102210321042105210621072108210921102111211221132114211521162117211821192120212121222123212421252126212721282129213021312132213321342135213621372138213921402141214221432144214521462147214821492150215121522153215421552156215721582159216021612162216321642165216621672168216921702171217221732174217521762177217821792180218121822183218421852186218721882189219021912192219321942195219621972198219922002201220222032204220522062207220822092210221122122213221422152216221722182219222022212222222322242225222622272228222922302231223222332234223522362237223822392240224122422243224422452246224722482249225022512252225322542255225622572258225922602261226222632264226522662267226822692270227122722273227422752276227722782279228022812282228322842285228622872288228922902291229222932294229522962297229822992300230123022303230423052306230723082309231023112312231323142315231623172318231923202321232223232324232523262327232823292330233123322333233423352336233723382339234023412342234323442345234623472348234923502351235223532354235523562357235823592360236123622363236423652366236723682369237023712372237323742375237623772378237923802381238223832384238523862387238823892390239123922393239423952396239723982399240024012402240324042405240624072408240924102411241224132414241524162417241824192420242124222423242424252426242724282429243024312432243324342435243624372438243924402441244224432444244524462447244824492450245124522453245424552456245724582459246024612462246324642465246624672468246924702471247224732474247524762477247824792480248124822483248424852486248724882489249024912492249324942495249624972498249925002501250225032504250525062507250825092510251125122513251425152516251725182519252025212522252325242525252625272528252925302531253225332534253525362537253825392540254125422543254425452546254725482549255025512552255325542555255625572558255925602561256225632564256525662567256825692570257125722573257425752576257725782579258025812582258325842585258625872588258925902591259225932594259525962597259825992600260126022603260426052606260726082609261026112612261326142615261626172618261926202621262226232624262526262627262826292630263126322633263426352636263726382639264026412642264326442645264626472648264926502651265226532654265526562657265826592660266126622663266426652666266726682669267026712672267326742675267626772678267926802681268226832684268526862687268826892690269126922693269426952696269726982699270027012702270327042705270627072708270927102711271227132714271527162717271827192720272127222723272427252726272727282729273027312732273327342735273627372738273927402741274227432744274527462747274827492750275127522753275427552756275727582759276027612762276327642765276627672768276927702771277227732774277527762777277827792780278127822783278427852786278727882789279027912792279327942795279627972798279928002801280228032804280528062807280828092810281128122813281428152816281728182819282028212822282328242825282628272828282928302831283228332834283528362837283828392840284128422843284428452846284728482849285028512852285328542855285628572858285928602861286228632864286528662867286828692870287128722873287428752876287728782879288028812882288328842885288628872888288928902891289228932894289528962897289828992900290129022903290429052906290729082909291029112912291329142915291629172918291929202921292229232924292529262927292829292930293129322933293429352936293729382939294029412942294329442945294629472948294929502951295229532954295529562957295829592960296129622963296429652966296729682969297029712972297329742975297629772978297929802981298229832984298529862987298829892990299129922993299429952996299729982999300030013002300330043005300630073008300930103011301230133014301530163017301830193020302130223023302430253026302730283029303030313032303330343035303630373038303930403041304230433044304530463047304830493050305130523053305430553056305730583059306030613062306330643065306630673068306930703071307230733074307530763077307830793080308130823083308430853086308730883089309030913092309330943095309630973098309931003101310231033104310531063107310831093110311131123113311431153116311731183119312031213122312331243125312631273128312931303131313231333134313531363137313831393140314131423143314431453146314731483149315031513152315331543155315631573158315931603161316231633164316531663167316831693170317131723173317431753176317731783179318031813182318331843185318631873188318931903191319231933194319531963197319831993200320132023203320432053206320732083209321032113212321332143215321632173218321932203221322232233224322532263227322832293230323132323233323432353236323732383239324032413242324332443245324632473248324932503251325232533254325532563257325832593260326132623263326432653266326732683269327032713272327332743275327632773278327932803281328232833284328532863287328832893290329132923293329432953296329732983299330033013302330333043305330633073308330933103311331233133314331533163317331833193320332133223323332433253326332733283329333033313332333333343335333633373338333933403341334233433344334533463347334833493350335133523353335433553356335733583359336033613362336333643365336633673368336933703371337233733374337533763377337833793380338133823383338433853386338733883389339033913392339333943395339633973398339934003401340234033404340534063407340834093410341134123413341434153416341734183419342034213422342334243425342634273428342934303431343234333434343534363437343834393440344134423443344434453446344734483449345034513452345334543455345634573458345934603461346234633464346534663467346834693470347134723473347434753476347734783479348034813482348334843485348634873488348934903491349234933494349534963497349834993500350135023503350435053506350735083509351035113512351335143515351635173518351935203521352235233524352535263527352835293530353135323533353435353536353735383539354035413542354335443545354635473548354935503551355235533554355535563557355835593560356135623563356435653566356735683569357035713572357335743575357635773578357935803581358235833584358535863587358835893590359135923593359435953596359735983599360036013602360336043605360636073608360936103611361236133614361536163617361836193620362136223623362436253626362736283629363036313632363336343635363636373638363936403641364236433644364536463647364836493650365136523653365436553656365736583659366036613662366336643665366636673668366936703671367236733674367536763677367836793680368136823683368436853686368736883689369036913692369336943695369636973698369937003701370237033704370537063707370837093710371137123713371437153716371737183719372037213722372337243725372637273728372937303731373237333734373537363737373837393740374137423743374437453746374737483749375037513752375337543755375637573758375937603761376237633764376537663767376837693770377137723773377437753776377737783779378037813782378337843785378637873788378937903791379237933794379537963797379837993800380138023803380438053806380738083809381038113812381338143815381638173818381938203821382238233824382538263827382838293830383138323833383438353836383738383839384038413842384338443845384638473848384938503851385238533854385538563857385838593860386138623863386438653866386738683869387038713872387338743875387638773878387938803881388238833884388538863887388838893890389138923893389438953896389738983899390039013902390339043905390639073908390939103911391239133914391539163917391839193920392139223923392439253926392739283929393039313932393339343935393639373938393939403941394239433944394539463947394839493950395139523953395439553956395739583959396039613962396339643965396639673968396939703971397239733974397539763977397839793980398139823983398439853986398739883989399039913992399339943995399639973998399940004001400240034004400540064007400840094010401140124013401440154016401740184019402040214022402340244025402640274028402940304031403240334034403540364037403840394040404140424043404440454046404740484049405040514052405340544055405640574058405940604061406240634064406540664067406840694070407140724073407440754076407740784079408040814082408340844085408640874088408940904091409240934094409540964097409840994100410141024103410441054106410741084109411041114112411341144115411641174118411941204121412241234124412541264127412841294130413141324133413441354136413741384139414041414142414341444145414641474148414941504151415241534154415541564157415841594160416141624163416441654166416741684169417041714172417341744175417641774178417941804181418241834184418541864187418841894190419141924193419441954196419741984199420042014202420342044205420642074208420942104211421242134214421542164217421842194220422142224223422442254226422742284229423042314232423342344235423642374238423942404241424242434244424542464247424842494250425142524253425442554256425742584259426042614262426342644265426642674268426942704271427242734274427542764277427842794280428142824283428442854286428742884289429042914292429342944295429642974298429943004301430243034304430543064307430843094310431143124313431443154316431743184319432043214322432343244325432643274328432943304331433243334334433543364337433843394340434143424343434443454346434743484349435043514352435343544355435643574358435943604361436243634364436543664367436843694370437143724373437443754376437743784379438043814382438343844385438643874388438943904391439243934394439543964397439843994400440144024403440444054406440744084409441044114412441344144415441644174418441944204421442244234424442544264427442844294430443144324433443444354436443744384439444044414442444344444445444644474448444944504451445244534454445544564457445844594460446144624463446444654466446744684469447044714472447344744475447644774478447944804481448244834484448544864487448844894490449144924493449444954496449744984499450045014502450345044505450645074508450945104511451245134514451545164517451845194520452145224523452445254526452745284529453045314532453345344535453645374538453945404541454245434544454545464547454845494550455145524553455445554556455745584559456045614562456345644565456645674568456945704571457245734574457545764577457845794580458145824583458445854586458745884589459045914592459345944595459645974598459946004601460246034604460546064607460846094610461146124613461446154616461746184619462046214622462346244625462646274628462946304631463246334634463546364637463846394640464146424643464446454646464746484649465046514652465346544655465646574658465946604661466246634664466546664667466846694670467146724673467446754676467746784679468046814682468346844685468646874688468946904691469246934694469546964697469846994700470147024703470447054706470747084709471047114712471347144715471647174718471947204721472247234724472547264727472847294730473147324733473447354736473747384739474047414742474347444745474647474748474947504751475247534754475547564757475847594760476147624763476447654766476747684769477047714772477347744775477647774778477947804781478247834784478547864787478847894790479147924793479447954796479747984799480048014802480348044805480648074808480948104811481248134814481548164817481848194820482148224823482448254826482748284829483048314832483348344835483648374838483948404841484248434844484548464847484848494850485148524853485448554856485748584859486048614862486348644865486648674868486948704871487248734874487548764877487848794880488148824883488448854886488748884889489048914892489348944895489648974898489949004901490249034904490549064907490849094910491149124913491449154916491749184919492049214922492349244925492649274928492949304931493249334934493549364937493849394940494149424943494449454946494749484949495049514952495349544955495649574958495949604961496249634964496549664967496849694970497149724973497449754976497749784979498049814982498349844985498649874988498949904991499249934994499549964997499849995000500150025003500450055006500750085009501050115012501350145015501650175018501950205021502250235024502550265027502850295030503150325033503450355036503750385039504050415042504350445045504650475048504950505051505250535054505550565057505850595060506150625063506450655066506750685069507050715072507350745075507650775078507950805081508250835084508550865087508850895090509150925093509450955096509750985099510051015102510351045105510651075108510951105111511251135114511551165117511851195120512151225123512451255126512751285129513051315132513351345135513651375138513951405141514251435144514551465147514851495150515151525153515451555156515751585159516051615162516351645165516651675168516951705171517251735174517551765177517851795180518151825183518451855186518751885189519051915192519351945195519651975198519952005201520252035204520552065207520852095210521152125213521452155216521752185219522052215222522352245225522652275228522952305231523252335234523552365237523852395240524152425243524452455246524752485249525052515252525352545255525652575258525952605261526252635264526552665267526852695270527152725273527452755276527752785279528052815282528352845285528652875288528952905291529252935294529552965297529852995300530153025303530453055306530753085309531053115312531353145315531653175318531953205321532253235324532553265327532853295330533153325333533453355336533753385339534053415342534353445345534653475348534953505351535253535354535553565357535853595360536153625363536453655366536753685369537053715372537353745375537653775378537953805381538253835384538553865387538853895390539153925393539453955396539753985399540054015402540354045405540654075408540954105411541254135414541554165417541854195420542154225423542454255426542754285429543054315432543354345435543654375438543954405441544254435444544554465447544854495450545154525453545454555456545754585459546054615462546354645465546654675468546954705471547254735474547554765477547854795480548154825483548454855486548754885489549054915492549354945495549654975498549955005501550255035504550555065507550855095510551155125513551455155516551755185519552055215522552355245525552655275528552955305531553255335534553555365537553855395540554155425543554455455546554755485549555055515552555355545555555655575558555955605561556255635564556555665567556855695570557155725573557455755576557755785579558055815582558355845585558655875588558955905591559255935594559555965597559855995600560156025603560456055606560756085609561056115612561356145615561656175618561956205621562256235624562556265627562856295630563156325633563456355636563756385639564056415642564356445645564656475648564956505651565256535654565556565657565856595660566156625663566456655666566756685669567056715672567356745675567656775678567956805681568256835684568556865687568856895690569156925693569456955696569756985699570057015702570357045705570657075708570957105711571257135714571557165717571857195720572157225723572457255726572757285729573057315732573357345735573657375738573957405741574257435744574557465747574857495750575157525753575457555756575757585759576057615762576357645765576657675768576957705771577257735774577557765777577857795780578157825783578457855786578757885789579057915792579357945795579657975798579958005801580258035804580558065807580858095810581158125813581458155816581758185819582058215822582358245825582658275828582958305831583258335834583558365837583858395840584158425843584458455846584758485849585058515852585358545855585658575858585958605861586258635864586558665867586858695870587158725873587458755876587758785879588058815882588358845885588658875888588958905891589258935894589558965897589858995900590159025903590459055906590759085909591059115912591359145915591659175918591959205921592259235924592559265927592859295930593159325933593459355936593759385939594059415942594359445945594659475948594959505951595259535954595559565957595859595960596159625963596459655966596759685969597059715972597359745975597659775978597959805981598259835984598559865987598859895990599159925993599459955996599759985999600060016002600360046005600660076008600960106011601260136014601560166017601860196020602160226023602460256026602760286029603060316032603360346035603660376038603960406041604260436044604560466047604860496050605160526053605460556056605760586059606060616062606360646065606660676068606960706071607260736074607560766077607860796080608160826083608460856086608760886089609060916092609360946095609660976098609961006101610261036104610561066107610861096110611161126113611461156116611761186119612061216122612361246125612661276128612961306131613261336134613561366137613861396140614161426143614461456146614761486149615061516152615361546155615661576158615961606161616261636164616561666167616861696170617161726173617461756176617761786179618061816182618361846185618661876188618961906191619261936194619561966197619861996200620162026203620462056206620762086209621062116212621362146215621662176218621962206221622262236224622562266227622862296230623162326233623462356236623762386239624062416242624362446245624662476248624962506251625262536254625562566257625862596260626162626263626462656266626762686269627062716272627362746275627662776278627962806281628262836284628562866287628862896290629162926293629462956296629762986299630063016302630363046305630663076308630963106311631263136314631563166317631863196320632163226323632463256326632763286329633063316332633363346335633663376338633963406341634263436344634563466347634863496350635163526353635463556356635763586359636063616362636363646365636663676368636963706371637263736374637563766377637863796380638163826383638463856386638763886389639063916392639363946395639663976398639964006401640264036404640564066407640864096410641164126413641464156416641764186419642064216422642364246425642664276428642964306431643264336434643564366437643864396440644164426443644464456446644764486449645064516452645364546455645664576458645964606461646264636464646564666467646864696470647164726473647464756476647764786479648064816482648364846485648664876488648964906491649264936494649564966497649864996500650165026503650465056506650765086509651065116512651365146515651665176518651965206521652265236524652565266527652865296530653165326533653465356536653765386539654065416542654365446545654665476548654965506551655265536554655565566557655865596560656165626563656465656566656765686569657065716572657365746575657665776578657965806581658265836584658565866587658865896590659165926593659465956596659765986599660066016602660366046605660666076608660966106611661266136614661566166617661866196620662166226623662466256626662766286629663066316632663366346635663666376638663966406641664266436644664566466647664866496650665166526653665466556656665766586659666066616662666366646665666666676668666966706671667266736674667566766677667866796680668166826683668466856686668766886689669066916692669366946695669666976698669967006701670267036704670567066707670867096710671167126713671467156716671767186719672067216722672367246725672667276728672967306731673267336734673567366737673867396740674167426743674467456746674767486749675067516752675367546755675667576758675967606761676267636764676567666767676867696770677167726773677467756776677767786779678067816782678367846785678667876788678967906791679267936794679567966797679867996800680168026803680468056806680768086809681068116812681368146815681668176818681968206821682268236824682568266827682868296830683168326833683468356836683768386839684068416842684368446845684668476848684968506851685268536854685568566857685868596860686168626863686468656866686768686869687068716872687368746875687668776878687968806881688268836884688568866887688868896890689168926893689468956896689768986899690069016902690369046905690669076908690969106911691269136914691569166917691869196920692169226923692469256926692769286929693069316932693369346935693669376938693969406941694269436944694569466947694869496950695169526953695469556956695769586959696069616962696369646965696669676968696969706971697269736974697569766977697869796980698169826983698469856986698769886989699069916992699369946995699669976998699970007001700270037004700570067007700870097010701170127013701470157016701770187019702070217022702370247025702670277028702970307031703270337034703570367037703870397040704170427043704470457046704770487049705070517052705370547055705670577058705970607061706270637064706570667067706870697070707170727073707470757076707770787079708070817082708370847085708670877088708970907091709270937094709570967097709870997100710171027103710471057106710771087109711071117112711371147115711671177118711971207121712271237124712571267127712871297130713171327133713471357136713771387139714071417142714371447145714671477148714971507151715271537154715571567157715871597160716171627163716471657166716771687169717071717172717371747175717671777178717971807181718271837184718571867187718871897190719171927193719471957196719771987199720072017202720372047205720672077208720972107211721272137214721572167217721872197220722172227223722472257226722772287229723072317232723372347235723672377238723972407241724272437244724572467247724872497250725172527253725472557256725772587259726072617262726372647265726672677268726972707271727272737274727572767277727872797280728172827283728472857286728772887289729072917292729372947295729672977298729973007301730273037304730573067307730873097310731173127313731473157316731773187319732073217322732373247325732673277328732973307331733273337334733573367337733873397340734173427343734473457346734773487349735073517352735373547355735673577358735973607361736273637364736573667367736873697370737173727373737473757376737773787379738073817382738373847385738673877388738973907391739273937394739573967397739873997400740174027403740474057406740774087409741074117412741374147415741674177418741974207421742274237424742574267427742874297430743174327433743474357436743774387439744074417442744374447445744674477448744974507451745274537454745574567457745874597460746174627463746474657466746774687469747074717472747374747475747674777478747974807481748274837484748574867487748874897490749174927493749474957496749774987499750075017502750375047505750675077508750975107511751275137514751575167517751875197520752175227523752475257526752775287529753075317532753375347535753675377538753975407541754275437544754575467547754875497550755175527553755475557556755775587559756075617562756375647565756675677568756975707571757275737574757575767577757875797580758175827583758475857586758775887589759075917592759375947595759675977598759976007601760276037604760576067607760876097610761176127613761476157616761776187619762076217622762376247625762676277628762976307631763276337634763576367637763876397640764176427643764476457646764776487649765076517652765376547655765676577658765976607661766276637664766576667667766876697670767176727673767476757676767776787679768076817682768376847685768676877688768976907691769276937694769576967697769876997700770177027703770477057706770777087709771077117712771377147715771677177718771977207721772277237724772577267727772877297730773177327733773477357736773777387739774077417742774377447745774677477748774977507751775277537754775577567757775877597760776177627763776477657766776777687769777077717772777377747775777677777778777977807781778277837784778577867787778877897790779177927793779477957796779777987799780078017802780378047805780678077808780978107811781278137814781578167817781878197820782178227823782478257826782778287829783078317832783378347835783678377838783978407841784278437844784578467847784878497850785178527853785478557856785778587859786078617862786378647865786678677868786978707871787278737874787578767877787878797880788178827883788478857886788778887889789078917892789378947895789678977898789979007901790279037904790579067907790879097910791179127913791479157916791779187919792079217922792379247925792679277928792979307931793279337934793579367937793879397940794179427943794479457946794779487949795079517952795379547955795679577958795979607961796279637964796579667967796879697970797179727973797479757976797779787979798079817982798379847985798679877988798979907991799279937994799579967997799879998000800180028003800480058006800780088009801080118012801380148015801680178018801980208021802280238024802580268027802880298030803180328033803480358036803780388039804080418042804380448045804680478048804980508051805280538054805580568057805880598060806180628063806480658066806780688069807080718072807380748075807680778078807980808081808280838084808580868087808880898090809180928093809480958096809780988099810081018102810381048105810681078108810981108111811281138114811581168117811881198120812181228123812481258126812781288129813081318132813381348135813681378138813981408141814281438144814581468147814881498150815181528153815481558156815781588159816081618162816381648165816681678168816981708171817281738174817581768177817881798180818181828183818481858186818781888189819081918192819381948195819681978198819982008201820282038204820582068207820882098210821182128213821482158216821782188219822082218222822382248225822682278228822982308231823282338234823582368237823882398240824182428243824482458246824782488249825082518252825382548255825682578258825982608261826282638264826582668267826882698270827182728273827482758276827782788279828082818282828382848285828682878288828982908291829282938294829582968297829882998300830183028303830483058306830783088309831083118312831383148315831683178318831983208321832283238324832583268327832883298330833183328333833483358336833783388339834083418342834383448345834683478348834983508351835283538354835583568357835883598360836183628363836483658366836783688369837083718372837383748375837683778378837983808381838283838384838583868387838883898390839183928393839483958396839783988399840084018402840384048405840684078408840984108411841284138414841584168417841884198420842184228423842484258426842784288429843084318432843384348435843684378438843984408441844284438444844584468447844884498450845184528453845484558456845784588459846084618462846384648465846684678468846984708471847284738474847584768477847884798480848184828483848484858486848784888489849084918492849384948495849684978498849985008501850285038504850585068507850885098510851185128513851485158516851785188519852085218522852385248525852685278528852985308531853285338534853585368537853885398540854185428543854485458546854785488549855085518552855385548555855685578558855985608561856285638564856585668567856885698570857185728573857485758576857785788579858085818582858385848585858685878588858985908591859285938594859585968597859885998600860186028603860486058606860786088609861086118612861386148615861686178618861986208621862286238624862586268627862886298630863186328633863486358636863786388639864086418642864386448645864686478648864986508651865286538654865586568657865886598660866186628663866486658666866786688669867086718672867386748675867686778678867986808681868286838684868586868687868886898690869186928693869486958696869786988699870087018702870387048705870687078708870987108711871287138714871587168717871887198720872187228723872487258726872787288729873087318732873387348735873687378738873987408741874287438744874587468747874887498750875187528753875487558756875787588759876087618762876387648765876687678768876987708771877287738774877587768777877887798780878187828783878487858786878787888789879087918792879387948795879687978798879988008801880288038804880588068807880888098810881188128813881488158816881788188819882088218822882388248825882688278828882988308831883288338834883588368837883888398840884188428843884488458846884788488849885088518852885388548855885688578858885988608861886288638864886588668867886888698870887188728873887488758876887788788879888088818882888388848885888688878888888988908891889288938894889588968897889888998900890189028903890489058906890789088909891089118912891389148915891689178918891989208921892289238924892589268927892889298930893189328933893489358936893789388939894089418942894389448945894689478948894989508951895289538954895589568957895889598960896189628963896489658966896789688969897089718972897389748975897689778978897989808981898289838984898589868987898889898990899189928993899489958996899789988999900090019002900390049005900690079008900990109011901290139014901590169017901890199020902190229023902490259026902790289029903090319032903390349035903690379038903990409041904290439044904590469047904890499050905190529053905490559056905790589059906090619062906390649065906690679068906990709071907290739074907590769077907890799080908190829083908490859086908790889089909090919092909390949095909690979098909991009101910291039104910591069107910891099110911191129113911491159116911791189119912091219122912391249125912691279128912991309131913291339134913591369137913891399140914191429143914491459146914791489149915091519152915391549155915691579158915991609161916291639164916591669167916891699170917191729173917491759176917791789179918091819182918391849185918691879188918991909191919291939194919591969197919891999200920192029203920492059206920792089209921092119212921392149215921692179218921992209221922292239224922592269227922892299230923192329233923492359236923792389239924092419242924392449245924692479248924992509251925292539254925592569257925892599260926192629263926492659266926792689269927092719272927392749275927692779278927992809281928292839284928592869287928892899290929192929293929492959296929792989299930093019302930393049305930693079308930993109311931293139314931593169317931893199320932193229323932493259326932793289329933093319332933393349335933693379338933993409341934293439344934593469347934893499350935193529353935493559356935793589359936093619362936393649365936693679368936993709371937293739374937593769377937893799380938193829383938493859386938793889389939093919392939393949395939693979398939994009401940294039404940594069407940894099410941194129413941494159416941794189419942094219422942394249425942694279428942994309431943294339434943594369437943894399440944194429443944494459446944794489449945094519452945394549455945694579458945994609461946294639464946594669467946894699470947194729473947494759476947794789479948094819482948394849485948694879488948994909491949294939494949594969497949894999500950195029503950495059506950795089509951095119512951395149515951695179518951995209521952295239524952595269527952895299530953195329533953495359536953795389539954095419542954395449545954695479548954995509551955295539554955595569557955895599560956195629563956495659566956795689569957095719572957395749575957695779578957995809581958295839584958595869587958895899590959195929593959495959596959795989599960096019602960396049605960696079608960996109611961296139614961596169617961896199620962196229623962496259626962796289629963096319632963396349635963696379638963996409641964296439644964596469647964896499650965196529653965496559656965796589659966096619662966396649665966696679668966996709671967296739674967596769677967896799680968196829683968496859686968796889689969096919692969396949695969696979698969997009701970297039704970597069707970897099710971197129713971497159716971797189719972097219722972397249725972697279728972997309731973297339734973597369737973897399740974197429743974497459746974797489749975097519752975397549755975697579758975997609761976297639764976597669767976897699770977197729773977497759776977797789779978097819782978397849785978697879788978997909791979297939794979597969797979897999800980198029803980498059806980798089809981098119812981398149815981698179818981998209821982298239824982598269827982898299830983198329833983498359836983798389839984098419842984398449845984698479848984998509851985298539854985598569857985898599860986198629863986498659866986798689869987098719872987398749875987698779878987998809881988298839884988598869887988898899890989198929893989498959896989798989899990099019902990399049905990699079908990999109911991299139914991599169917991899199920992199229923992499259926992799289929993099319932993399349935993699379938993999409941994299439944994599469947994899499950995199529953995499559956995799589959996099619962996399649965996699679968996999709971997299739974997599769977997899799980998199829983998499859986998799889989999099919992999399949995999699979998999910000100011000210003100041000510006100071000810009100101001110012100131001410015100161001710018100191002010021100221002310024100251002610027100281002910030100311003210033100341003510036100371003810039100401004110042100431004410045100461004710048100491005010051100521005310054100551005610057100581005910060100611006210063100641006510066100671006810069100701007110072100731007410075100761007710078100791008010081100821008310084100851008610087100881008910090100911009210093100941009510096100971009810099101001010110102101031010410105101061010710108101091011010111101121011310114101151011610117101181011910120101211012210123101241012510126101271012810129101301013110132101331013410135101361013710138101391014010141101421014310144101451014610147101481014910150101511015210153101541015510156101571015810159101601016110162101631016410165101661016710168101691017010171101721017310174101751017610177101781017910180101811018210183101841018510186101871018810189101901019110192101931019410195101961019710198101991020010201102021020310204102051020610207102081020910210102111021210213102141021510216102171021810219102201022110222102231022410225102261022710228102291023010231102321023310234102351023610237102381023910240102411024210243102441024510246102471024810249102501025110252102531025410255102561025710258102591026010261102621026310264102651026610267102681026910270102711027210273102741027510276102771027810279102801028110282102831028410285102861028710288102891029010291102921029310294102951029610297102981029910300103011030210303103041030510306103071030810309103101031110312103131031410315103161031710318103191032010321103221032310324103251032610327103281032910330103311033210333103341033510336103371033810339103401034110342103431034410345103461034710348103491035010351103521035310354103551035610357103581035910360103611036210363103641036510366103671036810369103701037110372103731037410375103761037710378103791038010381103821038310384103851038610387103881038910390103911039210393103941039510396103971039810399104001040110402104031040410405104061040710408104091041010411104121041310414104151041610417104181041910420104211042210423104241042510426104271042810429104301043110432104331043410435104361043710438104391044010441104421044310444104451044610447104481044910450104511045210453104541045510456104571045810459104601046110462104631046410465104661046710468104691047010471104721047310474104751047610477104781047910480104811048210483104841048510486104871048810489104901049110492104931049410495104961049710498104991050010501105021050310504105051050610507105081050910510105111051210513105141051510516105171051810519105201052110522105231052410525105261052710528105291053010531105321053310534105351053610537105381053910540105411054210543105441054510546105471054810549105501055110552105531055410555105561055710558105591056010561105621056310564105651056610567105681056910570105711057210573105741057510576105771057810579105801058110582105831058410585105861058710588105891059010591105921059310594105951059610597105981059910600106011060210603106041060510606106071060810609106101061110612106131061410615106161061710618106191062010621106221062310624106251062610627106281062910630106311063210633106341063510636106371063810639106401064110642106431064410645106461064710648106491065010651106521065310654106551065610657106581065910660106611066210663106641066510666106671066810669106701067110672106731067410675106761067710678106791068010681106821068310684106851068610687106881068910690106911069210693106941069510696106971069810699107001070110702107031070410705107061070710708107091071010711107121071310714107151071610717107181071910720107211072210723107241072510726107271072810729107301073110732107331073410735107361073710738107391074010741107421074310744107451074610747107481074910750107511075210753107541075510756107571075810759107601076110762107631076410765107661076710768107691077010771107721077310774107751077610777107781077910780107811078210783107841078510786107871078810789107901079110792107931079410795107961079710798107991080010801108021080310804108051080610807108081080910810108111081210813108141081510816108171081810819108201082110822108231082410825108261082710828108291083010831108321083310834108351083610837108381083910840108411084210843108441084510846108471084810849108501085110852108531085410855108561085710858108591086010861108621086310864108651086610867108681086910870108711087210873108741087510876108771087810879108801088110882108831088410885108861088710888108891089010891108921089310894108951089610897108981089910900109011090210903109041090510906109071090810909109101091110912109131091410915109161091710918109191092010921109221092310924109251092610927109281092910930109311093210933109341093510936109371093810939109401094110942109431094410945109461094710948109491095010951109521095310954109551095610957109581095910960109611096210963109641096510966109671096810969109701097110972109731097410975109761097710978109791098010981109821098310984109851098610987109881098910990109911099210993109941099510996109971099810999110001100111002110031100411005110061100711008110091101011011110121101311014110151101611017110181101911020110211102211023110241102511026110271102811029110301103111032110331103411035110361103711038110391104011041110421104311044110451104611047110481104911050110511105211053110541105511056110571105811059110601106111062110631106411065110661106711068110691107011071110721107311074110751107611077110781107911080110811108211083110841108511086110871108811089110901109111092110931109411095110961109711098110991110011101111021110311104111051110611107111081110911110111111111211113111141111511116111171111811119111201112111122111231112411125111261112711128111291113011131111321113311134111351113611137111381113911140111411114211143111441114511146111471114811149111501115111152111531115411155111561115711158111591116011161111621116311164111651116611167111681116911170111711117211173111741117511176111771117811179111801118111182111831118411185111861118711188111891119011191111921119311194111951119611197111981119911200112011120211203112041120511206112071120811209112101121111212112131121411215112161121711218112191122011221112221122311224112251122611227112281122911230112311123211233112341123511236112371123811239112401124111242112431124411245112461124711248112491125011251112521125311254112551125611257112581125911260112611126211263112641126511266112671126811269112701127111272112731127411275112761127711278112791128011281112821128311284112851128611287112881128911290112911129211293112941129511296112971129811299113001130111302113031130411305113061130711308113091131011311113121131311314113151131611317113181131911320113211132211323113241132511326113271132811329113301133111332113331133411335113361133711338113391134011341113421134311344113451134611347113481134911350113511135211353113541135511356113571135811359113601136111362113631136411365113661136711368113691137011371113721137311374113751137611377113781137911380113811138211383113841138511386113871138811389113901139111392113931139411395113961139711398113991140011401114021140311404114051140611407114081140911410114111141211413114141141511416114171141811419114201142111422114231142411425114261142711428114291143011431114321143311434114351143611437114381143911440114411144211443114441144511446114471144811449114501145111452114531145411455114561145711458114591146011461114621146311464114651146611467114681146911470114711147211473114741147511476114771147811479114801148111482114831148411485114861148711488114891149011491114921149311494114951149611497114981149911500115011150211503115041150511506115071150811509115101151111512115131151411515115161151711518115191152011521115221152311524115251152611527115281152911530115311153211533115341153511536115371153811539115401154111542115431154411545115461154711548115491155011551115521155311554115551155611557115581155911560115611156211563115641156511566115671156811569115701157111572115731157411575115761157711578115791158011581115821158311584115851158611587115881158911590115911159211593115941159511596115971159811599116001160111602116031160411605116061160711608116091161011611116121161311614116151161611617116181161911620116211162211623116241162511626116271162811629116301163111632116331163411635116361163711638116391164011641116421164311644116451164611647116481164911650116511165211653116541165511656116571165811659116601166111662116631166411665116661166711668116691167011671116721167311674116751167611677116781167911680116811168211683116841168511686116871168811689116901169111692116931169411695116961169711698116991170011701117021170311704117051170611707117081170911710117111171211713117141171511716117171171811719117201172111722117231172411725117261172711728117291173011731117321173311734117351173611737117381173911740117411174211743117441174511746117471174811749117501175111752117531175411755117561175711758117591176011761117621176311764117651176611767117681176911770117711177211773117741177511776117771177811779117801178111782117831178411785117861178711788117891179011791117921179311794117951179611797117981179911800118011180211803118041180511806118071180811809118101181111812118131181411815118161181711818118191182011821118221182311824118251182611827118281182911830118311183211833118341183511836118371183811839118401184111842118431184411845118461184711848118491185011851118521185311854118551185611857118581185911860118611186211863118641186511866118671186811869118701187111872118731187411875118761187711878118791188011881118821188311884118851188611887118881188911890118911189211893118941189511896118971189811899119001190111902119031190411905119061190711908119091191011911119121191311914119151191611917119181191911920119211192211923119241192511926119271192811929119301193111932119331193411935119361193711938119391194011941119421194311944119451194611947119481194911950119511195211953119541195511956119571195811959119601196111962119631196411965119661196711968119691197011971119721197311974119751197611977119781197911980119811198211983119841198511986119871198811989119901199111992119931199411995119961199711998119991200012001120021200312004120051200612007120081200912010120111201212013120141201512016120171201812019120201202112022120231202412025120261202712028120291203012031120321203312034120351203612037120381203912040120411204212043120441204512046120471204812049120501205112052120531205412055120561205712058120591206012061120621206312064120651206612067120681206912070120711207212073120741207512076120771207812079120801208112082120831208412085120861208712088120891209012091120921209312094120951209612097120981209912100121011210212103121041210512106121071210812109121101211112112121131211412115121161211712118121191212012121121221212312124121251212612127121281212912130121311213212133121341213512136121371213812139121401214112142121431214412145121461214712148121491215012151121521215312154121551215612157121581215912160121611216212163121641216512166121671216812169121701217112172121731217412175121761217712178121791218012181121821218312184121851218612187121881218912190121911219212193121941219512196121971219812199122001220112202122031220412205122061220712208122091221012211122121221312214122151221612217122181221912220122211222212223122241222512226122271222812229122301223112232122331223412235122361223712238122391224012241122421224312244122451224612247122481224912250122511225212253122541225512256122571225812259122601226112262122631226412265122661226712268122691227012271122721227312274122751227612277122781227912280122811228212283122841228512286122871228812289122901229112292122931229412295122961229712298122991230012301123021230312304123051230612307123081230912310123111231212313123141231512316123171231812319123201232112322123231232412325123261232712328123291233012331123321233312334123351233612337123381233912340123411234212343123441234512346123471234812349123501235112352123531235412355123561235712358123591236012361123621236312364123651236612367123681236912370123711237212373123741237512376123771237812379123801238112382123831238412385123861238712388123891239012391123921239312394123951239612397123981239912400124011240212403124041240512406124071240812409124101241112412124131241412415124161241712418124191242012421124221242312424124251242612427124281242912430124311243212433124341243512436124371243812439124401244112442124431244412445124461244712448124491245012451124521245312454124551245612457124581245912460124611246212463124641246512466124671246812469124701247112472124731247412475124761247712478124791248012481124821248312484124851248612487124881248912490124911249212493124941249512496124971249812499125001250112502125031250412505125061250712508125091251012511125121251312514125151251612517125181251912520125211252212523125241252512526125271252812529125301253112532125331253412535125361253712538125391254012541125421254312544125451254612547125481254912550125511255212553125541255512556125571255812559125601256112562125631256412565125661256712568125691257012571125721257312574125751257612577125781257912580125811258212583125841258512586125871258812589125901259112592125931259412595125961259712598125991260012601126021260312604126051260612607126081260912610126111261212613126141261512616126171261812619126201262112622126231262412625126261262712628126291263012631126321263312634126351263612637126381263912640126411264212643126441264512646126471264812649126501265112652126531265412655126561265712658126591266012661126621266312664126651266612667126681266912670126711267212673126741267512676126771267812679126801268112682126831268412685126861268712688126891269012691126921269312694126951269612697126981269912700127011270212703127041270512706127071270812709127101271112712127131271412715127161271712718127191272012721127221272312724127251272612727127281272912730127311273212733127341273512736127371273812739127401274112742127431274412745127461274712748127491275012751127521275312754127551275612757127581275912760127611276212763127641276512766127671276812769127701277112772127731277412775127761277712778127791278012781127821278312784127851278612787127881278912790127911279212793127941279512796127971279812799128001280112802128031280412805128061280712808128091281012811128121281312814128151281612817128181281912820128211282212823128241282512826128271282812829128301283112832128331283412835128361283712838128391284012841128421284312844128451284612847128481284912850128511285212853128541285512856128571285812859128601286112862128631286412865128661286712868128691287012871128721287312874128751287612877128781287912880128811288212883128841288512886128871288812889128901289112892128931289412895128961289712898128991290012901129021290312904129051290612907129081290912910129111291212913129141291512916129171291812919129201292112922129231292412925129261292712928129291293012931129321293312934129351293612937129381293912940129411294212943129441294512946129471294812949129501295112952129531295412955129561295712958129591296012961129621296312964129651296612967129681296912970129711297212973129741297512976129771297812979129801298112982129831298412985129861298712988129891299012991129921299312994129951299612997129981299913000130011300213003130041300513006130071300813009130101301113012130131301413015130161301713018130191302013021130221302313024130251302613027130281302913030130311303213033130341303513036130371303813039130401304113042130431304413045130461304713048130491305013051130521305313054130551305613057130581305913060130611306213063130641306513066130671306813069130701307113072130731307413075130761307713078130791308013081130821308313084130851308613087130881308913090130911309213093130941309513096130971309813099131001310113102131031310413105131061310713108131091311013111131121311313114131151311613117131181311913120131211312213123131241312513126131271312813129131301313113132131331313413135131361313713138131391314013141131421314313144131451314613147131481314913150131511315213153131541315513156131571315813159131601316113162131631316413165131661316713168131691317013171131721317313174131751317613177131781317913180131811318213183131841318513186131871318813189131901319113192131931319413195131961319713198131991320013201132021320313204132051320613207132081320913210132111321213213132141321513216132171321813219132201322113222132231322413225132261322713228132291323013231132321323313234132351323613237132381323913240132411324213243132441324513246132471324813249132501325113252132531325413255132561325713258132591326013261132621326313264132651326613267132681326913270132711327213273132741327513276132771327813279132801328113282132831328413285132861328713288132891329013291132921329313294132951329613297132981329913300133011330213303133041330513306133071330813309133101331113312133131331413315133161331713318133191332013321133221332313324133251332613327133281332913330133311333213333133341333513336133371333813339133401334113342133431334413345133461334713348133491335013351133521335313354133551335613357133581335913360133611336213363133641336513366133671336813369133701337113372133731337413375133761337713378133791338013381133821338313384133851338613387133881338913390133911339213393133941339513396133971339813399134001340113402134031340413405134061340713408134091341013411134121341313414134151341613417134181341913420134211342213423134241342513426134271342813429134301343113432134331343413435134361343713438134391344013441134421344313444134451344613447134481344913450134511345213453134541345513456134571345813459134601346113462134631346413465134661346713468134691347013471134721347313474134751347613477134781347913480134811348213483134841348513486134871348813489134901349113492134931349413495134961349713498134991350013501135021350313504135051350613507135081350913510135111351213513135141351513516135171351813519135201352113522135231352413525135261352713528135291353013531135321353313534135351353613537135381353913540135411354213543135441354513546135471354813549135501355113552135531355413555135561355713558135591356013561135621356313564135651356613567135681356913570135711357213573135741357513576135771357813579135801358113582135831358413585135861358713588135891359013591135921359313594135951359613597135981359913600136011360213603136041360513606136071360813609136101361113612136131361413615136161361713618136191362013621136221362313624136251362613627136281362913630136311363213633136341363513636136371363813639136401364113642136431364413645136461364713648136491365013651136521365313654136551365613657136581365913660136611366213663136641366513666136671366813669136701367113672136731367413675136761367713678136791368013681136821368313684136851368613687136881368913690136911369213693136941369513696136971369813699137001370113702137031370413705137061370713708137091371013711137121371313714137151371613717137181371913720137211372213723137241372513726137271372813729137301373113732137331373413735137361373713738137391374013741137421374313744137451374613747137481374913750137511375213753137541375513756137571375813759137601376113762137631376413765137661376713768137691377013771137721377313774137751377613777137781377913780137811378213783137841378513786137871378813789137901379113792137931379413795137961379713798137991380013801138021380313804138051380613807138081380913810138111381213813138141381513816138171381813819138201382113822138231382413825138261382713828138291383013831138321383313834138351383613837138381383913840138411384213843138441384513846138471384813849138501385113852138531385413855138561385713858138591386013861138621386313864138651386613867138681386913870138711387213873138741387513876138771387813879138801388113882138831388413885138861388713888138891389013891138921389313894138951389613897138981389913900139011390213903139041390513906139071390813909139101391113912139131391413915139161391713918139191392013921139221392313924139251392613927139281392913930139311393213933139341393513936139371393813939139401394113942139431394413945139461394713948139491395013951139521395313954139551395613957139581395913960139611396213963139641396513966139671396813969139701397113972139731397413975139761397713978139791398013981139821398313984139851398613987139881398913990139911399213993139941399513996139971399813999140001400114002140031400414005140061400714008140091401014011140121401314014140151401614017140181401914020140211402214023140241402514026140271402814029140301403114032140331403414035140361403714038140391404014041140421404314044140451404614047140481404914050140511405214053140541405514056140571405814059140601406114062140631406414065140661406714068140691407014071140721407314074140751407614077140781407914080140811408214083140841408514086140871408814089140901409114092140931409414095140961409714098140991410014101141021410314104141051410614107141081410914110141111411214113141141411514116141171411814119141201412114122141231412414125141261412714128141291413014131141321413314134141351413614137141381413914140141411414214143141441414514146141471414814149141501415114152141531415414155141561415714158141591416014161141621416314164141651416614167141681416914170141711417214173141741417514176141771417814179141801418114182141831418414185141861418714188141891419014191141921419314194141951419614197141981419914200142011420214203142041420514206142071420814209142101421114212142131421414215142161421714218142191422014221142221422314224142251422614227142281422914230142311423214233142341423514236142371423814239142401424114242142431424414245142461424714248142491425014251142521425314254142551425614257142581425914260142611426214263142641426514266142671426814269142701427114272142731427414275142761427714278142791428014281142821428314284142851428614287142881428914290142911429214293142941429514296142971429814299143001430114302143031430414305143061430714308143091431014311143121431314314143151431614317143181431914320143211432214323143241432514326143271432814329143301433114332143331433414335143361433714338143391434014341143421434314344143451434614347143481434914350143511435214353143541435514356143571435814359143601436114362143631436414365143661436714368143691437014371143721437314374143751437614377143781437914380143811438214383143841438514386143871438814389143901439114392143931439414395143961439714398143991440014401144021440314404144051440614407144081440914410144111441214413144141441514416144171441814419144201442114422144231442414425144261442714428144291443014431144321443314434144351443614437144381443914440144411444214443144441444514446144471444814449144501445114452144531445414455144561445714458144591446014461144621446314464144651446614467144681446914470144711447214473144741447514476144771447814479144801448114482144831448414485144861448714488144891449014491144921449314494144951449614497144981449914500145011450214503145041450514506145071450814509145101451114512145131451414515145161451714518145191452014521145221452314524145251452614527145281452914530145311453214533145341453514536145371453814539145401454114542145431454414545145461454714548145491455014551145521455314554145551455614557145581455914560145611456214563145641456514566145671456814569145701457114572145731457414575145761457714578145791458014581145821458314584145851458614587145881458914590145911459214593145941459514596145971459814599146001460114602146031460414605146061460714608146091461014611146121461314614146151461614617146181461914620146211462214623146241462514626146271462814629146301463114632146331463414635146361463714638146391464014641146421464314644146451464614647146481464914650146511465214653146541465514656146571465814659146601466114662146631466414665146661466714668146691467014671146721467314674146751467614677146781467914680146811468214683146841468514686146871468814689146901469114692146931469414695146961469714698146991470014701147021470314704147051470614707147081470914710147111471214713147141471514716147171471814719147201472114722147231472414725147261472714728147291473014731147321473314734147351473614737147381473914740147411474214743147441474514746147471474814749147501475114752147531475414755147561475714758147591476014761147621476314764147651476614767147681476914770147711477214773147741477514776147771477814779147801478114782147831478414785147861478714788147891479014791147921479314794147951479614797147981479914800148011480214803148041480514806148071480814809148101481114812148131481414815148161481714818148191482014821148221482314824148251482614827148281482914830148311483214833148341483514836148371483814839148401484114842148431484414845148461484714848148491485014851148521485314854148551485614857148581485914860148611486214863148641486514866148671486814869148701487114872148731487414875148761487714878148791488014881148821488314884148851488614887148881488914890148911489214893148941489514896148971489814899149001490114902149031490414905149061490714908149091491014911149121491314914149151491614917149181491914920149211492214923149241492514926149271492814929149301493114932149331493414935149361493714938149391494014941149421494314944149451494614947149481494914950149511495214953149541495514956149571495814959149601496114962149631496414965149661496714968149691497014971149721497314974149751497614977149781497914980149811498214983149841498514986149871498814989149901499114992149931499414995149961499714998149991500015001150021500315004150051500615007150081500915010150111501215013150141501515016150171501815019150201502115022150231502415025150261502715028150291503015031150321503315034150351503615037150381503915040150411504215043150441504515046150471504815049150501505115052150531505415055150561505715058150591506015061150621506315064150651506615067150681506915070150711507215073150741507515076150771507815079150801508115082150831508415085150861508715088150891509015091150921509315094150951509615097150981509915100151011510215103151041510515106151071510815109151101511115112151131511415115151161511715118151191512015121151221512315124151251512615127151281512915130151311513215133151341513515136151371513815139151401514115142151431514415145151461514715148151491515015151151521515315154151551515615157151581515915160151611516215163151641516515166151671516815169151701517115172151731517415175151761517715178151791518015181151821518315184151851518615187151881518915190151911519215193151941519515196151971519815199152001520115202152031520415205152061520715208152091521015211152121521315214152151521615217152181521915220152211522215223152241522515226152271522815229152301523115232152331523415235152361523715238152391524015241152421524315244152451524615247152481524915250152511525215253152541525515256152571525815259152601526115262152631526415265152661526715268152691527015271152721527315274152751527615277152781527915280152811528215283152841528515286152871528815289152901529115292152931529415295152961529715298152991530015301153021530315304153051530615307153081530915310153111531215313153141531515316153171531815319153201532115322153231532415325153261532715328153291533015331153321533315334153351533615337153381533915340153411534215343153441534515346153471534815349153501535115352153531535415355153561535715358153591536015361153621536315364153651536615367153681536915370153711537215373153741537515376153771537815379153801538115382153831538415385153861538715388153891539015391153921539315394153951539615397153981539915400154011540215403154041540515406154071540815409154101541115412154131541415415154161541715418154191542015421154221542315424154251542615427154281542915430154311543215433154341543515436154371543815439154401544115442154431544415445154461544715448154491545015451154521545315454154551545615457154581545915460154611546215463154641546515466154671546815469154701547115472154731547415475154761547715478154791548015481154821548315484154851548615487154881548915490154911549215493154941549515496154971549815499155001550115502155031550415505155061550715508155091551015511155121551315514155151551615517155181551915520155211552215523155241552515526155271552815529155301553115532155331553415535155361553715538155391554015541155421554315544155451554615547155481554915550155511555215553155541555515556155571555815559155601556115562155631556415565155661556715568155691557015571155721557315574155751557615577155781557915580155811558215583155841558515586155871558815589155901559115592155931559415595155961559715598155991560015601156021560315604156051560615607156081560915610156111561215613156141561515616156171561815619156201562115622156231562415625156261562715628156291563015631156321563315634156351563615637156381563915640156411564215643156441564515646156471564815649156501565115652156531565415655156561565715658156591566015661156621566315664156651566615667156681566915670156711567215673156741567515676156771567815679156801568115682156831568415685156861568715688156891569015691156921569315694156951569615697156981569915700157011570215703157041570515706157071570815709157101571115712157131571415715157161571715718157191572015721157221572315724157251572615727157281572915730157311573215733157341573515736157371573815739157401574115742157431574415745157461574715748157491575015751157521575315754157551575615757157581575915760157611576215763157641576515766157671576815769157701577115772157731577415775157761577715778157791578015781157821578315784157851578615787157881578915790157911579215793157941579515796157971579815799158001580115802158031580415805158061580715808158091581015811158121581315814158151581615817158181581915820158211582215823158241582515826158271582815829158301583115832158331583415835158361583715838158391584015841158421584315844158451584615847158481584915850158511585215853158541585515856158571585815859158601586115862158631586415865158661586715868158691587015871158721587315874158751587615877158781587915880158811588215883158841588515886158871588815889158901589115892158931589415895158961589715898158991590015901159021590315904159051590615907159081590915910159111591215913159141591515916159171591815919159201592115922159231592415925159261592715928159291593015931159321593315934159351593615937159381593915940159411594215943159441594515946159471594815949159501595115952159531595415955159561595715958159591596015961159621596315964159651596615967159681596915970159711597215973159741597515976159771597815979159801598115982159831598415985159861598715988159891599015991159921599315994159951599615997159981599916000160011600216003160041600516006160071600816009160101601116012160131601416015160161601716018160191602016021160221602316024160251602616027160281602916030160311603216033160341603516036160371603816039160401604116042160431604416045160461604716048160491605016051160521605316054160551605616057160581605916060160611606216063160641606516066160671606816069160701607116072160731607416075160761607716078160791608016081160821608316084160851608616087160881608916090160911609216093160941609516096160971609816099161001610116102161031610416105161061610716108161091611016111161121611316114161151611616117161181611916120161211612216123161241612516126161271612816129161301613116132161331613416135161361613716138161391614016141161421614316144161451614616147161481614916150161511615216153161541615516156161571615816159161601616116162161631616416165161661616716168161691617016171161721617316174161751617616177161781617916180161811618216183161841618516186161871618816189161901619116192161931619416195161961619716198161991620016201162021620316204162051620616207162081620916210162111621216213162141621516216162171621816219162201622116222162231622416225162261622716228162291623016231162321623316234162351623616237162381623916240162411624216243162441624516246162471624816249162501625116252162531625416255162561625716258162591626016261162621626316264162651626616267162681626916270162711627216273162741627516276162771627816279162801628116282162831628416285162861628716288162891629016291162921629316294162951629616297162981629916300163011630216303 |
- From: Matthias Schiffer <mschiffer@universe-factory.net>
- Date: Fri, 29 Jul 2016 21:36:45 +0200
- Subject: mac80211, hostapd, iw, ...: update to LEDE b2ddfbc1c7b935cf931b4c336969b65947270ce9
- diff --git a/package/firmware/ath10k-firmware/Makefile b/package/firmware/ath10k-firmware/Makefile
- index b03d644..e2cf92e 100644
- --- a/package/firmware/ath10k-firmware/Makefile
- +++ b/package/firmware/ath10k-firmware/Makefile
- @@ -8,7 +8,7 @@
- include $(TOPDIR)/rules.mk
-
- PKG_NAME:=ath10k-firmware
- -PKG_SOURCE_VERSION:=77f72b5f7dd940386d9e619a17904987759b7186
- +PKG_SOURCE_VERSION:=b00eb8d30fbebb6a5047ccacefa8c37e072fca9c
- PKG_VERSION:=2014-11-13-$(PKG_SOURCE_VERSION)
- PKG_RELEASE:=1
-
- @@ -17,7 +17,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
- PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
- PKG_SOURCE_URL:=https://github.com/kvalo/ath10k-firmware.git
-
- -PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
- +PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
-
- include $(INCLUDE_DIR)/package.mk
-
- @@ -28,14 +28,19 @@ define Package/ath10k-firmware-default
- CATEGORY:=Kernel modules
- SUBMENU:=$(WMENU)
- URL:=$(PKG_SOURCE_URL)
- + DEPENDS:=
- endef
-
- define Package/ath10k-firmware-qca988x
- $(Package/ath10k-firmware-default)
- + DEFAULT:=PACKAGE_kmod-ath10k
- TITLE:=ath10k firmware for QCA988x devices
- endef
-
- QCA988X_FIRMWARE_FILE:=firmware-5.bin_10.2.4.97-1
- +QCA988X_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-16.1.bin-lede
- +QCA99X0_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-7.bin-lede.001
- +QCA9984_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-7.bin-lede.001
-
- define Download/ath10k-firmware-qca988x
- URL:=https://www.codeaurora.org/cgit/quic/qsdk/oss/firmware/ath10k-firmware/plain/10.2.4/
- @@ -44,11 +49,83 @@ define Download/ath10k-firmware-qca988x
- endef
- $(eval $(call Download,ath10k-firmware-qca988x))
-
- +define Download/ath10k-firmware-qca988x-ct
- + URL:=https://www.candelatech.com/downloads/
- + FILE:=$(QCA988X_FIRMWARE_FILE_CT)
- + MD5SUM:=d7e081e9782936ed544b78994c9133fb
- +endef
- +$(eval $(call Download,ath10k-firmware-qca988x-ct))
- +
- +define Download/ath10k-firmware-qca99x0-ct
- + URL:=https://www.candelatech.com/downloads/ath10k-10-4/
- + FILE:=$(QCA99X0_FIRMWARE_FILE_CT)
- + MD5SUM:=eb710949ff79142954aadae24616169c
- +endef
- +$(eval $(call Download,ath10k-firmware-qca99x0-ct))
- +
- +define Download/ath10k-firmware-qca9984-ct
- + URL:=https://www.candelatech.com/downloads/ath10k-9984-10-4/
- + FILE:=$(QCA9984_FIRMWARE_FILE_CT)
- + MD5SUM:=747cc1394f15aef97b5ea15e4c208e58
- +endef
- +$(eval $(call Download,ath10k-firmware-qca9984-ct))
- +
- define Package/ath10k-firmware-qca99x0
- $(Package/ath10k-firmware-default)
- TITLE:=ath10k firmware for QCA99x0 devices
- endef
-
- +define Package/ath10k-firmware-qca988x-ct
- +$(Package/ath10k-firmware-default)
- + TITLE:=ath10k CT 10.1 firmware for QCA988x devices
- +endef
- +
- +define Package/ath10k-firmware-qca988x-ct/description
- +Alternative ath10k firmware for QCA988X from Candela Technologies.
- +Enables IBSS and other features. See:
- +http://www.candelatech.com/ath10k-10.1.php
- +This firmware will NOT be used unless the standard ath10k-firmware-qca988x
- +is un-selected since the driver will try to load firmware-5.bin before
- +firmware-2.bin
- +endef
- +
- +define Package/ath10k-firmware-qca99x0-ct/description
- +Alternative ath10k firmware for QCA99x0 from Candela Technologies.
- +Enables IBSS and other features. See:
- +http://www.candelatech.com/ath10k-10.4.php
- +This firmware conflicts with the standard 99x0 firmware, so select only
- +one.
- +endef
- +
- +define Package/ath10k-firmware-qca9984-ct/description
- +Alternative ath10k firmware for QCA9984 from Candela Technologies.
- +Enables IBSS and other features. See:
- +http://www.candelatech.com/ath10k-10.4-9984.php
- +This firmware conflicts with the standard 9984 firmware, so select only
- +one.
- +endef
- +
- +define Package/ath10k-firmware-qca99x0/description
- +Standard ath10k firmware for QCA99x0 from QCA
- +This firmware conflicts with the CT 99x0 firmware, so select only
- +one.
- +endef
- +
- +define Package/ath10k-firmware-qca99x0-ct
- +$(Package/ath10k-firmware-default)
- + TITLE:=ath10k CT 10.4.3 firmware for QCA99x0 devices
- +endef
- +
- +define Package/ath10k-firmware-qca9984-ct
- +$(Package/ath10k-firmware-default)
- + TITLE:=ath10k CT 10.4.3 firmware for QCA9984 devices
- +endef
- +
- +define Package/ath10k-firmware-qca9984
- +$(Package/ath10k-firmware-default)
- + TITLE:=ath10k firmware for QCA9984 devices
- +endef
- +
- define Package/ath10k-firmware-qca6174
- $(Package/ath10k-firmware-default)
- TITLE:=ath10k firmware for QCA6174 devices
- @@ -58,8 +135,8 @@ QCA99X0_BOARD_REV:=ddcec9efd245da9365c474f513a855a55f3ac7fe
- QCA99X0_BOARD_FILE:=board-2.bin.$(QCA99X0_BOARD_REV)
-
- define Download/qca99x0-board
- - URL:=https://www.codeaurora.org/cgit/quic/qsdk/oss/firmware/ath10k-firmware/plain/ath10k/QCA99X0/hw2.0
- - URL_FILE:=board-2.bin?id=ddcec9efd245da9365c474f513a855a55f3ac7fe
- + URL:=https://source.codeaurora.org/quic/qsdk/oss/firmware/ath10k-firmware/plain/ath10k/QCA99X0/hw2.0
- + URL_FILE:=board-2.bin?id=$(QCA99X0_BOARD_REV)
- FILE:=$(QCA99X0_BOARD_FILE)
- MD5SUM:=a2b3c653c2363a5641200051d6333d0a
- endef
- @@ -79,6 +156,16 @@ define Package/ath10k-firmware-qca988x/install
- $(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-5.bin
- endef
-
- +define Package/ath10k-firmware-qca988x-ct/install
- + $(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA988X/hw2.0
- + $(INSTALL_DATA) \
- + $(PKG_BUILD_DIR)/QCA988X/board.bin \
- + $(1)/lib/firmware/ath10k/QCA988X/hw2.0/
- + $(INSTALL_DATA) \
- + $(DL_DIR)/$(QCA988X_FIRMWARE_FILE_CT) \
- + $(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-2.bin
- +endef
- +
- define Package/ath10k-firmware-qca6174/install
- $(INSTALL_DIR) $(1)/lib/firmware/ath10k
- $(CP) $(PKG_BUILD_DIR)/QCA6174 $(1)/lib/firmware/ath10k/
- @@ -97,6 +184,50 @@ define Package/ath10k-firmware-qca99x0/install
- $(1)/lib/firmware/ath10k/QCA99X0/hw2.0/firmware-5.bin
- endef
-
- +define Package/ath10k-firmware-qca99x0-ct/install
- + $(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA99X0/hw2.0
- + $(INSTALL_DATA) \
- + $(DL_DIR)/$(QCA99X0_BOARD_FILE) \
- + $(1)/lib/firmware/ath10k/QCA99X0/hw2.0/board-2.bin
- + $(INSTALL_DATA) \
- + $(PKG_BUILD_DIR)/QCA99X0/hw2.0/boardData_AR900B_CUS239_5G_v2_001.bin \
- + $(1)/lib/firmware/ath10k/QCA99X0/hw2.0/board.bin
- + $(INSTALL_DATA) \
- + $(DL_DIR)/$(QCA99X0_FIRMWARE_FILE_CT) \
- + $(1)/lib/firmware/ath10k/QCA99X0/hw2.0/firmware-5.bin
- +endef
- +
- +define Package/ath10k-firmware-qca9984/install
- + $(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA9984/hw1.0
- + ln -s \
- + ../../cal-pci-0000:01:00.0.bin \
- + $(1)/lib/firmware/ath10k/QCA9984/hw1.0/board.bin
- + $(INSTALL_DATA) \
- + $(PKG_BUILD_DIR)/QCA9984/hw1.0/board-2.bin \
- + $(1)/lib/firmware/ath10k/QCA9984/hw1.0/board-2.bin
- + $(INSTALL_DATA) \
- + $(PKG_BUILD_DIR)/QCA9984/hw1.0/firmware-5.bin_10.4-3.2-00072 \
- + $(1)/lib/firmware/ath10k/QCA9984/hw1.0/firmware-5.bin
- +endef
- +
- +define Package/ath10k-firmware-qca9984-ct/install
- + $(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA9984/hw1.0
- + ln -s \
- + ../../cal-pci-0000:01:00.0.bin \
- + $(1)/lib/firmware/ath10k/QCA9984/hw1.0/board.bin
- + $(INSTALL_DATA) \
- + $(PKG_BUILD_DIR)/QCA9984/hw1.0/board-2.bin \
- + $(1)/lib/firmware/ath10k/QCA9984/hw1.0/board-2.bin
- + $(INSTALL_DATA) \
- + $(DL_DIR)/$(QCA9984_FIRMWARE_FILE_CT) \
- + $(1)/lib/firmware/ath10k/QCA9984/hw1.0/firmware-5.bin
- +endef
- +
- $(eval $(call BuildPackage,ath10k-firmware-qca988x))
- $(eval $(call BuildPackage,ath10k-firmware-qca99x0))
- $(eval $(call BuildPackage,ath10k-firmware-qca6174))
- +$(eval $(call BuildPackage,ath10k-firmware-qca9984))
- +
- +$(eval $(call BuildPackage,ath10k-firmware-qca988x-ct))
- +$(eval $(call BuildPackage,ath10k-firmware-qca99x0-ct))
- +$(eval $(call BuildPackage,ath10k-firmware-qca9984-ct))
- diff --git a/package/firmware/linux-firmware/Makefile b/package/firmware/linux-firmware/Makefile
- index 2fcd93b..7a2e977 100644
- --- a/package/firmware/linux-firmware/Makefile
- +++ b/package/firmware/linux-firmware/Makefile
- @@ -16,10 +16,10 @@ PKG_SOURCE_PROTO:=git
- PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
- PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
- PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
- -PKG_SOURCE_URL:=git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
- -PKG_MIRROR_MD5SUM:=ca4d289ad9380471cae376fc7dd3660a
- +PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
- +PKG_MIRROR_MD5SUM:=8d44332359de89b1936b4ff608a72614
-
- -PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
- +PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
-
- SCAN_DEPS = *.mk
-
- diff --git a/package/firmware/linux-firmware/realtek.mk b/package/firmware/linux-firmware/realtek.mk
- index 0f8b1ce..4229ca0 100644
- --- a/package/firmware/linux-firmware/realtek.mk
- +++ b/package/firmware/linux-firmware/realtek.mk
- @@ -43,8 +43,15 @@ endef
- $(eval $(call BuildPackage,rtl8192de-firmware))
-
- Package/rtl8192se-firmware = $(call Package/firmware-default,RealTek RTL8192SE firmware)
- -define KernelPackage/rtl8192se/install
- +define Package/rtl8192se-firmware/install
- $(INSTALL_DIR) $(1)/lib/firmware/rtlwifi
- $(INSTALL_DATA) $(PKG_BUILD_DIR)/rtlwifi/rtl8192sefw.bin $(1)/lib/firmware/rtlwifi
- endef
- $(eval $(call BuildPackage,rtl8192se-firmware))
- +
- +Package/rtl8192su-firmware = $(call Package/firmware-default,RealTek RTL8192SU firmware)
- +define Package/rtl8192su-firmware/install
- + $(INSTALL_DIR) $(1)/lib/firmware/rtlwifi
- + $(INSTALL_DATA) $(PKG_BUILD_DIR)/rtlwifi/rtl8712u.bin $(1)/lib/firmware/rtlwifi
- +endef
- +$(eval $(call BuildPackage,rtl8192su-firmware))
- diff --git a/package/kernel/acx-mac80211/Makefile b/package/kernel/acx-mac80211/Makefile
- index 1820e7a..8fce374 100644
- --- a/package/kernel/acx-mac80211/Makefile
- +++ b/package/kernel/acx-mac80211/Makefile
- @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
- include $(INCLUDE_DIR)/kernel.mk
-
- PKG_NAME:=acx-mac80211
- -PKG_REV:=v20130127
- -PKG_VERSION:=20130909
- +PKG_REV:=b6fc31491020cb01d2cd1acc170cfa03ced7e726
- +PKG_VERSION:=20140216
- PKG_RELEASE:=1
-
- PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
- -PKG_SOURCE_URL:=git://acx100.git.sourceforge.net/gitroot/acx100/acx-mac80211
- +PKG_SOURCE_URL:=http://git.code.sf.net/p/acx100/acx-mac80211
- PKG_SOURCE_PROTO:=git
- PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
- PKG_SOURCE_VERSION:=$(PKG_REV)
- @@ -190,7 +190,7 @@ define Build/Compile
- CROSS_COMPILE="$(TARGET_CROSS)" \
- SUBDIRS="$(PKG_BUILD_DIR)" \
- $(PKG_EXTRA_KCONFIG) \
- - EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS) -DCONFIG_ACX_MAC80211_VERSION=\"KERNEL_VERSION(3,14,0)\"" \
- + EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS) -DCONFIG_ACX_MAC80211_VERSION=\"KERNEL_VERSION(4,2,0)\"" \
- LINUXINCLUDE="-I$(STAGING_DIR)/usr/include/mac80211-backport/uapi -I$(STAGING_DIR)/usr/include/mac80211-backport \
- -I$(STAGING_DIR)/usr/include/mac80211/uapi -I$(STAGING_DIR)/usr/include/mac80211 \
- -I$(LINUX_DIR)/include -I$(LINUX_DIR)/include/$(LINUX_UAPI_DIR) \
- diff --git a/package/kernel/acx-mac80211/patches/001-pci-mem-Fix-3.8-build.patch b/package/kernel/acx-mac80211/patches/001-pci-mem-Fix-3.8-build.patch
- deleted file mode 100644
- index fa4a6be..0000000
- --- a/package/kernel/acx-mac80211/patches/001-pci-mem-Fix-3.8-build.patch
- +++ /dev/null
- @@ -1,129 +0,0 @@
- -From 8a0f5890019bf43f4bc95ef0754b062ddfcfa9cd Mon Sep 17 00:00:00 2001
- -From: Oliver Winker <oliver@oli1170.net>
- -Date: Sun, 10 Mar 2013 21:04:23 +0100
- -Subject: [PATCH 1/3] pci, mem: Fix 3.8 build
- -
- -__devexit and __devinit not used anymore in 3.8
- -
- -Signed-off-by: Reinhard Karcher <reinhard.karcher@gmx.net>
- -Signed-off-by: Oliver Winker <oliver@oli1170.net>
- ----
- - mem.c | 13 ++++++++++++-
- - pci.c | 26 +++++++++++++++++++++++++-
- - 2 files changed, 37 insertions(+), 2 deletions(-)
- -
- ---- a/mem.c
- -+++ b/mem.c
- -@@ -2216,7 +2216,11 @@ int acx100mem_ioctl_set_phy_amp_bias(str
- - * ==================================================
- - */
- -
- -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
- - static int __devinit acxmem_probe(struct platform_device *pdev)
- -+#else
- -+static int acxmem_probe(struct platform_device *pdev)
- -+#endif
- - {
- - acx_device_t *adev = NULL;
- - const char *chip_name;
- -@@ -2392,7 +2396,11 @@ static int __devinit acxmem_probe(struct
- - * pdev - ptr to PCI device structure containing info about pci
- - * configuration
- - */
- -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
- - static int __devexit acxmem_remove(struct platform_device *pdev)
- -+#else
- -+static int acxmem_remove(struct platform_device *pdev)
- -+#endif
- - {
- - struct ieee80211_hw *hw = (struct ieee80211_hw *)
- - platform_get_drvdata(pdev);
- -@@ -2594,8 +2602,11 @@ static struct platform_driver acxmem_dri
- - .name = "acx-mem",
- - },
- - .probe = acxmem_probe,
- -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
- - .remove = __devexit_p(acxmem_remove),
- --
- -+#else
- -+ .remove = acxmem_remove,
- -+#endif
- - #ifdef CONFIG_PM
- - .suspend = acxmem_e_suspend,
- - .resume = acxmem_e_resume
- ---- a/pci.c
- -+++ b/pci.c
- -@@ -1039,7 +1039,11 @@ int acx100pci_ioctl_set_phy_amp_bias(str
- - * id - ptr to the device id entry that matched this device
- - */
- - #ifdef CONFIG_PCI
- -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
- - static int __devinit acxpci_probe(struct pci_dev *pdev,
- -+#else
- -+static int acxpci_probe(struct pci_dev *pdev,
- -+#endif
- - const struct pci_device_id *id)
- - {
- - unsigned long mem_region1 = 0;
- -@@ -1292,7 +1296,11 @@ static int __devinit acxpci_probe(struct
- - *
- - * pdev - ptr to PCI device structure containing info about pci configuration
- - */
- -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
- - static void __devexit acxpci_remove(struct pci_dev *pdev)
- -+#else
- -+static void acxpci_remove(struct pci_dev *pdev)
- -+#endif
- - {
- - struct ieee80211_hw *hw
- - = (struct ieee80211_hw *) pci_get_drvdata(pdev);
- -@@ -1505,7 +1513,11 @@ static struct pci_driver acxpci_driver =
- - .name = "acx_pci",
- - .id_table = acxpci_id_tbl,
- - .probe = acxpci_probe,
- -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
- - .remove = __devexit_p(acxpci_remove),
- -+#else
- -+ .remove = acxpci_remove,
- -+#endif
- - #ifdef CONFIG_PM
- - .suspend = acxpci_e_suspend,
- - .resume = acxpci_e_resume
- -@@ -1603,8 +1615,12 @@ static struct vlynq_device_id acx_vlynq_
- - };
- -
- -
- -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
- - static __devinit int vlynq_probe(struct vlynq_device *vdev,
- -- struct vlynq_device_id *id)
- -+#else
- -+static int vlynq_probe(struct vlynq_device *vdev,
- -+#endif
- -+ struct vlynq_device_id *id)
- - {
- - int result = -EIO, i;
- - u32 addr;
- -@@ -1785,7 +1801,11 @@ static __devinit int vlynq_probe(struct
- - return result;
- - }
- -
- -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
- - static __devexit void vlynq_remove(struct vlynq_device *vdev)
- -+#else
- -+static void vlynq_remove(struct vlynq_device *vdev)
- -+#endif
- - {
- - struct ieee80211_hw *hw = vlynq_get_drvdata(vdev);
- - acx_device_t *adev = hw2adev(hw);
- -@@ -1851,7 +1871,11 @@ static struct vlynq_driver acxvlynq_driv
- - .name = "acx_vlynq",
- - .id_table = acx_vlynq_id,
- - .probe = vlynq_probe,
- -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
- - .remove = __devexit_p(vlynq_remove),
- -+#else
- -+ .remove = vlynq_remove,
- -+#endif
- - };
- - #endif /* CONFIG_VLYNQ */
- -
- diff --git a/package/kernel/acx-mac80211/patches/003-Fix-3.10-build.patch b/package/kernel/acx-mac80211/patches/003-Fix-3.10-build.patch
- deleted file mode 100644
- index c737844..0000000
- --- a/package/kernel/acx-mac80211/patches/003-Fix-3.10-build.patch
- +++ /dev/null
- @@ -1,31 +0,0 @@
- -From 1daf4bfdb072b08f3b4e412bbfa9645f88dc0a01 Mon Sep 17 00:00:00 2001
- -From: Oliver Winker <oliver@oli1170.net>
- -Date: Tue, 3 Sep 2013 20:36:36 +0200
- -Subject: [PATCH 3/3] Fix 3.10 build
- -
- -Signed-off-by: Reinhard Karcher <reinhard.karcher@gmx.net>
- -Signed-off-by: Oliver Winker <oliver@oli1170.net>
- ----
- - main.c | 7 +++++++
- - 1 file changed, 7 insertions(+)
- -
- ---- a/main.c
- -+++ b/main.c
- -@@ -682,10 +682,17 @@ int acx_op_config(struct ieee80211_hw *h
- -
- - if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
- - logf1(L_DEBUG, "IEEE80211_CONF_CHANGE_CHANNEL,"
- -+#if CONFIG_ACX_MAC80211_VERSION >= KERNEL_VERSION(3, 10, 0)
- -+ "channel->hw_value=%i\n", conf->chandef.chan->hw_value);
- -+
- -+ acx_set_channel(adev, conf->chandef.chan->hw_value,
- -+ conf->chandef.chan->center_freq);
- -+#else
- - "channel->hw_value=%i\n", conf->channel->hw_value);
- -
- - acx_set_channel(adev, conf->channel->hw_value,
- - conf->channel->center_freq);
- -+#endif
- -
- - changed_not_done &= ~IEEE80211_CONF_CHANGE_CHANNEL;
- - }
- diff --git a/package/kernel/acx-mac80211/patches/004-Fix-3.14-build.patch b/package/kernel/acx-mac80211/patches/004-Fix-3.14-build.patch
- deleted file mode 100644
- index 847b573..0000000
- --- a/package/kernel/acx-mac80211/patches/004-Fix-3.14-build.patch
- +++ /dev/null
- @@ -1,22 +0,0 @@
- -From d17fcac710e629463591f6bd09d76b66ec591583 Mon Sep 17 00:00:00 2001
- -From: Hauke Mehrtens <hauke@hauke-m.de>
- -Date: Wed, 5 Feb 2014 20:57:07 +0100
- -Subject: [PATCH] Fix 3.14 build
- -
- -Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
- ----
- - main.c | 2 ++
- - 1 file changed, 2 insertions(+)
- -
- ---- a/main.c
- -+++ b/main.c
- -@@ -500,7 +500,9 @@ int acx_init_ieee80211(acx_device_t *ade
- - hw->flags &= ~IEEE80211_HW_RX_INCLUDES_FCS;
- - hw->queues = 1;
- - hw->wiphy->max_scan_ssids = 1;
- -+#if CONFIG_ACX_MAC80211_VERSION < KERNEL_VERSION(3, 14, 0)
- - hw->channel_change_time = 10000;
- -+#endif
- -
- - /* OW TODO Check if RTS/CTS threshold can be included here */
- -
- diff --git a/package/kernel/acx-mac80211/patches/300-api_sync.patch b/package/kernel/acx-mac80211/patches/300-api_sync.patch
- new file mode 100644
- index 0000000..94d6135
- --- /dev/null
- +++ b/package/kernel/acx-mac80211/patches/300-api_sync.patch
- @@ -0,0 +1,83 @@
- +--- a/main.c
- ++++ b/main.c
- +@@ -497,7 +497,7 @@ int acx_free_mechanics(acx_device_t *ade
- +
- + int acx_init_ieee80211(acx_device_t *adev, struct ieee80211_hw *hw)
- + {
- +- hw->flags &= ~IEEE80211_HW_RX_INCLUDES_FCS;
- ++ __clear_bit(IEEE80211_HW_RX_INCLUDES_FCS, hw->flags);
- + hw->queues = 1;
- + hw->wiphy->max_scan_ssids = 1;
- +
- +@@ -525,14 +525,14 @@ int acx_init_ieee80211(acx_device_t *ade
- + /* We base signal quality on winlevel approach of previous driver
- + * TODO OW 20100615 This should into a common init code
- + */
- +- hw->flags |= IEEE80211_HW_SIGNAL_UNSPEC;
- ++ __set_bit(IEEE80211_HW_SIGNAL_UNSPEC, hw->flags);
- + hw->max_signal = 100;
- +
- + if (IS_ACX100(adev)) {
- +- adev->hw->wiphy->bands[IEEE80211_BAND_2GHZ] =
- ++ adev->hw->wiphy->bands[NL80211_BAND_2GHZ] =
- + &acx100_band_2GHz;
- + } else if (IS_ACX111(adev))
- +- adev->hw->wiphy->bands[IEEE80211_BAND_2GHZ] =
- ++ adev->hw->wiphy->bands[NL80211_BAND_2GHZ] =
- + &acx111_band_2GHz;
- + else {
- + log(L_ANY, "Error: Unknown device");
- +@@ -945,8 +945,8 @@ void acx_op_configure_filter(struct ieee
- + changed_flags, *total_flags);
- +
- + /* OWI TODO: Set also FIF_PROBE_REQ ? */
- +- *total_flags &= (FIF_PROMISC_IN_BSS | FIF_ALLMULTI | FIF_FCSFAIL
- +- | FIF_CONTROL | FIF_OTHER_BSS);
- ++ *total_flags &= (FIF_ALLMULTI | FIF_FCSFAIL | FIF_CONTROL
- ++ | FIF_OTHER_BSS);
- +
- + logf1(L_DEBUG, "2: *total_flags=0x%08x\n", *total_flags);
- +
- +@@ -1045,9 +1045,10 @@ void acx_op_tx(struct ieee80211_hw *hw,
- + }
- +
- + int acx_op_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
- +- struct cfg80211_scan_request *req)
- ++ struct ieee80211_scan_request *hw_req)
- + {
- + acx_device_t *adev = hw2adev(hw);
- ++ struct cfg80211_scan_request *req = &hw_req->req;
- + struct sk_buff *skb;
- + size_t ssid_len = 0;
- + u8 *ssid = NULL;
- +@@ -1082,7 +1083,7 @@ int acx_op_hw_scan(struct ieee80211_hw *
- + goto out;
- + }
- + #else
- +- skb = ieee80211_probereq_get(adev->hw, adev->vif, ssid, ssid_len,
- ++ skb = ieee80211_probereq_get(adev->hw, vif->addr, ssid, ssid_len,
- + req->ie_len);
- + if (!skb) {
- + ret = -ENOMEM;
- +--- a/main.h
- ++++ b/main.h
- +@@ -62,7 +62,7 @@ void acx_op_tx(struct ieee80211_hw *hw,
- + #endif
- +
- + int acx_op_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
- +- struct cfg80211_scan_request *req);
- ++ struct ieee80211_scan_request *req);
- +
- + int acx_recover_hw(acx_device_t *adev);
- +
- +--- a/cardsetting.c
- ++++ b/cardsetting.c
- +@@ -159,7 +159,7 @@ int acx_set_channel(acx_device_t *adev,
- + int res = 0;
- +
- + adev->rx_status.freq = freq;
- +- adev->rx_status.band = IEEE80211_BAND_2GHZ;
- ++ adev->rx_status.band = NL80211_BAND_2GHZ;
- +
- + adev->channel = channel;
- +
- diff --git a/package/kernel/ath10k-ct/Makefile b/package/kernel/ath10k-ct/Makefile
- new file mode 100644
- index 0000000..7a025aa
- --- /dev/null
- +++ b/package/kernel/ath10k-ct/Makefile
- @@ -0,0 +1,80 @@
- +include $(TOPDIR)/rules.mk
- +
- +PKG_NAME:=ath10k-ct
- +PKG_VERSION:=2016-07-21
- +PKG_RELEASE=1
- +
- +PKG_LICENSE:=GPLv2
- +PKG_LICENSE_FILES:=
- +
- +PKG_SOURCE_URL:=https://github.com/greearb/ath10k-ct.git
- +PKG_SOURCE_PROTO:=git
- +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
- +PKG_SOURCE_VERSION:=a142524abc8eef3ba30b12f9b5ac74385c8ddc39
- +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
- +
- +PKG_MAINTAINER:=Ben Greear <greearb@candelatech.com>
- +PKG_BUILD_PARALLEL:=1
- +
- +STAMP_CONFIGURED_DEPENDS := $(STAGING_DIR)/usr/include/mac80211-backport/backport/autoconf.h
- +
- +include $(INCLUDE_DIR)/kernel.mk
- +include $(INCLUDE_DIR)/package.mk
- +
- +define KernelPackage/ath10k-ct
- + SUBMENU:=Wireless Drivers
- + TITLE:=ath10k-ct driver optimized for CT ath10k firmware
- + DEPENDS:=+kmod-mac80211 +kmod-ath +@DRIVER_11N_SUPPORT @PCI_SUPPORT
- + FILES:=\
- + $(PKG_BUILD_DIR)/ath10k/ath10k_pci.ko \
- + $(PKG_BUILD_DIR)/ath10k/ath10k_core.ko
- + AUTOLOAD:=$(call AutoLoad,50,mac80211 ath ath10k_core ath10k_pci)
- +endef
- +
- +NOSTDINC_FLAGS = \
- + -I$(PKG_BUILD_DIR) \
- + -I$(STAGING_DIR)/usr/include/mac80211-backport/uapi \
- + -I$(STAGING_DIR)/usr/include/mac80211-backport \
- + -I$(STAGING_DIR)/usr/include/mac80211/uapi \
- + -I$(STAGING_DIR)/usr/include/mac80211 \
- + -include backport/autoconf.h \
- + -include backport/backport.h
- +
- +ifdef CONFIG_PACKAGE_MAC80211_MESH
- + NOSTDINC_FLAGS += -DCONFIG_MAC80211_MESH
- +endif
- +
- +CT_MAKEDEFS += CONFIG_ATH10K=m CONFIG_ATH10K_PCI=m
- +# No AHB support enabled yet. Could conditionally enable it later.
- +#CT_MAKEDEFS += CONFIG_ATH10K_AHB=y
- +#NOSTDINC_FLAGS += -DCONFIG_ATH10K_AHB
- +NOSTDINC_FLAGS += -DSTANDALONE_CT
- +
- +ifdef CONFIG_PACKAGE_MAC80211_DEBUGFS
- + CT_MAKEDEFS += CONFIG_ATH10K_DEBUGFS=y CONFIG_MAC80211_DEBUGFS=y
- + NOSTDINC_FLAGS += -DCONFIG_MAC80211_DEBUGFS
- + NOSTDINC_FLAGS += -DCONFIG_ATH10K_DEBUGFS
- +endif
- +
- +ifdef CONFIG_PACKAGE_ATH_DEBUG
- + NOSTDINC_FLAGS += -DCONFIG_ATH10K_DEBUG
- +endif
- +
- +define Build/Configure
- + cp $(STAGING_DIR)/usr/include/mac80211/ath/*.h $(PKG_BUILD_DIR)
- +endef
- +
- +ifneq ($(findstring c,$(OPENWRT_VERBOSE)),)
- + CT_MAKEDEFS += V=1
- +endif
- +
- +define Build/Compile
- + +$(MAKE) $(CT_MAKEDEFS) $(PKG_JOBS) -C "$(LINUX_DIR)" \
- + ARCH="$(LINUX_KARCH)" \
- + CROSS_COMPILE="$(TARGET_CROSS)" \
- + SUBDIRS="$(PKG_BUILD_DIR)/ath10k" \
- + NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \
- + modules
- +endef
- +
- +$(eval $(call KernelPackage,ath10k-ct))
- diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
- index 30da1cf..f2839cd 100644
- --- a/package/kernel/mac80211/Makefile
- +++ b/package/kernel/mac80211/Makefile
- @@ -10,20 +10,21 @@ include $(INCLUDE_DIR)/kernel.mk
-
- PKG_NAME:=mac80211
-
- -PKG_VERSION:=2016-01-10
- +PKG_VERSION:=2016-06-20
- PKG_RELEASE:=1
- PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
- PKG_BACKPORT_VERSION:=
- -PKG_MD5SUM:=be5fae2e8d6f7490f9b073374fb895ba
- +PKG_MD5SUM:=29c79bdc3928ef5113b17042ebda9237
-
- PKG_SOURCE:=compat-wireless-$(PKG_VERSION)$(PKG_BACKPORT_VERSION).tar.bz2
- PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION)
- PKG_BUILD_PARALLEL:=1
-
- -PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
- +PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
-
- PKG_DRIVERS = \
- adm8211 \
- + airo \
- ath ath5k ath9k ath9k-common ath9k-htc ath10k \
- b43 b43legacy \
- carl9170 \
- @@ -52,6 +53,7 @@ PKG_CONFIG_DEPENDS:= \
- $(patsubst %,CONFIG_PACKAGE_kmod-%,$(PKG_DRIVERS)) \
- CONFIG_PACKAGE_MAC80211_DEBUGFS \
- CONFIG_PACKAGE_MAC80211_MESH \
- + CONFIG_PACKAGE_MAC80211_TRACING \
- CONFIG_PACKAGE_ATH_DEBUG \
- CONFIG_PACKAGE_ATH_DFS \
- CONFIG_PACKAGE_B43_DEBUG \
- @@ -63,7 +65,12 @@ PKG_CONFIG_DEPENDS:= \
- CONFIG_PACKAGE_B43_BUSES_BCMA_AND_SSB \
- CONFIG_PACKAGE_B43_BUSES_BCMA \
- CONFIG_PACKAGE_B43_BUSES_SSB \
- + CONFIG_PACKAGE_BRCM80211_DEBUG \
- + CONFIG_PACKAGE_IWLWIFI_DEBUG \
- + CONFIG_PACKAGE_IWLWIFI_DEBUGFS \
- CONFIG_PACKAGE_RTLWIFI_DEBUG \
- + CONFIG_ATH9K_SUPPORT_PCOEM \
- + CONFIG_ATH9K_TX99 \
- CONFIG_ATH_USER_REGD \
-
- include $(INCLUDE_DIR)/package.mk
- @@ -73,7 +80,7 @@ WMENU:=Wireless Drivers
- define KernelPackage/mac80211/Default
- SUBMENU:=$(WMENU)
- URL:=https://wireless.wiki.kernel.org/
- - MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
- + MAINTAINER:=Felix Fietkau <nbd@nbd.name>
- endef
-
- define KernelPackage/cfg80211
- @@ -92,7 +99,7 @@ endef
- define KernelPackage/mac80211
- $(call KernelPackage/mac80211/Default)
- TITLE:=Linux 802.11 Wireless Networking Stack
- - DEPENDS+= +kmod-cfg80211 +hostapd-common +kmod-crypto-core +kmod-crypto-arc4
- + DEPENDS+= +kmod-cfg80211 +hostapd-common
- KCONFIG:=\
- CONFIG_AVERAGE=y
- FILES:= $(PKG_BUILD_DIR)/net/mac80211/mac80211.ko
- @@ -138,10 +145,23 @@ define KernelPackage/adm8211
- AUTOLOAD:=$(call AutoProbe,adm8211)
- endef
-
- +define KernelPackage/airo
- + $(call KernelPackage/mac80211/Default)
- + TITLE:=Cisco Aironet driver
- + DEPENDS+=@PCI_SUPPORT +@DRIVER_WEXT_SUPPORT +kmod-cfg80211 @TARGET_x86
- + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/cisco/airo.ko
- + AUTOLOAD:=$(call AutoProbe,airo)
- +endef
- +
- +define KernelPackage/airo/description
- + Kernel support for Cisco Aironet cards
- +endef
- +
- define KernelPackage/ath/config
- if PACKAGE_kmod-ath
- config ATH_USER_REGD
- bool "Force Atheros drivers to respect the user's regdomain settings"
- + default y
- help
- Atheros' idea of regulatory handling is that the EEPROM of the card defines
- the regulatory limits and the user is only allowed to restrict the settings
- @@ -199,6 +219,7 @@ define KernelPackage/ath9k-common
- $(call KernelPackage/mac80211/Default)
- TITLE:=Atheros 802.11n wireless devices (common code for ath9k and ath9k_htc)
- URL:=https://wireless.wiki.kernel.org/en/users/drivers/ath9k
- + HIDDEN:=1
- DEPENDS+= @PCI_SUPPORT||USB_SUPPORT||TARGET_ar71xx +kmod-ath +@DRIVER_11N_SUPPORT +@DRIVER_11W_SUPPORT +@KERNEL_RELAY
- FILES:= \
- $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k_common.ko \
- @@ -226,6 +247,10 @@ define KernelPackage/ath9k/config
- bool "Support chips used in PC OEM cards"
- depends on PACKAGE_kmod-ath9k
-
- + config ATH9K_TX99
- + bool "Enable TX99 support"
- + depends on PACKAGE_kmod-ath9k
- +
- endef
-
- define KernelPackage/ath9k-htc
- @@ -247,7 +272,7 @@ define KernelPackage/ath10k
- $(call KernelPackage/mac80211/Default)
- TITLE:=Atheros 802.11ac wireless cards support
- URL:=https://wireless.wiki.kernel.org/en/users/Drivers/ath10k
- - DEPENDS+= @PCI_SUPPORT +kmod-ath +@DRIVER_11N_SUPPORT +@DRIVER_11W_SUPPORT +@KERNEL_RELAY +ath10k-firmware-qca988x
- + DEPENDS+= @PCI_SUPPORT +kmod-ath +@DRIVER_11N_SUPPORT +@DRIVER_11W_SUPPORT +@KERNEL_RELAY
- FILES:= \
- $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath10k/ath10k_core.ko \
- $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath10k/ath10k_pci.ko
- @@ -673,6 +698,7 @@ define KernelPackage/brcmfmac/config
-
- config BRCMFMAC_SDIO
- bool "Enable SDIO bus interface support"
- + default y if TARGET_brcm2708
- default n
- help
- Enable support for cards attached to an SDIO bus.
- @@ -761,7 +787,7 @@ endef
-
- define KernelPackage/iwlwifi
- $(call KernelPackage/mac80211/Default)
- - DEPENDS:= +kmod-mac80211 @PCI_SUPPORT +@DRIVER_11N_SUPPORT +iwlwifi-firmware
- + DEPENDS:= +kmod-mac80211 @PCI_SUPPORT +@DRIVER_11N_SUPPORT +iwlwifi-firmware @!LINUX_3_18
- TITLE:=Intel AGN Wireless support
- FILES:= \
- $(PKG_BUILD_DIR)/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko \
- @@ -870,7 +896,7 @@ endef
- define KernelPackage/lib80211
- $(call KernelPackage/mac80211/Default)
- TITLE:=802.11 Networking stack
- - DEPENDS:=+kmod-cfg80211
- + DEPENDS:=+kmod-cfg80211 +kmod-crypto-hash
- FILES:= \
- $(PKG_BUILD_DIR)/net/wireless/lib80211.ko \
- $(PKG_BUILD_DIR)/net/wireless/lib80211_crypt_wep.ko \
- @@ -897,7 +923,7 @@ endef
- define KernelPackage/libipw
- $(call KernelPackage/mac80211/Default)
- TITLE:=libipw for ipw2100 and ipw2200
- - DEPENDS:=@PCI_SUPPORT +kmod-crypto-michael-mic +kmod-crypto-core +kmod-crypto-arc4 +kmod-lib80211 +kmod-cfg80211 +@DRIVER_WEXT_SUPPORT @!BIG_ENDIAN
- + DEPENDS:=@PCI_SUPPORT +kmod-crypto-michael-mic +kmod-lib80211 +kmod-cfg80211 +@DRIVER_WEXT_SUPPORT @!BIG_ENDIAN
- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/intel/ipw2x00/libipw.ko
- AUTOLOAD:=$(call AutoProbe,libipw)
- endef
- @@ -978,7 +1004,7 @@ endef
- define KernelPackage/libertas-spi
- $(call KernelPackage/mac80211/Default)
- SUBMENU:=Wireless Drivers
- - DEPENDS+= +kmod-cfg80211 +kmod-lib80211 +@DRIVER_WEXT_SUPPORT +libertas-spi-firmware
- + DEPENDS+= +kmod-cfg80211 +kmod-lib80211 +@DRIVER_WEXT_SUPPORT @!TARGET_uml +libertas-spi-firmware
- KCONFIG := \
- CONFIG_SPI=y \
- CONFIG_SPI_MASTER=y
- @@ -1036,33 +1062,6 @@ define KernelPackage/mwifiex-pcie/description
- Kernel modules for Marvell 802.11n/802.11ac PCIe Wireless cards
- endef
-
- -
- -# Prism54 drivers
- -P54PCIFW:=2.13.12.0.arm
- -P54USBFW:=2.13.24.0.lm87.arm
- -P54SPIFW:=2.13.0.0.a.13.14.arm
- -
- -define Download/p54usb
- - FILE:=$(P54USBFW)
- - URL:=http://daemonizer.de/prism54/prism54-fw/fw-usb
- - MD5SUM:=8e8ab005a4f8f0123bcdc51bc25b47f6
- -endef
- -$(eval $(call Download,p54usb))
- -
- -define Download/p54pci
- - FILE:=$(P54PCIFW)
- - URL:=http://daemonizer.de/prism54/prism54-fw/fw-softmac
- - MD5SUM:=ff7536af2092b1c4b21315bd103ef4c4
- -endef
- -$(eval $(call Download,p54pci))
- -
- -define Download/p54spi
- - FILE:=$(P54SPIFW)
- - URL:=http://daemonizer.de/prism54/prism54-fw/stlc4560
- - MD5SUM:=42661f8ecbadd88012807493f596081d
- -endef
- -$(eval $(call Download,p54spi))
- -
- define KernelPackage/p54/Default
- $(call KernelPackage/mac80211/Default)
- TITLE:=Prism54 Drivers
- @@ -1082,7 +1081,7 @@ endef
- define KernelPackage/p54-pci
- $(call KernelPackage/p54/Default)
- TITLE+= (PCI)
- - DEPENDS+= @PCI_SUPPORT +kmod-p54-common
- + DEPENDS+= @PCI_SUPPORT +kmod-p54-common +p54-pci-firmware
- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/intersil/p54/p54pci.ko
- AUTOLOAD:=$(call AutoProbe,p54pci)
- endef
- @@ -1090,7 +1089,7 @@ endef
- define KernelPackage/p54-usb
- $(call KernelPackage/p54/Default)
- TITLE+= (USB)
- - DEPENDS+= @USB_SUPPORT +kmod-usb-core +kmod-p54-common
- + DEPENDS+= @USB_SUPPORT +kmod-usb-core +kmod-p54-common +p54-usb-firmware
- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/intersil/p54/p54usb.ko
- AUTOLOAD:=$(call AutoProbe,p54usb)
- endef
- @@ -1098,7 +1097,7 @@ endef
- define KernelPackage/p54-spi
- $(call KernelPackage/p54/Default)
- TITLE+= (SPI)
- - DEPENDS+= @TARGET_omap24xx +kmod-p54-common
- + DEPENDS+= @TARGET_omap24xx +kmod-p54-common +p54-spi-firmware
- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/intersil/p54/p54spi.ko
- AUTOLOAD:=$(call AutoProbe,p54spi)
- endef
- @@ -1453,6 +1452,7 @@ config-y:= \
- WLAN_VENDOR_ATH \
- WLAN_VENDOR_ATMEL \
- WLAN_VENDOR_BROADCOM \
- + WLAN_VENDOR_CISCO \
- WLAN_VENDOR_INTEL \
- WLAN_VENDOR_INTERSIL \
- WLAN_VENDOR_MARVELL \
- @@ -1491,6 +1491,8 @@ endif
-
- config-$(call config_package,lib80211) += LIB80211 LIB80211_CRYPT_WEP LIB80211_CRYPT_CCMP LIB80211_CRYPT_TKIP
-
- +config-$(call config_package,airo) += AIRO
- +
- config-$(call config_package,ath) += ATH_CARDS ATH_COMMON
- config-$(CONFIG_PACKAGE_ATH_DEBUG) += ATH_DEBUG ATH10K_DEBUG
- config-$(CONFIG_PACKAGE_ATH_DFS) += ATH9K_DFS_CERTIFIED ATH10K_DFS_CERTIFIED
- @@ -1501,6 +1503,7 @@ config-$(CONFIG_TARGET_ar71xx) += ATH9K_AHB
- config-$(CONFIG_PCI) += ATH9K_PCI
- config-$(CONFIG_ATH_USER_REGD) += ATH_USER_REGD
- config-$(CONFIG_ATH9K_SUPPORT_PCOEM) += ATH9K_PCOEM
- +config-$(CONFIG_ATH9K_TX99) += ATH9K_TX99
-
- config-$(call config_package,ath9k-htc) += ATH9K_HTC
- config-$(call config_package,ath10k) += ATH10K ATH10K_PCI
- @@ -1742,21 +1745,6 @@ define KernelPackage/ipw2200/install
- $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IPW2200_NAME)-$(IPW2200_VERSION)/ipw2200*.fw $(1)/lib/firmware
- endef
-
- -define KernelPackage/p54-pci/install
- - $(INSTALL_DIR) $(1)/lib/firmware
- - $(INSTALL_DATA) $(DL_DIR)/$(P54PCIFW) $(1)/lib/firmware/isl3886pci
- -endef
- -
- -define KernelPackage/p54-usb/install
- - $(INSTALL_DIR) $(1)/lib/firmware
- - $(INSTALL_DATA) $(DL_DIR)/$(P54USBFW) $(1)/lib/firmware/isl3887usb
- -endef
- -
- -define KernelPackage/p54-spi/install
- - $(INSTALL_DIR) $(1)/lib/firmware
- - $(INSTALL_DATA) $(DL_DIR)/$(P54SPIFW) $(1)/lib/firmware/3826.arm
- -endef
- -
- define KernelPackage/zd1211rw/install
- $(INSTALL_DIR) $(1)/lib/firmware/zd1211
- $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(ZD1211FW_NAME)/zd1211* $(1)/lib/firmware/zd1211
- @@ -1764,6 +1752,7 @@ endef
-
-
- $(eval $(call KernelPackage,adm8211))
- +$(eval $(call KernelPackage,airo))
- $(eval $(call KernelPackage,ath))
- $(eval $(call KernelPackage,ath10k))
- $(eval $(call KernelPackage,ath5k))
- diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
- index fb2f928..e3d612e 100644
- --- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
- +++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
- @@ -23,6 +23,7 @@ drv_mac80211_init_device_config() {
- config_add_int rxantenna txantenna antenna_gain txpower distance
- config_add_boolean noscan ht_coex
- config_add_array ht_capab
- + config_add_array channels
- config_add_boolean \
- rxldpc \
- short_gi_80 \
- @@ -89,6 +90,7 @@ mac80211_hostapd_setup_base() {
- json_select config
-
- [ "$auto_channel" -gt 0 ] && channel=acs_survey
- + [ "$auto_channel" -gt 0 ] && json_get_values channel_list channels
-
- json_get_vars noscan ht_coex
- json_get_values ht_capab_list ht_capab
- @@ -218,7 +220,6 @@ mac80211_hostapd_setup_base() {
- vht_max_a_mpdu_len_exp:7 \
- vht_max_mpdu:11454 \
- rx_stbc:4 \
- - tx_stbc:4 \
- vht_link_adapt:3 \
- vht160:2
-
- @@ -230,13 +231,13 @@ mac80211_hostapd_setup_base() {
-
- cap_rx_stbc=$((($vht_cap >> 8) & 7))
- [ "$rx_stbc" -lt "$cap_rx_stbc" ] && cap_rx_stbc="$rx_stbc"
- - ht_cap_mask="$(( ($vht_cap & ~(0x700)) | ($cap_rx_stbc << 8) ))"
- + vht_cap="$(( ($vht_cap & ~(0x700)) | ($cap_rx_stbc << 8) ))"
-
- mac80211_add_capabilities vht_capab $vht_cap \
- RXLDPC:0x10::$rxldpc \
- SHORT-GI-80:0x20::$short_gi_80 \
- SHORT-GI-160:0x40::$short_gi_160 \
- - TX-STBC-2BY1:0x80::$tx_stbc \
- + TX-STBC-2BY1:0x80::$tx_stbc_2by1 \
- SU-BEAMFORMER:0x800::$su_beamformer \
- SU-BEAMFORMEE:0x1000::$su_beamformee \
- MU-BEAMFORMER:0x80000::$mu_beamformer \
- @@ -245,10 +246,10 @@ mac80211_hostapd_setup_base() {
- HTC-VHT:0x400000::$htc_vht \
- RX-ANTENNA-PATTERN:0x10000000::$rx_antenna_pattern \
- TX-ANTENNA-PATTERN:0x20000000::$tx_antenna_pattern \
- - RX-STBC1:0x700:0x100:1 \
- - RX-STBC12:0x700:0x200:1 \
- - RX-STBC123:0x700:0x300:1 \
- - RX-STBC1234:0x700:0x400:1 \
- + RX-STBC-1:0x700:0x100:1 \
- + RX-STBC-12:0x700:0x200:1 \
- + RX-STBC-123:0x700:0x300:1 \
- + RX-STBC-1234:0x700:0x400:1 \
-
- # supported Channel widths
- vht160_hw=0
- @@ -301,6 +302,7 @@ mac80211_hostapd_setup_base() {
- hostapd_prepare_device_config "$hostapd_conf_file" nl80211
- cat >> "$hostapd_conf_file" <<EOF
- ${channel:+channel=$channel}
- +${channel_list:+chanlist=$channel_list}
- ${noscan:+noscan=$noscan}
- $base_cfg
-
- @@ -391,11 +393,10 @@ mac80211_generate_mac() {
- find_phy() {
- [ -n "$phy" -a -d /sys/class/ieee80211/$phy ] && return 0
- [ -n "$path" ] && {
- - for phy in /sys/devices/$path/ieee80211/phy*; do
- - [ -e "$phy" ] && {
- - phy="${phy##*/}"
- - return 0
- - }
- + for phy in $(ls /sys/class/ieee80211 2>/dev/null); do
- + case "$(readlink -f /sys/class/ieee80211/$phy/device)" in
- + *$path) return 0;;
- + esac
- done
- }
- [ -n "$macaddr" ] && {
- @@ -481,7 +482,7 @@ mac80211_prepare_vif() {
- # All interfaces must have unique mac addresses
- # which can either be explicitly set in the device
- # section, or automatically generated
- - ifconfig "$ifname" hw ether "$macaddr"
- + ip link set dev "$ifname" address "$macaddr"
- fi
-
- json_select ..
- @@ -496,7 +497,7 @@ mac80211_setup_supplicant() {
- mac80211_setup_adhoc_htmode() {
- case "$htmode" in
- VHT20|HT20) ibss_htmode=HT20;;
- - HT40*|VHT40|VHT80|VHT160)
- + HT40*|VHT40|VHT160)
- case "$hwmode" in
- a)
- case "$(( ($channel / 4) % 2 ))" in
- @@ -520,6 +521,9 @@ mac80211_setup_adhoc_htmode() {
- esac
- [ "$auto_channel" -gt 0 ] && ibss_htmode="HT40+"
- ;;
- + VHT80)
- + ibss_htmode="80MHZ"
- + ;;
- NONE|NOHT)
- ibss_htmode="NOHT"
- ;;
- @@ -580,7 +584,7 @@ mac80211_setup_vif() {
- json_get_vars mode
- json_get_var vif_txpower txpower
-
- - ifconfig "$ifname" up || {
- + ip link set dev "$ifname" up || {
- wireless_setup_vif_failed IFUP_ERROR
- json_select ..
- return
- @@ -643,7 +647,7 @@ mac80211_interface_cleanup() {
- local phy="$1"
-
- for wdev in $(list_phy_interfaces "$phy"); do
- - ifconfig "$wdev" down 2>/dev/null
- + ip link set dev "$wdev" down 2>/dev/null
- iw dev "$wdev" del
- done
- }
- diff --git a/package/kernel/mac80211/files/lib/wifi/mac80211.sh b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
- index ea229d6..06f3b8b 100644
- --- a/package/kernel/mac80211/files/lib/wifi/mac80211.sh
- +++ b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
- @@ -9,11 +9,10 @@ lookup_phy() {
- local devpath
- config_get devpath "$device" path
- [ -n "$devpath" ] && {
- - for _phy in /sys/devices/$devpath/ieee80211/phy*; do
- - [ -e "$_phy" ] && {
- - phy="${_phy##*/}"
- - return
- - }
- + for phy in $(ls /sys/class/ieee80211 2>/dev/null); do
- + case "$(readlink -f /sys/class/ieee80211/$phy/device)" in
- + *$devpath) return;;
- + esac
- done
- }
-
- @@ -102,6 +101,9 @@ detect_mac80211() {
- fi
- if [ -n "$path" ]; then
- path="${path##/sys/devices/}"
- + case "$path" in
- + platform*/pci*) path="${path##platform/}";;
- + esac
- dev_id=" option path '$path'"
- else
- dev_id=" option macaddr $(cat /sys/class/ieee80211/${dev}/macaddress)"
- diff --git a/package/kernel/mac80211/patches/004-backports-add-skb_free_frag.patch b/package/kernel/mac80211/patches/004-backports-add-skb_free_frag.patch
- deleted file mode 100644
- index 9adfd8f..0000000
- --- a/package/kernel/mac80211/patches/004-backports-add-skb_free_frag.patch
- +++ /dev/null
- @@ -1,21 +0,0 @@
- -From: Felix Fietkau <nbd@openwrt.org>
- -Date: Thu, 28 Jan 2016 15:16:35 +0100
- -Subject: [PATCH] backports: add skb_free_frag()
- -
- -Signed-off-by: Felix Fietkau <nbd@openwrt.org>
- ----
- -
- ---- a/backport-include/linux/skbuff.h
- -+++ b/backport-include/linux/skbuff.h
- -@@ -300,4 +300,11 @@ int skb_ensure_writable(struct sk_buff *
- -
- - #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0) */
- -
- -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
- -+static inline void skb_free_frag(void *data)
- -+{
- -+ put_page(virt_to_head_page(data));
- -+}
- -+#endif
- -+
- - #endif /* __BACKPORT_SKBUFF_H */
- diff --git a/package/kernel/mac80211/patches/004-fix_duplicate_skcipher_backport.patch b/package/kernel/mac80211/patches/004-fix_duplicate_skcipher_backport.patch
- new file mode 100644
- index 0000000..38b3179
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/004-fix_duplicate_skcipher_backport.patch
- @@ -0,0 +1,11 @@
- +--- a/compat/Makefile
- ++++ b/compat/Makefile
- +@@ -35,8 +35,6 @@ compat-$(CPTCFG_KERNEL_4_6) += backport-
- +
- + compat-$(CPTCFG_BPAUTO_BUILD_CRYPTO_CCM) += crypto-ccm.o
- + compat-$(CPTCFG_BPAUTO_CRYPTO_SKCIPHER) += crypto-skcipher.o
- +-skcipher-objs += crypto-skcipher.o
- +-obj-$(CPTCFG_BPAUTO_CRYPTO_SKCIPHER) += skcipher.o
- + compat-$(CPTCFG_BPAUTO_BUILD_WANT_DEV_COREDUMP) += drivers-base-devcoredump.o
- + compat-$(CPTCFG_BPAUTO_RHASHTABLE) += lib-rhashtable.o
- + cordic-objs += lib-cordic.o
- diff --git a/package/kernel/mac80211/patches/005-backport_skb_get_hash_perturb.patch b/package/kernel/mac80211/patches/005-backport_skb_get_hash_perturb.patch
- new file mode 100644
- index 0000000..29bccc1
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/005-backport_skb_get_hash_perturb.patch
- @@ -0,0 +1,22 @@
- +--- a/backport-include/linux/skbuff.h
- ++++ b/backport-include/linux/skbuff.h
- +@@ -305,6 +305,19 @@ static inline void skb_free_frag(void *d
- + {
- + put_page(virt_to_head_page(data));
- + }
- ++
- ++#include <net/flow_keys.h>
- ++#include <linux/jhash.h>
- ++
- ++static inline u32 skb_get_hash_perturb(struct sk_buff *skb, u32 key)
- ++{
- ++ struct flow_keys keys;
- ++
- ++ skb_flow_dissect(skb, &keys);
- ++ return jhash_3words((__force u32)keys.dst,
- ++ (__force u32)keys.src ^ keys.ip_proto,
- ++ (__force u32)keys.ports, key);
- ++}
- + #endif
- +
- + #endif /* __BACKPORT_SKBUFF_H */
- diff --git a/package/kernel/mac80211/patches/005-backports-add-napi_alloc_frag.patch b/package/kernel/mac80211/patches/005-backports-add-napi_alloc_frag.patch
- deleted file mode 100644
- index 9b672a8..0000000
- --- a/package/kernel/mac80211/patches/005-backports-add-napi_alloc_frag.patch
- +++ /dev/null
- @@ -1,20 +0,0 @@
- -From: Felix Fietkau <nbd@openwrt.org>
- -Date: Thu, 28 Jan 2016 15:19:22 +0100
- -Subject: [PATCH] backports: add napi_alloc_frag
- -
- -Signed-off-by: Felix Fietkau <nbd@openwrt.org>
- ----
- -
- ---- a/backport-include/linux/netdevice.h
- -+++ b/backport-include/linux/netdevice.h
- -@@ -232,6 +232,10 @@ static inline void backport_unregister_n
- - #define unregister_netdevice_many LINUX_BACKPORT(unregister_netdevice_many)
- - #endif
- -
- -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)
- -+#define napi_alloc_frag netdev_alloc_frag
- -+#endif
- -+
- - /*
- - * Complicated way of saying: We only backport netdev_rss_key stuff on kernels
- - * that either already have net_get_random_once() (>= 3.13) or where we've been
- diff --git a/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch b/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch
- index fd1e1cf..8be5fa1 100644
- --- a/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch
- +++ b/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch
- @@ -1,6 +1,6 @@
- --- a/.local-symbols
- +++ b/.local-symbols
- -@@ -476,44 +476,6 @@ USB_IPHETH=
- +@@ -481,45 +481,6 @@ USB_IPHETH=
- USB_SIERRA_NET=
- USB_VL600=
- USB_NET_CH9200=
- @@ -37,6 +37,7 @@
- -BCMA_DRIVER_PCI=
- -BCMA_DRIVER_PCI_HOSTMODE=
- -BCMA_DRIVER_MIPS=
- +-BCMA_PFLASH=
- -BCMA_SFLASH=
- -BCMA_NFLASH=
- -BCMA_DRIVER_GMAC_CMN=
- @@ -56,7 +57,7 @@
- return (bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev);
- #else
- return bus->chipco.dev;
- -@@ -4903,7 +4903,7 @@ static int b43_wireless_core_init(struct
- +@@ -4883,7 +4883,7 @@ static int b43_wireless_core_init(struct
- }
- if (sprom->boardflags_lo & B43_BFL_XTAL_NOSLOW)
- hf |= B43_HF_DSCRQ; /* Disable slowclock requests from ucode. */
- diff --git a/package/kernel/mac80211/patches/080-disable_clk_backport.patch b/package/kernel/mac80211/patches/080-disable_clk_backport.patch
- deleted file mode 100644
- index 3765591..0000000
- --- a/package/kernel/mac80211/patches/080-disable_clk_backport.patch
- +++ /dev/null
- @@ -1,20 +0,0 @@
- ---- a/compat/compat-3.6.c
- -+++ b/compat/compat-3.6.c
- -@@ -147,17 +147,3 @@ int sg_alloc_table_from_pages(struct sg_
- - return 0;
- - }
- - EXPORT_SYMBOL_GPL(sg_alloc_table_from_pages);
- --
- --/* whoopsie ! */
- --#ifndef CONFIG_COMMON_CLK
- --int clk_enable(struct clk *clk)
- --{
- -- return 0;
- --}
- --EXPORT_SYMBOL_GPL(clk_enable);
- --
- --void clk_disable(struct clk *clk)
- --{
- --}
- --EXPORT_SYMBOL_GPL(clk_disable);
- --#endif
- diff --git a/package/kernel/mac80211/patches/100-remove-cryptoapi-dependencies.patch b/package/kernel/mac80211/patches/100-remove-cryptoapi-dependencies.patch
- index 02f46c7..fbe22e5 100644
- --- a/package/kernel/mac80211/patches/100-remove-cryptoapi-dependencies.patch
- +++ b/package/kernel/mac80211/patches/100-remove-cryptoapi-dependencies.patch
- @@ -309,7 +309,7 @@
- #endif /* AES_GMAC_H */
- --- a/net/mac80211/key.h
- +++ b/net/mac80211/key.h
- -@@ -84,7 +84,7 @@ struct ieee80211_key {
- +@@ -88,7 +88,7 @@ struct ieee80211_key {
- * Management frames.
- */
- u8 rx_pn[IEEE80211_NUM_TIDS + 1][IEEE80211_CCMP_PN_LEN];
- @@ -320,7 +320,7 @@
- struct {
- --- a/net/mac80211/wpa.c
- +++ b/net/mac80211/wpa.c
- -@@ -307,7 +307,8 @@ ieee80211_crypto_tkip_decrypt(struct iee
- +@@ -304,7 +304,8 @@ ieee80211_crypto_tkip_decrypt(struct iee
- }
-
-
- @@ -330,7 +330,7 @@
- {
- __le16 mask_fc;
- int a4_included, mgmt;
- -@@ -337,14 +338,8 @@ static void ccmp_special_blocks(struct s
- +@@ -334,14 +335,8 @@ static void ccmp_special_blocks(struct s
- else
- qos_tid = 0;
-
- @@ -347,7 +347,7 @@
-
- /* Nonce: Nonce Flags | A2 | PN
- * Nonce Flags: Priority (b0..b3) | Management (b4) | Reserved (b5..b7)
- -@@ -352,6 +347,8 @@ static void ccmp_special_blocks(struct s
- +@@ -349,6 +344,8 @@ static void ccmp_special_blocks(struct s
- b_0[1] = qos_tid | (mgmt << 4);
- memcpy(&b_0[2], hdr->addr2, ETH_ALEN);
- memcpy(&b_0[8], pn, IEEE80211_CCMP_PN_LEN);
- @@ -356,7 +356,7 @@
-
- /* AAD (extra authenticate-only data) / masked 802.11 header
- * FC | A1 | A2 | A3 | SC | [A4] | [QC] */
- -@@ -463,7 +460,7 @@ static int ccmp_encrypt_skb(struct ieee8
- +@@ -460,7 +457,7 @@ static int ccmp_encrypt_skb(struct ieee8
- return 0;
-
- pos += IEEE80211_CCMP_HDR_LEN;
- @@ -365,7 +365,7 @@
- ieee80211_aes_ccm_encrypt(key->u.ccmp.tfm, b_0, aad, pos, len,
- skb_put(skb, mic_len), mic_len);
-
- -@@ -534,7 +531,7 @@ ieee80211_crypto_ccmp_decrypt(struct iee
- +@@ -537,7 +534,7 @@ ieee80211_crypto_ccmp_decrypt(struct iee
- u8 aad[2 * AES_BLOCK_SIZE];
- u8 b_0[AES_BLOCK_SIZE];
- /* hardware didn't decrypt/verify MIC */
- diff --git a/package/kernel/mac80211/patches/110-mac80211_keep_keys_on_stop_ap.patch b/package/kernel/mac80211/patches/110-mac80211_keep_keys_on_stop_ap.patch
- index d1d9fbd..3ca166f 100644
- --- a/package/kernel/mac80211/patches/110-mac80211_keep_keys_on_stop_ap.patch
- +++ b/package/kernel/mac80211/patches/110-mac80211_keep_keys_on_stop_ap.patch
- @@ -2,7 +2,7 @@ Used for AP+STA support in OpenWrt - preserve AP mode keys across STA reconnects
-
- --- a/net/mac80211/cfg.c
- +++ b/net/mac80211/cfg.c
- -@@ -846,7 +846,6 @@ static int ieee80211_stop_ap(struct wiph
- +@@ -850,7 +850,6 @@ static int ieee80211_stop_ap(struct wiph
- sdata->u.ap.driver_smps_mode = IEEE80211_SMPS_OFF;
-
- __sta_info_flush(sdata, true);
- diff --git a/package/kernel/mac80211/patches/150-disable_addr_notifier.patch b/package/kernel/mac80211/patches/150-disable_addr_notifier.patch
- index 2855a88..16fab84 100644
- --- a/package/kernel/mac80211/patches/150-disable_addr_notifier.patch
- +++ b/package/kernel/mac80211/patches/150-disable_addr_notifier.patch
- @@ -18,9 +18,9 @@
- static int ieee80211_ifa6_changed(struct notifier_block *nb,
- unsigned long data, void *arg)
- {
- -@@ -1087,14 +1087,14 @@ int ieee80211_register_hw(struct ieee802
- -
- - rtnl_unlock();
- +@@ -1090,14 +1090,14 @@ int ieee80211_register_hw(struct ieee802
- + if (result)
- + goto fail_flows;
-
- -#ifdef CONFIG_INET
- +#ifdef __disabled__CONFIG_INET
- @@ -35,7 +35,7 @@
- local->ifa6_notifier.notifier_call = ieee80211_ifa6_changed;
- result = register_inet6addr_notifier(&local->ifa6_notifier);
- if (result)
- -@@ -1103,13 +1103,13 @@ int ieee80211_register_hw(struct ieee802
- +@@ -1106,13 +1106,13 @@ int ieee80211_register_hw(struct ieee802
-
- return 0;
-
- @@ -51,8 +51,8 @@
- +#if defined(__disabled__CONFIG_INET) || defined(__disabled__CONFIG_IPV6)
- fail_ifa:
- #endif
- - rtnl_lock();
- -@@ -1137,10 +1137,10 @@ void ieee80211_unregister_hw(struct ieee
- + ieee80211_txq_teardown_flows(local);
- +@@ -1142,10 +1142,10 @@ void ieee80211_unregister_hw(struct ieee
- tasklet_kill(&local->tx_pending_tasklet);
- tasklet_kill(&local->tasklet);
-
- diff --git a/package/kernel/mac80211/patches/210-ap_scan.patch b/package/kernel/mac80211/patches/210-ap_scan.patch
- index a99cbd2..29f05c4 100644
- --- a/package/kernel/mac80211/patches/210-ap_scan.patch
- +++ b/package/kernel/mac80211/patches/210-ap_scan.patch
- @@ -1,6 +1,6 @@
- --- a/net/mac80211/cfg.c
- +++ b/net/mac80211/cfg.c
- -@@ -1999,7 +1999,7 @@ static int ieee80211_scan(struct wiphy *
- +@@ -2008,7 +2008,7 @@ static int ieee80211_scan(struct wiphy *
- * the frames sent while scanning on other channel will be
- * lost)
- */
- diff --git a/package/kernel/mac80211/patches/220-fq_disable_hack.patch b/package/kernel/mac80211/patches/220-fq_disable_hack.patch
- new file mode 100644
- index 0000000..7f420be
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/220-fq_disable_hack.patch
- @@ -0,0 +1,15 @@
- +mac80211 fq has been found to cause a regression in multi-stream TCP
- +performance. Disable it until the cause has been found and fixed
- +
- +--- a/include/net/fq_impl.h
- ++++ b/include/net/fq_impl.h
- +@@ -104,6 +104,9 @@ static struct fq_flow *fq_flow_classify(
- +
- + lockdep_assert_held(&fq->lock);
- +
- ++ /* HACK: disable fq for now until TCP issues are fixed */
- ++ return get_default_func(fq, tin, 0, skb);
- ++
- + hash = skb_get_hash_perturb(skb, fq->perturbation);
- + idx = reciprocal_scale(hash, fq->flows_cnt);
- + flow = &fq->flows[idx];
- diff --git a/package/kernel/mac80211/patches/300-ath9k-force-rx_clear-when-disabling-rx.patch b/package/kernel/mac80211/patches/300-ath9k-force-rx_clear-when-disabling-rx.patch
- index bddb15a..098bda7 100644
- --- a/package/kernel/mac80211/patches/300-ath9k-force-rx_clear-when-disabling-rx.patch
- +++ b/package/kernel/mac80211/patches/300-ath9k-force-rx_clear-when-disabling-rx.patch
- @@ -3,15 +3,16 @@ Date: Sun, 7 Jun 2015 13:53:35 +0200
- Subject: [PATCH] ath9k: force rx_clear when disabling rx
-
- This makes stopping Rx more reliable and should reduce the frequency of
- -Rx related DMA stop warnings
- +Rx related DMA stop warnings. Don't use rx_clear in TX99 mode.
-
- Cc: stable@vger.kernel.org
- -Signed-off-by: Felix Fietkau <nbd@openwrt.org>
- +Signed-off-by: Felix Fietkau <nbd@nbd.name>
- +Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
- ---
-
- --- a/drivers/net/wireless/ath/ath9k/mac.c
- +++ b/drivers/net/wireless/ath/ath9k/mac.c
- -@@ -677,13 +677,15 @@ void ath9k_hw_startpcureceive(struct ath
- +@@ -677,13 +677,18 @@ void ath9k_hw_startpcureceive(struct ath
-
- ath9k_ani_reset(ah, is_scanning);
-
- @@ -24,8 +25,11 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
- void ath9k_hw_abortpcurecv(struct ath_hw *ah)
- {
- - REG_SET_BIT(ah, AR_DIAG_SW, AR_DIAG_RX_ABORT | AR_DIAG_RX_DIS);
- -+ REG_SET_BIT(ah, AR_DIAG_SW,
- -+ AR_DIAG_RX_DIS | AR_DIAG_RX_ABORT | AR_DIAG_FORCE_RX_CLEAR);
- ++ u32 reg = AR_DIAG_RX_DIS | AR_DIAG_RX_ABORT;
- ++
- ++ if (!config_enabled(CPTCFG_ATH9K_TX99))
- ++ reg |= AR_DIAG_FORCE_RX_CLEAR;
- ++ REG_SET_BIT(ah, AR_DIAG_SW, reg);
-
- ath9k_hw_disable_mib_counters(ah);
- }
- diff --git a/package/kernel/mac80211/patches/302-Revert-ath9k-interpret-requested-txpower-in-EIRP-dom.patch b/package/kernel/mac80211/patches/302-Revert-ath9k-interpret-requested-txpower-in-EIRP-dom.patch
- new file mode 100644
- index 0000000..7caa9be
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/302-Revert-ath9k-interpret-requested-txpower-in-EIRP-dom.patch
- @@ -0,0 +1,37 @@
- +From: Felix Fietkau <nbd@nbd.name>
- +Date: Sat, 14 May 2016 14:51:02 +0200
- +Subject: [PATCH] Revert "ath9k: interpret requested txpower in EIRP
- + domain"
- +
- +This reverts commit 71f5137bf010c6faffab50c0ec15374c59c4a411.
- +---
- +
- +--- a/drivers/net/wireless/ath/ath9k/hw.c
- ++++ b/drivers/net/wireless/ath/ath9k/hw.c
- +@@ -2914,7 +2914,8 @@ void ath9k_hw_apply_txpower(struct ath_h
- + {
- + struct ath_regulatory *reg = ath9k_hw_regulatory(ah);
- + struct ieee80211_channel *channel;
- +- int chan_pwr, new_pwr;
- ++ int chan_pwr, new_pwr, max_gain;
- ++ int ant_gain, ant_reduction = 0;
- +
- + if (!chan)
- + return;
- +@@ -2922,10 +2923,15 @@ void ath9k_hw_apply_txpower(struct ath_h
- + channel = chan->chan;
- + chan_pwr = min_t(int, channel->max_power * 2, MAX_RATE_POWER);
- + new_pwr = min_t(int, chan_pwr, reg->power_limit);
- ++ max_gain = chan_pwr - new_pwr + channel->max_antenna_gain * 2;
- ++
- ++ ant_gain = get_antenna_gain(ah, chan);
- ++ if (ant_gain > max_gain)
- ++ ant_reduction = ant_gain - max_gain;
- +
- + ah->eep_ops->set_txpower(ah, chan,
- + ath9k_regd_get_ctl(reg, chan),
- +- get_antenna_gain(ah, chan), new_pwr, test);
- ++ ant_reduction, new_pwr, test);
- + }
- +
- + void ath9k_hw_set_txpowerlimit(struct ath_hw *ah, u32 limit, bool test)
- diff --git a/package/kernel/mac80211/patches/302-ath9k_hw-add-low-power-tx-gain-table-for-AR953x.patch b/package/kernel/mac80211/patches/302-ath9k_hw-add-low-power-tx-gain-table-for-AR953x.patch
- deleted file mode 100644
- index 22b987a..0000000
- --- a/package/kernel/mac80211/patches/302-ath9k_hw-add-low-power-tx-gain-table-for-AR953x.patch
- +++ /dev/null
- @@ -1,95 +0,0 @@
- -From: Felix Fietkau <nbd@openwrt.org>
- -Date: Thu, 14 Jan 2016 03:14:03 +0100
- -Subject: [PATCH] ath9k_hw: add low power tx gain table for AR953x
- -
- -Used in some newer TP-Link AR9533 devices.
- -
- -Signed-off-by: Felix Fietkau <nbd@openwrt.org>
- ----
- -
- ---- a/drivers/net/wireless/ath/ath9k/ar9003_hw.c
- -+++ b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
- -@@ -698,6 +698,9 @@ static void ar9003_tx_gain_table_mode2(s
- - else if (AR_SREV_9340(ah))
- - INIT_INI_ARRAY(&ah->iniModesTxGain,
- - ar9340Modes_low_ob_db_tx_gain_table_1p0);
- -+ else if (AR_SREV_9531_11(ah))
- -+ INIT_INI_ARRAY(&ah->iniModesTxGain,
- -+ qca953x_1p1_modes_no_xpa_low_power_tx_gain_table);
- - else if (AR_SREV_9485_11_OR_LATER(ah))
- - INIT_INI_ARRAY(&ah->iniModesTxGain,
- - ar9485Modes_low_ob_db_tx_gain_1_1);
- ---- a/drivers/net/wireless/ath/ath9k/ar953x_initvals.h
- -+++ b/drivers/net/wireless/ath/ath9k/ar953x_initvals.h
- -@@ -757,6 +757,71 @@ static const u32 qca953x_1p1_modes_xpa_t
- - {0x00016448, 0x6c927a70},
- - };
- -
- -+static const u32 qca953x_1p1_modes_no_xpa_low_power_tx_gain_table[][2] = {
- -+ /* Addr allmodes */
- -+ {0x0000a2dc, 0xfff55592},
- -+ {0x0000a2e0, 0xfff99924},
- -+ {0x0000a2e4, 0xfffe1e00},
- -+ {0x0000a2e8, 0xffffe000},
- -+ {0x0000a410, 0x000050d6},
- -+ {0x0000a500, 0x00000069},
- -+ {0x0000a504, 0x0400006b},
- -+ {0x0000a508, 0x0800006d},
- -+ {0x0000a50c, 0x0c000269},
- -+ {0x0000a510, 0x1000026b},
- -+ {0x0000a514, 0x1400026d},
- -+ {0x0000a518, 0x18000669},
- -+ {0x0000a51c, 0x1c00066b},
- -+ {0x0000a520, 0x1d000a68},
- -+ {0x0000a524, 0x21000a6a},
- -+ {0x0000a528, 0x25000a6c},
- -+ {0x0000a52c, 0x29000a6e},
- -+ {0x0000a530, 0x2d0012a9},
- -+ {0x0000a534, 0x310012ab},
- -+ {0x0000a538, 0x350012ad},
- -+ {0x0000a53c, 0x39001b0a},
- -+ {0x0000a540, 0x3d001b0c},
- -+ {0x0000a544, 0x41001b0e},
- -+ {0x0000a548, 0x43001bae},
- -+ {0x0000a54c, 0x45001914},
- -+ {0x0000a550, 0x47001916},
- -+ {0x0000a554, 0x49001b96},
- -+ {0x0000a558, 0x49001b96},
- -+ {0x0000a55c, 0x49001b96},
- -+ {0x0000a560, 0x49001b96},
- -+ {0x0000a564, 0x49001b96},
- -+ {0x0000a568, 0x49001b96},
- -+ {0x0000a56c, 0x49001b96},
- -+ {0x0000a570, 0x49001b96},
- -+ {0x0000a574, 0x49001b96},
- -+ {0x0000a578, 0x49001b96},
- -+ {0x0000a57c, 0x49001b96},
- -+ {0x0000a600, 0x00000000},
- -+ {0x0000a604, 0x00000000},
- -+ {0x0000a608, 0x00000000},
- -+ {0x0000a60c, 0x00000000},
- -+ {0x0000a610, 0x00000000},
- -+ {0x0000a614, 0x00000000},
- -+ {0x0000a618, 0x00804201},
- -+ {0x0000a61c, 0x01408201},
- -+ {0x0000a620, 0x01408502},
- -+ {0x0000a624, 0x01408502},
- -+ {0x0000a628, 0x01408502},
- -+ {0x0000a62c, 0x01408502},
- -+ {0x0000a630, 0x01408502},
- -+ {0x0000a634, 0x01408502},
- -+ {0x0000a638, 0x01408502},
- -+ {0x0000a63c, 0x01408502},
- -+ {0x0000b2dc, 0xfff55592},
- -+ {0x0000b2e0, 0xfff99924},
- -+ {0x0000b2e4, 0xfffe1e00},
- -+ {0x0000b2e8, 0xffffe000},
- -+ {0x00016044, 0x044922db},
- -+ {0x00016048, 0x6c927a70},
- -+ {0x00016444, 0x044922db},
- -+ {0x00016448, 0x6c927a70},
- -+};
- -+
- - static const u32 qca953x_2p0_baseband_core[][2] = {
- - /* Addr allmodes */
- - {0x00009800, 0xafe68e30},
- diff --git a/package/kernel/mac80211/patches/303-ath10k-Ensure-txrx-compl-task-is-stopped-when-cleani.patch b/package/kernel/mac80211/patches/303-ath10k-Ensure-txrx-compl-task-is-stopped-when-cleani.patch
- new file mode 100644
- index 0000000..73accd8
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/303-ath10k-Ensure-txrx-compl-task-is-stopped-when-cleani.patch
- @@ -0,0 +1,21 @@
- +From: Ben Greear <greearb@candelatech.com>
- +Date: Fri, 1 Apr 2016 14:12:08 -0700
- +Subject: [PATCH] ath10k: Ensure txrx-compl-task is stopped when cleaning
- + htt-tx.
- +
- +Otherwise, the txrx-compl-task may access some bad memory?
- +
- +Signed-off-by: Ben Greear <greearb@candelatech.com>
- +---
- +
- +--- a/drivers/net/wireless/ath/ath10k/htt_tx.c
- ++++ b/drivers/net/wireless/ath/ath10k/htt_tx.c
- +@@ -388,6 +388,8 @@ void ath10k_htt_tx_free(struct ath10k_ht
- + {
- + int size;
- +
- ++ tasklet_kill(&htt->txrx_compl_task);
- ++
- + idr_for_each(&htt->pending_tx, ath10k_htt_tx_clean_up_pending, htt->ar);
- + idr_destroy(&htt->pending_tx);
- +
- diff --git a/package/kernel/mac80211/patches/303-rt2x00-fix-monitor-mode-regression.patch b/package/kernel/mac80211/patches/303-rt2x00-fix-monitor-mode-regression.patch
- deleted file mode 100644
- index 7bb7435..0000000
- --- a/package/kernel/mac80211/patches/303-rt2x00-fix-monitor-mode-regression.patch
- +++ /dev/null
- @@ -1,156 +0,0 @@
- -From: Eli Cooper <elicooper@gmx.com>
- -Date: Thu, 14 Jan 2016 00:07:12 +0800
- -Subject: [PATCH] rt2x00: fix monitor mode regression
- -
- -Since commit df1404650ccbfeb76a84f301f22316be0d00a864 monitor mode for rt2x00
- -has been made effectively useless because the hardware filter is configured to
- -drop packets whose intended recipient is not the device, regardless of the
- -presence of monitor mode interfaces.
- -
- -This patch fixes this regression by adding explicit monitor mode support, and
- -configuring the hardware filter accordingly.
- -
- -Signed-off-by: Eli Cooper <elicooper@gmx.com>
- ----
- -
- ---- a/drivers/net/wireless/ralink/rt2x00/rt2400pci.c
- -+++ b/drivers/net/wireless/ralink/rt2x00/rt2400pci.c
- -@@ -273,8 +273,10 @@ static void rt2400pci_config_filter(stru
- - !(filter_flags & FIF_PLCPFAIL));
- - rt2x00_set_field32(®, RXCSR0_DROP_CONTROL,
- - !(filter_flags & FIF_CONTROL));
- -- rt2x00_set_field32(®, RXCSR0_DROP_NOT_TO_ME, 1);
- -+ rt2x00_set_field32(®, RXCSR0_DROP_NOT_TO_ME,
- -+ !rt2x00dev->is_monitoring);
- - rt2x00_set_field32(®, RXCSR0_DROP_TODS,
- -+ !rt2x00dev->is_monitoring &&
- - !rt2x00dev->intf_ap_count);
- - rt2x00_set_field32(®, RXCSR0_DROP_VERSION_ERROR, 1);
- - rt2x00mmio_register_write(rt2x00dev, RXCSR0, reg);
- ---- a/drivers/net/wireless/ralink/rt2x00/rt2500pci.c
- -+++ b/drivers/net/wireless/ralink/rt2x00/rt2500pci.c
- -@@ -274,8 +274,10 @@ static void rt2500pci_config_filter(stru
- - !(filter_flags & FIF_PLCPFAIL));
- - rt2x00_set_field32(®, RXCSR0_DROP_CONTROL,
- - !(filter_flags & FIF_CONTROL));
- -- rt2x00_set_field32(®, RXCSR0_DROP_NOT_TO_ME, 1);
- -+ rt2x00_set_field32(®, RXCSR0_DROP_NOT_TO_ME,
- -+ !rt2x00dev->is_monitoring);
- - rt2x00_set_field32(®, RXCSR0_DROP_TODS,
- -+ !rt2x00dev->is_monitoring &&
- - !rt2x00dev->intf_ap_count);
- - rt2x00_set_field32(®, RXCSR0_DROP_VERSION_ERROR, 1);
- - rt2x00_set_field32(®, RXCSR0_DROP_MCAST,
- ---- a/drivers/net/wireless/ralink/rt2x00/rt2500usb.c
- -+++ b/drivers/net/wireless/ralink/rt2x00/rt2500usb.c
- -@@ -437,8 +437,10 @@ static void rt2500usb_config_filter(stru
- - !(filter_flags & FIF_PLCPFAIL));
- - rt2x00_set_field16(®, TXRX_CSR2_DROP_CONTROL,
- - !(filter_flags & FIF_CONTROL));
- -- rt2x00_set_field16(®, TXRX_CSR2_DROP_NOT_TO_ME, 1);
- -+ rt2x00_set_field16(®, TXRX_CSR2_DROP_NOT_TO_ME,
- -+ !rt2x00dev->is_monitoring);
- - rt2x00_set_field16(®, TXRX_CSR2_DROP_TODS,
- -+ !rt2x00dev->is_monitoring &&
- - !rt2x00dev->intf_ap_count);
- - rt2x00_set_field16(®, TXRX_CSR2_DROP_VERSION_ERROR, 1);
- - rt2x00_set_field16(®, TXRX_CSR2_DROP_MULTICAST,
- ---- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
- -+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
- -@@ -1490,7 +1490,8 @@ void rt2800_config_filter(struct rt2x00_
- - !(filter_flags & FIF_FCSFAIL));
- - rt2x00_set_field32(®, RX_FILTER_CFG_DROP_PHY_ERROR,
- - !(filter_flags & FIF_PLCPFAIL));
- -- rt2x00_set_field32(®, RX_FILTER_CFG_DROP_NOT_TO_ME, 1);
- -+ rt2x00_set_field32(®, RX_FILTER_CFG_DROP_NOT_TO_ME,
- -+ !rt2x00dev->is_monitoring);
- - rt2x00_set_field32(®, RX_FILTER_CFG_DROP_NOT_MY_BSSD, 0);
- - rt2x00_set_field32(®, RX_FILTER_CFG_DROP_VER_ERROR, 1);
- - rt2x00_set_field32(®, RX_FILTER_CFG_DROP_MULTICAST,
- ---- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
- -+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
- -@@ -844,11 +844,13 @@ struct rt2x00_dev {
- - * - Open sta interface count.
- - * - Association count.
- - * - Beaconing enabled count.
- -+ * - Whether the device is monitoring.
- - */
- - unsigned int intf_ap_count;
- - unsigned int intf_sta_count;
- - unsigned int intf_associated;
- - unsigned int intf_beaconing;
- -+ bool is_monitoring;
- -
- - /*
- - * Interface combinations
- ---- a/drivers/net/wireless/ralink/rt2x00/rt2x00config.c
- -+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00config.c
- -@@ -244,6 +244,16 @@ void rt2x00lib_config(struct rt2x00_dev
- - (ieee80211_flags & IEEE80211_CONF_CHANGE_PS))
- - cancel_delayed_work_sync(&rt2x00dev->autowakeup_work);
- -
- -+ if (ieee80211_flags & IEEE80211_CONF_CHANGE_MONITOR) {
- -+ if (conf->flags & IEEE80211_CONF_MONITOR) {
- -+ rt2x00_dbg(rt2x00dev, "Monitor mode is enabled\n");
- -+ rt2x00dev->is_monitoring = true;
- -+ } else {
- -+ rt2x00_dbg(rt2x00dev, "Monitor mode is disabled\n");
- -+ rt2x00dev->is_monitoring = false;
- -+ }
- -+ }
- -+
- - /*
- - * Start configuration.
- - */
- ---- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
- -+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
- -@@ -1204,6 +1204,7 @@ int rt2x00lib_start(struct rt2x00_dev *r
- - rt2x00dev->intf_ap_count = 0;
- - rt2x00dev->intf_sta_count = 0;
- - rt2x00dev->intf_associated = 0;
- -+ rt2x00dev->is_monitoring = false;
- -
- - /* Enable the radio */
- - retval = rt2x00lib_enable_radio(rt2x00dev);
- ---- a/drivers/net/wireless/ralink/rt2x00/rt2x00mac.c
- -+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00mac.c
- -@@ -385,11 +385,6 @@ void rt2x00mac_configure_filter(struct i
- - *total_flags |= FIF_PSPOLL;
- - }
- -
- -- /*
- -- * Check if there is any work left for us.
- -- */
- -- if (rt2x00dev->packet_filter == *total_flags)
- -- return;
- - rt2x00dev->packet_filter = *total_flags;
- -
- - rt2x00dev->ops->lib->config_filter(rt2x00dev, *total_flags);
- ---- a/drivers/net/wireless/ralink/rt2x00/rt61pci.c
- -+++ b/drivers/net/wireless/ralink/rt2x00/rt61pci.c
- -@@ -530,8 +530,10 @@ static void rt61pci_config_filter(struct
- - !(filter_flags & FIF_PLCPFAIL));
- - rt2x00_set_field32(®, TXRX_CSR0_DROP_CONTROL,
- - !(filter_flags & (FIF_CONTROL | FIF_PSPOLL)));
- -- rt2x00_set_field32(®, TXRX_CSR0_DROP_NOT_TO_ME, 1);
- -+ rt2x00_set_field32(®, TXRX_CSR0_DROP_NOT_TO_ME,
- -+ !rt2x00dev->is_monitoring);
- - rt2x00_set_field32(®, TXRX_CSR0_DROP_TO_DS,
- -+ !rt2x00dev->is_monitoring &&
- - !rt2x00dev->intf_ap_count);
- - rt2x00_set_field32(®, TXRX_CSR0_DROP_VERSION_ERROR, 1);
- - rt2x00_set_field32(®, TXRX_CSR0_DROP_MULTICAST,
- ---- a/drivers/net/wireless/ralink/rt2x00/rt73usb.c
- -+++ b/drivers/net/wireless/ralink/rt2x00/rt73usb.c
- -@@ -480,8 +480,10 @@ static void rt73usb_config_filter(struct
- - !(filter_flags & FIF_PLCPFAIL));
- - rt2x00_set_field32(®, TXRX_CSR0_DROP_CONTROL,
- - !(filter_flags & (FIF_CONTROL | FIF_PSPOLL)));
- -- rt2x00_set_field32(®, TXRX_CSR0_DROP_NOT_TO_ME, 1);
- -+ rt2x00_set_field32(®, TXRX_CSR0_DROP_NOT_TO_ME,
- -+ !rt2x00dev->is_monitoring);
- - rt2x00_set_field32(®, TXRX_CSR0_DROP_TO_DS,
- -+ !rt2x00dev->is_monitoring &&
- - !rt2x00dev->intf_ap_count);
- - rt2x00_set_field32(®, TXRX_CSR0_DROP_VERSION_ERROR, 1);
- - rt2x00_set_field32(®, TXRX_CSR0_DROP_MULTICAST,
- diff --git a/package/kernel/mac80211/patches/304-ath10k-Ensure-peer_map-references-are-cleaned-up.patch b/package/kernel/mac80211/patches/304-ath10k-Ensure-peer_map-references-are-cleaned-up.patch
- new file mode 100644
- index 0000000..7dec1fb
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/304-ath10k-Ensure-peer_map-references-are-cleaned-up.patch
- @@ -0,0 +1,60 @@
- +From: Ben Greear <greearb@candelatech.com>
- +Date: Fri, 1 Apr 2016 14:12:09 -0700
- +Subject: [PATCH] ath10k: Ensure peer_map references are cleaned up.
- +
- +While debugging OS crashes due to firmware crashes, I enabled
- +kasan, and it noticed that peer objects were being used-after-freed.
- +
- +Looks like there are two places we could be leaving stale references
- +in the peer-map, so clean that up.
- +
- +Signed-off-by: Ben Greear <greearb@candelatech.com>
- +---
- +
- +--- a/drivers/net/wireless/ath/ath10k/mac.c
- ++++ b/drivers/net/wireless/ath/ath10k/mac.c
- +@@ -802,6 +802,7 @@ static void ath10k_peer_cleanup(struct a
- + {
- + struct ath10k_peer *peer, *tmp;
- + int peer_id;
- ++ int i;
- +
- + lockdep_assert_held(&ar->conf_mutex);
- +
- +@@ -818,6 +819,17 @@ static void ath10k_peer_cleanup(struct a
- + ar->peer_map[peer_id] = NULL;
- + }
- +
- ++ /* Double check that peer is properly un-referenced from
- ++ * the peer_map
- ++ */
- ++ for (i = 0; i < ARRAY_SIZE(ar->peer_map); i++) {
- ++ if (ar->peer_map[i] == peer) {
- ++ ath10k_warn(ar, "removing stale peer_map entry for %pM (ptr %p idx %d)\n",
- ++ peer->addr, peer, i);
- ++ ar->peer_map[i] = NULL;
- ++ }
- ++ }
- ++
- + list_del(&peer->list);
- + kfree(peer);
- + ar->num_peers--;
- +@@ -828,6 +840,7 @@ static void ath10k_peer_cleanup(struct a
- + static void ath10k_peer_cleanup_all(struct ath10k *ar)
- + {
- + struct ath10k_peer *peer, *tmp;
- ++ int i;
- +
- + lockdep_assert_held(&ar->conf_mutex);
- +
- +@@ -836,6 +849,10 @@ static void ath10k_peer_cleanup_all(stru
- + list_del(&peer->list);
- + kfree(peer);
- + }
- ++
- ++ for (i = 0; i < ARRAY_SIZE(ar->peer_map); i++)
- ++ ar->peer_map[i] = NULL;
- ++
- + spin_unlock_bh(&ar->data_lock);
- +
- + ar->num_peers = 0;
- diff --git a/package/kernel/mac80211/patches/304-ath9k-avoid-ANI-restart-if-no-trigger.patch b/package/kernel/mac80211/patches/304-ath9k-avoid-ANI-restart-if-no-trigger.patch
- deleted file mode 100644
- index 049059a..0000000
- --- a/package/kernel/mac80211/patches/304-ath9k-avoid-ANI-restart-if-no-trigger.patch
- +++ /dev/null
- @@ -1,32 +0,0 @@
- -From: Miaoqing Pan <miaoqing@codeaurora.org>
- -Date: Fri, 15 Jan 2016 18:17:17 +0800
- -Subject: [PATCH] ath9k: avoid ANI restart if no trigger
- -
- -Fixes commit 54da20d83f0e ("ath9k_hw: improve ANI processing and rx desensitizing parameters")
- -
- -Call ath9k_ani_restart() only when the phy error rate reach the
- -ANI immunity threshold. Sync the logic with internal code base.
- -
- -Signed-off-by: Miaoqing Pan <miaoqing@codeaurora.org>
- ----
- -
- ---- a/drivers/net/wireless/ath/ath9k/ani.c
- -+++ b/drivers/net/wireless/ath/ath9k/ani.c
- -@@ -444,14 +444,16 @@ void ath9k_hw_ani_monitor(struct ath_hw
- - ofdmPhyErrRate < ah->config.ofdm_trig_low) {
- - ath9k_hw_ani_lower_immunity(ah);
- - aniState->ofdmsTurn = !aniState->ofdmsTurn;
- -+ ath9k_ani_restart(ah);
- - } else if (ofdmPhyErrRate > ah->config.ofdm_trig_high) {
- - ath9k_hw_ani_ofdm_err_trigger(ah);
- - aniState->ofdmsTurn = false;
- -+ ath9k_ani_restart(ah);
- - } else if (cckPhyErrRate > ah->config.cck_trig_high) {
- - ath9k_hw_ani_cck_err_trigger(ah);
- - aniState->ofdmsTurn = true;
- -+ ath9k_ani_restart(ah);
- - }
- -- ath9k_ani_restart(ah);
- - }
- - }
- - EXPORT_SYMBOL(ath9k_hw_ani_monitor);
- diff --git a/package/kernel/mac80211/patches/305-ath10k-Clean-up-peer-when-sta-goes-away.patch b/package/kernel/mac80211/patches/305-ath10k-Clean-up-peer-when-sta-goes-away.patch
- new file mode 100644
- index 0000000..7248a8c
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/305-ath10k-Clean-up-peer-when-sta-goes-away.patch
- @@ -0,0 +1,32 @@
- +From: Ben Greear <greearb@candelatech.com>
- +Date: Fri, 1 Apr 2016 14:12:11 -0700
- +Subject: [PATCH] ath10k: Clean up peer when sta goes away.
- +
- +If WMI and/or firmware has issues removing the peer object,
- +then we still need to clean up the peer object in the driver.
- +
- +Signed-off-by: Ben Greear <greearb@candelatech.com>
- +---
- +
- +--- a/drivers/net/wireless/ath/ath10k/mac.c
- ++++ b/drivers/net/wireless/ath/ath10k/mac.c
- +@@ -5992,9 +5992,17 @@ static int ath10k_sta_state(struct ieee8
- + continue;
- +
- + if (peer->sta == sta) {
- +- ath10k_warn(ar, "found sta peer %pM entry on vdev %i after it was supposedly removed\n",
- +- sta->addr, arvif->vdev_id);
- ++ ath10k_warn(ar, "found sta peer %pM (ptr %p id %d) entry on vdev %i after it was supposedly removed\n",
- ++ sta->addr, peer, i, arvif->vdev_id);
- + peer->sta = NULL;
- ++
- ++ /* Clean up the peer object as well since we
- ++ * must have failed to do this above.
- ++ */
- ++ list_del(&peer->list);
- ++ ar->peer_map[i] = NULL;
- ++ kfree(peer);
- ++ ar->num_peers--;
- + }
- + }
- + spin_unlock_bh(&ar->data_lock);
- diff --git a/package/kernel/mac80211/patches/305-ath9k-clean-up-ANI-per-channel-pointer-checking.patch b/package/kernel/mac80211/patches/305-ath9k-clean-up-ANI-per-channel-pointer-checking.patch
- deleted file mode 100644
- index a1ac67c..0000000
- --- a/package/kernel/mac80211/patches/305-ath9k-clean-up-ANI-per-channel-pointer-checking.patch
- +++ /dev/null
- @@ -1,91 +0,0 @@
- -From: Miaoqing Pan <miaoqing@codeaurora.org>
- -Date: Fri, 15 Jan 2016 18:17:18 +0800
- -Subject: [PATCH] ath9k: clean up ANI per-channel pointer checking
- -
- -commit c24bd3620c50 ("ath9k: Do not maintain ANI state per-channel")
- -removed per-channel handling, the code to check 'curchan' also
- -should be removed as never used.
- -
- -Signed-off-by: Miaoqing Pan <miaoqing@codeaurora.org>
- ----
- -
- ---- a/drivers/net/wireless/ath/ath9k/ani.c
- -+++ b/drivers/net/wireless/ath/ath9k/ani.c
- -@@ -126,12 +126,8 @@ static void ath9k_hw_update_mibstats(str
- -
- - static void ath9k_ani_restart(struct ath_hw *ah)
- - {
- -- struct ar5416AniState *aniState;
- --
- -- if (!ah->curchan)
- -- return;
- -+ struct ar5416AniState *aniState = &ah->ani;
- -
- -- aniState = &ah->ani;
- - aniState->listenTime = 0;
- -
- - ENABLE_REGWRITE_BUFFER(ah);
- -@@ -221,12 +217,7 @@ static void ath9k_hw_set_ofdm_nil(struct
- -
- - static void ath9k_hw_ani_ofdm_err_trigger(struct ath_hw *ah)
- - {
- -- struct ar5416AniState *aniState;
- --
- -- if (!ah->curchan)
- -- return;
- --
- -- aniState = &ah->ani;
- -+ struct ar5416AniState *aniState = &ah->ani;
- -
- - if (aniState->ofdmNoiseImmunityLevel < ATH9K_ANI_OFDM_MAX_LEVEL)
- - ath9k_hw_set_ofdm_nil(ah, aniState->ofdmNoiseImmunityLevel + 1, false);
- -@@ -281,12 +272,7 @@ static void ath9k_hw_set_cck_nil(struct
- -
- - static void ath9k_hw_ani_cck_err_trigger(struct ath_hw *ah)
- - {
- -- struct ar5416AniState *aniState;
- --
- -- if (!ah->curchan)
- -- return;
- --
- -- aniState = &ah->ani;
- -+ struct ar5416AniState *aniState = &ah->ani;
- -
- - if (aniState->cckNoiseImmunityLevel < ATH9K_ANI_CCK_MAX_LEVEL)
- - ath9k_hw_set_cck_nil(ah, aniState->cckNoiseImmunityLevel + 1,
- -@@ -299,9 +285,7 @@ static void ath9k_hw_ani_cck_err_trigger
- - */
- - static void ath9k_hw_ani_lower_immunity(struct ath_hw *ah)
- - {
- -- struct ar5416AniState *aniState;
- --
- -- aniState = &ah->ani;
- -+ struct ar5416AniState *aniState = &ah->ani;
- -
- - /* lower OFDM noise immunity */
- - if (aniState->ofdmNoiseImmunityLevel > 0 &&
- -@@ -329,7 +313,7 @@ void ath9k_ani_reset(struct ath_hw *ah,
- - struct ath_common *common = ath9k_hw_common(ah);
- - int ofdm_nil, cck_nil;
- -
- -- if (!ah->curchan)
- -+ if (!chan)
- - return;
- -
- - BUG_ON(aniState == NULL);
- -@@ -416,14 +400,10 @@ static bool ath9k_hw_ani_read_counters(s
- -
- - void ath9k_hw_ani_monitor(struct ath_hw *ah, struct ath9k_channel *chan)
- - {
- -- struct ar5416AniState *aniState;
- -+ struct ar5416AniState *aniState = &ah->ani;
- - struct ath_common *common = ath9k_hw_common(ah);
- - u32 ofdmPhyErrRate, cckPhyErrRate;
- -
- -- if (!ah->curchan)
- -- return;
- --
- -- aniState = &ah->ani;
- - if (!ath9k_hw_ani_read_counters(ah))
- - return;
- -
- diff --git a/package/kernel/mac80211/patches/306-ath9k-do-not-reset-while-BB-panic-0x4000409-on-ar956.patch b/package/kernel/mac80211/patches/306-ath9k-do-not-reset-while-BB-panic-0x4000409-on-ar956.patch
- deleted file mode 100644
- index cf8194a..0000000
- --- a/package/kernel/mac80211/patches/306-ath9k-do-not-reset-while-BB-panic-0x4000409-on-ar956.patch
- +++ /dev/null
- @@ -1,31 +0,0 @@
- -From: Miaoqing Pan <miaoqing@codeaurora.org>
- -Date: Fri, 15 Jan 2016 18:17:19 +0800
- -Subject: [PATCH] ath9k: do not reset while BB panic(0x4000409) on ar9561
- -
- -BB panic(0x4000409) observed while AP enabling/disabling
- -bursting.
- -
- -Signed-off-by: Miaoqing Pan <miaoqing@codeaurora.org>
- ----
- -
- ---- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
- -+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
- -@@ -2071,7 +2071,8 @@ void ar9003_hw_attach_phy_ops(struct ath
- - * to be disabled.
- - *
- - * 0x04000409: Packet stuck on receive.
- -- * Full chip reset is required for all chips except AR9340.
- -+ * Full chip reset is required for all chips except
- -+ * AR9340, AR9531 and AR9561.
- - */
- -
- - /*
- -@@ -2100,7 +2101,7 @@ bool ar9003_hw_bb_watchdog_check(struct
- - case 0x04000b09:
- - return true;
- - case 0x04000409:
- -- if (AR_SREV_9340(ah) || AR_SREV_9531(ah))
- -+ if (AR_SREV_9340(ah) || AR_SREV_9531(ah) || AR_SREV_9561(ah))
- - return false;
- - else
- - return true;
- diff --git a/package/kernel/mac80211/patches/306-mac80211-add-hdrlen-to-ieee80211_tx_data.patch b/package/kernel/mac80211/patches/306-mac80211-add-hdrlen-to-ieee80211_tx_data.patch
- new file mode 100644
- index 0000000..4a8f143
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/306-mac80211-add-hdrlen-to-ieee80211_tx_data.patch
- @@ -0,0 +1,203 @@
- +From: Janusz Dziedzic <janusz.dziedzic@tieto.com>
- +Date: Fri, 19 Feb 2016 11:01:49 +0100
- +Subject: [PATCH] mac80211: add hdrlen to ieee80211_tx_data
- +
- +Add hdrlen to ieee80211_tx_data and use this
- +when wep/ccmd/tkip. This is preparation for
- +aligned4 code.
- +
- +Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
- +---
- +
- +--- a/net/mac80211/ieee80211_i.h
- ++++ b/net/mac80211/ieee80211_i.h
- +@@ -173,6 +173,7 @@ struct ieee80211_tx_data {
- + struct ieee80211_tx_rate rate;
- +
- + unsigned int flags;
- ++ unsigned int hdrlen;
- + };
- +
- +
- +--- a/net/mac80211/tx.c
- ++++ b/net/mac80211/tx.c
- +@@ -922,7 +922,7 @@ ieee80211_tx_h_fragment(struct ieee80211
- + struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
- + struct ieee80211_hdr *hdr = (void *)skb->data;
- + int frag_threshold = tx->local->hw.wiphy->frag_threshold;
- +- int hdrlen;
- ++ int hdrlen = tx->hdrlen;
- + int fragnum;
- +
- + /* no matter what happens, tx->skb moves to tx->skbs */
- +@@ -943,8 +943,6 @@ ieee80211_tx_h_fragment(struct ieee80211
- + if (WARN_ON(info->flags & IEEE80211_TX_CTL_AMPDU))
- + return TX_DROP;
- +
- +- hdrlen = ieee80211_hdrlen(hdr->frame_control);
- +-
- + /* internal error, why isn't DONTFRAG set? */
- + if (WARN_ON(skb->len + FCS_LEN <= frag_threshold))
- + return TX_DROP;
- +@@ -1176,6 +1174,8 @@ ieee80211_tx_prepare(struct ieee80211_su
- +
- + hdr = (struct ieee80211_hdr *) skb->data;
- +
- ++ tx->hdrlen = ieee80211_hdrlen(hdr->frame_control);
- ++
- + if (likely(sta)) {
- + if (!IS_ERR(sta))
- + tx->sta = sta;
- +--- a/net/mac80211/util.c
- ++++ b/net/mac80211/util.c
- +@@ -1226,6 +1226,7 @@ void ieee80211_send_auth(struct ieee8021
- + struct ieee80211_local *local = sdata->local;
- + struct sk_buff *skb;
- + struct ieee80211_mgmt *mgmt;
- ++ unsigned int hdrlen;
- + int err;
- +
- + /* 24 + 6 = header + auth_algo + auth_transaction + status_code */
- +@@ -1250,8 +1251,10 @@ void ieee80211_send_auth(struct ieee8021
- + memcpy(skb_put(skb, extra_len), extra, extra_len);
- +
- + if (auth_alg == WLAN_AUTH_SHARED_KEY && transaction == 3) {
- ++ hdrlen = ieee80211_hdrlen(mgmt->frame_control);
- + mgmt->frame_control |= cpu_to_le16(IEEE80211_FCTL_PROTECTED);
- +- err = ieee80211_wep_encrypt(local, skb, key, key_len, key_idx);
- ++ err = ieee80211_wep_encrypt(local, skb, hdrlen, key,
- ++ key_len, key_idx);
- + WARN_ON(err);
- + }
- +
- +--- a/net/mac80211/wep.c
- ++++ b/net/mac80211/wep.c
- +@@ -89,11 +89,11 @@ static void ieee80211_wep_get_iv(struct
- +
- + static u8 *ieee80211_wep_add_iv(struct ieee80211_local *local,
- + struct sk_buff *skb,
- ++ unsigned int hdrlen,
- + int keylen, int keyidx)
- + {
- + struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
- + struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
- +- unsigned int hdrlen;
- + u8 *newhdr;
- +
- + hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_PROTECTED);
- +@@ -101,7 +101,6 @@ static u8 *ieee80211_wep_add_iv(struct i
- + if (WARN_ON(skb_headroom(skb) < IEEE80211_WEP_IV_LEN))
- + return NULL;
- +
- +- hdrlen = ieee80211_hdrlen(hdr->frame_control);
- + newhdr = skb_push(skb, IEEE80211_WEP_IV_LEN);
- + memmove(newhdr, newhdr + IEEE80211_WEP_IV_LEN, hdrlen);
- +
- +@@ -160,6 +159,7 @@ int ieee80211_wep_encrypt_data(struct cr
- + */
- + int ieee80211_wep_encrypt(struct ieee80211_local *local,
- + struct sk_buff *skb,
- ++ unsigned int hdrlen,
- + const u8 *key, int keylen, int keyidx)
- + {
- + u8 *iv;
- +@@ -169,7 +169,7 @@ int ieee80211_wep_encrypt(struct ieee802
- + if (WARN_ON(skb_tailroom(skb) < IEEE80211_WEP_ICV_LEN))
- + return -1;
- +
- +- iv = ieee80211_wep_add_iv(local, skb, keylen, keyidx);
- ++ iv = ieee80211_wep_add_iv(local, skb, hdrlen, keylen, keyidx);
- + if (!iv)
- + return -1;
- +
- +@@ -306,13 +306,14 @@ static int wep_encrypt_skb(struct ieee80
- + struct ieee80211_key_conf *hw_key = info->control.hw_key;
- +
- + if (!hw_key) {
- +- if (ieee80211_wep_encrypt(tx->local, skb, tx->key->conf.key,
- ++ if (ieee80211_wep_encrypt(tx->local, skb, tx->hdrlen,
- ++ tx->key->conf.key,
- + tx->key->conf.keylen,
- + tx->key->conf.keyidx))
- + return -1;
- + } else if ((hw_key->flags & IEEE80211_KEY_FLAG_GENERATE_IV) ||
- + (hw_key->flags & IEEE80211_KEY_FLAG_PUT_IV_SPACE)) {
- +- if (!ieee80211_wep_add_iv(tx->local, skb,
- ++ if (!ieee80211_wep_add_iv(tx->local, skb, tx->hdrlen,
- + tx->key->conf.keylen,
- + tx->key->conf.keyidx))
- + return -1;
- +--- a/net/mac80211/wep.h
- ++++ b/net/mac80211/wep.h
- +@@ -22,6 +22,7 @@ int ieee80211_wep_encrypt_data(struct cr
- + size_t klen, u8 *data, size_t data_len);
- + int ieee80211_wep_encrypt(struct ieee80211_local *local,
- + struct sk_buff *skb,
- ++ unsigned int hdrlen,
- + const u8 *key, int keylen, int keyidx);
- + int ieee80211_wep_decrypt_data(struct crypto_cipher *tfm, u8 *rc4key,
- + size_t klen, u8 *data, size_t data_len);
- +--- a/net/mac80211/wpa.c
- ++++ b/net/mac80211/wpa.c
- +@@ -43,7 +43,7 @@ ieee80211_tx_h_michael_mic_add(struct ie
- + skb->len < 24 || !ieee80211_is_data_present(hdr->frame_control))
- + return TX_CONTINUE;
- +
- +- hdrlen = ieee80211_hdrlen(hdr->frame_control);
- ++ hdrlen = tx->hdrlen;
- + if (skb->len < hdrlen)
- + return TX_DROP;
- +
- +@@ -186,7 +186,6 @@ mic_fail_no_key:
- +
- + static int tkip_encrypt_skb(struct ieee80211_tx_data *tx, struct sk_buff *skb)
- + {
- +- struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
- + struct ieee80211_key *key = tx->key;
- + struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
- + unsigned int hdrlen;
- +@@ -201,7 +200,7 @@ static int tkip_encrypt_skb(struct ieee8
- + return 0;
- + }
- +
- +- hdrlen = ieee80211_hdrlen(hdr->frame_control);
- ++ hdrlen = tx->hdrlen;
- + len = skb->len - hdrlen;
- +
- + if (info->control.hw_key)
- +@@ -418,7 +417,7 @@ static int ccmp_encrypt_skb(struct ieee8
- + return 0;
- + }
- +
- +- hdrlen = ieee80211_hdrlen(hdr->frame_control);
- ++ hdrlen = tx->hdrlen;
- + len = skb->len - hdrlen;
- +
- + if (info->control.hw_key)
- +@@ -651,7 +650,7 @@ static int gcmp_encrypt_skb(struct ieee8
- + return 0;
- + }
- +
- +- hdrlen = ieee80211_hdrlen(hdr->frame_control);
- ++ hdrlen = tx->hdrlen;
- + len = skb->len - hdrlen;
- +
- + if (info->control.hw_key)
- +@@ -791,7 +790,6 @@ static ieee80211_tx_result
- + ieee80211_crypto_cs_encrypt(struct ieee80211_tx_data *tx,
- + struct sk_buff *skb)
- + {
- +- struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
- + struct ieee80211_key *key = tx->key;
- + struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
- + int hdrlen;
- +@@ -807,8 +805,7 @@ ieee80211_crypto_cs_encrypt(struct ieee8
- + pskb_expand_head(skb, iv_len, 0, GFP_ATOMIC)))
- + return TX_DROP;
- +
- +- hdrlen = ieee80211_hdrlen(hdr->frame_control);
- +-
- ++ hdrlen = tx->hdrlen;
- + pos = skb_push(skb, iv_len);
- + memmove(pos, pos + iv_len, hdrlen);
- +
- diff --git a/package/kernel/mac80211/patches/307-ath9k-fix-inconsistent-use-of-tab-and-space-in-inden.patch b/package/kernel/mac80211/patches/307-ath9k-fix-inconsistent-use-of-tab-and-space-in-inden.patch
- deleted file mode 100644
- index 80b781c..0000000
- --- a/package/kernel/mac80211/patches/307-ath9k-fix-inconsistent-use-of-tab-and-space-in-inden.patch
- +++ /dev/null
- @@ -1,27 +0,0 @@
- -From: Miaoqing Pan <miaoqing@codeaurora.org>
- -Date: Fri, 15 Jan 2016 18:17:20 +0800
- -Subject: [PATCH] ath9k: fix inconsistent use of tab and space in
- - indentation
- -
- -Minor changes for indenting.
- -
- -Signed-off-by: Miaoqing Pan <miaoqing@codeaurora.org>
- ----
- -
- ---- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
- -+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
- -@@ -5485,11 +5485,11 @@ unsigned int ar9003_get_paprd_scale_fact
- - AR9300_PAPRD_SCALE_1);
- - else {
- - if (chan->channel >= 5700)
- -- return MS(le32_to_cpu(eep->modalHeader5G.papdRateMaskHt20),
- -- AR9300_PAPRD_SCALE_1);
- -+ return MS(le32_to_cpu(eep->modalHeader5G.papdRateMaskHt20),
- -+ AR9300_PAPRD_SCALE_1);
- - else if (chan->channel >= 5400)
- - return MS(le32_to_cpu(eep->modalHeader5G.papdRateMaskHt40),
- -- AR9300_PAPRD_SCALE_2);
- -+ AR9300_PAPRD_SCALE_2);
- - else
- - return MS(le32_to_cpu(eep->modalHeader5G.papdRateMaskHt40),
- - AR9300_PAPRD_SCALE_1);
- diff --git a/package/kernel/mac80211/patches/307-mac80211-add-NEED_ALIGNED4_SKBS-hw-flag.patch b/package/kernel/mac80211/patches/307-mac80211-add-NEED_ALIGNED4_SKBS-hw-flag.patch
- new file mode 100644
- index 0000000..eeb881e
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/307-mac80211-add-NEED_ALIGNED4_SKBS-hw-flag.patch
- @@ -0,0 +1,235 @@
- +From: Janusz Dziedzic <janusz.dziedzic@tieto.com>
- +Date: Fri, 19 Feb 2016 11:01:50 +0100
- +Subject: [PATCH] mac80211: add NEED_ALIGNED4_SKBS hw flag
- +
- +HW/driver should set NEED_ALIGNED4_SKBS flag in case
- +require aligned skbs to four-byte boundaries.
- +This affect only TX direction.
- +
- +Padding is added after ieee80211_hdr, before IV/LLC.
- +
- +Before we have to do memmove(hdrlen) twice in the
- +dirver. Once before we pass this to HW and next
- +in tx completion (to be sure monitor will report
- +this tx frame correctly).
- +
- +With this patch we can skip this memmove() and save CPU.
- +
- +Currently this was tested with ath9k, both hw/sw crypt for
- +wep/tkip/ccmp.
- +
- +Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
- +---
- +
- +--- a/include/net/mac80211.h
- ++++ b/include/net/mac80211.h
- +@@ -2014,6 +2014,9 @@ struct ieee80211_txq {
- + * @IEEE80211_HW_TX_FRAG_LIST: Hardware (or driver) supports sending frag_list
- + * skbs, needed for zero-copy software A-MSDU.
- + *
- ++ * @IEEE80211_HW_NEEDS_ALIGNED4_SKBS: Driver need aligned skbs to four-byte.
- ++ * Padding will be added after ieee80211_hdr, before IV/LLC.
- ++ *
- + * @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays
- + */
- + enum ieee80211_hw_flags {
- +@@ -2054,6 +2057,7 @@ enum ieee80211_hw_flags {
- + IEEE80211_HW_USES_RSS,
- + IEEE80211_HW_TX_AMSDU,
- + IEEE80211_HW_TX_FRAG_LIST,
- ++ IEEE80211_HW_NEEDS_ALIGNED4_SKBS,
- +
- + /* keep last, obviously */
- + NUM_IEEE80211_HW_FLAGS
- +--- a/net/mac80211/debugfs.c
- ++++ b/net/mac80211/debugfs.c
- +@@ -302,6 +302,7 @@ static const char *hw_flag_names[] = {
- + FLAG(USES_RSS),
- + FLAG(TX_AMSDU),
- + FLAG(TX_FRAG_LIST),
- ++ FLAG(NEEDS_ALIGNED4_SKBS),
- + #undef FLAG
- + };
- +
- +--- a/net/mac80211/ieee80211_i.h
- ++++ b/net/mac80211/ieee80211_i.h
- +@@ -1497,6 +1497,29 @@ ieee80211_have_rx_timestamp(struct ieee8
- + return false;
- + }
- +
- ++static inline unsigned int
- ++ieee80211_hdr_padsize(struct ieee80211_hw *hw, unsigned int hdrlen)
- ++{
- ++ /*
- ++ * While hdrlen is already aligned to two-byte boundaries,
- ++ * simple check with & 2 will return correct padsize.
- ++ */
- ++ if (ieee80211_hw_check(hw, NEEDS_ALIGNED4_SKBS))
- ++ return hdrlen & 2;
- ++ return 0;
- ++}
- ++
- ++static inline unsigned int
- ++ieee80211_padded_hdrlen(struct ieee80211_hw *hw, __le16 fc)
- ++{
- ++ unsigned int hdrlen;
- ++
- ++ hdrlen = ieee80211_hdrlen(fc);
- ++ hdrlen += ieee80211_hdr_padsize(hw, hdrlen);
- ++
- ++ return hdrlen;
- ++}
- ++
- + u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local,
- + struct ieee80211_rx_status *status,
- + unsigned int mpdu_len,
- +--- a/net/mac80211/sta_info.h
- ++++ b/net/mac80211/sta_info.h
- +@@ -279,7 +279,7 @@ struct ieee80211_fast_tx {
- + u8 hdr_len;
- + u8 sa_offs, da_offs, pn_offs;
- + u8 band;
- +- u8 hdr[30 + 2 + IEEE80211_FAST_XMIT_MAX_IV +
- ++ u8 hdr[30 + 2 + 2 + IEEE80211_FAST_XMIT_MAX_IV +
- + sizeof(rfc1042_header)] __aligned(2);
- +
- + struct rcu_head rcu_head;
- +--- a/net/mac80211/status.c
- ++++ b/net/mac80211/status.c
- +@@ -683,9 +683,22 @@ void ieee80211_tx_monitor(struct ieee802
- + struct sk_buff *skb2;
- + struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
- + struct ieee80211_sub_if_data *sdata;
- ++ struct ieee80211_hdr *hdr = (void *)skb->data;
- + struct net_device *prev_dev = NULL;
- ++ unsigned int hdrlen, padsize;
- + int rtap_len;
- +
- ++ /* Remove padding if was added */
- ++ if (ieee80211_hw_check(&local->hw, NEEDS_ALIGNED4_SKBS)) {
- ++ hdrlen = ieee80211_hdrlen(hdr->frame_control);
- ++ padsize = ieee80211_hdr_padsize(&local->hw, hdrlen);
- ++
- ++ if (padsize && skb->len > hdrlen + padsize) {
- ++ memmove(skb->data + padsize, skb->data, hdrlen);
- ++ skb_pull(skb, padsize);
- ++ }
- ++ }
- ++
- + /* send frame to monitor interfaces now */
- + rtap_len = ieee80211_tx_radiotap_len(info);
- + if (WARN_ON_ONCE(skb_headroom(skb) < rtap_len)) {
- +--- a/net/mac80211/tkip.c
- ++++ b/net/mac80211/tkip.c
- +@@ -201,10 +201,12 @@ void ieee80211_get_tkip_p2k(struct ieee8
- + {
- + struct ieee80211_key *key = (struct ieee80211_key *)
- + container_of(keyconf, struct ieee80211_key, conf);
- ++ struct ieee80211_hw *hw = &key->local->hw;
- + const u8 *tk = &key->conf.key[NL80211_TKIP_DATA_OFFSET_ENCR_KEY];
- + struct tkip_ctx *ctx = &key->u.tkip.tx;
- + struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
- +- const u8 *data = (u8 *)hdr + ieee80211_hdrlen(hdr->frame_control);
- ++ const u8 *data = (u8 *)hdr + ieee80211_padded_hdrlen(hw,
- ++ hdr->frame_control);
- + u32 iv32 = get_unaligned_le32(&data[4]);
- + u16 iv16 = data[2] | (data[0] << 8);
- +
- +--- a/net/mac80211/tx.c
- ++++ b/net/mac80211/tx.c
- +@@ -1173,8 +1173,7 @@ ieee80211_tx_prepare(struct ieee80211_su
- + info->flags &= ~IEEE80211_TX_INTFL_NEED_TXPROCESSING;
- +
- + hdr = (struct ieee80211_hdr *) skb->data;
- +-
- +- tx->hdrlen = ieee80211_hdrlen(hdr->frame_control);
- ++ tx->hdrlen = ieee80211_padded_hdrlen(&local->hw, hdr->frame_control);
- +
- + if (likely(sta)) {
- + if (!IS_ERR(sta))
- +@@ -2108,7 +2107,7 @@ netdev_tx_t ieee80211_monitor_start_xmit
- + goto fail;
- +
- + hdr = (struct ieee80211_hdr *)(skb->data + len_rthdr);
- +- hdrlen = ieee80211_hdrlen(hdr->frame_control);
- ++ hdrlen = ieee80211_padded_hdrlen(&local->hw, hdr->frame_control);
- +
- + if (skb->len < len_rthdr + hdrlen)
- + goto fail;
- +@@ -2334,7 +2333,7 @@ static struct sk_buff *ieee80211_build_h
- + struct ieee80211_chanctx_conf *chanctx_conf;
- + struct ieee80211_sub_if_data *ap_sdata;
- + enum nl80211_band band;
- +- int ret;
- ++ int padsize, ret;
- +
- + if (IS_ERR(sta))
- + sta = NULL;
- +@@ -2554,6 +2553,9 @@ static struct sk_buff *ieee80211_build_h
- + hdrlen += 2;
- + }
- +
- ++ /* Check aligned4 skb required */
- ++ padsize = ieee80211_hdr_padsize(&sdata->local->hw, hdrlen);
- ++
- + /*
- + * Drop unicast frames to unauthorised stations unless they are
- + * EAPOL frames from the local station.
- +@@ -2640,6 +2642,7 @@ static struct sk_buff *ieee80211_build_h
- + h_pos -= skip_header_bytes;
- +
- + head_need = hdrlen + encaps_len + meshhdrlen - skb_headroom(skb);
- ++ head_need += padsize;
- +
- + /*
- + * So we need to modify the skb header and hence need a copy of
- +@@ -2678,6 +2681,9 @@ static struct sk_buff *ieee80211_build_h
- + }
- + #endif
- +
- ++ if (padsize)
- ++ memset(skb_push(skb, padsize), 0, padsize);
- ++
- + if (ieee80211_is_data_qos(fc)) {
- + __le16 *qos_control;
- +
- +@@ -2691,8 +2697,8 @@ static struct sk_buff *ieee80211_build_h
- + } else
- + memcpy(skb_push(skb, hdrlen), &hdr, hdrlen);
- +
- +- nh_pos += hdrlen;
- +- h_pos += hdrlen;
- ++ nh_pos += hdrlen + padsize;
- ++ h_pos += hdrlen + padsize;
- +
- + /* Update skb pointers to various headers since this modified frame
- + * is going to go through Linux networking code that may potentially
- +@@ -2861,6 +2867,9 @@ void ieee80211_check_fast_xmit(struct st
- + fc |= cpu_to_le16(IEEE80211_STYPE_QOS_DATA);
- + }
- +
- ++ /* Check aligned4 skb required */
- ++ build.hdr_len += ieee80211_hdr_padsize(&local->hw, build.hdr_len);
- ++
- + /* We store the key here so there's no point in using rcu_dereference()
- + * but that's fine because the code that changes the pointers will call
- + * this function after doing so. For a single CPU that would be enough,
- +--- a/net/mac80211/util.c
- ++++ b/net/mac80211/util.c
- +@@ -1224,6 +1224,7 @@ void ieee80211_send_auth(struct ieee8021
- + u32 tx_flags)
- + {
- + struct ieee80211_local *local = sdata->local;
- ++ struct ieee80211_hw *hw = &local->hw;
- + struct sk_buff *skb;
- + struct ieee80211_mgmt *mgmt;
- + unsigned int hdrlen;
- +@@ -1251,7 +1252,7 @@ void ieee80211_send_auth(struct ieee8021
- + memcpy(skb_put(skb, extra_len), extra, extra_len);
- +
- + if (auth_alg == WLAN_AUTH_SHARED_KEY && transaction == 3) {
- +- hdrlen = ieee80211_hdrlen(mgmt->frame_control);
- ++ hdrlen = ieee80211_padded_hdrlen(hw, mgmt->frame_control);
- + mgmt->frame_control |= cpu_to_le16(IEEE80211_FCTL_PROTECTED);
- + err = ieee80211_wep_encrypt(local, skb, hdrlen, key,
- + key_len, key_idx);
- diff --git a/package/kernel/mac80211/patches/308-ath10k-Fix-sending-NULL-Qos-NULL-data-frames-for-QCA.patch b/package/kernel/mac80211/patches/308-ath10k-Fix-sending-NULL-Qos-NULL-data-frames-for-QCA.patch
- new file mode 100644
- index 0000000..8590aad
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/308-ath10k-Fix-sending-NULL-Qos-NULL-data-frames-for-QCA.patch
- @@ -0,0 +1,72 @@
- +From: Mohammed Shafi Shajakhan <mohammed@qti.qualcomm.com>
- +Date: Thu, 23 Jun 2016 22:10:01 +0530
- +Subject: [PATCH] ath10k: Fix sending NULL/ Qos NULL data frames for
- + QCA99X0 and later
- +
- +For chipsets like QCA99X0, IPQ4019 and later we are not getting proper
- +NULL func status (always acked/successs !!) when hostapd does a
- +PROBE_CLIENT via nullfunc frames when the station is powered off
- +abruptly (inactive timer probes client via null func after the inactive
- +time reaches beyond the threshold). Fix this by disabling the workaround
- +(getting the ACK status of NULL func frames by sending via HTT mgmt-tx
- + path) introduced by the change ("ath10k: fix beacon loss handling ")
- +for QCA99X0 and later chipsets. The normal tx path provides the proper
- +ACK status for NULL data frames. As of now disable this workaround for
- +chipsets QCA99X0 and later, once the 10.1 firmware is obselete we can
- +completely get rid of this workaround for all the chipsets
- +
- +Signed-off-by: Tamizh chelvam <c_traja@qti.qualcomm.com>
- +Signed-off-by: Mohammed Shafi Shajakhan <mohammed@qti.qualcomm.com>
- +---
- +
- +--- a/drivers/net/wireless/ath/ath10k/core.c
- ++++ b/drivers/net/wireless/ath/ath10k/core.c
- +@@ -181,6 +181,7 @@ static const struct ath10k_hw_params ath
- + .board = QCA99X0_HW_2_0_BOARD_DATA_FILE,
- + .board_size = QCA99X0_BOARD_DATA_SZ,
- + .board_ext_size = QCA99X0_BOARD_EXT_DATA_SZ,
- ++ .disable_null_func_workaround = true,
- + },
- + },
- + {
- +@@ -204,6 +205,7 @@ static const struct ath10k_hw_params ath
- + .board = QCA9984_HW_1_0_BOARD_DATA_FILE,
- + .board_size = QCA99X0_BOARD_DATA_SZ,
- + .board_ext_size = QCA99X0_BOARD_EXT_DATA_SZ,
- ++ .disable_null_func_workaround = true,
- + },
- + },
- + {
- +@@ -262,6 +264,7 @@ static const struct ath10k_hw_params ath
- + .board = QCA4019_HW_1_0_BOARD_DATA_FILE,
- + .board_size = QCA4019_BOARD_DATA_SZ,
- + .board_ext_size = QCA4019_BOARD_EXT_DATA_SZ,
- ++ .disable_null_func_workaround = true,
- + },
- + },
- + };
- +--- a/drivers/net/wireless/ath/ath10k/core.h
- ++++ b/drivers/net/wireless/ath/ath10k/core.h
- +@@ -750,6 +750,12 @@ struct ath10k {
- + const char *board;
- + size_t board_size;
- + size_t board_ext_size;
- ++ /* Workaround of sending NULL data frames via
- ++ * HTT mgmt TX and getting the proper ACK status does
- ++ * not works for chipsets QCA99X0 and later, while
- ++ * Tx data path reports the ACK status properly.
- ++ */
- ++ bool disable_null_func_workaround;
- + } fw;
- + } hw_params;
- +
- +--- a/drivers/net/wireless/ath/ath10k/mac.c
- ++++ b/drivers/net/wireless/ath/ath10k/mac.c
- +@@ -3253,6 +3253,7 @@ ath10k_mac_tx_h_get_txmode(struct ath10k
- + * mode though because AP don't sleep.
- + */
- + if (ar->htt.target_version_major < 3 &&
- ++ !ar->hw_params.fw.disable_null_func_workaround &&
- + (ieee80211_is_nullfunc(fc) || ieee80211_is_qos_nullfunc(fc)) &&
- + !test_bit(ATH10K_FW_FEATURE_HAS_WMI_MGMT_TX,
- + ar->running_fw->fw_file.fw_features))
- diff --git a/package/kernel/mac80211/patches/308-ath9k-fix-data-bus-error-on-ar9300-and-ar9580.patch b/package/kernel/mac80211/patches/308-ath9k-fix-data-bus-error-on-ar9300-and-ar9580.patch
- deleted file mode 100644
- index d408866..0000000
- --- a/package/kernel/mac80211/patches/308-ath9k-fix-data-bus-error-on-ar9300-and-ar9580.patch
- +++ /dev/null
- @@ -1,65 +0,0 @@
- -From: Miaoqing Pan <miaoqing@codeaurora.org>
- -Date: Fri, 15 Jan 2016 18:17:21 +0800
- -Subject: [PATCH] ath9k: fix data bus error on ar9300 and ar9580
- -
- -One crash issue be found on ar9300: RTC_RC reg read leads crash, leading
- -the data bus error, due to RTC_RC reg write not happen properly.
- -
- -Warm Reset trigger in continuous beacon stuck for one of the customer for
- -other chip, noticed the MAC was stuck in RTC reset. After analysis noticed
- -DMA did not complete when RTC was put in reset.
- -
- -So, before resetting the MAC need to make sure there are no pending DMA
- -transactions because this reset does not reset all parts of the chip.
- -
- -The 12th and 11th bit of MAC _DMA_CFG register used to do that.
- - 12 cfg_halt_ack 0x0
- - 0 DMA has not yet halted
- - 1 DMA has halted
- - 11 cfg_halt_req 0x0
- - 0 DMA logic operates normally
- - 1 Request DMA logic to stop so software can reset the MAC
- -
- -The Bit [12] of this register indicates when the halt has taken effect or
- -not. the DMA halt IS NOT recoverable; once software sets bit [11] to
- -request a DMA halt, software must wait for bit [12] to be set and reset
- -the MAC.
- -
- -So, the same thing we implemented for ar9580 chip.
- -
- -Signed-off-by: Miaoqing Pan <miaoqing@codeaurora.org>
- ----
- -
- ---- a/drivers/net/wireless/ath/ath9k/hw.c
- -+++ b/drivers/net/wireless/ath/ath9k/hw.c
- -@@ -1368,6 +1368,16 @@ static bool ath9k_hw_set_reset(struct at
- - if (ath9k_hw_mci_is_enabled(ah))
- - ar9003_mci_check_gpm_offset(ah);
- -
- -+ /* DMA HALT added to resolve ar9300 and ar9580 bus error during
- -+ * RTC_RC reg read
- -+ */
- -+ if (AR_SREV_9300(ah) || AR_SREV_9580(ah)) {
- -+ REG_SET_BIT(ah, AR_CFG, AR_CFG_HALT_REQ);
- -+ ath9k_hw_wait(ah, AR_CFG, AR_CFG_HALT_ACK, AR_CFG_HALT_ACK,
- -+ 20 * AH_WAIT_TIMEOUT);
- -+ REG_CLR_BIT(ah, AR_CFG, AR_CFG_HALT_REQ);
- -+ }
- -+
- - REG_WRITE(ah, AR_RTC_RC, rst_flags);
- -
- - REGWRITE_BUFFER_FLUSH(ah);
- ---- a/drivers/net/wireless/ath/ath9k/reg.h
- -+++ b/drivers/net/wireless/ath/ath9k/reg.h
- -@@ -34,8 +34,10 @@
- - #define AR_CFG_SWRG 0x00000010
- - #define AR_CFG_AP_ADHOC_INDICATION 0x00000020
- - #define AR_CFG_PHOK 0x00000100
- --#define AR_CFG_CLK_GATE_DIS 0x00000400
- - #define AR_CFG_EEBS 0x00000200
- -+#define AR_CFG_CLK_GATE_DIS 0x00000400
- -+#define AR_CFG_HALT_REQ 0x00000800
- -+#define AR_CFG_HALT_ACK 0x00001000
- - #define AR_CFG_PCI_MASTER_REQ_Q_THRESH 0x00060000
- - #define AR_CFG_PCI_MASTER_REQ_Q_THRESH_S 17
- -
- diff --git a/package/kernel/mac80211/patches/309-01-brcmfmac-add-missing-include.patch b/package/kernel/mac80211/patches/309-01-brcmfmac-add-missing-include.patch
- deleted file mode 100644
- index d9511c8..0000000
- --- a/package/kernel/mac80211/patches/309-01-brcmfmac-add-missing-include.patch
- +++ /dev/null
- @@ -1,19 +0,0 @@
- -From: Felix Fietkau <nbd@openwrt.org>
- -Date: Fri, 15 Jan 2016 15:59:45 +0100
- -Subject: [PATCH] brcmfmac: add missing include
- -
- -linux/module.h is required for defining module parameters
- -
- -Signed-off-by: Felix Fietkau <nbd@openwrt.org>
- ----
- -
- ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
- -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
- -@@ -17,6 +17,7 @@
- - #include <linux/kernel.h>
- - #include <linux/string.h>
- - #include <linux/netdevice.h>
- -+#include <linux/module.h>
- - #include <brcmu_wifi.h>
- - #include <brcmu_utils.h>
- - #include "core.h"
- diff --git a/package/kernel/mac80211/patches/309-02-brcmfmac-fix-sdio-sg-table-alloc-crash.patch b/package/kernel/mac80211/patches/309-02-brcmfmac-fix-sdio-sg-table-alloc-crash.patch
- deleted file mode 100644
- index 711e019..0000000
- --- a/package/kernel/mac80211/patches/309-02-brcmfmac-fix-sdio-sg-table-alloc-crash.patch
- +++ /dev/null
- @@ -1,118 +0,0 @@
- -From: Hante Meuleman <meuleman@broadcom.com>
- -Date: Tue, 19 Jan 2016 12:39:24 +0100
- -Subject: [PATCH] brcmfmac: fix sdio sg table alloc crash
- -
- -With commit 7d34b0560567 ("brcmfmac: Move all module parameters to
- -one place") a bug was introduced causing a null pointer exception.
- -This patch fixes the bug by initializing the sg table till after
- -the settings have been initialized.
- -
- -Fixes: 7d34b0560567 ("brcmfmac: Move all module parameters to one place")
- -Reported-by: Marc Zyngier <marc.zyngier@arm.com>
- -Tested-by: Marc Zyngier <marc.zyngier@arm.com>
- -Reviewed-by: Arend Van Spriel <arend@broadcom.com>
- -Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
- -Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
- -Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
- -Signed-off-by: Arend van Spriel <arend@broadcom.com>
- -Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
- ----
- -
- ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
- -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
- -@@ -879,11 +879,24 @@ int brcmf_sdiod_abort(struct brcmf_sdio_
- - return 0;
- - }
- -
- --static void brcmf_sdiod_sgtable_alloc(struct brcmf_sdio_dev *sdiodev)
- -+void brcmf_sdiod_sgtable_alloc(struct brcmf_sdio_dev *sdiodev)
- - {
- -+ struct sdio_func *func;
- -+ struct mmc_host *host;
- -+ uint max_blocks;
- - uint nents;
- - int err;
- -
- -+ func = sdiodev->func[2];
- -+ host = func->card->host;
- -+ sdiodev->sg_support = host->max_segs > 1;
- -+ max_blocks = min_t(uint, host->max_blk_count, 511u);
- -+ sdiodev->max_request_size = min_t(uint, host->max_req_size,
- -+ max_blocks * func->cur_blksize);
- -+ sdiodev->max_segment_count = min_t(uint, host->max_segs,
- -+ SG_MAX_SINGLE_ALLOC);
- -+ sdiodev->max_segment_size = host->max_seg_size;
- -+
- - if (!sdiodev->sg_support)
- - return;
- -
- -@@ -1021,9 +1034,6 @@ static void brcmf_sdiod_host_fixup(struc
- -
- - static int brcmf_sdiod_probe(struct brcmf_sdio_dev *sdiodev)
- - {
- -- struct sdio_func *func;
- -- struct mmc_host *host;
- -- uint max_blocks;
- - int ret = 0;
- -
- - sdiodev->num_funcs = 2;
- -@@ -1054,26 +1064,6 @@ static int brcmf_sdiod_probe(struct brcm
- - goto out;
- - }
- -
- -- /*
- -- * determine host related variables after brcmf_sdiod_probe()
- -- * as func->cur_blksize is properly set and F2 init has been
- -- * completed successfully.
- -- */
- -- func = sdiodev->func[2];
- -- host = func->card->host;
- -- sdiodev->sg_support = host->max_segs > 1;
- -- max_blocks = min_t(uint, host->max_blk_count, 511u);
- -- sdiodev->max_request_size = min_t(uint, host->max_req_size,
- -- max_blocks * func->cur_blksize);
- -- sdiodev->max_segment_count = min_t(uint, host->max_segs,
- -- SG_MAX_SINGLE_ALLOC);
- -- sdiodev->max_segment_size = host->max_seg_size;
- --
- -- /* allocate scatter-gather table. sg support
- -- * will be disabled upon allocation failure.
- -- */
- -- brcmf_sdiod_sgtable_alloc(sdiodev);
- --
- - ret = brcmf_sdiod_freezer_attach(sdiodev);
- - if (ret)
- - goto out;
- -@@ -1084,7 +1074,7 @@ static int brcmf_sdiod_probe(struct brcm
- - ret = -ENODEV;
- - goto out;
- - }
- -- brcmf_sdiod_host_fixup(host);
- -+ brcmf_sdiod_host_fixup(sdiodev->func[2]->card->host);
- - out:
- - if (ret)
- - brcmf_sdiod_remove(sdiodev);
- ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
- -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
- -@@ -4114,6 +4114,11 @@ struct brcmf_sdio *brcmf_sdio_probe(stru
- - goto fail;
- - }
- -
- -+ /* allocate scatter-gather table. sg support
- -+ * will be disabled upon allocation failure.
- -+ */
- -+ brcmf_sdiod_sgtable_alloc(bus->sdiodev);
- -+
- - /* Query the F2 block size, set roundup accordingly */
- - bus->blocksize = bus->sdiodev->func[2]->cur_blksize;
- - bus->roundup = min(max_roundup, bus->blocksize);
- ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h
- -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h
- -@@ -342,6 +342,7 @@ int brcmf_sdiod_ramrw(struct brcmf_sdio_
- -
- - /* Issue an abort to the specified function */
- - int brcmf_sdiod_abort(struct brcmf_sdio_dev *sdiodev, uint fn);
- -+void brcmf_sdiod_sgtable_alloc(struct brcmf_sdio_dev *sdiodev);
- - void brcmf_sdiod_change_state(struct brcmf_sdio_dev *sdiodev,
- - enum brcmf_sdiod_state state);
- - #ifdef CONFIG_PM_SLEEP
- diff --git a/package/kernel/mac80211/patches/309-cfg80211-fix-proto-in-ieee80211_data_to_8023-for-fra.patch b/package/kernel/mac80211/patches/309-cfg80211-fix-proto-in-ieee80211_data_to_8023-for-fra.patch
- new file mode 100644
- index 0000000..41c27ca
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/309-cfg80211-fix-proto-in-ieee80211_data_to_8023-for-fra.patch
- @@ -0,0 +1,37 @@
- +From: Felix Fietkau <nbd@nbd.name>
- +Date: Wed, 29 Jun 2016 10:02:32 +0200
- +Subject: [PATCH] cfg80211: fix proto in ieee80211_data_to_8023 for frames
- + without LLC header
- +
- +The PDU length of incoming LLC frames is set to the total skb payload size
- +in __ieee80211_data_to_8023() of net/wireless/util.c which incorrectly
- +includes the length of the IEEE 802.11 header.
- +
- +The resulting LLC frame header has a too large PDU length, causing the
- +llc_fixup_skb() function of net/llc/llc_input.c to reject the incoming
- +skb, effectively breaking STP.
- +
- +Solve the problem by properly substracting the IEEE 802.11 frame header size
- +from the PDU length, allowing the LLC processor to pick up the incoming
- +control messages.
- +
- +Special thanks to Gerry Rozema for tracking down the regression and proposing
- +a suitable patch.
- +
- +Fixes: 2d1c304cb2d5 ("cfg80211: add function for 802.3 conversion with separate output buffer")
- +Cc: stable@vger.kernel.org
- +Reported-by: Gerry Rozema <gerryr@rozeware.com>
- +Signed-off-by: Felix Fietkau <nbd@nbd.name>
- +---
- +
- +--- a/net/wireless/util.c
- ++++ b/net/wireless/util.c
- +@@ -509,7 +509,7 @@ static int __ieee80211_data_to_8023(stru
- + * replace EtherType */
- + hdrlen += ETH_ALEN + 2;
- + else
- +- tmp.h_proto = htons(skb->len);
- ++ tmp.h_proto = htons(skb->len - hdrlen);
- +
- + pskb_pull(skb, hdrlen);
- +
- diff --git a/package/kernel/mac80211/patches/310-ath9k_hw-ignore-eeprom-magic-mismatch-on-flash-based.patch b/package/kernel/mac80211/patches/310-ath9k_hw-ignore-eeprom-magic-mismatch-on-flash-based.patch
- deleted file mode 100644
- index 287d6e1..0000000
- --- a/package/kernel/mac80211/patches/310-ath9k_hw-ignore-eeprom-magic-mismatch-on-flash-based.patch
- +++ /dev/null
- @@ -1,38 +0,0 @@
- -From: Felix Fietkau <nbd@openwrt.org>
- -Date: Thu, 21 Jan 2016 16:28:44 +0100
- -Subject: [PATCH] ath9k_hw: ignore eeprom magic mismatch on flash based devices
- -
- -Many AR913x based devices (maybe others too) do not have a valid EEPROM
- -magic in their calibration data partition.
- -
- -Fixes: 6fa658fd5ab2 ("ath9k: Simplify and fix eeprom endianness swapping")
- -Signed-off-by: Felix Fietkau <nbd@openwrt.org>
- ----
- -
- ---- a/drivers/net/wireless/ath/ath9k/eeprom.c
- -+++ b/drivers/net/wireless/ath/ath9k/eeprom.c
- -@@ -150,18 +150,18 @@ int ath9k_hw_nvram_swap_data(struct ath_
- - return -EIO;
- - }
- -
- -- if (magic == AR5416_EEPROM_MAGIC) {
- -- *swap_needed = false;
- -- } else if (swab16(magic) == AR5416_EEPROM_MAGIC) {
- -+ *swap_needed = false;
- -+ if (swab16(magic) == AR5416_EEPROM_MAGIC) {
- - if (ah->ah_flags & AH_NO_EEP_SWAP) {
- - ath_info(common,
- - "Ignoring endianness difference in EEPROM magic bytes.\n");
- --
- -- *swap_needed = false;
- - } else {
- - *swap_needed = true;
- - }
- -- } else {
- -+ } else if (magic != AR5416_EEPROM_MAGIC) {
- -+ if (ath9k_hw_use_flash(ah))
- -+ return 0;
- -+
- - ath_err(common,
- - "Invalid EEPROM Magic (0x%04x).\n", magic);
- - return -EINVAL;
- diff --git a/package/kernel/mac80211/patches/310-mac80211-minstrel-Enable-STBC-and-LDPC-for-VHT-Rates.patch b/package/kernel/mac80211/patches/310-mac80211-minstrel-Enable-STBC-and-LDPC-for-VHT-Rates.patch
- new file mode 100644
- index 0000000..25929c9
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/310-mac80211-minstrel-Enable-STBC-and-LDPC-for-VHT-Rates.patch
- @@ -0,0 +1,81 @@
- +From: Chaitanya T K <chaitanya.mgit@gmail.com>
- +Date: Mon, 27 Jun 2016 15:23:26 +0530
- +Subject: [PATCH] mac80211: minstrel: Enable STBC and LDPC for VHT Rates
- +
- +If peer support reception of STBC and LDPC, enable them for better
- +performance.
- +
- +Signed-off-by: Chaitanya TK <chaitanya.mgit@gmail.com>
- +---
- +
- +--- a/include/linux/ieee80211.h
- ++++ b/include/linux/ieee80211.h
- +@@ -1550,6 +1550,7 @@ struct ieee80211_vht_operation {
- + #define IEEE80211_VHT_CAP_RXSTBC_3 0x00000300
- + #define IEEE80211_VHT_CAP_RXSTBC_4 0x00000400
- + #define IEEE80211_VHT_CAP_RXSTBC_MASK 0x00000700
- ++#define IEEE80211_VHT_CAP_RXSTBC_SHIFT 8
- + #define IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE 0x00000800
- + #define IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE 0x00001000
- + #define IEEE80211_VHT_CAP_BEAMFORMEE_STS_SHIFT 13
- +--- a/net/mac80211/rc80211_minstrel_ht.c
- ++++ b/net/mac80211/rc80211_minstrel_ht.c
- +@@ -1166,13 +1166,14 @@ minstrel_ht_update_caps(void *priv, stru
- + struct minstrel_ht_sta_priv *msp = priv_sta;
- + struct minstrel_ht_sta *mi = &msp->ht;
- + struct ieee80211_mcs_info *mcs = &sta->ht_cap.mcs;
- +- u16 sta_cap = sta->ht_cap.cap;
- ++ u16 ht_cap = sta->ht_cap.cap;
- + struct ieee80211_sta_vht_cap *vht_cap = &sta->vht_cap;
- + int use_vht;
- + int n_supported = 0;
- + int ack_dur;
- + int stbc;
- + int i;
- ++ bool ldpc = false;
- +
- + /* fall back to the old minstrel for legacy stations */
- + if (!sta->ht_cap.ht_supported)
- +@@ -1210,16 +1211,24 @@ minstrel_ht_update_caps(void *priv, stru
- + }
- + mi->sample_tries = 4;
- +
- +- /* TODO tx_flags for vht - ATM the RC API is not fine-grained enough */
- + if (!use_vht) {
- +- stbc = (sta_cap & IEEE80211_HT_CAP_RX_STBC) >>
- ++ stbc = (ht_cap & IEEE80211_HT_CAP_RX_STBC) >>
- + IEEE80211_HT_CAP_RX_STBC_SHIFT;
- +- mi->tx_flags |= stbc << IEEE80211_TX_CTL_STBC_SHIFT;
- +
- +- if (sta_cap & IEEE80211_HT_CAP_LDPC_CODING)
- +- mi->tx_flags |= IEEE80211_TX_CTL_LDPC;
- ++ if (ht_cap & IEEE80211_HT_CAP_LDPC_CODING)
- ++ ldpc = true;
- ++ } else {
- ++ stbc = (vht_cap->cap & IEEE80211_VHT_CAP_RXSTBC_MASK) >>
- ++ IEEE80211_VHT_CAP_RXSTBC_SHIFT;
- ++
- ++ if (vht_cap->cap & IEEE80211_VHT_CAP_RXLDPC)
- ++ ldpc = true;
- + }
- +
- ++ mi->tx_flags |= stbc << IEEE80211_TX_CTL_STBC_SHIFT;
- ++ if (ldpc)
- ++ mi->tx_flags |= IEEE80211_TX_CTL_LDPC;
- ++
- + for (i = 0; i < ARRAY_SIZE(mi->groups); i++) {
- + u32 gflags = minstrel_mcs_groups[i].flags;
- + int bw, nss;
- +@@ -1232,10 +1241,10 @@ minstrel_ht_update_caps(void *priv, stru
- +
- + if (gflags & IEEE80211_TX_RC_SHORT_GI) {
- + if (gflags & IEEE80211_TX_RC_40_MHZ_WIDTH) {
- +- if (!(sta_cap & IEEE80211_HT_CAP_SGI_40))
- ++ if (!(ht_cap & IEEE80211_HT_CAP_SGI_40))
- + continue;
- + } else {
- +- if (!(sta_cap & IEEE80211_HT_CAP_SGI_20))
- ++ if (!(ht_cap & IEEE80211_HT_CAP_SGI_20))
- + continue;
- + }
- + }
- diff --git a/package/kernel/mac80211/patches/311-ath10k-disable-wake_tx_queue-for-older-devices.patch b/package/kernel/mac80211/patches/311-ath10k-disable-wake_tx_queue-for-older-devices.patch
- new file mode 100644
- index 0000000..4cf26a6
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/311-ath10k-disable-wake_tx_queue-for-older-devices.patch
- @@ -0,0 +1,73 @@
- +From: Michal Kazior <michal.kazior@tieto.com>
- +Date: Tue, 17 May 2016 14:47:01 +0200
- +Subject: [PATCH] ath10k: disable wake_tx_queue for older devices
- +
- +Some setups suffer performance regressions with
- +current wake_tx_queue implementation.
- +
- +Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
- +---
- +
- +--- a/drivers/net/wireless/ath/ath10k/core.h
- ++++ b/drivers/net/wireless/ath/ath10k/core.h
- +@@ -667,6 +667,7 @@ struct ath10k_fw_components {
- + struct ath10k {
- + struct ath_common ath_common;
- + struct ieee80211_hw *hw;
- ++ struct ieee80211_ops *ops;
- + struct device *dev;
- + u8 mac_addr[ETH_ALEN];
- +
- +--- a/drivers/net/wireless/ath/ath10k/mac.c
- ++++ b/drivers/net/wireless/ath/ath10k/mac.c
- +@@ -7497,21 +7497,32 @@ static const struct ieee80211_channel at
- + struct ath10k *ath10k_mac_create(size_t priv_size)
- + {
- + struct ieee80211_hw *hw;
- ++ struct ieee80211_ops *ops;
- + struct ath10k *ar;
- +
- +- hw = ieee80211_alloc_hw(sizeof(struct ath10k) + priv_size, &ath10k_ops);
- +- if (!hw)
- ++ ops = kmemdup(&ath10k_ops, sizeof(ath10k_ops), GFP_KERNEL);
- ++ if (!ops)
- ++ return NULL;
- ++
- ++ hw = ieee80211_alloc_hw(sizeof(struct ath10k) + priv_size, ops);
- ++ if (!hw) {
- ++ kfree(ops);
- + return NULL;
- ++ }
- +
- + ar = hw->priv;
- + ar->hw = hw;
- ++ ar->ops = ops;
- +
- + return ar;
- + }
- +
- + void ath10k_mac_destroy(struct ath10k *ar)
- + {
- ++ struct ieee80211_ops *ops = ar->ops;
- ++
- + ieee80211_free_hw(ar->hw);
- ++ kfree(ops);
- + }
- +
- + static const struct ieee80211_iface_limit ath10k_if_limits[] = {
- +@@ -7945,6 +7956,15 @@ int ath10k_mac_register(struct ath10k *a
- + ath10k_warn(ar, "failed to initialise DFS pattern detector\n");
- + }
- +
- ++ /* Current wake_tx_queue implementation imposes a significant
- ++ * performance penalty in some setups. The tx scheduling code needs
- ++ * more work anyway so disable the wake_tx_queue unless firmware
- ++ * supports the pull-push mechanism.
- ++ */
- ++ if (!test_bit(ATH10K_FW_FEATURE_PEER_FLOW_CONTROL,
- ++ ar->running_fw->fw_file.fw_features))
- ++ ar->ops->wake_tx_queue = NULL;
- ++
- + ret = ath_regd_init(&ar->ath_common.regulatory, ar->hw->wiphy,
- + ath10k_reg_notifier);
- + if (ret) {
- diff --git a/package/kernel/mac80211/patches/311-ath9k-do-not-limit-the-number-of-DFS-interfaces-to-1.patch b/package/kernel/mac80211/patches/311-ath9k-do-not-limit-the-number-of-DFS-interfaces-to-1.patch
- deleted file mode 100644
- index 070efa9..0000000
- --- a/package/kernel/mac80211/patches/311-ath9k-do-not-limit-the-number-of-DFS-interfaces-to-1.patch
- +++ /dev/null
- @@ -1,55 +0,0 @@
- -From: Felix Fietkau <nbd@openwrt.org>
- -Date: Fri, 22 Jan 2016 01:05:56 +0100
- -Subject: [PATCH] ath9k: do not limit the number of DFS interfaces to 1
- -
- -Signed-off-by: Felix Fietkau <nbd@openwrt.org>
- ----
- -
- ---- a/drivers/net/wireless/ath/ath9k/init.c
- -+++ b/drivers/net/wireless/ath/ath9k/init.c
- -@@ -751,14 +751,6 @@ static const struct ieee80211_iface_comb
- -
- - #endif /* CPTCFG_ATH9K_CHANNEL_CONTEXT */
- -
- --static const struct ieee80211_iface_limit if_dfs_limits[] = {
- -- { .max = 1, .types = BIT(NL80211_IFTYPE_AP) |
- --#ifdef CPTCFG_MAC80211_MESH
- -- BIT(NL80211_IFTYPE_MESH_POINT) |
- --#endif
- -- BIT(NL80211_IFTYPE_ADHOC) },
- --};
- --
- - static const struct ieee80211_iface_combination if_comb[] = {
- - {
- - .limits = if_limits,
- -@@ -766,6 +758,11 @@ static const struct ieee80211_iface_comb
- - .max_interfaces = 2048,
- - .num_different_channels = 1,
- - .beacon_int_infra_match = true,
- -+#ifdef CPTCFG_ATH9K_DFS_CERTIFIED
- -+ .radar_detect_widths = BIT(NL80211_CHAN_WIDTH_20_NOHT) |
- -+ BIT(NL80211_CHAN_WIDTH_20) |
- -+ BIT(NL80211_CHAN_WIDTH_40),
- -+#endif
- - },
- - {
- - .limits = wds_limits,
- -@@ -774,18 +771,6 @@ static const struct ieee80211_iface_comb
- - .num_different_channels = 1,
- - .beacon_int_infra_match = true,
- - },
- --#ifdef CPTCFG_ATH9K_DFS_CERTIFIED
- -- {
- -- .limits = if_dfs_limits,
- -- .n_limits = ARRAY_SIZE(if_dfs_limits),
- -- .max_interfaces = 1,
- -- .num_different_channels = 1,
- -- .beacon_int_infra_match = true,
- -- .radar_detect_widths = BIT(NL80211_CHAN_WIDTH_20_NOHT) |
- -- BIT(NL80211_CHAN_WIDTH_20) |
- -- BIT(NL80211_CHAN_WIDTH_40),
- -- }
- --#endif
- - };
- -
- - #ifdef CPTCFG_ATH9K_CHANNEL_CONTEXT
- diff --git a/package/kernel/mac80211/patches/312-ath9k-Correct-TSF-adjustment-to-align-the-beacon-tim.patch b/package/kernel/mac80211/patches/312-ath9k-Correct-TSF-adjustment-to-align-the-beacon-tim.patch
- new file mode 100644
- index 0000000..df43105
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/312-ath9k-Correct-TSF-adjustment-to-align-the-beacon-tim.patch
- @@ -0,0 +1,45 @@
- +From: Benjamin Berg <benjamin.berg@open-mesh.com>
- +Date: Mon, 4 Jul 2016 14:37:20 +0200
- +Subject: [PATCH] ath9k: Correct TSF adjustment to align the beacon time
- + correctly
- +
- +Beacons were not send out at (timestamp % beacon_time == 0) for interfaces
- +other than the primary one. To send out beacons with the correct timestamp
- +according to 10.1.3.2 of the 802.11 standard the tsf_adjustment has to be
- +set to the negative time difference instead of positive. This way the
- +later beacons get corrected to have a lower (and similar) timestamp with
- +regard to the beacon from slot 0.
- +
- +I am not aware about any issues that have been caused by this.
- +
- +Signed-off-by: Benjamin Berg <benjamin.berg@open-mesh.com>
- +---
- +
- +--- a/drivers/net/wireless/ath/ath9k/beacon.c
- ++++ b/drivers/net/wireless/ath/ath9k/beacon.c
- +@@ -279,17 +279,21 @@ static void ath9k_set_tsfadjust(struct a
- + struct ath_common *common = ath9k_hw_common(sc->sc_ah);
- + struct ath_vif *avp = (void *)vif->drv_priv;
- + struct ath_beacon_config *cur_conf = &avp->chanctx->beacon;
- +- u32 tsfadjust;
- ++ s64 tsfadjust;
- +
- + if (avp->av_bslot == 0)
- + return;
- +
- ++ /* tsf_adjust is added to the TSF value. We send out the beacon late,
- ++ * so need to adjust the TSF starting point to be later in time (i.e.
- ++ * the theoretical first beacon has a TSF of 0 after correction).
- ++ */
- + tsfadjust = cur_conf->beacon_interval * avp->av_bslot;
- +- tsfadjust = TU_TO_USEC(tsfadjust) / ATH_BCBUF;
- ++ tsfadjust = -TU_TO_USEC(tsfadjust) / ATH_BCBUF;
- + avp->tsf_adjust = cpu_to_le64(tsfadjust);
- +
- +- ath_dbg(common, CONFIG, "tsfadjust is: %llu for bslot: %d\n",
- +- (unsigned long long)tsfadjust, avp->av_bslot);
- ++ ath_dbg(common, CONFIG, "tsfadjust is: %lld for bslot: %d\n",
- ++ (signed long long)tsfadjust, avp->av_bslot);
- + }
- +
- + bool ath9k_csa_is_finished(struct ath_softc *sc, struct ieee80211_vif *vif)
- diff --git a/package/kernel/mac80211/patches/312-mac80211-fix-txq-queue-related-crashes.patch b/package/kernel/mac80211/patches/312-mac80211-fix-txq-queue-related-crashes.patch
- deleted file mode 100644
- index 61cafc7..0000000
- --- a/package/kernel/mac80211/patches/312-mac80211-fix-txq-queue-related-crashes.patch
- +++ /dev/null
- @@ -1,27 +0,0 @@
- -From: Michal Kazior <michal.kazior@tieto.com>
- -Date: Thu, 21 Jan 2016 14:23:07 +0100
- -Subject: [PATCH] mac80211: fix txq queue related crashes
- -
- -The driver can access the queue simultanously
- -while mac80211 tears down the interface. Without
- -spinlock protection this could lead to corrupting
- -sk_buff_head and subsequently to an invalid
- -pointer dereference.
- -
- -Fixes: ba8c3d6f16a1 ("mac80211: add an intermediate software queue implementation")
- -Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
- ----
- -
- ---- a/net/mac80211/iface.c
- -+++ b/net/mac80211/iface.c
- -@@ -977,7 +977,10 @@ static void ieee80211_do_stop(struct iee
- - if (sdata->vif.txq) {
- - struct txq_info *txqi = to_txq_info(sdata->vif.txq);
- -
- -+ spin_lock_bh(&txqi->queue.lock);
- - ieee80211_purge_tx_queue(&local->hw, &txqi->queue);
- -+ spin_unlock_bh(&txqi->queue.lock);
- -+
- - atomic_set(&sdata->txqs_len[txqi->txq.ac], 0);
- - }
- -
- diff --git a/package/kernel/mac80211/patches/313-ath9k-Handle-channel-context-in-get_-set_-reset_tsf.patch b/package/kernel/mac80211/patches/313-ath9k-Handle-channel-context-in-get_-set_-reset_tsf.patch
- new file mode 100644
- index 0000000..ef0afbe
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/313-ath9k-Handle-channel-context-in-get_-set_-reset_tsf.patch
- @@ -0,0 +1,70 @@
- +From: Benjamin Berg <benjamin.berg@open-mesh.com>
- +Date: Mon, 4 Jul 2016 14:37:21 +0200
- +Subject: [PATCH] ath9k: Handle channel context in get_/set_/reset_tsf
- +
- +The ath9k TSF handling routines need to be aware of the channel context that
- +is being modified. With this change the TSF related values that are stored
- +in each channel context will be correctly tracked and the harware will only
- +be updated if the modified context is currently the active one.
- +
- +Without this change the TSF modifications done using these routines would
- +for example be lost during a hardware reset as done by ath_complete_reset.
- +
- +Signed-off-by: Benjamin Berg <benjamin.berg@open-mesh.com>
- +---
- +
- +--- a/drivers/net/wireless/ath/ath9k/main.c
- ++++ b/drivers/net/wireless/ath/ath9k/main.c
- +@@ -1823,11 +1823,18 @@ static void ath9k_bss_info_changed(struc
- + static u64 ath9k_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
- + {
- + struct ath_softc *sc = hw->priv;
- ++ struct ath_vif *avp = (void *)vif->drv_priv;
- + u64 tsf;
- +
- + mutex_lock(&sc->mutex);
- + ath9k_ps_wakeup(sc);
- +- tsf = ath9k_hw_gettsf64(sc->sc_ah);
- ++ /* Get current TSF either from HW or kernel time. */
- ++ if (sc->cur_chan == avp->chanctx) {
- ++ tsf = ath9k_hw_gettsf64(sc->sc_ah);
- ++ } else {
- ++ tsf = sc->cur_chan->tsf_val +
- ++ ath9k_hw_get_tsf_offset(&sc->cur_chan->tsf_ts, NULL);
- ++ }
- + ath9k_ps_restore(sc);
- + mutex_unlock(&sc->mutex);
- +
- +@@ -1839,10 +1846,14 @@ static void ath9k_set_tsf(struct ieee802
- + u64 tsf)
- + {
- + struct ath_softc *sc = hw->priv;
- ++ struct ath_vif *avp = (void *)vif->drv_priv;
- +
- + mutex_lock(&sc->mutex);
- + ath9k_ps_wakeup(sc);
- +- ath9k_hw_settsf64(sc->sc_ah, tsf);
- ++ getrawmonotonic(&avp->chanctx->tsf_ts);
- ++ if (sc->cur_chan == avp->chanctx)
- ++ ath9k_hw_settsf64(sc->sc_ah, tsf);
- ++ avp->chanctx->tsf_val = tsf;
- + ath9k_ps_restore(sc);
- + mutex_unlock(&sc->mutex);
- + }
- +@@ -1850,11 +1861,15 @@ static void ath9k_set_tsf(struct ieee802
- + static void ath9k_reset_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
- + {
- + struct ath_softc *sc = hw->priv;
- ++ struct ath_vif *avp = (void *)vif->drv_priv;
- +
- + mutex_lock(&sc->mutex);
- +
- + ath9k_ps_wakeup(sc);
- +- ath9k_hw_reset_tsf(sc->sc_ah);
- ++ getrawmonotonic(&avp->chanctx->tsf_ts);
- ++ if (sc->cur_chan == avp->chanctx)
- ++ ath9k_hw_reset_tsf(sc->sc_ah);
- ++ avp->chanctx->tsf_val = 0;
- + ath9k_ps_restore(sc);
- +
- + mutex_unlock(&sc->mutex);
- diff --git a/package/kernel/mac80211/patches/313-mac80211-fix-unnecessary-frame-drops-in-mesh-fwding.patch b/package/kernel/mac80211/patches/313-mac80211-fix-unnecessary-frame-drops-in-mesh-fwding.patch
- deleted file mode 100644
- index 844d43b..0000000
- --- a/package/kernel/mac80211/patches/313-mac80211-fix-unnecessary-frame-drops-in-mesh-fwding.patch
- +++ /dev/null
- @@ -1,57 +0,0 @@
- -From: Michal Kazior <michal.kazior@tieto.com>
- -Date: Mon, 25 Jan 2016 14:43:24 +0100
- -Subject: [PATCH] mac80211: fix unnecessary frame drops in mesh fwding
- -
- -The ieee80211_queue_stopped() expects hw queue
- -number but it was given raw WMM AC number instead.
- -
- -This could cause frame drops and problems with
- -traffic in some cases - most notably if driver
- -doesn't map AC numbers to queue numbers 1:1 and
- -uses ieee80211_stop_queues() and
- -ieee80211_wake_queue() only without ever calling
- -ieee80211_wake_queues().
- -
- -On ath10k it was possible to hit this problem in
- -the following case:
- -
- - 1. wlan0 uses queue 0
- - (ath10k maps queues per vif)
- - 2. offchannel uses queue 15
- - 3. queues 1-14 are unused
- - 4. ieee80211_stop_queues()
- - 5. ieee80211_wake_queue(q=0)
- - 6. ieee80211_wake_queue(q=15)
- - (other queues are not woken up because both
- - driver and mac80211 know other queues are
- - unused)
- - 7. ieee80211_rx_h_mesh_fwding()
- - 8. ieee80211_select_queue_80211() returns 2
- - 9. ieee80211_queue_stopped(q=2) returns true
- - 10. frame is dropped (oops!)
- -
- -Fixes: d3c1597b8d1b ("mac80211: fix forwarded mesh frame queue mapping")
- -Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
- ----
- -
- ---- a/net/mac80211/rx.c
- -+++ b/net/mac80211/rx.c
- -@@ -2235,7 +2235,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80
- - struct ieee80211_local *local = rx->local;
- - struct ieee80211_sub_if_data *sdata = rx->sdata;
- - struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
- -- u16 q, hdrlen;
- -+ u16 ac, q, hdrlen;
- -
- - hdr = (struct ieee80211_hdr *) skb->data;
- - hdrlen = ieee80211_hdrlen(hdr->frame_control);
- -@@ -2304,7 +2304,8 @@ ieee80211_rx_h_mesh_fwding(struct ieee80
- - ether_addr_equal(sdata->vif.addr, hdr->addr3))
- - return RX_CONTINUE;
- -
- -- q = ieee80211_select_queue_80211(sdata, skb, hdr);
- -+ ac = ieee80211_select_queue_80211(sdata, skb, hdr);
- -+ q = sdata->vif.hw_queue[ac];
- - if (ieee80211_queue_stopped(&local->hw, q)) {
- - IEEE80211_IFSTA_MESH_CTR_INC(ifmsh, dropped_frames_congestion);
- - return RX_DROP_MONITOR;
- diff --git a/package/kernel/mac80211/patches/314-ath9k-Use-tsf-offset-helper-in-ath9k_hw_reset.patch b/package/kernel/mac80211/patches/314-ath9k-Use-tsf-offset-helper-in-ath9k_hw_reset.patch
- new file mode 100644
- index 0000000..e725a8b
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/314-ath9k-Use-tsf-offset-helper-in-ath9k_hw_reset.patch
- @@ -0,0 +1,65 @@
- +From: Benjamin Berg <benjamin.berg@open-mesh.com>
- +Date: Mon, 4 Jul 2016 14:37:22 +0200
- +Subject: [PATCH] ath9k: Use tsf offset helper in ath9k_hw_reset
- +
- +These changes make ath9k_hw_reset more consistent with other places that
- +handle the TSF value by using the same helper routine.
- +
- +A slight improvement is to not assume that a fixed time of 1.5ms has
- +passed for the initval writes when compared to the first write attempt.
- +Instead the TSF value is re-calculated which will yield a higher accuracy
- +of the restored TSF timer.
- +
- +Signed-off-by: Benjamin Berg <benjamin.berg@open-mesh.com>
- +---
- +
- +--- a/drivers/net/wireless/ath/ath9k/hw.c
- ++++ b/drivers/net/wireless/ath/ath9k/hw.c
- +@@ -1832,8 +1832,9 @@ int ath9k_hw_reset(struct ath_hw *ah, st
- + u32 saveLedState;
- + u32 saveDefAntenna;
- + u32 macStaId1;
- ++ struct timespec tsf_ts;
- ++ u32 tsf_offset;
- + u64 tsf = 0;
- +- s64 usec = 0;
- + int r;
- + bool start_mci_reset = false;
- + bool save_fullsleep = ah->chip_fullsleep;
- +@@ -1877,8 +1878,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st
- + macStaId1 = REG_READ(ah, AR_STA_ID1) & AR_STA_ID1_BASE_RATE_11B;
- +
- + /* Save TSF before chip reset, a cold reset clears it */
- ++ getrawmonotonic(&tsf_ts);
- + tsf = ath9k_hw_gettsf64(ah);
- +- usec = ktime_to_us(ktime_get_raw());
- +
- + saveLedState = REG_READ(ah, AR_CFG_LED) &
- + (AR_CFG_LED_ASSOC_CTL | AR_CFG_LED_MODE_SEL |
- +@@ -1911,8 +1912,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st
- + }
- +
- + /* Restore TSF */
- +- usec = ktime_to_us(ktime_get_raw()) - usec;
- +- ath9k_hw_settsf64(ah, tsf + usec);
- ++ tsf_offset = ath9k_hw_get_tsf_offset(&tsf_ts, NULL);
- ++ ath9k_hw_settsf64(ah, tsf + tsf_offset);
- +
- + if (AR_SREV_9280_20_OR_LATER(ah))
- + REG_SET_BIT(ah, AR_GPIO_INPUT_EN_VAL, AR_GPIO_JTAG_DISABLE);
- +@@ -1932,12 +1933,11 @@ int ath9k_hw_reset(struct ath_hw *ah, st
- + /*
- + * Some AR91xx SoC devices frequently fail to accept TSF writes
- + * right after the chip reset. When that happens, write a new
- +- * value after the initvals have been applied, with an offset
- +- * based on measured time difference
- ++ * value after the initvals have been applied.
- + */
- + if (AR_SREV_9100(ah) && (ath9k_hw_gettsf64(ah) < tsf)) {
- +- tsf += 1500;
- +- ath9k_hw_settsf64(ah, tsf);
- ++ tsf_offset = ath9k_hw_get_tsf_offset(&tsf_ts, NULL);
- ++ ath9k_hw_settsf64(ah, tsf + tsf_offset);
- + }
- +
- + ath9k_hw_init_mfp(ah);
- diff --git a/package/kernel/mac80211/patches/314-mac80211-Requeue-work-after-scan-complete-for-all-VI.patch b/package/kernel/mac80211/patches/314-mac80211-Requeue-work-after-scan-complete-for-all-VI.patch
- deleted file mode 100644
- index 5b3efbd..0000000
- --- a/package/kernel/mac80211/patches/314-mac80211-Requeue-work-after-scan-complete-for-all-VI.patch
- +++ /dev/null
- @@ -1,103 +0,0 @@
- -From: Sachin Kulkarni <Sachin.Kulkarni@imgtec.com>
- -Date: Tue, 12 Jan 2016 14:30:19 +0530
- -Subject: [PATCH] mac80211: Requeue work after scan complete for all VIF
- - types.
- -
- -During a sw scan ieee80211_iface_work ignores work items for all vifs.
- -However after the scan complete work is requeued only for STA, ADHOC
- -and MESH iftypes.
- -
- -This occasionally results in event processing getting delayed/not
- -processed for iftype AP when it coexists with a STA. This can result
- -in data halt and eventually disconnection on the AP interface.
- -
- -Signed-off-by: Sachin Kulkarni <Sachin.Kulkarni@imgtec.com>
- -Cc: linux-wireless@vger.kernel.org
- -Cc: johannes@sipsolutions.net
- ----
- -
- ---- a/net/mac80211/ibss.c
- -+++ b/net/mac80211/ibss.c
- -@@ -1731,7 +1731,6 @@ void ieee80211_ibss_notify_scan_complete
- - if (sdata->vif.type != NL80211_IFTYPE_ADHOC)
- - continue;
- - sdata->u.ibss.last_scan_completed = jiffies;
- -- ieee80211_queue_work(&local->hw, &sdata->work);
- - }
- - mutex_unlock(&local->iflist_mtx);
- - }
- ---- a/net/mac80211/mesh.c
- -+++ b/net/mac80211/mesh.c
- -@@ -1369,17 +1369,6 @@ out:
- - sdata_unlock(sdata);
- - }
- -
- --void ieee80211_mesh_notify_scan_completed(struct ieee80211_local *local)
- --{
- -- struct ieee80211_sub_if_data *sdata;
- --
- -- rcu_read_lock();
- -- list_for_each_entry_rcu(sdata, &local->interfaces, list)
- -- if (ieee80211_vif_is_mesh(&sdata->vif) &&
- -- ieee80211_sdata_running(sdata))
- -- ieee80211_queue_work(&local->hw, &sdata->work);
- -- rcu_read_unlock();
- --}
- -
- - void ieee80211_mesh_init_sdata(struct ieee80211_sub_if_data *sdata)
- - {
- ---- a/net/mac80211/mesh.h
- -+++ b/net/mac80211/mesh.h
- -@@ -362,14 +362,10 @@ static inline bool mesh_path_sel_is_hwmp
- - return sdata->u.mesh.mesh_pp_id == IEEE80211_PATH_PROTOCOL_HWMP;
- - }
- -
- --void ieee80211_mesh_notify_scan_completed(struct ieee80211_local *local);
- --
- - void mesh_path_flush_by_iface(struct ieee80211_sub_if_data *sdata);
- - void mesh_sync_adjust_tbtt(struct ieee80211_sub_if_data *sdata);
- - void ieee80211s_stop(void);
- - #else
- --static inline void
- --ieee80211_mesh_notify_scan_completed(struct ieee80211_local *local) {}
- - static inline bool mesh_path_sel_is_hwmp(struct ieee80211_sub_if_data *sdata)
- - { return false; }
- - static inline void mesh_path_flush_by_iface(struct ieee80211_sub_if_data *sdata)
- ---- a/net/mac80211/mlme.c
- -+++ b/net/mac80211/mlme.c
- -@@ -3978,8 +3978,6 @@ static void ieee80211_restart_sta_timer(
- - if (!ieee80211_hw_check(&sdata->local->hw, CONNECTION_MONITOR))
- - ieee80211_queue_work(&sdata->local->hw,
- - &sdata->u.mgd.monitor_work);
- -- /* and do all the other regular work too */
- -- ieee80211_queue_work(&sdata->local->hw, &sdata->work);
- - }
- - }
- -
- ---- a/net/mac80211/scan.c
- -+++ b/net/mac80211/scan.c
- -@@ -314,6 +314,7 @@ static void __ieee80211_scan_completed(s
- - bool was_scanning = local->scanning;
- - struct cfg80211_scan_request *scan_req;
- - struct ieee80211_sub_if_data *scan_sdata;
- -+ struct ieee80211_sub_if_data *sdata;
- -
- - lockdep_assert_held(&local->mtx);
- -
- -@@ -373,7 +374,15 @@ static void __ieee80211_scan_completed(s
- -
- - ieee80211_mlme_notify_scan_completed(local);
- - ieee80211_ibss_notify_scan_completed(local);
- -- ieee80211_mesh_notify_scan_completed(local);
- -+
- -+ /* Requeue all the work that might have been ignored while
- -+ * the scan was in progress
- -+ */
- -+ list_for_each_entry_rcu(sdata, &local->interfaces, list) {
- -+ if (ieee80211_sdata_running(sdata))
- -+ ieee80211_queue_work(&sdata->local->hw, &sdata->work);
- -+ }
- -+
- - if (was_scanning)
- - ieee80211_start_next_roc(local);
- - }
- diff --git a/package/kernel/mac80211/patches/315-ath9k-Expose-tsf_adjustment-in-mac80211-tsf-getters-.patch b/package/kernel/mac80211/patches/315-ath9k-Expose-tsf_adjustment-in-mac80211-tsf-getters-.patch
- new file mode 100644
- index 0000000..c95ab7e
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/315-ath9k-Expose-tsf_adjustment-in-mac80211-tsf-getters-.patch
- @@ -0,0 +1,32 @@
- +From: Benjamin Berg <benjamin.berg@open-mesh.com>
- +Date: Mon, 4 Jul 2016 14:37:23 +0200
- +Subject: [PATCH] ath9k: Expose tsf_adjustment in mac80211 tsf getters and
- + setters.
- +
- +The ath9k driver modifies the TSF for VIFs for the purpose of sending
- +beacons in a staggered fashion. This patch exposes this VIF specific
- +adjustment of the TSF value to mac80211. Without the change the TSF
- +routines handle the hardware TSF value instead of the actual TSF value as
- +seen on the air.
- +
- +Signed-off-by: Benjamin Berg <benjamin.berg@open-mesh.com>
- +---
- +
- +--- a/drivers/net/wireless/ath/ath9k/main.c
- ++++ b/drivers/net/wireless/ath/ath9k/main.c
- +@@ -1835,6 +1835,7 @@ static u64 ath9k_get_tsf(struct ieee8021
- + tsf = sc->cur_chan->tsf_val +
- + ath9k_hw_get_tsf_offset(&sc->cur_chan->tsf_ts, NULL);
- + }
- ++ tsf += le64_to_cpu(avp->tsf_adjust);
- + ath9k_ps_restore(sc);
- + mutex_unlock(&sc->mutex);
- +
- +@@ -1850,6 +1851,7 @@ static void ath9k_set_tsf(struct ieee802
- +
- + mutex_lock(&sc->mutex);
- + ath9k_ps_wakeup(sc);
- ++ tsf -= le64_to_cpu(avp->tsf_adjust);
- + getrawmonotonic(&avp->chanctx->tsf_ts);
- + if (sc->cur_chan == avp->chanctx)
- + ath9k_hw_settsf64(sc->sc_ah, tsf);
- diff --git a/package/kernel/mac80211/patches/315-mac80211-fix-ibss-scan-parameters.patch b/package/kernel/mac80211/patches/315-mac80211-fix-ibss-scan-parameters.patch
- deleted file mode 100644
- index 52fecb9..0000000
- --- a/package/kernel/mac80211/patches/315-mac80211-fix-ibss-scan-parameters.patch
- +++ /dev/null
- @@ -1,57 +0,0 @@
- -From: Sara Sharon <sara.sharon@intel.com>
- -Date: Mon, 25 Jan 2016 15:46:35 +0200
- -Subject: [PATCH] mac80211: fix ibss scan parameters
- -
- -When joining IBSS a full scan should be initiated in order to search
- -for existing cell, unless the fixed_channel parameter was set.
- -A default channel to create the IBSS on if no cell was found is
- -provided as well.
- -However - a scan is initiated only on the default channel provided
- -regardless of whether ifibss->fixed_channel is set or not, with the
- -obvious result of the cell not joining existing IBSS cell that is
- -on another channel.
- -
- -Fixes: 76bed0f43b27 ("mac80211: IBSS fix scan request")
- -Signed-off-by: Sara Sharon <sara.sharon@intel.com>
- -Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
- ----
- -
- ---- a/net/mac80211/ibss.c
- -+++ b/net/mac80211/ibss.c
- -@@ -7,6 +7,7 @@
- - * Copyright 2007, Michael Wu <flamingice@sourmilk.net>
- - * Copyright 2009, Johannes Berg <johannes@sipsolutions.net>
- - * Copyright 2013-2014 Intel Mobile Communications GmbH
- -+ * Copyright(c) 2016 Intel Deutschland GmbH
- - *
- - * This program is free software; you can redistribute it and/or modify
- - * it under the terms of the GNU General Public License version 2 as
- -@@ -1483,14 +1484,21 @@ static void ieee80211_sta_find_ibss(stru
- -
- - sdata_info(sdata, "Trigger new scan to find an IBSS to join\n");
- -
- -- num = ieee80211_ibss_setup_scan_channels(local->hw.wiphy,
- -- &ifibss->chandef,
- -- channels,
- -- ARRAY_SIZE(channels));
- - scan_width = cfg80211_chandef_to_scan_width(&ifibss->chandef);
- -- ieee80211_request_ibss_scan(sdata, ifibss->ssid,
- -- ifibss->ssid_len, channels, num,
- -- scan_width);
- -+
- -+ if (ifibss->fixed_channel) {
- -+ num = ieee80211_ibss_setup_scan_channels(local->hw.wiphy,
- -+ &ifibss->chandef,
- -+ channels,
- -+ ARRAY_SIZE(channels));
- -+ ieee80211_request_ibss_scan(sdata, ifibss->ssid,
- -+ ifibss->ssid_len, channels,
- -+ num, scan_width);
- -+ } else {
- -+ ieee80211_request_ibss_scan(sdata, ifibss->ssid,
- -+ ifibss->ssid_len, NULL,
- -+ 0, scan_width);
- -+ }
- - } else {
- - int interval = IEEE80211_SCAN_INTERVAL;
- -
- diff --git a/package/kernel/mac80211/patches/316-ath9k-Remove-some-defined-constants-to-decrease-verb.patch b/package/kernel/mac80211/patches/316-ath9k-Remove-some-defined-constants-to-decrease-verb.patch
- new file mode 100644
- index 0000000..36aaa10
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/316-ath9k-Remove-some-defined-constants-to-decrease-verb.patch
- @@ -0,0 +1,137 @@
- +From: Benjamin Berg <benjamin.berg@open-mesh.com>
- +Date: Mon, 4 Jul 2016 14:37:24 +0200
- +Subject: [PATCH] ath9k: Remove some #defined constants to decrease
- + verbosity
- +
- +The removed ATH9K_SLOT_TIME_X constants simply map the value in microseconds
- +to the same integer. These constants were not used consistently, so fix the
- +inconsistency issue by replacing all occurances with the integer equivalent.
- +
- +Signed-off-by: Benjamin Berg <benjamin.berg@open-mesh.com>
- +---
- +
- +--- a/drivers/net/wireless/ath/ath9k/beacon.c
- ++++ b/drivers/net/wireless/ath/ath9k/beacon.c
- +@@ -50,7 +50,7 @@ static void ath9k_beaconq_config(struct
- + txq = sc->tx.txq_map[IEEE80211_AC_BE];
- + ath9k_hw_get_txq_props(ah, txq->axq_qnum, &qi_be);
- + qi.tqi_aifs = qi_be.tqi_aifs;
- +- if (ah->slottime == ATH9K_SLOT_TIME_20)
- ++ if (ah->slottime == 20)
- + qi.tqi_cwmin = 2*qi_be.tqi_cwmin;
- + else
- + qi.tqi_cwmin = 4*qi_be.tqi_cwmin;
- +--- a/drivers/net/wireless/ath/ath9k/dynack.c
- ++++ b/drivers/net/wireless/ath/ath9k/dynack.c
- +@@ -280,7 +280,7 @@ EXPORT_SYMBOL(ath_dynack_sample_ack_ts);
- + void ath_dynack_node_init(struct ath_hw *ah, struct ath_node *an)
- + {
- + /* ackto = slottime + sifs + air delay */
- +- u32 ackto = ATH9K_SLOT_TIME_9 + 16 + 64;
- ++ u32 ackto = 9 + 16 + 64;
- + struct ath_dynack *da = &ah->dynack;
- +
- + an->ackto = ackto;
- +@@ -315,7 +315,7 @@ EXPORT_SYMBOL(ath_dynack_node_deinit);
- + void ath_dynack_reset(struct ath_hw *ah)
- + {
- + /* ackto = slottime + sifs + air delay */
- +- u32 ackto = ATH9K_SLOT_TIME_9 + 16 + 64;
- ++ u32 ackto = 9 + 16 + 64;
- + struct ath_dynack *da = &ah->dynack;
- +
- + da->lto = jiffies;
- +--- a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
- ++++ b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
- +@@ -45,7 +45,7 @@ void ath9k_htc_beaconq_config(struct ath
- + * Long slot time : 2x cwmin
- + * Short slot time : 4x cwmin
- + */
- +- if (ah->slottime == ATH9K_SLOT_TIME_20)
- ++ if (ah->slottime == 20)
- + qi.tqi_cwmin = 2*qi_be.tqi_cwmin;
- + else
- + qi.tqi_cwmin = 4*qi_be.tqi_cwmin;
- +--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
- ++++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
- +@@ -678,7 +678,7 @@ static int ath9k_init_priv(struct ath9k_
- +
- + for (i = 0; i < ATH9K_HTC_MAX_BCN_VIF; i++)
- + priv->beacon.bslot[i] = NULL;
- +- priv->beacon.slottime = ATH9K_SLOT_TIME_9;
- ++ priv->beacon.slottime = 9;
- +
- + ath9k_cmn_init_channels_rates(common);
- + ath9k_cmn_init_crypto(ah);
- +--- a/drivers/net/wireless/ath/ath9k/hw.c
- ++++ b/drivers/net/wireless/ath/ath9k/hw.c
- +@@ -454,7 +454,7 @@ static void ath9k_hw_init_defaults(struc
- + if (AR_SREV_9100(ah))
- + ah->sta_id1_defaults |= AR_STA_ID1_AR9100_BA_FIX;
- +
- +- ah->slottime = ATH9K_SLOT_TIME_9;
- ++ ah->slottime = 9;
- + ah->globaltxtimeout = (u32) -1;
- + ah->power_mode = ATH9K_PM_UNDEFINED;
- + ah->htc_reset_init = true;
- +--- a/drivers/net/wireless/ath/ath9k/init.c
- ++++ b/drivers/net/wireless/ath/ath9k/init.c
- +@@ -372,7 +372,7 @@ static void ath9k_init_misc(struct ath_s
- +
- + common->last_rssi = ATH_RSSI_DUMMY_MARKER;
- + memcpy(common->bssidmask, ath_bcast_mac, ETH_ALEN);
- +- sc->beacon.slottime = ATH9K_SLOT_TIME_9;
- ++ sc->beacon.slottime = 9;
- +
- + for (i = 0; i < ARRAY_SIZE(sc->beacon.bslot); i++)
- + sc->beacon.bslot[i] = NULL;
- +--- a/drivers/net/wireless/ath/ath9k/mac.h
- ++++ b/drivers/net/wireless/ath/ath9k/mac.h
- +@@ -65,10 +65,6 @@
- + #define INIT_SSH_RETRY 32
- + #define INIT_SLG_RETRY 32
- +
- +-#define ATH9K_SLOT_TIME_6 6
- +-#define ATH9K_SLOT_TIME_9 9
- +-#define ATH9K_SLOT_TIME_20 20
- +-
- + #define ATH9K_TXERR_XRETRY 0x01
- + #define ATH9K_TXERR_FILT 0x02
- + #define ATH9K_TXERR_FIFO 0x04
- +--- a/drivers/net/wireless/ath/ath9k/main.c
- ++++ b/drivers/net/wireless/ath/ath9k/main.c
- +@@ -926,7 +926,7 @@ static void ath9k_vif_iter(struct ath9k_
- + }
- +
- + if (!vif->bss_conf.use_short_slot)
- +- iter_data->slottime = ATH9K_SLOT_TIME_20;
- ++ iter_data->slottime = 20;
- +
- + switch (vif->type) {
- + case NL80211_IFTYPE_AP:
- +@@ -999,7 +999,7 @@ void ath9k_calculate_iter_data(struct at
- + */
- + memset(iter_data, 0, sizeof(*iter_data));
- + eth_broadcast_addr(iter_data->mask);
- +- iter_data->slottime = ATH9K_SLOT_TIME_9;
- ++ iter_data->slottime = 9;
- +
- + list_for_each_entry(avp, &ctx->vifs, list)
- + ath9k_vif_iter(iter_data, avp->vif->addr, avp->vif);
- +@@ -1061,7 +1061,7 @@ static void ath9k_set_offchannel_state(s
- + ah->opmode = vif->type;
- + ah->imask &= ~ATH9K_INT_SWBA;
- + ah->imask &= ~ATH9K_INT_TSFOOR;
- +- ah->slottime = ATH9K_SLOT_TIME_9;
- ++ ah->slottime = 9;
- +
- + ath_hw_setbssidmask(common);
- + ath9k_hw_setopmode(ah);
- +@@ -1788,6 +1788,7 @@ static void ath9k_bss_info_changed(struc
- + slottime = 9;
- + else
- + slottime = 20;
- ++
- + if (vif->type == NL80211_IFTYPE_AP) {
- + /*
- + * Defer update, so that connected stations can adjust
- diff --git a/package/kernel/mac80211/patches/316-net-mac80211-agg-rx.c-fix-use-of-uninitialised-value.patch b/package/kernel/mac80211/patches/316-net-mac80211-agg-rx.c-fix-use-of-uninitialised-value.patch
- deleted file mode 100644
- index e78df36..0000000
- --- a/package/kernel/mac80211/patches/316-net-mac80211-agg-rx.c-fix-use-of-uninitialised-value.patch
- +++ /dev/null
- @@ -1,50 +0,0 @@
- -From: Chris Bainbridge <chris.bainbridge@gmail.com>
- -Date: Wed, 27 Jan 2016 15:46:18 +0000
- -Subject: [PATCH] net/mac80211/agg-rx.c: fix use of uninitialised values
- -
- -Use kzalloc instead of kmalloc for struct tid_ampdu_rx. Fixes:
- -
- -[ 7.976605] UBSAN: Undefined behaviour in net/mac80211/rx.c:932:29
- -[ 7.976608] load of value 2 is not a valid value for type '_Bool'
- -[ 7.976611] CPU: 3 PID: 1134 Comm: kworker/u16:7 Not tainted 4.5.0-rc1+ #265
- -[ 7.976613] Hardware name: Apple Inc. MacBookPro10,2/Mac-AFD8A9D944EA4843, BIOS MBP102.88Z.0106.B0A.1509130955 09/13/2015
- -[ 7.976616] Workqueue: phy0 rt2x00usb_work_rxdone
- -[ 7.976619] 0000000000000004 ffff880254a7ba50 ffffffff8181d866 0000000000000007
- -[ 7.976622] ffff880254a7ba78 ffff880254a7ba68 ffffffff8188422d ffffffff8379b500
- -[ 7.976626] ffff880254a7bab8 ffffffff81884747 0000000000000202 0000000348620032
- -[ 7.976629] Call Trace:
- -[ 7.976633] [<ffffffff8181d866>] dump_stack+0x45/0x5f
- -[ 7.976637] [<ffffffff8188422d>] ubsan_epilogue+0xd/0x40
- -[ 7.976642] [<ffffffff81884747>] __ubsan_handle_load_invalid_value+0x67/0x70
- -[ 7.976646] [<ffffffff82227b4d>] ieee80211_sta_reorder_release.isra.16+0x5ed/0x730
- -[ 7.976650] [<ffffffff8222ca14>] ieee80211_prepare_and_rx_handle+0xd04/0x1c00
- -[ 7.976654] [<ffffffff81cb27ce>] ? usb_hcd_map_urb_for_dma+0x65e/0x960
- -[ 7.976659] [<ffffffff8222db03>] __ieee80211_rx_handle_packet+0x1f3/0x750
- -[ 7.976663] [<ffffffff8222e4a7>] ieee80211_rx_napi+0x447/0x990
- -[ 7.976667] [<ffffffff81c5fb85>] rt2x00lib_rxdone+0x305/0xbd0
- -[ 7.976670] [<ffffffff811ac23f>] ? dequeue_task_fair+0x64f/0x1de0
- -[ 7.976674] [<ffffffff811a1516>] ? sched_clock_cpu+0xe6/0x150
- -[ 7.976678] [<ffffffff81c6c45c>] rt2x00usb_work_rxdone+0x7c/0x140
- -[ 7.976682] [<ffffffff8117aef6>] process_one_work+0x226/0x860
- -[ 7.976686] [<ffffffff8117b58c>] worker_thread+0x5c/0x680
- -[ 7.976690] [<ffffffff8117b530>] ? process_one_work+0x860/0x860
- -[ 7.976693] [<ffffffff81184f86>] kthread+0xf6/0x150
- -[ 7.976697] [<ffffffff81184e90>] ? kthread_worker_fn+0x310/0x310
- -[ 7.976700] [<ffffffff822a94df>] ret_from_fork+0x3f/0x70
- -[ 7.976703] [<ffffffff81184e90>] ? kthread_worker_fn+0x310/0x310
- -
- -Link: https://lkml.org/lkml/2016/1/26/230
- -Signed-off-by: Chris Bainbridge <chris.bainbridge@gmail.com>
- ----
- -
- ---- a/net/mac80211/agg-rx.c
- -+++ b/net/mac80211/agg-rx.c
- -@@ -327,7 +327,7 @@ void __ieee80211_start_rx_ba_session(str
- - }
- -
- - /* prepare A-MPDU MLME for Rx aggregation */
- -- tid_agg_rx = kmalloc(sizeof(struct tid_ampdu_rx), GFP_KERNEL);
- -+ tid_agg_rx = kzalloc(sizeof(struct tid_ampdu_rx), GFP_KERNEL);
- - if (!tid_agg_rx)
- - goto end;
- -
- diff --git a/package/kernel/mac80211/patches/317-ath9k-Fix-beacon-configuration-for-addition-removal-.patch b/package/kernel/mac80211/patches/317-ath9k-Fix-beacon-configuration-for-addition-removal-.patch
- new file mode 100644
- index 0000000..360dfbf
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/317-ath9k-Fix-beacon-configuration-for-addition-removal-.patch
- @@ -0,0 +1,544 @@
- +From: Benjamin Berg <benjamin.berg@open-mesh.com>
- +Date: Mon, 4 Jul 2016 14:37:25 +0200
- +Subject: [PATCH] ath9k: Fix beacon configuration for addition/removal of
- + interfaces
- +
- +This patch fixes some issues with interface reconfiguration. It could
- +for example happen that an AP interface in beacon slot 0 was removed
- +leaving an IBSS station in one of the other slots. When this happens
- +the driver never sends out the beacon as it only tries to send a beacon
- +from slot 0.
- +
- +Appart from that the tracking of required changes to the beacon config is
- +relatively complicated and prone to errors.
- +
- +The approach taken here is to solve reconfiguration issues is to
- +reconfigure the beacons when any interface changes. This means that
- +the complexity of deciding whether an interface change may modify the
- +beacon configuration is gone. It also means that the beacon config will
- +be reliably updated when an interface is removed.
- +
- +The issue that a single non-AP interface might not be in beacon
- +slot 0 and wouldn't be send out is solved by moving it into the
- +first slot. The TSF value in hardware is adjusted accordingly so
- +that the timestamp of the beacons stay consistent.
- +
- +Signed-off-by: Benjamin Berg <benjamin.berg@open-mesh.com>
- +---
- +
- +--- a/drivers/net/wireless/ath/ath9k/ath9k.h
- ++++ b/drivers/net/wireless/ath/ath9k/ath9k.h
- +@@ -637,6 +637,8 @@ struct ath9k_vif_iter_data {
- + int nwds; /* number of WDS vifs */
- + int nadhocs; /* number of adhoc vifs */
- + int nocbs; /* number of OCB vifs */
- ++ int nbcnvifs; /* number of beaconing vifs */
- ++ struct ieee80211_vif *primary_beacon_vif;
- + struct ieee80211_vif *primary_sta;
- + };
- +
- +@@ -685,10 +687,11 @@ struct ath_beacon {
- + };
- +
- + void ath9k_beacon_tasklet(unsigned long data);
- +-void ath9k_beacon_config(struct ath_softc *sc, struct ieee80211_vif *vif,
- +- u32 changed);
- ++void ath9k_beacon_config(struct ath_softc *sc, struct ieee80211_vif *main_vif,
- ++ bool beacons);
- + void ath9k_beacon_assign_slot(struct ath_softc *sc, struct ieee80211_vif *vif);
- + void ath9k_beacon_remove_slot(struct ath_softc *sc, struct ieee80211_vif *vif);
- ++void ath9k_beacon_ensure_primary_slot(struct ath_softc *sc);
- + void ath9k_set_beacon(struct ath_softc *sc);
- + bool ath9k_csa_is_finished(struct ath_softc *sc, struct ieee80211_vif *vif);
- + void ath9k_csa_update(struct ath_softc *sc);
- +--- a/drivers/net/wireless/ath/ath9k/beacon.c
- ++++ b/drivers/net/wireless/ath/ath9k/beacon.c
- +@@ -209,7 +209,6 @@ void ath9k_beacon_assign_slot(struct ath
- + }
- +
- + sc->beacon.bslot[avp->av_bslot] = vif;
- +- sc->nbcnvifs++;
- +
- + ath_dbg(common, CONFIG, "Added interface at beacon slot: %d\n",
- + avp->av_bslot);
- +@@ -220,15 +219,12 @@ void ath9k_beacon_remove_slot(struct ath
- + struct ath_common *common = ath9k_hw_common(sc->sc_ah);
- + struct ath_vif *avp = (void *)vif->drv_priv;
- + struct ath_buf *bf = avp->av_bcbuf;
- +- struct ath_beacon_config *cur_conf = &sc->cur_chan->beacon;
- +
- + ath_dbg(common, CONFIG, "Removing interface at beacon slot: %d\n",
- + avp->av_bslot);
- +
- + tasklet_disable(&sc->bcon_tasklet);
- +
- +- cur_conf->enable_beacon &= ~BIT(avp->av_bslot);
- +-
- + if (bf && bf->bf_mpdu) {
- + struct sk_buff *skb = bf->bf_mpdu;
- + dma_unmap_single(sc->dev, bf->bf_buf_addr,
- +@@ -240,12 +236,73 @@ void ath9k_beacon_remove_slot(struct ath
- +
- + avp->av_bcbuf = NULL;
- + sc->beacon.bslot[avp->av_bslot] = NULL;
- +- sc->nbcnvifs--;
- + list_add_tail(&bf->list, &sc->beacon.bbuf);
- +
- + tasklet_enable(&sc->bcon_tasklet);
- + }
- +
- ++void ath9k_beacon_ensure_primary_slot(struct ath_softc *sc)
- ++{
- ++ struct ath_common *common = ath9k_hw_common(sc->sc_ah);
- ++ struct ieee80211_vif *vif;
- ++ struct ath_vif *avp;
- ++ s64 tsfadjust;
- ++ u32 offset;
- ++ int first_slot = ATH_BCBUF;
- ++ int slot;
- ++
- ++ tasklet_disable(&sc->bcon_tasklet);
- ++
- ++ /* Find first taken slot. */
- ++ for (slot = 0; slot < ATH_BCBUF; slot++) {
- ++ if (sc->beacon.bslot[slot]) {
- ++ first_slot = slot;
- ++ break;
- ++ }
- ++ }
- ++ if (first_slot == 0)
- ++ goto out;
- ++
- ++ /* Re-enumarate all slots, moving them forward. */
- ++ for (slot = 0; slot < ATH_BCBUF; slot++) {
- ++ if (slot + first_slot < ATH_BCBUF) {
- ++ vif = sc->beacon.bslot[slot + first_slot];
- ++ sc->beacon.bslot[slot] = vif;
- ++
- ++ if (vif) {
- ++ avp = (void *)vif->drv_priv;
- ++ avp->av_bslot = slot;
- ++ }
- ++ } else {
- ++ sc->beacon.bslot[slot] = NULL;
- ++ }
- ++ }
- ++
- ++ vif = sc->beacon.bslot[0];
- ++ if (WARN_ON(!vif))
- ++ goto out;
- ++
- ++ /* Get the tsf_adjust value for the new first slot. */
- ++ avp = (void *)vif->drv_priv;
- ++ tsfadjust = le64_to_cpu(avp->tsf_adjust);
- ++
- ++ ath_dbg(common, CONFIG,
- ++ "Adjusting global TSF after beacon slot reassignment: %lld\n",
- ++ (signed long long)tsfadjust);
- ++
- ++ /* Modify TSF as required and update the HW. */
- ++ avp->chanctx->tsf_val += tsfadjust;
- ++ if (sc->cur_chan == avp->chanctx) {
- ++ offset = ath9k_hw_get_tsf_offset(&avp->chanctx->tsf_ts, NULL);
- ++ ath9k_hw_settsf64(sc->sc_ah, avp->chanctx->tsf_val + offset);
- ++ }
- ++
- ++ /* The slots tsf_adjust will be updated by ath9k_beacon_config later. */
- ++
- ++out:
- ++ tasklet_enable(&sc->bcon_tasklet);
- ++}
- ++
- + static int ath9k_beacon_choose_slot(struct ath_softc *sc)
- + {
- + struct ath_common *common = ath9k_hw_common(sc->sc_ah);
- +@@ -274,26 +331,33 @@ static int ath9k_beacon_choose_slot(stru
- + return slot;
- + }
- +
- +-static void ath9k_set_tsfadjust(struct ath_softc *sc, struct ieee80211_vif *vif)
- ++static void ath9k_set_tsfadjust(struct ath_softc *sc,
- ++ struct ath_beacon_config *cur_conf)
- + {
- + struct ath_common *common = ath9k_hw_common(sc->sc_ah);
- +- struct ath_vif *avp = (void *)vif->drv_priv;
- +- struct ath_beacon_config *cur_conf = &avp->chanctx->beacon;
- + s64 tsfadjust;
- ++ int slot;
- +
- +- if (avp->av_bslot == 0)
- +- return;
- ++ for (slot = 0; slot < ATH_BCBUF; slot++) {
- ++ struct ath_vif *avp;
- +
- +- /* tsf_adjust is added to the TSF value. We send out the beacon late,
- +- * so need to adjust the TSF starting point to be later in time (i.e.
- +- * the theoretical first beacon has a TSF of 0 after correction).
- +- */
- +- tsfadjust = cur_conf->beacon_interval * avp->av_bslot;
- +- tsfadjust = -TU_TO_USEC(tsfadjust) / ATH_BCBUF;
- +- avp->tsf_adjust = cpu_to_le64(tsfadjust);
- ++ if (!sc->beacon.bslot[slot])
- ++ continue;
- +
- +- ath_dbg(common, CONFIG, "tsfadjust is: %lld for bslot: %d\n",
- +- (signed long long)tsfadjust, avp->av_bslot);
- ++ avp = (void *)sc->beacon.bslot[slot]->drv_priv;
- ++
- ++ /* tsf_adjust is added to the TSF value. We send out the
- ++ * beacon late, so need to adjust the TSF starting point to be
- ++ * later in time (i.e. the theoretical first beacon has a TSF
- ++ * of 0 after correction).
- ++ */
- ++ tsfadjust = cur_conf->beacon_interval * avp->av_bslot;
- ++ tsfadjust = -TU_TO_USEC(tsfadjust) / ATH_BCBUF;
- ++ avp->tsf_adjust = cpu_to_le64(tsfadjust);
- ++
- ++ ath_dbg(common, CONFIG, "tsfadjust is: %lld for bslot: %d\n",
- ++ (signed long long)tsfadjust, avp->av_bslot);
- ++ }
- + }
- +
- + bool ath9k_csa_is_finished(struct ath_softc *sc, struct ieee80211_vif *vif)
- +@@ -447,20 +511,28 @@ void ath9k_beacon_tasklet(unsigned long
- + * Both nexttbtt and intval have to be in usecs.
- + */
- + static void ath9k_beacon_init(struct ath_softc *sc, u32 nexttbtt,
- +- u32 intval, bool reset_tsf)
- ++ u32 intval)
- + {
- + struct ath_hw *ah = sc->sc_ah;
- +
- + ath9k_hw_disable_interrupts(ah);
- +- if (reset_tsf)
- +- ath9k_hw_reset_tsf(ah);
- + ath9k_beaconq_config(sc);
- + ath9k_hw_beaconinit(ah, nexttbtt, intval);
- ++ ah->imask |= ATH9K_INT_SWBA;
- + sc->beacon.bmisscnt = 0;
- + ath9k_hw_set_interrupts(ah);
- + ath9k_hw_enable_interrupts(ah);
- + }
- +
- ++static void ath9k_beacon_stop(struct ath_softc *sc)
- ++{
- ++ ath9k_hw_disable_interrupts(sc->sc_ah);
- ++ sc->sc_ah->imask &= ~(ATH9K_INT_SWBA | ATH9K_INT_BMISS);
- ++ sc->beacon.bmisscnt = 0;
- ++ ath9k_hw_set_interrupts(sc->sc_ah);
- ++ ath9k_hw_enable_interrupts(sc->sc_ah);
- ++}
- ++
- + /*
- + * For multi-bss ap support beacons are either staggered evenly over N slots or
- + * burst together. For the former arrange for the SWBA to be delivered for each
- +@@ -472,7 +544,7 @@ static void ath9k_beacon_config_ap(struc
- + struct ath_hw *ah = sc->sc_ah;
- +
- + ath9k_cmn_beacon_config_ap(ah, conf, ATH_BCBUF);
- +- ath9k_beacon_init(sc, conf->nexttbtt, conf->intval, false);
- ++ ath9k_beacon_init(sc, conf->nexttbtt, conf->intval);
- + }
- +
- + static void ath9k_beacon_config_sta(struct ath_hw *ah,
- +@@ -501,7 +573,7 @@ static void ath9k_beacon_config_adhoc(st
- +
- + ath9k_cmn_beacon_config_adhoc(ah, conf);
- +
- +- ath9k_beacon_init(sc, conf->nexttbtt, conf->intval, conf->ibss_creator);
- ++ ath9k_beacon_init(sc, conf->nexttbtt, conf->intval);
- +
- + /*
- + * Set the global 'beacon has been configured' flag for the
- +@@ -511,44 +583,6 @@ static void ath9k_beacon_config_adhoc(st
- + set_bit(ATH_OP_BEACONS, &common->op_flags);
- + }
- +
- +-static bool ath9k_allow_beacon_config(struct ath_softc *sc,
- +- struct ieee80211_vif *vif)
- +-{
- +- struct ath_common *common = ath9k_hw_common(sc->sc_ah);
- +- struct ath_vif *avp = (void *)vif->drv_priv;
- +-
- +- if (ath9k_is_chanctx_enabled()) {
- +- /*
- +- * If the VIF is not present in the current channel context,
- +- * then we can't do the usual opmode checks. Allow the
- +- * beacon config for the VIF to be updated in this case and
- +- * return immediately.
- +- */
- +- if (sc->cur_chan != avp->chanctx)
- +- return true;
- +- }
- +-
- +- if (sc->sc_ah->opmode == NL80211_IFTYPE_AP) {
- +- if (vif->type != NL80211_IFTYPE_AP) {
- +- ath_dbg(common, CONFIG,
- +- "An AP interface is already present !\n");
- +- return false;
- +- }
- +- }
- +-
- +- if (sc->sc_ah->opmode == NL80211_IFTYPE_STATION) {
- +- if ((vif->type == NL80211_IFTYPE_STATION) &&
- +- test_bit(ATH_OP_BEACONS, &common->op_flags) &&
- +- vif != sc->cur_chan->primary_sta) {
- +- ath_dbg(common, CONFIG,
- +- "Beacon already configured for a station interface\n");
- +- return false;
- +- }
- +- }
- +-
- +- return true;
- +-}
- +-
- + static void ath9k_cache_beacon_config(struct ath_softc *sc,
- + struct ath_chanctx *ctx,
- + struct ieee80211_bss_conf *bss_conf)
- +@@ -584,87 +618,79 @@ static void ath9k_cache_beacon_config(st
- + if (cur_conf->dtim_period == 0)
- + cur_conf->dtim_period = 1;
- +
- ++ ath9k_set_tsfadjust(sc, cur_conf);
- + }
- +
- +-void ath9k_beacon_config(struct ath_softc *sc, struct ieee80211_vif *vif,
- +- u32 changed)
- ++void ath9k_beacon_config(struct ath_softc *sc, struct ieee80211_vif *main_vif,
- ++ bool beacons)
- + {
- +- struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;
- +- struct ath_hw *ah = sc->sc_ah;
- +- struct ath_common *common = ath9k_hw_common(ah);
- +- struct ath_vif *avp = (void *)vif->drv_priv;
- +- struct ath_chanctx *ctx = avp->chanctx;
- ++ struct ath_hw *ah = sc->sc_ah;
- ++ struct ath_common *common = ath9k_hw_common(ah);
- ++ struct ath_vif *avp;
- ++ struct ath_chanctx *ctx;
- + struct ath_beacon_config *cur_conf;
- + unsigned long flags;
- ++ bool enabled;
- + bool skip_beacon = false;
- +
- +- if (!ctx)
- ++ if (!beacons) {
- ++ clear_bit(ATH_OP_BEACONS, &common->op_flags);
- ++ ath9k_beacon_stop(sc);
- + return;
- ++ }
- +
- +- cur_conf = &avp->chanctx->beacon;
- +- if (vif->type == NL80211_IFTYPE_AP)
- +- ath9k_set_tsfadjust(sc, vif);
- +-
- +- if (!ath9k_allow_beacon_config(sc, vif))
- ++ if (WARN_ON(!main_vif))
- + return;
- +
- +- if (vif->type == NL80211_IFTYPE_STATION) {
- +- ath9k_cache_beacon_config(sc, ctx, bss_conf);
- +- if (ctx != sc->cur_chan)
- +- return;
- ++ avp = (void *)main_vif->drv_priv;
- ++ ctx = avp->chanctx;
- ++ cur_conf = &ctx->beacon;
- ++ enabled = cur_conf->enable_beacon;
- ++ cur_conf->enable_beacon = beacons;
- ++
- ++ if (sc->sc_ah->opmode == NL80211_IFTYPE_STATION) {
- ++ ath9k_cache_beacon_config(sc, ctx, &main_vif->bss_conf);
- +
- + ath9k_set_beacon(sc);
- + set_bit(ATH_OP_BEACONS, &common->op_flags);
- + return;
- + }
- +
- +- /*
- +- * Take care of multiple interfaces when
- +- * enabling/disabling SWBA.
- +- */
- +- if (changed & BSS_CHANGED_BEACON_ENABLED) {
- +- bool enabled = cur_conf->enable_beacon;
- +-
- +- if (!bss_conf->enable_beacon) {
- +- cur_conf->enable_beacon &= ~BIT(avp->av_bslot);
- +- } else {
- +- cur_conf->enable_beacon |= BIT(avp->av_bslot);
- +- if (!enabled)
- +- ath9k_cache_beacon_config(sc, ctx, bss_conf);
- +- }
- +- }
- +-
- +- if (ctx != sc->cur_chan)
- +- return;
- ++ /* Update the beacon configuration. */
- ++ ath9k_cache_beacon_config(sc, ctx, &main_vif->bss_conf);
- +
- + /*
- + * Configure the HW beacon registers only when we have a valid
- + * beacon interval.
- + */
- + if (cur_conf->beacon_interval) {
- +- /*
- +- * If we are joining an existing IBSS network, start beaconing
- +- * only after a TSF-sync has taken place. Ensure that this
- +- * happens by setting the appropriate flags.
- ++ /* Special case to sync the TSF when joining an existing IBSS.
- ++ * This is only done if no AP interface is active.
- ++ * Note that mac80211 always resets the TSF when creating a new
- ++ * IBSS interface.
- + */
- +- if ((changed & BSS_CHANGED_IBSS) && !bss_conf->ibss_creator &&
- +- bss_conf->enable_beacon) {
- ++ if (sc->sc_ah->opmode == NL80211_IFTYPE_ADHOC &&
- ++ !enabled && beacons && !main_vif->bss_conf.ibss_creator) {
- + spin_lock_irqsave(&sc->sc_pm_lock, flags);
- + sc->ps_flags |= PS_BEACON_SYNC | PS_WAIT_FOR_BEACON;
- + spin_unlock_irqrestore(&sc->sc_pm_lock, flags);
- + skip_beacon = true;
- +- } else {
- +- ath9k_set_beacon(sc);
- + }
- +
- + /*
- + * Do not set the ATH_OP_BEACONS flag for IBSS joiner mode
- + * here, it is done in ath9k_beacon_config_adhoc().
- + */
- +- if (cur_conf->enable_beacon && !skip_beacon)
- ++ if (beacons && !skip_beacon) {
- + set_bit(ATH_OP_BEACONS, &common->op_flags);
- +- else
- ++ ath9k_set_beacon(sc);
- ++ } else {
- + clear_bit(ATH_OP_BEACONS, &common->op_flags);
- ++ ath9k_beacon_stop(sc);
- ++ }
- ++ } else {
- ++ clear_bit(ATH_OP_BEACONS, &common->op_flags);
- ++ ath9k_beacon_stop(sc);
- + }
- + }
- +
- +--- a/drivers/net/wireless/ath/ath9k/common.h
- ++++ b/drivers/net/wireless/ath/ath9k/common.h
- +@@ -50,6 +50,7 @@
- + #define IEEE80211_MS_TO_TU(x) (((x) * 1000) / 1024)
- +
- + struct ath_beacon_config {
- ++ struct ieee80211_vif *main_vif;
- + int beacon_interval;
- + u16 dtim_period;
- + u16 bmiss_timeout;
- +--- a/drivers/net/wireless/ath/ath9k/main.c
- ++++ b/drivers/net/wireless/ath/ath9k/main.c
- +@@ -910,6 +910,22 @@ static bool ath9k_uses_beacons(int type)
- + }
- + }
- +
- ++static void ath9k_vif_iter_set_beacon(struct ath9k_vif_iter_data *iter_data,
- ++ struct ieee80211_vif *vif)
- ++{
- ++ /* Use the first (configured) interface, but prefering AP interfaces. */
- ++ if (!iter_data->primary_beacon_vif) {
- ++ iter_data->primary_beacon_vif = vif;
- ++ } else {
- ++ if (iter_data->primary_beacon_vif->type != NL80211_IFTYPE_AP &&
- ++ vif->type == NL80211_IFTYPE_AP)
- ++ iter_data->primary_beacon_vif = vif;
- ++ }
- ++
- ++ iter_data->beacons = true;
- ++ iter_data->nbcnvifs += 1;
- ++}
- ++
- + static void ath9k_vif_iter(struct ath9k_vif_iter_data *iter_data,
- + u8 *mac, struct ieee80211_vif *vif)
- + {
- +@@ -931,6 +947,8 @@ static void ath9k_vif_iter(struct ath9k_
- + switch (vif->type) {
- + case NL80211_IFTYPE_AP:
- + iter_data->naps++;
- ++ if (vif->bss_conf.enable_beacon)
- ++ ath9k_vif_iter_set_beacon(iter_data, vif);
- + break;
- + case NL80211_IFTYPE_STATION:
- + iter_data->nstations++;
- +@@ -943,12 +961,12 @@ static void ath9k_vif_iter(struct ath9k_
- + case NL80211_IFTYPE_ADHOC:
- + iter_data->nadhocs++;
- + if (vif->bss_conf.enable_beacon)
- +- iter_data->beacons = true;
- ++ ath9k_vif_iter_set_beacon(iter_data, vif);
- + break;
- + case NL80211_IFTYPE_MESH_POINT:
- + iter_data->nmeshes++;
- + if (vif->bss_conf.enable_beacon)
- +- iter_data->beacons = true;
- ++ ath9k_vif_iter_set_beacon(iter_data, vif);
- + break;
- + case NL80211_IFTYPE_WDS:
- + iter_data->nwds++;
- +@@ -1081,7 +1099,6 @@ void ath9k_calculate_summary_state(struc
- + struct ath_hw *ah = sc->sc_ah;
- + struct ath_common *common = ath9k_hw_common(ah);
- + struct ath9k_vif_iter_data iter_data;
- +- struct ath_beacon_config *cur_conf;
- +
- + ath_chanctx_check_active(sc, ctx);
- +
- +@@ -1103,13 +1120,12 @@ void ath9k_calculate_summary_state(struc
- + ath_hw_setbssidmask(common);
- +
- + if (iter_data.naps > 0) {
- +- cur_conf = &ctx->beacon;
- + ath9k_hw_set_tsfadjust(ah, true);
- + ah->opmode = NL80211_IFTYPE_AP;
- +- if (cur_conf->enable_beacon)
- +- iter_data.beacons = true;
- + } else {
- + ath9k_hw_set_tsfadjust(ah, false);
- ++ if (iter_data.beacons)
- ++ ath9k_beacon_ensure_primary_slot(sc);
- +
- + if (iter_data.nmeshes)
- + ah->opmode = NL80211_IFTYPE_MESH_POINT;
- +@@ -1134,7 +1150,6 @@ void ath9k_calculate_summary_state(struc
- + ctx->switch_after_beacon = true;
- + }
- +
- +- ah->imask &= ~ATH9K_INT_SWBA;
- + if (ah->opmode == NL80211_IFTYPE_STATION) {
- + bool changed = (iter_data.primary_sta != ctx->primary_sta);
- +
- +@@ -1151,16 +1166,12 @@ void ath9k_calculate_summary_state(struc
- + if (ath9k_hw_mci_is_enabled(sc->sc_ah))
- + ath9k_mci_update_wlan_channels(sc, true);
- + }
- +- } else if (iter_data.beacons) {
- +- ah->imask |= ATH9K_INT_SWBA;
- + }
- ++ sc->nbcnvifs = iter_data.nbcnvifs;
- ++ ath9k_beacon_config(sc, iter_data.primary_beacon_vif,
- ++ iter_data.beacons);
- + ath9k_hw_set_interrupts(ah);
- +
- +- if (iter_data.beacons)
- +- set_bit(ATH_OP_BEACONS, &common->op_flags);
- +- else
- +- clear_bit(ATH_OP_BEACONS, &common->op_flags);
- +-
- + if (ah->slottime != iter_data.slottime) {
- + ah->slottime = iter_data.slottime;
- + ath9k_hw_init_global_settings(ah);
- +@@ -1777,9 +1788,7 @@ static void ath9k_bss_info_changed(struc
- + if ((changed & BSS_CHANGED_BEACON_ENABLED) ||
- + (changed & BSS_CHANGED_BEACON_INT) ||
- + (changed & BSS_CHANGED_BEACON_INFO)) {
- +- ath9k_beacon_config(sc, vif, changed);
- +- if (changed & BSS_CHANGED_BEACON_ENABLED)
- +- ath9k_calculate_summary_state(sc, avp->chanctx);
- ++ ath9k_calculate_summary_state(sc, avp->chanctx);
- + }
- +
- + if ((avp->chanctx == sc->cur_chan) &&
- diff --git a/package/kernel/mac80211/patches/317-mac80211-minstrel_ht-fix-out-of-bound-in-minstrel_ht.patch b/package/kernel/mac80211/patches/317-mac80211-minstrel_ht-fix-out-of-bound-in-minstrel_ht.patch
- deleted file mode 100644
- index 5bf53b9..0000000
- --- a/package/kernel/mac80211/patches/317-mac80211-minstrel_ht-fix-out-of-bound-in-minstrel_ht.patch
- +++ /dev/null
- @@ -1,45 +0,0 @@
- -From: Konstantin Khlebnikov <koct9i@gmail.com>
- -Date: Fri, 29 Jan 2016 11:35:12 +0300
- -Subject: [PATCH] mac80211: minstrel_ht: fix out-of-bound in
- - minstrel_ht_set_best_prob_rate
- -
- -Patch fixes this splat
- -
- -BUG: KASAN: slab-out-of-bounds in minstrel_ht_update_stats.isra.7+0x6e1/0x9e0
- -[mac80211] at addr ffff8800cee640f4 Read of size 4 by task swapper/3/0
- -
- -Signed-off-by: Konstantin Khlebnikov <koct9i@gmail.com>
- -Link: http://lkml.kernel.org/r/CALYGNiNyJhSaVnE35qS6UCGaSb2Dx1_i5HcRavuOX14oTz2P+w@mail.gmail.com
- ----
- -
- ---- a/net/mac80211/rc80211_minstrel_ht.c
- -+++ b/net/mac80211/rc80211_minstrel_ht.c
- -@@ -414,15 +414,16 @@ minstrel_ht_set_best_prob_rate(struct mi
- - (max_tp_group != MINSTREL_CCK_GROUP))
- - return;
- -
- -+ max_gpr_group = mg->max_group_prob_rate / MCS_GROUP_RATES;
- -+ max_gpr_idx = mg->max_group_prob_rate % MCS_GROUP_RATES;
- -+ max_gpr_prob = mi->groups[max_gpr_group].rates[max_gpr_idx].prob_ewma;
- -+
- - if (mrs->prob_ewma > MINSTREL_FRAC(75, 100)) {
- - cur_tp_avg = minstrel_ht_get_tp_avg(mi, cur_group, cur_idx,
- - mrs->prob_ewma);
- - if (cur_tp_avg > tmp_tp_avg)
- - mi->max_prob_rate = index;
- -
- -- max_gpr_group = mg->max_group_prob_rate / MCS_GROUP_RATES;
- -- max_gpr_idx = mg->max_group_prob_rate % MCS_GROUP_RATES;
- -- max_gpr_prob = mi->groups[max_gpr_group].rates[max_gpr_idx].prob_ewma;
- - max_gpr_tp_avg = minstrel_ht_get_tp_avg(mi, max_gpr_group,
- - max_gpr_idx,
- - max_gpr_prob);
- -@@ -431,7 +432,7 @@ minstrel_ht_set_best_prob_rate(struct mi
- - } else {
- - if (mrs->prob_ewma > tmp_prob)
- - mi->max_prob_rate = index;
- -- if (mrs->prob_ewma > mg->rates[mg->max_group_prob_rate].prob_ewma)
- -+ if (mrs->prob_ewma > max_gpr_prob)
- - mg->max_group_prob_rate = index;
- - }
- - }
- diff --git a/package/kernel/mac80211/patches/318-brcmfmac-slightly-simplify-building-interface-combin.patch b/package/kernel/mac80211/patches/318-brcmfmac-slightly-simplify-building-interface-combin.patch
- new file mode 100644
- index 0000000..d946ecc
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/318-brcmfmac-slightly-simplify-building-interface-combin.patch
- @@ -0,0 +1,108 @@
- +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
- +Date: Tue, 7 Jun 2016 21:10:18 +0200
- +Subject: [PATCH] brcmfmac: slightly simplify building interface combinations
- +MIME-Version: 1.0
- +Content-Type: text/plain; charset=UTF-8
- +Content-Transfer-Encoding: 8bit
- +
- +This change reorders some operations in brcmf_setup_ifmodes in hope to
- +make it simpler:
- +1) It allocates arrays right before filling them. This way it's easier
- + to follow requested array length as it's immediately followed by
- + code filling it. It's easier to check e.g. why we need 4 entries for
- + P2P. Other than that it deduplicates some checks (e.g. for P2P).
- +2) It reorders code to first prepare limits and then define a new combo.
- + Previously this was mixed (e.g. we were setting num of channels
- + before preparing limits).
- +3) It modifies mbss code to use i variable just like other combos do.
- +
- +Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
- +Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
- +Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
- +---
- +
- +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
- ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
- +@@ -6284,29 +6284,15 @@ static int brcmf_setup_ifmodes(struct wi
- + if (!combo)
- + goto err;
- +
- +- c0_limits = kcalloc(p2p ? 3 : 2, sizeof(*c0_limits), GFP_KERNEL);
- +- if (!c0_limits)
- +- goto err;
- +-
- +- if (p2p) {
- +- p2p_limits = kcalloc(4, sizeof(*p2p_limits), GFP_KERNEL);
- +- if (!p2p_limits)
- +- goto err;
- +- }
- +-
- +- if (mbss) {
- +- mbss_limits = kcalloc(1, sizeof(*mbss_limits), GFP_KERNEL);
- +- if (!mbss_limits)
- +- goto err;
- +- }
- +-
- + wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |
- + BIT(NL80211_IFTYPE_ADHOC) |
- + BIT(NL80211_IFTYPE_AP);
- +
- + c = 0;
- + i = 0;
- +- combo[c].num_different_channels = 1;
- ++ c0_limits = kcalloc(p2p ? 3 : 2, sizeof(*c0_limits), GFP_KERNEL);
- ++ if (!c0_limits)
- ++ goto err;
- + c0_limits[i].max = 1;
- + c0_limits[i++].types = BIT(NL80211_IFTYPE_STATION);
- + if (p2p) {
- +@@ -6324,6 +6310,7 @@ static int brcmf_setup_ifmodes(struct wi
- + c0_limits[i].max = 1;
- + c0_limits[i++].types = BIT(NL80211_IFTYPE_AP);
- + }
- ++ combo[c].num_different_channels = 1;
- + combo[c].max_interfaces = i;
- + combo[c].n_limits = i;
- + combo[c].limits = c0_limits;
- +@@ -6331,7 +6318,9 @@ static int brcmf_setup_ifmodes(struct wi
- + if (p2p) {
- + c++;
- + i = 0;
- +- combo[c].num_different_channels = 1;
- ++ p2p_limits = kcalloc(4, sizeof(*p2p_limits), GFP_KERNEL);
- ++ if (!p2p_limits)
- ++ goto err;
- + p2p_limits[i].max = 1;
- + p2p_limits[i++].types = BIT(NL80211_IFTYPE_STATION);
- + p2p_limits[i].max = 1;
- +@@ -6340,6 +6329,7 @@ static int brcmf_setup_ifmodes(struct wi
- + p2p_limits[i++].types = BIT(NL80211_IFTYPE_P2P_CLIENT);
- + p2p_limits[i].max = 1;
- + p2p_limits[i++].types = BIT(NL80211_IFTYPE_P2P_DEVICE);
- ++ combo[c].num_different_channels = 1;
- + combo[c].max_interfaces = i;
- + combo[c].n_limits = i;
- + combo[c].limits = p2p_limits;
- +@@ -6347,14 +6337,19 @@ static int brcmf_setup_ifmodes(struct wi
- +
- + if (mbss) {
- + c++;
- ++ i = 0;
- ++ mbss_limits = kcalloc(1, sizeof(*mbss_limits), GFP_KERNEL);
- ++ if (!mbss_limits)
- ++ goto err;
- ++ mbss_limits[i].max = 4;
- ++ mbss_limits[i++].types = BIT(NL80211_IFTYPE_AP);
- + combo[c].beacon_int_infra_match = true;
- + combo[c].num_different_channels = 1;
- +- mbss_limits[0].max = 4;
- +- mbss_limits[0].types = BIT(NL80211_IFTYPE_AP);
- + combo[c].max_interfaces = 4;
- +- combo[c].n_limits = 1;
- ++ combo[c].n_limits = i;
- + combo[c].limits = mbss_limits;
- + }
- ++
- + wiphy->n_iface_combinations = n_combos;
- + wiphy->iface_combinations = combo;
- + return 0;
- diff --git a/package/kernel/mac80211/patches/318-mac80211-move-A-MSDU-skb_linearize-call-to-ieee80211.patch b/package/kernel/mac80211/patches/318-mac80211-move-A-MSDU-skb_linearize-call-to-ieee80211.patch
- deleted file mode 100644
- index 655dc4b..0000000
- --- a/package/kernel/mac80211/patches/318-mac80211-move-A-MSDU-skb_linearize-call-to-ieee80211.patch
- +++ /dev/null
- @@ -1,35 +0,0 @@
- -From: Felix Fietkau <nbd@openwrt.org>
- -Date: Tue, 2 Feb 2016 14:39:08 +0100
- -Subject: [PATCH] mac80211: move A-MSDU skb_linearize call to
- - ieee80211_amsdu_to_8023s
- -
- -Prepararation for zero-copy A-MSDU support with page fragment SKBs
- -
- -Signed-off-by: Felix Fietkau <nbd@openwrt.org>
- -Signed-off-by: Johannes Berg <johannes.berg@intel.com>
- ----
- -
- ---- a/net/mac80211/rx.c
- -+++ b/net/mac80211/rx.c
- -@@ -2203,9 +2203,6 @@ ieee80211_rx_h_amsdu(struct ieee80211_rx
- - skb->dev = dev;
- - __skb_queue_head_init(&frame_list);
- -
- -- if (skb_linearize(skb))
- -- return RX_DROP_UNUSABLE;
- --
- - ieee80211_amsdu_to_8023s(skb, &frame_list, dev->dev_addr,
- - rx->sdata->vif.type,
- - rx->local->hw.extra_tx_headroom, true);
- ---- a/net/wireless/util.c
- -+++ b/net/wireless/util.c
- -@@ -657,6 +657,9 @@ void ieee80211_amsdu_to_8023s(struct sk_
- - int remaining, err;
- - u8 dst[ETH_ALEN], src[ETH_ALEN];
- -
- -+ if (skb_linearize(skb))
- -+ goto out;
- -+
- - if (has_80211_header) {
- - err = ieee80211_data_to_8023(skb, addr, iftype);
- - if (err)
- diff --git a/package/kernel/mac80211/patches/319-0001-brcmfmac-fix-lockup-when-removing-P2P-interface-afte.patch b/package/kernel/mac80211/patches/319-0001-brcmfmac-fix-lockup-when-removing-P2P-interface-afte.patch
- new file mode 100644
- index 0000000..073d012
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/319-0001-brcmfmac-fix-lockup-when-removing-P2P-interface-afte.patch
- @@ -0,0 +1,154 @@
- +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
- +Date: Fri, 17 Jun 2016 12:29:21 +0200
- +Subject: [PATCH] brcmfmac: fix lockup when removing P2P interface after
- + event timeout
- +MIME-Version: 1.0
- +Content-Type: text/plain; charset=UTF-8
- +Content-Transfer-Encoding: 8bit
- +
- +Removing P2P interface is handled by sending a proper request to the
- +firmware. On success firmware triggers an event and driver's handler
- +removes a matching interface.
- +
- +However on event timeout we remove interface directly from the cfg80211
- +callback. Current code doesn't handle this case correctly as it always
- +assumes rtnl to be unlocked.
- +
- +Fix it by adding an extra rtnl_locked parameter to functions and calling
- +unregister_netdevice when needed.
- +
- +Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
- +Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
- +---
- +
- +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
- ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
- +@@ -548,12 +548,16 @@ fail:
- + return -EBADE;
- + }
- +
- +-static void brcmf_net_detach(struct net_device *ndev)
- ++static void brcmf_net_detach(struct net_device *ndev, bool rtnl_locked)
- + {
- +- if (ndev->reg_state == NETREG_REGISTERED)
- +- unregister_netdev(ndev);
- +- else
- ++ if (ndev->reg_state == NETREG_REGISTERED) {
- ++ if (rtnl_locked)
- ++ unregister_netdevice(ndev);
- ++ else
- ++ unregister_netdev(ndev);
- ++ } else {
- + brcmf_cfg80211_free_netdev(ndev);
- ++ }
- + }
- +
- + void brcmf_net_setcarrier(struct brcmf_if *ifp, bool on)
- +@@ -651,7 +655,7 @@ struct brcmf_if *brcmf_add_if(struct brc
- + brcmf_err("ERROR: netdev:%s already exists\n",
- + ifp->ndev->name);
- + netif_stop_queue(ifp->ndev);
- +- brcmf_net_detach(ifp->ndev);
- ++ brcmf_net_detach(ifp->ndev, false);
- + drvr->iflist[bsscfgidx] = NULL;
- + } else {
- + brcmf_dbg(INFO, "netdev:%s ignore IF event\n",
- +@@ -699,7 +703,8 @@ struct brcmf_if *brcmf_add_if(struct brc
- + return ifp;
- + }
- +
- +-static void brcmf_del_if(struct brcmf_pub *drvr, s32 bsscfgidx)
- ++static void brcmf_del_if(struct brcmf_pub *drvr, s32 bsscfgidx,
- ++ bool rtnl_locked)
- + {
- + struct brcmf_if *ifp;
- +
- +@@ -729,7 +734,7 @@ static void brcmf_del_if(struct brcmf_pu
- + cancel_work_sync(&ifp->multicast_work);
- + cancel_work_sync(&ifp->ndoffload_work);
- + }
- +- brcmf_net_detach(ifp->ndev);
- ++ brcmf_net_detach(ifp->ndev, rtnl_locked);
- + } else {
- + /* Only p2p device interfaces which get dynamically created
- + * end up here. In this case the p2p module should be informed
- +@@ -743,14 +748,14 @@ static void brcmf_del_if(struct brcmf_pu
- + }
- + }
- +
- +-void brcmf_remove_interface(struct brcmf_if *ifp)
- ++void brcmf_remove_interface(struct brcmf_if *ifp, bool rtnl_locked)
- + {
- + if (!ifp || WARN_ON(ifp->drvr->iflist[ifp->bsscfgidx] != ifp))
- + return;
- + brcmf_dbg(TRACE, "Enter, bsscfgidx=%d, ifidx=%d\n", ifp->bsscfgidx,
- + ifp->ifidx);
- + brcmf_fws_del_interface(ifp);
- +- brcmf_del_if(ifp->drvr, ifp->bsscfgidx);
- ++ brcmf_del_if(ifp->drvr, ifp->bsscfgidx, rtnl_locked);
- + }
- +
- + #ifdef CONFIG_INET
- +@@ -1057,9 +1062,9 @@ fail:
- + brcmf_fws_deinit(drvr);
- + }
- + if (ifp)
- +- brcmf_net_detach(ifp->ndev);
- ++ brcmf_net_detach(ifp->ndev, false);
- + if (p2p_ifp)
- +- brcmf_net_detach(p2p_ifp->ndev);
- ++ brcmf_net_detach(p2p_ifp->ndev, false);
- + drvr->iflist[0] = NULL;
- + drvr->iflist[1] = NULL;
- + if (drvr->settings->ignore_probe_fail)
- +@@ -1128,7 +1133,7 @@ void brcmf_detach(struct device *dev)
- +
- + /* make sure primary interface removed last */
- + for (i = BRCMF_MAX_IFS-1; i > -1; i--)
- +- brcmf_remove_interface(drvr->iflist[i]);
- ++ brcmf_remove_interface(drvr->iflist[i], false);
- +
- + brcmf_cfg80211_detach(drvr->config);
- +
- +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
- ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
- +@@ -216,7 +216,7 @@ struct brcmf_if *brcmf_get_ifp(struct br
- + int brcmf_net_attach(struct brcmf_if *ifp, bool rtnl_locked);
- + struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, s32 bsscfgidx, s32 ifidx,
- + bool is_p2pdev, char *name, u8 *mac_addr);
- +-void brcmf_remove_interface(struct brcmf_if *ifp);
- ++void brcmf_remove_interface(struct brcmf_if *ifp, bool rtnl_locked);
- + void brcmf_txflowblock_if(struct brcmf_if *ifp,
- + enum brcmf_netif_stop_reason reason, bool state);
- + void brcmf_txfinalize(struct brcmf_if *ifp, struct sk_buff *txp, bool success);
- +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
- ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
- +@@ -183,7 +183,7 @@ static void brcmf_fweh_handle_if_event(s
- + err = brcmf_fweh_call_event_handler(ifp, emsg->event_code, emsg, data);
- +
- + if (ifp && ifevent->action == BRCMF_E_IF_DEL)
- +- brcmf_remove_interface(ifp);
- ++ brcmf_remove_interface(ifp, false);
- + }
- +
- + /**
- +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
- ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
- +@@ -2289,7 +2289,7 @@ int brcmf_p2p_del_vif(struct wiphy *wiph
- + err = 0;
- + }
- + if (err)
- +- brcmf_remove_interface(vif->ifp);
- ++ brcmf_remove_interface(vif->ifp, true);
- +
- + brcmf_cfg80211_arm_vif_event(cfg, NULL);
- + if (vif->wdev.iftype != NL80211_IFTYPE_P2P_DEVICE)
- +@@ -2395,7 +2395,7 @@ void brcmf_p2p_detach(struct brcmf_p2p_i
- + if (vif != NULL) {
- + brcmf_p2p_cancel_remain_on_channel(vif->ifp);
- + brcmf_p2p_deinit_discovery(p2p);
- +- brcmf_remove_interface(vif->ifp);
- ++ brcmf_remove_interface(vif->ifp, false);
- + }
- + /* just set it all to zero */
- + memset(p2p, 0, sizeof(*p2p));
- diff --git a/package/kernel/mac80211/patches/319-0002-brcmfmac-use-const-char-for-interface-name-in-brcmf_.patch b/package/kernel/mac80211/patches/319-0002-brcmfmac-use-const-char-for-interface-name-in-brcmf_.patch
- new file mode 100644
- index 0000000..6d3f3c6
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/319-0002-brcmfmac-use-const-char-for-interface-name-in-brcmf_.patch
- @@ -0,0 +1,40 @@
- +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
- +Date: Fri, 17 Jun 2016 12:48:44 +0200
- +Subject: [PATCH] brcmfmac: use const char * for interface name in
- + brcmf_add_if
- +MIME-Version: 1.0
- +Content-Type: text/plain; charset=UTF-8
- +Content-Transfer-Encoding: 8bit
- +
- +This function can work just fine with const pointer, it only calls
- +alloc_netdev which take const as well. Moreover it makes this function
- +more flexible as some cfg80211 callback may provide const char * as
- +well, e.g. add_virtual_intf. This will be needed for more advanced
- +interface management.
- +
- +Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
- +Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
- +---
- +
- +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
- ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
- +@@ -638,7 +638,7 @@ fail:
- + }
- +
- + struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, s32 bsscfgidx, s32 ifidx,
- +- bool is_p2pdev, char *name, u8 *mac_addr)
- ++ bool is_p2pdev, const char *name, u8 *mac_addr)
- + {
- + struct brcmf_if *ifp;
- + struct net_device *ndev;
- +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
- ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
- +@@ -215,7 +215,7 @@ char *brcmf_ifname(struct brcmf_if *ifp)
- + struct brcmf_if *brcmf_get_ifp(struct brcmf_pub *drvr, int ifidx);
- + int brcmf_net_attach(struct brcmf_if *ifp, bool rtnl_locked);
- + struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, s32 bsscfgidx, s32 ifidx,
- +- bool is_p2pdev, char *name, u8 *mac_addr);
- ++ bool is_p2pdev, const char *name, u8 *mac_addr);
- + void brcmf_remove_interface(struct brcmf_if *ifp, bool rtnl_locked);
- + void brcmf_txflowblock_if(struct brcmf_if *ifp,
- + enum brcmf_netif_stop_reason reason, bool state);
- diff --git a/package/kernel/mac80211/patches/319-0003-brcmfmac-include-also-core.h-header-in-cfg80211.h.patch b/package/kernel/mac80211/patches/319-0003-brcmfmac-include-also-core.h-header-in-cfg80211.h.patch
- new file mode 100644
- index 0000000..eeda766
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/319-0003-brcmfmac-include-also-core.h-header-in-cfg80211.h.patch
- @@ -0,0 +1,33 @@
- +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
- +Date: Sat, 18 Jun 2016 18:49:38 +0200
- +Subject: [PATCH] brcmfmac: include also core.h header in cfg80211.h
- +MIME-Version: 1.0
- +Content-Type: text/plain; charset=UTF-8
- +Content-Transfer-Encoding: 8bit
- +
- +This header provides two inline functions using struct brcmf_if so we
- +need core.h to avoid:
- +
- +drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h: In function ‘ndev_to_prof’:
- +drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h:368:13: error: dereferencing pointer to incomplete type
- + return &ifp->vif->profile;
- + ^
- +drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h: In function ‘ndev_to_vif’:
- +drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h:374:12: error: dereferencing pointer to incomplete type
- + return ifp->vif;
- + ^
- +
- +Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
- +Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
- +---
- +
- +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
- ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
- +@@ -20,6 +20,7 @@
- + /* for brcmu_d11inf */
- + #include <brcmu_d11.h>
- +
- ++#include "core.h"
- + #include "fwil_types.h"
- + #include "p2p.h"
- +
- diff --git a/package/kernel/mac80211/patches/319-0004-brcmfmac-add-missing-break-when-deleting-P2P_DEVICE.patch b/package/kernel/mac80211/patches/319-0004-brcmfmac-add-missing-break-when-deleting-P2P_DEVICE.patch
- new file mode 100644
- index 0000000..3819248
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/319-0004-brcmfmac-add-missing-break-when-deleting-P2P_DEVICE.patch
- @@ -0,0 +1,27 @@
- +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
- +Date: Sun, 19 Jun 2016 01:55:57 +0200
- +Subject: [PATCH] brcmfmac: add missing break when deleting P2P_DEVICE
- +MIME-Version: 1.0
- +Content-Type: text/plain; charset=UTF-8
- +Content-Transfer-Encoding: 8bit
- +
- +We obviously don't want to fall through in that switch. With this change
- +1) We wait for event (triggered by p2p_disc) as expected
- +2) We remove interface manually on timeout
- +3) We return 0 on success instead of -ENOTSUPP
- +
- +Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
- +Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
- +---
- +
- +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
- ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
- +@@ -2263,6 +2263,8 @@ int brcmf_p2p_del_vif(struct wiphy *wiph
- + return 0;
- + brcmf_p2p_cancel_remain_on_channel(vif->ifp);
- + brcmf_p2p_deinit_discovery(p2p);
- ++ break;
- ++
- + default:
- + return -ENOTSUPP;
- + }
- diff --git a/package/kernel/mac80211/patches/319-0005-brcmfmac-delete-interface-directly-in-code-that-sent.patch b/package/kernel/mac80211/patches/319-0005-brcmfmac-delete-interface-directly-in-code-that-sent.patch
- new file mode 100644
- index 0000000..12d7eb4
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/319-0005-brcmfmac-delete-interface-directly-in-code-that-sent.patch
- @@ -0,0 +1,75 @@
- +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
- +Date: Wed, 29 Jun 2016 21:54:26 +0200
- +Subject: [PATCH] brcmfmac: delete interface directly in code that sent fw
- + request
- +MIME-Version: 1.0
- +Content-Type: text/plain; charset=UTF-8
- +Content-Transfer-Encoding: 8bit
- +
- +So far when receiving event about in-firmware-interface removal our
- +event worker was notifying listener and afterwards it was removing Linux
- +interface.
- +
- +First of all it was resulting in slightly unexpected order. The listener
- +(del_virtual_intf callback) was (usually) returning with success before
- +we even called unregister_netdev(ice).
- +
- +Please note this couldn't be simply fixed by changing order of calls in
- +brcmf_fweh_handle_if_event as unregistering interface earlier could free
- +struct brcmf_if.
- +
- +Another problem of current implementation are possible lockups. Focus on
- +the time slot between calling event handler and removing Linux
- +interface. During that time original caller may leave (unlocking rtnl
- +semaphore) *and* another call to the same code may be done (locking it
- +again). If that happens our event handler will stuck at removing Linux
- +interface, it won't handle another event and will block process holding
- +rtnl lock.
- +
- +This can be simply solved by unregistering interface in a proper
- +callback, right after receiving confirmation event from firmware. This
- +only required modifying worker to don't unregister on its own if there
- +is someone waiting for the event.
- +
- +Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
- +Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
- +---
- +
- +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
- ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
- +@@ -18,6 +18,7 @@
- + #include "brcmu_wifi.h"
- + #include "brcmu_utils.h"
- +
- ++#include "cfg80211.h"
- + #include "core.h"
- + #include "debug.h"
- + #include "tracepoint.h"
- +@@ -182,8 +183,13 @@ static void brcmf_fweh_handle_if_event(s
- +
- + err = brcmf_fweh_call_event_handler(ifp, emsg->event_code, emsg, data);
- +
- +- if (ifp && ifevent->action == BRCMF_E_IF_DEL)
- +- brcmf_remove_interface(ifp, false);
- ++ if (ifp && ifevent->action == BRCMF_E_IF_DEL) {
- ++ bool armed = brcmf_cfg80211_vif_event_armed(drvr->config);
- ++
- ++ /* Default handling in case no-one waits for this event */
- ++ if (!armed)
- ++ brcmf_remove_interface(ifp, false);
- ++ }
- + }
- +
- + /**
- +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
- ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
- +@@ -2290,8 +2290,7 @@ int brcmf_p2p_del_vif(struct wiphy *wiph
- + else
- + err = 0;
- + }
- +- if (err)
- +- brcmf_remove_interface(vif->ifp, true);
- ++ brcmf_remove_interface(vif->ifp, true);
- +
- + brcmf_cfg80211_arm_vif_event(cfg, NULL);
- + if (vif->wdev.iftype != NL80211_IFTYPE_P2P_DEVICE)
- diff --git a/package/kernel/mac80211/patches/319-0006-brcmfmac-support-removing-AP-interfaces-with-interfa.patch b/package/kernel/mac80211/patches/319-0006-brcmfmac-support-removing-AP-interfaces-with-interfa.patch
- new file mode 100644
- index 0000000..2f7165e
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/319-0006-brcmfmac-support-removing-AP-interfaces-with-interfa.patch
- @@ -0,0 +1,84 @@
- +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
- +Date: Wed, 29 Jun 2016 21:54:27 +0200
- +Subject: [PATCH] brcmfmac: support removing AP interfaces with
- + "interface_remove"
- +MIME-Version: 1.0
- +Content-Type: text/plain; charset=UTF-8
- +Content-Transfer-Encoding: 8bit
- +
- +New firmwares (e.g. 10.10.69.36 for BCM4366) support "interface_remove"
- +for removing interfaces. Try to use this method on cfg80211 request. In
- +case of older firmwares (e.g. 7.35.177.56 for BCM43602 as I tested) this
- +will just result in firmware rejecting command and this won't change any
- +behavior.
- +
- +Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
- +Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
- +---
- +
- +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
- ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
- +@@ -785,12 +785,48 @@ s32 brcmf_notify_escan_complete(struct b
- + return err;
- + }
- +
- ++static int brcmf_cfg80211_del_ap_iface(struct wiphy *wiphy,
- ++ struct wireless_dev *wdev)
- ++{
- ++ struct brcmf_cfg80211_info *cfg = wiphy_priv(wiphy);
- ++ struct net_device *ndev = wdev->netdev;
- ++ struct brcmf_if *ifp = netdev_priv(ndev);
- ++ int ret;
- ++ int err;
- ++
- ++ brcmf_cfg80211_arm_vif_event(cfg, ifp->vif);
- ++
- ++ err = brcmf_fil_bsscfg_data_set(ifp, "interface_remove", NULL, 0);
- ++ if (err) {
- ++ brcmf_err("interface_remove failed %d\n", err);
- ++ goto err_unarm;
- ++ }
- ++
- ++ /* wait for firmware event */
- ++ ret = brcmf_cfg80211_wait_vif_event(cfg, BRCMF_E_IF_DEL,
- ++ BRCMF_VIF_EVENT_TIMEOUT);
- ++ if (!ret) {
- ++ brcmf_err("timeout occurred\n");
- ++ err = -EIO;
- ++ goto err_unarm;
- ++ }
- ++
- ++ brcmf_remove_interface(ifp, true);
- ++
- ++err_unarm:
- ++ brcmf_cfg80211_arm_vif_event(cfg, NULL);
- ++ return err;
- ++}
- ++
- + static
- + int brcmf_cfg80211_del_iface(struct wiphy *wiphy, struct wireless_dev *wdev)
- + {
- + struct brcmf_cfg80211_info *cfg = wiphy_priv(wiphy);
- + struct net_device *ndev = wdev->netdev;
- +
- ++ if (ndev && ndev == cfg_to_ndev(cfg))
- ++ return -ENOTSUPP;
- ++
- + /* vif event pending in firmware */
- + if (brcmf_cfg80211_vif_event_armed(cfg))
- + return -EBUSY;
- +@@ -807,12 +843,13 @@ int brcmf_cfg80211_del_iface(struct wiph
- + switch (wdev->iftype) {
- + case NL80211_IFTYPE_ADHOC:
- + case NL80211_IFTYPE_STATION:
- +- case NL80211_IFTYPE_AP:
- + case NL80211_IFTYPE_AP_VLAN:
- + case NL80211_IFTYPE_WDS:
- + case NL80211_IFTYPE_MONITOR:
- + case NL80211_IFTYPE_MESH_POINT:
- + return -EOPNOTSUPP;
- ++ case NL80211_IFTYPE_AP:
- ++ return brcmf_cfg80211_del_ap_iface(wiphy, wdev);
- + case NL80211_IFTYPE_P2P_CLIENT:
- + case NL80211_IFTYPE_P2P_GO:
- + case NL80211_IFTYPE_P2P_DEVICE:
- diff --git a/package/kernel/mac80211/patches/319-cfg80211-add-function-for-802.3-conversion-with-sepa.patch b/package/kernel/mac80211/patches/319-cfg80211-add-function-for-802.3-conversion-with-sepa.patch
- deleted file mode 100644
- index b646ab3..0000000
- --- a/package/kernel/mac80211/patches/319-cfg80211-add-function-for-802.3-conversion-with-sepa.patch
- +++ /dev/null
- @@ -1,186 +0,0 @@
- -From: Felix Fietkau <nbd@openwrt.org>
- -Date: Tue, 2 Feb 2016 14:39:09 +0100
- -Subject: [PATCH] cfg80211: add function for 802.3 conversion with separate
- - output buffer
- -
- -Use skb_copy_bits in preparation for allowing fragmented skbs
- -
- -Signed-off-by: Felix Fietkau <nbd@openwrt.org>
- -Signed-off-by: Johannes Berg <johannes.berg@intel.com>
- ----
- -
- ---- a/net/wireless/util.c
- -+++ b/net/wireless/util.c
- -@@ -393,9 +393,9 @@ unsigned int ieee80211_get_hdrlen_from_s
- - }
- - EXPORT_SYMBOL(ieee80211_get_hdrlen_from_skb);
- -
- --unsigned int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr)
- -+static unsigned int __ieee80211_get_mesh_hdrlen(u8 flags)
- - {
- -- int ae = meshhdr->flags & MESH_FLAGS_AE;
- -+ int ae = flags & MESH_FLAGS_AE;
- - /* 802.11-2012, 8.2.4.7.3 */
- - switch (ae) {
- - default:
- -@@ -407,21 +407,31 @@ unsigned int ieee80211_get_mesh_hdrlen(s
- - return 18;
- - }
- - }
- -+
- -+unsigned int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr)
- -+{
- -+ return __ieee80211_get_mesh_hdrlen(meshhdr->flags);
- -+}
- - EXPORT_SYMBOL(ieee80211_get_mesh_hdrlen);
- -
- --int ieee80211_data_to_8023(struct sk_buff *skb, const u8 *addr,
- -- enum nl80211_iftype iftype)
- -+static int __ieee80211_data_to_8023(struct sk_buff *skb, struct ethhdr *ehdr,
- -+ const u8 *addr, enum nl80211_iftype iftype)
- - {
- - struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
- -- u16 hdrlen, ethertype;
- -- u8 *payload;
- -- u8 dst[ETH_ALEN];
- -- u8 src[ETH_ALEN] __aligned(2);
- -+ struct {
- -+ u8 hdr[ETH_ALEN] __aligned(2);
- -+ __be16 proto;
- -+ } payload;
- -+ struct ethhdr tmp;
- -+ u16 hdrlen;
- -+ u8 mesh_flags = 0;
- -
- - if (unlikely(!ieee80211_is_data_present(hdr->frame_control)))
- - return -1;
- -
- - hdrlen = ieee80211_hdrlen(hdr->frame_control);
- -+ if (skb->len < hdrlen + 8)
- -+ return -1;
- -
- - /* convert IEEE 802.11 header + possible LLC headers into Ethernet
- - * header
- -@@ -432,8 +442,11 @@ int ieee80211_data_to_8023(struct sk_buf
- - * 1 0 BSSID SA DA n/a
- - * 1 1 RA TA DA SA
- - */
- -- memcpy(dst, ieee80211_get_DA(hdr), ETH_ALEN);
- -- memcpy(src, ieee80211_get_SA(hdr), ETH_ALEN);
- -+ memcpy(tmp.h_dest, ieee80211_get_DA(hdr), ETH_ALEN);
- -+ memcpy(tmp.h_source, ieee80211_get_SA(hdr), ETH_ALEN);
- -+
- -+ if (iftype == NL80211_IFTYPE_MESH_POINT)
- -+ skb_copy_bits(skb, hdrlen, &mesh_flags, 1);
- -
- - switch (hdr->frame_control &
- - cpu_to_le16(IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) {
- -@@ -450,44 +463,31 @@ int ieee80211_data_to_8023(struct sk_buf
- - iftype != NL80211_IFTYPE_STATION))
- - return -1;
- - if (iftype == NL80211_IFTYPE_MESH_POINT) {
- -- struct ieee80211s_hdr *meshdr =
- -- (struct ieee80211s_hdr *) (skb->data + hdrlen);
- -- /* make sure meshdr->flags is on the linear part */
- -- if (!pskb_may_pull(skb, hdrlen + 1))
- -- return -1;
- -- if (meshdr->flags & MESH_FLAGS_AE_A4)
- -+ if (mesh_flags & MESH_FLAGS_AE_A4)
- - return -1;
- -- if (meshdr->flags & MESH_FLAGS_AE_A5_A6) {
- -+ if (mesh_flags & MESH_FLAGS_AE_A5_A6) {
- - skb_copy_bits(skb, hdrlen +
- - offsetof(struct ieee80211s_hdr, eaddr1),
- -- dst, ETH_ALEN);
- -- skb_copy_bits(skb, hdrlen +
- -- offsetof(struct ieee80211s_hdr, eaddr2),
- -- src, ETH_ALEN);
- -+ tmp.h_dest, 2 * ETH_ALEN);
- - }
- -- hdrlen += ieee80211_get_mesh_hdrlen(meshdr);
- -+ hdrlen += __ieee80211_get_mesh_hdrlen(mesh_flags);
- - }
- - break;
- - case cpu_to_le16(IEEE80211_FCTL_FROMDS):
- - if ((iftype != NL80211_IFTYPE_STATION &&
- - iftype != NL80211_IFTYPE_P2P_CLIENT &&
- - iftype != NL80211_IFTYPE_MESH_POINT) ||
- -- (is_multicast_ether_addr(dst) &&
- -- ether_addr_equal(src, addr)))
- -+ (is_multicast_ether_addr(tmp.h_dest) &&
- -+ ether_addr_equal(tmp.h_source, addr)))
- - return -1;
- - if (iftype == NL80211_IFTYPE_MESH_POINT) {
- -- struct ieee80211s_hdr *meshdr =
- -- (struct ieee80211s_hdr *) (skb->data + hdrlen);
- -- /* make sure meshdr->flags is on the linear part */
- -- if (!pskb_may_pull(skb, hdrlen + 1))
- -- return -1;
- -- if (meshdr->flags & MESH_FLAGS_AE_A5_A6)
- -+ if (mesh_flags & MESH_FLAGS_AE_A5_A6)
- - return -1;
- -- if (meshdr->flags & MESH_FLAGS_AE_A4)
- -+ if (mesh_flags & MESH_FLAGS_AE_A4)
- - skb_copy_bits(skb, hdrlen +
- - offsetof(struct ieee80211s_hdr, eaddr1),
- -- src, ETH_ALEN);
- -- hdrlen += ieee80211_get_mesh_hdrlen(meshdr);
- -+ tmp.h_source, ETH_ALEN);
- -+ hdrlen += __ieee80211_get_mesh_hdrlen(mesh_flags);
- - }
- - break;
- - case cpu_to_le16(0):
- -@@ -498,33 +498,33 @@ int ieee80211_data_to_8023(struct sk_buf
- - break;
- - }
- -
- -- if (!pskb_may_pull(skb, hdrlen + 8))
- -- return -1;
- --
- -- payload = skb->data + hdrlen;
- -- ethertype = (payload[6] << 8) | payload[7];
- -+ skb_copy_bits(skb, hdrlen, &payload, sizeof(payload));
- -+ tmp.h_proto = payload.proto;
- -
- -- if (likely((ether_addr_equal(payload, rfc1042_header) &&
- -- ethertype != ETH_P_AARP && ethertype != ETH_P_IPX) ||
- -- ether_addr_equal(payload, bridge_tunnel_header))) {
- -+ if (likely((ether_addr_equal(payload.hdr, rfc1042_header) &&
- -+ tmp.h_proto != htons(ETH_P_AARP) &&
- -+ tmp.h_proto != htons(ETH_P_IPX)) ||
- -+ ether_addr_equal(payload.hdr, bridge_tunnel_header)))
- - /* remove RFC1042 or Bridge-Tunnel encapsulation and
- - * replace EtherType */
- -- skb_pull(skb, hdrlen + 6);
- -- memcpy(skb_push(skb, ETH_ALEN), src, ETH_ALEN);
- -- memcpy(skb_push(skb, ETH_ALEN), dst, ETH_ALEN);
- -- } else {
- -- struct ethhdr *ehdr;
- -- __be16 len;
- -+ hdrlen += ETH_ALEN + 2;
- -+ else
- -+ tmp.h_proto = htons(skb->len);
- -
- -- skb_pull(skb, hdrlen);
- -- len = htons(skb->len);
- -+ pskb_pull(skb, hdrlen);
- -+
- -+ if (!ehdr)
- - ehdr = (struct ethhdr *) skb_push(skb, sizeof(struct ethhdr));
- -- memcpy(ehdr->h_dest, dst, ETH_ALEN);
- -- memcpy(ehdr->h_source, src, ETH_ALEN);
- -- ehdr->h_proto = len;
- -- }
- -+ memcpy(ehdr, &tmp, sizeof(tmp));
- -+
- - return 0;
- - }
- -+
- -+int ieee80211_data_to_8023(struct sk_buff *skb, const u8 *addr,
- -+ enum nl80211_iftype iftype)
- -+{
- -+ return __ieee80211_data_to_8023(skb, NULL, addr, iftype);
- -+}
- - EXPORT_SYMBOL(ieee80211_data_to_8023);
- -
- - int ieee80211_data_from_8023(struct sk_buff *skb, const u8 *addr,
- diff --git a/package/kernel/mac80211/patches/320-cfg80211-add-support-for-non-linear-skbs-in-ieee8021.patch b/package/kernel/mac80211/patches/320-cfg80211-add-support-for-non-linear-skbs-in-ieee8021.patch
- deleted file mode 100644
- index 2eeed22..0000000
- --- a/package/kernel/mac80211/patches/320-cfg80211-add-support-for-non-linear-skbs-in-ieee8021.patch
- +++ /dev/null
- @@ -1,159 +0,0 @@
- -From: Felix Fietkau <nbd@openwrt.org>
- -Date: Tue, 2 Feb 2016 14:39:10 +0100
- -Subject: [PATCH] cfg80211: add support for non-linear skbs in
- - ieee80211_amsdu_to_8023s
- -
- -Signed-off-by: Felix Fietkau <nbd@openwrt.org>
- -Signed-off-by: Johannes Berg <johannes.berg@intel.com>
- ----
- -
- ---- a/net/wireless/util.c
- -+++ b/net/wireless/util.c
- -@@ -644,73 +644,75 @@ int ieee80211_data_from_8023(struct sk_b
- - }
- - EXPORT_SYMBOL(ieee80211_data_from_8023);
- -
- -+static struct sk_buff *
- -+__ieee80211_amsdu_copy(struct sk_buff *skb, unsigned int hlen,
- -+ int offset, int len)
- -+{
- -+ struct sk_buff *frame;
- -+
- -+ if (skb->len - offset < len)
- -+ return NULL;
- -+
- -+ /*
- -+ * Allocate and reserve two bytes more for payload
- -+ * alignment since sizeof(struct ethhdr) is 14.
- -+ */
- -+ frame = dev_alloc_skb(hlen + sizeof(struct ethhdr) + 2 + len);
- -+
- -+ skb_reserve(frame, hlen + sizeof(struct ethhdr) + 2);
- -+ skb_copy_bits(skb, offset, skb_put(frame, len), len);
- -+
- -+ return frame;
- -+}
- -
- - void ieee80211_amsdu_to_8023s(struct sk_buff *skb, struct sk_buff_head *list,
- - const u8 *addr, enum nl80211_iftype iftype,
- - const unsigned int extra_headroom,
- - bool has_80211_header)
- - {
- -+ unsigned int hlen = ALIGN(extra_headroom, 4);
- - struct sk_buff *frame = NULL;
- - u16 ethertype;
- - u8 *payload;
- -- const struct ethhdr *eth;
- -- int remaining, err;
- -- u8 dst[ETH_ALEN], src[ETH_ALEN];
- --
- -- if (skb_linearize(skb))
- -- goto out;
- -+ int offset = 0, remaining, err;
- -+ struct ethhdr eth;
- -+ bool reuse_skb = true;
- -+ bool last = false;
- -
- - if (has_80211_header) {
- -- err = ieee80211_data_to_8023(skb, addr, iftype);
- -+ err = __ieee80211_data_to_8023(skb, ð, addr, iftype);
- - if (err)
- - goto out;
- --
- -- /* skip the wrapping header */
- -- eth = (struct ethhdr *) skb_pull(skb, sizeof(struct ethhdr));
- -- if (!eth)
- -- goto out;
- -- } else {
- -- eth = (struct ethhdr *) skb->data;
- - }
- -
- -- while (skb != frame) {
- -+ while (!last) {
- -+ unsigned int subframe_len;
- -+ int len;
- - u8 padding;
- -- __be16 len = eth->h_proto;
- -- unsigned int subframe_len = sizeof(struct ethhdr) + ntohs(len);
- --
- -- remaining = skb->len;
- -- memcpy(dst, eth->h_dest, ETH_ALEN);
- -- memcpy(src, eth->h_source, ETH_ALEN);
- -
- -+ skb_copy_bits(skb, offset, ð, sizeof(eth));
- -+ len = ntohs(eth.h_proto);
- -+ subframe_len = sizeof(struct ethhdr) + len;
- - padding = (4 - subframe_len) & 0x3;
- -+
- - /* the last MSDU has no padding */
- -+ remaining = skb->len - offset;
- - if (subframe_len > remaining)
- - goto purge;
- -
- -- skb_pull(skb, sizeof(struct ethhdr));
- -+ offset += sizeof(struct ethhdr);
- - /* reuse skb for the last subframe */
- -- if (remaining <= subframe_len + padding)
- -+ last = remaining <= subframe_len + padding;
- -+ if (!skb_is_nonlinear(skb) && last) {
- -+ skb_pull(skb, offset);
- - frame = skb;
- -- else {
- -- unsigned int hlen = ALIGN(extra_headroom, 4);
- -- /*
- -- * Allocate and reserve two bytes more for payload
- -- * alignment since sizeof(struct ethhdr) is 14.
- -- */
- -- frame = dev_alloc_skb(hlen + subframe_len + 2);
- -+ reuse_skb = true;
- -+ } else {
- -+ frame = __ieee80211_amsdu_copy(skb, hlen, offset, len);
- - if (!frame)
- - goto purge;
- -
- -- skb_reserve(frame, hlen + sizeof(struct ethhdr) + 2);
- -- memcpy(skb_put(frame, ntohs(len)), skb->data,
- -- ntohs(len));
- --
- -- eth = (struct ethhdr *)skb_pull(skb, ntohs(len) +
- -- padding);
- -- if (!eth) {
- -- dev_kfree_skb(frame);
- -- goto purge;
- -- }
- -+ offset += len + padding;
- - }
- -
- - skb_reset_network_header(frame);
- -@@ -719,24 +721,20 @@ void ieee80211_amsdu_to_8023s(struct sk_
- -
- - payload = frame->data;
- - ethertype = (payload[6] << 8) | payload[7];
- --
- - if (likely((ether_addr_equal(payload, rfc1042_header) &&
- - ethertype != ETH_P_AARP && ethertype != ETH_P_IPX) ||
- - ether_addr_equal(payload, bridge_tunnel_header))) {
- -- /* remove RFC1042 or Bridge-Tunnel
- -- * encapsulation and replace EtherType */
- -- skb_pull(frame, 6);
- -- memcpy(skb_push(frame, ETH_ALEN), src, ETH_ALEN);
- -- memcpy(skb_push(frame, ETH_ALEN), dst, ETH_ALEN);
- -- } else {
- -- memcpy(skb_push(frame, sizeof(__be16)), &len,
- -- sizeof(__be16));
- -- memcpy(skb_push(frame, ETH_ALEN), src, ETH_ALEN);
- -- memcpy(skb_push(frame, ETH_ALEN), dst, ETH_ALEN);
- -+ eth.h_proto = htons(ethertype);
- -+ skb_pull(frame, ETH_ALEN + 2);
- - }
- -+
- -+ memcpy(skb_push(frame, sizeof(eth)), ð, sizeof(eth));
- - __skb_queue_tail(list, frame);
- - }
- -
- -+ if (!reuse_skb)
- -+ dev_kfree_skb(skb);
- -+
- - return;
- -
- - purge:
- diff --git a/package/kernel/mac80211/patches/321-ath9k_hw-reset-AHB-WMAC-interface-on-AR91xx.patch b/package/kernel/mac80211/patches/321-ath9k_hw-reset-AHB-WMAC-interface-on-AR91xx.patch
- new file mode 100644
- index 0000000..9caa76d
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/321-ath9k_hw-reset-AHB-WMAC-interface-on-AR91xx.patch
- @@ -0,0 +1,25 @@
- +From: Felix Fietkau <nbd@nbd.name>
- +Date: Sat, 9 Jul 2016 15:25:24 +0200
- +Subject: [PATCH] ath9k_hw: reset AHB-WMAC interface on AR91xx
- +
- +Should fix a few stability issues
- +
- +Signed-off-by: Felix Fietkau <nbd@nbd.name>
- +---
- +
- +--- a/drivers/net/wireless/ath/ath9k/hw.c
- ++++ b/drivers/net/wireless/ath/ath9k/hw.c
- +@@ -1398,8 +1398,12 @@ static bool ath9k_hw_set_reset(struct at
- + if (!AR_SREV_9100(ah))
- + REG_WRITE(ah, AR_RC, 0);
- +
- +- if (AR_SREV_9100(ah))
- ++ if (AR_SREV_9100(ah)) {
- ++ /* Reset the AHB-WMAC interface */
- ++ if (ah->external_reset)
- ++ ah->external_reset();
- + udelay(50);
- ++ }
- +
- + return true;
- + }
- diff --git a/package/kernel/mac80211/patches/321-mac80211-Parse-legacy-and-HT-rate-in-injected-frames.patch b/package/kernel/mac80211/patches/321-mac80211-Parse-legacy-and-HT-rate-in-injected-frames.patch
- deleted file mode 100644
- index c4155a1..0000000
- --- a/package/kernel/mac80211/patches/321-mac80211-Parse-legacy-and-HT-rate-in-injected-frames.patch
- +++ /dev/null
- @@ -1,155 +0,0 @@
- -From: Sven Eckelmann <sven@narfation.org>
- -Date: Tue, 26 Jan 2016 17:11:13 +0100
- -Subject: [PATCH] mac80211: Parse legacy and HT rate in injected frames
- -
- -Drivers/devices without their own rate control algorithm can get the
- -information what rates they should use from either the radiotap header of
- -injected frames or from the rate control algorithm. But the parsing of the
- -legacy rate information from the radiotap header was removed in commit
- -e6a9854b05c1 ("mac80211/drivers: rewrite the rate control API").
- -
- -The removal of this feature heavily reduced the usefulness of frame
- -injection when wanting to simulate specific transmission behavior. Having
- -rate parsing together with MCS rates and retry support allows a fine
- -grained selection of the tx behavior of injected frames for these kind of
- -tests.
- -
- -Signed-off-by: Sven Eckelmann <sven@narfation.org>
- -Cc: Simon Wunderlich <sw@simonwunderlich.de>
- -Signed-off-by: Johannes Berg <johannes.berg@intel.com>
- ----
- -
- ---- a/include/net/mac80211.h
- -+++ b/include/net/mac80211.h
- -@@ -708,12 +708,14 @@ enum mac80211_tx_info_flags {
- - * protocol frame (e.g. EAP)
- - * @IEEE80211_TX_CTRL_PS_RESPONSE: This frame is a response to a poll
- - * frame (PS-Poll or uAPSD).
- -+ * @IEEE80211_TX_CTRL_RATE_INJECT: This frame is injected with rate information
- - *
- - * These flags are used in tx_info->control.flags.
- - */
- - enum mac80211_tx_control_flags {
- - IEEE80211_TX_CTRL_PORT_CTRL_PROTO = BIT(0),
- - IEEE80211_TX_CTRL_PS_RESPONSE = BIT(1),
- -+ IEEE80211_TX_CTRL_RATE_INJECT = BIT(2),
- - };
- -
- - /*
- ---- a/net/mac80211/tx.c
- -+++ b/net/mac80211/tx.c
- -@@ -710,6 +710,10 @@ ieee80211_tx_h_rate_ctrl(struct ieee8021
- -
- - info->control.short_preamble = txrc.short_preamble;
- -
- -+ /* don't ask rate control when rate already injected via radiotap */
- -+ if (info->control.flags & IEEE80211_TX_CTRL_RATE_INJECT)
- -+ return TX_CONTINUE;
- -+
- - if (tx->sta)
- - assoc = test_sta_flag(tx->sta, WLAN_STA_ASSOC);
- -
- -@@ -1665,15 +1669,24 @@ void ieee80211_xmit(struct ieee80211_sub
- - ieee80211_tx(sdata, sta, skb, false);
- - }
- -
- --static bool ieee80211_parse_tx_radiotap(struct sk_buff *skb)
- -+static bool ieee80211_parse_tx_radiotap(struct ieee80211_local *local,
- -+ struct sk_buff *skb)
- - {
- - struct ieee80211_radiotap_iterator iterator;
- - struct ieee80211_radiotap_header *rthdr =
- - (struct ieee80211_radiotap_header *) skb->data;
- - struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
- -+ struct ieee80211_supported_band *sband =
- -+ local->hw.wiphy->bands[info->band];
- - int ret = ieee80211_radiotap_iterator_init(&iterator, rthdr, skb->len,
- - NULL);
- - u16 txflags;
- -+ u16 rate = 0;
- -+ bool rate_found = false;
- -+ u8 rate_retries = 0;
- -+ u16 rate_flags = 0;
- -+ u8 mcs_known, mcs_flags;
- -+ int i;
- -
- - info->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT |
- - IEEE80211_TX_CTL_DONTFRAG;
- -@@ -1724,6 +1737,35 @@ static bool ieee80211_parse_tx_radiotap(
- - info->flags |= IEEE80211_TX_CTL_NO_ACK;
- - break;
- -
- -+ case IEEE80211_RADIOTAP_RATE:
- -+ rate = *iterator.this_arg;
- -+ rate_flags = 0;
- -+ rate_found = true;
- -+ break;
- -+
- -+ case IEEE80211_RADIOTAP_DATA_RETRIES:
- -+ rate_retries = *iterator.this_arg;
- -+ break;
- -+
- -+ case IEEE80211_RADIOTAP_MCS:
- -+ mcs_known = iterator.this_arg[0];
- -+ mcs_flags = iterator.this_arg[1];
- -+ if (!(mcs_known & IEEE80211_RADIOTAP_MCS_HAVE_MCS))
- -+ break;
- -+
- -+ rate_found = true;
- -+ rate = iterator.this_arg[2];
- -+ rate_flags = IEEE80211_TX_RC_MCS;
- -+
- -+ if (mcs_known & IEEE80211_RADIOTAP_MCS_HAVE_GI &&
- -+ mcs_flags & IEEE80211_RADIOTAP_MCS_SGI)
- -+ rate_flags |= IEEE80211_TX_RC_SHORT_GI;
- -+
- -+ if (mcs_known & IEEE80211_RADIOTAP_MCS_HAVE_BW &&
- -+ mcs_flags & IEEE80211_RADIOTAP_MCS_BW_40)
- -+ rate_flags |= IEEE80211_TX_RC_40_MHZ_WIDTH;
- -+ break;
- -+
- - /*
- - * Please update the file
- - * Documentation/networking/mac80211-injection.txt
- -@@ -1738,6 +1780,32 @@ static bool ieee80211_parse_tx_radiotap(
- - if (ret != -ENOENT) /* ie, if we didn't simply run out of fields */
- - return false;
- -
- -+ if (rate_found) {
- -+ info->control.flags |= IEEE80211_TX_CTRL_RATE_INJECT;
- -+
- -+ for (i = 0; i < IEEE80211_TX_MAX_RATES; i++) {
- -+ info->control.rates[i].idx = -1;
- -+ info->control.rates[i].flags = 0;
- -+ info->control.rates[i].count = 0;
- -+ }
- -+
- -+ if (rate_flags & IEEE80211_TX_RC_MCS) {
- -+ info->control.rates[0].idx = rate;
- -+ } else {
- -+ for (i = 0; i < sband->n_bitrates; i++) {
- -+ if (rate * 5 != sband->bitrates[i].bitrate)
- -+ continue;
- -+
- -+ info->control.rates[0].idx = i;
- -+ break;
- -+ }
- -+ }
- -+
- -+ info->control.rates[0].flags = rate_flags;
- -+ info->control.rates[0].count = min_t(u8, rate_retries + 1,
- -+ local->hw.max_rate_tries);
- -+ }
- -+
- - /*
- - * remove the radiotap header
- - * iterator->_max_length was sanity-checked against
- -@@ -1819,7 +1887,7 @@ netdev_tx_t ieee80211_monitor_start_xmit
- - IEEE80211_TX_CTL_INJECTED;
- -
- - /* process and remove the injection radiotap header */
- -- if (!ieee80211_parse_tx_radiotap(skb))
- -+ if (!ieee80211_parse_tx_radiotap(local, skb))
- - goto fail;
- -
- - rcu_read_lock();
- diff --git a/package/kernel/mac80211/patches/322-ath9k_hw-issue-external-reset-for-QCA9550.patch b/package/kernel/mac80211/patches/322-ath9k_hw-issue-external-reset-for-QCA9550.patch
- new file mode 100644
- index 0000000..5d4e849
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/322-ath9k_hw-issue-external-reset-for-QCA9550.patch
- @@ -0,0 +1,125 @@
- +From: Felix Fietkau <nbd@nbd.name>
- +Date: Sat, 9 Jul 2016 15:26:44 +0200
- +Subject: [PATCH] ath9k_hw: issue external reset for QCA9550
- +
- +The RTC interface on the SoC needs to be reset along with the rest of
- +the WMAC.
- +
- +Signed-off-by: Felix Fietkau <nbd@nbd.name>
- +---
- +
- +--- a/drivers/net/wireless/ath/ath9k/hw.c
- ++++ b/drivers/net/wireless/ath/ath9k/hw.c
- +@@ -1275,39 +1275,56 @@ void ath9k_hw_get_delta_slope_vals(struc
- + *coef_exponent = coef_exp - 16;
- + }
- +
- +-/* AR9330 WAR:
- +- * call external reset function to reset WMAC if:
- +- * - doing a cold reset
- +- * - we have pending frames in the TX queues.
- +- */
- +-static bool ath9k_hw_ar9330_reset_war(struct ath_hw *ah, int type)
- ++static bool ath9k_hw_need_external_reset(struct ath_hw *ah, int type)
- + {
- +- int i, npend = 0;
- ++ int i;
- +
- +- for (i = 0; i < AR_NUM_QCU; i++) {
- +- npend = ath9k_hw_numtxpending(ah, i);
- +- if (npend)
- +- break;
- ++ if (type == ATH9K_RESET_COLD)
- ++ return true;
- ++
- ++ if (AR_SREV_9550(ah))
- ++ return true;
- ++
- ++ /* AR9330 WAR:
- ++ * call external reset function to reset WMAC if:
- ++ * - doing a cold reset
- ++ * - we have pending frames in the TX queues.
- ++ */
- ++ if (AR_SREV_9330(ah)) {
- ++ for (i = 0; i < AR_NUM_QCU; i++) {
- ++ if (ath9k_hw_numtxpending(ah, i))
- ++ return true;
- ++ }
- + }
- +
- +- if (ah->external_reset &&
- +- (npend || type == ATH9K_RESET_COLD)) {
- +- int reset_err = 0;
- ++ return false;
- ++}
- +
- +- ath_dbg(ath9k_hw_common(ah), RESET,
- +- "reset MAC via external reset\n");
- ++static bool ath9k_hw_external_reset(struct ath_hw *ah, int type)
- ++{
- ++ int err;
- +
- +- reset_err = ah->external_reset();
- +- if (reset_err) {
- +- ath_err(ath9k_hw_common(ah),
- +- "External reset failed, err=%d\n",
- +- reset_err);
- +- return false;
- +- }
- ++ if (!ah->external_reset || !ath9k_hw_need_external_reset(ah, type))
- ++ return true;
- +
- +- REG_WRITE(ah, AR_RTC_RESET, 1);
- ++ ath_dbg(ath9k_hw_common(ah), RESET,
- ++ "reset MAC via external reset\n");
- ++
- ++ err = ah->external_reset();
- ++ if (err) {
- ++ ath_err(ath9k_hw_common(ah),
- ++ "External reset failed, err=%d\n", err);
- ++ return false;
- ++ }
- ++
- ++ if (AR_SREV_9550(ah)) {
- ++ REG_WRITE(ah, AR_RTC_RESET, 0);
- ++ udelay(10);
- + }
- +
- ++ REG_WRITE(ah, AR_RTC_RESET, 1);
- ++ udelay(10);
- ++
- + return true;
- + }
- +
- +@@ -1360,24 +1377,23 @@ static bool ath9k_hw_set_reset(struct at
- + rst_flags |= AR_RTC_RC_MAC_COLD;
- + }
- +
- +- if (AR_SREV_9330(ah)) {
- +- if (!ath9k_hw_ar9330_reset_war(ah, type))
- +- return false;
- +- }
- +-
- + if (ath9k_hw_mci_is_enabled(ah))
- + ar9003_mci_check_gpm_offset(ah);
- +
- + /* DMA HALT added to resolve ar9300 and ar9580 bus error during
- +- * RTC_RC reg read
- ++ * RTC_RC reg read. Also needed for AR9550 external reset
- + */
- +- if (AR_SREV_9300(ah) || AR_SREV_9580(ah)) {
- ++ if (AR_SREV_9300(ah) || AR_SREV_9580(ah) || AR_SREV_9550(ah)) {
- + REG_SET_BIT(ah, AR_CFG, AR_CFG_HALT_REQ);
- + ath9k_hw_wait(ah, AR_CFG, AR_CFG_HALT_ACK, AR_CFG_HALT_ACK,
- + 20 * AH_WAIT_TIMEOUT);
- +- REG_CLR_BIT(ah, AR_CFG, AR_CFG_HALT_REQ);
- + }
- +
- ++ ath9k_hw_external_reset(ah, type);
- ++
- ++ if (AR_SREV_9300(ah) || AR_SREV_9580(ah))
- ++ REG_CLR_BIT(ah, AR_CFG, AR_CFG_HALT_REQ);
- ++
- + REG_WRITE(ah, AR_RTC_RC, rst_flags);
- +
- + REGWRITE_BUFFER_FLUSH(ah);
- diff --git a/package/kernel/mac80211/patches/322-mac80211-add-A-MSDU-tx-support.patch b/package/kernel/mac80211/patches/322-mac80211-add-A-MSDU-tx-support.patch
- deleted file mode 100644
- index e7bfb9c..0000000
- --- a/package/kernel/mac80211/patches/322-mac80211-add-A-MSDU-tx-support.patch
- +++ /dev/null
- @@ -1,317 +0,0 @@
- -From: Felix Fietkau <nbd@openwrt.org>
- -Date: Fri, 5 Feb 2016 01:38:51 +0100
- -Subject: [PATCH] mac80211: add A-MSDU tx support
- -
- -Requires software tx queueing support. frag_list support (for zero-copy)
- -is optional.
- -
- -Signed-off-by: Felix Fietkau <nbd@openwrt.org>
- ----
- -
- ---- a/include/net/mac80211.h
- -+++ b/include/net/mac80211.h
- -@@ -709,6 +709,7 @@ enum mac80211_tx_info_flags {
- - * @IEEE80211_TX_CTRL_PS_RESPONSE: This frame is a response to a poll
- - * frame (PS-Poll or uAPSD).
- - * @IEEE80211_TX_CTRL_RATE_INJECT: This frame is injected with rate information
- -+ * @IEEE80211_TX_CTRL_AMSDU: This frame is an A-MSDU frame
- - *
- - * These flags are used in tx_info->control.flags.
- - */
- -@@ -716,6 +717,7 @@ enum mac80211_tx_control_flags {
- - IEEE80211_TX_CTRL_PORT_CTRL_PROTO = BIT(0),
- - IEEE80211_TX_CTRL_PS_RESPONSE = BIT(1),
- - IEEE80211_TX_CTRL_RATE_INJECT = BIT(2),
- -+ IEEE80211_TX_CTRL_AMSDU = BIT(3),
- - };
- -
- - /*
- -@@ -1728,6 +1730,7 @@ struct ieee80211_sta_rates {
- - * size is min(max_amsdu_len, 7935) bytes.
- - * Both additional HT limits must be enforced by the low level driver.
- - * This is defined by the spec (IEEE 802.11-2012 section 8.3.2.2 NOTE 2).
- -+ * @max_rc_amsdu_len: Maximum A-MSDU size in bytes recommended by rate control.
- - * @txq: per-TID data TX queues (if driver uses the TXQ abstraction)
- - */
- - struct ieee80211_sta {
- -@@ -1748,6 +1751,7 @@ struct ieee80211_sta {
- - bool mfp;
- - u8 max_amsdu_subframes;
- - u16 max_amsdu_len;
- -+ u16 max_rc_amsdu_len;
- -
- - struct ieee80211_txq *txq[IEEE80211_NUM_TIDS];
- -
- -@@ -1961,6 +1965,15 @@ struct ieee80211_txq {
- - * order and does not need to manage its own reorder buffer or BA session
- - * timeout.
- - *
- -+ * @IEEE80211_HW_TX_AMSDU: Hardware (or driver) supports software aggregated
- -+ * A-MSDU frames. Requires software tx queueing and fast-xmit support.
- -+ * When not using minstrel/minstrel_ht rate control, the driver should
- -+ * limit the maximum A-MSDU size based on the current tx rate by setting
- -+ * max_rc_amsdu_len in struct ieee80211_sta.
- -+ *
- -+ * @IEEE80211_HW_TX_FRAG_LIST: Hardware (or driver) supports sending frag_list
- -+ * skbs, needed for zero-copy software A-MSDU.
- -+ *
- - * @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays
- - */
- - enum ieee80211_hw_flags {
- -@@ -1998,6 +2011,8 @@ enum ieee80211_hw_flags {
- - IEEE80211_HW_BEACON_TX_STATUS,
- - IEEE80211_HW_NEEDS_UNIQUE_STA_ADDR,
- - IEEE80211_HW_SUPPORTS_REORDERING_BUFFER,
- -+ IEEE80211_HW_TX_AMSDU,
- -+ IEEE80211_HW_TX_FRAG_LIST,
- -
- - /* keep last, obviously */
- - NUM_IEEE80211_HW_FLAGS
- -@@ -2070,6 +2085,9 @@ enum ieee80211_hw_flags {
- - * size is smaller (an example is LinkSys WRT120N with FW v1.0.07
- - * build 002 Jun 18 2012).
- - *
- -+ * @max_tx_fragments: maximum number of tx buffers per (A)-MSDU, sum
- -+ * of 1 + skb_shinfo(skb)->nr_frags for each skb in the frag_list.
- -+ *
- - * @offchannel_tx_hw_queue: HW queue ID to use for offchannel TX
- - * (if %IEEE80211_HW_QUEUE_CONTROL is set)
- - *
- -@@ -2124,6 +2142,7 @@ struct ieee80211_hw {
- - u8 max_rate_tries;
- - u8 max_rx_aggregation_subframes;
- - u8 max_tx_aggregation_subframes;
- -+ u8 max_tx_fragments;
- - u8 offchannel_tx_hw_queue;
- - u8 radiotap_mcs_details;
- - u16 radiotap_vht_details;
- ---- a/net/mac80211/agg-tx.c
- -+++ b/net/mac80211/agg-tx.c
- -@@ -935,6 +935,7 @@ void ieee80211_process_addba_resp(struct
- - size_t len)
- - {
- - struct tid_ampdu_tx *tid_tx;
- -+ struct ieee80211_txq *txq;
- - u16 capab, tid;
- - u8 buf_size;
- - bool amsdu;
- -@@ -945,6 +946,10 @@ void ieee80211_process_addba_resp(struct
- - buf_size = (capab & IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK) >> 6;
- - buf_size = min(buf_size, local->hw.max_tx_aggregation_subframes);
- -
- -+ txq = sta->sta.txq[tid];
- -+ if (!amsdu && txq)
- -+ set_bit(IEEE80211_TXQ_NO_AMSDU, &to_txq_info(txq)->flags);
- -+
- - mutex_lock(&sta->ampdu_mlme.mtx);
- -
- - tid_tx = rcu_dereference_protected_tid_tx(sta, tid);
- ---- a/net/mac80211/debugfs.c
- -+++ b/net/mac80211/debugfs.c
- -@@ -127,6 +127,8 @@ static const char *hw_flag_names[NUM_IEE
- - FLAG(BEACON_TX_STATUS),
- - FLAG(NEEDS_UNIQUE_STA_ADDR),
- - FLAG(SUPPORTS_REORDERING_BUFFER),
- -+ FLAG(TX_AMSDU),
- -+ FLAG(TX_FRAG_LIST),
- -
- - /* keep last for the build bug below */
- - (void *)0x1
- ---- a/net/mac80211/ieee80211_i.h
- -+++ b/net/mac80211/ieee80211_i.h
- -@@ -799,6 +799,7 @@ struct mac80211_qos_map {
- - enum txq_info_flags {
- - IEEE80211_TXQ_STOP,
- - IEEE80211_TXQ_AMPDU,
- -+ IEEE80211_TXQ_NO_AMSDU,
- - };
- -
- - struct txq_info {
- ---- a/net/mac80211/tx.c
- -+++ b/net/mac80211/tx.c
- -@@ -1318,6 +1318,10 @@ struct sk_buff *ieee80211_tx_dequeue(str
- - out:
- - spin_unlock_bh(&txqi->queue.lock);
- -
- -+ if (skb && skb_has_frag_list(skb) &&
- -+ !ieee80211_hw_check(&local->hw, TX_FRAG_LIST))
- -+ skb_linearize(skb);
- -+
- - return skb;
- - }
- - EXPORT_SYMBOL(ieee80211_tx_dequeue);
- -@@ -2757,6 +2761,163 @@ void ieee80211_clear_fast_xmit(struct st
- - kfree_rcu(fast_tx, rcu_head);
- - }
- -
- -+static bool ieee80211_amsdu_realloc_pad(struct ieee80211_local *local,
- -+ struct sk_buff *skb, int headroom,
- -+ int *subframe_len)
- -+{
- -+ int amsdu_len = *subframe_len + sizeof(struct ethhdr);
- -+ int padding = (4 - amsdu_len) & 3;
- -+
- -+ if (skb_headroom(skb) < headroom || skb_tailroom(skb) < padding) {
- -+ I802_DEBUG_INC(local->tx_expand_skb_head);
- -+
- -+ if (pskb_expand_head(skb, headroom, padding, GFP_ATOMIC)) {
- -+ wiphy_debug(local->hw.wiphy,
- -+ "failed to reallocate TX buffer\n");
- -+ return false;
- -+ }
- -+ }
- -+
- -+ if (padding) {
- -+ *subframe_len += padding;
- -+ memset(skb_put(skb, padding), 0, padding);
- -+ }
- -+
- -+ return true;
- -+}
- -+
- -+static bool ieee80211_amsdu_prepare_head(struct ieee80211_sub_if_data *sdata,
- -+ struct ieee80211_fast_tx *fast_tx,
- -+ struct sk_buff *skb)
- -+{
- -+ struct ieee80211_local *local = sdata->local;
- -+ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
- -+ struct ieee80211_hdr *hdr;
- -+ struct ethhdr amsdu_hdr;
- -+ int hdr_len = fast_tx->hdr_len - sizeof(rfc1042_header);
- -+ int subframe_len = skb->len - hdr_len;
- -+ void *data;
- -+ u8 *qc;
- -+
- -+ if (info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE)
- -+ return false;
- -+
- -+ if (info->control.flags & IEEE80211_TX_CTRL_AMSDU)
- -+ return true;
- -+
- -+ if (!ieee80211_amsdu_realloc_pad(local, skb, sizeof(amsdu_hdr),
- -+ &subframe_len))
- -+ return false;
- -+
- -+ amsdu_hdr.h_proto = cpu_to_be16(subframe_len);
- -+ memcpy(amsdu_hdr.h_source, skb->data + fast_tx->sa_offs, ETH_ALEN);
- -+ memcpy(amsdu_hdr.h_dest, skb->data + fast_tx->da_offs, ETH_ALEN);
- -+
- -+ data = skb_push(skb, sizeof(amsdu_hdr));
- -+ memmove(data, data + sizeof(amsdu_hdr), hdr_len);
- -+ memcpy(data + hdr_len, &amsdu_hdr, sizeof(amsdu_hdr));
- -+
- -+ hdr = data;
- -+ qc = ieee80211_get_qos_ctl(hdr);
- -+ *qc |= IEEE80211_QOS_CTL_A_MSDU_PRESENT;
- -+
- -+ info->control.flags |= IEEE80211_TX_CTRL_AMSDU;
- -+
- -+ return true;
- -+}
- -+
- -+static bool ieee80211_amsdu_aggregate(struct ieee80211_sub_if_data *sdata,
- -+ struct sta_info *sta,
- -+ struct ieee80211_fast_tx *fast_tx,
- -+ struct sk_buff *skb)
- -+{
- -+ struct ieee80211_local *local = sdata->local;
- -+ u8 tid = skb->priority & IEEE80211_QOS_CTL_TAG1D_MASK;
- -+ struct ieee80211_txq *txq = sta->sta.txq[tid];
- -+ struct txq_info *txqi;
- -+ struct sk_buff **frag_tail, *head;
- -+ int subframe_len = skb->len - ETH_ALEN;
- -+ u8 max_subframes = sta->sta.max_amsdu_subframes;
- -+ int max_frags = local->hw.max_tx_fragments;
- -+ int max_amsdu_len = sta->sta.max_amsdu_len;
- -+ __be16 len;
- -+ void *data;
- -+ bool ret = false;
- -+ int n = 1, nfrags;
- -+
- -+ if (!ieee80211_hw_check(&local->hw, TX_AMSDU))
- -+ return false;
- -+
- -+ if (!txq)
- -+ return false;
- -+
- -+ txqi = to_txq_info(txq);
- -+ if (test_bit(IEEE80211_TXQ_NO_AMSDU, &txqi->flags))
- -+ return false;
- -+
- -+ if (sta->sta.max_rc_amsdu_len)
- -+ max_amsdu_len = min_t(int, max_amsdu_len,
- -+ sta->sta.max_rc_amsdu_len);
- -+
- -+ spin_lock_bh(&txqi->queue.lock);
- -+
- -+ head = skb_peek_tail(&txqi->queue);
- -+ if (!head)
- -+ goto out;
- -+
- -+ if (skb->len + head->len > max_amsdu_len)
- -+ goto out;
- -+
- -+ /*
- -+ * HT A-MPDU limits maximum MPDU size to 4095 bytes. Since aggregation
- -+ * sessions are started/stopped without txq flush, use the limit here
- -+ * to avoid having to de-aggregate later.
- -+ */
- -+ if (skb->len + head->len > 4095 &&
- -+ !sta->sta.vht_cap.vht_supported)
- -+ goto out;
- -+
- -+ if (!ieee80211_amsdu_prepare_head(sdata, fast_tx, head))
- -+ goto out;
- -+
- -+ nfrags = 1 + skb_shinfo(skb)->nr_frags;
- -+ nfrags += 1 + skb_shinfo(head)->nr_frags;
- -+ frag_tail = &skb_shinfo(head)->frag_list;
- -+ while (*frag_tail) {
- -+ nfrags += 1 + skb_shinfo(*frag_tail)->nr_frags;
- -+ frag_tail = &(*frag_tail)->next;
- -+ n++;
- -+ }
- -+
- -+ if (max_subframes && n > max_subframes)
- -+ goto out;
- -+
- -+ if (max_frags && nfrags > max_frags)
- -+ goto out;
- -+
- -+ if (!ieee80211_amsdu_realloc_pad(local, skb, sizeof(rfc1042_header) + 2,
- -+ &subframe_len))
- -+ return false;
- -+
- -+ ret = true;
- -+ data = skb_push(skb, ETH_ALEN + 2);
- -+ memmove(data, data + ETH_ALEN + 2, 2 * ETH_ALEN);
- -+
- -+ data += 2 * ETH_ALEN;
- -+ len = cpu_to_be16(subframe_len);
- -+ memcpy(data, &len, 2);
- -+ memcpy(data + 2, rfc1042_header, sizeof(rfc1042_header));
- -+
- -+ head->len += skb->len;
- -+ head->data_len += skb->len;
- -+ *frag_tail = skb;
- -+
- -+out:
- -+ spin_unlock_bh(&txqi->queue.lock);
- -+
- -+ return ret;
- -+}
- -+
- - static bool ieee80211_xmit_fast(struct ieee80211_sub_if_data *sdata,
- - struct net_device *dev, struct sta_info *sta,
- - struct ieee80211_fast_tx *fast_tx,
- -@@ -2811,6 +2972,10 @@ static bool ieee80211_xmit_fast(struct i
- -
- - ieee80211_tx_stats(dev, skb->len + extra_head);
- -
- -+ if ((hdr->frame_control & cpu_to_le16(IEEE80211_STYPE_QOS_DATA)) &&
- -+ ieee80211_amsdu_aggregate(sdata, sta, fast_tx, skb))
- -+ return true;
- -+
- - /* will not be crypto-handled beyond what we do here, so use false
- - * as the may-encrypt argument for the resize to not account for
- - * more room than we already have in 'extra_head'
- diff --git a/package/kernel/mac80211/patches/323-0000-brcmfmac-fix-setting-primary-channel-for-80-MHz-widt.patch b/package/kernel/mac80211/patches/323-0000-brcmfmac-fix-setting-primary-channel-for-80-MHz-widt.patch
- deleted file mode 100644
- index 9277b2c..0000000
- --- a/package/kernel/mac80211/patches/323-0000-brcmfmac-fix-setting-primary-channel-for-80-MHz-widt.patch
- +++ /dev/null
- @@ -1,64 +0,0 @@
- -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
- -Date: Wed, 20 Jan 2016 16:46:04 +0100
- -Subject: [PATCH] brcmfmac: fix setting primary channel for 80 MHz width
- -MIME-Version: 1.0
- -Content-Type: text/plain; charset=UTF-8
- -Content-Transfer-Encoding: 8bit
- -
- -First of all it changes the way we calculate primary channel offset. If
- -we use e.g. 80 MHz channel with primary frequency 5180 MHz (which means
- -center frequency is 5210 MHz) it makes sense to calculate primary offset
- -as -30 MHz.
- -Then it fixes values we compare primary_offset with. We were comparing
- -offset in MHz against -2 or 2 which was resulting in picking a wrong
- -primary channel.
- -
- -Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
- -Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
- ----
- -
- ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
- -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
- -@@ -247,7 +247,7 @@ static u16 chandef_to_chanspec(struct br
- - brcmf_dbg(TRACE, "chandef: control %d center %d width %d\n",
- - ch->chan->center_freq, ch->center_freq1, ch->width);
- - ch_inf.chnum = ieee80211_frequency_to_channel(ch->center_freq1);
- -- primary_offset = ch->center_freq1 - ch->chan->center_freq;
- -+ primary_offset = ch->chan->center_freq - ch->center_freq1;
- - switch (ch->width) {
- - case NL80211_CHAN_WIDTH_20:
- - case NL80211_CHAN_WIDTH_20_NOHT:
- -@@ -256,24 +256,21 @@ static u16 chandef_to_chanspec(struct br
- - break;
- - case NL80211_CHAN_WIDTH_40:
- - ch_inf.bw = BRCMU_CHAN_BW_40;
- -- if (primary_offset < 0)
- -+ if (primary_offset > 0)
- - ch_inf.sb = BRCMU_CHAN_SB_U;
- - else
- - ch_inf.sb = BRCMU_CHAN_SB_L;
- - break;
- - case NL80211_CHAN_WIDTH_80:
- - ch_inf.bw = BRCMU_CHAN_BW_80;
- -- if (primary_offset < 0) {
- -- if (primary_offset < -CH_10MHZ_APART)
- -- ch_inf.sb = BRCMU_CHAN_SB_UU;
- -- else
- -- ch_inf.sb = BRCMU_CHAN_SB_UL;
- -- } else {
- -- if (primary_offset > CH_10MHZ_APART)
- -- ch_inf.sb = BRCMU_CHAN_SB_LL;
- -- else
- -- ch_inf.sb = BRCMU_CHAN_SB_LU;
- -- }
- -+ if (primary_offset == -30)
- -+ ch_inf.sb = BRCMU_CHAN_SB_LL;
- -+ else if (primary_offset == -10)
- -+ ch_inf.sb = BRCMU_CHAN_SB_LU;
- -+ else if (primary_offset == 10)
- -+ ch_inf.sb = BRCMU_CHAN_SB_UL;
- -+ else
- -+ ch_inf.sb = BRCMU_CHAN_SB_UU;
- - break;
- - case NL80211_CHAN_WIDTH_80P80:
- - case NL80211_CHAN_WIDTH_160:
- diff --git a/package/kernel/mac80211/patches/323-0001-brcmfmac-analyze-descriptors-of-current-component-on.patch b/package/kernel/mac80211/patches/323-0001-brcmfmac-analyze-descriptors-of-current-component-on.patch
- deleted file mode 100644
- index d7018da..0000000
- --- a/package/kernel/mac80211/patches/323-0001-brcmfmac-analyze-descriptors-of-current-component-on.patch
- +++ /dev/null
- @@ -1,51 +0,0 @@
- -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
- -Date: Tue, 26 Jan 2016 17:57:01 +0100
- -Subject: [PATCH] brcmfmac: analyze descriptors of current component only
- -MIME-Version: 1.0
- -Content-Type: text/plain; charset=UTF-8
- -Content-Transfer-Encoding: 8bit
- -
- -So far we were looking for address descriptors without a check for
- -crossing current component border. In case of dealing with unsupported
- -descriptor or descriptor missing at all the code would incorrectly get
- -data from another component.
- -
- -Consider this binary-described component from BCM4366 EROM:
- -4bf83b01 TAG==CI CID==0x83b
- -20080201 TAG==CI PORTS==0+1 WRAPPERS==0+1
- -18400035 TAG==ADDR SZ_SZD TYPE_SLAVE
- -00050000
- -18107085 TAG==ADDR SZ_4K TYPE_SWRAP
- -
- -Driver was assigning invalid base address to this core:
- -brcmfmac: [6 ] core 0x83b:32 base 0x18109000 wrap 0x18107000
- -which came from totally different component defined in EROM:
- -43b36701 TAG==CI CID==0x367
- -00000201 TAG==CI PORTS==0+1 WRAPPERS==0+0
- -18109005 TAG==ADDR SZ_4K TYPE_SLAVE
- -
- -This change will also allow us to support components without wrapper
- -address in the future.
- -
- -Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
- -Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
- ----
- -
- ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
- -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
- -@@ -803,7 +803,14 @@ static int brcmf_chip_dmp_get_regaddr(st
- - *eromaddr -= 4;
- - return -EFAULT;
- - }
- -- } while (desc != DMP_DESC_ADDRESS);
- -+ } while (desc != DMP_DESC_ADDRESS &&
- -+ desc != DMP_DESC_COMPONENT);
- -+
- -+ /* stop if we crossed current component border */
- -+ if (desc == DMP_DESC_COMPONENT) {
- -+ *eromaddr -= 4;
- -+ return 0;
- -+ }
- -
- - /* skip upper 32-bit address descriptor */
- - if (val & DMP_DESC_ADDRSIZE_GT32)
- diff --git a/package/kernel/mac80211/patches/323-0002-brcmfmac-allow-storing-PMU-core-without-wrapper-addr.patch b/package/kernel/mac80211/patches/323-0002-brcmfmac-allow-storing-PMU-core-without-wrapper-addr.patch
- deleted file mode 100644
- index 045ab49..0000000
- --- a/package/kernel/mac80211/patches/323-0002-brcmfmac-allow-storing-PMU-core-without-wrapper-addr.patch
- +++ /dev/null
- @@ -1,28 +0,0 @@
- -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
- -Date: Tue, 26 Jan 2016 17:57:02 +0100
- -Subject: [PATCH] brcmfmac: allow storing PMU core without wrapper address
- -MIME-Version: 1.0
- -Content-Type: text/plain; charset=UTF-8
- -Content-Transfer-Encoding: 8bit
- -
- -Separated PMU core can be found in new devices and should be used for
- -accessing PMU registers (which were routed through ChipCommon so far).
- -This core is one of exceptions that doesn't have or need wrapper address
- -to be still safely accessible.
- -
- -Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
- -Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
- ----
- -
- ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
- -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
- -@@ -883,7 +883,8 @@ int brcmf_chip_dmp_erom_scan(struct brcm
- - rev = (val & DMP_COMP_REVISION) >> DMP_COMP_REVISION_S;
- -
- - /* need core with ports */
- -- if (nmw + nsw == 0)
- -+ if (nmw + nsw == 0 &&
- -+ id != BCMA_CORE_PMU)
- - continue;
- -
- - /* try to obtain register address info */
- diff --git a/package/kernel/mac80211/patches/323-0003-brcmfmac-read-extended-capabilities-of-ChipCommon-co.patch b/package/kernel/mac80211/patches/323-0003-brcmfmac-read-extended-capabilities-of-ChipCommon-co.patch
- deleted file mode 100644
- index 7b7ba4f..0000000
- --- a/package/kernel/mac80211/patches/323-0003-brcmfmac-read-extended-capabilities-of-ChipCommon-co.patch
- +++ /dev/null
- @@ -1,43 +0,0 @@
- -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
- -Date: Tue, 26 Jan 2016 17:57:03 +0100
- -Subject: [PATCH] brcmfmac: read extended capabilities of ChipCommon core
- -MIME-Version: 1.0
- -Content-Type: text/plain; charset=UTF-8
- -Content-Transfer-Encoding: 8bit
- -
- -This is an extra bitfield with info about some present hardware.
- -
- -Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
- -Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
- ----
- -
- ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
- -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
- -@@ -1025,6 +1025,9 @@ static int brcmf_chip_setup(struct brcmf
- - /* get chipcommon capabilites */
- - pub->cc_caps = chip->ops->read32(chip->ctx,
- - CORE_CC_REG(base, capabilities));
- -+ pub->cc_caps_ext = chip->ops->read32(chip->ctx,
- -+ CORE_CC_REG(base,
- -+ capabilities_ext));
- -
- - /* get pmu caps & rev */
- - if (pub->cc_caps & CC_CAP_PMU) {
- ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h
- -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h
- -@@ -27,6 +27,7 @@
- - * @chip: chip identifier.
- - * @chiprev: chip revision.
- - * @cc_caps: chipcommon core capabilities.
- -+ * @cc_caps_ext: chipcommon core extended capabilities.
- - * @pmucaps: PMU capabilities.
- - * @pmurev: PMU revision.
- - * @rambase: RAM base address (only applicable for ARM CR4 chips).
- -@@ -38,6 +39,7 @@ struct brcmf_chip {
- - u32 chip;
- - u32 chiprev;
- - u32 cc_caps;
- -+ u32 cc_caps_ext;
- - u32 pmucaps;
- - u32 pmurev;
- - u32 rambase;
- diff --git a/package/kernel/mac80211/patches/323-0004-brcmfmac-access-PMU-registers-using-standalone-PMU-c.patch b/package/kernel/mac80211/patches/323-0004-brcmfmac-access-PMU-registers-using-standalone-PMU-c.patch
- deleted file mode 100644
- index 2af6fd9..0000000
- --- a/package/kernel/mac80211/patches/323-0004-brcmfmac-access-PMU-registers-using-standalone-PMU-c.patch
- +++ /dev/null
- @@ -1,148 +0,0 @@
- -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
- -Date: Tue, 26 Jan 2016 17:57:04 +0100
- -Subject: [PATCH] brcmfmac: access PMU registers using standalone PMU core if
- - available
- -MIME-Version: 1.0
- -Content-Type: text/plain; charset=UTF-8
- -Content-Transfer-Encoding: 8bit
- -
- -On recent Broadcom chipsets PMU is present as separated core and it
- -can't be accessed using ChipCommon anymore as it fails with e.g.:
- -[ 18.198412] Unhandled fault: imprecise external abort (0x1406) at 0xb6da200f
- -
- -Add a new helper function that will return a proper core that should be
- -used for accessing PMU registers.
- -
- -Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
- -Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
- ----
- -
- ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
- -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
- -@@ -1014,6 +1014,7 @@ static int brcmf_chip_setup(struct brcmf
- - {
- - struct brcmf_chip *pub;
- - struct brcmf_core_priv *cc;
- -+ struct brcmf_core *pmu;
- - u32 base;
- - u32 val;
- - int ret = 0;
- -@@ -1030,9 +1031,10 @@ static int brcmf_chip_setup(struct brcmf
- - capabilities_ext));
- -
- - /* get pmu caps & rev */
- -+ pmu = brcmf_chip_get_pmu(pub); /* after reading cc_caps_ext */
- - if (pub->cc_caps & CC_CAP_PMU) {
- - val = chip->ops->read32(chip->ctx,
- -- CORE_CC_REG(base, pmucapabilities));
- -+ CORE_CC_REG(pmu->base, pmucapabilities));
- - pub->pmurev = val & PCAP_REV_MASK;
- - pub->pmucaps = val;
- - }
- -@@ -1131,6 +1133,23 @@ struct brcmf_core *brcmf_chip_get_chipco
- - return &cc->pub;
- - }
- -
- -+struct brcmf_core *brcmf_chip_get_pmu(struct brcmf_chip *pub)
- -+{
- -+ struct brcmf_core *cc = brcmf_chip_get_chipcommon(pub);
- -+ struct brcmf_core *pmu;
- -+
- -+ /* See if there is separated PMU core available */
- -+ if (cc->rev >= 35 &&
- -+ pub->cc_caps_ext & BCMA_CC_CAP_EXT_AOB_PRESENT) {
- -+ pmu = brcmf_chip_get_core(pub, BCMA_CORE_PMU);
- -+ if (pmu)
- -+ return pmu;
- -+ }
- -+
- -+ /* Fallback to ChipCommon core for older hardware */
- -+ return cc;
- -+}
- -+
- - bool brcmf_chip_iscoreup(struct brcmf_core *pub)
- - {
- - struct brcmf_core_priv *core;
- -@@ -1301,6 +1320,7 @@ bool brcmf_chip_sr_capable(struct brcmf_
- - {
- - u32 base, addr, reg, pmu_cc3_mask = ~0;
- - struct brcmf_chip_priv *chip;
- -+ struct brcmf_core *pmu = brcmf_chip_get_pmu(pub);
- -
- - brcmf_dbg(TRACE, "Enter\n");
- -
- -@@ -1320,9 +1340,9 @@ bool brcmf_chip_sr_capable(struct brcmf_
- - case BRCM_CC_4335_CHIP_ID:
- - case BRCM_CC_4339_CHIP_ID:
- - /* read PMU chipcontrol register 3 */
- -- addr = CORE_CC_REG(base, chipcontrol_addr);
- -+ addr = CORE_CC_REG(pmu->base, chipcontrol_addr);
- - chip->ops->write32(chip->ctx, addr, 3);
- -- addr = CORE_CC_REG(base, chipcontrol_data);
- -+ addr = CORE_CC_REG(pmu->base, chipcontrol_data);
- - reg = chip->ops->read32(chip->ctx, addr);
- - return (reg & pmu_cc3_mask) != 0;
- - case BRCM_CC_43430_CHIP_ID:
- -@@ -1330,12 +1350,12 @@ bool brcmf_chip_sr_capable(struct brcmf_
- - reg = chip->ops->read32(chip->ctx, addr);
- - return reg != 0;
- - default:
- -- addr = CORE_CC_REG(base, pmucapabilities_ext);
- -+ addr = CORE_CC_REG(pmu->base, pmucapabilities_ext);
- - reg = chip->ops->read32(chip->ctx, addr);
- - if ((reg & PCAPEXT_SR_SUPPORTED_MASK) == 0)
- - return false;
- -
- -- addr = CORE_CC_REG(base, retention_ctl);
- -+ addr = CORE_CC_REG(pmu->base, retention_ctl);
- - reg = chip->ops->read32(chip->ctx, addr);
- - return (reg & (PMU_RCTL_MACPHY_DISABLE_MASK |
- - PMU_RCTL_LOGIC_DISABLE_MASK)) == 0;
- ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h
- -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h
- -@@ -85,6 +85,7 @@ struct brcmf_chip *brcmf_chip_attach(voi
- - void brcmf_chip_detach(struct brcmf_chip *chip);
- - struct brcmf_core *brcmf_chip_get_core(struct brcmf_chip *chip, u16 coreid);
- - struct brcmf_core *brcmf_chip_get_chipcommon(struct brcmf_chip *chip);
- -+struct brcmf_core *brcmf_chip_get_pmu(struct brcmf_chip *pub);
- - bool brcmf_chip_iscoreup(struct brcmf_core *core);
- - void brcmf_chip_coredisable(struct brcmf_core *core, u32 prereset, u32 reset);
- - void brcmf_chip_resetcore(struct brcmf_core *core, u32 prereset, u32 reset,
- ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
- -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
- -@@ -3615,7 +3615,6 @@ brcmf_sdio_drivestrengthinit(struct brcm
- - const struct sdiod_drive_str *str_tab = NULL;
- - u32 str_mask;
- - u32 str_shift;
- -- u32 base;
- - u32 i;
- - u32 drivestrength_sel = 0;
- - u32 cc_data_temp;
- -@@ -3658,14 +3657,15 @@ brcmf_sdio_drivestrengthinit(struct brcm
- - }
- -
- - if (str_tab != NULL) {
- -+ struct brcmf_core *pmu = brcmf_chip_get_pmu(ci);
- -+
- - for (i = 0; str_tab[i].strength != 0; i++) {
- - if (drivestrength >= str_tab[i].strength) {
- - drivestrength_sel = str_tab[i].sel;
- - break;
- - }
- - }
- -- base = brcmf_chip_get_chipcommon(ci)->base;
- -- addr = CORE_CC_REG(base, chipcontrol_addr);
- -+ addr = CORE_CC_REG(pmu->base, chipcontrol_addr);
- - brcmf_sdiod_regwl(sdiodev, addr, 1, NULL);
- - cc_data_temp = brcmf_sdiod_regrl(sdiodev, addr, NULL);
- - cc_data_temp &= ~str_mask;
- -@@ -3835,8 +3835,7 @@ brcmf_sdio_probe_attach(struct brcmf_sdi
- - goto fail;
- -
- - /* set PMUControl so a backplane reset does PMU state reload */
- -- reg_addr = CORE_CC_REG(brcmf_chip_get_chipcommon(bus->ci)->base,
- -- pmucontrol);
- -+ reg_addr = CORE_CC_REG(brcmf_chip_get_pmu(bus->ci)->base, pmucontrol);
- - reg_val = brcmf_sdiod_regrl(bus->sdiodev, reg_addr, &err);
- - if (err)
- - goto fail;
- diff --git a/package/kernel/mac80211/patches/323-0005-brcmfmac-add-support-for-14e4-4365-PCI-ID-with-BCM43.patch b/package/kernel/mac80211/patches/323-0005-brcmfmac-add-support-for-14e4-4365-PCI-ID-with-BCM43.patch
- deleted file mode 100644
- index 35887fc..0000000
- --- a/package/kernel/mac80211/patches/323-0005-brcmfmac-add-support-for-14e4-4365-PCI-ID-with-BCM43.patch
- +++ /dev/null
- @@ -1,38 +0,0 @@
- -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
- -Date: Tue, 26 Jan 2016 17:57:05 +0100
- -Subject: [PATCH] brcmfmac: add support for 14e4:4365 PCI ID with BCM4366
- - chipset
- -MIME-Version: 1.0
- -Content-Type: text/plain; charset=UTF-8
- -Content-Transfer-Encoding: 8bit
- -
- -On Broadcom ARM routers BCM4366 cards are available with 14e4:4365 ID.
- -Unfortunately this ID was already used by Broadcom for cards with
- -BCM43142, a totally different chipset requiring SoftMAC driver. To avoid
- -a conflict between brcmfmac and bcma use more specific ID entry with
- -subvendor and subdevice specified.
- -
- -Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
- -Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
- ----
- -
- ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
- -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
- -@@ -1951,6 +1951,9 @@ static const struct dev_pm_ops brcmf_pci
- -
- - #define BRCMF_PCIE_DEVICE(dev_id) { BRCM_PCIE_VENDOR_ID_BROADCOM, dev_id,\
- - PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_NETWORK_OTHER << 8, 0xffff00, 0 }
- -+#define BRCMF_PCIE_DEVICE_SUB(dev_id, subvend, subdev) { \
- -+ BRCM_PCIE_VENDOR_ID_BROADCOM, dev_id,\
- -+ subvend, subdev, PCI_CLASS_NETWORK_OTHER << 8, 0xffff00, 0 }
- -
- - static struct pci_device_id brcmf_pcie_devid_table[] = {
- - BRCMF_PCIE_DEVICE(BRCM_PCIE_4350_DEVICE_ID),
- -@@ -1966,6 +1969,7 @@ static struct pci_device_id brcmf_pcie_d
- - BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_DEVICE_ID),
- - BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_2G_DEVICE_ID),
- - BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_5G_DEVICE_ID),
- -+ BRCMF_PCIE_DEVICE_SUB(0x4365, BRCM_PCIE_VENDOR_ID_BROADCOM, 0x4365),
- - BRCMF_PCIE_DEVICE(BRCM_PCIE_4366_DEVICE_ID),
- - BRCMF_PCIE_DEVICE(BRCM_PCIE_4366_2G_DEVICE_ID),
- - BRCMF_PCIE_DEVICE(BRCM_PCIE_4366_5G_DEVICE_ID),
- diff --git a/package/kernel/mac80211/patches/323-ath9k-Fix-programming-of-minCCA-power-threshold.patch b/package/kernel/mac80211/patches/323-ath9k-Fix-programming-of-minCCA-power-threshold.patch
- new file mode 100644
- index 0000000..59ac29b
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/323-ath9k-Fix-programming-of-minCCA-power-threshold.patch
- @@ -0,0 +1,26 @@
- +From: Sven Eckelmann <sven@narfation.org>
- +Date: Fri, 17 Jun 2016 11:58:20 +0200
- +Subject: [PATCH] ath9k: Fix programming of minCCA power threshold
- +
- +The function ar9003_hw_apply_minccapwr_thresh takes as second parameter not
- +a pointer to the channel but a boolean value describing whether the channel
- +is 2.4GHz or not. This broke (according to the origin commit) the ETSI
- +regulatory compliance on 5GHz channels.
- +
- +Fixes: 3533bf6b15a0 ("ath9k: Fix regulatory compliance")
- +Signed-off-by: Sven Eckelmann <sven@narfation.org>
- +Cc: Simon Wunderlich <sw@simonwunderlich.de>
- +Cc: Sujith Manoharan <c_manoha@qca.qualcomm.com>
- +---
- +
- +--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
- ++++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
- +@@ -4175,7 +4175,7 @@ static void ath9k_hw_ar9300_set_board_va
- + if (!AR_SREV_9330(ah) && !AR_SREV_9340(ah) && !AR_SREV_9531(ah))
- + ar9003_hw_internal_regulator_apply(ah);
- + ar9003_hw_apply_tuning_caps(ah);
- +- ar9003_hw_apply_minccapwr_thresh(ah, chan);
- ++ ar9003_hw_apply_minccapwr_thresh(ah, is2ghz);
- + ar9003_hw_txend_to_xpa_off_apply(ah, is2ghz);
- + ar9003_hw_thermometer_apply(ah);
- + ar9003_hw_thermo_cal_apply(ah);
- diff --git a/package/kernel/mac80211/patches/324-ath9k_hw-fix-spectral-scan-on-AR9285-and-newer.patch b/package/kernel/mac80211/patches/324-ath9k_hw-fix-spectral-scan-on-AR9285-and-newer.patch
- new file mode 100644
- index 0000000..b6f4868
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/324-ath9k_hw-fix-spectral-scan-on-AR9285-and-newer.patch
- @@ -0,0 +1,86 @@
- +From: Felix Fietkau <nbd@nbd.name>
- +Date: Mon, 11 Jul 2016 10:34:37 +0200
- +Subject: [PATCH] ath9k_hw: fix spectral scan on AR9285 and newer
- +
- +The register layout of AR_PHY_SPECTRAL_SCAN has changed, only AR9280
- +uses the old layout
- +
- +Signed-off-by: Felix Fietkau <nbd@nbd.name>
- +---
- +
- +--- a/drivers/net/wireless/ath/ath9k/ar9002_phy.c
- ++++ b/drivers/net/wireless/ath/ath9k/ar9002_phy.c
- +@@ -476,6 +476,7 @@ static void ar9002_hw_set_bt_ant_diversi
- + static void ar9002_hw_spectral_scan_config(struct ath_hw *ah,
- + struct ath_spec_scan *param)
- + {
- ++ u32 repeat_bit;
- + u8 count;
- +
- + if (!param->enabled) {
- +@@ -486,12 +487,15 @@ static void ar9002_hw_spectral_scan_conf
- + REG_SET_BIT(ah, AR_PHY_RADAR_0, AR_PHY_RADAR_0_FFT_ENA);
- + REG_SET_BIT(ah, AR_PHY_SPECTRAL_SCAN, AR_PHY_SPECTRAL_SCAN_ENABLE);
- +
- ++ if (AR_SREV_9280(ah))
- ++ repeat_bit = AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT;
- ++ else
- ++ repeat_bit = AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT_KIWI;
- ++
- + if (param->short_repeat)
- +- REG_SET_BIT(ah, AR_PHY_SPECTRAL_SCAN,
- +- AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT);
- ++ REG_SET_BIT(ah, AR_PHY_SPECTRAL_SCAN, repeat_bit);
- + else
- +- REG_CLR_BIT(ah, AR_PHY_SPECTRAL_SCAN,
- +- AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT);
- ++ REG_CLR_BIT(ah, AR_PHY_SPECTRAL_SCAN, repeat_bit);
- +
- + /* on AR92xx, the highest bit of count will make the the chip send
- + * spectral samples endlessly. Check if this really was intended,
- +@@ -499,15 +503,25 @@ static void ar9002_hw_spectral_scan_conf
- + */
- + count = param->count;
- + if (param->endless) {
- +- if (AR_SREV_9271(ah))
- +- count = 0;
- +- else
- ++ if (AR_SREV_9280(ah))
- + count = 0x80;
- ++ else
- ++ count = 0;
- + } else if (count & 0x80)
- + count = 0x7f;
- ++ else if (!count)
- ++ count = 1;
- ++
- ++ if (AR_SREV_9280(ah)) {
- ++ REG_RMW_FIELD(ah, AR_PHY_SPECTRAL_SCAN,
- ++ AR_PHY_SPECTRAL_SCAN_COUNT, count);
- ++ } else {
- ++ REG_RMW_FIELD(ah, AR_PHY_SPECTRAL_SCAN,
- ++ AR_PHY_SPECTRAL_SCAN_COUNT_KIWI, count);
- ++ REG_SET_BIT(ah, AR_PHY_SPECTRAL_SCAN,
- ++ AR_PHY_SPECTRAL_SCAN_PHYERR_MASK_SELECT);
- ++ }
- +
- +- REG_RMW_FIELD(ah, AR_PHY_SPECTRAL_SCAN,
- +- AR_PHY_SPECTRAL_SCAN_COUNT, count);
- + REG_RMW_FIELD(ah, AR_PHY_SPECTRAL_SCAN,
- + AR_PHY_SPECTRAL_SCAN_PERIOD, param->period);
- + REG_RMW_FIELD(ah, AR_PHY_SPECTRAL_SCAN,
- +--- a/drivers/net/wireless/ath/ath9k/ar9002_phy.h
- ++++ b/drivers/net/wireless/ath/ath9k/ar9002_phy.h
- +@@ -177,8 +177,11 @@
- + #define AR_PHY_SPECTRAL_SCAN_PERIOD_S 8
- + #define AR_PHY_SPECTRAL_SCAN_COUNT 0x00FF0000 /* Number of reports, reg 68, bits 16-23*/
- + #define AR_PHY_SPECTRAL_SCAN_COUNT_S 16
- ++#define AR_PHY_SPECTRAL_SCAN_COUNT_KIWI 0x0FFF0000 /* Number of reports, reg 68, bits 16-27*/
- ++#define AR_PHY_SPECTRAL_SCAN_COUNT_KIWI_S 16
- + #define AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT 0x01000000 /* Short repeat, reg 68, bit 24*/
- +-#define AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT_S 24 /* Short repeat, reg 68, bit 24*/
- ++#define AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT_KIWI 0x10000000 /* Short repeat, reg 68, bit 28*/
- ++#define AR_PHY_SPECTRAL_SCAN_PHYERR_MASK_SELECT 0x40000000
- +
- + #define AR_PHY_RX_DELAY 0x9914
- + #define AR_PHY_SEARCH_START_DELAY 0x9918
- diff --git a/package/kernel/mac80211/patches/324-brcmfmac-treat-NULL-character-in-NVRAM-as-separator.patch b/package/kernel/mac80211/patches/324-brcmfmac-treat-NULL-character-in-NVRAM-as-separator.patch
- deleted file mode 100644
- index 6ce60f1..0000000
- --- a/package/kernel/mac80211/patches/324-brcmfmac-treat-NULL-character-in-NVRAM-as-separator.patch
- +++ /dev/null
- @@ -1,32 +0,0 @@
- -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
- -Date: Sun, 31 Jan 2016 12:14:34 +0100
- -Subject: [PATCH] brcmfmac: treat NULL character in NVRAM as separator
- -MIME-Version: 1.0
- -Content-Type: text/plain; charset=UTF-8
- -Content-Transfer-Encoding: 8bit
- -
- -Platform NVRAM (stored on a flash partition) has entries separated by a
- -NULL (\0) char. Our parsing code switches from VALUE state to IDLE
- -whenever it meets a NULL (\0). When that happens our IDLE handler should
- -simply consume it and analyze whatever is placed ahead.
- -
- -This fixes harmless warnings spamming debugging output:
- -[ 155.165624] brcmfmac: brcmf_nvram_handle_idle warning: ln=1:col=20: ignoring invalid character
- -[ 155.180806] brcmfmac: brcmf_nvram_handle_idle warning: ln=1:col=44: ignoring invalid character
- -[ 155.195971] brcmfmac: brcmf_nvram_handle_idle warning: ln=1:col=63: ignoring invalid character
- -
- -Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
- -Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
- ----
- -
- ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
- -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
- -@@ -93,7 +93,7 @@ static enum nvram_parser_state brcmf_nvr
- - c = nvp->data[nvp->pos];
- - if (c == '\n')
- - return COMMENT;
- -- if (is_whitespace(c))
- -+ if (is_whitespace(c) || c == '\0')
- - goto proceed;
- - if (c == '#')
- - return COMMENT;
- diff --git a/package/kernel/mac80211/patches/325-ath9k_hw-fix-duplicate-and-partially-wrong-definitio.patch b/package/kernel/mac80211/patches/325-ath9k_hw-fix-duplicate-and-partially-wrong-definitio.patch
- new file mode 100644
- index 0000000..6685f33
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/325-ath9k_hw-fix-duplicate-and-partially-wrong-definitio.patch
- @@ -0,0 +1,57 @@
- +From: Felix Fietkau <nbd@nbd.name>
- +Date: Mon, 11 Jul 2016 11:31:39 +0200
- +Subject: [PATCH] ath9k_hw: fix duplicate (and partially wrong) definition
- + of AR_CH0_THERM
- +
- +AR_PHY_65NM_CH0_THERM and AR_CH0_THERM were supposed to refer to the
- +same register, however they had different SREV checks.
- +
- +Remove the duplicate and use the checks. Since there were other SREV
- +checks present in the only place that uses this, this will probaby not
- +affect runtime behavior.
- +
- +Signed-off-by: Felix Fietkau <nbd@nbd.name>
- +---
- +
- +--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
- ++++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
- +@@ -689,13 +689,6 @@
- + #define AR_CH0_TOP_XPABIASLVL (AR_SREV_9550(ah) ? 0x3c0 : 0x300)
- + #define AR_CH0_TOP_XPABIASLVL_S (AR_SREV_9550(ah) ? 6 : 8)
- +
- +-#define AR_CH0_THERM (AR_SREV_9300(ah) ? 0x16290 : \
- +- ((AR_SREV_9485(ah) ? 0x1628c : 0x16294)))
- +-#define AR_CH0_THERM_XPABIASLVL_MSB 0x3
- +-#define AR_CH0_THERM_XPABIASLVL_MSB_S 0
- +-#define AR_CH0_THERM_XPASHORT2GND 0x4
- +-#define AR_CH0_THERM_XPASHORT2GND_S 2
- +-
- + #define AR_SWITCH_TABLE_COM_ALL (0xffff)
- + #define AR_SWITCH_TABLE_COM_ALL_S (0)
- + #define AR_SWITCH_TABLE_COM_AR9462_ALL (0xffffff)
- +@@ -712,15 +705,17 @@
- + #define AR_SWITCH_TABLE_ALL (0xfff)
- + #define AR_SWITCH_TABLE_ALL_S (0)
- +
- +-#define AR_PHY_65NM_CH0_THERM (AR_SREV_9300(ah) ? 0x16290 :\
- +- ((AR_SREV_9462(ah) || AR_SREV_9565(ah)) ? 0x16294 : 0x1628c))
- ++#define AR_CH0_THERM (AR_SREV_9300(ah) ? 0x16290 :\
- ++ ((AR_SREV_9462(ah) || AR_SREV_9565(ah)) ? 0x16294 : 0x1628c))
- ++#define AR_CH0_THERM_XPABIASLVL_MSB 0x3
- ++#define AR_CH0_THERM_XPABIASLVL_MSB_S 0
- ++#define AR_CH0_THERM_XPASHORT2GND 0x4
- ++#define AR_CH0_THERM_XPASHORT2GND_S 2
- +
- +-#define AR_PHY_65NM_CH0_THERM_LOCAL 0x80000000
- +-#define AR_PHY_65NM_CH0_THERM_LOCAL_S 31
- +-#define AR_PHY_65NM_CH0_THERM_START 0x20000000
- +-#define AR_PHY_65NM_CH0_THERM_START_S 29
- +-#define AR_PHY_65NM_CH0_THERM_SAR_ADC_OUT 0x0000ff00
- +-#define AR_PHY_65NM_CH0_THERM_SAR_ADC_OUT_S 8
- ++#define AR_CH0_THERM_LOCAL 0x80000000
- ++#define AR_CH0_THERM_START 0x20000000
- ++#define AR_CH0_THERM_SAR_ADC_OUT 0x0000ff00
- ++#define AR_CH0_THERM_SAR_ADC_OUT_S 8
- +
- + #define AR_CH0_TOP2 (AR_SREV_9300(ah) ? 0x1628c : \
- + (AR_SREV_9462(ah) ? 0x16290 : 0x16284))
- diff --git a/package/kernel/mac80211/patches/325-brcmfmac-sdio-Increase-the-default-timeouts-a-bit.patch b/package/kernel/mac80211/patches/325-brcmfmac-sdio-Increase-the-default-timeouts-a-bit.patch
- deleted file mode 100644
- index 012dea1..0000000
- --- a/package/kernel/mac80211/patches/325-brcmfmac-sdio-Increase-the-default-timeouts-a-bit.patch
- +++ /dev/null
- @@ -1,41 +0,0 @@
- -From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
- -Date: Mon, 25 Jan 2016 11:47:29 +0100
- -Subject: [PATCH] brcmfmac: sdio: Increase the default timeouts a bit
- -
- -On a Radxa Rock2 board with a Ampak AP6335 (Broadcom 4339 core) it seems
- -the card responds very quickly most of the time, unfortunately during
- -initialisation it sometimes seems to take just a bit over 2 seconds to
- -respond.
- -
- -This results intialization failing with message like:
- - brcmf_c_preinit_dcmds: Retreiving cur_etheraddr failed, -52
- - brcmf_bus_start: failed: -52
- - brcmf_sdio_firmware_callback: dongle is not responding
- -
- -Increasing the timeout to allow for a bit more headroom allows the
- -card to initialize reliably.
- -
- -A quick search online after diagnosing/fixing this showed that Google
- -has a similar patch in their ChromeOS tree, so this doesn't seem
- -specific to the board I'm using.
- -
- -Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
- -Reviewed-by: Julian Calaby <julian.calaby@gmail.com>
- -Acked-by: Arend van Spriel <arend@broadcom.com>
- -Reviewed-by: Douglas Anderson <dianders@chromium.org>
- -Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
- ----
- -
- ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
- -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
- -@@ -45,8 +45,8 @@
- - #include "chip.h"
- - #include "firmware.h"
- -
- --#define DCMD_RESP_TIMEOUT msecs_to_jiffies(2000)
- --#define CTL_DONE_TIMEOUT msecs_to_jiffies(2000)
- -+#define DCMD_RESP_TIMEOUT msecs_to_jiffies(2500)
- -+#define CTL_DONE_TIMEOUT msecs_to_jiffies(2500)
- -
- - #ifdef DEBUG
- -
- diff --git a/package/kernel/mac80211/patches/326-ath9k-make-NF-load-complete-quickly-and-reliably.patch b/package/kernel/mac80211/patches/326-ath9k-make-NF-load-complete-quickly-and-reliably.patch
- deleted file mode 100644
- index 71f7a40..0000000
- --- a/package/kernel/mac80211/patches/326-ath9k-make-NF-load-complete-quickly-and-reliably.patch
- +++ /dev/null
- @@ -1,87 +0,0 @@
- -From: Miaoqing Pan <miaoqing@codeaurora.org>
- -Date: Fri, 5 Feb 2016 09:45:50 +0800
- -Subject: [PATCH] ath9k: make NF load complete quickly and reliably
- -
- -Make NF load complete quickly and reliably. NF load execution
- -is delayed by HW to end of frame if frame Rx or Tx is ongoing.
- -Increasing timeout to max frame duration. If NF cal is ongoing
- -before NF load, stop it before load, and restart it afterwards.
- -
- -Signed-off-by: Miaoqing Pan <miaoqing@codeaurora.org>
- ----
- -
- ---- a/drivers/net/wireless/ath/ath9k/calib.c
- -+++ b/drivers/net/wireless/ath/ath9k/calib.c
- -@@ -241,6 +241,7 @@ int ath9k_hw_loadnf(struct ath_hw *ah, s
- - u8 chainmask = (ah->rxchainmask << 3) | ah->rxchainmask;
- - struct ath_common *common = ath9k_hw_common(ah);
- - s16 default_nf = ath9k_hw_get_default_nf(ah, chan);
- -+ u32 bb_agc_ctl = REG_READ(ah, AR_PHY_AGC_CONTROL);
- -
- - if (ah->caldata)
- - h = ah->caldata->nfCalHist;
- -@@ -264,6 +265,16 @@ int ath9k_hw_loadnf(struct ath_hw *ah, s
- - }
- -
- - /*
- -+ * stop NF cal if ongoing to ensure NF load completes immediately
- -+ * (or after end rx/tx frame if ongoing)
- -+ */
- -+ if (bb_agc_ctl & AR_PHY_AGC_CONTROL_NF) {
- -+ REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_NF);
- -+ REG_RMW_BUFFER_FLUSH(ah);
- -+ ENABLE_REG_RMW_BUFFER(ah);
- -+ }
- -+
- -+ /*
- - * Load software filtered NF value into baseband internal minCCApwr
- - * variable.
- - */
- -@@ -276,18 +287,33 @@ int ath9k_hw_loadnf(struct ath_hw *ah, s
- -
- - /*
- - * Wait for load to complete, should be fast, a few 10s of us.
- -- * The max delay was changed from an original 250us to 10000us
- -- * since 250us often results in NF load timeout and causes deaf
- -- * condition during stress testing 12/12/2009
- -+ * The max delay was changed from an original 250us to 22.2 msec.
- -+ * This would increase timeout to the longest possible frame
- -+ * (11n max length 22.1 msec)
- - */
- -- for (j = 0; j < 10000; j++) {
- -+ for (j = 0; j < 22200; j++) {
- - if ((REG_READ(ah, AR_PHY_AGC_CONTROL) &
- -- AR_PHY_AGC_CONTROL_NF) == 0)
- -+ AR_PHY_AGC_CONTROL_NF) == 0)
- - break;
- - udelay(10);
- - }
- -
- - /*
- -+ * Restart NF so it can continue.
- -+ */
- -+ if (bb_agc_ctl & AR_PHY_AGC_CONTROL_NF) {
- -+ ENABLE_REG_RMW_BUFFER(ah);
- -+ if (bb_agc_ctl & AR_PHY_AGC_CONTROL_ENABLE_NF)
- -+ REG_SET_BIT(ah, AR_PHY_AGC_CONTROL,
- -+ AR_PHY_AGC_CONTROL_ENABLE_NF);
- -+ if (bb_agc_ctl & AR_PHY_AGC_CONTROL_NO_UPDATE_NF)
- -+ REG_SET_BIT(ah, AR_PHY_AGC_CONTROL,
- -+ AR_PHY_AGC_CONTROL_NO_UPDATE_NF);
- -+ REG_SET_BIT(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_NF);
- -+ REG_RMW_BUFFER_FLUSH(ah);
- -+ }
- -+
- -+ /*
- - * We timed out waiting for the noisefloor to load, probably due to an
- - * in-progress rx. Simply return here and allow the load plenty of time
- - * to complete before the next calibration interval. We need to avoid
- -@@ -296,7 +322,7 @@ int ath9k_hw_loadnf(struct ath_hw *ah, s
- - * here, the baseband nf cal will just be capped by our present
- - * noisefloor until the next calibration timer.
- - */
- -- if (j == 10000) {
- -+ if (j == 22200) {
- - ath_dbg(common, ANY,
- - "Timeout while waiting for nf to load: AR_PHY_AGC_CONTROL=0x%x\n",
- - REG_READ(ah, AR_PHY_AGC_CONTROL));
- diff --git a/package/kernel/mac80211/patches/326-ath9k_hw-simplify-ar9003_hw_per_calibration.patch b/package/kernel/mac80211/patches/326-ath9k_hw-simplify-ar9003_hw_per_calibration.patch
- new file mode 100644
- index 0000000..999d993
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/326-ath9k_hw-simplify-ar9003_hw_per_calibration.patch
- @@ -0,0 +1,88 @@
- +From: Felix Fietkau <nbd@nbd.name>
- +Date: Mon, 11 Jul 2016 11:34:47 +0200
- +Subject: [PATCH] ath9k_hw: simplify ar9003_hw_per_calibration
- +
- +Reduce indentation, use a variable to save a few pointer dereferences
- +
- +Signed-off-by: Felix Fietkau <nbd@nbd.name>
- +---
- +
- +--- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
- ++++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
- +@@ -75,50 +75,49 @@ static bool ar9003_hw_per_calibration(st
- + struct ath9k_cal_list *currCal)
- + {
- + struct ath9k_hw_cal_data *caldata = ah->caldata;
- +- /* Cal is assumed not done until explicitly set below */
- +- bool iscaldone = false;
- ++ const struct ath9k_percal_data *cur_caldata = currCal->calData;
- +
- + /* Calibration in progress. */
- + if (currCal->calState == CAL_RUNNING) {
- + /* Check to see if it has finished. */
- +- if (!(REG_READ(ah, AR_PHY_TIMING4) & AR_PHY_TIMING4_DO_CAL)) {
- +- /*
- +- * Accumulate cal measures for active chains
- +- */
- +- currCal->calData->calCollect(ah);
- +- ah->cal_samples++;
- ++ if (REG_READ(ah, AR_PHY_TIMING4) & AR_PHY_TIMING4_DO_CAL)
- ++ return false;
- +
- +- if (ah->cal_samples >=
- +- currCal->calData->calNumSamples) {
- +- unsigned int i, numChains = 0;
- +- for (i = 0; i < AR9300_MAX_CHAINS; i++) {
- +- if (rxchainmask & (1 << i))
- +- numChains++;
- +- }
- ++ /*
- ++ * Accumulate cal measures for active chains
- ++ */
- ++ cur_caldata->calCollect(ah);
- ++ ah->cal_samples++;
- +
- +- /*
- +- * Process accumulated data
- +- */
- +- currCal->calData->calPostProc(ah, numChains);
- ++ if (ah->cal_samples >= cur_caldata->calNumSamples) {
- ++ unsigned int i, numChains = 0;
- ++ for (i = 0; i < AR9300_MAX_CHAINS; i++) {
- ++ if (rxchainmask & (1 << i))
- ++ numChains++;
- ++ }
- +
- +- /* Calibration has finished. */
- +- caldata->CalValid |= currCal->calData->calType;
- +- currCal->calState = CAL_DONE;
- +- iscaldone = true;
- +- } else {
- ++ /*
- ++ * Process accumulated data
- ++ */
- ++ cur_caldata->calPostProc(ah, numChains);
- ++
- ++ /* Calibration has finished. */
- ++ caldata->CalValid |= cur_caldata->calType;
- ++ currCal->calState = CAL_DONE;
- ++ return true;
- ++ } else {
- + /*
- + * Set-up collection of another sub-sample until we
- + * get desired number
- + */
- + ar9003_hw_setup_calibration(ah, currCal);
- +- }
- + }
- +- } else if (!(caldata->CalValid & currCal->calData->calType)) {
- ++ } else if (!(caldata->CalValid & cur_caldata->calType)) {
- + /* If current cal is marked invalid in channel, kick it off */
- + ath9k_hw_reset_calibration(ah, currCal);
- + }
- +
- +- return iscaldone;
- ++ return false;
- + }
- +
- + static int ar9003_hw_calibrate(struct ath_hw *ah, struct ath9k_channel *chan,
- diff --git a/package/kernel/mac80211/patches/327-ath9k_hw-get-rid-of-some-duplicate-code-in-calibrati.patch b/package/kernel/mac80211/patches/327-ath9k_hw-get-rid-of-some-duplicate-code-in-calibrati.patch
- new file mode 100644
- index 0000000..b7f3823
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/327-ath9k_hw-get-rid-of-some-duplicate-code-in-calibrati.patch
- @@ -0,0 +1,94 @@
- +From: Felix Fietkau <nbd@nbd.name>
- +Date: Mon, 11 Jul 2016 11:35:20 +0200
- +Subject: [PATCH] ath9k_hw: get rid of some duplicate code in calibration
- + init
- +
- +Remove a misleading debug message as well
- +
- +Signed-off-by: Felix Fietkau <nbd@nbd.name>
- +---
- +
- +--- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
- ++++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
- +@@ -1373,6 +1373,26 @@ static void ar9003_hw_cl_cal_post_proc(s
- + }
- + }
- +
- ++static void ar9003_hw_init_cal_common(struct ath_hw *ah)
- ++{
- ++ struct ath9k_hw_cal_data *caldata = ah->caldata;
- ++
- ++ /* Initialize list pointers */
- ++ ah->cal_list = ah->cal_list_last = ah->cal_list_curr = NULL;
- ++
- ++ INIT_CAL(&ah->iq_caldata);
- ++ INSERT_CAL(ah, &ah->iq_caldata);
- ++
- ++ /* Initialize current pointer to first element in list */
- ++ ah->cal_list_curr = ah->cal_list;
- ++
- ++ if (ah->cal_list_curr)
- ++ ath9k_hw_reset_calibration(ah, ah->cal_list_curr);
- ++
- ++ if (caldata)
- ++ caldata->CalValid = 0;
- ++}
- ++
- + static bool ar9003_hw_init_cal_pcoem(struct ath_hw *ah,
- + struct ath9k_channel *chan)
- + {
- +@@ -1532,21 +1552,7 @@ skip_tx_iqcal:
- + /* Revert chainmask to runtime parameters */
- + ar9003_hw_set_chain_masks(ah, ah->rxchainmask, ah->txchainmask);
- +
- +- /* Initialize list pointers */
- +- ah->cal_list = ah->cal_list_last = ah->cal_list_curr = NULL;
- +-
- +- INIT_CAL(&ah->iq_caldata);
- +- INSERT_CAL(ah, &ah->iq_caldata);
- +- ath_dbg(common, CALIBRATE, "enabling IQ Calibration\n");
- +-
- +- /* Initialize current pointer to first element in list */
- +- ah->cal_list_curr = ah->cal_list;
- +-
- +- if (ah->cal_list_curr)
- +- ath9k_hw_reset_calibration(ah, ah->cal_list_curr);
- +-
- +- if (caldata)
- +- caldata->CalValid = 0;
- ++ ar9003_hw_init_cal_common(ah);
- +
- + return true;
- + }
- +@@ -1577,8 +1583,6 @@ static bool do_ar9003_agc_cal(struct ath
- + static bool ar9003_hw_init_cal_soc(struct ath_hw *ah,
- + struct ath9k_channel *chan)
- + {
- +- struct ath_common *common = ath9k_hw_common(ah);
- +- struct ath9k_hw_cal_data *caldata = ah->caldata;
- + bool txiqcal_done = false;
- + bool status = true;
- + bool run_agc_cal = false, sep_iq_cal = false;
- +@@ -1676,21 +1680,7 @@ skip_tx_iqcal:
- + /* Revert chainmask to runtime parameters */
- + ar9003_hw_set_chain_masks(ah, ah->rxchainmask, ah->txchainmask);
- +
- +- /* Initialize list pointers */
- +- ah->cal_list = ah->cal_list_last = ah->cal_list_curr = NULL;
- +-
- +- INIT_CAL(&ah->iq_caldata);
- +- INSERT_CAL(ah, &ah->iq_caldata);
- +- ath_dbg(common, CALIBRATE, "enabling IQ Calibration\n");
- +-
- +- /* Initialize current pointer to first element in list */
- +- ah->cal_list_curr = ah->cal_list;
- +-
- +- if (ah->cal_list_curr)
- +- ath9k_hw_reset_calibration(ah, ah->cal_list_curr);
- +-
- +- if (caldata)
- +- caldata->CalValid = 0;
- ++ ar9003_hw_init_cal_common(ah);
- +
- + return true;
- + }
- diff --git a/package/kernel/mac80211/patches/327-mac80211-Remove-MPP-table-entries-with-MPath.patch b/package/kernel/mac80211/patches/327-mac80211-Remove-MPP-table-entries-with-MPath.patch
- deleted file mode 100644
- index f7f9df9..0000000
- --- a/package/kernel/mac80211/patches/327-mac80211-Remove-MPP-table-entries-with-MPath.patch
- +++ /dev/null
- @@ -1,54 +0,0 @@
- -From: Henning Rogge <hrogge@gmail.com>
- -Date: Wed, 3 Feb 2016 13:58:36 +0100
- -Subject: [PATCH] mac80211: Remove MPP table entries with MPath
- -
- -Make the mesh_path_del() function remove all mpp table entries
- -that are proxied by the removed mesh path.
- -
- -Acked-by: Bob Copeland <me@bobcopeland.com>
- -Signed-off-by: Henning Rogge <henning.rogge@fkie.fraunhofer.de>
- -Signed-off-by: Johannes Berg <johannes.berg@intel.com>
- ----
- -
- ---- a/net/mac80211/mesh_pathtbl.c
- -+++ b/net/mac80211/mesh_pathtbl.c
- -@@ -835,6 +835,29 @@ void mesh_path_flush_by_nexthop(struct s
- - rcu_read_unlock();
- - }
- -
- -+static void mpp_flush_by_proxy(struct ieee80211_sub_if_data *sdata,
- -+ const u8 *proxy)
- -+{
- -+ struct mesh_table *tbl;
- -+ struct mesh_path *mpp;
- -+ struct mpath_node *node;
- -+ int i;
- -+
- -+ rcu_read_lock();
- -+ read_lock_bh(&pathtbl_resize_lock);
- -+ tbl = resize_dereference_mpp_paths();
- -+ for_each_mesh_entry(tbl, node, i) {
- -+ mpp = node->mpath;
- -+ if (ether_addr_equal(mpp->mpp, proxy)) {
- -+ spin_lock(&tbl->hashwlock[i]);
- -+ __mesh_path_del(tbl, node);
- -+ spin_unlock(&tbl->hashwlock[i]);
- -+ }
- -+ }
- -+ read_unlock_bh(&pathtbl_resize_lock);
- -+ rcu_read_unlock();
- -+}
- -+
- - static void table_flush_by_iface(struct mesh_table *tbl,
- - struct ieee80211_sub_if_data *sdata)
- - {
- -@@ -892,6 +915,9 @@ int mesh_path_del(struct ieee80211_sub_i
- - int hash_idx;
- - int err = 0;
- -
- -+ /* flush relevant mpp entries first */
- -+ mpp_flush_by_proxy(sdata, addr);
- -+
- - read_lock_bh(&pathtbl_resize_lock);
- - tbl = resize_dereference_mesh_paths();
- - hash_idx = mesh_table_hash(addr, sdata, tbl);
- diff --git a/package/kernel/mac80211/patches/328-ath9k_hw-implement-temperature-compensation-support-.patch b/package/kernel/mac80211/patches/328-ath9k_hw-implement-temperature-compensation-support-.patch
- new file mode 100644
- index 0000000..cff32ad
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/328-ath9k_hw-implement-temperature-compensation-support-.patch
- @@ -0,0 +1,97 @@
- +From: Felix Fietkau <nbd@nbd.name>
- +Date: Mon, 11 Jul 2016 11:35:55 +0200
- +Subject: [PATCH] ath9k_hw: implement temperature compensation support for
- + AR9003+
- +
- +Signed-off-by: Felix Fietkau <nbd@nbd.name>
- +---
- +
- +--- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
- ++++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
- +@@ -33,6 +33,7 @@ struct coeff {
- +
- + enum ar9003_cal_types {
- + IQ_MISMATCH_CAL = BIT(0),
- ++ TEMP_COMP_CAL = BIT(1),
- + };
- +
- + static void ar9003_hw_setup_calibration(struct ath_hw *ah,
- +@@ -58,6 +59,12 @@ static void ar9003_hw_setup_calibration(
- + /* Kick-off cal */
- + REG_SET_BIT(ah, AR_PHY_TIMING4, AR_PHY_TIMING4_DO_CAL);
- + break;
- ++ case TEMP_COMP_CAL:
- ++ ath_dbg(common, CALIBRATE,
- ++ "starting Temperature Compensation Calibration\n");
- ++ REG_SET_BIT(ah, AR_CH0_THERM, AR_CH0_THERM_LOCAL);
- ++ REG_SET_BIT(ah, AR_CH0_THERM, AR_CH0_THERM_START);
- ++ break;
- + default:
- + ath_err(common, "Invalid calibration type\n");
- + break;
- +@@ -86,7 +93,8 @@ static bool ar9003_hw_per_calibration(st
- + /*
- + * Accumulate cal measures for active chains
- + */
- +- cur_caldata->calCollect(ah);
- ++ if (cur_caldata->calCollect)
- ++ cur_caldata->calCollect(ah);
- + ah->cal_samples++;
- +
- + if (ah->cal_samples >= cur_caldata->calNumSamples) {
- +@@ -99,7 +107,8 @@ static bool ar9003_hw_per_calibration(st
- + /*
- + * Process accumulated data
- + */
- +- cur_caldata->calPostProc(ah, numChains);
- ++ if (cur_caldata->calPostProc)
- ++ cur_caldata->calPostProc(ah, numChains);
- +
- + /* Calibration has finished. */
- + caldata->CalValid |= cur_caldata->calType;
- +@@ -314,9 +323,16 @@ static const struct ath9k_percal_data iq
- + ar9003_hw_iqcalibrate
- + };
- +
- ++static const struct ath9k_percal_data temp_cal_single_sample = {
- ++ TEMP_COMP_CAL,
- ++ MIN_CAL_SAMPLES,
- ++ PER_MAX_LOG_COUNT,
- ++};
- ++
- + static void ar9003_hw_init_cal_settings(struct ath_hw *ah)
- + {
- + ah->iq_caldata.calData = &iq_cal_single_sample;
- ++ ah->temp_caldata.calData = &temp_cal_single_sample;
- +
- + if (AR_SREV_9300_20_OR_LATER(ah)) {
- + ah->enabled_cals |= TX_IQ_CAL;
- +@@ -324,7 +340,7 @@ static void ar9003_hw_init_cal_settings(
- + ah->enabled_cals |= TX_IQ_ON_AGC_CAL;
- + }
- +
- +- ah->supp_cals = IQ_MISMATCH_CAL;
- ++ ah->supp_cals = IQ_MISMATCH_CAL | TEMP_COMP_CAL;
- + }
- +
- + #define OFF_UPPER_LT 24
- +@@ -1383,6 +1399,9 @@ static void ar9003_hw_init_cal_common(st
- + INIT_CAL(&ah->iq_caldata);
- + INSERT_CAL(ah, &ah->iq_caldata);
- +
- ++ INIT_CAL(&ah->temp_caldata);
- ++ INSERT_CAL(ah, &ah->temp_caldata);
- ++
- + /* Initialize current pointer to first element in list */
- + ah->cal_list_curr = ah->cal_list;
- +
- +--- a/drivers/net/wireless/ath/ath9k/hw.h
- ++++ b/drivers/net/wireless/ath/ath9k/hw.h
- +@@ -830,6 +830,7 @@ struct ath_hw {
- + /* Calibration */
- + u32 supp_cals;
- + struct ath9k_cal_list iq_caldata;
- ++ struct ath9k_cal_list temp_caldata;
- + struct ath9k_cal_list adcgain_caldata;
- + struct ath9k_cal_list adcdc_caldata;
- + struct ath9k_cal_list *cal_list;
- diff --git a/package/kernel/mac80211/patches/328-mac80211-let-unused-MPP-table-entries-timeout.patch b/package/kernel/mac80211/patches/328-mac80211-let-unused-MPP-table-entries-timeout.patch
- deleted file mode 100644
- index 740993c..0000000
- --- a/package/kernel/mac80211/patches/328-mac80211-let-unused-MPP-table-entries-timeout.patch
- +++ /dev/null
- @@ -1,104 +0,0 @@
- -From: Henning Rogge <hrogge@gmail.com>
- -Date: Wed, 3 Feb 2016 13:58:37 +0100
- -Subject: [PATCH] mac80211: let unused MPP table entries timeout
- -
- -Remember the last time when a mpp table entry is used for
- -rx or tx and remove them after MESH_PATH_EXPIRE time.
- -
- -Acked-by: Bob Copeland <me@bobcopeland.com>
- -Signed-off-by: Henning Rogge <henning.rogge@fkie.fraunhofer.de>
- -Signed-off-by: Johannes Berg <johannes.berg@intel.com>
- ----
- -
- ---- a/net/mac80211/mesh_pathtbl.c
- -+++ b/net/mac80211/mesh_pathtbl.c
- -@@ -942,6 +942,46 @@ enddel:
- - }
- -
- - /**
- -+ * mpp_path_del - delete a mesh proxy path from the table
- -+ *
- -+ * @addr: addr address (ETH_ALEN length)
- -+ * @sdata: local subif
- -+ *
- -+ * Returns: 0 if successful
- -+ */
- -+static int mpp_path_del(struct ieee80211_sub_if_data *sdata, const u8 *addr)
- -+{
- -+ struct mesh_table *tbl;
- -+ struct mesh_path *mpath;
- -+ struct mpath_node *node;
- -+ struct hlist_head *bucket;
- -+ int hash_idx;
- -+ int err = 0;
- -+
- -+ read_lock_bh(&pathtbl_resize_lock);
- -+ tbl = resize_dereference_mpp_paths();
- -+ hash_idx = mesh_table_hash(addr, sdata, tbl);
- -+ bucket = &tbl->hash_buckets[hash_idx];
- -+
- -+ spin_lock(&tbl->hashwlock[hash_idx]);
- -+ hlist_for_each_entry(node, bucket, list) {
- -+ mpath = node->mpath;
- -+ if (mpath->sdata == sdata &&
- -+ ether_addr_equal(addr, mpath->dst)) {
- -+ __mesh_path_del(tbl, node);
- -+ goto enddel;
- -+ }
- -+ }
- -+
- -+ err = -ENXIO;
- -+enddel:
- -+ mesh_paths_generation++;
- -+ spin_unlock(&tbl->hashwlock[hash_idx]);
- -+ read_unlock_bh(&pathtbl_resize_lock);
- -+ return err;
- -+}
- -+
- -+/**
- - * mesh_path_tx_pending - sends pending frames in a mesh path queue
- - *
- - * @mpath: mesh path to activate
- -@@ -1157,6 +1197,17 @@ void mesh_path_expire(struct ieee80211_s
- - time_after(jiffies, mpath->exp_time + MESH_PATH_EXPIRE))
- - mesh_path_del(mpath->sdata, mpath->dst);
- - }
- -+
- -+ tbl = rcu_dereference(mpp_paths);
- -+ for_each_mesh_entry(tbl, node, i) {
- -+ if (node->mpath->sdata != sdata)
- -+ continue;
- -+ mpath = node->mpath;
- -+ if ((!(mpath->flags & MESH_PATH_FIXED)) &&
- -+ time_after(jiffies, mpath->exp_time + MESH_PATH_EXPIRE))
- -+ mpp_path_del(mpath->sdata, mpath->dst);
- -+ }
- -+
- - rcu_read_unlock();
- - }
- -
- ---- a/net/mac80211/rx.c
- -+++ b/net/mac80211/rx.c
- -@@ -2291,6 +2291,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80
- - spin_lock_bh(&mppath->state_lock);
- - if (!ether_addr_equal(mppath->mpp, mpp_addr))
- - memcpy(mppath->mpp, mpp_addr, ETH_ALEN);
- -+ mppath->exp_time = jiffies;
- - spin_unlock_bh(&mppath->state_lock);
- - }
- - rcu_read_unlock();
- ---- a/net/mac80211/tx.c
- -+++ b/net/mac80211/tx.c
- -@@ -2171,8 +2171,11 @@ static struct sk_buff *ieee80211_build_h
- - mpp_lookup = true;
- - }
- -
- -- if (mpp_lookup)
- -+ if (mpp_lookup) {
- - mppath = mpp_path_lookup(sdata, skb->data);
- -+ if (mppath)
- -+ mppath->exp_time = jiffies;
- -+ }
- -
- - if (mppath && mpath)
- - mesh_path_del(mpath->sdata, mpath->dst);
- diff --git a/package/kernel/mac80211/patches/329-mac80211-Unify-mesh-and-mpp-path-removal-function.patch b/package/kernel/mac80211/patches/329-mac80211-Unify-mesh-and-mpp-path-removal-function.patch
- deleted file mode 100644
- index 0c36b1d..0000000
- --- a/package/kernel/mac80211/patches/329-mac80211-Unify-mesh-and-mpp-path-removal-function.patch
- +++ /dev/null
- @@ -1,143 +0,0 @@
- -From: Henning Rogge <hrogge@gmail.com>
- -Date: Wed, 3 Feb 2016 13:58:38 +0100
- -Subject: [PATCH] mac80211: Unify mesh and mpp path removal function
- -
- -mpp_path_del() and mesh_path_del() are mostly the same function.
- -Move common code into a new static function.
- -
- -Acked-by: Bob Copeland <me@bobcopeland.com>
- -Signed-off-by: Henning Rogge <henning.rogge@fkie.fraunhofer.de>
- -Signed-off-by: Johannes Berg <johannes.berg@intel.com>
- ----
- -
- ---- a/net/mac80211/mesh_pathtbl.c
- -+++ b/net/mac80211/mesh_pathtbl.c
- -@@ -55,16 +55,21 @@ int mpp_paths_generation;
- - static DEFINE_RWLOCK(pathtbl_resize_lock);
- -
- -
- -+static inline struct mesh_table *resize_dereference_paths(
- -+ struct mesh_table __rcu *table)
- -+{
- -+ return rcu_dereference_protected(table,
- -+ lockdep_is_held(&pathtbl_resize_lock));
- -+}
- -+
- - static inline struct mesh_table *resize_dereference_mesh_paths(void)
- - {
- -- return rcu_dereference_protected(mesh_paths,
- -- lockdep_is_held(&pathtbl_resize_lock));
- -+ return resize_dereference_paths(mesh_paths);
- - }
- -
- - static inline struct mesh_table *resize_dereference_mpp_paths(void)
- - {
- -- return rcu_dereference_protected(mpp_paths,
- -- lockdep_is_held(&pathtbl_resize_lock));
- -+ return resize_dereference_paths(mpp_paths);
- - }
- -
- - /*
- -@@ -899,14 +904,17 @@ void mesh_path_flush_by_iface(struct iee
- - }
- -
- - /**
- -- * mesh_path_del - delete a mesh path from the table
- -+ * table_path_del - delete a path from the mesh or mpp table
- - *
- -- * @addr: dst address (ETH_ALEN length)
- -+ * @tbl: mesh or mpp path table
- - * @sdata: local subif
- -+ * @addr: dst address (ETH_ALEN length)
- - *
- - * Returns: 0 if successful
- - */
- --int mesh_path_del(struct ieee80211_sub_if_data *sdata, const u8 *addr)
- -+static int table_path_del(struct mesh_table __rcu *rcu_tbl,
- -+ struct ieee80211_sub_if_data *sdata,
- -+ const u8 *addr)
- - {
- - struct mesh_table *tbl;
- - struct mesh_path *mpath;
- -@@ -915,11 +923,7 @@ int mesh_path_del(struct ieee80211_sub_i
- - int hash_idx;
- - int err = 0;
- -
- -- /* flush relevant mpp entries first */
- -- mpp_flush_by_proxy(sdata, addr);
- --
- -- read_lock_bh(&pathtbl_resize_lock);
- -- tbl = resize_dereference_mesh_paths();
- -+ tbl = resize_dereference_paths(rcu_tbl);
- - hash_idx = mesh_table_hash(addr, sdata, tbl);
- - bucket = &tbl->hash_buckets[hash_idx];
- -
- -@@ -935,9 +939,30 @@ int mesh_path_del(struct ieee80211_sub_i
- -
- - err = -ENXIO;
- - enddel:
- -- mesh_paths_generation++;
- - spin_unlock(&tbl->hashwlock[hash_idx]);
- -+ return err;
- -+}
- -+
- -+/**
- -+ * mesh_path_del - delete a mesh path from the table
- -+ *
- -+ * @addr: dst address (ETH_ALEN length)
- -+ * @sdata: local subif
- -+ *
- -+ * Returns: 0 if successful
- -+ */
- -+int mesh_path_del(struct ieee80211_sub_if_data *sdata, const u8 *addr)
- -+{
- -+ int err = 0;
- -+
- -+ /* flush relevant mpp entries first */
- -+ mpp_flush_by_proxy(sdata, addr);
- -+
- -+ read_lock_bh(&pathtbl_resize_lock);
- -+ err = table_path_del(mesh_paths, sdata, addr);
- -+ mesh_paths_generation++;
- - read_unlock_bh(&pathtbl_resize_lock);
- -+
- - return err;
- - }
- -
- -@@ -951,33 +976,13 @@ enddel:
- - */
- - static int mpp_path_del(struct ieee80211_sub_if_data *sdata, const u8 *addr)
- - {
- -- struct mesh_table *tbl;
- -- struct mesh_path *mpath;
- -- struct mpath_node *node;
- -- struct hlist_head *bucket;
- -- int hash_idx;
- - int err = 0;
- -
- - read_lock_bh(&pathtbl_resize_lock);
- -- tbl = resize_dereference_mpp_paths();
- -- hash_idx = mesh_table_hash(addr, sdata, tbl);
- -- bucket = &tbl->hash_buckets[hash_idx];
- --
- -- spin_lock(&tbl->hashwlock[hash_idx]);
- -- hlist_for_each_entry(node, bucket, list) {
- -- mpath = node->mpath;
- -- if (mpath->sdata == sdata &&
- -- ether_addr_equal(addr, mpath->dst)) {
- -- __mesh_path_del(tbl, node);
- -- goto enddel;
- -- }
- -- }
- --
- -- err = -ENXIO;
- --enddel:
- -- mesh_paths_generation++;
- -- spin_unlock(&tbl->hashwlock[hash_idx]);
- -+ err = table_path_del(mpp_paths, sdata, addr);
- -+ mpp_paths_generation++;
- - read_unlock_bh(&pathtbl_resize_lock);
- -+
- - return err;
- - }
- -
- diff --git a/package/kernel/mac80211/patches/329-mac80211-fix-check-for-buffered-powersave-frames-wit.patch b/package/kernel/mac80211/patches/329-mac80211-fix-check-for-buffered-powersave-frames-wit.patch
- new file mode 100644
- index 0000000..38e541c
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/329-mac80211-fix-check-for-buffered-powersave-frames-wit.patch
- @@ -0,0 +1,21 @@
- +From: Felix Fietkau <nbd@nbd.name>
- +Date: Mon, 11 Jul 2016 15:07:06 +0200
- +Subject: [PATCH] mac80211: fix check for buffered powersave frames with txq
- +
- +The logic was inverted here, set the bit if frames are pending.
- +
- +Fixes: ba8c3d6f16a1 ("mac80211: add an intermediate software queue implementation")
- +Signed-off-by: Felix Fietkau <nbd@nbd.name>
- +---
- +
- +--- a/net/mac80211/rx.c
- ++++ b/net/mac80211/rx.c
- +@@ -1268,7 +1268,7 @@ static void sta_ps_start(struct sta_info
- + for (tid = 0; tid < ARRAY_SIZE(sta->sta.txq); tid++) {
- + struct txq_info *txqi = to_txq_info(sta->sta.txq[tid]);
- +
- +- if (!txqi->tin.backlog_packets)
- ++ if (txqi->tin.backlog_packets)
- + set_bit(tid, &sta->txq_buffered_tids);
- + else
- + clear_bit(tid, &sta->txq_buffered_tids);
- diff --git a/package/kernel/mac80211/patches/330-ath10k-fix-rx-status-reporting-for-A-MSDU-subframes.patch b/package/kernel/mac80211/patches/330-ath10k-fix-rx-status-reporting-for-A-MSDU-subframes.patch
- new file mode 100644
- index 0000000..a6031b9
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/330-ath10k-fix-rx-status-reporting-for-A-MSDU-subframes.patch
- @@ -0,0 +1,36 @@
- +From: Felix Fietkau <nbd@nbd.name>
- +Date: Sun, 17 Jul 2016 12:49:59 +0200
- +Subject: [PATCH] ath10k: fix rx status reporting for A-MSDU subframes
- +
- +Patch by Nagarajan, Ashok Raj <arnagara@qti.qualcomm.com>
- +
- +Signed-off-by: Felix Fietkau <nbd@nbd.name>
- +---
- +
- +--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
- ++++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
- +@@ -1525,7 +1525,7 @@ static void ath10k_htt_rx_h_filter(struc
- + static int ath10k_htt_rx_handle_amsdu(struct ath10k_htt *htt)
- + {
- + struct ath10k *ar = htt->ar;
- +- static struct ieee80211_rx_status rx_status;
- ++ struct ieee80211_rx_status *rx_status = &htt->rx_status;
- + struct sk_buff_head amsdu;
- + int ret;
- +
- +@@ -1549,11 +1549,11 @@ static int ath10k_htt_rx_handle_amsdu(st
- + return ret;
- + }
- +
- +- ath10k_htt_rx_h_ppdu(ar, &amsdu, &rx_status, 0xffff);
- ++ ath10k_htt_rx_h_ppdu(ar, &amsdu, rx_status, 0xffff);
- + ath10k_htt_rx_h_unchain(ar, &amsdu, ret > 0);
- +- ath10k_htt_rx_h_filter(ar, &amsdu, &rx_status);
- +- ath10k_htt_rx_h_mpdu(ar, &amsdu, &rx_status);
- +- ath10k_htt_rx_h_deliver(ar, &amsdu, &rx_status);
- ++ ath10k_htt_rx_h_filter(ar, &amsdu, rx_status);
- ++ ath10k_htt_rx_h_mpdu(ar, &amsdu, rx_status);
- ++ ath10k_htt_rx_h_deliver(ar, &amsdu, rx_status);
- +
- + return 0;
- + }
- diff --git a/package/kernel/mac80211/patches/330-mac80211-minstrel-Change-expected-throughput-unit-ba.patch b/package/kernel/mac80211/patches/330-mac80211-minstrel-Change-expected-throughput-unit-ba.patch
- deleted file mode 100644
- index 4dc6d66..0000000
- --- a/package/kernel/mac80211/patches/330-mac80211-minstrel-Change-expected-throughput-unit-ba.patch
- +++ /dev/null
- @@ -1,51 +0,0 @@
- -From: Sven Eckelmann <sven.eckelmann@open-mesh.com>
- -Date: Tue, 2 Feb 2016 08:12:26 +0100
- -Subject: [PATCH] mac80211: minstrel: Change expected throughput unit back to
- - Kbps
- -
- -The change from cur_tp to the function
- -minstrel_get_tp_avg/minstrel_ht_get_tp_avg changed the unit used for the
- -current throughput. For example in minstrel_ht the correct
- -conversion between them would be:
- -
- - mrs->cur_tp / 10 == minstrel_ht_get_tp_avg(..).
- -
- -This factor 10 must also be included in the calculation of
- -minstrel_get_expected_throughput and minstrel_ht_get_expected_throughput to
- -return values with the unit [Kbps] instead of [10Kbps]. Otherwise routing
- -algorithms like B.A.T.M.A.N. V will make incorrect decision based on these
- -values. Its kernel based implementation expects expected_throughput always
- -to have the unit [Kbps] and not sometimes [10Kbps] and sometimes [Kbps].
- -
- -The same requirement has iw or olsrdv2's nl80211 based statistics module
- -which retrieve the same data via NL80211_STA_INFO_TX_BITRATE.
- -
- -Cc: stable@vger.kernel.org
- -Fixes: 6a27b2c40b48 ("mac80211: restructure per-rate throughput calculation into function")
- -Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
- -Signed-off-by: Johannes Berg <johannes.berg@intel.com>
- ----
- -
- ---- a/net/mac80211/rc80211_minstrel.c
- -+++ b/net/mac80211/rc80211_minstrel.c
- -@@ -711,7 +711,7 @@ static u32 minstrel_get_expected_through
- - * computing cur_tp
- - */
- - tmp_mrs = &mi->r[idx].stats;
- -- tmp_cur_tp = minstrel_get_tp_avg(&mi->r[idx], tmp_mrs->prob_ewma);
- -+ tmp_cur_tp = minstrel_get_tp_avg(&mi->r[idx], tmp_mrs->prob_ewma) * 10;
- - tmp_cur_tp = tmp_cur_tp * 1200 * 8 / 1024;
- -
- - return tmp_cur_tp;
- ---- a/net/mac80211/rc80211_minstrel_ht.c
- -+++ b/net/mac80211/rc80211_minstrel_ht.c
- -@@ -1335,7 +1335,8 @@ static u32 minstrel_ht_get_expected_thro
- - prob = mi->groups[i].rates[j].prob_ewma;
- -
- - /* convert tp_avg from pkt per second in kbps */
- -- tp_avg = minstrel_ht_get_tp_avg(mi, i, j, prob) * AVG_PKT_SIZE * 8 / 1024;
- -+ tp_avg = minstrel_ht_get_tp_avg(mi, i, j, prob) * 10;
- -+ tp_avg = tp_avg * AVG_PKT_SIZE * 8 / 1024;
- -
- - return tp_avg;
- - }
- diff --git a/package/kernel/mac80211/patches/331-brcmfmac-Increase-nr-of-supported-flowrings.patch b/package/kernel/mac80211/patches/331-brcmfmac-Increase-nr-of-supported-flowrings.patch
- deleted file mode 100644
- index 1fd016f..0000000
- --- a/package/kernel/mac80211/patches/331-brcmfmac-Increase-nr-of-supported-flowrings.patch
- +++ /dev/null
- @@ -1,307 +0,0 @@
- -From: Hante Meuleman <meuleman@broadcom.com>
- -Date: Sun, 7 Feb 2016 18:08:24 +0100
- -Subject: [PATCH] brcmfmac: Increase nr of supported flowrings.
- -MIME-Version: 1.0
- -Content-Type: text/plain; charset=UTF-8
- -Content-Transfer-Encoding: 8bit
- -
- -New generation devices have firmware which has more than 256 flowrings.
- -E.g. following debugging message comes from 14e4:4365 BCM4366:
- -[ 194.606245] brcmfmac: brcmf_pcie_init_ringbuffers Nr of flowrings is 264
- -
- -At various code places (related to flowrings) we were using u8 which
- -could lead to storing wrong number or infinite loops when indexing with
- -this type. This issue was quite easy to spot in brcmf_flowring_detach
- -where it led to infinite loop e.g. on failed initialization.
- -
- -This patch switches code to proper types and increases the maximum
- -number of supported flowrings to 512.
- -
- -Originally this change was sent in September 2015, but back it was
- -causing a regression on BCM43602 resulting in:
- -Unable to handle kernel NULL pointer dereference at virtual address ...
- -
- -The reason for this regression was missing update (s/u8/u16) of struct
- -brcmf_flowring_ring. This problem was handled in 9f64df9 ("brcmfmac: Fix
- -bug in flowring management."). Starting with that it's safe to apply
- -this original patch as it doesn't cause a regression anymore.
- -
- -This patch fixes an infinite loop on BCM4366 which is supported since
- -4.4 so it makes sense to apply it to stable 4.4+.
- -
- -Cc: <stable@vger.kernel.org> # 4.4+
- -Reviewed-by: Arend Van Spriel <arend@broadcom.com>
- -Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
- -Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
- -Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
- -Signed-off-by: Arend van Spriel <arend@broadcom.com>
- -Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
- ----
- -
- ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c
- -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c
- -@@ -32,7 +32,7 @@
- - #define BRCMF_FLOWRING_LOW (BRCMF_FLOWRING_HIGH - 256)
- - #define BRCMF_FLOWRING_INVALID_IFIDX 0xff
- -
- --#define BRCMF_FLOWRING_HASH_AP(da, fifo, ifidx) (da[5] + fifo + ifidx * 16)
- -+#define BRCMF_FLOWRING_HASH_AP(da, fifo, ifidx) (da[5] * 2 + fifo + ifidx * 16)
- - #define BRCMF_FLOWRING_HASH_STA(fifo, ifidx) (fifo + ifidx * 16)
- -
- - static const u8 brcmf_flowring_prio2fifo[] = {
- -@@ -68,7 +68,7 @@ u32 brcmf_flowring_lookup(struct brcmf_f
- - u8 prio, u8 ifidx)
- - {
- - struct brcmf_flowring_hash *hash;
- -- u8 hash_idx;
- -+ u16 hash_idx;
- - u32 i;
- - bool found;
- - bool sta;
- -@@ -88,6 +88,7 @@ u32 brcmf_flowring_lookup(struct brcmf_f
- - }
- - hash_idx = sta ? BRCMF_FLOWRING_HASH_STA(fifo, ifidx) :
- - BRCMF_FLOWRING_HASH_AP(mac, fifo, ifidx);
- -+ hash_idx &= (BRCMF_FLOWRING_HASHSIZE - 1);
- - found = false;
- - hash = flow->hash;
- - for (i = 0; i < BRCMF_FLOWRING_HASHSIZE; i++) {
- -@@ -98,6 +99,7 @@ u32 brcmf_flowring_lookup(struct brcmf_f
- - break;
- - }
- - hash_idx++;
- -+ hash_idx &= (BRCMF_FLOWRING_HASHSIZE - 1);
- - }
- - if (found)
- - return hash[hash_idx].flowid;
- -@@ -111,7 +113,7 @@ u32 brcmf_flowring_create(struct brcmf_f
- - {
- - struct brcmf_flowring_ring *ring;
- - struct brcmf_flowring_hash *hash;
- -- u8 hash_idx;
- -+ u16 hash_idx;
- - u32 i;
- - bool found;
- - u8 fifo;
- -@@ -131,6 +133,7 @@ u32 brcmf_flowring_create(struct brcmf_f
- - }
- - hash_idx = sta ? BRCMF_FLOWRING_HASH_STA(fifo, ifidx) :
- - BRCMF_FLOWRING_HASH_AP(mac, fifo, ifidx);
- -+ hash_idx &= (BRCMF_FLOWRING_HASHSIZE - 1);
- - found = false;
- - hash = flow->hash;
- - for (i = 0; i < BRCMF_FLOWRING_HASHSIZE; i++) {
- -@@ -140,6 +143,7 @@ u32 brcmf_flowring_create(struct brcmf_f
- - break;
- - }
- - hash_idx++;
- -+ hash_idx &= (BRCMF_FLOWRING_HASHSIZE - 1);
- - }
- - if (found) {
- - for (i = 0; i < flow->nrofrings; i++) {
- -@@ -169,7 +173,7 @@ u32 brcmf_flowring_create(struct brcmf_f
- - }
- -
- -
- --u8 brcmf_flowring_tid(struct brcmf_flowring *flow, u8 flowid)
- -+u8 brcmf_flowring_tid(struct brcmf_flowring *flow, u16 flowid)
- - {
- - struct brcmf_flowring_ring *ring;
- -
- -@@ -179,7 +183,7 @@ u8 brcmf_flowring_tid(struct brcmf_flowr
- - }
- -
- -
- --static void brcmf_flowring_block(struct brcmf_flowring *flow, u8 flowid,
- -+static void brcmf_flowring_block(struct brcmf_flowring *flow, u16 flowid,
- - bool blocked)
- - {
- - struct brcmf_flowring_ring *ring;
- -@@ -228,10 +232,10 @@ static void brcmf_flowring_block(struct
- - }
- -
- -
- --void brcmf_flowring_delete(struct brcmf_flowring *flow, u8 flowid)
- -+void brcmf_flowring_delete(struct brcmf_flowring *flow, u16 flowid)
- - {
- - struct brcmf_flowring_ring *ring;
- -- u8 hash_idx;
- -+ u16 hash_idx;
- - struct sk_buff *skb;
- -
- - ring = flow->rings[flowid];
- -@@ -253,7 +257,7 @@ void brcmf_flowring_delete(struct brcmf_
- - }
- -
- -
- --u32 brcmf_flowring_enqueue(struct brcmf_flowring *flow, u8 flowid,
- -+u32 brcmf_flowring_enqueue(struct brcmf_flowring *flow, u16 flowid,
- - struct sk_buff *skb)
- - {
- - struct brcmf_flowring_ring *ring;
- -@@ -279,7 +283,7 @@ u32 brcmf_flowring_enqueue(struct brcmf_
- - }
- -
- -
- --struct sk_buff *brcmf_flowring_dequeue(struct brcmf_flowring *flow, u8 flowid)
- -+struct sk_buff *brcmf_flowring_dequeue(struct brcmf_flowring *flow, u16 flowid)
- - {
- - struct brcmf_flowring_ring *ring;
- - struct sk_buff *skb;
- -@@ -300,7 +304,7 @@ struct sk_buff *brcmf_flowring_dequeue(s
- - }
- -
- -
- --void brcmf_flowring_reinsert(struct brcmf_flowring *flow, u8 flowid,
- -+void brcmf_flowring_reinsert(struct brcmf_flowring *flow, u16 flowid,
- - struct sk_buff *skb)
- - {
- - struct brcmf_flowring_ring *ring;
- -@@ -311,7 +315,7 @@ void brcmf_flowring_reinsert(struct brcm
- - }
- -
- -
- --u32 brcmf_flowring_qlen(struct brcmf_flowring *flow, u8 flowid)
- -+u32 brcmf_flowring_qlen(struct brcmf_flowring *flow, u16 flowid)
- - {
- - struct brcmf_flowring_ring *ring;
- -
- -@@ -326,7 +330,7 @@ u32 brcmf_flowring_qlen(struct brcmf_flo
- - }
- -
- -
- --void brcmf_flowring_open(struct brcmf_flowring *flow, u8 flowid)
- -+void brcmf_flowring_open(struct brcmf_flowring *flow, u16 flowid)
- - {
- - struct brcmf_flowring_ring *ring;
- -
- -@@ -340,10 +344,10 @@ void brcmf_flowring_open(struct brcmf_fl
- - }
- -
- -
- --u8 brcmf_flowring_ifidx_get(struct brcmf_flowring *flow, u8 flowid)
- -+u8 brcmf_flowring_ifidx_get(struct brcmf_flowring *flow, u16 flowid)
- - {
- - struct brcmf_flowring_ring *ring;
- -- u8 hash_idx;
- -+ u16 hash_idx;
- -
- - ring = flow->rings[flowid];
- - hash_idx = ring->hash_id;
- -@@ -384,7 +388,7 @@ void brcmf_flowring_detach(struct brcmf_
- - struct brcmf_pub *drvr = bus_if->drvr;
- - struct brcmf_flowring_tdls_entry *search;
- - struct brcmf_flowring_tdls_entry *remove;
- -- u8 flowid;
- -+ u16 flowid;
- -
- - for (flowid = 0; flowid < flow->nrofrings; flowid++) {
- - if (flow->rings[flowid])
- -@@ -408,7 +412,7 @@ void brcmf_flowring_configure_addr_mode(
- - struct brcmf_bus *bus_if = dev_get_drvdata(flow->dev);
- - struct brcmf_pub *drvr = bus_if->drvr;
- - u32 i;
- -- u8 flowid;
- -+ u16 flowid;
- -
- - if (flow->addr_mode[ifidx] != addr_mode) {
- - for (i = 0; i < ARRAY_SIZE(flow->hash); i++) {
- -@@ -434,7 +438,7 @@ void brcmf_flowring_delete_peer(struct b
- - struct brcmf_flowring_tdls_entry *prev;
- - struct brcmf_flowring_tdls_entry *search;
- - u32 i;
- -- u8 flowid;
- -+ u16 flowid;
- - bool sta;
- -
- - sta = (flow->addr_mode[ifidx] == ADDR_INDIRECT);
- ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.h
- -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.h
- -@@ -16,7 +16,7 @@
- - #define BRCMFMAC_FLOWRING_H
- -
- -
- --#define BRCMF_FLOWRING_HASHSIZE 256
- -+#define BRCMF_FLOWRING_HASHSIZE 512 /* has to be 2^x */
- - #define BRCMF_FLOWRING_INVALID_ID 0xFFFFFFFF
- -
- -
- -@@ -24,7 +24,7 @@ struct brcmf_flowring_hash {
- - u8 mac[ETH_ALEN];
- - u8 fifo;
- - u8 ifidx;
- -- u8 flowid;
- -+ u16 flowid;
- - };
- -
- - enum ring_status {
- -@@ -61,16 +61,16 @@ u32 brcmf_flowring_lookup(struct brcmf_f
- - u8 prio, u8 ifidx);
- - u32 brcmf_flowring_create(struct brcmf_flowring *flow, u8 da[ETH_ALEN],
- - u8 prio, u8 ifidx);
- --void brcmf_flowring_delete(struct brcmf_flowring *flow, u8 flowid);
- --void brcmf_flowring_open(struct brcmf_flowring *flow, u8 flowid);
- --u8 brcmf_flowring_tid(struct brcmf_flowring *flow, u8 flowid);
- --u32 brcmf_flowring_enqueue(struct brcmf_flowring *flow, u8 flowid,
- -+void brcmf_flowring_delete(struct brcmf_flowring *flow, u16 flowid);
- -+void brcmf_flowring_open(struct brcmf_flowring *flow, u16 flowid);
- -+u8 brcmf_flowring_tid(struct brcmf_flowring *flow, u16 flowid);
- -+u32 brcmf_flowring_enqueue(struct brcmf_flowring *flow, u16 flowid,
- - struct sk_buff *skb);
- --struct sk_buff *brcmf_flowring_dequeue(struct brcmf_flowring *flow, u8 flowid);
- --void brcmf_flowring_reinsert(struct brcmf_flowring *flow, u8 flowid,
- -+struct sk_buff *brcmf_flowring_dequeue(struct brcmf_flowring *flow, u16 flowid);
- -+void brcmf_flowring_reinsert(struct brcmf_flowring *flow, u16 flowid,
- - struct sk_buff *skb);
- --u32 brcmf_flowring_qlen(struct brcmf_flowring *flow, u8 flowid);
- --u8 brcmf_flowring_ifidx_get(struct brcmf_flowring *flow, u8 flowid);
- -+u32 brcmf_flowring_qlen(struct brcmf_flowring *flow, u16 flowid);
- -+u8 brcmf_flowring_ifidx_get(struct brcmf_flowring *flow, u16 flowid);
- - struct brcmf_flowring *brcmf_flowring_attach(struct device *dev, u16 nrofrings);
- - void brcmf_flowring_detach(struct brcmf_flowring *flow);
- - void brcmf_flowring_configure_addr_mode(struct brcmf_flowring *flow, int ifidx,
- ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
- -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
- -@@ -677,7 +677,7 @@ static u32 brcmf_msgbuf_flowring_create(
- - }
- -
- -
- --static void brcmf_msgbuf_txflow(struct brcmf_msgbuf *msgbuf, u8 flowid)
- -+static void brcmf_msgbuf_txflow(struct brcmf_msgbuf *msgbuf, u16 flowid)
- - {
- - struct brcmf_flowring *flow = msgbuf->flow;
- - struct brcmf_commonring *commonring;
- -@@ -1310,7 +1310,7 @@ int brcmf_proto_msgbuf_rx_trigger(struct
- - }
- -
- -
- --void brcmf_msgbuf_delete_flowring(struct brcmf_pub *drvr, u8 flowid)
- -+void brcmf_msgbuf_delete_flowring(struct brcmf_pub *drvr, u16 flowid)
- - {
- - struct brcmf_msgbuf *msgbuf = (struct brcmf_msgbuf *)drvr->proto->pd;
- - struct msgbuf_tx_flowring_delete_req *delete;
- -@@ -1415,6 +1415,13 @@ int brcmf_proto_msgbuf_attach(struct brc
- - u32 count;
- -
- - if_msgbuf = drvr->bus_if->msgbuf;
- -+
- -+ if (if_msgbuf->nrof_flowrings >= BRCMF_FLOWRING_HASHSIZE) {
- -+ brcmf_err("driver not configured for this many flowrings %d\n",
- -+ if_msgbuf->nrof_flowrings);
- -+ if_msgbuf->nrof_flowrings = BRCMF_FLOWRING_HASHSIZE - 1;
- -+ }
- -+
- - msgbuf = kzalloc(sizeof(*msgbuf), GFP_KERNEL);
- - if (!msgbuf)
- - goto fail;
- ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.h
- -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.h
- -@@ -33,7 +33,7 @@
- -
- -
- - int brcmf_proto_msgbuf_rx_trigger(struct device *dev);
- --void brcmf_msgbuf_delete_flowring(struct brcmf_pub *drvr, u8 flowid);
- -+void brcmf_msgbuf_delete_flowring(struct brcmf_pub *drvr, u16 flowid);
- - int brcmf_proto_msgbuf_attach(struct brcmf_pub *drvr);
- - void brcmf_proto_msgbuf_detach(struct brcmf_pub *drvr);
- - #else
- diff --git a/package/kernel/mac80211/patches/331-mac80211-End-the-MPSP-even-if-EOSP-frame-was-not-rec.patch b/package/kernel/mac80211/patches/331-mac80211-End-the-MPSP-even-if-EOSP-frame-was-not-rec.patch
- new file mode 100644
- index 0000000..5d8a8fb
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/331-mac80211-End-the-MPSP-even-if-EOSP-frame-was-not-rec.patch
- @@ -0,0 +1,42 @@
- +From: Masashi Honma <masashi.honma@gmail.com>
- +Date: Wed, 13 Jul 2016 16:04:35 +0900
- +Subject: [PATCH] mac80211: End the MPSP even if EOSP frame was not received
- +
- +The mesh STA sends QoS frame with EOSP (end of service period)
- +subfiled=1 to end the MPSP(mesh peer service period). Previously, if
- +the frame was not acked by peer, the mesh STA did not end the MPSP.
- +This patch ends the MPSP even if the QoS frame was no acked.
- +
- +Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
- +---
- +
- +--- a/net/mac80211/status.c
- ++++ b/net/mac80211/status.c
- +@@ -784,6 +784,13 @@ void ieee80211_tx_status(struct ieee8021
- + clear_sta_flag(sta, WLAN_STA_SP);
- +
- + acked = !!(info->flags & IEEE80211_TX_STAT_ACK);
- ++
- ++ /* mesh Peer Service Period support */
- ++ if (ieee80211_vif_is_mesh(&sta->sdata->vif) &&
- ++ ieee80211_is_data_qos(fc))
- ++ ieee80211_mpsp_trigger_process(
- ++ ieee80211_get_qos_ctl(hdr), sta, true, acked);
- ++
- + if (!acked && test_sta_flag(sta, WLAN_STA_PS_STA)) {
- + /*
- + * The STA is in power save mode, so assume
- +@@ -794,13 +801,6 @@ void ieee80211_tx_status(struct ieee8021
- + return;
- + }
- +
- +- /* mesh Peer Service Period support */
- +- if (ieee80211_vif_is_mesh(&sta->sdata->vif) &&
- +- ieee80211_is_data_qos(fc))
- +- ieee80211_mpsp_trigger_process(
- +- ieee80211_get_qos_ctl(hdr),
- +- sta, true, acked);
- +-
- + if (ieee80211_hw_check(&local->hw, HAS_RATE_CONTROL) &&
- + (ieee80211_is_data(hdr->frame_control)) &&
- + (rates_idx != -1))
- diff --git a/package/kernel/mac80211/patches/332-ath10k-implement-NAPI-support.patch b/package/kernel/mac80211/patches/332-ath10k-implement-NAPI-support.patch
- new file mode 100644
- index 0000000..c6cc145
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/332-ath10k-implement-NAPI-support.patch
- @@ -0,0 +1,642 @@
- +From: Rajkumar Manoharan <rmanohar@qti.qualcomm.com>
- +Date: Thu, 21 Jul 2016 11:50:00 +0530
- +Subject: [PATCH] ath10k: implement NAPI support
- +
- +Add NAPI support for rx and tx completion. NAPI poll is scheduled
- +from interrupt handler. The design is as below
- +
- + - on interrupt
- + - schedule napi and mask interrupts
- + - on poll
- + - process all pipes (no actual Tx/Rx)
- + - process Rx within budget
- + - if quota exceeds budget reschedule napi poll by returning budget
- + - process Tx completions and update budget if necessary
- + - process Tx fetch indications (pull-push)
- + - push any other pending Tx (if possible)
- + - before resched or napi completion replenish htt rx ring buffer
- + - if work done < budget, complete napi poll and unmask interrupts
- +
- +This change also get rid of two tasklets (intr_tq and txrx_compl_task).
- +
- +Measured peak throughput with NAPI on IPQ4019 platform in controlled
- +environment. No noticeable reduction in throughput is seen and also
- +observed improvements in CPU usage. Approx. 15% CPU usage got reduced
- +in UDP uplink case.
- +
- +DL: AP DUT Tx
- +UL: AP DUT Rx
- +
- +IPQ4019 (avg. cpu usage %)
- +========
- + TOT +NAPI
- + =========== =============
- +TCP DL 644 Mbps (42%) 645 Mbps (36%)
- +TCP UL 673 Mbps (30%) 675 Mbps (26%)
- +UDP DL 682 Mbps (49%) 680 Mbps (49%)
- +UDP UL 720 Mbps (28%) 717 Mbps (11%)
- +
- +Signed-off-by: Rajkumar Manoharan <rmanohar@qti.qualcomm.com>
- +---
- +
- +--- a/drivers/net/wireless/ath/ath10k/ahb.c
- ++++ b/drivers/net/wireless/ath/ath10k/ahb.c
- +@@ -462,13 +462,13 @@ static void ath10k_ahb_halt_chip(struct
- + static irqreturn_t ath10k_ahb_interrupt_handler(int irq, void *arg)
- + {
- + struct ath10k *ar = arg;
- +- struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);
- +
- + if (!ath10k_pci_irq_pending(ar))
- + return IRQ_NONE;
- +
- + ath10k_pci_disable_and_clear_legacy_irq(ar);
- +- tasklet_schedule(&ar_pci->intr_tq);
- ++ ath10k_pci_irq_msi_fw_mask(ar);
- ++ napi_schedule(&ar->napi);
- +
- + return IRQ_HANDLED;
- + }
- +@@ -831,7 +831,7 @@ static int ath10k_ahb_probe(struct platf
- + goto err_resource_deinit;
- + }
- +
- +- ath10k_pci_init_irq_tasklets(ar);
- ++ ath10k_pci_init_napi(ar);
- +
- + ret = ath10k_ahb_request_irq_legacy(ar);
- + if (ret)
- +--- a/drivers/net/wireless/ath/ath10k/core.c
- ++++ b/drivers/net/wireless/ath/ath10k/core.c
- +@@ -2226,6 +2226,8 @@ struct ath10k *ath10k_core_create(size_t
- + INIT_WORK(&ar->register_work, ath10k_core_register_work);
- + INIT_WORK(&ar->restart_work, ath10k_core_restart);
- +
- ++ init_dummy_netdev(&ar->napi_dev);
- ++
- + ret = ath10k_debug_create(ar);
- + if (ret)
- + goto err_free_aux_wq;
- +--- a/drivers/net/wireless/ath/ath10k/core.h
- ++++ b/drivers/net/wireless/ath/ath10k/core.h
- +@@ -65,6 +65,10 @@
- + #define ATH10K_KEEPALIVE_MAX_IDLE 3895
- + #define ATH10K_KEEPALIVE_MAX_UNRESPONSIVE 3900
- +
- ++/* NAPI poll budget */
- ++#define ATH10K_NAPI_BUDGET 64
- ++#define ATH10K_NAPI_QUOTA_LIMIT 60
- ++
- + struct ath10k;
- +
- + enum ath10k_bus {
- +@@ -933,6 +937,10 @@ struct ath10k {
- + struct ath10k_thermal thermal;
- + struct ath10k_wow wow;
- +
- ++ /* NAPI */
- ++ struct net_device napi_dev;
- ++ struct napi_struct napi;
- ++
- + /* must be last */
- + u8 drv_priv[0] __aligned(sizeof(void *));
- + };
- +--- a/drivers/net/wireless/ath/ath10k/htt.h
- ++++ b/drivers/net/wireless/ath/ath10k/htt.h
- +@@ -1666,7 +1666,6 @@ struct ath10k_htt {
- +
- + /* This is used to group tx/rx completions separately and process them
- + * in batches to reduce cache stalls */
- +- struct tasklet_struct txrx_compl_task;
- + struct sk_buff_head rx_compl_q;
- + struct sk_buff_head rx_in_ord_compl_q;
- + struct sk_buff_head tx_fetch_ind_q;
- +@@ -1799,5 +1798,6 @@ int ath10k_htt_tx(struct ath10k_htt *htt
- + struct sk_buff *msdu);
- + void ath10k_htt_rx_pktlog_completion_handler(struct ath10k *ar,
- + struct sk_buff *skb);
- ++int ath10k_htt_txrx_compl_task(struct ath10k *ar, int budget);
- +
- + #endif
- +--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
- ++++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
- +@@ -34,7 +34,6 @@
- + #define HTT_RX_RING_REFILL_RESCHED_MS 5
- +
- + static int ath10k_htt_rx_get_csum_state(struct sk_buff *skb);
- +-static void ath10k_htt_txrx_compl_task(unsigned long ptr);
- +
- + static struct sk_buff *
- + ath10k_htt_rx_find_skb_paddr(struct ath10k *ar, u32 paddr)
- +@@ -226,7 +225,6 @@ int ath10k_htt_rx_ring_refill(struct ath
- + void ath10k_htt_rx_free(struct ath10k_htt *htt)
- + {
- + del_timer_sync(&htt->rx_ring.refill_retry_timer);
- +- tasklet_kill(&htt->txrx_compl_task);
- +
- + skb_queue_purge(&htt->rx_compl_q);
- + skb_queue_purge(&htt->rx_in_ord_compl_q);
- +@@ -520,9 +518,6 @@ int ath10k_htt_rx_alloc(struct ath10k_ht
- + skb_queue_head_init(&htt->tx_fetch_ind_q);
- + atomic_set(&htt->num_mpdus_ready, 0);
- +
- +- tasklet_init(&htt->txrx_compl_task, ath10k_htt_txrx_compl_task,
- +- (unsigned long)htt);
- +-
- + ath10k_dbg(ar, ATH10K_DBG_BOOT, "htt rx ring size %d fill_level %d\n",
- + htt->rx_ring.size, htt->rx_ring.fill_level);
- + return 0;
- +@@ -958,7 +953,7 @@ static void ath10k_process_rx(struct ath
- + trace_ath10k_rx_hdr(ar, skb->data, skb->len);
- + trace_ath10k_rx_payload(ar, skb->data, skb->len);
- +
- +- ieee80211_rx(ar->hw, skb);
- ++ ieee80211_rx_napi(ar->hw, NULL, skb, &ar->napi);
- + }
- +
- + static int ath10k_htt_rx_nwifi_hdrlen(struct ath10k *ar,
- +@@ -1527,7 +1522,7 @@ static int ath10k_htt_rx_handle_amsdu(st
- + struct ath10k *ar = htt->ar;
- + struct ieee80211_rx_status *rx_status = &htt->rx_status;
- + struct sk_buff_head amsdu;
- +- int ret;
- ++ int ret, num_msdus;
- +
- + __skb_queue_head_init(&amsdu);
- +
- +@@ -1549,13 +1544,14 @@ static int ath10k_htt_rx_handle_amsdu(st
- + return ret;
- + }
- +
- ++ num_msdus = skb_queue_len(&amsdu);
- + ath10k_htt_rx_h_ppdu(ar, &amsdu, rx_status, 0xffff);
- + ath10k_htt_rx_h_unchain(ar, &amsdu, ret > 0);
- + ath10k_htt_rx_h_filter(ar, &amsdu, rx_status);
- + ath10k_htt_rx_h_mpdu(ar, &amsdu, rx_status);
- + ath10k_htt_rx_h_deliver(ar, &amsdu, rx_status);
- +
- +- return 0;
- ++ return num_msdus;
- + }
- +
- + static void ath10k_htt_rx_proc_rx_ind(struct ath10k_htt *htt,
- +@@ -1579,15 +1575,6 @@ static void ath10k_htt_rx_proc_rx_ind(st
- + mpdu_count += mpdu_ranges[i].mpdu_count;
- +
- + atomic_add(mpdu_count, &htt->num_mpdus_ready);
- +-
- +- tasklet_schedule(&htt->txrx_compl_task);
- +-}
- +-
- +-static void ath10k_htt_rx_frag_handler(struct ath10k_htt *htt)
- +-{
- +- atomic_inc(&htt->num_mpdus_ready);
- +-
- +- tasklet_schedule(&htt->txrx_compl_task);
- + }
- +
- + static void ath10k_htt_rx_tx_compl_ind(struct ath10k *ar,
- +@@ -1772,14 +1759,15 @@ static void ath10k_htt_rx_h_rx_offload_p
- + RX_FLAG_MMIC_STRIPPED;
- + }
- +
- +-static void ath10k_htt_rx_h_rx_offload(struct ath10k *ar,
- +- struct sk_buff_head *list)
- ++static int ath10k_htt_rx_h_rx_offload(struct ath10k *ar,
- ++ struct sk_buff_head *list)
- + {
- + struct ath10k_htt *htt = &ar->htt;
- + struct ieee80211_rx_status *status = &htt->rx_status;
- + struct htt_rx_offload_msdu *rx;
- + struct sk_buff *msdu;
- + size_t offset;
- ++ int num_msdu = 0;
- +
- + while ((msdu = __skb_dequeue(list))) {
- + /* Offloaded frames don't have Rx descriptor. Instead they have
- +@@ -1819,10 +1807,12 @@ static void ath10k_htt_rx_h_rx_offload(s
- + ath10k_htt_rx_h_rx_offload_prot(status, msdu);
- + ath10k_htt_rx_h_channel(ar, status, NULL, rx->vdev_id);
- + ath10k_process_rx(ar, status, msdu);
- ++ num_msdu++;
- + }
- ++ return num_msdu;
- + }
- +
- +-static void ath10k_htt_rx_in_ord_ind(struct ath10k *ar, struct sk_buff *skb)
- ++static int ath10k_htt_rx_in_ord_ind(struct ath10k *ar, struct sk_buff *skb)
- + {
- + struct ath10k_htt *htt = &ar->htt;
- + struct htt_resp *resp = (void *)skb->data;
- +@@ -1835,12 +1825,12 @@ static void ath10k_htt_rx_in_ord_ind(str
- + u8 tid;
- + bool offload;
- + bool frag;
- +- int ret;
- ++ int ret, num_msdus = 0;
- +
- + lockdep_assert_held(&htt->rx_ring.lock);
- +
- + if (htt->rx_confused)
- +- return;
- ++ return -EIO;
- +
- + skb_pull(skb, sizeof(resp->hdr));
- + skb_pull(skb, sizeof(resp->rx_in_ord_ind));
- +@@ -1859,7 +1849,7 @@ static void ath10k_htt_rx_in_ord_ind(str
- +
- + if (skb->len < msdu_count * sizeof(*resp->rx_in_ord_ind.msdu_descs)) {
- + ath10k_warn(ar, "dropping invalid in order rx indication\n");
- +- return;
- ++ return -EINVAL;
- + }
- +
- + /* The event can deliver more than 1 A-MSDU. Each A-MSDU is later
- +@@ -1870,14 +1860,14 @@ static void ath10k_htt_rx_in_ord_ind(str
- + if (ret < 0) {
- + ath10k_warn(ar, "failed to pop paddr list: %d\n", ret);
- + htt->rx_confused = true;
- +- return;
- ++ return -EIO;
- + }
- +
- + /* Offloaded frames are very different and need to be handled
- + * separately.
- + */
- + if (offload)
- +- ath10k_htt_rx_h_rx_offload(ar, &list);
- ++ num_msdus = ath10k_htt_rx_h_rx_offload(ar, &list);
- +
- + while (!skb_queue_empty(&list)) {
- + __skb_queue_head_init(&amsdu);
- +@@ -1890,6 +1880,7 @@ static void ath10k_htt_rx_in_ord_ind(str
- + * better to report something than nothing though. This
- + * should still give an idea about rx rate to the user.
- + */
- ++ num_msdus += skb_queue_len(&amsdu);
- + ath10k_htt_rx_h_ppdu(ar, &amsdu, status, vdev_id);
- + ath10k_htt_rx_h_filter(ar, &amsdu, status);
- + ath10k_htt_rx_h_mpdu(ar, &amsdu, status);
- +@@ -1902,9 +1893,10 @@ static void ath10k_htt_rx_in_ord_ind(str
- + ath10k_warn(ar, "failed to extract amsdu: %d\n", ret);
- + htt->rx_confused = true;
- + __skb_queue_purge(&list);
- +- return;
- ++ return -EIO;
- + }
- + }
- ++ return num_msdus;
- + }
- +
- + static void ath10k_htt_rx_tx_fetch_resp_id_confirm(struct ath10k *ar,
- +@@ -2267,7 +2259,6 @@ bool ath10k_htt_t2h_msg_handler(struct a
- + }
- + case HTT_T2H_MSG_TYPE_TX_COMPL_IND:
- + ath10k_htt_rx_tx_compl_ind(htt->ar, skb);
- +- tasklet_schedule(&htt->txrx_compl_task);
- + break;
- + case HTT_T2H_MSG_TYPE_SEC_IND: {
- + struct ath10k *ar = htt->ar;
- +@@ -2284,7 +2275,7 @@ bool ath10k_htt_t2h_msg_handler(struct a
- + case HTT_T2H_MSG_TYPE_RX_FRAG_IND: {
- + ath10k_dbg_dump(ar, ATH10K_DBG_HTT_DUMP, NULL, "htt event: ",
- + skb->data, skb->len);
- +- ath10k_htt_rx_frag_handler(htt);
- ++ atomic_inc(&htt->num_mpdus_ready);
- + break;
- + }
- + case HTT_T2H_MSG_TYPE_TEST:
- +@@ -2322,8 +2313,7 @@ bool ath10k_htt_t2h_msg_handler(struct a
- + break;
- + }
- + case HTT_T2H_MSG_TYPE_RX_IN_ORD_PADDR_IND: {
- +- skb_queue_tail(&htt->rx_in_ord_compl_q, skb);
- +- tasklet_schedule(&htt->txrx_compl_task);
- ++ __skb_queue_tail(&htt->rx_in_ord_compl_q, skb);
- + return false;
- + }
- + case HTT_T2H_MSG_TYPE_TX_CREDIT_UPDATE_IND:
- +@@ -2349,7 +2339,6 @@ bool ath10k_htt_t2h_msg_handler(struct a
- + break;
- + }
- + skb_queue_tail(&htt->tx_fetch_ind_q, tx_fetch_ind);
- +- tasklet_schedule(&htt->txrx_compl_task);
- + break;
- + }
- + case HTT_T2H_MSG_TYPE_TX_FETCH_CONFIRM:
- +@@ -2378,27 +2367,77 @@ void ath10k_htt_rx_pktlog_completion_han
- + }
- + EXPORT_SYMBOL(ath10k_htt_rx_pktlog_completion_handler);
- +
- +-static void ath10k_htt_txrx_compl_task(unsigned long ptr)
- ++int ath10k_htt_txrx_compl_task(struct ath10k *ar, int budget)
- + {
- +- struct ath10k_htt *htt = (struct ath10k_htt *)ptr;
- +- struct ath10k *ar = htt->ar;
- ++ struct ath10k_htt *htt = &ar->htt;
- + struct htt_tx_done tx_done = {};
- +- struct sk_buff_head rx_ind_q;
- + struct sk_buff_head tx_ind_q;
- + struct sk_buff *skb;
- + unsigned long flags;
- +- int num_mpdus;
- ++ int quota = 0, done, num_rx_msdus;
- ++ bool resched_napi = false;
- +
- +- __skb_queue_head_init(&rx_ind_q);
- + __skb_queue_head_init(&tx_ind_q);
- +
- +- spin_lock_irqsave(&htt->rx_in_ord_compl_q.lock, flags);
- +- skb_queue_splice_init(&htt->rx_in_ord_compl_q, &rx_ind_q);
- +- spin_unlock_irqrestore(&htt->rx_in_ord_compl_q.lock, flags);
- ++ /* Since in-ord-ind can deliver more than 1 A-MSDU in single event,
- ++ * process it first to utilize full available quota.
- ++ */
- ++ while (quota < budget) {
- ++ if (skb_queue_empty(&htt->rx_in_ord_compl_q))
- ++ break;
- +
- +- spin_lock_irqsave(&htt->tx_fetch_ind_q.lock, flags);
- +- skb_queue_splice_init(&htt->tx_fetch_ind_q, &tx_ind_q);
- +- spin_unlock_irqrestore(&htt->tx_fetch_ind_q.lock, flags);
- ++ skb = __skb_dequeue(&htt->rx_in_ord_compl_q);
- ++ if (!skb) {
- ++ resched_napi = true;
- ++ goto exit;
- ++ }
- ++
- ++ spin_lock_bh(&htt->rx_ring.lock);
- ++ num_rx_msdus = ath10k_htt_rx_in_ord_ind(ar, skb);
- ++ spin_unlock_bh(&htt->rx_ring.lock);
- ++ if (num_rx_msdus < 0) {
- ++ resched_napi = true;
- ++ goto exit;
- ++ }
- ++
- ++ dev_kfree_skb_any(skb);
- ++ if (num_rx_msdus > 0)
- ++ quota += num_rx_msdus;
- ++
- ++ if ((quota > ATH10K_NAPI_QUOTA_LIMIT) &&
- ++ !skb_queue_empty(&htt->rx_in_ord_compl_q)) {
- ++ resched_napi = true;
- ++ goto exit;
- ++ }
- ++ }
- ++
- ++ while (quota < budget) {
- ++ /* no more data to receive */
- ++ if (!atomic_read(&htt->num_mpdus_ready))
- ++ break;
- ++
- ++ num_rx_msdus = ath10k_htt_rx_handle_amsdu(htt);
- ++ if (num_rx_msdus < 0) {
- ++ resched_napi = true;
- ++ goto exit;
- ++ }
- ++
- ++ quota += num_rx_msdus;
- ++ atomic_dec(&htt->num_mpdus_ready);
- ++ if ((quota > ATH10K_NAPI_QUOTA_LIMIT) &&
- ++ atomic_read(&htt->num_mpdus_ready)) {
- ++ resched_napi = true;
- ++ goto exit;
- ++ }
- ++ }
- ++
- ++ /* From NAPI documentation:
- ++ * The napi poll() function may also process TX completions, in which
- ++ * case if it processes the entire TX ring then it should count that
- ++ * work as the rest of the budget.
- ++ */
- ++ if ((quota < budget) && !kfifo_is_empty(&htt->txdone_fifo))
- ++ quota = budget;
- +
- + /* kfifo_get: called only within txrx_tasklet so it's neatly serialized.
- + * From kfifo_get() documentation:
- +@@ -2408,27 +2447,22 @@ static void ath10k_htt_txrx_compl_task(u
- + while (kfifo_get(&htt->txdone_fifo, &tx_done))
- + ath10k_txrx_tx_unref(htt, &tx_done);
- +
- ++ spin_lock_irqsave(&htt->tx_fetch_ind_q.lock, flags);
- ++ skb_queue_splice_init(&htt->tx_fetch_ind_q, &tx_ind_q);
- ++ spin_unlock_irqrestore(&htt->tx_fetch_ind_q.lock, flags);
- ++
- + while ((skb = __skb_dequeue(&tx_ind_q))) {
- + ath10k_htt_rx_tx_fetch_ind(ar, skb);
- + dev_kfree_skb_any(skb);
- + }
- +
- +- num_mpdus = atomic_read(&htt->num_mpdus_ready);
- +-
- +- while (num_mpdus) {
- +- if (ath10k_htt_rx_handle_amsdu(htt))
- +- break;
- +-
- +- num_mpdus--;
- +- atomic_dec(&htt->num_mpdus_ready);
- +- }
- +-
- +- while ((skb = __skb_dequeue(&rx_ind_q))) {
- +- spin_lock_bh(&htt->rx_ring.lock);
- +- ath10k_htt_rx_in_ord_ind(ar, skb);
- +- spin_unlock_bh(&htt->rx_ring.lock);
- +- dev_kfree_skb_any(skb);
- +- }
- +-
- ++exit:
- + ath10k_htt_rx_msdu_buff_replenish(htt);
- ++ /* In case of rx failure or more data to read, report budget
- ++ * to reschedule NAPI poll
- ++ */
- ++ done = resched_napi ? budget : quota;
- ++
- ++ return done;
- + }
- ++EXPORT_SYMBOL(ath10k_htt_txrx_compl_task);
- +--- a/drivers/net/wireless/ath/ath10k/htt_tx.c
- ++++ b/drivers/net/wireless/ath/ath10k/htt_tx.c
- +@@ -388,8 +388,6 @@ void ath10k_htt_tx_free(struct ath10k_ht
- + {
- + int size;
- +
- +- tasklet_kill(&htt->txrx_compl_task);
- +-
- + idr_for_each(&htt->pending_tx, ath10k_htt_tx_clean_up_pending, htt->ar);
- + idr_destroy(&htt->pending_tx);
- +
- +--- a/drivers/net/wireless/ath/ath10k/pci.c
- ++++ b/drivers/net/wireless/ath/ath10k/pci.c
- +@@ -1502,12 +1502,10 @@ void ath10k_pci_hif_send_complete_check(
- + ath10k_ce_per_engine_service(ar, pipe);
- + }
- +
- +-void ath10k_pci_kill_tasklet(struct ath10k *ar)
- ++static void ath10k_pci_rx_retry_sync(struct ath10k *ar)
- + {
- + struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);
- +
- +- tasklet_kill(&ar_pci->intr_tq);
- +-
- + del_timer_sync(&ar_pci->rx_post_retry);
- + }
- +
- +@@ -1566,7 +1564,7 @@ void ath10k_pci_hif_get_default_pipe(str
- + ul_pipe, dl_pipe);
- + }
- +
- +-static void ath10k_pci_irq_msi_fw_mask(struct ath10k *ar)
- ++void ath10k_pci_irq_msi_fw_mask(struct ath10k *ar)
- + {
- + u32 val;
- +
- +@@ -1747,7 +1745,7 @@ void ath10k_pci_ce_deinit(struct ath10k
- +
- + void ath10k_pci_flush(struct ath10k *ar)
- + {
- +- ath10k_pci_kill_tasklet(ar);
- ++ ath10k_pci_rx_retry_sync(ar);
- + ath10k_pci_buffer_cleanup(ar);
- + }
- +
- +@@ -2754,35 +2752,53 @@ static irqreturn_t ath10k_pci_interrupt_
- + return IRQ_NONE;
- + }
- +
- +- if (ar_pci->oper_irq_mode == ATH10K_PCI_IRQ_LEGACY) {
- +- if (!ath10k_pci_irq_pending(ar))
- +- return IRQ_NONE;
- +-
- +- ath10k_pci_disable_and_clear_legacy_irq(ar);
- +- }
- ++ if ((ar_pci->oper_irq_mode == ATH10K_PCI_IRQ_LEGACY) &&
- ++ !ath10k_pci_irq_pending(ar))
- ++ return IRQ_NONE;
- +
- +- tasklet_schedule(&ar_pci->intr_tq);
- ++ ath10k_pci_disable_and_clear_legacy_irq(ar);
- ++ ath10k_pci_irq_msi_fw_mask(ar);
- ++ napi_schedule(&ar->napi);
- +
- + return IRQ_HANDLED;
- + }
- +
- +-static void ath10k_pci_tasklet(unsigned long data)
- ++static int ath10k_pci_napi_poll(struct napi_struct *ctx, int budget)
- + {
- +- struct ath10k *ar = (struct ath10k *)data;
- +- struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);
- ++ struct ath10k *ar = container_of(ctx, struct ath10k, napi);
- ++ int done = 0;
- +
- + if (ath10k_pci_has_fw_crashed(ar)) {
- +- ath10k_pci_irq_disable(ar);
- + ath10k_pci_fw_crashed_clear(ar);
- + ath10k_pci_fw_crashed_dump(ar);
- +- return;
- ++ napi_complete(ctx);
- ++ return done;
- + }
- +
- + ath10k_ce_per_engine_service_any(ar);
- +
- +- /* Re-enable legacy irq that was disabled in the irq handler */
- +- if (ar_pci->oper_irq_mode == ATH10K_PCI_IRQ_LEGACY)
- ++ done = ath10k_htt_txrx_compl_task(ar, budget);
- ++
- ++ if (done < budget) {
- ++ napi_complete(ctx);
- ++ /* In case of MSI, it is possible that interrupts are received
- ++ * while NAPI poll is inprogress. So pending interrupts that are
- ++ * received after processing all copy engine pipes by NAPI poll
- ++ * will not be handled again. This is causing failure to
- ++ * complete boot sequence in x86 platform. So before enabling
- ++ * interrupts safer to check for pending interrupts for
- ++ * immediate servicing.
- ++ */
- ++ if (CE_INTERRUPT_SUMMARY(ar)) {
- ++ napi_reschedule(&ar->napi);
- ++ goto out;
- ++ }
- + ath10k_pci_enable_legacy_irq(ar);
- ++ ath10k_pci_irq_msi_fw_unmask(ar);
- ++ }
- ++
- ++out:
- ++ return done;
- + }
- +
- + static int ath10k_pci_request_irq_msi(struct ath10k *ar)
- +@@ -2840,11 +2856,11 @@ static void ath10k_pci_free_irq(struct a
- + free_irq(ar_pci->pdev->irq, ar);
- + }
- +
- +-void ath10k_pci_init_irq_tasklets(struct ath10k *ar)
- ++void ath10k_pci_init_napi(struct ath10k *ar)
- + {
- +- struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);
- +-
- +- tasklet_init(&ar_pci->intr_tq, ath10k_pci_tasklet, (unsigned long)ar);
- ++ netif_napi_add(&ar->napi_dev, &ar->napi, ath10k_pci_napi_poll,
- ++ ATH10K_NAPI_BUDGET);
- ++ napi_enable(&ar->napi);
- + }
- +
- + static int ath10k_pci_init_irq(struct ath10k *ar)
- +@@ -2852,7 +2868,7 @@ static int ath10k_pci_init_irq(struct at
- + struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);
- + int ret;
- +
- +- ath10k_pci_init_irq_tasklets(ar);
- ++ ath10k_pci_init_napi(ar);
- +
- + if (ath10k_pci_irq_mode != ATH10K_PCI_IRQ_AUTO)
- + ath10k_info(ar, "limiting irq mode to: %d\n",
- +@@ -3113,7 +3129,8 @@ int ath10k_pci_setup_resource(struct ath
- +
- + void ath10k_pci_release_resource(struct ath10k *ar)
- + {
- +- ath10k_pci_kill_tasklet(ar);
- ++ ath10k_pci_rx_retry_sync(ar);
- ++ netif_napi_del(&ar->napi);
- + ath10k_pci_ce_deinit(ar);
- + ath10k_pci_free_pipes(ar);
- + }
- +@@ -3274,7 +3291,7 @@ static int ath10k_pci_probe(struct pci_d
- +
- + err_free_irq:
- + ath10k_pci_free_irq(ar);
- +- ath10k_pci_kill_tasklet(ar);
- ++ ath10k_pci_rx_retry_sync(ar);
- +
- + err_deinit_irq:
- + ath10k_pci_deinit_irq(ar);
- +--- a/drivers/net/wireless/ath/ath10k/pci.h
- ++++ b/drivers/net/wireless/ath/ath10k/pci.h
- +@@ -177,8 +177,6 @@ struct ath10k_pci {
- + /* Operating interrupt mode */
- + enum ath10k_pci_irq_mode oper_irq_mode;
- +
- +- struct tasklet_struct intr_tq;
- +-
- + struct ath10k_pci_pipe pipe_info[CE_COUNT_MAX];
- +
- + /* Copy Engine used for Diagnostic Accesses */
- +@@ -294,8 +292,7 @@ void ath10k_pci_free_pipes(struct ath10k
- + void ath10k_pci_free_pipes(struct ath10k *ar);
- + void ath10k_pci_rx_replenish_retry(unsigned long ptr);
- + void ath10k_pci_ce_deinit(struct ath10k *ar);
- +-void ath10k_pci_init_irq_tasklets(struct ath10k *ar);
- +-void ath10k_pci_kill_tasklet(struct ath10k *ar);
- ++void ath10k_pci_init_napi(struct ath10k *ar);
- + int ath10k_pci_init_pipes(struct ath10k *ar);
- + int ath10k_pci_init_config(struct ath10k *ar);
- + void ath10k_pci_rx_post(struct ath10k *ar);
- +@@ -303,6 +300,7 @@ void ath10k_pci_flush(struct ath10k *ar)
- + void ath10k_pci_enable_legacy_irq(struct ath10k *ar);
- + bool ath10k_pci_irq_pending(struct ath10k *ar);
- + void ath10k_pci_disable_and_clear_legacy_irq(struct ath10k *ar);
- ++void ath10k_pci_irq_msi_fw_mask(struct ath10k *ar);
- + int ath10k_pci_wait_for_target_init(struct ath10k *ar);
- + int ath10k_pci_setup_resource(struct ath10k *ar);
- + void ath10k_pci_release_resource(struct ath10k *ar);
- diff --git a/package/kernel/mac80211/patches/332-cfg80211-fix-faulty-variable-initialization-in-ieee8.patch b/package/kernel/mac80211/patches/332-cfg80211-fix-faulty-variable-initialization-in-ieee8.patch
- deleted file mode 100644
- index e414f23..0000000
- --- a/package/kernel/mac80211/patches/332-cfg80211-fix-faulty-variable-initialization-in-ieee8.patch
- +++ /dev/null
- @@ -1,22 +0,0 @@
- -From: Felix Fietkau <nbd@openwrt.org>
- -Date: Mon, 8 Feb 2016 14:24:36 +0100
- -Subject: [PATCH] cfg80211: fix faulty variable initialization in
- - ieee80211_amsdu_to_8023s
- -
- -reuse_skb is set to true if the code decides to use the last segment.
- -Fixes a memory leak
- -
- -Signed-off-by: Felix Fietkau <nbd@openwrt.org>
- ----
- -
- ---- a/net/wireless/util.c
- -+++ b/net/wireless/util.c
- -@@ -676,7 +676,7 @@ void ieee80211_amsdu_to_8023s(struct sk_
- - u8 *payload;
- - int offset = 0, remaining, err;
- - struct ethhdr eth;
- -- bool reuse_skb = true;
- -+ bool reuse_skb = false;
- - bool last = false;
- -
- - if (has_80211_header) {
- diff --git a/package/kernel/mac80211/patches/333-ath9k-fix-client-mode-beacon-configuration.patch b/package/kernel/mac80211/patches/333-ath9k-fix-client-mode-beacon-configuration.patch
- new file mode 100644
- index 0000000..d008ceb
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/333-ath9k-fix-client-mode-beacon-configuration.patch
- @@ -0,0 +1,69 @@
- +From: Felix Fietkau <nbd@nbd.name>
- +Date: Tue, 26 Jul 2016 08:05:10 +0200
- +Subject: [PATCH] ath9k: fix client mode beacon configuration
- +
- +For pure station mode, iter_data.primary_beacon_vif was used and passed
- +to ath_beacon_config, but not set to the station vif.
- +This was causing the following warning:
- +
- +[ 100.310919] ------------[ cut here ]------------
- +[ 100.315683] WARNING: CPU: 0 PID: 7 at compat-wireless-2016-06-20/drivers/net/wireless/ath/ath9k/beacon.c:642 ath9k_calculate_summary_state+0x250/0x60c [ath9k]()
- +[ 100.402028] CPU: 0 PID: 7 Comm: kworker/u2:1 Tainted: G W 4.4.15 #5
- +[ 100.409676] Workqueue: phy0 ieee80211_ibss_leave [mac80211]
- +[ 100.415351] Stack : 8736e98c 870b4b20 87a25b54 800a6800 8782a080 80400d63 8039b96c 00000007
- +[ 100.415351] 803c5edc 87875914 80400000 800a47cc 87a25b54 800a6800 803a0fd8 80400000
- +[ 100.415351] 00000003 87875914 80400000 80094ae0 87a25b54 8787594c 00000000 801ef308
- +[ 100.415351] 803ffe70 801ef300 87193d58 87b3a400 87b3ad00 70687930 00000000 00000000
- +[ 100.415351] 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
- +[ 100.415351] ...
- +[ 100.451703] Call Trace:
- +[ 100.454235] [<800a6800>] vprintk_default+0x24/0x30
- +[ 100.459110] [<800a47cc>] printk+0x2c/0x38
- +[ 100.463190] [<800a6800>] vprintk_default+0x24/0x30
- +[ 100.468072] [<80094ae0>] print_worker_info+0x148/0x174
- +[ 100.473378] [<801ef308>] serial8250_console_putchar+0x0/0x44
- +[ 100.479122] [<801ef300>] wait_for_xmitr+0xc4/0xcc
- +[ 100.484014] [<87193d58>] ieee80211_ibss_leave+0xb90/0x1900 [mac80211]
- +[ 100.490590] [<80081604>] warn_slowpath_common+0xa0/0xd0
- +[ 100.495922] [<801a359c>] dump_stack+0x14/0x28
- +[ 100.500350] [<80071a00>] show_stack+0x50/0x84
- +[ 100.504784] [<80081604>] warn_slowpath_common+0xa0/0xd0
- +[ 100.510106] [<87024c60>] ath9k_calculate_summary_state+0x250/0x60c [ath9k]
- +[ 100.517105] [<800816b8>] warn_slowpath_null+0x18/0x24
- +[ 100.522256] [<87024c60>] ath9k_calculate_summary_state+0x250/0x60c [ath9k]
- +[ 100.529273] [<87025418>] ath9k_set_txpower+0x148/0x498 [ath9k]
- +[ 100.535302] [<871d2c64>] cleanup_module+0xa74/0xd4c [mac80211]
- +[ 100.541237] [<801ef308>] serial8250_console_putchar+0x0/0x44
- +[ 100.547042] [<800a5d18>] wake_up_klogd+0x54/0x68
- +[ 100.551730] [<800a6650>] vprintk_emit+0x404/0x43c
- +[ 100.556623] [<871b9db8>] ieee80211_sta_rx_notify+0x258/0x32c [mac80211]
- +[ 100.563475] [<871ba6a4>] ieee80211_sta_rx_queued_mgmt+0x63c/0x734 [mac80211]
- +[ 100.570693] [<871aa49c>] ieee80211_tx_prepare_skb+0x210/0x230 [mac80211]
- +[ 100.577609] [<800af5d4>] mod_timer+0x15c/0x190
- +[ 100.582220] [<871ba8b8>] ieee80211_sta_work+0xfc/0xe1c [mac80211]
- +[ 100.588539] [<871940b4>] ieee80211_ibss_leave+0xeec/0x1900 [mac80211]
- +[ 100.595122] [<8009ec84>] dequeue_task_fair+0x44/0x130
- +[ 100.600281] [<80092a34>] process_one_work+0x1f8/0x334
- +[ 100.605454] [<80093830>] worker_thread+0x2b4/0x408
- +[ 100.610317] [<8009357c>] worker_thread+0x0/0x408
- +[ 100.615019] [<8009357c>] worker_thread+0x0/0x408
- +[ 100.619705] [<80097b68>] kthread+0xdc/0xe8
- +[ 100.623886] [<80097a8c>] kthread+0x0/0xe8
- +[ 100.627961] [<80060878>] ret_from_kernel_thread+0x14/0x1c
- +[ 100.633448]
- +[ 100.634956] ---[ end trace aafbe57e9ae6862f ]---
- +
- +Fixes: cfda2d8e2314 ("ath9k: Fix beacon configuration for addition/removal of interfaces")
- +Signed-off-by: Felix Fietkau <nbd@nbd.name>
- +---
- +
- +--- a/drivers/net/wireless/ath/ath9k/main.c
- ++++ b/drivers/net/wireless/ath/ath9k/main.c
- +@@ -1154,6 +1154,7 @@ void ath9k_calculate_summary_state(struc
- + bool changed = (iter_data.primary_sta != ctx->primary_sta);
- +
- + if (iter_data.primary_sta) {
- ++ iter_data.primary_beacon_vif = iter_data.primary_sta;
- + iter_data.beacons = true;
- + ath9k_set_assoc_state(sc, iter_data.primary_sta,
- + changed);
- diff --git a/package/kernel/mac80211/patches/333-cfg80211-reuse-existing-page-fragments-in-A-MSDU-rx.patch b/package/kernel/mac80211/patches/333-cfg80211-reuse-existing-page-fragments-in-A-MSDU-rx.patch
- deleted file mode 100644
- index 6e2d0cf..0000000
- --- a/package/kernel/mac80211/patches/333-cfg80211-reuse-existing-page-fragments-in-A-MSDU-rx.patch
- +++ /dev/null
- @@ -1,132 +0,0 @@
- -From: Felix Fietkau <nbd@openwrt.org>
- -Date: Mon, 8 Feb 2016 14:33:19 +0100
- -Subject: [PATCH] cfg80211: reuse existing page fragments in A-MSDU rx
- -
- -This massively reduces data copying and thus improves rx performance
- -
- -Signed-off-by: Felix Fietkau <nbd@openwrt.org>
- ----
- -
- ---- a/net/wireless/util.c
- -+++ b/net/wireless/util.c
- -@@ -644,23 +644,93 @@ int ieee80211_data_from_8023(struct sk_b
- - }
- - EXPORT_SYMBOL(ieee80211_data_from_8023);
- -
- -+static void
- -+__frame_add_frag(struct sk_buff *skb, struct page *page,
- -+ void *ptr, int len, int size)
- -+{
- -+ struct skb_shared_info *sh = skb_shinfo(skb);
- -+ int page_offset;
- -+
- -+ atomic_inc(&page->_count);
- -+ page_offset = ptr - page_address(page);
- -+ skb_add_rx_frag(skb, sh->nr_frags, page, page_offset, len, size);
- -+}
- -+
- -+static void
- -+__ieee80211_amsdu_copy_frag(struct sk_buff *skb, struct sk_buff *frame,
- -+ int offset, int len)
- -+{
- -+ struct skb_shared_info *sh = skb_shinfo(skb);
- -+ const skb_frag_t *frag = &sh->frags[-1];
- -+ struct page *frag_page;
- -+ void *frag_ptr;
- -+ int frag_len, frag_size;
- -+ int head_size = skb->len - skb->data_len;
- -+ int cur_len;
- -+
- -+ frag_page = virt_to_head_page(skb->head);
- -+ frag_ptr = skb->data;
- -+ frag_size = head_size;
- -+
- -+ while (offset >= frag_size) {
- -+ offset -= frag_size;
- -+ frag++;
- -+ frag_page = skb_frag_page(frag);
- -+ frag_ptr = skb_frag_address(frag);
- -+ frag_size = skb_frag_size(frag);
- -+ }
- -+
- -+ frag_ptr += offset;
- -+ frag_len = frag_size - offset;
- -+
- -+ cur_len = min(len, frag_len);
- -+
- -+ __frame_add_frag(frame, frag_page, frag_ptr, cur_len, frag_size);
- -+ len -= cur_len;
- -+
- -+ while (len > 0) {
- -+ frag++;
- -+ frag_len = skb_frag_size(frag);
- -+ cur_len = min(len, frag_len);
- -+ __frame_add_frag(frame, skb_frag_page(frag),
- -+ skb_frag_address(frag), cur_len, frag_len);
- -+ len -= cur_len;
- -+ }
- -+}
- -+
- - static struct sk_buff *
- - __ieee80211_amsdu_copy(struct sk_buff *skb, unsigned int hlen,
- -- int offset, int len)
- -+ int offset, int len, bool reuse_frag)
- - {
- - struct sk_buff *frame;
- -+ int cur_len = len;
- -
- - if (skb->len - offset < len)
- - return NULL;
- -
- - /*
- -+ * When reusing framents, copy some data to the head to simplify
- -+ * ethernet header handling and speed up protocol header processing
- -+ * in the stack later.
- -+ */
- -+ if (reuse_frag)
- -+ cur_len = min_t(int, len, 32);
- -+
- -+ /*
- - * Allocate and reserve two bytes more for payload
- - * alignment since sizeof(struct ethhdr) is 14.
- - */
- -- frame = dev_alloc_skb(hlen + sizeof(struct ethhdr) + 2 + len);
- -+ frame = dev_alloc_skb(hlen + sizeof(struct ethhdr) + 2 + cur_len);
- -
- - skb_reserve(frame, hlen + sizeof(struct ethhdr) + 2);
- -- skb_copy_bits(skb, offset, skb_put(frame, len), len);
- -+ skb_copy_bits(skb, offset, skb_put(frame, cur_len), cur_len);
- -+
- -+ len -= cur_len;
- -+ if (!len)
- -+ return frame;
- -+
- -+ offset += cur_len;
- -+ __ieee80211_amsdu_copy_frag(skb, frame, offset, len);
- -
- - return frame;
- - }
- -@@ -676,6 +746,7 @@ void ieee80211_amsdu_to_8023s(struct sk_
- - u8 *payload;
- - int offset = 0, remaining, err;
- - struct ethhdr eth;
- -+ bool reuse_frag = skb->head_frag && !skb_has_frag_list(skb);
- - bool reuse_skb = false;
- - bool last = false;
- -
- -@@ -703,12 +774,13 @@ void ieee80211_amsdu_to_8023s(struct sk_
- - offset += sizeof(struct ethhdr);
- - /* reuse skb for the last subframe */
- - last = remaining <= subframe_len + padding;
- -- if (!skb_is_nonlinear(skb) && last) {
- -+ if (!skb_is_nonlinear(skb) && !reuse_frag && last) {
- - skb_pull(skb, offset);
- - frame = skb;
- - reuse_skb = true;
- - } else {
- -- frame = __ieee80211_amsdu_copy(skb, hlen, offset, len);
- -+ frame = __ieee80211_amsdu_copy(skb, hlen, offset, len,
- -+ reuse_frag);
- - if (!frame)
- - goto purge;
- -
- diff --git a/package/kernel/mac80211/patches/334-mac80211-fix-wiphy-supported_band-access.patch b/package/kernel/mac80211/patches/334-mac80211-fix-wiphy-supported_band-access.patch
- deleted file mode 100644
- index f8f4f09..0000000
- --- a/package/kernel/mac80211/patches/334-mac80211-fix-wiphy-supported_band-access.patch
- +++ /dev/null
- @@ -1,36 +0,0 @@
- -From: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
- -Date: Wed, 10 Feb 2016 16:08:17 +0100
- -Subject: [PATCH] mac80211: fix wiphy supported_band access
- -
- -Fix wiphy supported_band access in tx radiotap parsing. In particular,
- -info->band is always set to 0 (IEEE80211_BAND_2GHZ) since it has not
- -assigned yet. This cause a kernel crash on 5GHz only devices.
- -Move ieee80211_parse_tx_radiotap() after info->band assignment
- -
- -Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
- ----
- -
- ---- a/net/mac80211/tx.c
- -+++ b/net/mac80211/tx.c
- -@@ -1890,10 +1890,6 @@ netdev_tx_t ieee80211_monitor_start_xmit
- - info->flags = IEEE80211_TX_CTL_REQ_TX_STATUS |
- - IEEE80211_TX_CTL_INJECTED;
- -
- -- /* process and remove the injection radiotap header */
- -- if (!ieee80211_parse_tx_radiotap(local, skb))
- -- goto fail;
- --
- - rcu_read_lock();
- -
- - /*
- -@@ -1955,6 +1951,10 @@ netdev_tx_t ieee80211_monitor_start_xmit
- - goto fail_rcu;
- -
- - info->band = chandef->chan->band;
- -+ /* process and remove the injection radiotap header */
- -+ if (!ieee80211_parse_tx_radiotap(local, skb))
- -+ goto fail_rcu;
- -+
- - ieee80211_xmit(sdata, NULL, skb);
- - rcu_read_unlock();
- -
- diff --git a/package/kernel/mac80211/patches/335-mac80211-minstrel_ht-set-A-MSDU-tx-limits-based-on-s.patch b/package/kernel/mac80211/patches/335-mac80211-minstrel_ht-set-A-MSDU-tx-limits-based-on-s.patch
- deleted file mode 100644
- index acaacf7..0000000
- --- a/package/kernel/mac80211/patches/335-mac80211-minstrel_ht-set-A-MSDU-tx-limits-based-on-s.patch
- +++ /dev/null
- @@ -1,61 +0,0 @@
- -From: Felix Fietkau <nbd@openwrt.org>
- -Date: Thu, 18 Feb 2016 19:30:05 +0100
- -Subject: [PATCH] mac80211: minstrel_ht: set A-MSDU tx limits based on selected
- - max_prob_rate
- -
- -Prevents excessive A-MSDU aggregation at low data rates or bad
- -conditions.
- -
- -Signed-off-by: Felix Fietkau <nbd@openwrt.org>
- ----
- -
- ---- a/net/mac80211/rc80211_minstrel_ht.c
- -+++ b/net/mac80211/rc80211_minstrel_ht.c
- -@@ -883,6 +883,39 @@ minstrel_ht_set_rate(struct minstrel_pri
- - ratetbl->rate[offset].flags = flags;
- - }
- -
- -+static int
- -+minstrel_ht_get_max_amsdu_len(struct minstrel_ht_sta *mi)
- -+{
- -+ int group = mi->max_prob_rate / MCS_GROUP_RATES;
- -+ const struct mcs_group *g = &minstrel_mcs_groups[group];
- -+ int rate = mi->max_prob_rate % MCS_GROUP_RATES;
- -+
- -+ /* Disable A-MSDU if max_prob_rate is bad */
- -+ if (mi->groups[group].rates[rate].prob_ewma < MINSTREL_FRAC(50, 100))
- -+ return 1;
- -+
- -+ /* If the rate is slower than single-stream MCS1, make A-MSDU limit small */
- -+ if (g->duration[rate] > MCS_DURATION(1, 0, 52))
- -+ return 500;
- -+
- -+ /*
- -+ * If the rate is slower than single-stream MCS4, limit A-MSDU to usual
- -+ * data packet size
- -+ */
- -+ if (g->duration[rate] > MCS_DURATION(1, 0, 104))
- -+ return 1500;
- -+
- -+ /*
- -+ * If the rate is slower than single-stream MCS7, limit A-MSDU to twice
- -+ * the usual data packet size
- -+ */
- -+ if (g->duration[rate] > MCS_DURATION(1, 0, 260))
- -+ return 3000;
- -+
- -+ /* unlimited */
- -+ return 0;
- -+}
- -+
- - static void
- - minstrel_ht_update_rates(struct minstrel_priv *mp, struct minstrel_ht_sta *mi)
- - {
- -@@ -907,6 +940,7 @@ minstrel_ht_update_rates(struct minstrel
- - minstrel_ht_set_rate(mp, mi, rates, i++, mi->max_prob_rate);
- - }
- -
- -+ mi->sta->max_rc_amsdu_len = minstrel_ht_get_max_amsdu_len(mi);
- - rates->rate[i].idx = -1;
- - rate_control_set_rates(mp->hw, mi->sta, rates);
- - }
- diff --git a/package/kernel/mac80211/patches/336-mac80211-minstrel_ht-set-default-tx-aggregation-time.patch b/package/kernel/mac80211/patches/336-mac80211-minstrel_ht-set-default-tx-aggregation-time.patch
- deleted file mode 100644
- index 32a2ad6..0000000
- --- a/package/kernel/mac80211/patches/336-mac80211-minstrel_ht-set-default-tx-aggregation-time.patch
- +++ /dev/null
- @@ -1,31 +0,0 @@
- -From: Felix Fietkau <nbd@openwrt.org>
- -Date: Thu, 18 Feb 2016 19:45:33 +0100
- -Subject: [PATCH] mac80211: minstrel_ht: set default tx aggregation timeout to
- - 0
- -
- -The value 5000 was put here with the addition of the timeout field to
- -ieee80211_start_tx_ba_session. It was originally added in mac80211 to
- -save resources for drivers like iwlwifi, which only supports a limited
- -number of concurrent aggregation sessions.
- -
- -Since iwlwifi does not use minstrel_ht and other drivers don't need
- -this, 0 is a better default - especially since there have been
- -recent reports of aggregation setup related issues reproduced with
- -ath9k. This should improve stability without causing any adverse
- -effects.
- -
- -Cc: stable@vger.kernel.org
- -Signed-off-by: Felix Fietkau <nbd@openwrt.org>
- ----
- -
- ---- a/net/mac80211/rc80211_minstrel_ht.c
- -+++ b/net/mac80211/rc80211_minstrel_ht.c
- -@@ -692,7 +692,7 @@ minstrel_aggr_check(struct ieee80211_sta
- - if (likely(sta->ampdu_mlme.tid_tx[tid]))
- - return;
- -
- -- ieee80211_start_tx_ba_session(pubsta, tid, 5000);
- -+ ieee80211_start_tx_ba_session(pubsta, tid, 0);
- - }
- -
- - static void
- diff --git a/package/kernel/mac80211/patches/337-mac80211-minstrel_ht-fix-a-logic-error-in-RTS-CTS-ha.patch b/package/kernel/mac80211/patches/337-mac80211-minstrel_ht-fix-a-logic-error-in-RTS-CTS-ha.patch
- deleted file mode 100644
- index 229351b..0000000
- --- a/package/kernel/mac80211/patches/337-mac80211-minstrel_ht-fix-a-logic-error-in-RTS-CTS-ha.patch
- +++ /dev/null
- @@ -1,26 +0,0 @@
- -From: Felix Fietkau <nbd@openwrt.org>
- -Date: Wed, 24 Feb 2016 12:03:13 +0100
- -Subject: [PATCH] mac80211: minstrel_ht: fix a logic error in RTS/CTS handling
- -MIME-Version: 1.0
- -Content-Type: text/plain; charset=UTF-8
- -Content-Transfer-Encoding: 8bit
- -
- -RTS/CTS needs to be enabled if the rate is a fallback rate *or* if it's
- -a dual-stream rate and the sta is in dynamic SMPS mode.
- -
- -Fixes: a3ebb4e1b763 ("mac80211: minstrel_ht: handle peers in dynamic SMPS")
- -Reported-by: Matías Richart <mrichart@fing.edu.uy>
- -Signed-off-by: Felix Fietkau <nbd@openwrt.org>
- ----
- -
- ---- a/net/mac80211/rc80211_minstrel_ht.c
- -+++ b/net/mac80211/rc80211_minstrel_ht.c
- -@@ -872,7 +872,7 @@ minstrel_ht_set_rate(struct minstrel_pri
- - * - if station is in dynamic SMPS (and streams > 1)
- - * - for fallback rates, to increase chances of getting through
- - */
- -- if (offset > 0 &&
- -+ if (offset > 0 ||
- - (mi->sta->smps_mode == IEEE80211_SMPS_DYNAMIC &&
- - group->streams > 1)) {
- - ratetbl->rate[offset].count = ratetbl->rate[offset].count_rts;
- diff --git a/package/kernel/mac80211/patches/338-mac80211-Fix-Public-Action-frame-RX-in-AP-mode.patch b/package/kernel/mac80211/patches/338-mac80211-Fix-Public-Action-frame-RX-in-AP-mode.patch
- deleted file mode 100644
- index 56cd94a..0000000
- --- a/package/kernel/mac80211/patches/338-mac80211-Fix-Public-Action-frame-RX-in-AP-mode.patch
- +++ /dev/null
- @@ -1,35 +0,0 @@
- -From: Jouni Malinen <jouni@qca.qualcomm.com>
- -Date: Tue, 1 Mar 2016 00:29:00 +0200
- -Subject: [PATCH] mac80211: Fix Public Action frame RX in AP mode
- -
- -Public Action frames use special rules for how the BSSID field (Address
- -3) is set. A wildcard BSSID is used in cases where the transmitter and
- -recipient are not members of the same BSS. As such, we need to accept
- -Public Action frames with wildcard BSSID.
- -
- -Commit db8e17324553 ("mac80211: ignore frames between TDLS peers when
- -operating as AP") added a rule that drops Action frames to TDLS-peers
- -based on an Action frame having different DA (Address 1) and BSSID
- -(Address 3) values. This is not correct since it misses the possibility
- -of BSSID being a wildcard BSSID in which case the Address 1 would not
- -necessarily match.
- -
- -Fix this by allowing mac80211 to accept wildcard BSSID in an Action
- -frame when in AP mode.
- -
- -Fixes: db8e17324553 ("mac80211: ignore frames between TDLS peers when operating as AP")
- -Cc: stable@vger.kernel.org
- -Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
- -Signed-off-by: Johannes Berg <johannes.berg@intel.com>
- ----
- -
- ---- a/net/mac80211/rx.c
- -+++ b/net/mac80211/rx.c
- -@@ -3374,6 +3374,7 @@ static bool ieee80211_accept_frame(struc
- - return false;
- - /* ignore action frames to TDLS-peers */
- - if (ieee80211_is_action(hdr->frame_control) &&
- -+ !is_broadcast_ether_addr(bssid) &&
- - !ether_addr_equal(bssid, hdr->addr1))
- - return false;
- - }
- diff --git a/package/kernel/mac80211/patches/339-cfg80211-add-radiotap-VHT-info-to-rtap_namespace_siz.patch b/package/kernel/mac80211/patches/339-cfg80211-add-radiotap-VHT-info-to-rtap_namespace_siz.patch
- deleted file mode 100644
- index 15d6cd0..0000000
- --- a/package/kernel/mac80211/patches/339-cfg80211-add-radiotap-VHT-info-to-rtap_namespace_siz.patch
- +++ /dev/null
- @@ -1,21 +0,0 @@
- -From: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
- -Date: Fri, 19 Feb 2016 11:43:04 +0100
- -Subject: [PATCH] cfg80211: add radiotap VHT info to rtap_namespace_sizes
- -
- -Add IEEE80211_RADIOTAP_VHT entry to rtap_namespace_sizes array in order to
- -define alignment and size of VHT info in tx radiotap
- -
- -Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
- -Signed-off-by: Johannes Berg <johannes.berg@intel.com>
- ----
- -
- ---- a/net/wireless/radiotap.c
- -+++ b/net/wireless/radiotap.c
- -@@ -43,6 +43,7 @@ static const struct radiotap_align_size
- - [IEEE80211_RADIOTAP_DATA_RETRIES] = { .align = 1, .size = 1, },
- - [IEEE80211_RADIOTAP_MCS] = { .align = 1, .size = 3, },
- - [IEEE80211_RADIOTAP_AMPDU_STATUS] = { .align = 4, .size = 8, },
- -+ [IEEE80211_RADIOTAP_VHT] = { .align = 2, .size = 12, },
- - /*
- - * add more here as they are defined in radiotap.h
- - */
- diff --git a/package/kernel/mac80211/patches/340-mac80211-fix-parsing-of-40Mhz-in-injected-radiotap-h.patch b/package/kernel/mac80211/patches/340-mac80211-fix-parsing-of-40Mhz-in-injected-radiotap-h.patch
- deleted file mode 100644
- index de1b386..0000000
- --- a/package/kernel/mac80211/patches/340-mac80211-fix-parsing-of-40Mhz-in-injected-radiotap-h.patch
- +++ /dev/null
- @@ -1,36 +0,0 @@
- -From: Sven Eckelmann <sven@narfation.org>
- -Date: Wed, 24 Feb 2016 16:25:49 +0100
- -Subject: [PATCH] mac80211: fix parsing of 40Mhz in injected radiotap
- - header
- -
- -The MCS bandwidth part of the radiotap header is 2 bits wide. The full 2
- -bit have to compared against IEEE80211_RADIOTAP_MCS_BW_40 and not only if
- -the first bit is set. Otherwise IEEE80211_RADIOTAP_MCS_BW_40 can be
- -confused with IEEE80211_RADIOTAP_MCS_BW_20U.
- -
- -Fixes: 5ec3aed9ba4c ("mac80211: Parse legacy and HT rate in injected frames")
- -Signed-off-by: Sven Eckelmann <sven@narfation.org>
- ----
- -
- ---- a/net/mac80211/tx.c
- -+++ b/net/mac80211/tx.c
- -@@ -1689,7 +1689,7 @@ static bool ieee80211_parse_tx_radiotap(
- - bool rate_found = false;
- - u8 rate_retries = 0;
- - u16 rate_flags = 0;
- -- u8 mcs_known, mcs_flags;
- -+ u8 mcs_known, mcs_flags, mcs_bw;
- - int i;
- -
- - info->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT |
- -@@ -1765,8 +1765,9 @@ static bool ieee80211_parse_tx_radiotap(
- - mcs_flags & IEEE80211_RADIOTAP_MCS_SGI)
- - rate_flags |= IEEE80211_TX_RC_SHORT_GI;
- -
- -+ mcs_bw = mcs_flags & IEEE80211_RADIOTAP_MCS_BW_MASK;
- - if (mcs_known & IEEE80211_RADIOTAP_MCS_HAVE_BW &&
- -- mcs_flags & IEEE80211_RADIOTAP_MCS_BW_40)
- -+ mcs_bw == IEEE80211_RADIOTAP_MCS_BW_40)
- - rate_flags |= IEEE80211_TX_RC_40_MHZ_WIDTH;
- - break;
- -
- diff --git a/package/kernel/mac80211/patches/341-mac80211-parse-VHT-info-in-injected-frames.patch b/package/kernel/mac80211/patches/341-mac80211-parse-VHT-info-in-injected-frames.patch
- deleted file mode 100644
- index ac1f251..0000000
- --- a/package/kernel/mac80211/patches/341-mac80211-parse-VHT-info-in-injected-frames.patch
- +++ /dev/null
- @@ -1,65 +0,0 @@
- -From: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
- -Date: Tue, 23 Feb 2016 15:43:35 +0100
- -Subject: [PATCH] mac80211: parse VHT info in injected frames
- -
- -Add VHT radiotap parsing support to ieee80211_parse_tx_radiotap().
- -That capability has been tested using a d-link dir-860l rev b1 running
- -OpenWrt trunk and mt76 driver
- -
- -Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
- ----
- -
- ---- a/net/mac80211/tx.c
- -+++ b/net/mac80211/tx.c
- -@@ -1690,6 +1690,8 @@ static bool ieee80211_parse_tx_radiotap(
- - u8 rate_retries = 0;
- - u16 rate_flags = 0;
- - u8 mcs_known, mcs_flags, mcs_bw;
- -+ u16 vht_known;
- -+ u8 vht_mcs = 0, vht_nss = 0;
- - int i;
- -
- - info->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT |
- -@@ -1771,6 +1773,32 @@ static bool ieee80211_parse_tx_radiotap(
- - rate_flags |= IEEE80211_TX_RC_40_MHZ_WIDTH;
- - break;
- -
- -+ case IEEE80211_RADIOTAP_VHT:
- -+ vht_known = get_unaligned_le16(iterator.this_arg);
- -+ rate_found = true;
- -+
- -+ rate_flags = IEEE80211_TX_RC_VHT_MCS;
- -+ if ((vht_known & IEEE80211_RADIOTAP_VHT_KNOWN_GI) &&
- -+ (iterator.this_arg[2] &
- -+ IEEE80211_RADIOTAP_VHT_FLAG_SGI))
- -+ rate_flags |= IEEE80211_TX_RC_SHORT_GI;
- -+ if (vht_known &
- -+ IEEE80211_RADIOTAP_VHT_KNOWN_BANDWIDTH) {
- -+ if (iterator.this_arg[3] == 1)
- -+ rate_flags |=
- -+ IEEE80211_TX_RC_40_MHZ_WIDTH;
- -+ else if (iterator.this_arg[3] == 4)
- -+ rate_flags |=
- -+ IEEE80211_TX_RC_80_MHZ_WIDTH;
- -+ else if (iterator.this_arg[3] == 11)
- -+ rate_flags |=
- -+ IEEE80211_TX_RC_160_MHZ_WIDTH;
- -+ }
- -+
- -+ vht_mcs = iterator.this_arg[4] >> 4;
- -+ vht_nss = iterator.this_arg[4] & 0xF;
- -+ break;
- -+
- - /*
- - * Please update the file
- - * Documentation/networking/mac80211-injection.txt
- -@@ -1796,6 +1824,9 @@ static bool ieee80211_parse_tx_radiotap(
- -
- - if (rate_flags & IEEE80211_TX_RC_MCS) {
- - info->control.rates[0].idx = rate;
- -+ } else if (rate_flags & IEEE80211_TX_RC_VHT_MCS) {
- -+ ieee80211_rate_set_vht(info->control.rates, vht_mcs,
- -+ vht_nss);
- - } else {
- - for (i = 0; i < sband->n_bitrates; i++) {
- - if (rate * 5 != sband->bitrates[i].bitrate)
- diff --git a/package/kernel/mac80211/patches/342-mac80211-do-not-pass-injected-frames-without-a-valid.patch b/package/kernel/mac80211/patches/342-mac80211-do-not-pass-injected-frames-without-a-valid.patch
- deleted file mode 100644
- index d7452c2..0000000
- --- a/package/kernel/mac80211/patches/342-mac80211-do-not-pass-injected-frames-without-a-valid.patch
- +++ /dev/null
- @@ -1,23 +0,0 @@
- -From: Felix Fietkau <nbd@openwrt.org>
- -Date: Wed, 2 Mar 2016 15:51:40 +0100
- -Subject: [PATCH] mac80211: do not pass injected frames without a valid rate to
- - the driver
- -
- -Fall back to rate control if the requested bitrate was not found.
- -
- -Fixes: dfdfc2beb0dd ("mac80211: Parse legacy and HT rate in injected frames")
- -Signed-off-by: Felix Fietkau <nbd@openwrt.org>
- ----
- -
- ---- a/net/mac80211/tx.c
- -+++ b/net/mac80211/tx.c
- -@@ -1837,6 +1837,9 @@ static bool ieee80211_parse_tx_radiotap(
- - }
- - }
- -
- -+ if (info->control.rates[0].idx < 0)
- -+ info->control.flags &= ~IEEE80211_TX_CTRL_RATE_INJECT;
- -+
- - info->control.rates[0].flags = rate_flags;
- - info->control.rates[0].count = min_t(u8, rate_retries + 1,
- - local->hw.max_rate_tries);
- diff --git a/package/kernel/mac80211/patches/343-mac80211-minstrel_ht-improve-sample-rate-skip-logic.patch b/package/kernel/mac80211/patches/343-mac80211-minstrel_ht-improve-sample-rate-skip-logic.patch
- deleted file mode 100644
- index 55ff817..0000000
- --- a/package/kernel/mac80211/patches/343-mac80211-minstrel_ht-improve-sample-rate-skip-logic.patch
- +++ /dev/null
- @@ -1,77 +0,0 @@
- -From: Felix Fietkau <nbd@openwrt.org>
- -Date: Thu, 3 Mar 2016 23:20:06 +0100
- -Subject: [PATCH] mac80211: minstrel_ht: improve sample rate skip logic
- -
- -There were a few issues that were slowing down the process of finding
- -the optimal rate, especially on devices with multi-rate retry
- -limitations:
- -
- -When max_tp_rate[0] was slower than max_tp_rate[1], the code did not
- -sample max_tp_rate[1], which would often allow it to switch places with
- -max_tp_rate[0] (e.g. if only the first sampling attempts were bad, but the
- -rate is otherwise good).
- -
- -Also, sample attempts of rates between max_tp_rate[0] and [1] were being
- -ignored in this case, because the code only checked if the rate was
- -slower than [1].
- -
- -Fix this by checking against the fastest / second fastest max_tp_rate
- -instead of assuming a specific order between the two.
- -
- -In my tests this patch significantly reduces the time until minstrel_ht
- -finds the optimal rate right after assoc
- -
- -Signed-off-by: Felix Fietkau <nbd@openwrt.org>
- ----
- -
- ---- a/net/mac80211/rc80211_minstrel_ht.c
- -+++ b/net/mac80211/rc80211_minstrel_ht.c
- -@@ -958,6 +958,7 @@ minstrel_get_sample_rate(struct minstrel
- - struct minstrel_rate_stats *mrs;
- - struct minstrel_mcs_group_data *mg;
- - unsigned int sample_dur, sample_group, cur_max_tp_streams;
- -+ int tp_rate1, tp_rate2;
- - int sample_idx = 0;
- -
- - if (mi->sample_wait > 0) {
- -@@ -979,14 +980,22 @@ minstrel_get_sample_rate(struct minstrel
- - mrs = &mg->rates[sample_idx];
- - sample_idx += sample_group * MCS_GROUP_RATES;
- -
- -+ /* Set tp_rate1, tp_rate2 to the highest / second highest max_tp_rate */
- -+ if (minstrel_get_duration(mi->max_tp_rate[0]) >
- -+ minstrel_get_duration(mi->max_tp_rate[1])) {
- -+ tp_rate1 = mi->max_tp_rate[1];
- -+ tp_rate2 = mi->max_tp_rate[0];
- -+ } else {
- -+ tp_rate1 = mi->max_tp_rate[0];
- -+ tp_rate2 = mi->max_tp_rate[1];
- -+ }
- -+
- - /*
- - * Sampling might add some overhead (RTS, no aggregation)
- -- * to the frame. Hence, don't use sampling for the currently
- -- * used rates.
- -+ * to the frame. Hence, don't use sampling for the highest currently
- -+ * used highest throughput or probability rate.
- - */
- -- if (sample_idx == mi->max_tp_rate[0] ||
- -- sample_idx == mi->max_tp_rate[1] ||
- -- sample_idx == mi->max_prob_rate)
- -+ if (sample_idx == mi->max_tp_rate[0] || sample_idx == mi->max_prob_rate)
- - return -1;
- -
- - /*
- -@@ -1001,10 +1010,10 @@ minstrel_get_sample_rate(struct minstrel
- - * if the link is working perfectly.
- - */
- -
- -- cur_max_tp_streams = minstrel_mcs_groups[mi->max_tp_rate[0] /
- -+ cur_max_tp_streams = minstrel_mcs_groups[tp_rate1 /
- - MCS_GROUP_RATES].streams;
- - sample_dur = minstrel_get_duration(sample_idx);
- -- if (sample_dur >= minstrel_get_duration(mi->max_tp_rate[1]) &&
- -+ if (sample_dur >= minstrel_get_duration(tp_rate2) &&
- - (cur_max_tp_streams - 1 <
- - minstrel_mcs_groups[sample_group].streams ||
- - sample_dur >= minstrel_get_duration(mi->max_prob_rate))) {
- diff --git a/package/kernel/mac80211/patches/344-0008-brcmfmac-use-device-memsize-config-from-fw-if-define.patch b/package/kernel/mac80211/patches/344-0008-brcmfmac-use-device-memsize-config-from-fw-if-define.patch
- deleted file mode 100644
- index 3de0f64..0000000
- --- a/package/kernel/mac80211/patches/344-0008-brcmfmac-use-device-memsize-config-from-fw-if-define.patch
- +++ /dev/null
- @@ -1,73 +0,0 @@
- -From: Hante Meuleman <meuleman@broadcom.com>
- -Date: Wed, 17 Feb 2016 11:26:57 +0100
- -Subject: [PATCH] brcmfmac: use device memsize config from fw if defined
- -
- -Newer type pcie devices have memory which get shared between fw and
- -hw. The division of this memory is done firmware compile time. As a
- -result the ramsize as used by driver needs to be adjusted for this.
- -This is done by reading the memory size from the firmware.
- -
- -Reviewed-by: Arend Van Spriel <arend@broadcom.com>
- -Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
- -Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
- -Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
- -Signed-off-by: Arend van Spriel <arend@broadcom.com>
- -Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
- ----
- -
- ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
- -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
- -@@ -207,6 +207,10 @@ static struct brcmf_firmware_mapping brc
- - #define BRCMF_PCIE_CFGREG_REG_BAR3_CONFIG 0x4F4
- - #define BRCMF_PCIE_LINK_STATUS_CTRL_ASPM_ENAB 3
- -
- -+/* Magic number at a magic location to find RAM size */
- -+#define BRCMF_RAMSIZE_MAGIC 0x534d4152 /* SMAR */
- -+#define BRCMF_RAMSIZE_OFFSET 0x6c
- -+
- -
- - struct brcmf_pcie_console {
- - u32 base_addr;
- -@@ -1412,6 +1416,28 @@ static const struct brcmf_bus_ops brcmf_
- - };
- -
- -
- -+static void
- -+brcmf_pcie_adjust_ramsize(struct brcmf_pciedev_info *devinfo, u8 *data,
- -+ u32 data_len)
- -+{
- -+ __le32 *field;
- -+ u32 newsize;
- -+
- -+ if (data_len < BRCMF_RAMSIZE_OFFSET + 8)
- -+ return;
- -+
- -+ field = (__le32 *)&data[BRCMF_RAMSIZE_OFFSET];
- -+ if (le32_to_cpup(field) != BRCMF_RAMSIZE_MAGIC)
- -+ return;
- -+ field++;
- -+ newsize = le32_to_cpup(field);
- -+
- -+ brcmf_dbg(PCIE, "Found ramsize info in FW, adjusting to 0x%x\n",
- -+ newsize);
- -+ devinfo->ci->ramsize = newsize;
- -+}
- -+
- -+
- - static int
- - brcmf_pcie_init_share_ram_info(struct brcmf_pciedev_info *devinfo,
- - u32 sharedram_addr)
- -@@ -1694,6 +1720,13 @@ static void brcmf_pcie_setup(struct devi
- -
- - brcmf_pcie_attach(devinfo);
- -
- -+ /* Some of the firmwares have the size of the memory of the device
- -+ * defined inside the firmware. This is because part of the memory in
- -+ * the device is shared and the devision is determined by FW. Parse
- -+ * the firmware and adjust the chip memory size now.
- -+ */
- -+ brcmf_pcie_adjust_ramsize(devinfo, (u8 *)fw->data, fw->size);
- -+
- - ret = brcmf_pcie_download_fw_nvram(devinfo, fw, nvram, nvram_len);
- - if (ret)
- - goto fail;
- diff --git a/package/kernel/mac80211/patches/344-0009-brcmfmac-use-bar1-window-size-as-provided-by-pci-sub.patch b/package/kernel/mac80211/patches/344-0009-brcmfmac-use-bar1-window-size-as-provided-by-pci-sub.patch
- deleted file mode 100644
- index ca03ffe..0000000
- --- a/package/kernel/mac80211/patches/344-0009-brcmfmac-use-bar1-window-size-as-provided-by-pci-sub.patch
- +++ /dev/null
- @@ -1,58 +0,0 @@
- -From: Hante Meuleman <meuleman@broadcom.com>
- -Date: Wed, 17 Feb 2016 11:26:58 +0100
- -Subject: [PATCH] brcmfmac: use bar1 window size as provided by pci subsystem
- -
- -The PCIE bar1 window size is specified by chip. Currently the
- -ioremap of bar1 was using a define which always matched the size
- -of bar1, but newer chips can have a different bar1 sizes. With
- -this patch the ioremap will be called with the by chip provided
- -window size.
- -
- -Reviewed-by: Arend Van Spriel <arend@broadcom.com>
- -Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
- -Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
- -Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
- -Signed-off-by: Arend van Spriel <arend@broadcom.com>
- -Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
- ----
- -
- ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
- -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
- -@@ -72,7 +72,6 @@ static struct brcmf_firmware_mapping brc
- -
- - #define BRCMF_PCIE_FW_UP_TIMEOUT 2000 /* msec */
- -
- --#define BRCMF_PCIE_TCM_MAP_SIZE (4096 * 1024)
- - #define BRCMF_PCIE_REG_MAP_SIZE (32 * 1024)
- -
- - /* backplane addres space accessed by BAR0 */
- -@@ -252,7 +251,6 @@ struct brcmf_pciedev_info {
- - char nvram_name[BRCMF_FW_NAME_LEN];
- - void __iomem *regs;
- - void __iomem *tcm;
- -- u32 tcm_size;
- - u32 ram_base;
- - u32 ram_size;
- - struct brcmf_chip *ci;
- -@@ -1592,8 +1590,7 @@ static int brcmf_pcie_get_resource(struc
- - }
- -
- - devinfo->regs = ioremap_nocache(bar0_addr, BRCMF_PCIE_REG_MAP_SIZE);
- -- devinfo->tcm = ioremap_nocache(bar1_addr, BRCMF_PCIE_TCM_MAP_SIZE);
- -- devinfo->tcm_size = BRCMF_PCIE_TCM_MAP_SIZE;
- -+ devinfo->tcm = ioremap_nocache(bar1_addr, bar1_size);
- -
- - if (!devinfo->regs || !devinfo->tcm) {
- - brcmf_err("ioremap() failed (%p,%p)\n", devinfo->regs,
- -@@ -1602,8 +1599,9 @@ static int brcmf_pcie_get_resource(struc
- - }
- - brcmf_dbg(PCIE, "Phys addr : reg space = %p base addr %#016llx\n",
- - devinfo->regs, (unsigned long long)bar0_addr);
- -- brcmf_dbg(PCIE, "Phys addr : mem space = %p base addr %#016llx\n",
- -- devinfo->tcm, (unsigned long long)bar1_addr);
- -+ brcmf_dbg(PCIE, "Phys addr : mem space = %p base addr %#016llx size 0x%x\n",
- -+ devinfo->tcm, (unsigned long long)bar1_addr,
- -+ (unsigned int)bar1_size);
- -
- - return 0;
- - }
- diff --git a/package/kernel/mac80211/patches/344-0010-brcmfmac-add-support-for-the-PCIE-4366c0-chip.patch b/package/kernel/mac80211/patches/344-0010-brcmfmac-add-support-for-the-PCIE-4366c0-chip.patch
- deleted file mode 100644
- index e4a8f30..0000000
- --- a/package/kernel/mac80211/patches/344-0010-brcmfmac-add-support-for-the-PCIE-4366c0-chip.patch
- +++ /dev/null
- @@ -1,34 +0,0 @@
- -From: Hante Meuleman <meuleman@broadcom.com>
- -Date: Wed, 17 Feb 2016 11:26:59 +0100
- -Subject: [PATCH] brcmfmac: add support for the PCIE 4366c0 chip
- -
- -A newer version of the 4366 PCIE chip has been released. Add
- -support for this version of the chip.
- -
- -Reviewed-by: Arend Van Spriel <arend@broadcom.com>
- -Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
- -Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
- -Signed-off-by: Arend van Spriel <arend@broadcom.com>
- -Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
- ----
- -
- ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
- -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
- -@@ -53,6 +53,7 @@ BRCMF_FW_NVRAM_DEF(4358, "brcmfmac4358-p
- - BRCMF_FW_NVRAM_DEF(4359, "brcmfmac4359-pcie.bin", "brcmfmac4359-pcie.txt");
- - BRCMF_FW_NVRAM_DEF(4365B, "brcmfmac4365b-pcie.bin", "brcmfmac4365b-pcie.txt");
- - BRCMF_FW_NVRAM_DEF(4366B, "brcmfmac4366b-pcie.bin", "brcmfmac4366b-pcie.txt");
- -+BRCMF_FW_NVRAM_DEF(4366C, "brcmfmac4366c-pcie.bin", "brcmfmac4366c-pcie.txt");
- - BRCMF_FW_NVRAM_DEF(4371, "brcmfmac4371-pcie.bin", "brcmfmac4371-pcie.txt");
- -
- - static struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {
- -@@ -66,7 +67,8 @@ static struct brcmf_firmware_mapping brc
- - BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4358_CHIP_ID, 0xFFFFFFFF, 4358),
- - BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4359_CHIP_ID, 0xFFFFFFFF, 4359),
- - BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4365_CHIP_ID, 0xFFFFFFFF, 4365B),
- -- BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4366_CHIP_ID, 0xFFFFFFFF, 4366B),
- -+ BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4366_CHIP_ID, 0x0000000F, 4366B),
- -+ BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4366_CHIP_ID, 0xFFFFFFF0, 4366C),
- - BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4371_CHIP_ID, 0xFFFFFFFF, 4371),
- - };
- -
- diff --git a/package/kernel/mac80211/patches/344-0012-brcmfmac-increase-timeout-for-tx-eapol.patch b/package/kernel/mac80211/patches/344-0012-brcmfmac-increase-timeout-for-tx-eapol.patch
- deleted file mode 100644
- index c529ff2..0000000
- --- a/package/kernel/mac80211/patches/344-0012-brcmfmac-increase-timeout-for-tx-eapol.patch
- +++ /dev/null
- @@ -1,30 +0,0 @@
- -From: Hante Meuleman <meuleman@broadcom.com>
- -Date: Wed, 17 Feb 2016 11:27:01 +0100
- -Subject: [PATCH] brcmfmac: increase timeout for tx eapol
- -
- -When keys get set and updated this has to happen after eapol got
- -transmitted (without key or old key) before the key can be updated.
- -To make sure the order of sending eapol and configuring key is done
- -correctly a timeout for tx of eapol is applied. This timeout is set
- -to 50 msec, which is not always enough. Especially in AP mode and
- -key updates the timeout may need to be much longer because client(s)
- -can be in powersave. Increase the timeout from 50 to 950 msec.
- -
- -Reviewed-by: Arend Van Spriel <arend@broadcom.com>
- -Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
- -Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
- -Signed-off-by: Arend van Spriel <arend@broadcom.com>
- -Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
- ----
- -
- ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
- -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
- -@@ -40,7 +40,7 @@ MODULE_AUTHOR("Broadcom Corporation");
- - MODULE_DESCRIPTION("Broadcom 802.11 wireless LAN fullmac driver.");
- - MODULE_LICENSE("Dual BSD/GPL");
- -
- --#define MAX_WAIT_FOR_8021X_TX msecs_to_jiffies(50)
- -+#define MAX_WAIT_FOR_8021X_TX msecs_to_jiffies(950)
- -
- - /* AMPDU rx reordering definitions */
- - #define BRCMF_RXREORDER_FLOWID_OFFSET 0
- diff --git a/package/kernel/mac80211/patches/345-brcmfmac-insert-default-boardrev-in-nvram-data-if-mi.patch b/package/kernel/mac80211/patches/345-brcmfmac-insert-default-boardrev-in-nvram-data-if-mi.patch
- deleted file mode 100644
- index f293401..0000000
- --- a/package/kernel/mac80211/patches/345-brcmfmac-insert-default-boardrev-in-nvram-data-if-mi.patch
- +++ /dev/null
- @@ -1,114 +0,0 @@
- -From: Hante Meuleman <hante.meuleman@broadcom.com>
- -Date: Mon, 11 Apr 2016 11:35:23 +0200
- -Subject: [PATCH] brcmfmac: insert default boardrev in nvram data if
- - missing
- -
- -Some nvram files/stores come without the boardrev information,
- -but firmware requires this to be set. When not found in nvram then
- -add a default boardrev string to the nvram data.
- -
- -Reported-by: Rafal Milecki <zajec5@gmail.com>
- -Reviewed-by: Arend Van Spriel <arend@broadcom.com>
- -Reviewed-by: Franky (Zhenhui) Lin <franky.lin@broadcom.com>
- -Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
- -Signed-off-by: Hante Meuleman <hante.meuleman@broadcom.com>
- -Signed-off-by: Arend van Spriel <arend@broadcom.com>
- -Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
- ----
- -
- ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
- -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
- -@@ -29,6 +29,7 @@
- - #define BRCMF_FW_MAX_NVRAM_SIZE 64000
- - #define BRCMF_FW_NVRAM_DEVPATH_LEN 19 /* devpath0=pcie/1/4/ */
- - #define BRCMF_FW_NVRAM_PCIEDEV_LEN 10 /* pcie/1/4/ + \0 */
- -+#define BRCMF_FW_DEFAULT_BOARDREV "boardrev=0xff"
- -
- - enum nvram_parser_state {
- - IDLE,
- -@@ -51,6 +52,7 @@ enum nvram_parser_state {
- - * @entry: start position of key,value entry.
- - * @multi_dev_v1: detect pcie multi device v1 (compressed).
- - * @multi_dev_v2: detect pcie multi device v2.
- -+ * @boardrev_found: nvram contains boardrev information.
- - */
- - struct nvram_parser {
- - enum nvram_parser_state state;
- -@@ -63,6 +65,7 @@ struct nvram_parser {
- - u32 entry;
- - bool multi_dev_v1;
- - bool multi_dev_v2;
- -+ bool boardrev_found;
- - };
- -
- - /**
- -@@ -125,6 +128,8 @@ static enum nvram_parser_state brcmf_nvr
- - nvp->multi_dev_v1 = true;
- - if (strncmp(&nvp->data[nvp->entry], "pcie/", 5) == 0)
- - nvp->multi_dev_v2 = true;
- -+ if (strncmp(&nvp->data[nvp->entry], "boardrev", 8) == 0)
- -+ nvp->boardrev_found = true;
- - } else if (!is_nvram_char(c) || c == ' ') {
- - brcmf_dbg(INFO, "warning: ln=%d:col=%d: '=' expected, skip invalid key entry\n",
- - nvp->line, nvp->column);
- -@@ -284,6 +289,8 @@ static void brcmf_fw_strip_multi_v1(stru
- - while (i < nvp->nvram_len) {
- - if ((nvp->nvram[i] - '0' == id) && (nvp->nvram[i + 1] == ':')) {
- - i += 2;
- -+ if (strncmp(&nvp->nvram[i], "boardrev", 8) == 0)
- -+ nvp->boardrev_found = true;
- - while (nvp->nvram[i] != 0) {
- - nvram[j] = nvp->nvram[i];
- - i++;
- -@@ -335,6 +342,8 @@ static void brcmf_fw_strip_multi_v2(stru
- - while (i < nvp->nvram_len - len) {
- - if (strncmp(&nvp->nvram[i], prefix, len) == 0) {
- - i += len;
- -+ if (strncmp(&nvp->nvram[i], "boardrev", 8) == 0)
- -+ nvp->boardrev_found = true;
- - while (nvp->nvram[i] != 0) {
- - nvram[j] = nvp->nvram[i];
- - i++;
- -@@ -356,6 +365,18 @@ fail:
- - nvp->nvram_len = 0;
- - }
- -
- -+static void brcmf_fw_add_defaults(struct nvram_parser *nvp)
- -+{
- -+ if (nvp->boardrev_found)
- -+ return;
- -+
- -+ memcpy(&nvp->nvram[nvp->nvram_len], &BRCMF_FW_DEFAULT_BOARDREV,
- -+ strlen(BRCMF_FW_DEFAULT_BOARDREV));
- -+ nvp->nvram_len += strlen(BRCMF_FW_DEFAULT_BOARDREV);
- -+ nvp->nvram[nvp->nvram_len] = '\0';
- -+ nvp->nvram_len++;
- -+}
- -+
- - /* brcmf_nvram_strip :Takes a buffer of "<var>=<value>\n" lines read from a fil
- - * and ending in a NUL. Removes carriage returns, empty lines, comment lines,
- - * and converts newlines to NULs. Shortens buffer as needed and pads with NULs.
- -@@ -377,16 +398,21 @@ static void *brcmf_fw_nvram_strip(const
- - if (nvp.state == END)
- - break;
- - }
- -- if (nvp.multi_dev_v1)
- -+ if (nvp.multi_dev_v1) {
- -+ nvp.boardrev_found = false;
- - brcmf_fw_strip_multi_v1(&nvp, domain_nr, bus_nr);
- -- else if (nvp.multi_dev_v2)
- -+ } else if (nvp.multi_dev_v2) {
- -+ nvp.boardrev_found = false;
- - brcmf_fw_strip_multi_v2(&nvp, domain_nr, bus_nr);
- -+ }
- -
- - if (nvp.nvram_len == 0) {
- - kfree(nvp.nvram);
- - return NULL;
- - }
- -
- -+ brcmf_fw_add_defaults(&nvp);
- -+
- - pad = nvp.nvram_len;
- - *new_length = roundup(nvp.nvram_len + 1, 4);
- - while (pad != *new_length) {
- diff --git a/package/kernel/mac80211/patches/402-ath_regd_optional.patch b/package/kernel/mac80211/patches/402-ath_regd_optional.patch
- index 7351353..4634283 100644
- --- a/package/kernel/mac80211/patches/402-ath_regd_optional.patch
- +++ b/package/kernel/mac80211/patches/402-ath_regd_optional.patch
- @@ -8,7 +8,7 @@
- + return;
- +#endif
- +
- - for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
- + for (band = 0; band < NUM_NL80211_BANDS; band++) {
- if (!wiphy->bands[band])
- continue;
- @@ -374,6 +378,10 @@ ath_reg_apply_ir_flags(struct wiphy *wip
- @@ -19,7 +19,7 @@
- + return;
- +#endif
- +
- - sband = wiphy->bands[IEEE80211_BAND_2GHZ];
- + sband = wiphy->bands[NL80211_BAND_2GHZ];
- if (!sband)
- return;
- @@ -402,6 +410,10 @@ static void ath_reg_apply_radar_flags(st
- @@ -30,7 +30,7 @@
- + return;
- +#endif
- +
- - if (!wiphy->bands[IEEE80211_BAND_5GHZ])
- + if (!wiphy->bands[NL80211_BAND_5GHZ])
- return;
-
- @@ -633,6 +645,11 @@ ath_regd_init_wiphy(struct ath_regulator
- @@ -59,7 +59,7 @@
- ---help---
- --- a/.local-symbols
- +++ b/.local-symbols
- -@@ -125,6 +125,7 @@ ADM8211=
- +@@ -127,6 +127,7 @@ ADM8211=
- ATH_COMMON=
- WLAN_VENDOR_ATH=
- ATH_DEBUG=
- diff --git a/package/kernel/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch b/package/kernel/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch
- index 1a62484..f2f52f9 100644
- --- a/package/kernel/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch
- +++ b/package/kernel/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch
- @@ -1,6 +1,6 @@
- --- a/drivers/net/wireless/ath/ath9k/init.c
- +++ b/drivers/net/wireless/ath/ath9k/init.c
- -@@ -722,6 +722,7 @@ static const struct ieee80211_iface_limi
- +@@ -727,6 +727,7 @@ static const struct ieee80211_iface_limi
- BIT(NL80211_IFTYPE_AP) },
- { .max = 1, .types = BIT(NL80211_IFTYPE_P2P_CLIENT) |
- BIT(NL80211_IFTYPE_P2P_GO) },
- diff --git a/package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch b/package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch
- index a7f9d9f..f21eed1 100644
- --- a/package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch
- +++ b/package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch
- @@ -1,6 +1,6 @@
- --- a/drivers/net/wireless/ath/ath9k/debug.c
- +++ b/drivers/net/wireless/ath/ath9k/debug.c
- -@@ -1301,6 +1301,53 @@ void ath9k_deinit_debug(struct ath_softc
- +@@ -1315,6 +1315,53 @@ void ath9k_deinit_debug(struct ath_softc
- ath9k_cmn_spectral_deinit_debug(&sc->spec_priv);
- }
-
- @@ -54,7 +54,7 @@
- int ath9k_init_debug(struct ath_hw *ah)
- {
- struct ath_common *common = ath9k_hw_common(ah);
- -@@ -1320,6 +1367,8 @@ int ath9k_init_debug(struct ath_hw *ah)
- +@@ -1334,6 +1381,8 @@ int ath9k_init_debug(struct ath_hw *ah)
- ath9k_tx99_init_debug(sc);
- ath9k_cmn_spectral_init_debug(&sc->spec_priv, sc->debug.debugfs_phy);
-
- diff --git a/package/kernel/mac80211/patches/501-ath9k_ahb_init.patch b/package/kernel/mac80211/patches/501-ath9k_ahb_init.patch
- index 5892c3e..1825d77 100644
- --- a/package/kernel/mac80211/patches/501-ath9k_ahb_init.patch
- +++ b/package/kernel/mac80211/patches/501-ath9k_ahb_init.patch
- @@ -1,6 +1,6 @@
- --- a/drivers/net/wireless/ath/ath9k/init.c
- +++ b/drivers/net/wireless/ath/ath9k/init.c
- -@@ -1024,23 +1024,23 @@ static int __init ath9k_init(void)
- +@@ -1030,23 +1030,23 @@ static int __init ath9k_init(void)
- {
- int error;
-
- diff --git a/package/kernel/mac80211/patches/511-ath9k_reduce_rxbuf.patch b/package/kernel/mac80211/patches/511-ath9k_reduce_rxbuf.patch
- index 6766111..15b8d7b 100644
- --- a/package/kernel/mac80211/patches/511-ath9k_reduce_rxbuf.patch
- +++ b/package/kernel/mac80211/patches/511-ath9k_reduce_rxbuf.patch
- @@ -8,4 +8,4 @@
- +#define ATH_RXBUF 256
- #define ATH_TXBUF 512
- #define ATH_TXBUF_RESERVE 5
- - #define ATH_MAX_QDEPTH (ATH_TXBUF / 4 - ATH_TXBUF_RESERVE)
- + #define ATH_TXMAXTRY 13
- diff --git a/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch b/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch
- index 5ecf528..c98072b 100644
- --- a/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch
- +++ b/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch
- @@ -1,6 +1,6 @@
- --- a/drivers/net/wireless/ath/ath9k/debug.c
- +++ b/drivers/net/wireless/ath/ath9k/debug.c
- -@@ -1348,6 +1348,52 @@ static const struct file_operations fops
- +@@ -1362,6 +1362,52 @@ static const struct file_operations fops
- .owner = THIS_MODULE
- };
-
- @@ -53,7 +53,7 @@
- int ath9k_init_debug(struct ath_hw *ah)
- {
- struct ath_common *common = ath9k_hw_common(ah);
- -@@ -1369,6 +1415,8 @@ int ath9k_init_debug(struct ath_hw *ah)
- +@@ -1383,6 +1429,8 @@ int ath9k_init_debug(struct ath_hw *ah)
-
- debugfs_create_file("eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,
- &fops_eeprom);
- @@ -90,7 +90,7 @@
- ichan->channel = chan->center_freq;
- ichan->chan = chan;
- @@ -308,7 +310,19 @@ static void ath9k_cmn_update_ichannel(st
- - if (chan->band == IEEE80211_BAND_5GHZ)
- + if (chan->band == NL80211_BAND_5GHZ)
- flags |= CHANNEL_5GHZ;
-
- - switch (chandef->width) {
- diff --git a/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch b/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch
- index c84d1bc..167eeff 100644
- --- a/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch
- +++ b/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch
- @@ -20,7 +20,7 @@
- #define AR9160_DEVID_PCI 0x0027
- --- a/drivers/net/wireless/ath/ath9k/pci.c
- +++ b/drivers/net/wireless/ath/ath9k/pci.c
- -@@ -751,6 +751,7 @@ static const struct pci_device_id ath_pc
- +@@ -761,6 +761,7 @@ static const struct pci_device_id ath_pc
- .driver_data = ATH9K_PCI_BT_ANT_DIV },
- #endif
-
- diff --git a/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch b/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch
- index e151a12..c40598d 100644
- --- a/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch
- +++ b/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch
- @@ -1,6 +1,6 @@
- --- a/include/net/cfg80211.h
- +++ b/include/net/cfg80211.h
- -@@ -2363,6 +2363,7 @@ struct cfg80211_qos_map {
- +@@ -2410,6 +2410,7 @@ struct cfg80211_qos_map {
- * (as advertised by the nl80211 feature flag.)
- * @get_tx_power: store the current TX power into the dbm variable;
- * return 0 if successful
- @@ -8,7 +8,7 @@
- *
- * @set_wds_peer: set the WDS peer for a WDS interface
- *
- -@@ -2624,6 +2625,7 @@ struct cfg80211_ops {
- +@@ -2671,6 +2672,7 @@ struct cfg80211_ops {
- enum nl80211_tx_power_setting type, int mbm);
- int (*get_tx_power)(struct wiphy *wiphy, struct wireless_dev *wdev,
- int *dbm);
- @@ -18,7 +18,7 @@
- const u8 *addr);
- --- a/include/net/mac80211.h
- +++ b/include/net/mac80211.h
- -@@ -1286,6 +1286,7 @@ enum ieee80211_smps_mode {
- +@@ -1317,6 +1317,7 @@ enum ieee80211_smps_mode {
- *
- * @power_level: requested transmit power (in dBm), backward compatibility
- * value only that is set to the minimum of all interfaces
- @@ -26,7 +26,7 @@
- *
- * @chandef: the channel definition to tune to
- * @radar_enabled: whether radar detection is enabled
- -@@ -1306,6 +1307,7 @@ enum ieee80211_smps_mode {
- +@@ -1337,6 +1338,7 @@ enum ieee80211_smps_mode {
- struct ieee80211_conf {
- u32 flags;
- int power_level, dynamic_ps_timeout;
- @@ -36,9 +36,9 @@
- u8 ps_dtim_period;
- --- a/include/uapi/linux/nl80211.h
- +++ b/include/uapi/linux/nl80211.h
- -@@ -1790,6 +1790,9 @@ enum nl80211_commands {
- - * between scans. The scan plans are executed sequentially.
- - * Each scan plan is a nested attribute of &enum nl80211_sched_scan_plan.
- +@@ -1829,6 +1829,9 @@ enum nl80211_commands {
- + * %NL80211_ATTR_EXT_CAPA_MASK, to specify the extended capabilities per
- + * interface type.
- *
- + * @NL80211_ATTR_WIPHY_ANTENNA_GAIN: Configured antenna gain. Used to reduce
- + * transmit power to stay within regulatory limits. u32, dBi.
- @@ -46,9 +46,9 @@
- * @NUM_NL80211_ATTR: total number of nl80211_attrs available
- * @NL80211_ATTR_MAX: highest attribute number currently defined
- * @__NL80211_ATTR_AFTER_LAST: internal use
- -@@ -2164,6 +2167,8 @@ enum nl80211_attrs {
- - NL80211_ATTR_MAX_SCAN_PLAN_ITERATIONS,
- - NL80211_ATTR_SCHED_SCAN_PLANS,
- +@@ -2213,6 +2216,8 @@ enum nl80211_attrs {
- +
- + NL80211_ATTR_IFTYPE_EXT_CAPA,
-
- + NL80211_ATTR_WIPHY_ANTENNA_GAIN,
- +
- @@ -57,7 +57,7 @@
- __NL80211_ATTR_AFTER_LAST,
- --- a/net/mac80211/cfg.c
- +++ b/net/mac80211/cfg.c
- -@@ -2229,6 +2229,19 @@ static int ieee80211_get_tx_power(struct
- +@@ -2238,6 +2238,19 @@ static int ieee80211_get_tx_power(struct
- return 0;
- }
-
- @@ -77,7 +77,7 @@
- static int ieee80211_set_wds_peer(struct wiphy *wiphy, struct net_device *dev,
- const u8 *addr)
- {
- -@@ -3403,6 +3416,7 @@ const struct cfg80211_ops mac80211_confi
- +@@ -3412,6 +3425,7 @@ const struct cfg80211_ops mac80211_confi
- .set_wiphy_params = ieee80211_set_wiphy_params,
- .set_tx_power = ieee80211_set_tx_power,
- .get_tx_power = ieee80211_get_tx_power,
- @@ -87,7 +87,7 @@
- CFG80211_TESTMODE_CMD(ieee80211_testmode_cmd)
- --- a/net/mac80211/ieee80211_i.h
- +++ b/net/mac80211/ieee80211_i.h
- -@@ -1318,6 +1318,7 @@ struct ieee80211_local {
- +@@ -1338,6 +1338,7 @@ struct ieee80211_local {
- int dynamic_ps_forced_timeout;
-
- int user_power_level; /* in dBm, for all interfaces */
- @@ -119,7 +119,7 @@
- if (local->hw.conf.power_level != power) {
- changed |= IEEE80211_CONF_CHANGE_POWER;
- local->hw.conf.power_level = power;
- -@@ -586,6 +592,7 @@ struct ieee80211_hw *ieee80211_alloc_hw_
- +@@ -588,6 +594,7 @@ struct ieee80211_hw *ieee80211_alloc_hw_
- IEEE80211_RADIOTAP_MCS_HAVE_BW;
- local->hw.radiotap_vht_details = IEEE80211_RADIOTAP_VHT_KNOWN_GI |
- IEEE80211_RADIOTAP_VHT_KNOWN_BANDWIDTH;
- @@ -129,15 +129,15 @@
- local->user_power_level = IEEE80211_UNSET_POWER_LEVEL;
- --- a/net/wireless/nl80211.c
- +++ b/net/wireless/nl80211.c
- -@@ -403,6 +403,7 @@ static const struct nla_policy nl80211_p
- - [NL80211_ATTR_NETNS_FD] = { .type = NLA_U32 },
- - [NL80211_ATTR_SCHED_SCAN_DELAY] = { .type = NLA_U32 },
- - [NL80211_ATTR_REG_INDOOR] = { .type = NLA_FLAG },
- +@@ -407,6 +407,7 @@ static const struct nla_policy nl80211_p
- + [NL80211_ATTR_PBSS] = { .type = NLA_FLAG },
- + [NL80211_ATTR_BSS_SELECT] = { .type = NLA_NESTED },
- + [NL80211_ATTR_STA_SUPPORT_P2P_PS] = { .type = NLA_U8 },
- + [NL80211_ATTR_WIPHY_ANTENNA_GAIN] = { .type = NLA_U32 },
- };
-
- /* policy for the key attributes */
- -@@ -2220,6 +2221,20 @@ static int nl80211_set_wiphy(struct sk_b
- +@@ -2294,6 +2295,20 @@ static int nl80211_set_wiphy(struct sk_b
- if (result)
- return result;
- }
- diff --git a/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch b/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
- index 5a5e464..0b25749 100644
- --- a/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
- +++ b/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
- @@ -1,16 +1,16 @@
- --- a/drivers/net/wireless/ath/ath9k/ath9k.h
- +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
- @@ -814,6 +814,9 @@ static inline int ath9k_dump_btcoex(stru
- + #ifdef CPTCFG_MAC80211_LEDS
- void ath_init_leds(struct ath_softc *sc);
- void ath_deinit_leds(struct ath_softc *sc);
- - void ath_fill_led_pin(struct ath_softc *sc);
- +int ath_create_gpio_led(struct ath_softc *sc, int gpio, const char *name,
- -+ const char *trigger, bool active_low);
- ++ const char *trigger, bool active_low);
- +
- #else
- static inline void ath_init_leds(struct ath_softc *sc)
- {
- -@@ -953,6 +956,13 @@ void ath_ant_comb_scan(struct ath_softc
- +@@ -950,6 +953,13 @@ void ath_ant_comb_scan(struct ath_softc
-
- #define ATH9K_NUM_CHANCTX 2 /* supports 2 operating channels */
-
- @@ -24,7 +24,7 @@
- struct ath_softc {
- struct ieee80211_hw *hw;
- struct device *dev;
- -@@ -1005,9 +1015,8 @@ struct ath_softc {
- +@@ -1002,9 +1012,8 @@ struct ath_softc {
- spinlock_t chan_lock;
-
- #ifdef CPTCFG_MAC80211_LEDS
- @@ -38,24 +38,33 @@
- #ifdef CPTCFG_ATH9K_DEBUGFS
- --- a/drivers/net/wireless/ath/ath9k/gpio.c
- +++ b/drivers/net/wireless/ath/ath9k/gpio.c
- -@@ -24,45 +24,102 @@
- - static void ath_led_brightness(struct led_classdev *led_cdev,
- - enum led_brightness brightness)
- +@@ -22,7 +22,7 @@
- +
- + #ifdef CPTCFG_MAC80211_LEDS
- +
- +-void ath_fill_led_pin(struct ath_softc *sc)
- ++static void ath_fill_led_pin(struct ath_softc *sc)
- {
- -- struct ath_softc *sc = container_of(led_cdev, struct ath_softc, led_cdev);
- -- u32 val = (brightness == LED_OFF);
- + struct ath_hw *ah = sc->sc_ah;
- +
- +@@ -39,61 +39,111 @@ void ath_fill_led_pin(struct ath_softc *
- + else
- + ah->led_pin = ATH_LED_PIN_DEF;
- + }
- ++}
- ++
- ++static void ath_led_brightness(struct led_classdev *led_cdev,
- ++ enum led_brightness brightness)
- ++{
- + struct ath_led *led = container_of(led_cdev, struct ath_led, cdev);
- + struct ath_softc *sc = led->sc;
- -
- -- if (sc->sc_ah->config.led_active_high)
- -- val = !val;
- ++
- + ath9k_ps_wakeup(sc);
- + ath9k_hw_set_gpio(sc->sc_ah, led->gpio->gpio,
- + (brightness != LED_OFF) ^ led->gpio->active_low);
- + ath9k_ps_restore(sc);
- +}
- -
- -- ath9k_hw_set_gpio(sc->sc_ah, sc->sc_ah->led_pin, val);
- ++
- +static int ath_add_led(struct ath_softc *sc, struct ath_led *led)
- +{
- + const struct gpio_led *gpio = led->gpio;
- @@ -71,30 +80,40 @@
- +
- + led->sc = sc;
- + list_add(&led->list, &sc->leds);
- -+
- -+ /* Configure gpio for output */
- -+ ath9k_hw_cfg_output(sc->sc_ah, gpio->gpio,
- -+ AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
- -+
- +
- + /* Configure gpio for output */
- +- ath9k_hw_gpio_request_out(ah, ah->led_pin, "ath9k-led",
- ++ ath9k_hw_gpio_request_out(sc->sc_ah, gpio->gpio, gpio->name,
- + AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
- +
- +- /* LED off, active low */
- +- ath9k_hw_set_gpio(ah, ah->led_pin, ah->config.led_active_high ? 0 : 1);
- + /* LED off */
- + ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, gpio->active_low);
- +
- + return 0;
- -+}
- -+
- + }
- +
- +-static void ath_led_brightness(struct led_classdev *led_cdev,
- +- enum led_brightness brightness)
- +int ath_create_gpio_led(struct ath_softc *sc, int gpio_num, const char *name,
- + const char *trigger, bool active_low)
- -+{
- + {
- +- struct ath_softc *sc = container_of(led_cdev, struct ath_softc, led_cdev);
- +- u32 val = (brightness == LED_OFF);
- + struct ath_led *led;
- + struct gpio_led *gpio;
- + char *_name;
- + int ret;
- -+
- +
- +- if (sc->sc_ah->config.led_active_high)
- +- val = !val;
- + led = kzalloc(sizeof(*led) + sizeof(*gpio) + strlen(name) + 1,
- + GFP_KERNEL);
- + if (!led)
- + return -ENOMEM;
- -+
- +
- +- ath9k_hw_set_gpio(sc->sc_ah, sc->sc_ah->led_pin, val);
- + led->gpio = gpio = (struct gpio_led *) (led + 1);
- + _name = (char *) (led->gpio + 1);
- +
- @@ -115,15 +134,18 @@
- {
- - if (!sc->led_registered)
- - return;
- -+ struct ath_led *led;
- -
- +-
- - ath_led_brightness(&sc->led_cdev, LED_OFF);
- - led_classdev_unregister(&sc->led_cdev);
- ++ struct ath_led *led;
- +
- +- ath9k_hw_gpio_free(sc->sc_ah, sc->sc_ah->led_pin);
- + while (!list_empty(&sc->leds)) {
- + led = list_first_entry(&sc->leds, struct ath_led, list);
- + list_del(&led->list);
- + ath_led_brightness(&led->cdev, LED_OFF);
- + led_classdev_unregister(&led->cdev);
- ++ ath9k_hw_gpio_free(sc->sc_ah, led->gpio->gpio);
- + kfree(led);
- + }
- }
- @@ -139,6 +161,8 @@
- if (AR_SREV_9100(sc->sc_ah))
- return;
-
- + ath_fill_led_pin(sc);
- +
- - if (!ath9k_led_blink)
- - sc->led_cdev.default_trigger =
- - ieee80211_get_radio_led_name(sc->hw);
- @@ -159,13 +183,14 @@
- + trigger = ieee80211_get_radio_led_name(sc->hw);
-
- - sc->led_registered = true;
- -+ ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger, !sc->sc_ah->config.led_active_high);
- ++ ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger,
- ++ !sc->sc_ah->config.led_active_high);
- }
- + #endif
-
- - void ath_fill_led_pin(struct ath_softc *sc)
- --- a/drivers/net/wireless/ath/ath9k/init.c
- +++ b/drivers/net/wireless/ath/ath9k/init.c
- -@@ -936,7 +936,7 @@ int ath9k_init_device(u16 devid, struct
- +@@ -942,7 +942,7 @@ int ath9k_init_device(u16 devid, struct
-
- #ifdef CPTCFG_MAC80211_LEDS
- /* must be initialized before ieee80211_register_hw */
- @@ -176,7 +201,7 @@
- #endif
- --- a/drivers/net/wireless/ath/ath9k/debug.c
- +++ b/drivers/net/wireless/ath/ath9k/debug.c
- -@@ -1393,6 +1393,61 @@ static const struct file_operations fops
- +@@ -1407,6 +1407,61 @@ static const struct file_operations fops
- .llseek = default_llseek,
- };
-
- @@ -238,7 +263,7 @@
-
- int ath9k_init_debug(struct ath_hw *ah)
- {
- -@@ -1417,6 +1472,10 @@ int ath9k_init_debug(struct ath_hw *ah)
- +@@ -1431,6 +1486,10 @@ int ath9k_init_debug(struct ath_hw *ah)
- &fops_eeprom);
- debugfs_create_file("chanbw", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
- sc, &fops_chanbw);
- diff --git a/package/kernel/mac80211/patches/531-ath9k_extra_platform_leds.patch b/package/kernel/mac80211/patches/531-ath9k_extra_platform_leds.patch
- index 7c10ea6..f656697 100644
- --- a/package/kernel/mac80211/patches/531-ath9k_extra_platform_leds.patch
- +++ b/package/kernel/mac80211/patches/531-ath9k_extra_platform_leds.patch
- @@ -1,6 +1,6 @@
- --- a/include/linux/ath9k_platform.h
- +++ b/include/linux/ath9k_platform.h
- -@@ -41,6 +41,9 @@ struct ath9k_platform_data {
- +@@ -45,6 +45,9 @@ struct ath9k_platform_data {
- int (*external_reset)(void);
-
- bool use_eeprom;
- @@ -20,7 +20,7 @@
-
- /********************************/
- /* LED functions */
- -@@ -88,6 +89,24 @@ int ath_create_gpio_led(struct ath_softc
- +@@ -108,6 +109,24 @@ int ath_create_gpio_led(struct ath_softc
- return ret;
- }
-
- @@ -45,7 +45,7 @@
- void ath_deinit_leds(struct ath_softc *sc)
- {
- struct ath_led *led;
- -@@ -103,8 +122,10 @@ void ath_deinit_leds(struct ath_softc *s
- +@@ -124,8 +143,10 @@ void ath_deinit_leds(struct ath_softc *s
-
- void ath_init_leds(struct ath_softc *sc)
- {
- @@ -56,10 +56,10 @@
-
- INIT_LIST_HEAD(&sc->leds);
-
- -@@ -120,6 +141,12 @@ void ath_init_leds(struct ath_softc *sc)
- - trigger = ieee80211_get_radio_led_name(sc->hw);
- +@@ -144,6 +165,12 @@ void ath_init_leds(struct ath_softc *sc)
-
- - ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger, !sc->sc_ah->config.led_active_high);
- + ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger,
- + !sc->sc_ah->config.led_active_high);
- +
- + if (!pdata)
- + return;
- @@ -67,5 +67,5 @@
- + for (i = 0; i < pdata->num_leds; i++)
- + ath_create_platform_led(sc, &pdata->leds[i]);
- }
- + #endif
-
- - void ath_fill_led_pin(struct ath_softc *sc)
- diff --git a/package/kernel/mac80211/patches/532-ath9k_get_led_polarity_from_platform_data.patch b/package/kernel/mac80211/patches/532-ath9k_get_led_polarity_from_platform_data.patch
- index 6d62a2b..50d8a7a 100644
- --- a/package/kernel/mac80211/patches/532-ath9k_get_led_polarity_from_platform_data.patch
- +++ b/package/kernel/mac80211/patches/532-ath9k_get_led_polarity_from_platform_data.patch
- @@ -1,6 +1,6 @@
- --- a/include/linux/ath9k_platform.h
- +++ b/include/linux/ath9k_platform.h
- -@@ -36,6 +36,7 @@ struct ath9k_platform_data {
- +@@ -40,6 +40,7 @@ struct ath9k_platform_data {
- bool tx_gain_buffalo;
- bool disable_2ghz;
- bool disable_5ghz;
- @@ -10,7 +10,7 @@
- int (*external_reset)(void);
- --- a/drivers/net/wireless/ath/ath9k/init.c
- +++ b/drivers/net/wireless/ath/ath9k/init.c
- -@@ -577,6 +577,7 @@ static int ath9k_init_softc(u16 devid, s
- +@@ -580,6 +580,7 @@ static int ath9k_init_softc(u16 devid, s
- ah->external_reset = pdata->external_reset;
- ah->disable_2ghz = pdata->disable_2ghz;
- ah->disable_5ghz = pdata->disable_5ghz;
- diff --git a/package/kernel/mac80211/patches/541-ath9k_rx_dma_stop_check.patch b/package/kernel/mac80211/patches/541-ath9k_rx_dma_stop_check.patch
- index 3c5e9f5..c2d2781 100644
- --- a/package/kernel/mac80211/patches/541-ath9k_rx_dma_stop_check.patch
- +++ b/package/kernel/mac80211/patches/541-ath9k_rx_dma_stop_check.patch
- @@ -1,6 +1,6 @@
- --- a/drivers/net/wireless/ath/ath9k/mac.c
- +++ b/drivers/net/wireless/ath/ath9k/mac.c
- -@@ -695,7 +695,7 @@ bool ath9k_hw_stopdmarecv(struct ath_hw
- +@@ -698,7 +698,7 @@ bool ath9k_hw_stopdmarecv(struct ath_hw
- {
- #define AH_RX_STOP_DMA_TIMEOUT 10000 /* usec */
- struct ath_common *common = ath9k_hw_common(ah);
- @@ -9,7 +9,7 @@
- int i;
-
- /* Enable access to the DMA observation bus */
- -@@ -725,6 +725,16 @@ bool ath9k_hw_stopdmarecv(struct ath_hw
- +@@ -728,6 +728,16 @@ bool ath9k_hw_stopdmarecv(struct ath_hw
- }
-
- if (i == 0) {
- diff --git a/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch b/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
- index e83c6bf..4615643 100644
- --- a/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
- +++ b/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
- @@ -1,6 +1,6 @@
- --- a/drivers/net/wireless/ath/ath9k/debug.c
- +++ b/drivers/net/wireless/ath/ath9k/debug.c
- -@@ -1449,6 +1449,50 @@ static const struct file_operations fops
- +@@ -1463,6 +1463,50 @@ static const struct file_operations fops
- #endif
-
-
- @@ -51,7 +51,7 @@
- int ath9k_init_debug(struct ath_hw *ah)
- {
- struct ath_common *common = ath9k_hw_common(ah);
- -@@ -1476,6 +1520,8 @@ int ath9k_init_debug(struct ath_hw *ah)
- +@@ -1490,6 +1534,8 @@ int ath9k_init_debug(struct ath_hw *ah)
- debugfs_create_file("gpio_led", S_IWUSR,
- sc->debug.debugfs_phy, sc, &fops_gpio_led);
- #endif
- @@ -62,7 +62,7 @@
- debugfs_create_devm_seqfile(sc->dev, "interrupt", sc->debug.debugfs_phy,
- --- a/drivers/net/wireless/ath/ath9k/hw.h
- +++ b/drivers/net/wireless/ath/ath9k/hw.h
- -@@ -519,6 +519,12 @@ enum {
- +@@ -520,6 +520,12 @@ enum {
- ATH9K_RESET_COLD,
- };
-
- @@ -75,7 +75,7 @@
- struct ath9k_hw_version {
- u32 magic;
- u16 devid;
- -@@ -804,6 +810,8 @@ struct ath_hw {
- +@@ -805,6 +811,8 @@ struct ath_hw {
- u32 rfkill_polarity;
- u32 ah_flags;
-
- @@ -84,7 +84,7 @@
- bool reset_power_on;
- bool htc_reset_init;
-
- -@@ -1066,6 +1074,7 @@ void ath9k_hw_check_nav(struct ath_hw *a
- +@@ -1068,6 +1076,7 @@ void ath9k_hw_check_nav(struct ath_hw *a
- bool ath9k_hw_check_alive(struct ath_hw *ah);
-
- bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode);
- @@ -94,7 +94,7 @@
- struct ath_gen_timer *ath_gen_timer_alloc(struct ath_hw *ah,
- --- a/drivers/net/wireless/ath/ath9k/hw.c
- +++ b/drivers/net/wireless/ath/ath9k/hw.c
- -@@ -1819,6 +1819,20 @@ u32 ath9k_hw_get_tsf_offset(struct times
- +@@ -1841,6 +1841,20 @@ u32 ath9k_hw_get_tsf_offset(struct times
- }
- EXPORT_SYMBOL(ath9k_hw_get_tsf_offset);
-
- @@ -115,7 +115,7 @@
- int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
- struct ath9k_hw_cal_data *caldata, bool fastcc)
- {
- -@@ -2027,6 +2041,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
- +@@ -2049,6 +2063,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
- ar9003_hw_disable_phy_restart(ah);
-
- ath9k_hw_apply_gpio_override(ah);
- diff --git a/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch b/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch
- index d7bb5a1..656ed43 100644
- --- a/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch
- +++ b/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch
- @@ -1,6 +1,6 @@
- --- a/drivers/net/wireless/ath/ath9k/hw.h
- +++ b/drivers/net/wireless/ath/ath9k/hw.h
- -@@ -720,6 +720,7 @@ struct ath_spec_scan {
- +@@ -721,6 +721,7 @@ struct ath_spec_scan {
- * @config_pci_powersave:
- * @calibrate: periodic calibration for NF, ANI, IQ, ADC gain, ADC-DC
- *
- @@ -8,7 +8,7 @@
- * @spectral_scan_config: set parameters for spectral scan and enable/disable it
- * @spectral_scan_trigger: trigger a spectral scan run
- * @spectral_scan_wait: wait for a spectral scan run to finish
- -@@ -742,6 +743,7 @@ struct ath_hw_ops {
- +@@ -743,6 +744,7 @@ struct ath_hw_ops {
- struct ath_hw_antcomb_conf *antconf);
- void (*antdiv_comb_conf_set)(struct ath_hw *ah,
- struct ath_hw_antcomb_conf *antconf);
- @@ -18,7 +18,7 @@
- void (*spectral_scan_trigger)(struct ath_hw *ah);
- --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
- +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
- -@@ -1998,6 +1998,26 @@ void ar9003_hw_init_rate_txpower(struct
- +@@ -1945,6 +1945,26 @@ void ar9003_hw_init_rate_txpower(struct
- }
- }
-
- @@ -45,7 +45,7 @@
- void ar9003_hw_attach_phy_ops(struct ath_hw *ah)
- {
- struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);
- -@@ -2034,6 +2054,7 @@ void ar9003_hw_attach_phy_ops(struct ath
- +@@ -1981,6 +2001,7 @@ void ar9003_hw_attach_phy_ops(struct ath
- priv_ops->set_radar_params = ar9003_hw_set_radar_params;
- priv_ops->fast_chan_change = ar9003_hw_fast_chan_change;
-
- @@ -55,9 +55,9 @@
- ops->spectral_scan_config = ar9003_hw_spectral_scan_config;
- --- a/drivers/net/wireless/ath/ath9k/init.c
- +++ b/drivers/net/wireless/ath/ath9k/init.c
- -@@ -711,7 +711,8 @@ static void ath9k_init_txpower_limits(st
- +@@ -716,7 +716,8 @@ static void ath9k_init_txpower_limits(st
- if (ah->caps.hw_caps & ATH9K_HW_CAP_5GHZ)
- - ath9k_init_band_txpower(sc, IEEE80211_BAND_5GHZ);
- + ath9k_init_band_txpower(sc, NL80211_BAND_5GHZ);
-
- - ah->curchan = curchan;
- + if (curchan)
- @@ -65,7 +65,7 @@
- }
-
- static const struct ieee80211_iface_limit if_limits[] = {
- -@@ -897,6 +898,18 @@ static void ath9k_set_hw_capab(struct at
- +@@ -903,6 +904,18 @@ static void ath9k_set_hw_capab(struct at
- SET_IEEE80211_PERM_ADDR(hw, common->macaddr);
- }
-
- @@ -84,7 +84,7 @@
- int ath9k_init_device(u16 devid, struct ath_softc *sc,
- const struct ath_bus_ops *bus_ops)
- {
- -@@ -942,6 +955,8 @@ int ath9k_init_device(u16 devid, struct
- +@@ -948,6 +961,8 @@ int ath9k_init_device(u16 devid, struct
- ARRAY_SIZE(ath9k_tpt_blink));
- #endif
-
- @@ -110,7 +110,7 @@
- static inline void ath9k_hw_set_bt_ant_diversity(struct ath_hw *ah, bool enable)
- --- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
- +++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
- -@@ -1327,9 +1327,30 @@ void ar5008_hw_init_rate_txpower(struct
- +@@ -1325,9 +1325,30 @@ void ar5008_hw_init_rate_txpower(struct
- }
- }
-
- @@ -141,7 +141,7 @@
- static const u32 ar5416_cca_regs[6] = {
- AR_PHY_CCA,
- AR_PHY_CH1_CCA,
- -@@ -1344,6 +1365,8 @@ int ar5008_hw_attach_phy_ops(struct ath_
- +@@ -1342,6 +1363,8 @@ int ar5008_hw_attach_phy_ops(struct ath_
- if (ret)
- return ret;
-
- @@ -175,7 +175,7 @@
- #define AR_PHY_TIMING2 0x9810
- #define AR_PHY_TIMING3 0x9814
- #define AR_PHY_TIMING3_DSC_MAN 0xFFFE0000
- -@@ -390,6 +399,8 @@
- +@@ -393,6 +402,8 @@
- #define AR_PHY_RFBUS_GRANT 0x9C20
- #define AR_PHY_RFBUS_GRANT_EN 0x00000001
-
- diff --git a/package/kernel/mac80211/patches/544-ath9k-ar933x-usb-hang-workaround.patch b/package/kernel/mac80211/patches/544-ath9k-ar933x-usb-hang-workaround.patch
- index 8768c5d..b9c962e 100644
- --- a/package/kernel/mac80211/patches/544-ath9k-ar933x-usb-hang-workaround.patch
- +++ b/package/kernel/mac80211/patches/544-ath9k-ar933x-usb-hang-workaround.patch
- @@ -20,9 +20,9 @@
- /******************/
- /* Chip Revisions */
- /******************/
- -@@ -1397,6 +1410,9 @@ static bool ath9k_hw_set_reset(struct at
- - if (AR_SREV_9100(ah))
- +@@ -1417,6 +1430,9 @@ static bool ath9k_hw_set_reset(struct at
- udelay(50);
- + }
-
- + if (AR_SREV_9330(ah) || AR_SREV_9340(ah))
- + ath9k_hw_disable_pll_lock_detect(ah);
- @@ -30,7 +30,7 @@
- return true;
- }
-
- -@@ -1496,6 +1512,9 @@ static bool ath9k_hw_chip_reset(struct a
- +@@ -1516,6 +1532,9 @@ static bool ath9k_hw_chip_reset(struct a
- ar9003_hw_internal_regulator_apply(ah);
- ath9k_hw_init_pll(ah, chan);
-
- @@ -40,7 +40,7 @@
- return true;
- }
-
- -@@ -1797,8 +1816,14 @@ static int ath9k_hw_do_fastcc(struct ath
- +@@ -1819,8 +1838,14 @@ static int ath9k_hw_do_fastcc(struct ath
- if (AR_SREV_9271(ah))
- ar9002_hw_load_ani_reg(ah, chan);
-
- @@ -55,7 +55,7 @@
- return -EINVAL;
- }
-
- -@@ -2052,6 +2077,9 @@ int ath9k_hw_reset(struct ath_hw *ah, st
- +@@ -2074,6 +2099,9 @@ int ath9k_hw_reset(struct ath_hw *ah, st
- ath9k_hw_set_radar_params(ah);
- }
-
- diff --git a/package/kernel/mac80211/patches/545-ath9k_ani_ws_detect.patch b/package/kernel/mac80211/patches/545-ath9k_ani_ws_detect.patch
- index 3d24ccd..b639f97 100644
- --- a/package/kernel/mac80211/patches/545-ath9k_ani_ws_detect.patch
- +++ b/package/kernel/mac80211/patches/545-ath9k_ani_ws_detect.patch
- @@ -1,6 +1,6 @@
- --- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
- +++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
- -@@ -956,55 +956,6 @@ static bool ar5008_hw_ani_control_new(st
- +@@ -954,55 +954,6 @@ static bool ar5008_hw_ani_control_new(st
- * on == 0 means more noise imm
- */
- u32 on = param ? 1 : 0;
- @@ -58,7 +58,7 @@
- REG_SET_BIT(ah, AR_PHY_SFCORR_LOW,
- --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
- +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
- -@@ -41,20 +41,6 @@ static const int cycpwrThr1_table[] =
- +@@ -42,20 +42,6 @@ static const int cycpwrThr1_table[] =
- /* level: 0 1 2 3 4 5 6 7 8 */
- { -6, -4, -2, 0, 2, 4, 6, 8 }; /* lvl 0-7, default 3 */
-
- @@ -79,7 +79,7 @@
- static const u8 ofdm2pwr[] = {
- ALL_TARGET_LEGACY_6_24,
- ALL_TARGET_LEGACY_6_24,
- -@@ -1089,11 +1075,6 @@ static bool ar9003_hw_ani_control(struct
- +@@ -1095,11 +1081,6 @@ static bool ar9003_hw_ani_control(struct
- struct ath_common *common = ath9k_hw_common(ah);
- struct ath9k_channel *chan = ah->curchan;
- struct ar5416AniState *aniState = &ah->ani;
- @@ -91,7 +91,7 @@
- s32 value, value2;
-
- switch (cmd & ah->ani_function) {
- -@@ -1107,61 +1088,6 @@ static bool ar9003_hw_ani_control(struct
- +@@ -1113,61 +1094,6 @@ static bool ar9003_hw_ani_control(struct
- */
- u32 on = param ? 1 : 0;
-
- diff --git a/package/kernel/mac80211/patches/546-ath9k_platform_led_name.patch b/package/kernel/mac80211/patches/546-ath9k_platform_led_name.patch
- new file mode 100644
- index 0000000..ced72c6
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/546-ath9k_platform_led_name.patch
- @@ -0,0 +1,39 @@
- +From: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
- +Date: Sun, 31 Jan 2016 20:45:57 +0100
- +Subject: [PATCH v4 1/8] mac80211: ath9k: enable platform WLAN LED name
- +
- +Enable platform-supplied WLAN LED name for ath9k device. It replaces generic
- +'ath9k-phy*' label with string set during platform initialization.
- +
- +Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
- +---
- + drivers/net/wireless/ath/ath9k/gpio.c | 10 +++++++---
- + include/linux/ath9k_platform.h | 1 +
- + 2 files changed, 8 insertions(+), 3 deletions(-)
- +
- +--- a/drivers/net/wireless/ath/ath9k/gpio.c
- ++++ b/drivers/net/wireless/ath/ath9k/gpio.c
- +@@ -155,8 +155,11 @@ void ath_init_leds(struct ath_softc *sc)
- +
- + ath_fill_led_pin(sc);
- +
- +- snprintf(led_name, sizeof(led_name), "ath9k-%s",
- +- wiphy_name(sc->hw->wiphy));
- ++ if (pdata && pdata->led_name)
- ++ strncpy(led_name, pdata->led_name, sizeof(led_name));
- ++ else
- ++ snprintf(led_name, sizeof(led_name), "ath9k-%s",
- ++ wiphy_name(sc->hw->wiphy));
- +
- + if (ath9k_led_blink)
- + trigger = sc->led_default_trigger;
- +--- a/include/linux/ath9k_platform.h
- ++++ b/include/linux/ath9k_platform.h
- +@@ -49,6 +49,7 @@ struct ath9k_platform_data {
- +
- + int num_leds;
- + const struct gpio_led *leds;
- ++ const char *led_name;
- + };
- +
- + #endif /* _LINUX_ATH9K_PLATFORM_H */
- diff --git a/package/kernel/mac80211/patches/547-ath9k_led_defstate_fix.patch b/package/kernel/mac80211/patches/547-ath9k_led_defstate_fix.patch
- new file mode 100644
- index 0000000..5d84cf0
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/547-ath9k_led_defstate_fix.patch
- @@ -0,0 +1,29 @@
- +From: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
- +Date: Sun, 31 Jan 2016 20:48:49 +0100
- +Subject: [PATCH v4 2/8] mac80211: ath9k: set default state for platform LEDs
- +
- +Support default state for platform LEDs connected to ath9k device.
- +Now LEDs are correctly set on or off at ath9k module initialization.
- +Very useful if power LED is connected to wireless chip.
- +
- +Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
- +---
- + gpio.c | 7 +++++--
- + 1 file changed, 5 insertions(+), 2 deletions(-)
- +
- +--- a/drivers/net/wireless/ath/ath9k/gpio.c
- ++++ b/drivers/net/wireless/ath/ath9k/gpio.c
- +@@ -74,8 +74,11 @@ static int ath_add_led(struct ath_softc
- + ath9k_hw_gpio_request_out(sc->sc_ah, gpio->gpio, gpio->name,
- + AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
- +
- +- /* LED off */
- +- ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, gpio->active_low);
- ++ /* Set default LED state */
- ++ if (gpio->default_state == LEDS_GPIO_DEFSTATE_ON)
- ++ ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, !gpio->active_low);
- ++ else
- ++ ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, gpio->active_low);
- +
- + return 0;
- + }
- diff --git a/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch b/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch
- new file mode 100644
- index 0000000..de7c0ac
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch
- @@ -0,0 +1,234 @@
- +From: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
- +Date: Sun, 31 Jan 2016 21:01:31 +0100
- +Subject: [PATCH v4 4/8] mac80211: ath9k: enable access to GPIO
- +
- +Enable access to GPIO chip and its pins for Atheros AR92xx
- +wireless devices. For now AR9285 and AR9287 are supported.
- +
- +Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
- +Signed-off-by: Felix Fietkau <nbd@nbd.name>
- +---
- +--- a/drivers/net/wireless/ath/ath9k/ath9k.h
- ++++ b/drivers/net/wireless/ath/ath9k/ath9k.h
- +@@ -24,6 +24,7 @@
- + #include <linux/completion.h>
- + #include <linux/time.h>
- + #include <linux/hw_random.h>
- ++#include <linux/gpio/driver.h>
- +
- + #include "common.h"
- + #include "debug.h"
- +@@ -960,6 +961,14 @@ struct ath_led {
- + struct led_classdev cdev;
- + };
- +
- ++#ifdef CONFIG_GPIOLIB
- ++struct ath9k_gpio_chip {
- ++ struct ath_softc *sc;
- ++ char label[32];
- ++ struct gpio_chip gchip;
- ++};
- ++#endif
- ++
- + struct ath_softc {
- + struct ieee80211_hw *hw;
- + struct device *dev;
- +@@ -1014,6 +1023,9 @@ struct ath_softc {
- + #ifdef CPTCFG_MAC80211_LEDS
- + const char *led_default_trigger;
- + struct list_head leds;
- ++#ifdef CONFIG_GPIOLIB
- ++ struct ath9k_gpio_chip *gpiochip;
- ++#endif
- + #endif
- +
- + #ifdef CPTCFG_ATH9K_DEBUGFS
- +--- a/drivers/net/wireless/ath/ath9k/gpio.c
- ++++ b/drivers/net/wireless/ath/ath9k/gpio.c
- +@@ -16,13 +16,135 @@
- +
- + #include "ath9k.h"
- + #include <linux/ath9k_platform.h>
- ++#include <linux/gpio.h>
- ++
- ++#ifdef CPTCFG_MAC80211_LEDS
- ++
- ++#ifdef CONFIG_GPIOLIB
- ++
- ++/***************/
- ++/* GPIO Chip */
- ++/***************/
- ++
- ++/* gpio_chip handler : set GPIO to input */
- ++static int ath9k_gpio_pin_cfg_input(struct gpio_chip *chip, unsigned offset)
- ++{
- ++ struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
- ++ gchip);
- ++
- ++ ath9k_hw_gpio_request_in(gc->sc->sc_ah, offset, "ath9k-gpio");
- ++
- ++ return 0;
- ++}
- ++
- ++/* gpio_chip handler : set GPIO to output */
- ++static int ath9k_gpio_pin_cfg_output(struct gpio_chip *chip, unsigned offset,
- ++ int value)
- ++{
- ++ struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
- ++ gchip);
- ++
- ++ ath9k_hw_gpio_request_out(gc->sc->sc_ah, offset, "ath9k-gpio",
- ++ AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
- ++ ath9k_hw_set_gpio(gc->sc->sc_ah, offset, value);
- ++
- ++ return 0;
- ++}
- ++
- ++/* gpio_chip handler : query GPIO direction (0=out, 1=in) */
- ++static int ath9k_gpio_pin_get_dir(struct gpio_chip *chip, unsigned offset)
- ++{
- ++ struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
- ++ gchip);
- ++ struct ath_hw *ah = gc->sc->sc_ah;
- ++
- ++ return !((REG_READ(ah, AR_GPIO_OE_OUT) >> (offset * 2)) & 3);
- ++}
- ++
- ++/* gpio_chip handler : get GPIO pin value */
- ++static int ath9k_gpio_pin_get(struct gpio_chip *chip, unsigned offset)
- ++{
- ++ struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
- ++ gchip);
- ++
- ++ return ath9k_hw_gpio_get(gc->sc->sc_ah, offset);
- ++}
- ++
- ++/* gpio_chip handler : set GPIO pin to value */
- ++static void ath9k_gpio_pin_set(struct gpio_chip *chip, unsigned offset,
- ++ int value)
- ++{
- ++ struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
- ++ gchip);
- ++
- ++ ath9k_hw_set_gpio(gc->sc->sc_ah, offset, value);
- ++}
- ++
- ++/* register GPIO chip */
- ++static void ath9k_register_gpio_chip(struct ath_softc *sc)
- ++{
- ++ struct ath9k_gpio_chip *gc;
- ++ struct ath_hw *ah = sc->sc_ah;
- ++
- ++ gc = kzalloc(sizeof(struct ath9k_gpio_chip), GFP_KERNEL);
- ++ if (!gc)
- ++ return;
- ++
- ++ snprintf(gc->label, sizeof(gc->label), "ath9k-%s",
- ++ wiphy_name(sc->hw->wiphy));
- ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,5,0)
- ++ gc->gchip.parent = sc->dev;
- ++#else
- ++ gc->gchip.dev = sc->dev;
- ++#endif
- ++ gc->gchip.label = gc->label;
- ++ gc->gchip.base = -1; /* determine base automatically */
- ++ gc->gchip.ngpio = ah->caps.num_gpio_pins;
- ++ gc->gchip.direction_input = ath9k_gpio_pin_cfg_input;
- ++ gc->gchip.direction_output = ath9k_gpio_pin_cfg_output;
- ++ gc->gchip.get_direction = ath9k_gpio_pin_get_dir;
- ++ gc->gchip.get = ath9k_gpio_pin_get;
- ++ gc->gchip.set = ath9k_gpio_pin_set;
- ++
- ++ if (gpiochip_add(&gc->gchip)) {
- ++ kfree(gc);
- ++ return;
- ++ }
- ++
- ++ gc->gchip.owner = NULL;
- ++ sc->gpiochip = gc;
- ++ gc->sc = sc;
- ++}
- ++
- ++/* remove GPIO chip */
- ++static void ath9k_unregister_gpio_chip(struct ath_softc *sc)
- ++{
- ++ struct ath9k_gpio_chip *gc = sc->gpiochip;
- ++
- ++ if (!gc)
- ++ return;
- ++
- ++ gpiochip_remove(&gc->gchip);
- ++ kfree(gc);
- ++ sc->gpiochip = NULL;
- ++}
- ++
- ++#else /* CONFIG_GPIOLIB */
- ++
- ++static inline void ath9k_register_gpio_chip(struct ath_softc *sc)
- ++{
- ++}
- ++
- ++static inline void ath9k_unregister_gpio_chip(struct ath_softc *sc)
- ++{
- ++}
- ++
- ++#endif /* CONFIG_GPIOLIB */
- +
- + /********************************/
- + /* LED functions */
- + /********************************/
- +
- +-#ifdef CPTCFG_MAC80211_LEDS
- +-
- + static void ath_fill_led_pin(struct ath_softc *sc)
- + {
- + struct ath_hw *ah = sc->sc_ah;
- +@@ -80,6 +202,12 @@ static int ath_add_led(struct ath_softc
- + else
- + ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, gpio->active_low);
- +
- ++#ifdef CONFIG_GPIOLIB
- ++ /* If there is GPIO chip configured, reserve LED pin */
- ++ if (sc->gpiochip)
- ++ gpio_request(sc->gpiochip->gchip.base + gpio->gpio, gpio->name);
- ++#endif
- ++
- + return 0;
- + }
- +
- +@@ -136,12 +264,18 @@ void ath_deinit_leds(struct ath_softc *s
- +
- + while (!list_empty(&sc->leds)) {
- + led = list_first_entry(&sc->leds, struct ath_led, list);
- ++#ifdef CONFIG_GPIOLIB
- ++ /* If there is GPIO chip configured, free LED pin */
- ++ if (sc->gpiochip)
- ++ gpio_free(sc->gpiochip->gchip.base + led->gpio->gpio);
- ++#endif
- + list_del(&led->list);
- + ath_led_brightness(&led->cdev, LED_OFF);
- + led_classdev_unregister(&led->cdev);
- + ath9k_hw_gpio_free(sc->sc_ah, led->gpio->gpio);
- + kfree(led);
- + }
- ++ ath9k_unregister_gpio_chip(sc);
- + }
- +
- + void ath_init_leds(struct ath_softc *sc)
- +@@ -158,6 +292,8 @@ void ath_init_leds(struct ath_softc *sc)
- +
- + ath_fill_led_pin(sc);
- +
- ++ ath9k_register_gpio_chip(sc);
- ++
- + if (pdata && pdata->led_name)
- + strncpy(led_name, pdata->led_name, sizeof(led_name));
- + else
- +@@ -178,6 +314,7 @@ void ath_init_leds(struct ath_softc *sc)
- + for (i = 0; i < pdata->num_leds; i++)
- + ath_create_platform_led(sc, &pdata->leds[i]);
- + }
- ++
- + #endif
- +
- + /*******************/
- diff --git a/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch b/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch
- new file mode 100644
- index 0000000..b9d1883
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch
- @@ -0,0 +1,149 @@
- +From: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
- +Subject: [PATCH v5 5/8] mac80211: ath9k: enable GPIO buttons
- +
- +Enable platform-defined GPIO button support for ath9k device.
- +Key poller is activated for attached platform buttons.
- +Requires ath9k GPIO chip access.
- +
- +Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
- +Signed-off-by: Felix Fietkau <nbd@nbd.name>
- +---
- +--- a/drivers/net/wireless/ath/ath9k/ath9k.h
- ++++ b/drivers/net/wireless/ath/ath9k/ath9k.h
- +@@ -1025,6 +1025,7 @@ struct ath_softc {
- + struct list_head leds;
- + #ifdef CONFIG_GPIOLIB
- + struct ath9k_gpio_chip *gpiochip;
- ++ struct platform_device *btnpdev; /* gpio-keys-polled */
- + #endif
- + #endif
- +
- +--- a/drivers/net/wireless/ath/ath9k/gpio.c
- ++++ b/drivers/net/wireless/ath/ath9k/gpio.c
- +@@ -17,6 +17,8 @@
- + #include "ath9k.h"
- + #include <linux/ath9k_platform.h>
- + #include <linux/gpio.h>
- ++#include <linux/platform_device.h>
- ++#include <linux/gpio_keys.h>
- +
- + #ifdef CPTCFG_MAC80211_LEDS
- +
- +@@ -129,6 +131,64 @@ static void ath9k_unregister_gpio_chip(s
- + sc->gpiochip = NULL;
- + }
- +
- ++/******************/
- ++/* GPIO Buttons */
- ++/******************/
- ++
- ++/* add GPIO buttons */
- ++static void ath9k_init_buttons(struct ath_softc *sc)
- ++{
- ++ struct ath9k_platform_data *pdata = sc->dev->platform_data;
- ++ struct platform_device *pdev;
- ++ struct gpio_keys_platform_data gkpdata;
- ++ struct gpio_keys_button *bt;
- ++ int i;
- ++
- ++ if (!sc->gpiochip)
- ++ return;
- ++
- ++ if (!pdata || !pdata->btns || !pdata->num_btns)
- ++ return;
- ++
- ++ bt = devm_kmemdup(sc->dev, pdata->btns,
- ++ pdata->num_btns * sizeof(struct gpio_keys_button),
- ++ GFP_KERNEL);
- ++ if (!bt)
- ++ return;
- ++
- ++ for (i = 0; i < pdata->num_btns; i++) {
- ++ ath9k_hw_gpio_request_in(sc->sc_ah, pdata->btns[i].gpio,
- ++ "ath9k-gpio");
- ++ bt[i].gpio = sc->gpiochip->gchip.base + pdata->btns[i].gpio;
- ++ }
- ++
- ++ memset(&gkpdata, 0, sizeof(struct gpio_keys_platform_data));
- ++ gkpdata.buttons = bt;
- ++ gkpdata.nbuttons = pdata->num_btns;
- ++ gkpdata.poll_interval = pdata->btn_poll_interval;
- ++
- ++ pdev = platform_device_register_data(sc->dev, "gpio-keys-polled",
- ++ PLATFORM_DEVID_AUTO, &gkpdata,
- ++ sizeof(gkpdata));
- ++ if (!IS_ERR_OR_NULL(pdev))
- ++ sc->btnpdev = pdev;
- ++ else {
- ++ sc->btnpdev = NULL;
- ++ devm_kfree(sc->dev, bt);
- ++ }
- ++}
- ++
- ++/* remove GPIO buttons */
- ++static void ath9k_deinit_buttons(struct ath_softc *sc)
- ++{
- ++ if (!sc->gpiochip || !sc->btnpdev)
- ++ return;
- ++
- ++ platform_device_unregister(sc->btnpdev);
- ++
- ++ sc->btnpdev = NULL;
- ++}
- ++
- + #else /* CONFIG_GPIOLIB */
- +
- + static inline void ath9k_register_gpio_chip(struct ath_softc *sc)
- +@@ -139,6 +199,14 @@ static inline void ath9k_unregister_gpio
- + {
- + }
- +
- ++static inline void ath9k_init_buttons(struct ath_softc *sc)
- ++{
- ++}
- ++
- ++static inline void ath9k_deinit_buttons(struct ath_softc *sc)
- ++{
- ++}
- ++
- + #endif /* CONFIG_GPIOLIB */
- +
- + /********************************/
- +@@ -262,6 +330,7 @@ void ath_deinit_leds(struct ath_softc *s
- + {
- + struct ath_led *led;
- +
- ++ ath9k_deinit_buttons(sc);
- + while (!list_empty(&sc->leds)) {
- + led = list_first_entry(&sc->leds, struct ath_led, list);
- + #ifdef CONFIG_GPIOLIB
- +@@ -293,6 +362,7 @@ void ath_init_leds(struct ath_softc *sc)
- + ath_fill_led_pin(sc);
- +
- + ath9k_register_gpio_chip(sc);
- ++ ath9k_init_buttons(sc);
- +
- + if (pdata && pdata->led_name)
- + strncpy(led_name, pdata->led_name, sizeof(led_name));
- +@@ -308,7 +378,7 @@ void ath_init_leds(struct ath_softc *sc)
- + ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger,
- + !sc->sc_ah->config.led_active_high);
- +
- +- if (!pdata)
- ++ if (!pdata || !pdata->leds || !pdata->num_leds)
- + return;
- +
- + for (i = 0; i < pdata->num_leds; i++)
- +--- a/include/linux/ath9k_platform.h
- ++++ b/include/linux/ath9k_platform.h
- +@@ -50,6 +50,10 @@ struct ath9k_platform_data {
- + int num_leds;
- + const struct gpio_led *leds;
- + const char *led_name;
- ++
- ++ unsigned num_btns;
- ++ const struct gpio_keys_button *btns;
- ++ unsigned btn_poll_interval;
- + };
- +
- + #endif /* _LINUX_ATH9K_PLATFORM_H */
- diff --git a/package/kernel/mac80211/patches/600-0002-rt2x00-rt2800lib-introduce-RT2800_HAS_HIGH_SHARED_ME.patch b/package/kernel/mac80211/patches/600-0002-rt2x00-rt2800lib-introduce-RT2800_HAS_HIGH_SHARED_ME.patch
- index 8245909..db70a33 100644
- --- a/package/kernel/mac80211/patches/600-0002-rt2x00-rt2800lib-introduce-RT2800_HAS_HIGH_SHARED_ME.patch
- +++ b/package/kernel/mac80211/patches/600-0002-rt2x00-rt2800lib-introduce-RT2800_HAS_HIGH_SHARED_ME.patch
- @@ -24,7 +24,7 @@ Changes since v1:
-
- --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
- +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
- -@@ -7722,6 +7722,7 @@ static int rt2800_probe_rt(struct rt2x00
- +@@ -7726,6 +7726,7 @@ static int rt2800_probe_rt(struct rt2x00
-
- int rt2800_probe_hw(struct rt2x00_dev *rt2x00dev)
- {
- @@ -32,7 +32,7 @@ Changes since v1:
- int retval;
- u32 reg;
-
- -@@ -7729,6 +7730,9 @@ int rt2800_probe_hw(struct rt2x00_dev *r
- +@@ -7733,6 +7734,9 @@ int rt2800_probe_hw(struct rt2x00_dev *r
- if (retval)
- return retval;
-
- diff --git a/package/kernel/mac80211/patches/600-0003-rt2x00-rt2800-serialize-shared-memory-access.patch b/package/kernel/mac80211/patches/600-0003-rt2x00-rt2800-serialize-shared-memory-access.patch
- index 7abfcd1..a3b62bc 100644
- --- a/package/kernel/mac80211/patches/600-0003-rt2x00-rt2800-serialize-shared-memory-access.patch
- +++ b/package/kernel/mac80211/patches/600-0003-rt2x00-rt2800-serialize-shared-memory-access.patch
- @@ -239,7 +239,7 @@ Changes since v1: ---
- msleep(1);
-
- /*
- -@@ -7726,6 +7774,8 @@ int rt2800_probe_hw(struct rt2x00_dev *r
- +@@ -7730,6 +7778,8 @@ int rt2800_probe_hw(struct rt2x00_dev *r
- int retval;
- u32 reg;
-
- @@ -248,7 +248,7 @@ Changes since v1: ---
- retval = rt2800_probe_rt(rt2x00dev);
- if (retval)
- return retval;
- -@@ -7809,8 +7859,11 @@ void rt2800_get_key_seq(struct ieee80211
- +@@ -7813,8 +7863,11 @@ void rt2800_get_key_seq(struct ieee80211
- return;
-
- offset = MAC_IVEIV_ENTRY(key->hw_key_idx);
- diff --git a/package/kernel/mac80211/patches/600-0005-rt2x00-rt2800lib-add-hw_beacon_count-field-to-struct.patch b/package/kernel/mac80211/patches/600-0005-rt2x00-rt2800lib-add-hw_beacon_count-field-to-struct.patch
- index 02b2acf..f41a160 100644
- --- a/package/kernel/mac80211/patches/600-0005-rt2x00-rt2800lib-add-hw_beacon_count-field-to-struct.patch
- +++ b/package/kernel/mac80211/patches/600-0005-rt2x00-rt2800lib-add-hw_beacon_count-field-to-struct.patch
- @@ -41,7 +41,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
- rt2800_clear_beacon_register(rt2x00dev, i);
-
- if (rt2x00_is_usb(rt2x00dev)) {
- -@@ -7827,6 +7828,8 @@ int rt2800_probe_hw(struct rt2x00_dev *r
- +@@ -7831,6 +7832,8 @@ int rt2800_probe_hw(struct rt2x00_dev *r
- if (rt2x00_rt(rt2x00dev, RT3593))
- __set_bit(RT2800_HAS_HIGH_SHARED_MEM, &drv_data->rt2800_flags);
-
- diff --git a/package/kernel/mac80211/patches/600-0007-rt2x00-rt2800lib-fix-max-supported-beacon-count-for-.patch b/package/kernel/mac80211/patches/600-0007-rt2x00-rt2800lib-fix-max-supported-beacon-count-for-.patch
- index e909272..5099c64 100644
- --- a/package/kernel/mac80211/patches/600-0007-rt2x00-rt2800lib-fix-max-supported-beacon-count-for-.patch
- +++ b/package/kernel/mac80211/patches/600-0007-rt2x00-rt2800lib-fix-max-supported-beacon-count-for-.patch
- @@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
-
- --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
- +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
- -@@ -7852,7 +7852,10 @@ int rt2800_probe_hw(struct rt2x00_dev *r
- +@@ -7856,7 +7856,10 @@ int rt2800_probe_hw(struct rt2x00_dev *r
- if (rt2x00_rt(rt2x00dev, RT3593))
- __set_bit(RT2800_HAS_HIGH_SHARED_MEM, &drv_data->rt2800_flags);
-
- diff --git a/package/kernel/mac80211/patches/600-0009-rt2x00-rt2800lib-enable-support-for-RT3883.patch b/package/kernel/mac80211/patches/600-0009-rt2x00-rt2800lib-enable-support-for-RT3883.patch
- index 7fe38e0..a2e7015 100644
- --- a/package/kernel/mac80211/patches/600-0009-rt2x00-rt2800lib-enable-support-for-RT3883.patch
- +++ b/package/kernel/mac80211/patches/600-0009-rt2x00-rt2800lib-enable-support-for-RT3883.patch
- @@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
-
- --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
- +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
- -@@ -7822,6 +7822,7 @@ static int rt2800_probe_rt(struct rt2x00
- +@@ -7826,6 +7826,7 @@ static int rt2800_probe_rt(struct rt2x00
- case RT3390:
- case RT3572:
- case RT3593:
- diff --git a/package/kernel/mac80211/patches/600-0010-rt2x00-rt2800lib-add-rf_vals-for-RF3853.patch b/package/kernel/mac80211/patches/600-0010-rt2x00-rt2800lib-add-rf_vals-for-RF3853.patch
- index 253a0c0..89bd0ac 100644
- --- a/package/kernel/mac80211/patches/600-0010-rt2x00-rt2800lib-add-rf_vals-for-RF3853.patch
- +++ b/package/kernel/mac80211/patches/600-0010-rt2x00-rt2800lib-add-rf_vals-for-RF3853.patch
- @@ -98,7 +98,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
- static const struct rf_channel rf_vals_5592_xtal20[] = {
- /* Channel, N, K, mod, R */
- {1, 482, 4, 10, 3},
- -@@ -7669,6 +7729,11 @@ static int rt2800_probe_hw_mode(struct r
- +@@ -7673,6 +7733,11 @@ static int rt2800_probe_hw_mode(struct r
- spec->channels = rf_vals_3x;
- break;
-
- diff --git a/package/kernel/mac80211/patches/600-0011-rt2x00-rt2800lib-enable-VCO-calibration-for-RF3853.patch b/package/kernel/mac80211/patches/600-0011-rt2x00-rt2800lib-enable-VCO-calibration-for-RF3853.patch
- index f15c22b..b7efc9f 100644
- --- a/package/kernel/mac80211/patches/600-0011-rt2x00-rt2800lib-enable-VCO-calibration-for-RF3853.patch
- +++ b/package/kernel/mac80211/patches/600-0011-rt2x00-rt2800lib-enable-VCO-calibration-for-RF3853.patch
- @@ -18,7 +18,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
- case RF5360:
- case RF5362:
- case RF5370:
- -@@ -7848,6 +7849,7 @@ static int rt2800_probe_hw_mode(struct r
- +@@ -7852,6 +7853,7 @@ static int rt2800_probe_hw_mode(struct r
- case RF3053:
- case RF3070:
- case RF3290:
- diff --git a/package/kernel/mac80211/patches/600-0026-rt2x00-rt2800lib-use-correct-beacon-count-for-RT3883.patch b/package/kernel/mac80211/patches/600-0026-rt2x00-rt2800lib-use-correct-beacon-count-for-RT3883.patch
- index 6ce224a..220e35f 100644
- --- a/package/kernel/mac80211/patches/600-0026-rt2x00-rt2800lib-use-correct-beacon-count-for-RT3883.patch
- +++ b/package/kernel/mac80211/patches/600-0026-rt2x00-rt2800lib-use-correct-beacon-count-for-RT3883.patch
- @@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
-
- --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
- +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
- -@@ -8403,7 +8403,8 @@ int rt2800_probe_hw(struct rt2x00_dev *r
- +@@ -8407,7 +8407,8 @@ int rt2800_probe_hw(struct rt2x00_dev *r
- if (rt2x00_rt(rt2x00dev, RT3593))
- __set_bit(RT2800_HAS_HIGH_SHARED_MEM, &drv_data->rt2800_flags);
-
- diff --git a/package/kernel/mac80211/patches/600-0032-rt2x00-rt2800lib-enable-RT2800_HAS_HIGH_SHARED_MEM-f.patch b/package/kernel/mac80211/patches/600-0032-rt2x00-rt2800lib-enable-RT2800_HAS_HIGH_SHARED_MEM-f.patch
- index 25753af..2ffa5a4 100644
- --- a/package/kernel/mac80211/patches/600-0032-rt2x00-rt2800lib-enable-RT2800_HAS_HIGH_SHARED_MEM-f.patch
- +++ b/package/kernel/mac80211/patches/600-0032-rt2x00-rt2800lib-enable-RT2800_HAS_HIGH_SHARED_MEM-f.patch
- @@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
-
- --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
- +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
- -@@ -8416,7 +8416,8 @@ int rt2800_probe_hw(struct rt2x00_dev *r
- +@@ -8420,7 +8420,8 @@ int rt2800_probe_hw(struct rt2x00_dev *r
- if (retval)
- return retval;
-
- diff --git a/package/kernel/mac80211/patches/602-rt2x00-introduce-rt2x00_platform_h.patch b/package/kernel/mac80211/patches/602-rt2x00-introduce-rt2x00_platform_h.patch
- index 7a183a4..daa5dc6 100644
- --- a/package/kernel/mac80211/patches/602-rt2x00-introduce-rt2x00_platform_h.patch
- +++ b/package/kernel/mac80211/patches/602-rt2x00-introduce-rt2x00_platform_h.patch
- @@ -22,10 +22,10 @@
- +#endif /* _RT2X00_PLATFORM_H */
- --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
- +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
- -@@ -38,6 +38,7 @@
- - #include <linux/kfifo.h>
- +@@ -39,6 +39,7 @@
- #include <linux/hrtimer.h>
- #include <linux/average.h>
- + #include <linux/usb.h>
- +#include <linux/rt2x00_platform.h>
-
- #include <net/mac80211.h>
- diff --git a/package/kernel/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch b/package/kernel/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch
- index bc056cd..8ae5da3 100644
- --- a/package/kernel/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch
- +++ b/package/kernel/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch
- @@ -1,6 +1,6 @@
- --- a/.local-symbols
- +++ b/.local-symbols
- -@@ -329,6 +329,7 @@ RT2X00_LIB_FIRMWARE=
- +@@ -331,6 +331,7 @@ RT2X00_LIB_FIRMWARE=
- RT2X00_LIB_CRYPTO=
- RT2X00_LIB_LEDS=
- RT2X00_LIB_DEBUGFS=
- @@ -105,7 +105,7 @@
- .drv_init_registers = rt2800mmio_init_registers,
- --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
- +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
- -@@ -697,6 +697,7 @@ enum rt2x00_capability_flags {
- +@@ -699,6 +699,7 @@ enum rt2x00_capability_flags {
- REQUIRE_HT_TX_DESC,
- REQUIRE_PS_AUTOWAKE,
- REQUIRE_DELAYED_RFKILL,
- @@ -127,7 +127,7 @@
- DECLARE_KFIFO_PTR(txstatus_fifo, u32);
- --- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
- +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
- -@@ -1335,6 +1335,10 @@ int rt2x00lib_probe_dev(struct rt2x00_de
- +@@ -1334,6 +1334,10 @@ int rt2x00lib_probe_dev(struct rt2x00_de
- INIT_DELAYED_WORK(&rt2x00dev->autowakeup_work, rt2x00lib_autowakeup);
- INIT_WORK(&rt2x00dev->sleep_work, rt2x00lib_sleep);
-
- @@ -138,7 +138,7 @@
- /*
- * Let the driver probe the device to detect the capabilities.
- */
- -@@ -1475,6 +1479,11 @@ void rt2x00lib_remove_dev(struct rt2x00_
- +@@ -1477,6 +1481,11 @@ void rt2x00lib_remove_dev(struct rt2x00_
- * Free the driver data.
- */
- kfree(rt2x00dev->drv_data);
- diff --git a/package/kernel/mac80211/patches/607-rt2x00-allow_disabling_bands_through_platform_data.patch b/package/kernel/mac80211/patches/607-rt2x00-allow_disabling_bands_through_platform_data.patch
- index d923e05..a2e1faf 100644
- --- a/package/kernel/mac80211/patches/607-rt2x00-allow_disabling_bands_through_platform_data.patch
- +++ b/package/kernel/mac80211/patches/607-rt2x00-allow_disabling_bands_through_platform_data.patch
- @@ -37,7 +37,7 @@
- num_rates += 4;
- --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
- +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
- -@@ -405,6 +405,7 @@ struct hw_mode_spec {
- +@@ -406,6 +406,7 @@ struct hw_mode_spec {
- unsigned int supported_bands;
- #define SUPPORT_BAND_2GHZ 0x00000001
- #define SUPPORT_BAND_5GHZ 0x00000002
- diff --git a/package/kernel/mac80211/patches/608-add_platform_data_mac_addr.patch b/package/kernel/mac80211/patches/608-add_platform_data_mac_addr.patch
- index a645ba1..6704ff8 100644
- --- a/package/kernel/mac80211/patches/608-add_platform_data_mac_addr.patch
- +++ b/package/kernel/mac80211/patches/608-add_platform_data_mac_addr.patch
- @@ -31,7 +31,7 @@
- {
- --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
- +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
- -@@ -1414,6 +1414,7 @@ static inline void rt2x00debug_dump_fram
- +@@ -1416,6 +1416,7 @@ static inline void rt2x00debug_dump_fram
- */
- u32 rt2x00lib_get_bssidx(struct rt2x00_dev *rt2x00dev,
- struct ieee80211_vif *vif);
- diff --git a/package/kernel/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch b/package/kernel/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch
- index c69d330..9f10fe3 100644
- --- a/package/kernel/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch
- +++ b/package/kernel/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch
- @@ -200,7 +200,7 @@
- * EEPROM frequency
- --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
- +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
- -@@ -717,6 +717,8 @@ enum rt2x00_capability_flags {
- +@@ -719,6 +719,8 @@ enum rt2x00_capability_flags {
- CAPABILITY_DOUBLE_ANTENNA,
- CAPABILITY_BT_COEXIST,
- CAPABILITY_VCO_RECALIBRATION,
- diff --git a/package/kernel/mac80211/patches/611-rt2x00-rf_vals-rt3352-xtal20.patch b/package/kernel/mac80211/patches/611-rt2x00-rf_vals-rt3352-xtal20.patch
- index b44fe90..860fdc0 100644
- --- a/package/kernel/mac80211/patches/611-rt2x00-rf_vals-rt3352-xtal20.patch
- +++ b/package/kernel/mac80211/patches/611-rt2x00-rf_vals-rt3352-xtal20.patch
- @@ -28,7 +28,7 @@
- static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
- {
- struct hw_mode_spec *spec = &rt2x00dev->spec;
- -@@ -8272,7 +8293,10 @@ static int rt2800_probe_hw_mode(struct r
- +@@ -8276,7 +8297,10 @@ static int rt2800_probe_hw_mode(struct r
- case RF5390:
- case RF5392:
- spec->num_channels = 14;
- @@ -40,7 +40,7 @@
- break;
-
- case RF3052:
- -@@ -8456,6 +8480,19 @@ static int rt2800_probe_rt(struct rt2x00
- +@@ -8460,6 +8484,19 @@ static int rt2800_probe_rt(struct rt2x00
- return 0;
- }
-
- @@ -60,7 +60,7 @@
- int rt2800_probe_hw(struct rt2x00_dev *rt2x00dev)
- {
- struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
- -@@ -8498,6 +8535,15 @@ int rt2800_probe_hw(struct rt2x00_dev *r
- +@@ -8502,6 +8539,15 @@ int rt2800_probe_hw(struct rt2x00_dev *r
- rt2800_register_write(rt2x00dev, GPIO_CTRL, reg);
-
- /*
- @@ -78,7 +78,7 @@
- retval = rt2800_probe_hw_mode(rt2x00dev);
- --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
- +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
- -@@ -400,6 +400,7 @@ static inline struct rt2x00_intf* vif_to
- +@@ -401,6 +401,7 @@ static inline struct rt2x00_intf* vif_to
- * @channels: Device/chipset specific channel values (See &struct rf_channel).
- * @channels_info: Additional information for channels (See &struct channel_info).
- * @ht: Driver HT Capabilities (See &ieee80211_sta_ht_cap).
- @@ -86,7 +86,7 @@
- */
- struct hw_mode_spec {
- unsigned int supported_bands;
- -@@ -416,6 +417,7 @@ struct hw_mode_spec {
- +@@ -417,6 +418,7 @@ struct hw_mode_spec {
- const struct channel_info *channels_info;
-
- struct ieee80211_sta_ht_cap ht;
- diff --git a/package/kernel/mac80211/patches/615-rt2x00-fix_20mhz_clk.patch b/package/kernel/mac80211/patches/615-rt2x00-fix_20mhz_clk.patch
- index 8e3bd2a..e7b2a8c 100644
- --- a/package/kernel/mac80211/patches/615-rt2x00-fix_20mhz_clk.patch
- +++ b/package/kernel/mac80211/patches/615-rt2x00-fix_20mhz_clk.patch
- @@ -8,7 +8,7 @@
-
- #include "rt2x00.h"
- #include "rt2800lib.h"
- -@@ -8482,13 +8483,14 @@ static int rt2800_probe_rt(struct rt2x00
- +@@ -8486,13 +8487,14 @@ static int rt2800_probe_rt(struct rt2x00
-
- int rt2800_probe_clk(struct rt2x00_dev *rt2x00dev)
- {
- diff --git a/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch b/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch
- index faa5879..44bd8a1 100644
- --- a/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch
- +++ b/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch
- @@ -240,7 +240,7 @@
- case RF5360:
- case RF5362:
- case RF5370:
- -@@ -8287,6 +8398,7 @@ static int rt2800_probe_hw_mode(struct r
- +@@ -8291,6 +8402,7 @@ static int rt2800_probe_hw_mode(struct r
- case RF3290:
- case RF3320:
- case RF3322:
- @@ -248,7 +248,7 @@
- case RF5360:
- case RF5362:
- case RF5370:
- -@@ -8426,6 +8538,7 @@ static int rt2800_probe_hw_mode(struct r
- +@@ -8430,6 +8542,7 @@ static int rt2800_probe_hw_mode(struct r
- case RF3070:
- case RF3290:
- case RF3853:
- @@ -256,7 +256,7 @@
- case RF5360:
- case RF5362:
- case RF5370:
- -@@ -8466,6 +8579,7 @@ static int rt2800_probe_rt(struct rt2x00
- +@@ -8470,6 +8583,7 @@ static int rt2800_probe_rt(struct rt2x00
- case RT3572:
- case RT3593:
- case RT3883:
- @@ -266,7 +266,7 @@
- case RT5592:
- --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
- +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
- -@@ -169,6 +169,7 @@ struct rt2x00_chip {
- +@@ -170,6 +170,7 @@ struct rt2x00_chip {
- #define RT3572 0x3572
- #define RT3593 0x3593
- #define RT3883 0x3883 /* WSOC */
- diff --git a/package/kernel/mac80211/patches/620-rt2x00-add-AP+STA-support.patch b/package/kernel/mac80211/patches/620-rt2x00-add-AP+STA-support.patch
- index 55452b9..dba6033 100644
- --- a/package/kernel/mac80211/patches/620-rt2x00-add-AP+STA-support.patch
- +++ b/package/kernel/mac80211/patches/620-rt2x00-add-AP+STA-support.patch
- @@ -1,6 +1,6 @@
- --- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
- +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
- -@@ -1284,7 +1284,7 @@ static inline void rt2x00lib_set_if_comb
- +@@ -1283,7 +1283,7 @@ static inline void rt2x00lib_set_if_comb
- */
- if_limit = &rt2x00dev->if_limits_ap;
- if_limit->max = rt2x00dev->ops->max_ap_intf;
- diff --git a/package/kernel/mac80211/patches/801-libertas-configure-sysfs-links.patch b/package/kernel/mac80211/patches/801-libertas-configure-sysfs-links.patch
- index fd885cc..02f3053 100644
- --- a/package/kernel/mac80211/patches/801-libertas-configure-sysfs-links.patch
- +++ b/package/kernel/mac80211/patches/801-libertas-configure-sysfs-links.patch
- @@ -1,6 +1,6 @@
- --- a/drivers/net/wireless/marvell/libertas/cfg.c
- +++ b/drivers/net/wireless/marvell/libertas/cfg.c
- -@@ -2084,6 +2084,8 @@ struct wireless_dev *lbs_cfg_alloc(struc
- +@@ -2122,6 +2122,8 @@ struct wireless_dev *lbs_cfg_alloc(struc
- goto err_wiphy_new;
- }
-
- diff --git a/package/kernel/mac80211/patches/802-libertas-set-wireless-macaddr.patch b/package/kernel/mac80211/patches/802-libertas-set-wireless-macaddr.patch
- index b67a95f..ad30608 100644
- --- a/package/kernel/mac80211/patches/802-libertas-set-wireless-macaddr.patch
- +++ b/package/kernel/mac80211/patches/802-libertas-set-wireless-macaddr.patch
- @@ -1,6 +1,6 @@
- --- a/drivers/net/wireless/marvell/libertas/cfg.c
- +++ b/drivers/net/wireless/marvell/libertas/cfg.c
- -@@ -2174,6 +2174,8 @@ int lbs_cfg_register(struct lbs_private
- +@@ -2212,6 +2212,8 @@ int lbs_cfg_register(struct lbs_private
- wdev->wiphy->n_cipher_suites = ARRAY_SIZE(cipher_suites);
- wdev->wiphy->reg_notifier = lbs_reg_notifier;
-
- diff --git a/package/kernel/mac80211/patches/804-b43-sync-with-bcma.patch b/package/kernel/mac80211/patches/804-b43-sync-with-bcma.patch
- deleted file mode 100644
- index 74cd448..0000000
- --- a/package/kernel/mac80211/patches/804-b43-sync-with-bcma.patch
- +++ /dev/null
- @@ -1,17 +0,0 @@
- ---- a/drivers/net/wireless/broadcom/b43/main.c
- -+++ b/drivers/net/wireless/broadcom/b43/main.c
- -@@ -1215,10 +1215,10 @@ void b43_wireless_core_phy_pll_reset(str
- - case B43_BUS_BCMA:
- - bcma_cc = &dev->dev->bdev->bus->drv_cc;
- -
- -- bcma_cc_write32(bcma_cc, BCMA_CC_CHIPCTL_ADDR, 0);
- -- bcma_cc_mask32(bcma_cc, BCMA_CC_CHIPCTL_DATA, ~0x4);
- -- bcma_cc_set32(bcma_cc, BCMA_CC_CHIPCTL_DATA, 0x4);
- -- bcma_cc_mask32(bcma_cc, BCMA_CC_CHIPCTL_DATA, ~0x4);
- -+ bcma_cc_write32(bcma_cc, BCMA_CC_PMU_CHIPCTL_ADDR, 0);
- -+ bcma_cc_mask32(bcma_cc, BCMA_CC_PMU_CHIPCTL_DATA, ~0x4);
- -+ bcma_cc_set32(bcma_cc, BCMA_CC_PMU_CHIPCTL_DATA, 0x4);
- -+ bcma_cc_mask32(bcma_cc, BCMA_CC_PMU_CHIPCTL_DATA, ~0x4);
- - break;
- - #endif
- - #ifdef CPTCFG_B43_SSB
- diff --git a/package/kernel/mac80211/patches/820-b43-add-antenna-control.patch b/package/kernel/mac80211/patches/820-b43-add-antenna-control.patch
- index 06c731f..f8f555f 100644
- --- a/package/kernel/mac80211/patches/820-b43-add-antenna-control.patch
- +++ b/package/kernel/mac80211/patches/820-b43-add-antenna-control.patch
- @@ -9,7 +9,7 @@
- antenna = b43_antenna_to_phyctl(antenna);
- ctl = b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_BEACPHYCTL);
- /* We can't send beacons with short preamble. Would get PHY errors. */
- -@@ -3300,8 +3300,8 @@ static int b43_chip_init(struct b43_wlde
- +@@ -3297,8 +3297,8 @@ static int b43_chip_init(struct b43_wlde
-
- /* Select the antennae */
- if (phy->ops->set_rx_antenna)
- @@ -20,7 +20,7 @@
-
- if (phy->type == B43_PHYTYPE_B) {
- value16 = b43_read16(dev, 0x005E);
- -@@ -4001,7 +4001,6 @@ static int b43_op_config(struct ieee8021
- +@@ -3998,7 +3998,6 @@ static int b43_op_config(struct ieee8021
- struct b43_wldev *dev = wl->current_dev;
- struct b43_phy *phy = &dev->phy;
- struct ieee80211_conf *conf = &hw->conf;
- @@ -28,7 +28,7 @@
- int err = 0;
-
- mutex_lock(&wl->mutex);
- -@@ -4044,11 +4043,9 @@ static int b43_op_config(struct ieee8021
- +@@ -4041,11 +4040,9 @@ static int b43_op_config(struct ieee8021
- }
-
- /* Antennas for RX and management frame TX. */
- @@ -42,7 +42,7 @@
-
- if (wl->radio_enabled != phy->radio_on) {
- if (wl->radio_enabled) {
- -@@ -5209,6 +5206,47 @@ static int b43_op_get_survey(struct ieee
- +@@ -5189,6 +5186,47 @@ static int b43_op_get_survey(struct ieee
- return 0;
- }
-
- @@ -90,7 +90,7 @@
- static const struct ieee80211_ops b43_hw_ops = {
- .tx = b43_op_tx,
- .conf_tx = b43_op_conf_tx,
- -@@ -5230,6 +5268,8 @@ static const struct ieee80211_ops b43_hw
- +@@ -5210,6 +5248,8 @@ static const struct ieee80211_ops b43_hw
- .sw_scan_complete = b43_op_sw_scan_complete_notifier,
- .get_survey = b43_op_get_survey,
- .rfkill_poll = b43_rfkill_poll,
- @@ -99,7 +99,7 @@
- };
-
- /* Hard-reset the chip. Do not call this directly.
- -@@ -5538,6 +5578,8 @@ static int b43_one_core_attach(struct b4
- +@@ -5513,6 +5553,8 @@ static int b43_one_core_attach(struct b4
- if (!wldev)
- goto out;
-
- @@ -108,7 +108,7 @@
- wldev->use_pio = b43_modparam_pio;
- wldev->dev = dev;
- wldev->wl = wl;
- -@@ -5628,6 +5670,9 @@ static struct b43_wl *b43_wireless_init(
- +@@ -5603,6 +5645,9 @@ static struct b43_wl *b43_wireless_init(
-
- hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
-
- diff --git a/package/kernel/mac80211/patches/860-brcmfmac-register-wiphy-s-during-module_init.patch b/package/kernel/mac80211/patches/860-brcmfmac-register-wiphy-s-during-module_init.patch
- new file mode 100644
- index 0000000..ae571c9
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/860-brcmfmac-register-wiphy-s-during-module_init.patch
- @@ -0,0 +1,97 @@
- +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
- +Date: Mon, 8 Jun 2015 16:11:40 +0200
- +Subject: [PATCH] brcmfmac: register wiphy(s) during module_init
- +MIME-Version: 1.0
- +Content-Type: text/plain; charset=UTF-8
- +Content-Transfer-Encoding: 8bit
- +
- +This is needed by OpenWrt which expects all PHYs to be created after
- +module loads successfully.
- +
- +Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
- +---
- +
- +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
- ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
- +@@ -1213,6 +1213,7 @@ int __init brcmf_core_init(void)
- + {
- + if (!schedule_work(&brcmf_driver_work))
- + return -EBUSY;
- ++ flush_work(&brcmf_driver_work);
- +
- + return 0;
- + }
- +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
- ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
- +@@ -444,6 +444,7 @@ struct brcmf_fw {
- + u16 bus_nr;
- + void (*done)(struct device *dev, const struct firmware *fw,
- + void *nvram_image, u32 nvram_len);
- ++ struct completion *completion;
- + };
- +
- + static void brcmf_fw_request_nvram_done(const struct firmware *fw, void *ctx)
- +@@ -478,6 +479,8 @@ static void brcmf_fw_request_nvram_done(
- + goto fail;
- +
- + fwctx->done(fwctx->dev, fwctx->code, nvram, nvram_length);
- ++ if (fwctx->completion)
- ++ complete(fwctx->completion);
- + kfree(fwctx);
- + return;
- +
- +@@ -485,6 +488,8 @@ fail:
- + brcmf_dbg(TRACE, "failed: dev=%s\n", dev_name(fwctx->dev));
- + release_firmware(fwctx->code);
- + device_release_driver(fwctx->dev);
- ++ if (fwctx->completion)
- ++ complete(fwctx->completion);
- + kfree(fwctx);
- + }
- +
- +@@ -500,6 +505,8 @@ static void brcmf_fw_request_code_done(c
- + /* only requested code so done here */
- + if (!(fwctx->flags & BRCMF_FW_REQUEST_NVRAM)) {
- + fwctx->done(fwctx->dev, fw, NULL, 0);
- ++ if (fwctx->completion)
- ++ complete(fwctx->completion);
- + kfree(fwctx);
- + return;
- + }
- +@@ -517,6 +524,8 @@ static void brcmf_fw_request_code_done(c
- + fail:
- + brcmf_dbg(TRACE, "failed: dev=%s\n", dev_name(fwctx->dev));
- + device_release_driver(fwctx->dev);
- ++ if (fwctx->completion)
- ++ complete(fwctx->completion);
- + kfree(fwctx);
- + }
- +
- +@@ -528,6 +537,8 @@ int brcmf_fw_get_firmwares_pcie(struct d
- + u16 domain_nr, u16 bus_nr)
- + {
- + struct brcmf_fw *fwctx;
- ++ struct completion completion;
- ++ int err;
- +
- + brcmf_dbg(TRACE, "enter: dev=%s\n", dev_name(dev));
- + if (!fw_cb || !code)
- +@@ -548,9 +559,17 @@ int brcmf_fw_get_firmwares_pcie(struct d
- + fwctx->domain_nr = domain_nr;
- + fwctx->bus_nr = bus_nr;
- +
- +- return request_firmware_nowait(THIS_MODULE, true, code, dev,
- ++ init_completion(&completion);
- ++ fwctx->completion = &completion;
- ++
- ++ err = request_firmware_nowait(THIS_MODULE, true, code, dev,
- + GFP_KERNEL, fwctx,
- + brcmf_fw_request_code_done);
- ++ if (!err)
- ++ wait_for_completion_timeout(fwctx->completion,
- ++ msecs_to_jiffies(5000));
- ++ fwctx->completion = NULL;
- ++ return err;
- + }
- +
- + int brcmf_fw_get_firmwares(struct device *dev, u16 flags,
- diff --git a/package/kernel/mac80211/patches/861-brcmfmac-register-wiphy-s-during-module_init.patch b/package/kernel/mac80211/patches/861-brcmfmac-register-wiphy-s-during-module_init.patch
- deleted file mode 100644
- index 00181f6..0000000
- --- a/package/kernel/mac80211/patches/861-brcmfmac-register-wiphy-s-during-module_init.patch
- +++ /dev/null
- @@ -1,97 +0,0 @@
- -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
- -Date: Mon, 8 Jun 2015 16:11:40 +0200
- -Subject: [PATCH] brcmfmac: register wiphy(s) during module_init
- -MIME-Version: 1.0
- -Content-Type: text/plain; charset=UTF-8
- -Content-Transfer-Encoding: 8bit
- -
- -This is needed by OpenWrt which expects all PHYs to be created after
- -module loads successfully.
- -
- -Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
- ----
- -
- ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
- -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
- -@@ -1332,6 +1332,7 @@ static int __init brcmfmac_module_init(v
- - #endif
- - if (!schedule_work(&brcmf_driver_work))
- - return -EBUSY;
- -+ flush_work(&brcmf_driver_work);
- -
- - return 0;
- - }
- ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
- -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
- -@@ -444,6 +444,7 @@ struct brcmf_fw {
- - u16 bus_nr;
- - void (*done)(struct device *dev, const struct firmware *fw,
- - void *nvram_image, u32 nvram_len);
- -+ struct completion *completion;
- - };
- -
- - static void brcmf_fw_request_nvram_done(const struct firmware *fw, void *ctx)
- -@@ -478,6 +479,8 @@ static void brcmf_fw_request_nvram_done(
- - goto fail;
- -
- - fwctx->done(fwctx->dev, fwctx->code, nvram, nvram_length);
- -+ if (fwctx->completion)
- -+ complete(fwctx->completion);
- - kfree(fwctx);
- - return;
- -
- -@@ -485,6 +488,8 @@ fail:
- - brcmf_dbg(TRACE, "failed: dev=%s\n", dev_name(fwctx->dev));
- - release_firmware(fwctx->code);
- - device_release_driver(fwctx->dev);
- -+ if (fwctx->completion)
- -+ complete(fwctx->completion);
- - kfree(fwctx);
- - }
- -
- -@@ -500,6 +505,8 @@ static void brcmf_fw_request_code_done(c
- - /* only requested code so done here */
- - if (!(fwctx->flags & BRCMF_FW_REQUEST_NVRAM)) {
- - fwctx->done(fwctx->dev, fw, NULL, 0);
- -+ if (fwctx->completion)
- -+ complete(fwctx->completion);
- - kfree(fwctx);
- - return;
- - }
- -@@ -517,6 +524,8 @@ static void brcmf_fw_request_code_done(c
- - fail:
- - brcmf_dbg(TRACE, "failed: dev=%s\n", dev_name(fwctx->dev));
- - device_release_driver(fwctx->dev);
- -+ if (fwctx->completion)
- -+ complete(fwctx->completion);
- - kfree(fwctx);
- - }
- -
- -@@ -528,6 +537,8 @@ int brcmf_fw_get_firmwares_pcie(struct d
- - u16 domain_nr, u16 bus_nr)
- - {
- - struct brcmf_fw *fwctx;
- -+ struct completion completion;
- -+ int err;
- -
- - brcmf_dbg(TRACE, "enter: dev=%s\n", dev_name(dev));
- - if (!fw_cb || !code)
- -@@ -548,9 +559,17 @@ int brcmf_fw_get_firmwares_pcie(struct d
- - fwctx->domain_nr = domain_nr;
- - fwctx->bus_nr = bus_nr;
- -
- -- return request_firmware_nowait(THIS_MODULE, true, code, dev,
- -+ init_completion(&completion);
- -+ fwctx->completion = &completion;
- -+
- -+ err = request_firmware_nowait(THIS_MODULE, true, code, dev,
- - GFP_KERNEL, fwctx,
- - brcmf_fw_request_code_done);
- -+ if (!err)
- -+ wait_for_completion_timeout(fwctx->completion,
- -+ msecs_to_jiffies(5000));
- -+ fwctx->completion = NULL;
- -+ return err;
- - }
- -
- - int brcmf_fw_get_firmwares(struct device *dev, u16 flags,
- diff --git a/package/kernel/mac80211/patches/861-brcmfmac-workaround-bug-with-some-inconsistent-BSSes.patch b/package/kernel/mac80211/patches/861-brcmfmac-workaround-bug-with-some-inconsistent-BSSes.patch
- new file mode 100644
- index 0000000..8721155
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/861-brcmfmac-workaround-bug-with-some-inconsistent-BSSes.patch
- @@ -0,0 +1,50 @@
- +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
- +Date: Thu, 9 Jul 2015 00:07:59 +0200
- +Subject: [PATCH] brcmfmac: workaround bug with some inconsistent BSSes state
- +MIME-Version: 1.0
- +Content-Type: text/plain; charset=UTF-8
- +Content-Transfer-Encoding: 8bit
- +
- +Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
- +---
- +
- +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
- ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
- +@@ -665,9 +665,37 @@ static struct wireless_dev *brcmf_cfg802
- + u32 *flags,
- + struct vif_params *params)
- + {
- ++ struct net_device *dev;
- + struct wireless_dev *wdev;
- + int err;
- +
- ++ /*
- ++ * There is a bug with in-firmware BSS management. When adding virtual
- ++ * interface brcmfmac first tells firmware to create new BSS and then
- ++ * it creates new struct net_device.
- ++ *
- ++ * If creating/registering netdev(ice) fails, BSS remains in some bugged
- ++ * state. It conflicts with existing BSSes by overtaking their auth
- ++ * requests.
- ++ *
- ++ * It results in one BSS (addresss X) sending beacons and another BSS
- ++ * (address Y) replying to authentication requests. This makes interface
- ++ * unusable as AP.
- ++ *
- ++ * To workaround this bug we may try to guess if register_netdev(ice)
- ++ * will fail. The most obvious case is using interface name that already
- ++ * exists. This is actually quite likely with brcmfmac & some user space
- ++ * scripts as brcmfmac doesn't allow deleting virtual interfaces.
- ++ * So this bug can be triggered even by something trivial like:
- ++ * iw dev wlan0 delete
- ++ * iw phy phy0 interface add wlan0 type __ap
- ++ */
- ++ dev = dev_get_by_name(&init_net, name);
- ++ if (dev) {
- ++ dev_put(dev);
- ++ return ERR_PTR(-ENFILE);
- ++ }
- ++
- + brcmf_dbg(TRACE, "enter: %s type %d\n", name, type);
- + err = brcmf_vif_add_validate(wiphy_to_cfg(wiphy), type);
- + if (err) {
- diff --git a/package/kernel/mac80211/patches/862-brcmfmac-Disable-power-management.patch b/package/kernel/mac80211/patches/862-brcmfmac-Disable-power-management.patch
- new file mode 100644
- index 0000000..f301fe1
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/862-brcmfmac-Disable-power-management.patch
- @@ -0,0 +1,27 @@
- +From 66ae1b1750720a33e29792a177b1e696f4f005fb Mon Sep 17 00:00:00 2001
- +From: Phil Elwell <phil@raspberrypi.org>
- +Date: Wed, 9 Mar 2016 17:25:59 +0000
- +Subject: [PATCH] brcmfmac: Disable power management
- +
- +Disable wireless power saving in the brcmfmac WLAN driver. This is a
- +temporary measure until the connectivity loss resulting from power
- +saving is resolved.
- +
- +Signed-off-by: Phil Elwell <phil@raspberrypi.org>
- +---
- + drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c | 2 ++
- + 1 file changed, 2 insertions(+)
- +
- +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
- ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
- +@@ -2783,6 +2783,10 @@ brcmf_cfg80211_set_power_mgmt(struct wip
- + * preference in cfg struct to apply this to
- + * FW later while initializing the dongle
- + */
- ++#if defined(CONFIG_BCM2708) || defined(CONFIG_BCM2709)
- ++ pr_info("power management disabled\n");
- ++ enabled = false;
- ++#endif
- + cfg->pwr_save = enabled;
- + if (!check_vif_up(ifp->vif)) {
- +
- diff --git a/package/kernel/mac80211/patches/862-brcmfmac-workaround-bug-with-some-inconsistent-BSSes.patch b/package/kernel/mac80211/patches/862-brcmfmac-workaround-bug-with-some-inconsistent-BSSes.patch
- deleted file mode 100644
- index 4295b4b..0000000
- --- a/package/kernel/mac80211/patches/862-brcmfmac-workaround-bug-with-some-inconsistent-BSSes.patch
- +++ /dev/null
- @@ -1,50 +0,0 @@
- -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
- -Date: Thu, 9 Jul 2015 00:07:59 +0200
- -Subject: [PATCH] brcmfmac: workaround bug with some inconsistent BSSes state
- -MIME-Version: 1.0
- -Content-Type: text/plain; charset=UTF-8
- -Content-Transfer-Encoding: 8bit
- -
- -Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
- ----
- -
- ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
- -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
- -@@ -615,9 +615,37 @@ static struct wireless_dev *brcmf_cfg802
- - u32 *flags,
- - struct vif_params *params)
- - {
- -+ struct net_device *dev;
- - struct wireless_dev *wdev;
- - int err;
- -
- -+ /*
- -+ * There is a bug with in-firmware BSS management. When adding virtual
- -+ * interface brcmfmac first tells firmware to create new BSS and then
- -+ * it creates new struct net_device.
- -+ *
- -+ * If creating/registering netdev(ice) fails, BSS remains in some bugged
- -+ * state. It conflicts with existing BSSes by overtaking their auth
- -+ * requests.
- -+ *
- -+ * It results in one BSS (addresss X) sending beacons and another BSS
- -+ * (address Y) replying to authentication requests. This makes interface
- -+ * unusable as AP.
- -+ *
- -+ * To workaround this bug we may try to guess if register_netdev(ice)
- -+ * will fail. The most obvious case is using interface name that already
- -+ * exists. This is actually quite likely with brcmfmac & some user space
- -+ * scripts as brcmfmac doesn't allow deleting virtual interfaces.
- -+ * So this bug can be triggered even by something trivial like:
- -+ * iw dev wlan0 delete
- -+ * iw phy phy0 interface add wlan0 type __ap
- -+ */
- -+ dev = dev_get_by_name(&init_net, name);
- -+ if (dev) {
- -+ dev_put(dev);
- -+ return ERR_PTR(-EEXIST);
- -+ }
- -+
- - brcmf_dbg(TRACE, "enter: %s type %d\n", name, type);
- - err = brcmf_vif_add_validate(wiphy_to_cfg(wiphy), type);
- - if (err) {
- diff --git a/package/kernel/mac80211/patches/910-01-add-support-for-mt7620.patch b/package/kernel/mac80211/patches/910-01-add-support-for-mt7620.patch
- index f2e21ea..be210f2 100644
- --- a/package/kernel/mac80211/patches/910-01-add-support-for-mt7620.patch
- +++ b/package/kernel/mac80211/patches/910-01-add-support-for-mt7620.patch
- @@ -1184,7 +1184,7 @@
- break;
- default:
- rt2x00_err(rt2x00dev, "Invalid RF chipset 0x%04x detected\n",
- -@@ -8423,6 +9363,7 @@ static int rt2800_probe_hw_mode(struct r
- +@@ -8427,6 +9367,7 @@ static int rt2800_probe_hw_mode(struct r
- case RF5372:
- case RF5390:
- case RF5392:
- @@ -1192,7 +1192,7 @@
- spec->num_channels = 14;
- if (spec->clk_is_20mhz)
- spec->channels = rf_vals_xtal20mhz_3x;
- -@@ -8563,6 +9504,7 @@ static int rt2800_probe_hw_mode(struct r
- +@@ -8567,6 +9508,7 @@ static int rt2800_probe_hw_mode(struct r
- case RF5372:
- case RF5390:
- case RF5392:
- diff --git a/package/kernel/mac80211/patches/921-ath10k_init_devices_synchronously.patch b/package/kernel/mac80211/patches/921-ath10k_init_devices_synchronously.patch
- index 8c6d720..e842d61 100644
- --- a/package/kernel/mac80211/patches/921-ath10k_init_devices_synchronously.patch
- +++ b/package/kernel/mac80211/patches/921-ath10k_init_devices_synchronously.patch
- @@ -14,7 +14,7 @@ Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
-
- --- a/drivers/net/wireless/ath/ath10k/core.c
- +++ b/drivers/net/wireless/ath/ath10k/core.c
- -@@ -1914,6 +1914,16 @@ int ath10k_core_register(struct ath10k *
- +@@ -2107,6 +2107,16 @@ int ath10k_core_register(struct ath10k *
- ar->chip_id = chip_id;
- queue_work(ar->workqueue, &ar->register_work);
-
- diff --git a/package/kernel/mac80211/patches/930-ath10k_add_tpt_led_trigger.patch b/package/kernel/mac80211/patches/930-ath10k_add_tpt_led_trigger.patch
- index 281b447..a501b99 100644
- --- a/package/kernel/mac80211/patches/930-ath10k_add_tpt_led_trigger.patch
- +++ b/package/kernel/mac80211/patches/930-ath10k_add_tpt_led_trigger.patch
- @@ -1,6 +1,6 @@
- --- a/drivers/net/wireless/ath/ath10k/mac.c
- +++ b/drivers/net/wireless/ath/ath10k/mac.c
- -@@ -7141,6 +7141,21 @@ struct ath10k_vif *ath10k_get_arvif(stru
- +@@ -7742,6 +7742,21 @@ struct ath10k_vif *ath10k_get_arvif(stru
- return arvif_iter.arvif;
- }
-
- @@ -22,11 +22,11 @@
- int ath10k_mac_register(struct ath10k *ar)
- {
- static const u32 cipher_suites[] = {
- -@@ -7357,6 +7372,12 @@ int ath10k_mac_register(struct ath10k *a
- +@@ -7975,6 +7990,12 @@ int ath10k_mac_register(struct ath10k *a
- ar->hw->wiphy->cipher_suites = cipher_suites;
- ar->hw->wiphy->n_cipher_suites = ARRAY_SIZE(cipher_suites);
-
- -+#if CPTCFG_MAC80211_LEDS
- ++#ifdef CPTCFG_MAC80211_LEDS
- + ieee80211_create_tpt_led_trigger(ar->hw,
- + IEEE80211_TPT_LEDTRIG_FL_RADIO, ath10k_tpt_blink,
- + ARRAY_SIZE(ath10k_tpt_blink));
- diff --git a/package/kernel/mac80211/patches/936-ath10k_skip_otp_check.patch b/package/kernel/mac80211/patches/936-ath10k_skip_otp_check.patch
- new file mode 100644
- index 0000000..596ef98
- --- /dev/null
- +++ b/package/kernel/mac80211/patches/936-ath10k_skip_otp_check.patch
- @@ -0,0 +1,51 @@
- +--- a/drivers/net/wireless/ath/ath10k/core.c
- ++++ b/drivers/net/wireless/ath/ath10k/core.c
- +@@ -1243,9 +1243,6 @@ static int ath10k_core_fetch_firmware_fi
- + {
- + int ret;
- +
- +- /* calibration file is optional, don't check for any errors */
- +- ath10k_fetch_cal_file(ar);
- +-
- + ar->fw_api = 5;
- + ath10k_dbg(ar, ATH10K_DBG_BOOT, "trying fw api %d\n", ar->fw_api);
- +
- +@@ -1944,7 +1941,7 @@ EXPORT_SYMBOL(ath10k_core_stop);
- + static int ath10k_core_probe_fw(struct ath10k *ar)
- + {
- + struct bmi_target_info target_info;
- +- int ret = 0;
- ++ int calret, ret = 0;
- +
- + ret = ath10k_hif_power_up(ar);
- + if (ret) {
- +@@ -1968,6 +1965,9 @@ static int ath10k_core_probe_fw(struct a
- + goto err_power_down;
- + }
- +
- ++ /* calibration file is optional, don't check for any errors */
- ++ calret = ath10k_fetch_cal_file(ar);
- ++
- + ret = ath10k_core_fetch_firmware_files(ar);
- + if (ret) {
- + ath10k_err(ar, "could not fetch firmware files (%d)\n", ret);
- +@@ -1990,11 +1990,14 @@ static int ath10k_core_probe_fw(struct a
- + "could not load pre cal data: %d\n", ret);
- + }
- +
- +- ret = ath10k_core_get_board_id_from_otp(ar);
- +- if (ret && ret != -EOPNOTSUPP) {
- +- ath10k_err(ar, "failed to get board id from otp: %d\n",
- +- ret);
- +- goto err_free_firmware_files;
- ++ /* otp and board file not needed if calibration data is present */
- ++ if (calret) {
- ++ ret = ath10k_core_get_board_id_from_otp(ar);
- ++ if (ret && ret != -EOPNOTSUPP) {
- ++ ath10k_err(ar, "failed to get board id from otp: %d\n",
- ++ ret);
- ++ goto err_free_firmware_files;
- ++ }
- + }
- +
- + ret = ath10k_core_fetch_board_file(ar);
- diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile
- index e49dd48..90430b9 100644
- --- a/package/kernel/mt76/Makefile
- +++ b/package/kernel/mt76/Makefile
- @@ -1,7 +1,7 @@
- include $(TOPDIR)/rules.mk
-
- PKG_NAME:=mt76
- -PKG_VERSION:=2016-03-03
- +PKG_VERSION:=2016-07-08
- PKG_RELEASE=1
-
- PKG_LICENSE:=GPLv2
- @@ -10,23 +10,26 @@ PKG_LICENSE_FILES:=
- PKG_SOURCE_URL:=https://github.com/openwrt/mt76
- PKG_SOURCE_PROTO:=git
- PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
- -PKG_SOURCE_VERSION:=310d420178c86e253a172413da30ecf479b64251
- +PKG_SOURCE_VERSION:=9226e96c40e9ae19996a262365ce764f7b0b9c4a
- PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
-
- -PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
- +PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
- PKG_BUILD_PARALLEL:=1
-
- +STAMP_CONFIGURED_DEPENDS := $(STAGING_DIR)/usr/include/mac80211-backport/backport/autoconf.h
- +
- include $(INCLUDE_DIR)/kernel.mk
- include $(INCLUDE_DIR)/package.mk
-
- define KernelPackage/mt76
- SUBMENU:=Wireless Drivers
- - TITLE:=MediaTek MT76x2 wireless driver
- - DEPENDS:=+kmod-mac80211 +@DRIVER_11N_SUPPORT @PCI_SUPPORT
- + TITLE:=MediaTek MT76x2/MT7603 wireless driver
- + DEPENDS:=+kmod-mac80211 +@DRIVER_11N_SUPPORT @PCI_SUPPORT @!LINUX_3_18
- FILES:=\
- $(PKG_BUILD_DIR)/mt76.ko \
- - $(PKG_BUILD_DIR)/mt76x2e.ko
- - AUTOLOAD:=$(call AutoLoad,50,mac80211 mt76 mt76x2e)
- + $(PKG_BUILD_DIR)/mt76x2e.ko \
- + $(PKG_BUILD_DIR)/mt7603e.ko
- + AUTOLOAD:=$(call AutoLoad,50,mac80211 mt76 mt76x2e mt7603e)
- endef
-
- NOSTDINC_FLAGS = \
- @@ -54,6 +57,12 @@ endef
- define KernelPackage/mt76/install
- $(INSTALL_DIR) $(1)/lib/firmware
- cp \
- + $(if $(CONFIG_TARGET_ramips_mt7628) || $(CONFIG_TARGET_ramips_mt7688), \
- + $(PKG_BUILD_DIR)/firmware/mt7628_e1.bin \
- + $(PKG_BUILD_DIR)/firmware/mt7628_e2.bin \
- + ) \
- + $(PKG_BUILD_DIR)/firmware/mt7603_e1.bin \
- + $(PKG_BUILD_DIR)/firmware/mt7603_e2.bin \
- $(PKG_BUILD_DIR)/firmware/mt7662_rom_patch.bin \
- $(PKG_BUILD_DIR)/firmware/mt7662.bin \
- $(1)/lib/firmware
- diff --git a/package/kernel/mwlwifi/Makefile b/package/kernel/mwlwifi/Makefile
- index 091928d..880803e 100644
- --- a/package/kernel/mwlwifi/Makefile
- +++ b/package/kernel/mwlwifi/Makefile
- @@ -8,7 +8,7 @@
- include $(TOPDIR)/rules.mk
-
- PKG_NAME:=mwlwifi
- -PKG_VERSION:=10.3.0.16-20160105
- +PKG_VERSION:=10.3.0.17-20160617
- PKG_RELEASE=1
-
- PKG_LICENSE:=ISC
- @@ -17,7 +17,7 @@ PKG_LICENSE_FILES:=
- PKG_SOURCE_URL:=https://github.com/kaloz/mwlwifi
- PKG_SOURCE_PROTO:=git
- PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
- -PKG_SOURCE_VERSION:=99d3879cc72f2a25d44fb4bee96fd84eca028b04
- +PKG_SOURCE_VERSION:=b7aff3c2839b048407d716d1cb9326122ee401f8
- PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
-
- PKG_MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
- diff --git a/package/kernel/mwlwifi/patches/100-drop_old_api.patch b/package/kernel/mwlwifi/patches/100-drop_old_api.patch
- deleted file mode 100644
- index d2e149e..0000000
- --- a/package/kernel/mwlwifi/patches/100-drop_old_api.patch
- +++ /dev/null
- @@ -1,92 +0,0 @@
- ---- a/main.c
- -+++ b/main.c
- -@@ -418,11 +418,7 @@ static void mwl_set_ht_caps(struct mwl_p
- - band->ht_cap.cap |= IEEE80211_HT_CAP_SGI_20;
- - band->ht_cap.cap |= IEEE80211_HT_CAP_SGI_40;
- -
- --#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0)
- -- hw->flags |= IEEE80211_HW_AMPDU_AGGREGATION;
- --#else
- - ieee80211_hw_set(hw, AMPDU_AGGREGATION);
- --#endif
- - band->ht_cap.ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K;
- - band->ht_cap.ampdu_density = IEEE80211_HT_MPDU_DENSITY_4;
- -
- -@@ -524,29 +520,16 @@ static int mwl_wl_init(struct mwl_priv *
- - hw->queues = SYSADPT_TX_WMM_QUEUES;
- -
- - /* Set rssi values to dBm */
- --#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0)
- -- hw->flags |= IEEE80211_HW_SIGNAL_DBM | IEEE80211_HW_HAS_RATE_CONTROL;
- --#else
- - ieee80211_hw_set(hw, SIGNAL_DBM);
- - ieee80211_hw_set(hw, HAS_RATE_CONTROL);
- --#endif
- -
- - /* Ask mac80211 not to trigger PS mode
- - * based on PM bit of incoming frames.
- - */
- --#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0)
- -- hw->flags |= IEEE80211_HW_AP_LINK_PS;
- --#else
- - ieee80211_hw_set(hw, AP_LINK_PS);
- --#endif
- -
- --#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0)
- -- hw->flags |= IEEE80211_HW_SUPPORTS_PER_STA_GTK |
- -- IEEE80211_HW_MFP_CAPABLE;
- --#else
- - ieee80211_hw_set(hw, SUPPORTS_PER_STA_GTK);
- - ieee80211_hw_set(hw, MFP_CAPABLE);
- --#endif
- -
- - hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
- -
- ---- a/dev.h
- -+++ b/dev.h
- -@@ -484,10 +484,6 @@ static inline struct mwl_sta *mwl_dev_ge
- - return (struct mwl_sta *)&sta->drv_priv;
- - }
- -
- --#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0)
- --#define ether_addr_copy(dst, src) memcpy(dst, src, ETH_ALEN)
- --#endif
- --
- - /* Defined in mac80211.c. */
- - extern const struct ieee80211_ops mwl_mac80211_ops;
- -
- ---- a/mac80211.c
- -+++ b/mac80211.c
- -@@ -572,19 +572,11 @@ static int mwl_mac80211_get_survey(struc
- - return 0;
- - }
- -
- --#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
- --static int mwl_mac80211_ampdu_action(struct ieee80211_hw *hw,
- -- struct ieee80211_vif *vif,
- -- enum ieee80211_ampdu_mlme_action action,
- -- struct ieee80211_sta *sta,
- -- u16 tid, u16 *ssn, u8 buf_size)
- --#else
- - static int mwl_mac80211_ampdu_action(struct ieee80211_hw *hw,
- - struct ieee80211_vif *vif,
- - enum ieee80211_ampdu_mlme_action action,
- - struct ieee80211_sta *sta,
- - u16 tid, u16 *ssn, u8 buf_size, bool amsdu)
- --#endif
- - {
- - int rc = 0;
- - struct mwl_priv *priv = hw->priv;
- ---- a/rx.c
- -+++ b/rx.c
- -@@ -232,10 +232,8 @@ static inline void mwl_rx_prepare_status
- - status->flag |= RX_FLAG_VHT;
- - if (bw == RX_RATE_INFO_HT40)
- - status->flag |= RX_FLAG_40MHZ;
- --#if LINUX_VERSION_CODE > KERNEL_VERSION(3, 18, 0)
- - if (bw == RX_RATE_INFO_HT80)
- - status->vht_flag |= RX_VHT_FLAG_80MHZ;
- --#endif
- - if (gi == RX_RATE_INFO_SHORT_INTERVAL)
- - status->flag |= RX_FLAG_SHORT_GI;
- - status->vht_nss = (nss + 1);
- diff --git a/package/kernel/mwlwifi/patches/110-api_sync.patch b/package/kernel/mwlwifi/patches/110-api_sync.patch
- deleted file mode 100644
- index ed3e06a..0000000
- --- a/package/kernel/mwlwifi/patches/110-api_sync.patch
- +++ /dev/null
- @@ -1,19 +0,0 @@
- ---- a/mac80211.c
- -+++ b/mac80211.c
- -@@ -597,10 +597,13 @@ static int mwl_mac80211_get_survey(struc
- -
- - static int mwl_mac80211_ampdu_action(struct ieee80211_hw *hw,
- - struct ieee80211_vif *vif,
- -- enum ieee80211_ampdu_mlme_action action,
- -- struct ieee80211_sta *sta,
- -- u16 tid, u16 *ssn, u8 buf_size, bool amsdu)
- -+ struct ieee80211_ampdu_params *params)
- - {
- -+ enum ieee80211_ampdu_mlme_action action = params->action;
- -+ struct ieee80211_sta *sta = params->sta;
- -+ u16 tid = params->tid;
- -+ u16 *ssn = ¶ms->ssn;
- -+ u8 buf_size = params->buf_size;
- - int rc = 0;
- - struct mwl_priv *priv = hw->priv;
- - struct mwl_ampdu_stream *stream;
- diff --git a/package/network/services/hostapd/Config.in b/package/network/services/hostapd/Config.in
- index aee2a15..645888e 100644
- --- a/package/network/services/hostapd/Config.in
- +++ b/package/network/services/hostapd/Config.in
- @@ -10,11 +10,10 @@ config WPA_SUPPLICANT_NO_TIMESTAMP_CHECK
- choice
- prompt "Choose TLS provider"
- default WPA_SUPPLICANT_INTERNAL
- - depends on PACKAGE_wpa-supplicant || PACKAGE_wpa-supplicant-mesh || PACKAGE_wpad || PACKAGE_wpad-mesh
- + depends on PACKAGE_wpa-supplicant || PACKAGE_wpad
-
- config WPA_SUPPLICANT_INTERNAL
- bool "internal"
- - depends on PACKAGE_wpa-supplicant || PACKAGE_wpad
-
- config WPA_SUPPLICANT_OPENSSL
- bool "openssl"
- diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile
- index 8e706dc..88f7627 100644
- --- a/package/network/services/hostapd/Makefile
- +++ b/package/network/services/hostapd/Makefile
- @@ -7,18 +7,18 @@
- include $(TOPDIR)/rules.mk
-
- PKG_NAME:=hostapd
- -PKG_VERSION:=2015-03-25
- +PKG_VERSION:=2016-06-15
- PKG_RELEASE:=1
- -PKG_REV:=8278138e679174b1ec8af7f169c2810a8888e202
- +PKG_REV:=31d3692fe5d56c05753ed4a70c7943979e1d29e7
-
- PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
- -PKG_SOURCE_URL:=git://w1.fi/srv/git/hostap.git
- +PKG_SOURCE_URL:=http://w1.fi/hostap.git
- PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
- PKG_SOURCE_VERSION:=$(PKG_REV)
- PKG_SOURCE_PROTO:=git
- # PKG_MIRROR_MD5SUM:=4e7c1f97edd7514535056fce54ae053a
-
- -PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
- +PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
- PKG_LICENSE:=BSD-3-Clause
-
- PKG_BUILD_PARALLEL:=1
- @@ -40,6 +40,10 @@ LOCAL_TYPE=$(strip \
- hostapd \
- )))
- LOCAL_VARIANT=$(patsubst wpad-%,%,$(patsubst supplicant-%,%,$(BUILD_VARIANT)))
- +CONFIG_VARIANT:=$(LOCAL_VARIANT)
- +ifeq ($(LOCAL_VARIANT),mesh)
- + CONFIG_VARIANT:=full
- +endif
-
- ifeq ($(LOCAL_TYPE),supplicant)
- ifeq ($(LOCAL_VARIANT),full)
- @@ -47,10 +51,6 @@ ifeq ($(LOCAL_TYPE),supplicant)
- CONFIG_WPA_SUPPLICANT_INTERNAL \
- CONFIG_WPA_SUPPLICANT_OPENSSL
- endif
- - ifeq ($(LOCAL_VARIANT),mesh)
- - PKG_CONFIG_DEPENDS += \
- - CONFIG_WPA_SUPPLICANT_OPENSSL
- - endif
- endif
-
- PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
- @@ -82,7 +82,7 @@ ifneq ($(LOCAL_TYPE),hostapd)
- endif
- endif
- ifeq ($(LOCAL_VARIANT),mesh)
- - DRIVER_MAKEOPTS += CONFIG_TLS=openssl
- + DRIVER_MAKEOPTS += CONFIG_TLS=openssl CONFIG_AP=y CONFIG_SAE=y CONFIG_MESH=y
- TARGET_LDFLAGS += -lcrypto -lssl
- endif
- ifdef CONFIG_WPA_SUPPLICANT_NO_TIMESTAMP_CHECK
- @@ -177,8 +177,7 @@ endef
- define Package/wpad-mesh
- $(call Package/wpad/Default)
- TITLE+= (with 802.11s mesh and SAE support)
- - DEPENDS:=$(DRV_DEPENDS) +libubus +libopenssl +@CONFIG_WPA_SUPPLICANT_OPENSSL @(!TARGET_uml||BROKEN)
- - CONFLICTS:=@WPA_SUPPLICANT_INTERNAL
- + DEPENDS:=$(DRV_DEPENDS) +libubus +PACKAGE_wpad-mesh:libopenssl @(!TARGET_uml||BROKEN)
- VARIANT:=wpad-mesh
- endef
-
- @@ -284,10 +283,10 @@ endif
-
- define Build/Configure
- $(Build/Configure/rebuild)
- - $(if $(wildcard ./files/hostapd-$(LOCAL_VARIANT).config), \
- - $(CP) ./files/hostapd-$(LOCAL_VARIANT).config $(PKG_BUILD_DIR)/hostapd/.config \
- + $(if $(wildcard ./files/hostapd-$(CONFIG_VARIANT).config), \
- + $(CP) ./files/hostapd-$(CONFIG_VARIANT).config $(PKG_BUILD_DIR)/hostapd/.config \
- )
- - $(CP) ./files/wpa_supplicant-$(LOCAL_VARIANT).config $(PKG_BUILD_DIR)/wpa_supplicant/.config
- + $(CP) ./files/wpa_supplicant-$(CONFIG_VARIANT).config $(PKG_BUILD_DIR)/wpa_supplicant/.config
- endef
-
- TARGET_CPPFLAGS := \
- diff --git a/package/network/services/hostapd/files/hostapd-full.config b/package/network/services/hostapd/files/hostapd-full.config
- index f1b2655..681e9df 100644
- --- a/package/network/services/hostapd/files/hostapd-full.config
- +++ b/package/network/services/hostapd/files/hostapd-full.config
- @@ -53,6 +53,9 @@ CONFIG_PEERKEY=y
- # Integrated EAP server
- CONFIG_EAP=y
-
- +# EAP-FAST for the integrated EAP server
- +CONFIG_EAP_FAST=y
- +
- # EAP-MD5 for the integrated EAP server
- CONFIG_EAP_MD5=y
-
- diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
- index 7aec7ad..9c1ba0f 100644
- --- a/package/network/services/hostapd/files/hostapd.sh
- +++ b/package/network/services/hostapd/files/hostapd.sh
- @@ -1,3 +1,5 @@
- +. /lib/functions/network.sh
- +
- hostapd_set_bss_options() {
- local var="$1"
- local vif="$2"
- @@ -193,8 +195,8 @@ hostapd_set_bss_options() {
-
- [ -n "$wps_possible" -a -n "$config_methods" ] && {
- config_get device_type "$vif" wps_device_type "6-0050F204-1"
- - config_get device_name "$vif" wps_device_name "OpenWrt AP"
- - config_get manufacturer "$vif" wps_manufacturer "openwrt.org"
- + config_get device_name "$vif" wps_device_name "Lede AP"
- + config_get manufacturer "$vif" wps_manufacturer "www.lede-project.org"
- config_get wps_pin "$vif" wps_pin
-
- config_get_bool ext_registrar "$vif" ext_registrar 0
- @@ -213,7 +215,11 @@ hostapd_set_bss_options() {
- append "$var" "ssid=$ssid" "$N"
- [ -n "$bridge" ] && append "$var" "bridge=$bridge" "$N"
- [ -n "$ieee80211d" ] && append "$var" "ieee80211d=$ieee80211d" "$N"
- - [ -n "$iapp_interface" ] && append "$var" iapp_interface=$(uci_get_state network "$iapp_interface" ifname "$iapp_interface") "$N"
- + [ -n "$iapp_interface" ] && {
- + local ifname
- + network_get_device ifname "$iapp_interface" || ifname = "$iapp_interface"
- + append bss_conf "iapp_interface=$ifname" "$N"
- + }
-
- if [ "$wpa" -ge "1" ]
- then
- @@ -391,4 +397,3 @@ $hostapd_cfg
- EOF
- hostapd -P /var/run/wifi-$ifname.pid -B /var/run/hostapd-$ifname.conf
- }
- -
- diff --git a/package/network/services/hostapd/files/netifd.sh b/package/network/services/hostapd/files/netifd.sh
- index 23d2e7e..af72e7a 100644
- --- a/package/network/services/hostapd/files/netifd.sh
- +++ b/package/network/services/hostapd/files/netifd.sh
- @@ -1,3 +1,5 @@
- +. /lib/functions/network.sh
- +
- wpa_supplicant_add_rate() {
- local var="$1"
- local val="$(($2 / 1000))"
- @@ -120,6 +122,7 @@ hostapd_common_add_bss_config() {
-
- config_add_boolean rsn_preauth auth_cache
- config_add_int ieee80211w
- + config_add_int eapol_version
-
- config_add_string 'auth_server:host' 'server:host'
- config_add_string auth_secret
- @@ -136,10 +139,11 @@ hostapd_common_add_bss_config() {
- config_add_string nasid
- config_add_string ownip
- config_add_string iapp_interface
- - config_add_string eap_type ca_cert client_cert identity auth priv_key priv_key_pwd
- + config_add_string eap_type ca_cert client_cert identity anonymous_identity auth priv_key priv_key_pwd
-
- config_add_int dynamic_vlan vlan_naming
- config_add_string vlan_tagged_interface vlan_bridge
- + config_add_string vlan_file
-
- config_add_string 'key1:wepkey' 'key2:wepkey' 'key3:wepkey' 'key4:wepkey' 'password:wpakey'
-
- @@ -182,7 +186,7 @@ hostapd_set_bss_options() {
- wps_pushbutton wps_label ext_registrar wps_pbc_in_m1 \
- wps_device_type wps_device_name wps_manufacturer wps_pin \
- macfilter ssid wmm uapsd hidden short_preamble rsn_preauth \
- - iapp_interface
- + iapp_interface eapol_version
-
- set_default isolate 0
- set_default maxassoc 0
- @@ -192,6 +196,7 @@ hostapd_set_bss_options() {
- set_default hidden 0
- set_default wmm 1
- set_default uapsd 1
- + set_default eapol_version 0
-
- append bss_conf "ctrl_interface=/var/run/hostapd"
- if [ "$isolate" -gt 0 ]; then
- @@ -237,6 +242,8 @@ hostapd_set_bss_options() {
- [ -e "$wpa_psk_file" ] || touch "$wpa_psk_file"
- append bss_conf "wpa_psk_file=$wpa_psk_file" "$N"
- }
- + [ "$eapol_version" -ge "1" -a "$eapol_version" -le "2" ] && append bss_conf "eapol_version=$eapol_version" "$N"
- +
- wps_possible=1
- append wpa_key_mgmt "WPA-PSK"
- ;;
- @@ -248,7 +255,7 @@ hostapd_set_bss_options() {
- ownip \
- eap_reauth_period dynamic_vlan \
- vlan_naming vlan_tagged_interface \
- - vlan_bridge
- + vlan_bridge vlan_file
-
- # legacy compatibility
- [ -n "$auth_server" ] || json_get_var auth_server server
- @@ -291,7 +298,13 @@ hostapd_set_bss_options() {
- append bss_conf "vlan_bridge=$vlan_bridge" "$N"
- [ -n "$vlan_tagged_interface" ] && \
- append bss_conf "vlan_tagged_interface=$vlan_tagged_interface" "$N"
- + [ -n "$vlan_file" ] && {
- + [ -e "$vlan_file" ] || touch "$vlan_file"
- + append bss_conf "vlan_file=$vlan_file" "$N"
- + }
- }
- +
- + [ "$eapol_version" -ge "1" -a "$eapol_version" -le "2" ] && append bss_conf "eapol_version=$eapol_version" "$N"
- ;;
- wep)
- local wep_keyidx=0
- @@ -318,8 +331,8 @@ hostapd_set_bss_options() {
- [ -n "$wps_possible" -a -n "$config_methods" ] && {
- set_default ext_registrar 0
- set_default wps_device_type "6-0050F204-1"
- - set_default wps_device_name "OpenWrt AP"
- - set_default wps_manufacturer "openwrt.org"
- + set_default wps_device_name "Lede AP"
- + set_default wps_manufacturer "www.lede-project.org"
-
- wps_state=2
- [ -n "$wps_configured" ] && wps_state=1
- @@ -340,8 +353,9 @@ hostapd_set_bss_options() {
- append bss_conf "ssid=$ssid" "$N"
- [ -n "$network_bridge" ] && append bss_conf "bridge=$network_bridge" "$N"
- [ -n "$iapp_interface" ] && {
- - iapp_interface="$(uci_get_state network "$iapp_interface" ifname "$iapp_interface")"
- - [ -n "$iapp_interface" ] && append bss_conf "iapp_interface=$iapp_interface" "$N"
- + local ifname
- + network_get_device ifname "$iapp_interface" || ifname = "$iapp_interface"
- + append bss_conf "iapp_interface=$ifname" "$N"
- }
-
- if [ "$wpa" -ge "1" ]; then
- @@ -522,9 +536,15 @@ wpa_supplicant_prepare_interface() {
- _w_modestr="mode=1"
- }
-
- + local country_str=
- + [ -n "$country" ] && {
- + country_str="country=$country"
- + }
- +
- wpa_supplicant_teardown_interface "$ifname"
- cat > "$_config" <<EOF
- $ap_scan
- +$country_str
- EOF
- return 0
- }
- @@ -538,7 +558,9 @@ wpa_supplicant_add_network() {
- json_get_vars \
- ssid bssid key \
- basic_rate mcast_rate \
- - ieee80211w
- + ieee80211w ieee80211r
- +
- + set_default ieee80211r 0
-
- local key_mgmt='NONE'
- local enc_str=
- @@ -549,6 +571,8 @@ wpa_supplicant_add_network() {
- local scan_ssid="scan_ssid=1"
- local freq
-
- + [ "$ieee80211r" -gt 0 ] && wpa_key_mgmt="FT-PSK $wpa_key_mgmt"
- +
- [[ "$_w_mode" = "adhoc" ]] && {
- append network_data "mode=1" "$N$T"
- [ -n "$channel" ] && {
- @@ -563,6 +587,9 @@ wpa_supplicant_add_network() {
- }
-
- [[ "$_w_mode" = "mesh" ]] && {
- + json_get_vars mesh_id
- + ssid="${mesh_id}"
- +
- append network_data "mode=5" "$N$T"
- [ -n "$channel" ] && {
- freq="$(get_freq "$phy" "$channel")"
- @@ -594,10 +621,12 @@ wpa_supplicant_add_network() {
- ;;
- eap)
- key_mgmt='WPA-EAP'
- + [ "$ieee80211r" -gt 0 ] && key_mgmt="FT-EAP $key_mgmt"
-
- - json_get_vars eap_type identity ca_cert
- + json_get_vars eap_type identity anonymous_identity ca_cert
- [ -n "$ca_cert" ] && append network_data "ca_cert=\"$ca_cert\"" "$N$T"
- [ -n "$identity" ] && append network_data "identity=\"$identity\"" "$N$T"
- + [ -n "$anonymous_identity" ] && append network_data "anonymous_identity=\"$anonymous_identity\"" "$N$T"
- case "$eap_type" in
- tls)
- json_get_vars client_cert priv_key priv_key_pwd
- @@ -605,11 +634,32 @@ wpa_supplicant_add_network() {
- append network_data "private_key=\"$priv_key\"" "$N$T"
- append network_data "private_key_passwd=\"$priv_key_pwd\"" "$N$T"
- ;;
- - peap|ttls)
- - json_get_vars auth password
- + fast|peap|ttls)
- + json_get_vars auth password ca_cert2 client_cert2 priv_key2 priv_key2_pwd
- set_default auth MSCHAPV2
- - append network_data "phase2=\"$auth\"" "$N$T"
- - append network_data "password=\"$password\"" "$N$T"
- +
- + if [ "$auth" = "EAP-TLS" ]; then
- + [ -n "$ca_cert2" ] &&
- + append network_data "ca_cert2=\"$ca_cert2\"" "$N$T"
- + append network_data "client_cert2=\"$client_cert2\"" "$N$T"
- + append network_data "private_key2=\"$priv_key2\"" "$N$T"
- + append network_data "private_key2_passwd=\"$priv_key2_pwd\"" "$N$T"
- + else
- + append network_data "password=\"$password\"" "$N$T"
- + fi
- +
- + phase2proto="auth="
- + case "$auth" in
- + "auth"*)
- + phase2proto=""
- + ;;
- + "EAP-"*)
- + auth="$(echo $auth | cut -b 5- )"
- + [ "$eap_type" = "ttls" ] &&
- + phase2proto="autheap="
- + ;;
- + esac
- + append network_data "phase2=\"$phase2proto$auth\"" "$N$T"
- ;;
- esac
- append network_data "eap=$(echo $eap_type | tr 'a-z' 'A-Z')" "$N$T"
- diff --git a/package/network/services/hostapd/files/wpa_supplicant-full.config b/package/network/services/hostapd/files/wpa_supplicant-full.config
- index a9d04ab..53c0762 100644
- --- a/package/network/services/hostapd/files/wpa_supplicant-full.config
- +++ b/package/network/services/hostapd/files/wpa_supplicant-full.config
- @@ -121,6 +121,9 @@ CONFIG_DRIVER_WIRED=y
- # included)
- CONFIG_IEEE8021X_EAPOL=y
-
- +# EAP-FAST
- +CONFIG_EAP_FAST=y
- +
- # EAP-MD5
- CONFIG_EAP_MD5=y
-
- @@ -367,7 +370,7 @@ CONFIG_INTERNAL_LIBTOMMATH_FAST=y
- #CONFIG_DYNAMIC_EAP_METHODS=y
-
- # IEEE Std 802.11r-2008 (Fast BSS Transition)
- -#CONFIG_IEEE80211R=y
- +CONFIG_IEEE80211R=y
-
- # Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt)
- #CONFIG_DEBUG_FILE=y
- diff --git a/package/network/services/hostapd/files/wpa_supplicant-mesh.config b/package/network/services/hostapd/files/wpa_supplicant-mesh.config
- deleted file mode 100644
- index 36e2908..0000000
- --- a/package/network/services/hostapd/files/wpa_supplicant-mesh.config
- +++ /dev/null
- @@ -1,407 +0,0 @@
- -# Example wpa_supplicant build time configuration
- -#
- -# This file lists the configuration options that are used when building the
- -# hostapd binary. All lines starting with # are ignored. Configuration option
- -# lines must be commented out complete, if they are not to be included, i.e.,
- -# just setting VARIABLE=n is not disabling that variable.
- -#
- -# This file is included in Makefile, so variables like CFLAGS and LIBS can also
- -# be modified from here. In most cases, these lines should use += in order not
- -# to override previous values of the variables.
- -
- -
- -# Uncomment following two lines and fix the paths if you have installed OpenSSL
- -# or GnuTLS in non-default location
- -#CFLAGS += -I/usr/local/openssl/include
- -#LIBS += -L/usr/local/openssl/lib
- -
- -# Some Red Hat versions seem to include kerberos header files from OpenSSL, but
- -# the kerberos files are not in the default include path. Following line can be
- -# used to fix build issues on such systems (krb5.h not found).
- -#CFLAGS += -I/usr/include/kerberos
- -
- -# Example configuration for various cross-compilation platforms
- -
- -#### sveasoft (e.g., for Linksys WRT54G) ######################################
- -#CC=mipsel-uclibc-gcc
- -#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
- -#CFLAGS += -Os
- -#CPPFLAGS += -I../src/include -I../../src/router/openssl/include
- -#LIBS += -L/opt/brcm/hndtools-mipsel-uclibc-0.9.19/lib -lssl
- -###############################################################################
- -
- -#### openwrt (e.g., for Linksys WRT54G) #######################################
- -#CC=mipsel-uclibc-gcc
- -#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
- -#CFLAGS += -Os
- -#CPPFLAGS=-I../src/include -I../openssl-0.9.7d/include \
- -# -I../WRT54GS/release/src/include
- -#LIBS = -lssl
- -###############################################################################
- -
- -
- -# Driver interface for Host AP driver
- -CONFIG_DRIVER_HOSTAP=y
- -
- -# Driver interface for Agere driver
- -#CONFIG_DRIVER_HERMES=y
- -# Change include directories to match with the local setup
- -#CFLAGS += -I../../hcf -I../../include -I../../include/hcf
- -#CFLAGS += -I../../include/wireless
- -
- -# Driver interface for ndiswrapper
- -# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
- -#CONFIG_DRIVER_NDISWRAPPER=y
- -
- -# Driver interface for Atmel driver
- -# CONFIG_DRIVER_ATMEL=y
- -
- -# Driver interface for old Broadcom driver
- -# Please note that the newer Broadcom driver ("hybrid Linux driver") supports
- -# Linux wireless extensions and does not need (or even work) with the old
- -# driver wrapper. Use CONFIG_DRIVER_WEXT=y with that driver.
- -#CONFIG_DRIVER_BROADCOM=y
- -# Example path for wlioctl.h; change to match your configuration
- -#CFLAGS += -I/opt/WRT54GS/release/src/include
- -
- -# Driver interface for Intel ipw2100/2200 driver
- -# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
- -#CONFIG_DRIVER_IPW=y
- -
- -# Driver interface for Ralink driver
- -#CONFIG_DRIVER_RALINK=y
- -
- -# Driver interface for generic Linux wireless extensions
- -CONFIG_DRIVER_WEXT=y
- -
- -# Driver interface for Linux drivers using the nl80211 kernel interface
- -CONFIG_DRIVER_NL80211=y
- -
- -# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
- -#CONFIG_DRIVER_BSD=y
- -#CFLAGS += -I/usr/local/include
- -#LIBS += -L/usr/local/lib
- -#LIBS_p += -L/usr/local/lib
- -#LIBS_c += -L/usr/local/lib
- -
- -# Driver interface for Windows NDIS
- -#CONFIG_DRIVER_NDIS=y
- -#CFLAGS += -I/usr/include/w32api/ddk
- -#LIBS += -L/usr/local/lib
- -# For native build using mingw
- -#CONFIG_NATIVE_WINDOWS=y
- -# Additional directories for cross-compilation on Linux host for mingw target
- -#CFLAGS += -I/opt/mingw/mingw32/include/ddk
- -#LIBS += -L/opt/mingw/mingw32/lib
- -#CC=mingw32-gcc
- -# By default, driver_ndis uses WinPcap for low-level operations. This can be
- -# replaced with the following option which replaces WinPcap calls with NDISUIO.
- -# However, this requires that WZC is disabled (net stop wzcsvc) before starting
- -# wpa_supplicant.
- -# CONFIG_USE_NDISUIO=y
- -
- -# Driver interface for development testing
- -#CONFIG_DRIVER_TEST=y
- -
- -# Include client MLME (management frame processing) for test driver
- -# This can be used to test MLME operations in hostapd with the test interface.
- -# space.
- -#CONFIG_CLIENT_MLME=y
- -
- -# Driver interface for wired Ethernet drivers
- -CONFIG_DRIVER_WIRED=y
- -
- -# Driver interface for the Broadcom RoboSwitch family
- -#CONFIG_DRIVER_ROBOSWITCH=y
- -
- -# Driver interface for no driver (e.g., WPS ER only)
- -#CONFIG_DRIVER_NONE=y
- -
- -# Enable IEEE 802.1X Supplicant (automatically included if any EAP method is
- -# included)
- -CONFIG_IEEE8021X_EAPOL=y
- -
- -# EAP-MD5
- -CONFIG_EAP_MD5=y
- -
- -# EAP-MSCHAPv2
- -CONFIG_EAP_MSCHAPV2=y
- -
- -# EAP-TLS
- -CONFIG_EAP_TLS=y
- -
- -# EAL-PEAP
- -CONFIG_EAP_PEAP=y
- -
- -# EAP-TTLS
- -CONFIG_EAP_TTLS=y
- -
- -# EAP-FAST
- -# Note: Default OpenSSL package does not include support for all the
- -# functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL,
- -# the OpenSSL library must be patched (openssl-0.9.8d-tls-extensions.patch)
- -# to add the needed functions.
- -#CONFIG_EAP_FAST=y
- -
- -# EAP-GTC
- -CONFIG_EAP_GTC=y
- -
- -# EAP-OTP
- -CONFIG_EAP_OTP=y
- -
- -# EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used)
- -#CONFIG_EAP_SIM=y
- -
- -# EAP-PSK (experimental; this is _not_ needed for WPA-PSK)
- -#CONFIG_EAP_PSK=y
- -
- -# EAP-PAX
- -#CONFIG_EAP_PAX=y
- -
- -# LEAP
- -CONFIG_EAP_LEAP=y
- -
- -# EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used)
- -#CONFIG_EAP_AKA=y
- -
- -# EAP-AKA' (enable CONFIG_PCSC, if EAP-AKA' is used).
- -# This requires CONFIG_EAP_AKA to be enabled, too.
- -#CONFIG_EAP_AKA_PRIME=y
- -
- -# Enable USIM simulator (Milenage) for EAP-AKA
- -#CONFIG_USIM_SIMULATOR=y
- -
- -# EAP-SAKE
- -#CONFIG_EAP_SAKE=y
- -
- -# EAP-GPSK
- -#CONFIG_EAP_GPSK=y
- -# Include support for optional SHA256 cipher suite in EAP-GPSK
- -#CONFIG_EAP_GPSK_SHA256=y
- -
- -# EAP-TNC and related Trusted Network Connect support (experimental)
- -#CONFIG_EAP_TNC=y
- -
- -# Wi-Fi Protected Setup (WPS)
- -CONFIG_WPS=y
- -
- -# EAP-IKEv2
- -#CONFIG_EAP_IKEV2=y
- -
- -# PKCS#12 (PFX) support (used to read private key and certificate file from
- -# a file that usually has extension .p12 or .pfx)
- -CONFIG_PKCS12=y
- -
- -# Smartcard support (i.e., private key on a smartcard), e.g., with openssl
- -# engine.
- -CONFIG_SMARTCARD=y
- -
- -# PC/SC interface for smartcards (USIM, GSM SIM)
- -# Enable this if EAP-SIM or EAP-AKA is included
- -#CONFIG_PCSC=y
- -
- -# Development testing
- -#CONFIG_EAPOL_TEST=y
- -
- -# Select control interface backend for external programs, e.g, wpa_cli:
- -# unix = UNIX domain sockets (default for Linux/*BSD)
- -# udp = UDP sockets using localhost (127.0.0.1)
- -# named_pipe = Windows Named Pipe (default for Windows)
- -# y = use default (backwards compatibility)
- -# If this option is commented out, control interface is not included in the
- -# build.
- -CONFIG_CTRL_IFACE=y
- -
- -# Include support for GNU Readline and History Libraries in wpa_cli.
- -# When building a wpa_cli binary for distribution, please note that these
- -# libraries are licensed under GPL and as such, BSD license may not apply for
- -# the resulting binary.
- -#CONFIG_READLINE=y
- -
- -# Remove debugging code that is printing out debug message to stdout.
- -# This can be used to reduce the size of the wpa_supplicant considerably
- -# if debugging code is not needed. The size reduction can be around 35%
- -# (e.g., 90 kB).
- -#CONFIG_NO_STDOUT_DEBUG=y
- -
- -# Remove WPA support, e.g., for wired-only IEEE 802.1X supplicant, to save
- -# 35-50 kB in code size.
- -#CONFIG_NO_WPA=y
- -
- -# Remove WPA2 support. This allows WPA to be used, but removes WPA2 code to
- -# save about 1 kB in code size when building only WPA-Personal (no EAP support)
- -# or 6 kB if building for WPA-Enterprise.
- -#CONFIG_NO_WPA2=y
- -
- -# Remove IEEE 802.11i/WPA-Personal ASCII passphrase support
- -# This option can be used to reduce code size by removing support for
- -# converting ASCII passphrases into PSK. If this functionality is removed, the
- -# PSK can only be configured as the 64-octet hexstring (e.g., from
- -# wpa_passphrase). This saves about 0.5 kB in code size.
- -#CONFIG_NO_WPA_PASSPHRASE=y
- -
- -# Disable scan result processing (ap_mode=1) to save code size by about 1 kB.
- -# This can be used if ap_scan=1 mode is never enabled.
- -#CONFIG_NO_SCAN_PROCESSING=y
- -
- -# Select configuration backend:
- -# file = text file (e.g., wpa_supplicant.conf; note: the configuration file
- -# path is given on command line, not here; this option is just used to
- -# select the backend that allows configuration files to be used)
- -# winreg = Windows registry (see win_example.reg for an example)
- -CONFIG_BACKEND=file
- -
- -# Remove configuration write functionality (i.e., to allow the configuration
- -# file to be updated based on runtime configuration changes). The runtime
- -# configuration can still be changed, the changes are just not going to be
- -# persistent over restarts. This option can be used to reduce code size by
- -# about 3.5 kB.
- -#CONFIG_NO_CONFIG_WRITE=y
- -
- -# Remove support for configuration blobs to reduce code size by about 1.5 kB.
- -#CONFIG_NO_CONFIG_BLOBS=y
- -
- -# Select program entry point implementation:
- -# main = UNIX/POSIX like main() function (default)
- -# main_winsvc = Windows service (read parameters from registry)
- -# main_none = Very basic example (development use only)
- -#CONFIG_MAIN=main
- -
- -# Select wrapper for operatins system and C library specific functions
- -# unix = UNIX/POSIX like systems (default)
- -# win32 = Windows systems
- -# none = Empty template
- -#CONFIG_OS=unix
- -
- -# Select event loop implementation
- -# eloop = select() loop (default)
- -# eloop_win = Windows events and WaitForMultipleObject() loop
- -# eloop_none = Empty template
- -#CONFIG_ELOOP=eloop
- -
- -# Select layer 2 packet implementation
- -# linux = Linux packet socket (default)
- -# pcap = libpcap/libdnet/WinPcap
- -# freebsd = FreeBSD libpcap
- -# winpcap = WinPcap with receive thread
- -# ndis = Windows NDISUIO (note: requires CONFIG_USE_NDISUIO=y)
- -# none = Empty template
- -#CONFIG_L2_PACKET=linux
- -
- -# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS)
- -CONFIG_PEERKEY=y
- -
- -# IEEE 802.11w (management frame protection)
- -# This version is an experimental implementation based on IEEE 802.11w/D1.0
- -# draft and is subject to change since the standard has not yet been finalized.
- -# Driver support is also needed for IEEE 802.11w.
- -CONFIG_IEEE80211W=y
- -
- -# Select TLS implementation
- -# openssl = OpenSSL (default)
- -# gnutls = GnuTLS (needed for TLS/IA, see also CONFIG_GNUTLS_EXTRA)
- -# internal = Internal TLSv1 implementation (experimental)
- -# none = Empty template
- -CONFIG_TLS=internal
- -
- -# Whether to enable TLS/IA support, which is required for EAP-TTLSv1.
- -# You need CONFIG_TLS=gnutls for this to have any effect. Please note that
- -# even though the core GnuTLS library is released under LGPL, this extra
- -# library uses GPL and as such, the terms of GPL apply to the combination
- -# of wpa_supplicant and GnuTLS if this option is enabled. BSD license may not
- -# apply for distribution of the resulting binary.
- -#CONFIG_GNUTLS_EXTRA=y
- -
- -# If CONFIG_TLS=internal is used, additional library and include paths are
- -# needed for LibTomMath. Alternatively, an integrated, minimal version of
- -# LibTomMath can be used. See beginning of libtommath.c for details on benefits
- -# and drawbacks of this option.
- -CONFIG_INTERNAL_LIBTOMMATH=y
- -#ifndef CONFIG_INTERNAL_LIBTOMMATH
- -#LTM_PATH=/usr/src/libtommath-0.39
- -#CFLAGS += -I$(LTM_PATH)
- -#LIBS += -L$(LTM_PATH)
- -#LIBS_p += -L$(LTM_PATH)
- -#endif
- -# At the cost of about 4 kB of additional binary size, the internal LibTomMath
- -# can be configured to include faster routines for exptmod, sqr, and div to
- -# speed up DH and RSA calculation considerably
- -CONFIG_INTERNAL_LIBTOMMATH_FAST=y
- -
- -# Include NDIS event processing through WMI into wpa_supplicant/wpasvc.
- -# This is only for Windows builds and requires WMI-related header files and
- -# WbemUuid.Lib from Platform SDK even when building with MinGW.
- -#CONFIG_NDIS_EVENTS_INTEGRATED=y
- -#PLATFORMSDKLIB="/opt/Program Files/Microsoft Platform SDK/Lib"
- -
- -# Add support for old DBus control interface
- -# (fi.epitest.hostap.WPASupplicant)
- -#CONFIG_CTRL_IFACE_DBUS=y
- -
- -# Add support for new DBus control interface
- -# (fi.w1.hostap.wpa_supplicant1)
- -#CONFIG_CTRL_IFACE_DBUS_NEW=y
- -
- -# Add introspection support for new DBus control interface
- -#CONFIG_CTRL_IFACE_DBUS_INTRO=y
- -
- -# Add support for loading EAP methods dynamically as shared libraries.
- -# When this option is enabled, each EAP method can be either included
- -# statically (CONFIG_EAP_<method>=y) or dynamically (CONFIG_EAP_<method>=dyn).
- -# Dynamic EAP methods are build as shared objects (eap_*.so) and they need to
- -# be loaded in the beginning of the wpa_supplicant configuration file
- -# (see load_dynamic_eap parameter in the example file) before being used in
- -# the network blocks.
- -#
- -# Note that some shared parts of EAP methods are included in the main program
- -# and in order to be able to use dynamic EAP methods using these parts, the
- -# main program must have been build with the EAP method enabled (=y or =dyn).
- -# This means that EAP-TLS/PEAP/TTLS/FAST cannot be added as dynamic libraries
- -# unless at least one of them was included in the main build to force inclusion
- -# of the shared code. Similarly, at least one of EAP-SIM/AKA must be included
- -# in the main build to be able to load these methods dynamically.
- -#
- -# Please also note that using dynamic libraries will increase the total binary
- -# size. Thus, it may not be the best option for targets that have limited
- -# amount of memory/flash.
- -#CONFIG_DYNAMIC_EAP_METHODS=y
- -
- -# IEEE Std 802.11r-2008 (Fast BSS Transition)
- -#CONFIG_IEEE80211R=y
- -
- -# Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt)
- -#CONFIG_DEBUG_FILE=y
- -
- -# Enable privilege separation (see README 'Privilege separation' for details)
- -#CONFIG_PRIVSEP=y
- -
- -# Enable mitigation against certain attacks against TKIP by delaying Michael
- -# MIC error reports by a random amount of time between 0 and 60 seconds
- -#CONFIG_DELAYED_MIC_ERROR_REPORT=y
- -
- -# Enable tracing code for developer debugging
- -# This tracks use of memory allocations and other registrations and reports
- -# incorrect use with a backtrace of call (or allocation) location.
- -#CONFIG_WPA_TRACE=y
- -# For BSD, comment out these.
- -#LIBS += -lexecinfo
- -#LIBS_p += -lexecinfo
- -#LIBS_c += -lexecinfo
- -
- -# Use libbfd to get more details for developer debugging
- -# This enables use of libbfd to get more detailed symbols for the backtraces
- -# generated by CONFIG_WPA_TRACE=y.
- -#CONFIG_WPA_TRACE_BFD=y
- -# For BSD, comment out these.
- -#LIBS += -lbfd -liberty -lz
- -#LIBS_p += -lbfd -liberty -lz
- -#LIBS_c += -lbfd -liberty -lz
- -
- -CONFIG_NO_RANDOM_POOL=y
- -NEED_80211_COMMON=y
- -
- -CONFIG_IBSS_RSN=y
- -
- -CONFIG_MESH=y
- -CONFIG_SAE=y
- -CONFIG_AP=y
- diff --git a/package/network/services/hostapd/patches/001-4addr-fix-reconnecting-client-on-connection-lost.patch b/package/network/services/hostapd/patches/001-4addr-fix-reconnecting-client-on-connection-lost.patch
- new file mode 100644
- index 0000000..5c8b662
- --- /dev/null
- +++ b/package/network/services/hostapd/patches/001-4addr-fix-reconnecting-client-on-connection-lost.patch
- @@ -0,0 +1,25 @@
- +From: Matthias May <matthias.may@neratec.com>
- +Date: Tue, 5 Jul 2016 15:00:43 +0200
- +Subject: [PATCH] 4addr: fix reconnecting client on connection lost
- +
- +When a 4addr client suddenly looses its connection (no deauth/deassoc)
- +the AP still thinks it is connected.
- +If the client reconnects before the AP timeoutes the client, traffic
- +cannot flow.
- +
- +Fix this by making sure the WLAN_STA_WDS flag is unset in the sta->flags
- +when the client completes association.
- +
- +Signed-off-by: Matthias May <matthias.may@neratec.com>
- +---
- +
- +--- a/src/ap/ieee802_11.c
- ++++ b/src/ap/ieee802_11.c
- +@@ -2826,6 +2826,7 @@ static void handle_assoc_cb(struct hosta
- + new_assoc = 0;
- + sta->flags |= WLAN_STA_ASSOC;
- + sta->flags &= ~WLAN_STA_WNM_SLEEP_MODE;
- ++ sta->flags &= ~WLAN_STA_WDS;
- + if ((!hapd->conf->ieee802_1x && !hapd->conf->wpa && !hapd->conf->osen) ||
- + sta->auth_alg == WLAN_AUTH_FT) {
- + /*
- diff --git a/package/network/services/hostapd/patches/001-P2P-Validate-SSID-element-length-before-copying-it-C.patch b/package/network/services/hostapd/patches/001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
- deleted file mode 100644
- index e408fbe..0000000
- --- a/package/network/services/hostapd/patches/001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
- +++ /dev/null
- @@ -1,37 +0,0 @@
- -From 9ed4eee345f85e3025c33c6e20aa25696e341ccd Mon Sep 17 00:00:00 2001
- -From: Jouni Malinen <jouni@qca.qualcomm.com>
- -Date: Tue, 7 Apr 2015 11:32:11 +0300
- -Subject: [PATCH] P2P: Validate SSID element length before copying it
- - (CVE-2015-1863)
- -
- -This fixes a possible memcpy overflow for P2P dev->oper_ssid in
- -p2p_add_device(). The length provided by the peer device (0..255 bytes)
- -was used without proper bounds checking and that could have resulted in
- -arbitrary data of up to 223 bytes being written beyond the end of the
- -dev->oper_ssid[] array (of which about 150 bytes would be beyond the
- -heap allocation) when processing a corrupted management frame for P2P
- -peer discovery purposes.
- -
- -This could result in corrupted state in heap, unexpected program
- -behavior due to corrupted P2P peer device information, denial of service
- -due to process crash, exposure of memory contents during GO Negotiation,
- -and potentially arbitrary code execution.
- -
- -Thanks to Google security team for reporting this issue and smart
- -hardware research group of Alibaba security team for discovering it.
- -
- -Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
- ----
- - src/p2p/p2p.c | 1 +
- - 1 file changed, 1 insertion(+)
- -
- ---- a/src/p2p/p2p.c
- -+++ b/src/p2p/p2p.c
- -@@ -778,6 +778,7 @@ int p2p_add_device(struct p2p_data *p2p,
- - if (os_memcmp(addr, p2p_dev_addr, ETH_ALEN) != 0)
- - os_memcpy(dev->interface_addr, addr, ETH_ALEN);
- - if (msg.ssid &&
- -+ msg.ssid[1] <= sizeof(dev->oper_ssid) &&
- - (msg.ssid[1] != P2P_WILDCARD_SSID_LEN ||
- - os_memcmp(msg.ssid + 2, P2P_WILDCARD_SSID, P2P_WILDCARD_SSID_LEN)
- - != 0)) {
- diff --git a/package/network/services/hostapd/patches/002-AP-WMM-Fix-integer-underflow-in-WMM-Action-frame-par.patch b/package/network/services/hostapd/patches/002-AP-WMM-Fix-integer-underflow-in-WMM-Action-frame-par.patch
- deleted file mode 100644
- index bc4d60f..0000000
- --- a/package/network/services/hostapd/patches/002-AP-WMM-Fix-integer-underflow-in-WMM-Action-frame-par.patch
- +++ /dev/null
- @@ -1,36 +0,0 @@
- -From ef566a4d4f74022e1fdb0a2addfe81e6de9f4aae Mon Sep 17 00:00:00 2001
- -From: Jouni Malinen <j@w1.fi>
- -Date: Wed, 29 Apr 2015 02:21:53 +0300
- -Subject: [PATCH] AP WMM: Fix integer underflow in WMM Action frame parser
- -
- -The length of the WMM Action frame was not properly validated and the
- -length of the information elements (int left) could end up being
- -negative. This would result in reading significantly past the stack
- -buffer while parsing the IEs in ieee802_11_parse_elems() and while doing
- -so, resulting in segmentation fault.
- -
- -This can result in an invalid frame being used for a denial of service
- -attack (hostapd process killed) against an AP with a driver that uses
- -hostapd for management frame processing (e.g., all mac80211-based
- -drivers).
- -
- -Thanks to Kostya Kortchinsky of Google security team for discovering and
- -reporting this issue.
- -
- -Signed-off-by: Jouni Malinen <j@w1.fi>
- ----
- - src/ap/wmm.c | 3 +++
- - 1 file changed, 3 insertions(+)
- -
- ---- a/src/ap/wmm.c
- -+++ b/src/ap/wmm.c
- -@@ -274,6 +274,9 @@ void hostapd_wmm_action(struct hostapd_d
- - return;
- - }
- -
- -+ if (left < 0)
- -+ return; /* not a valid WMM Action frame */
- -+
- - /* extract the tspec info element */
- - if (ieee802_11_parse_elems(pos, left, &elems, 1) == ParseFailed) {
- - hostapd_logger(hapd, mgmt->sa, HOSTAPD_MODULE_IEEE80211,
- diff --git a/package/network/services/hostapd/patches/002-mesh-Set-correct-secondary-channel-offset-if-HT40-is.patch b/package/network/services/hostapd/patches/002-mesh-Set-correct-secondary-channel-offset-if-HT40-is.patch
- new file mode 100644
- index 0000000..2439220
- --- /dev/null
- +++ b/package/network/services/hostapd/patches/002-mesh-Set-correct-secondary-channel-offset-if-HT40-is.patch
- @@ -0,0 +1,61 @@
- +From: Masashi Honma <masashi.honma@gmail.com>
- +Date: Tue, 26 Jul 2016 11:45:40 +0900
- +Subject: [PATCH] mesh: Set correct secondary channel offset if HT40 is
- + disabled
- +
- +Previously, secondary channel offset could be non zero even though
- +disable_ht40=1. This patch fixes it.
- +
- +Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
- +---
- +
- +--- a/wpa_supplicant/wpa_supplicant.c
- ++++ b/wpa_supplicant/wpa_supplicant.c
- +@@ -1901,20 +1901,27 @@ void ibss_mesh_setup_freq(struct wpa_sup
- + break;
- + }
- + }
- ++#ifdef CONFIG_HT_OVERRIDES
- ++ if (ssid->disable_ht40)
- ++ ht40 = 0;
- ++#endif /* CONFIG_HT_OVERRIDES */
- +
- +- /* Find secondary channel */
- +- for (i = 0; i < mode->num_channels; i++) {
- +- sec_chan = &mode->channels[i];
- +- if (sec_chan->chan == channel + ht40 * 4)
- +- break;
- +- sec_chan = NULL;
- +- }
- +- if (!sec_chan)
- +- return;
- ++ if (ht40) {
- ++ /* Find secondary channel */
- ++ for (i = 0; i < mode->num_channels; i++) {
- ++ sec_chan = &mode->channels[i];
- ++ if (sec_chan->chan == channel + ht40 * 4)
- ++ break;
- ++ sec_chan = NULL;
- ++ }
- ++ if (!sec_chan)
- ++ return;
- +
- +- /* Check secondary channel flags */
- +- if (sec_chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR))
- +- return;
- ++ /* Check secondary channel flags */
- ++ if (sec_chan->flag &
- ++ (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR))
- ++ return;
- ++ }
- +
- + freq->channel = pri_chan->chan;
- +
- +@@ -1930,6 +1937,7 @@ void ibss_mesh_setup_freq(struct wpa_sup
- + freq->sec_channel_offset = 1;
- + break;
- + default:
- ++ freq->sec_channel_offset = 0;
- + break;
- + }
- +
- diff --git a/package/network/services/hostapd/patches/003-WPS-Fix-HTTP-chunked-transfer-encoding-parser.patch b/package/network/services/hostapd/patches/003-WPS-Fix-HTTP-chunked-transfer-encoding-parser.patch
- deleted file mode 100644
- index 36b4ca2..0000000
- --- a/package/network/services/hostapd/patches/003-WPS-Fix-HTTP-chunked-transfer-encoding-parser.patch
- +++ /dev/null
- @@ -1,49 +0,0 @@
- -From 5acd23f4581da58683f3cf5e36cb71bbe4070bd7 Mon Sep 17 00:00:00 2001
- -From: Jouni Malinen <j@w1.fi>
- -Date: Tue, 28 Apr 2015 17:08:33 +0300
- -Subject: [PATCH] WPS: Fix HTTP chunked transfer encoding parser
- -
- -strtoul() return value may end up overflowing the int h->chunk_size and
- -resulting in a negative value to be stored as the chunk_size. This could
- -result in the following memcpy operation using a very large length
- -argument which would result in a buffer overflow and segmentation fault.
- -
- -This could have been used to cause a denial service by any device that
- -has been authorized for network access (either wireless or wired). This
- -would affect both the WPS UPnP functionality in a WPS AP (hostapd with
- -upnp_iface parameter set in the configuration) and WPS ER
- -(wpa_supplicant with WPS_ER_START control interface command used).
- -
- -Validate the parsed chunk length value to avoid this. In addition to
- -rejecting negative values, we can also reject chunk size that would be
- -larger than the maximum configured body length.
- -
- -Thanks to Kostya Kortchinsky of Google security team for discovering and
- -reporting this issue.
- -
- -Signed-off-by: Jouni Malinen <j@w1.fi>
- ----
- - src/wps/httpread.c | 7 +++++++
- - 1 file changed, 7 insertions(+)
- -
- -diff --git a/src/wps/httpread.c b/src/wps/httpread.c
- -index 2f08f37..d2855e3 100644
- ---- a/src/wps/httpread.c
- -+++ b/src/wps/httpread.c
- -@@ -533,6 +533,13 @@ static void httpread_read_handler(int sd, void *eloop_ctx, void *sock_ctx)
- - if (!isxdigit(*cbp))
- - goto bad;
- - h->chunk_size = strtoul(cbp, NULL, 16);
- -+ if (h->chunk_size < 0 ||
- -+ h->chunk_size > h->max_bytes) {
- -+ wpa_printf(MSG_DEBUG,
- -+ "httpread: Invalid chunk size %d",
- -+ h->chunk_size);
- -+ goto bad;
- -+ }
- - /* throw away chunk header
- - * so we have only real data
- - */
- ---
- -1.9.1
- -
- diff --git a/package/network/services/hostapd/patches/004-EAP-pwd-peer-Fix-payload-length-validation-for-Commi.patch b/package/network/services/hostapd/patches/004-EAP-pwd-peer-Fix-payload-length-validation-for-Commi.patch
- deleted file mode 100644
- index 91627fb..0000000
- --- a/package/network/services/hostapd/patches/004-EAP-pwd-peer-Fix-payload-length-validation-for-Commi.patch
- +++ /dev/null
- @@ -1,73 +0,0 @@
- -From dd2f043c9c43d156494e33d7ce22db96e6ef42c7 Mon Sep 17 00:00:00 2001
- -From: Jouni Malinen <j@w1.fi>
- -Date: Fri, 1 May 2015 16:37:45 +0300
- -Subject: [PATCH 1/5] EAP-pwd peer: Fix payload length validation for Commit
- - and Confirm
- -
- -The length of the received Commit and Confirm message payloads was not
- -checked before reading them. This could result in a buffer read
- -overflow when processing an invalid message.
- -
- -Fix this by verifying that the payload is of expected length before
- -processing it. In addition, enforce correct state transition sequence to
- -make sure there is no unexpected behavior if receiving a Commit/Confirm
- -message before the previous exchanges have been completed.
- -
- -Thanks to Kostya Kortchinsky of Google security team for discovering and
- -reporting this issue.
- -
- -Signed-off-by: Jouni Malinen <j@w1.fi>
- ----
- - src/eap_peer/eap_pwd.c | 29 +++++++++++++++++++++++++++++
- - 1 file changed, 29 insertions(+)
- -
- -diff --git a/src/eap_peer/eap_pwd.c b/src/eap_peer/eap_pwd.c
- -index f2b0926..a629437 100644
- ---- a/src/eap_peer/eap_pwd.c
- -+++ b/src/eap_peer/eap_pwd.c
- -@@ -355,6 +355,23 @@ eap_pwd_perform_commit_exchange(struct eap_sm *sm, struct eap_pwd_data *data,
- - BIGNUM *mask = NULL, *x = NULL, *y = NULL, *cofactor = NULL;
- - u16 offset;
- - u8 *ptr, *scalar = NULL, *element = NULL;
- -+ size_t prime_len, order_len;
- -+
- -+ if (data->state != PWD_Commit_Req) {
- -+ ret->ignore = TRUE;
- -+ goto fin;
- -+ }
- -+
- -+ prime_len = BN_num_bytes(data->grp->prime);
- -+ order_len = BN_num_bytes(data->grp->order);
- -+
- -+ if (payload_len != 2 * prime_len + order_len) {
- -+ wpa_printf(MSG_INFO,
- -+ "EAP-pwd: Unexpected Commit payload length %u (expected %u)",
- -+ (unsigned int) payload_len,
- -+ (unsigned int) (2 * prime_len + order_len));
- -+ goto fin;
- -+ }
- -
- - if (((data->private_value = BN_new()) == NULL) ||
- - ((data->my_element = EC_POINT_new(data->grp->group)) == NULL) ||
- -@@ -554,6 +571,18 @@ eap_pwd_perform_confirm_exchange(struct eap_sm *sm, struct eap_pwd_data *data,
- - u8 conf[SHA256_MAC_LEN], *cruft = NULL, *ptr;
- - int offset;
- -
- -+ if (data->state != PWD_Confirm_Req) {
- -+ ret->ignore = TRUE;
- -+ goto fin;
- -+ }
- -+
- -+ if (payload_len != SHA256_MAC_LEN) {
- -+ wpa_printf(MSG_INFO,
- -+ "EAP-pwd: Unexpected Confirm payload length %u (expected %u)",
- -+ (unsigned int) payload_len, SHA256_MAC_LEN);
- -+ goto fin;
- -+ }
- -+
- - /*
- - * first build up the ciphersuite which is group | random_function |
- - * prf
- ---
- -1.9.1
- -
- diff --git a/package/network/services/hostapd/patches/005-EAP-pwd-server-Fix-payload-length-validation-for-Com.patch b/package/network/services/hostapd/patches/005-EAP-pwd-server-Fix-payload-length-validation-for-Com.patch
- deleted file mode 100644
- index 5dca20b..0000000
- --- a/package/network/services/hostapd/patches/005-EAP-pwd-server-Fix-payload-length-validation-for-Com.patch
- +++ /dev/null
- @@ -1,66 +0,0 @@
- -From e28a58be26184c2a23f80b410e0997ef1bd5d578 Mon Sep 17 00:00:00 2001
- -From: Jouni Malinen <j@w1.fi>
- -Date: Fri, 1 May 2015 16:40:44 +0300
- -Subject: [PATCH 2/5] EAP-pwd server: Fix payload length validation for Commit
- - and Confirm
- -
- -The length of the received Commit and Confirm message payloads was not
- -checked before reading them. This could result in a buffer read
- -overflow when processing an invalid message.
- -
- -Fix this by verifying that the payload is of expected length before
- -processing it. In addition, enforce correct state transition sequence to
- -make sure there is no unexpected behavior if receiving a Commit/Confirm
- -message before the previous exchanges have been completed.
- -
- -Thanks to Kostya Kortchinsky of Google security team for discovering and
- -reporting this issue.
- -
- -Signed-off-by: Jouni Malinen <j@w1.fi>
- ----
- - src/eap_server/eap_server_pwd.c | 19 +++++++++++++++++++
- - 1 file changed, 19 insertions(+)
- -
- -diff --git a/src/eap_server/eap_server_pwd.c b/src/eap_server/eap_server_pwd.c
- -index 66bd5d2..3189105 100644
- ---- a/src/eap_server/eap_server_pwd.c
- -+++ b/src/eap_server/eap_server_pwd.c
- -@@ -656,9 +656,21 @@ eap_pwd_process_commit_resp(struct eap_sm *sm, struct eap_pwd_data *data,
- - BIGNUM *x = NULL, *y = NULL, *cofactor = NULL;
- - EC_POINT *K = NULL, *point = NULL;
- - int res = 0;
- -+ size_t prime_len, order_len;
- -
- - wpa_printf(MSG_DEBUG, "EAP-pwd: Received commit response");
- -
- -+ prime_len = BN_num_bytes(data->grp->prime);
- -+ order_len = BN_num_bytes(data->grp->order);
- -+
- -+ if (payload_len != 2 * prime_len + order_len) {
- -+ wpa_printf(MSG_INFO,
- -+ "EAP-pwd: Unexpected Commit payload length %u (expected %u)",
- -+ (unsigned int) payload_len,
- -+ (unsigned int) (2 * prime_len + order_len));
- -+ goto fin;
- -+ }
- -+
- - if (((data->peer_scalar = BN_new()) == NULL) ||
- - ((data->k = BN_new()) == NULL) ||
- - ((cofactor = BN_new()) == NULL) ||
- -@@ -774,6 +786,13 @@ eap_pwd_process_confirm_resp(struct eap_sm *sm, struct eap_pwd_data *data,
- - u8 conf[SHA256_MAC_LEN], *cruft = NULL, *ptr;
- - int offset;
- -
- -+ if (payload_len != SHA256_MAC_LEN) {
- -+ wpa_printf(MSG_INFO,
- -+ "EAP-pwd: Unexpected Confirm payload length %u (expected %u)",
- -+ (unsigned int) payload_len, SHA256_MAC_LEN);
- -+ goto fin;
- -+ }
- -+
- - /* build up the ciphersuite: group | random_function | prf */
- - grp = htons(data->group_num);
- - ptr = (u8 *) &cs;
- ---
- -1.9.1
- -
- diff --git a/package/network/services/hostapd/patches/006-EAP-pwd-peer-Fix-Total-Length-parsing-for-fragment-r.patch b/package/network/services/hostapd/patches/006-EAP-pwd-peer-Fix-Total-Length-parsing-for-fragment-r.patch
- deleted file mode 100644
- index 4d2f9d8..0000000
- --- a/package/network/services/hostapd/patches/006-EAP-pwd-peer-Fix-Total-Length-parsing-for-fragment-r.patch
- +++ /dev/null
- @@ -1,52 +0,0 @@
- -From 477c74395acd0123340457ba6f15ab345d42016e Mon Sep 17 00:00:00 2001
- -From: Jouni Malinen <j@w1.fi>
- -Date: Sat, 2 May 2015 19:23:04 +0300
- -Subject: [PATCH 3/5] EAP-pwd peer: Fix Total-Length parsing for fragment
- - reassembly
- -
- -The remaining number of bytes in the message could be smaller than the
- -Total-Length field size, so the length needs to be explicitly checked
- -prior to reading the field and decrementing the len variable. This could
- -have resulted in the remaining length becoming negative and interpreted
- -as a huge positive integer.
- -
- -In addition, check that there is no already started fragment in progress
- -before allocating a new buffer for reassembling fragments. This avoid a
- -potential memory leak when processing invalid message.
- -
- -Signed-off-by: Jouni Malinen <j@w1.fi>
- ----
- - src/eap_peer/eap_pwd.c | 12 ++++++++++++
- - 1 file changed, 12 insertions(+)
- -
- -diff --git a/src/eap_peer/eap_pwd.c b/src/eap_peer/eap_pwd.c
- -index a629437..1d2079b 100644
- ---- a/src/eap_peer/eap_pwd.c
- -+++ b/src/eap_peer/eap_pwd.c
- -@@ -866,11 +866,23 @@ eap_pwd_process(struct eap_sm *sm, void *priv, struct eap_method_ret *ret,
- - * if it's the first fragment there'll be a length field
- - */
- - if (EAP_PWD_GET_LENGTH_BIT(lm_exch)) {
- -+ if (len < 2) {
- -+ wpa_printf(MSG_DEBUG,
- -+ "EAP-pwd: Frame too short to contain Total-Length field");
- -+ ret->ignore = TRUE;
- -+ return NULL;
- -+ }
- - tot_len = WPA_GET_BE16(pos);
- - wpa_printf(MSG_DEBUG, "EAP-pwd: Incoming fragments whose "
- - "total length = %d", tot_len);
- - if (tot_len > 15000)
- - return NULL;
- -+ if (data->inbuf) {
- -+ wpa_printf(MSG_DEBUG,
- -+ "EAP-pwd: Unexpected new fragment start when previous fragment is still in use");
- -+ ret->ignore = TRUE;
- -+ return NULL;
- -+ }
- - data->inbuf = wpabuf_alloc(tot_len);
- - if (data->inbuf == NULL) {
- - wpa_printf(MSG_INFO, "Out of memory to buffer "
- ---
- -1.9.1
- -
- diff --git a/package/network/services/hostapd/patches/007-EAP-pwd-server-Fix-Total-Length-parsing-for-fragment.patch b/package/network/services/hostapd/patches/007-EAP-pwd-server-Fix-Total-Length-parsing-for-fragment.patch
- deleted file mode 100644
- index 7edef09..0000000
- --- a/package/network/services/hostapd/patches/007-EAP-pwd-server-Fix-Total-Length-parsing-for-fragment.patch
- +++ /dev/null
- @@ -1,50 +0,0 @@
- -From 3035cc2894e08319b905bd6561e8bddc8c2db9fa Mon Sep 17 00:00:00 2001
- -From: Jouni Malinen <j@w1.fi>
- -Date: Sat, 2 May 2015 19:26:06 +0300
- -Subject: [PATCH 4/5] EAP-pwd server: Fix Total-Length parsing for fragment
- - reassembly
- -
- -The remaining number of bytes in the message could be smaller than the
- -Total-Length field size, so the length needs to be explicitly checked
- -prior to reading the field and decrementing the len variable. This could
- -have resulted in the remaining length becoming negative and interpreted
- -as a huge positive integer.
- -
- -In addition, check that there is no already started fragment in progress
- -before allocating a new buffer for reassembling fragments. This avoid a
- -potential memory leak when processing invalid message.
- -
- -Signed-off-by: Jouni Malinen <j@w1.fi>
- ----
- - src/eap_server/eap_server_pwd.c | 10 ++++++++++
- - 1 file changed, 10 insertions(+)
- -
- -diff --git a/src/eap_server/eap_server_pwd.c b/src/eap_server/eap_server_pwd.c
- -index 3189105..2bfc3c2 100644
- ---- a/src/eap_server/eap_server_pwd.c
- -+++ b/src/eap_server/eap_server_pwd.c
- -@@ -942,11 +942,21 @@ static void eap_pwd_process(struct eap_sm *sm, void *priv,
- - * the first fragment has a total length
- - */
- - if (EAP_PWD_GET_LENGTH_BIT(lm_exch)) {
- -+ if (len < 2) {
- -+ wpa_printf(MSG_DEBUG,
- -+ "EAP-pwd: Frame too short to contain Total-Length field");
- -+ return;
- -+ }
- - tot_len = WPA_GET_BE16(pos);
- - wpa_printf(MSG_DEBUG, "EAP-pwd: Incoming fragments, total "
- - "length = %d", tot_len);
- - if (tot_len > 15000)
- - return;
- -+ if (data->inbuf) {
- -+ wpa_printf(MSG_DEBUG,
- -+ "EAP-pwd: Unexpected new fragment start when previous fragment is still in use");
- -+ return;
- -+ }
- - data->inbuf = wpabuf_alloc(tot_len);
- - if (data->inbuf == NULL) {
- - wpa_printf(MSG_INFO, "EAP-pwd: Out of memory to "
- ---
- -1.9.1
- -
- diff --git a/package/network/services/hostapd/patches/008-EAP-pwd-peer-Fix-asymmetric-fragmentation-behavior.patch b/package/network/services/hostapd/patches/008-EAP-pwd-peer-Fix-asymmetric-fragmentation-behavior.patch
- deleted file mode 100644
- index a601323..0000000
- --- a/package/network/services/hostapd/patches/008-EAP-pwd-peer-Fix-asymmetric-fragmentation-behavior.patch
- +++ /dev/null
- @@ -1,32 +0,0 @@
- -From 28a069a545b06b99eb55ad53f63f2c99e65a98f6 Mon Sep 17 00:00:00 2001
- -From: Jouni Malinen <j@w1.fi>
- -Date: Sat, 2 May 2015 19:26:28 +0300
- -Subject: [PATCH 5/5] EAP-pwd peer: Fix asymmetric fragmentation behavior
- -
- -The L (Length) and M (More) flags needs to be cleared before deciding
- -whether the locally generated response requires fragmentation. This
- -fixes an issue where these flags from the server could have been invalid
- -for the following message. In some cases, this could have resulted in
- -triggering the wpabuf security check that would terminate the process
- -due to invalid buffer allocation.
- -
- -Signed-off-by: Jouni Malinen <j@w1.fi>
- ----
- - src/eap_peer/eap_pwd.c | 1 +
- - 1 file changed, 1 insertion(+)
- -
- -diff --git a/src/eap_peer/eap_pwd.c b/src/eap_peer/eap_pwd.c
- -index 1d2079b..e58b13a 100644
- ---- a/src/eap_peer/eap_pwd.c
- -+++ b/src/eap_peer/eap_pwd.c
- -@@ -968,6 +968,7 @@ eap_pwd_process(struct eap_sm *sm, void *priv, struct eap_method_ret *ret,
- - /*
- - * we have output! Do we need to fragment it?
- - */
- -+ lm_exch = EAP_PWD_GET_EXCHANGE(lm_exch);
- - len = wpabuf_len(data->outbuf);
- - if ((len + EAP_PWD_HDR_SIZE) > data->mtu) {
- - resp = eap_msg_alloc(EAP_VENDOR_IETF, EAP_TYPE_PWD, data->mtu,
- ---
- -1.9.1
- -
- diff --git a/package/network/services/hostapd/patches/009-NFC-Fix-payload-length-validation-in-NDEF-record-par.patch b/package/network/services/hostapd/patches/009-NFC-Fix-payload-length-validation-in-NDEF-record-par.patch
- deleted file mode 100644
- index dd34624..0000000
- --- a/package/network/services/hostapd/patches/009-NFC-Fix-payload-length-validation-in-NDEF-record-par.patch
- +++ /dev/null
- @@ -1,61 +0,0 @@
- -From df9079e72760ceb7ebe7fb11538200c516bdd886 Mon Sep 17 00:00:00 2001
- -From: Jouni Malinen <j@w1.fi>
- -Date: Tue, 7 Jul 2015 21:57:28 +0300
- -Subject: [PATCH] NFC: Fix payload length validation in NDEF record parser
- -
- -It was possible for the 32-bit record->total_length value to end up
- -wrapping around due to integer overflow if the longer form of payload
- -length field is used and record->payload_length gets a value close to
- -2^32. This could result in ndef_parse_record() accepting a too large
- -payload length value and the record type filter reading up to about 20
- -bytes beyond the end of the buffer and potentially killing the process.
- -This could also result in an attempt to allocate close to 2^32 bytes of
- -heap memory and if that were to succeed, a buffer read overflow of the
- -same length which would most likely result in the process termination.
- -In case of record->total_length ending up getting the value 0, there
- -would be no buffer read overflow, but record parsing would result in an
- -infinite loop in ndef_parse_records().
- -
- -Any of these error cases could potentially be used for denial of service
- -attacks over NFC by using a malformed NDEF record on an NFC Tag or
- -sending them during NFC connection handover if the application providing
- -the NDEF message to hostapd/wpa_supplicant did no validation of the
- -received records. While such validation is likely done in the NFC stack
- -that needs to parse the NFC messages before further processing,
- -hostapd/wpa_supplicant better be prepared for any data being included
- -here.
- -
- -Fix this by validating record->payload_length value in a way that
- -detects integer overflow. (CID 122668)
- -
- -Signed-off-by: Jouni Malinen <j@w1.fi>
- ----
- - src/wps/ndef.c | 5 ++++-
- - 1 file changed, 4 insertions(+), 1 deletion(-)
- -
- -diff --git a/src/wps/ndef.c b/src/wps/ndef.c
- -index 5604b0a..50d018f 100644
- ---- a/src/wps/ndef.c
- -+++ b/src/wps/ndef.c
- -@@ -48,6 +48,8 @@ static int ndef_parse_record(const u8 *data, u32 size,
- - if (size < 6)
- - return -1;
- - record->payload_length = ntohl(*(u32 *)pos);
- -+ if (record->payload_length > size - 6)
- -+ return -1;
- - pos += sizeof(u32);
- - }
- -
- -@@ -68,7 +70,8 @@ static int ndef_parse_record(const u8 *data, u32 size,
- - pos += record->payload_length;
- -
- - record->total_length = pos - data;
- -- if (record->total_length > size)
- -+ if (record->total_length > size ||
- -+ record->total_length < record->payload_length)
- - return -1;
- - return 0;
- - }
- ---
- -1.9.1
- -
- diff --git a/package/network/services/hostapd/patches/010-WNM-Ignore-Key-Data-in-WNM-Sleep-Mode-Response-frame.patch b/package/network/services/hostapd/patches/010-WNM-Ignore-Key-Data-in-WNM-Sleep-Mode-Response-frame.patch
- deleted file mode 100644
- index 00e5b7c..0000000
- --- a/package/network/services/hostapd/patches/010-WNM-Ignore-Key-Data-in-WNM-Sleep-Mode-Response-frame.patch
- +++ /dev/null
- @@ -1,32 +0,0 @@
- -From 6b12d93d2c7428a34bfd4b3813ba339ed57b698a Mon Sep 17 00:00:00 2001
- -From: Jouni Malinen <j@w1.fi>
- -Date: Sun, 25 Oct 2015 15:45:50 +0200
- -Subject: [PATCH] WNM: Ignore Key Data in WNM Sleep Mode Response frame if no
- - PMF in use
- -
- -WNM Sleep Mode Response frame is used to update GTK/IGTK only if PMF is
- -enabled. Verify that PMF is in use before using this field on station
- -side to avoid accepting unauthenticated key updates. (CVE-2015-5310)
- -
- -Signed-off-by: Jouni Malinen <j@w1.fi>
- ----
- - wpa_supplicant/wnm_sta.c | 6 ++++++
- - 1 file changed, 6 insertions(+)
- -
- -diff --git a/wpa_supplicant/wnm_sta.c b/wpa_supplicant/wnm_sta.c
- -index 954de67..7d79499 100644
- ---- a/wpa_supplicant/wnm_sta.c
- -+++ b/wpa_supplicant/wnm_sta.c
- -@@ -187,6 +187,12 @@ static void wnm_sleep_mode_exit_success(struct wpa_supplicant *wpa_s,
- - end = ptr + key_len_total;
- - wpa_hexdump_key(MSG_DEBUG, "WNM: Key Data", ptr, key_len_total);
- -
- -+ if (key_len_total && !wpa_sm_pmf_enabled(wpa_s->wpa)) {
- -+ wpa_msg(wpa_s, MSG_INFO,
- -+ "WNM: Ignore Key Data in WNM-Sleep Mode Response - PMF not enabled");
- -+ return;
- -+ }
- -+
- - while (ptr + 1 < end) {
- - if (ptr + 2 + ptr[1] > end) {
- - wpa_printf(MSG_DEBUG, "WNM: Invalid Key Data element "
- diff --git a/package/network/services/hostapd/patches/011-EAP-pwd-peer-Fix-last-fragment-length-validation.patch b/package/network/services/hostapd/patches/011-EAP-pwd-peer-Fix-last-fragment-length-validation.patch
- deleted file mode 100644
- index 82c2639..0000000
- --- a/package/network/services/hostapd/patches/011-EAP-pwd-peer-Fix-last-fragment-length-validation.patch
- +++ /dev/null
- @@ -1,54 +0,0 @@
- -From 8057821706784608b828e769ccefbced95591e50 Mon Sep 17 00:00:00 2001
- -From: Jouni Malinen <j@w1.fi>
- -Date: Sun, 1 Nov 2015 18:18:17 +0200
- -Subject: [PATCH] EAP-pwd peer: Fix last fragment length validation
- -
- -All but the last fragment had their length checked against the remaining
- -room in the reassembly buffer. This allowed a suitably constructed last
- -fragment frame to try to add extra data that would go beyond the buffer.
- -The length validation code in wpabuf_put_data() prevents an actual
- -buffer write overflow from occurring, but this results in process
- -termination. (CVE-2015-5315)
- -
- -Signed-off-by: Jouni Malinen <j@w1.fi>
- ----
- - src/eap_peer/eap_pwd.c | 7 +++----
- - 1 file changed, 3 insertions(+), 4 deletions(-)
- -
- -diff --git a/src/eap_peer/eap_pwd.c b/src/eap_peer/eap_pwd.c
- -index 1f78544..75ceef1 100644
- ---- a/src/eap_peer/eap_pwd.c
- -+++ b/src/eap_peer/eap_pwd.c
- -@@ -903,7 +903,7 @@ eap_pwd_process(struct eap_sm *sm, void *priv, struct eap_method_ret *ret,
- - /*
- - * buffer and ACK the fragment
- - */
- -- if (EAP_PWD_GET_MORE_BIT(lm_exch)) {
- -+ if (EAP_PWD_GET_MORE_BIT(lm_exch) || data->in_frag_pos) {
- - data->in_frag_pos += len;
- - if (data->in_frag_pos > wpabuf_size(data->inbuf)) {
- - wpa_printf(MSG_INFO, "EAP-pwd: Buffer overflow attack "
- -@@ -916,7 +916,8 @@ eap_pwd_process(struct eap_sm *sm, void *priv, struct eap_method_ret *ret,
- - return NULL;
- - }
- - wpabuf_put_data(data->inbuf, pos, len);
- --
- -+ }
- -+ if (EAP_PWD_GET_MORE_BIT(lm_exch)) {
- - resp = eap_msg_alloc(EAP_VENDOR_IETF, EAP_TYPE_PWD,
- - EAP_PWD_HDR_SIZE,
- - EAP_CODE_RESPONSE, eap_get_id(reqData));
- -@@ -930,10 +931,8 @@ eap_pwd_process(struct eap_sm *sm, void *priv, struct eap_method_ret *ret,
- - * we're buffering and this is the last fragment
- - */
- - if (data->in_frag_pos) {
- -- wpabuf_put_data(data->inbuf, pos, len);
- - wpa_printf(MSG_DEBUG, "EAP-pwd: Last fragment, %d bytes",
- - (int) len);
- -- data->in_frag_pos += len;
- - pos = wpabuf_head_u8(data->inbuf);
- - len = data->in_frag_pos;
- - }
- ---
- -1.9.1
- -
- diff --git a/package/network/services/hostapd/patches/012-EAP-pwd-server-Fix-last-fragment-length-validation.patch b/package/network/services/hostapd/patches/012-EAP-pwd-server-Fix-last-fragment-length-validation.patch
- deleted file mode 100644
- index bfc4c74..0000000
- --- a/package/network/services/hostapd/patches/012-EAP-pwd-server-Fix-last-fragment-length-validation.patch
- +++ /dev/null
- @@ -1,51 +0,0 @@
- -From bef802ece03f9ae9d52a21f0cf4f1bc2c5a1f8aa Mon Sep 17 00:00:00 2001
- -From: Jouni Malinen <j@w1.fi>
- -Date: Sun, 1 Nov 2015 18:24:16 +0200
- -Subject: [PATCH] EAP-pwd server: Fix last fragment length validation
- -
- -All but the last fragment had their length checked against the remaining
- -room in the reassembly buffer. This allowed a suitably constructed last
- -fragment frame to try to add extra data that would go beyond the buffer.
- -The length validation code in wpabuf_put_data() prevents an actual
- -buffer write overflow from occurring, but this results in process
- -termination. (CVE-2015-5314)
- -
- -Signed-off-by: Jouni Malinen <j@w1.fi>
- ----
- - src/eap_server/eap_server_pwd.c | 6 +++---
- - 1 file changed, 3 insertions(+), 3 deletions(-)
- -
- -diff --git a/src/eap_server/eap_server_pwd.c b/src/eap_server/eap_server_pwd.c
- -index cb83ff7..9f787ab 100644
- ---- a/src/eap_server/eap_server_pwd.c
- -+++ b/src/eap_server/eap_server_pwd.c
- -@@ -970,7 +970,7 @@ static void eap_pwd_process(struct eap_sm *sm, void *priv,
- - /*
- - * the first and all intermediate fragments have the M bit set
- - */
- -- if (EAP_PWD_GET_MORE_BIT(lm_exch)) {
- -+ if (EAP_PWD_GET_MORE_BIT(lm_exch) || data->in_frag_pos) {
- - if ((data->in_frag_pos + len) > wpabuf_size(data->inbuf)) {
- - wpa_printf(MSG_DEBUG, "EAP-pwd: Buffer overflow "
- - "attack detected! (%d+%d > %d)",
- -@@ -981,6 +981,8 @@ static void eap_pwd_process(struct eap_sm *sm, void *priv,
- - }
- - wpabuf_put_data(data->inbuf, pos, len);
- - data->in_frag_pos += len;
- -+ }
- -+ if (EAP_PWD_GET_MORE_BIT(lm_exch)) {
- - wpa_printf(MSG_DEBUG, "EAP-pwd: Got a %d byte fragment",
- - (int) len);
- - return;
- -@@ -990,8 +992,6 @@ static void eap_pwd_process(struct eap_sm *sm, void *priv,
- - * buffering fragments so that's how we know it's the last)
- - */
- - if (data->in_frag_pos) {
- -- wpabuf_put_data(data->inbuf, pos, len);
- -- data->in_frag_pos += len;
- - pos = wpabuf_head_u8(data->inbuf);
- - len = data->in_frag_pos;
- - wpa_printf(MSG_DEBUG, "EAP-pwd: Last fragment, %d bytes",
- ---
- -1.9.1
- -
- diff --git a/package/network/services/hostapd/patches/013-EAP-pwd-peer-Fix-error-path-for-unexpected-Confirm-m.patch b/package/network/services/hostapd/patches/013-EAP-pwd-peer-Fix-error-path-for-unexpected-Confirm-m.patch
- deleted file mode 100644
- index 3088f6a..0000000
- --- a/package/network/services/hostapd/patches/013-EAP-pwd-peer-Fix-error-path-for-unexpected-Confirm-m.patch
- +++ /dev/null
- @@ -1,34 +0,0 @@
- -From 95577884ca4fa76be91344ff7a8d5d1e6dc3da61 Mon Sep 17 00:00:00 2001
- -From: Jouni Malinen <j@w1.fi>
- -Date: Sun, 1 Nov 2015 19:35:44 +0200
- -Subject: [PATCH] EAP-pwd peer: Fix error path for unexpected Confirm message
- -
- -If the Confirm message is received from the server before the Identity
- -exchange has been completed, the group has not yet been determined and
- -data->grp is NULL. The error path in eap_pwd_perform_confirm_exchange()
- -did not take this corner case into account and could end up
- -dereferencing a NULL pointer and terminating the process if invalid
- -message sequence is received. (CVE-2015-5316)
- -
- -Signed-off-by: Jouni Malinen <j@w1.fi>
- ----
- - src/eap_peer/eap_pwd.c | 3 ++-
- - 1 file changed, 2 insertions(+), 1 deletion(-)
- -
- -diff --git a/src/eap_peer/eap_pwd.c b/src/eap_peer/eap_pwd.c
- -index 75ceef1..892b590 100644
- ---- a/src/eap_peer/eap_pwd.c
- -+++ b/src/eap_peer/eap_pwd.c
- -@@ -774,7 +774,8 @@ eap_pwd_perform_confirm_exchange(struct eap_sm *sm, struct eap_pwd_data *data,
- - wpabuf_put_data(data->outbuf, conf, SHA256_MAC_LEN);
- -
- - fin:
- -- bin_clear_free(cruft, BN_num_bytes(data->grp->prime));
- -+ if (data->grp)
- -+ bin_clear_free(cruft, BN_num_bytes(data->grp->prime));
- - BN_clear_free(x);
- - BN_clear_free(y);
- - if (data->outbuf == NULL) {
- ---
- -1.9.1
- -
- diff --git a/package/network/services/hostapd/patches/100-mesh_mode_fix.patch b/package/network/services/hostapd/patches/100-mesh_mode_fix.patch
- new file mode 100644
- index 0000000..ceb4c53
- --- /dev/null
- +++ b/package/network/services/hostapd/patches/100-mesh_mode_fix.patch
- @@ -0,0 +1,12 @@
- +--- a/src/drivers/driver_nl80211.c
- ++++ b/src/drivers/driver_nl80211.c
- +@@ -2332,7 +2332,8 @@ wpa_driver_nl80211_finish_drv_init(struc
- +
- + if (drv->hostapd || bss->static_ap)
- + nlmode = NL80211_IFTYPE_AP;
- +- else if (bss->if_dynamic)
- ++ else if (bss->if_dynamic ||
- ++ nl80211_get_ifmode(bss) == NL80211_IFTYPE_MESH_POINT)
- + nlmode = nl80211_get_ifmode(bss);
- + else
- + nlmode = NL80211_IFTYPE_STATION;
- diff --git a/package/network/services/hostapd/patches/110-bool_fix.patch b/package/network/services/hostapd/patches/110-bool_fix.patch
- deleted file mode 100644
- index 865c014..0000000
- --- a/package/network/services/hostapd/patches/110-bool_fix.patch
- +++ /dev/null
- @@ -1,14 +0,0 @@
- ---- a/src/ap/ieee802_1x.c
- -+++ b/src/ap/ieee802_1x.c
- -@@ -2332,9 +2332,9 @@ void ieee802_1x_notify_pre_auth(struct e
- - }
- -
- -
- --static const char * bool_txt(Boolean bool)
- -+static const char * bool_txt(Boolean bool_val)
- - {
- -- return bool ? "TRUE" : "FALSE";
- -+ return bool_val ? "TRUE" : "FALSE";
- - }
- -
- -
- diff --git a/package/network/services/hostapd/patches/110-fix_parse_das_client.patch b/package/network/services/hostapd/patches/110-fix_parse_das_client.patch
- new file mode 100644
- index 0000000..67fb899
- --- /dev/null
- +++ b/package/network/services/hostapd/patches/110-fix_parse_das_client.patch
- @@ -0,0 +1,10 @@
- +--- a/hostapd/config_file.c
- ++++ b/hostapd/config_file.c
- +@@ -645,6 +645,7 @@ static int hostapd_parse_das_client(stru
- + if (secret == NULL)
- + return -1;
- +
- ++ *secret = 0;
- + secret++;
- +
- + if (hostapd_parse_ip_addr(val, &bss->radius_das_client_addr))
- diff --git a/package/network/services/hostapd/patches/120-daemonize_fix.patch b/package/network/services/hostapd/patches/120-daemonize_fix.patch
- index 032e207..0389406 100644
- --- a/package/network/services/hostapd/patches/120-daemonize_fix.patch
- +++ b/package/network/services/hostapd/patches/120-daemonize_fix.patch
- @@ -8,7 +8,7 @@
-
- #ifdef ANDROID
- #include <sys/capability.h>
- -@@ -155,59 +156,46 @@ int os_gmtime(os_time_t t, struct os_tm
- +@@ -179,59 +180,46 @@ int os_gmtime(os_time_t t, struct os_tm
- return 0;
- }
-
- @@ -60,13 +60,13 @@
- + if (chdir("/") < 0)
- return -1;
- - }
- --
- +
- - return 0;
- -}
- -#else /* __APPLE__ */
- -#define os_daemon daemon
- -#endif /* __APPLE__ */
- -
- +-
- -
- -int os_daemonize(const char *pid_file)
- -{
- diff --git a/package/network/services/hostapd/patches/130-no_eapol_fix.patch b/package/network/services/hostapd/patches/130-no_eapol_fix.patch
- index d23b47b..5aee3d0 100644
- --- a/package/network/services/hostapd/patches/130-no_eapol_fix.patch
- +++ b/package/network/services/hostapd/patches/130-no_eapol_fix.patch
- @@ -1,6 +1,6 @@
- --- a/wpa_supplicant/wpa_supplicant.c
- +++ b/wpa_supplicant/wpa_supplicant.c
- -@@ -252,9 +252,10 @@ void wpa_supplicant_cancel_auth_timeout(
- +@@ -257,9 +257,10 @@ void wpa_supplicant_cancel_auth_timeout(
- */
- void wpa_supplicant_initiate_eapol(struct wpa_supplicant *wpa_s)
- {
- diff --git a/package/network/services/hostapd/patches/140-disable_bridge_packet_workaround.patch b/package/network/services/hostapd/patches/140-disable_bridge_packet_workaround.patch
- index 6337d8d..fdd5da9 100644
- --- a/package/network/services/hostapd/patches/140-disable_bridge_packet_workaround.patch
- +++ b/package/network/services/hostapd/patches/140-disable_bridge_packet_workaround.patch
- @@ -1,6 +1,6 @@
- --- a/src/l2_packet/l2_packet_linux.c
- +++ b/src/l2_packet/l2_packet_linux.c
- -@@ -307,8 +307,7 @@ struct l2_packet_data * l2_packet_init_b
- +@@ -337,8 +337,7 @@ struct l2_packet_data * l2_packet_init_b
-
- l2 = l2_packet_init(br_ifname, own_addr, protocol, rx_callback,
- rx_callback_ctx, l2_hdr);
- @@ -8,5 +8,5 @@
- - return NULL;
- + return l2;
-
- + #ifndef CONFIG_NO_LINUX_PACKET_SOCKET_WAR
- /*
- - * The Linux packet socket behavior has changed over the years and there
- diff --git a/package/network/services/hostapd/patches/150-nl80211-Report-disassociated-STA-lost-peer-for-the-c.patch b/package/network/services/hostapd/patches/150-nl80211-Report-disassociated-STA-lost-peer-for-the-c.patch
- deleted file mode 100644
- index 66c682f..0000000
- --- a/package/network/services/hostapd/patches/150-nl80211-Report-disassociated-STA-lost-peer-for-the-c.patch
- +++ /dev/null
- @@ -1,67 +0,0 @@
- -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
- -Date: Mon, 11 Jan 2016 19:18:06 +0100
- -Subject: [PATCH] nl80211: Report disassociated STA / lost peer for the correct
- - BSS
- -MIME-Version: 1.0
- -Content-Type: text/plain; charset=UTF-8
- -Content-Transfer-Encoding: 8bit
- -
- -We shouldn't use drv->ctx as it always points to the first BSS. When
- -using FullMAC driver with multi-BSS support it resulted in incorrect
- -treating nl80211 events. I noticed with with brcmfmac and BCM43602.
- -
- -Before my change I was getting "disassociated" on a wrong interface:
- -wlan0-1: STA 78:d6:f0:00:11:22 IEEE 802.11: associated
- -wlan0-1: STA 78:d6:f0:00:11:22 WPA: pairwise key handshake completed (RSN)
- -wlan0: STA 78:d6:f0:00:11:22 IEEE 802.11: disassociated
- -
- -With this patch it works as expected:
- -wlan0-1: STA 78:d6:f0:00:11:22 IEEE 802.11: associated
- -wlan0-1: STA 78:d6:f0:00:11:22 WPA: pairwise key handshake completed (RSN)
- -wlan0-1: STA 78:d6:f0:00:11:22 IEEE 802.11: disassociated
- -
- -This doesn't apply to hostapd dealing with SoftMAC drivers when handling
- -AP SME & MLME is done it hostapd not the firmware.
- -
- -Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
- ----
- - src/drivers/driver_nl80211_event.c | 7 ++++---
- - 1 file changed, 4 insertions(+), 3 deletions(-)
- -
- ---- a/src/drivers/driver_nl80211_event.c
- -+++ b/src/drivers/driver_nl80211_event.c
- -@@ -1154,6 +1154,7 @@ static void nl80211_new_station_event(st
- -
- -
- - static void nl80211_del_station_event(struct wpa_driver_nl80211_data *drv,
- -+ struct i802_bss *bss,
- - struct nlattr **tb)
- - {
- - u8 *addr;
- -@@ -1166,7 +1167,7 @@ static void nl80211_del_station_event(st
- - MAC2STR(addr));
- -
- - if (is_ap_interface(drv->nlmode) && drv->device_ap_sme) {
- -- drv_event_disassoc(drv->ctx, addr);
- -+ drv_event_disassoc(bss->ctx, addr);
- - return;
- - }
- -
- -@@ -1175,7 +1176,7 @@ static void nl80211_del_station_event(st
- -
- - os_memset(&data, 0, sizeof(data));
- - os_memcpy(data.ibss_peer_lost.peer, addr, ETH_ALEN);
- -- wpa_supplicant_event(drv->ctx, EVENT_IBSS_PEER_LOST, &data);
- -+ wpa_supplicant_event(bss->ctx, EVENT_IBSS_PEER_LOST, &data);
- - }
- -
- -
- -@@ -1939,7 +1940,7 @@ static void do_process_drv_event(struct
- - nl80211_new_station_event(drv, bss, tb);
- - break;
- - case NL80211_CMD_DEL_STATION:
- -- nl80211_del_station_event(drv, tb);
- -+ nl80211_del_station_event(drv, bss, tb);
- - break;
- - case NL80211_CMD_SET_REKEY_OFFLOAD:
- - nl80211_rekey_offload_event(drv, tb);
- diff --git a/package/network/services/hostapd/patches/200-multicall.patch b/package/network/services/hostapd/patches/200-multicall.patch
- index de4a3a8..8b260c2 100644
- --- a/package/network/services/hostapd/patches/200-multicall.patch
- +++ b/package/network/services/hostapd/patches/200-multicall.patch
- @@ -1,15 +1,25 @@
- --- a/hostapd/Makefile
- +++ b/hostapd/Makefile
- -@@ -17,6 +17,7 @@ export BINDIR ?= /usr/local/bin/
- - # CFLAGS += -DUSE_KERNEL_HEADERS -I/usr/src/linux/include
- +@@ -28,6 +28,7 @@ CFLAGS += -I$(abspath ../src/utils)
- + export BINDIR ?= /usr/local/bin/
-
- -include .config
- +-include $(if $(MULTICALL), ../wpa_supplicant/.config)
-
- - ifdef CONFIG_TESTING_OPTIONS
- - CFLAGS += -DCONFIG_TESTING_OPTIONS
- -@@ -242,10 +243,14 @@ ifdef CONFIG_IEEE80211AC
- - CFLAGS += -DCONFIG_IEEE80211AC
- + ifndef CONFIG_NO_GITVER
- + # Add VERSION_STR postfix for builds from a git repository
- +@@ -190,7 +191,8 @@ endif
- +
- + ifdef CONFIG_NO_VLAN
- + CFLAGS += -DCONFIG_NO_VLAN
- +-else
- ++endif
- ++ifneq ($(findstring CONFIG_NO_VLAN,$(CFLAGS)), CONFIG_NO_VLAN)
- + OBJS += ../src/ap/vlan_init.o
- + OBJS += ../src/ap/vlan_ifconfig.o
- + OBJS += ../src/ap/vlan.o
- +@@ -315,10 +317,14 @@ CFLAGS += -DCONFIG_MBO
- + OBJS += ../src/ap/mbo_ap.o
- endif
-
- +ifndef MULTICALL
- @@ -26,7 +36,7 @@
- LIBS += $(DRV_AP_LIBS)
-
- ifdef CONFIG_L2_PACKET
- -@@ -941,6 +946,12 @@ install: $(addprefix $(DESTDIR)$(BINDIR)
- +@@ -1051,6 +1057,12 @@ install: $(addprefix $(DESTDIR)$(BINDIR)
-
- BCHECK=../src/drivers/build.hostapd
-
- @@ -39,7 +49,7 @@
- hostapd: $(BCHECK) $(OBJS)
- $(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
- @$(E) " LD " $@
- -@@ -980,6 +991,12 @@ HOBJS += ../src/crypto/aes-internal.o
- +@@ -1092,6 +1104,12 @@ HOBJS += ../src/crypto/aes-internal.o
- HOBJS += ../src/crypto/aes-internal-enc.o
- endif
-
- @@ -54,15 +64,25 @@
- @$(E) " LD " $@
- --- a/wpa_supplicant/Makefile
- +++ b/wpa_supplicant/Makefile
- -@@ -15,6 +15,7 @@ CFLAGS += -I$(abspath ../src)
- +@@ -27,6 +27,7 @@ CFLAGS += -I$(abspath ../src)
- CFLAGS += -I$(abspath ../src/utils)
-
- -include .config
- +-include $(if $(MULTICALL),../hostapd/.config)
-
- - ifdef CONFIG_TESTING_OPTIONS
- - CFLAGS += -DCONFIG_TESTING_OPTIONS
- -@@ -773,6 +774,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS
- + ifndef CONFIG_NO_GITVER
- + # Add VERSION_STR postfix for builds from a git repository
- +@@ -312,7 +313,9 @@ endif
- + ifdef CONFIG_IBSS_RSN
- + NEED_RSN_AUTHENTICATOR=y
- + CFLAGS += -DCONFIG_IBSS_RSN
- ++ifndef MULTICALL
- + CFLAGS += -DCONFIG_NO_VLAN
- ++endif
- + OBJS += ibss_rsn.o
- + endif
- +
- +@@ -803,6 +806,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS
- CFLAGS += -DCONFIG_DYNAMIC_EAP_METHODS
- LIBS += -ldl -rdynamic
- endif
- @@ -73,7 +93,7 @@
- endif
-
- ifdef CONFIG_MACSEC
- -@@ -793,9 +798,11 @@ NEED_EAP_COMMON=y
- +@@ -823,9 +830,11 @@ NEED_EAP_COMMON=y
- NEED_RSN_AUTHENTICATOR=y
- CFLAGS += -DCONFIG_AP
- OBJS += ap.o
- @@ -85,7 +105,7 @@
- OBJS += ../src/ap/hostapd.o
- OBJS += ../src/ap/wpa_auth_glue.o
- OBJS += ../src/ap/utils.o
- -@@ -858,10 +865,18 @@ endif
- +@@ -898,10 +907,18 @@ endif
- ifdef CONFIG_HS20
- OBJS += ../src/ap/hs20.o
- endif
- @@ -104,7 +124,7 @@
- NEED_AES_WRAP=y
- OBJS += ../src/ap/wpa_auth.o
- OBJS += ../src/ap/wpa_auth_ie.o
- -@@ -1603,6 +1618,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv)
- +@@ -1680,6 +1697,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv)
-
- $(OBJS_c) $(OBJS_t) $(OBJS_t2) $(OBJS) $(BCHECK) $(EXTRA_progs): .config
-
- @@ -117,8 +137,8 @@
- wpa_supplicant: $(BCHECK) $(OBJS) $(EXTRA_progs)
- $(Q)$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS)
- @$(E) " LD " $@
- -@@ -1694,6 +1715,12 @@ endif
- - $(Q)sed -e 's|\@BINDIR\@|$(BINDIR)|g' $< >$@
- +@@ -1782,6 +1805,12 @@ endif
- + -e 's|\@DBUS_INTERFACE\@|$(DBUS_INTERFACE)|g' $< >$@
- @$(E) " sed" $<
-
- +dump_cflags:
- @@ -132,7 +152,7 @@
- wpa_cli.exe: wpa_cli
- --- a/src/drivers/driver.h
- +++ b/src/drivers/driver.h
- -@@ -4581,8 +4581,8 @@ union wpa_event_data {
- +@@ -4794,8 +4794,8 @@ union wpa_event_data {
- * Driver wrapper code should call this function whenever an event is received
- * from the driver.
- */
- @@ -141,11 +161,20 @@
- +extern void (*wpa_supplicant_event)(void *ctx, enum wpa_event_type event,
- + union wpa_event_data *data);
-
- + /**
- + * wpa_supplicant_event_global - Report a driver event for wpa_supplicant
- +@@ -4807,7 +4807,7 @@ void wpa_supplicant_event(void *ctx, enu
- + * Same as wpa_supplicant_event(), but we search for the interface in
- + * wpa_global.
- + */
- +-void wpa_supplicant_event_global(void *ctx, enum wpa_event_type event,
- ++extern void (*wpa_supplicant_event_global)(void *ctx, enum wpa_event_type event,
- + union wpa_event_data *data);
-
- /*
- --- a/src/ap/drv_callbacks.c
- +++ b/src/ap/drv_callbacks.c
- -@@ -1075,8 +1075,8 @@ static void hostapd_event_dfs_cac_starte
- +@@ -1157,8 +1157,8 @@ static void hostapd_event_dfs_cac_starte
- #endif /* NEED_AP_MLME */
-
-
- @@ -156,9 +185,18 @@
- {
- struct hostapd_data *hapd = ctx;
- #ifndef CONFIG_NO_STDOUT_DEBUG
- +@@ -1367,7 +1367,7 @@ void wpa_supplicant_event(void *ctx, enu
- + }
- +
- +
- +-void wpa_supplicant_event_global(void *ctx, enum wpa_event_type event,
- ++void hostapd_wpa_event_global(void *ctx, enum wpa_event_type event,
- + union wpa_event_data *data)
- + {
- + struct hapd_interfaces *interfaces = ctx;
- --- a/wpa_supplicant/wpa_priv.c
- +++ b/wpa_supplicant/wpa_priv.c
- -@@ -819,8 +819,8 @@ static void wpa_priv_send_ft_response(st
- +@@ -940,8 +940,8 @@ static void wpa_priv_send_ft_response(st
- }
-
-
- @@ -169,17 +207,27 @@
- {
- struct wpa_priv_interface *iface = ctx;
-
- -@@ -961,6 +961,7 @@ int main(int argc, char *argv[])
- +@@ -1010,7 +1010,7 @@ void wpa_supplicant_event(void *ctx, enu
- + }
- +
- +
- +-void wpa_supplicant_event_global(void *ctx, enum wpa_event_type event,
- ++void supplicant_event_global(void *ctx, enum wpa_event_type event,
- + union wpa_event_data *data)
- + {
- + struct wpa_priv_global *global = ctx;
- +@@ -1122,6 +1122,8 @@ int main(int argc, char *argv[])
- if (os_program_init())
- return -1;
-
- + wpa_supplicant_event = supplicant_event;
- ++ wpa_supplicant_event_global = supplicant_event_global;
- wpa_priv_fd_workaround();
-
- - for (;;) {
- + os_memset(&global, 0, sizeof(global));
- --- a/wpa_supplicant/events.c
- +++ b/wpa_supplicant/events.c
- -@@ -3138,8 +3138,8 @@ static void wpa_supplicant_event_assoc_a
- +@@ -3384,8 +3384,8 @@ static void wpa_supplicant_event_assoc_a
- }
-
-
- @@ -189,88 +237,125 @@
- + union wpa_event_data *data)
- {
- struct wpa_supplicant *wpa_s = ctx;
- + int resched;
- +@@ -4051,7 +4051,7 @@ void wpa_supplicant_event(void *ctx, enu
- + #endif /* CONFIG_AP */
- + break;
- + case EVENT_ACS_CHANNEL_SELECTED:
- +-#ifdef CONFIG_ACS
- ++#if defined(CONFIG_ACS) && defined(CONFIG_AP)
- + if (!wpa_s->ap_iface)
- + break;
- + hostapd_acs_channel_selected(wpa_s->ap_iface->bss[0],
- +@@ -4065,7 +4065,7 @@ void wpa_supplicant_event(void *ctx, enu
- + }
- +
-
- +-void wpa_supplicant_event_global(void *ctx, enum wpa_event_type event,
- ++void supplicant_event_global(void *ctx, enum wpa_event_type event,
- + union wpa_event_data *data)
- + {
- + struct wpa_supplicant *wpa_s;
- --- a/wpa_supplicant/wpa_supplicant.c
- +++ b/wpa_supplicant/wpa_supplicant.c
- -@@ -4300,6 +4300,9 @@ static void wpa_supplicant_deinit_iface(
- - os_free(wpa_s);
- +@@ -4990,7 +4990,6 @@ struct wpa_interface * wpa_supplicant_ma
- + return NULL;
- }
-
- +-
- + /**
- + * wpa_supplicant_match_existing - Match existing interfaces
- + * @global: Pointer to global data from wpa_supplicant_init()
- +@@ -5027,6 +5026,11 @@ static int wpa_supplicant_match_existing
- +
- + #endif /* CONFIG_MATCH_IFACE */
- +
- +extern void supplicant_event(void *ctx, enum wpa_event_type event,
- + union wpa_event_data *data);
- +
- ++extern void supplicant_event_global(void *ctx, enum wpa_event_type event,
- ++ union wpa_event_data *data);
-
- /**
- * wpa_supplicant_add_iface - Add a new network interface
- -@@ -4526,6 +4529,7 @@ struct wpa_global * wpa_supplicant_init(
- +@@ -5282,6 +5286,8 @@ struct wpa_global * wpa_supplicant_init(
- #ifndef CONFIG_NO_WPA_MSG
- wpa_msg_register_ifname_cb(wpa_supplicant_msg_ifname_cb);
- #endif /* CONFIG_NO_WPA_MSG */
- + wpa_supplicant_event = supplicant_event;
- ++ wpa_supplicant_event_global = supplicant_event_global;
-
- if (params->wpa_debug_file_path)
- wpa_debug_open_file(params->wpa_debug_file_path);
- --- a/hostapd/main.c
- +++ b/hostapd/main.c
- -@@ -511,6 +511,9 @@ static int hostapd_get_ctrl_iface_group(
- - return 0;
- +@@ -583,6 +583,11 @@ fail:
- + return -1;
- }
-
- +void hostapd_wpa_event(void *ctx, enum wpa_event_type event,
- + union wpa_event_data *data);
- +
- ++void hostapd_wpa_event_global(void *ctx, enum wpa_event_type event,
- ++ union wpa_event_data *data);
-
- #ifdef CONFIG_WPS
- static int gen_uuid(const char *txt_addr)
- -@@ -562,6 +565,7 @@ int main(int argc, char *argv[])
- - interfaces.global_iface_name = NULL;
- +@@ -660,6 +665,8 @@ int main(int argc, char *argv[])
- interfaces.global_ctrl_sock = -1;
- + dl_list_init(&interfaces.global_ctrl_dst);
-
- + wpa_supplicant_event = hostapd_wpa_event;
- ++ wpa_supplicant_event_global = hostapd_wpa_event_global;
- for (;;) {
- - c = getopt(argc, argv, "b:Bde:f:hKP:Ttu:vg:G:");
- + c = getopt(argc, argv, "b:Bde:f:hi:KP:STtu:vg:G:");
- if (c < 0)
- --- a/src/drivers/drivers.c
- +++ b/src/drivers/drivers.c
- -@@ -10,6 +10,9 @@
- +@@ -10,6 +10,11 @@
- #include "utils/common.h"
- #include "driver.h"
-
- +void (*wpa_supplicant_event)(void *ctx, enum wpa_event_type event,
- + union wpa_event_data *data);
- ++void (*wpa_supplicant_event_global)(void *ctx, enum wpa_event_type event,
- ++ union wpa_event_data *data);
- +
- #ifdef CONFIG_DRIVER_WEXT
- extern struct wpa_driver_ops wpa_driver_wext_ops; /* driver_wext.c */
- #endif /* CONFIG_DRIVER_WEXT */
- --- a/wpa_supplicant/eapol_test.c
- +++ b/wpa_supplicant/eapol_test.c
- -@@ -28,8 +28,12 @@
- +@@ -29,7 +29,12 @@
- #include "ctrl_iface.h"
- #include "pcsc_funcs.h"
- #include "wpas_glue.h"
- +#include "drivers/driver.h"
-
- -
- +void (*wpa_supplicant_event)(void *ctx, enum wpa_event_type event,
- + union wpa_event_data *data);
- -+
- - struct wpa_driver_ops *wpa_drivers[] = { NULL };
- ++void (*wpa_supplicant_event_global)(void *ctx, enum wpa_event_type event,
- ++ union wpa_event_data *data);
-
- + const struct wpa_driver_ops *const wpa_drivers[] = { NULL };
-
- -@@ -1203,6 +1207,8 @@ static void usage(void)
- +@@ -1295,6 +1300,10 @@ static void usage(void)
- "option several times.\n");
- }
-
- +extern void supplicant_event(void *ctx, enum wpa_event_type event,
- + union wpa_event_data *data);
- ++extern void supplicant_event_global(void *ctx, enum wpa_event_type event,
- ++ union wpa_event_data *data);
-
- int main(int argc, char *argv[])
- {
- -@@ -1221,6 +1227,7 @@ int main(int argc, char *argv[])
- +@@ -1315,6 +1324,8 @@ int main(int argc, char *argv[])
- if (os_program_init())
- return -1;
-
- + wpa_supplicant_event = supplicant_event;
- ++ wpa_supplicant_event_global = supplicant_event_global;
- hostapd_logger_register_cb(hostapd_logger_cb);
-
- os_memset(&eapol_test, 0, sizeof(eapol_test));
- diff --git a/package/network/services/hostapd/patches/300-noscan.patch b/package/network/services/hostapd/patches/300-noscan.patch
- index 57d8fe2..21d6316 100644
- --- a/package/network/services/hostapd/patches/300-noscan.patch
- +++ b/package/network/services/hostapd/patches/300-noscan.patch
- @@ -1,6 +1,6 @@
- --- a/hostapd/config_file.c
- +++ b/hostapd/config_file.c
- -@@ -2771,6 +2771,10 @@ static int hostapd_config_fill(struct ho
- +@@ -2862,6 +2862,10 @@ static int hostapd_config_fill(struct ho
- }
- #endif /* CONFIG_IEEE80211W */
- #ifdef CONFIG_IEEE80211N
- @@ -13,7 +13,7 @@
- } else if (os_strcmp(buf, "ht_capab") == 0) {
- --- a/src/ap/ap_config.h
- +++ b/src/ap/ap_config.h
- -@@ -619,6 +619,8 @@ struct hostapd_config {
- +@@ -655,6 +655,8 @@ struct hostapd_config {
-
- int ht_op_mode_fixed;
- u16 ht_capab;
- @@ -21,21 +21,22 @@
- + int no_ht_coex;
- int ieee80211n;
- int secondary_channel;
- - int require_ht;
- + int no_pri_sec_switch;
- --- a/src/ap/hw_features.c
- +++ b/src/ap/hw_features.c
- -@@ -461,7 +461,7 @@ static int ieee80211n_check_40mhz(struct
- - struct wpa_driver_scan_params params;
- +@@ -474,7 +474,8 @@ static int ieee80211n_check_40mhz(struct
- int ret;
-
- -- if (!iface->conf->secondary_channel)
- -+ if (!iface->conf->secondary_channel || iface->conf->noscan)
- - return 0; /* HT40 not used */
- + /* Check that HT40 is used and PRI / SEC switch is allowed */
- +- if (!iface->conf->secondary_channel || iface->conf->no_pri_sec_switch)
- ++ if (!iface->conf->secondary_channel || iface->conf->no_pri_sec_switch ||
- ++ iface->conf->noscan)
- + return 0;
-
- hostapd_set_state(iface, HAPD_IFACE_HT_SCAN);
- --- a/src/ap/ieee802_11_ht.c
- +++ b/src/ap/ieee802_11_ht.c
- -@@ -221,6 +221,9 @@ void hostapd_2040_coex_action(struct hos
- +@@ -244,6 +244,9 @@ void hostapd_2040_coex_action(struct hos
- if (!(iface->conf->ht_capab & HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET))
- return;
-
- @@ -45,7 +46,7 @@
- if (len < IEEE80211_HDRLEN + 2 + sizeof(*bc_ie))
- return;
-
- -@@ -346,6 +349,9 @@ void ht40_intolerant_add(struct hostapd_
- +@@ -368,6 +371,9 @@ void ht40_intolerant_add(struct hostapd_
- if (iface->current_mode->mode != HOSTAPD_MODE_IEEE80211G)
- return;
-
- diff --git a/package/network/services/hostapd/patches/310-rescan_immediately.patch b/package/network/services/hostapd/patches/310-rescan_immediately.patch
- index 7be8c32..3f46cc4 100644
- --- a/package/network/services/hostapd/patches/310-rescan_immediately.patch
- +++ b/package/network/services/hostapd/patches/310-rescan_immediately.patch
- @@ -1,6 +1,6 @@
- --- a/wpa_supplicant/wpa_supplicant.c
- +++ b/wpa_supplicant/wpa_supplicant.c
- -@@ -3249,7 +3249,7 @@ wpa_supplicant_alloc(struct wpa_supplica
- +@@ -3556,7 +3556,7 @@ wpa_supplicant_alloc(struct wpa_supplica
- if (wpa_s == NULL)
- return NULL;
- wpa_s->scan_req = INITIAL_SCAN_REQ;
- @@ -8,4 +8,4 @@
- + wpa_s->scan_interval = 1;
- wpa_s->new_connection = 1;
- wpa_s->parent = parent ? parent : wpa_s;
- - wpa_s->sched_scanning = 0;
- + wpa_s->p2pdev = wpa_s->parent;
- diff --git a/package/network/services/hostapd/patches/320-optional_rfkill.patch b/package/network/services/hostapd/patches/320-optional_rfkill.patch
- index 75b4b07..cf2a2c1 100644
- --- a/package/network/services/hostapd/patches/320-optional_rfkill.patch
- +++ b/package/network/services/hostapd/patches/320-optional_rfkill.patch
- @@ -1,14 +1,14 @@
- --- a/src/drivers/drivers.mak
- +++ b/src/drivers/drivers.mak
- -@@ -34,7 +34,6 @@ NEED_SME=y
- +@@ -36,7 +36,6 @@ NEED_SME=y
- NEED_AP_MLME=y
- NEED_NETLINK=y
- NEED_LINUX_IOCTL=y
- -NEED_RFKILL=y
- + NEED_RADIOTAP=y
-
- ifdef CONFIG_LIBNL32
- - DRV_LIBS += -lnl-3
- -@@ -116,7 +115,6 @@ DRV_WPA_CFLAGS += -DCONFIG_DRIVER_WEXT
- +@@ -123,7 +122,6 @@ DRV_WPA_CFLAGS += -DCONFIG_DRIVER_WEXT
- CONFIG_WIRELESS_EXTENSION=y
- NEED_NETLINK=y
- NEED_LINUX_IOCTL=y
- @@ -16,7 +16,7 @@
- endif
-
- ifdef CONFIG_DRIVER_NDIS
- -@@ -142,7 +140,6 @@ endif
- +@@ -149,7 +147,6 @@ endif
- ifdef CONFIG_WIRELESS_EXTENSION
- DRV_WPA_CFLAGS += -DCONFIG_WIRELESS_EXTENSION
- DRV_WPA_OBJS += ../src/drivers/driver_wext.o
- @@ -24,14 +24,14 @@
- endif
-
- ifdef NEED_NETLINK
- -@@ -155,6 +152,7 @@ endif
- +@@ -162,6 +159,7 @@ endif
-
- ifdef NEED_RFKILL
- DRV_OBJS += ../src/drivers/rfkill.o
- +DRV_WPA_CFLAGS += -DCONFIG_RFKILL
- endif
-
- - ifdef CONFIG_VLAN_NETLINK
- + ifdef NEED_RADIOTAP
- --- a/src/drivers/rfkill.h
- +++ b/src/drivers/rfkill.h
- @@ -18,8 +18,24 @@ struct rfkill_config {
- diff --git a/package/network/services/hostapd/patches/330-nl80211_fix_set_freq.patch b/package/network/services/hostapd/patches/330-nl80211_fix_set_freq.patch
- index dd90877..ca46012 100644
- --- a/package/network/services/hostapd/patches/330-nl80211_fix_set_freq.patch
- +++ b/package/network/services/hostapd/patches/330-nl80211_fix_set_freq.patch
- @@ -1,6 +1,6 @@
- --- a/src/drivers/driver_nl80211.c
- +++ b/src/drivers/driver_nl80211.c
- -@@ -3616,7 +3616,7 @@ static int nl80211_set_channel(struct i8
- +@@ -3795,7 +3795,7 @@ static int nl80211_set_channel(struct i8
- freq->freq, freq->ht_enabled, freq->vht_enabled,
- freq->bandwidth, freq->center_freq1, freq->center_freq2);
-
- diff --git a/package/network/services/hostapd/patches/340-reload_freq_change.patch b/package/network/services/hostapd/patches/340-reload_freq_change.patch
- index 91b6196..086ade9 100644
- --- a/package/network/services/hostapd/patches/340-reload_freq_change.patch
- +++ b/package/network/services/hostapd/patches/340-reload_freq_change.patch
- @@ -1,6 +1,6 @@
- --- a/src/ap/hostapd.c
- +++ b/src/ap/hostapd.c
- -@@ -76,6 +76,16 @@ static void hostapd_reload_bss(struct ho
- +@@ -80,6 +80,16 @@ static void hostapd_reload_bss(struct ho
- #endif /* CONFIG_NO_RADIUS */
-
- ssid = &hapd->conf->ssid;
- @@ -17,7 +17,7 @@
- if (!ssid->wpa_psk_set && ssid->wpa_psk && !ssid->wpa_psk->next &&
- ssid->wpa_passphrase_set && ssid->wpa_passphrase) {
- /*
- -@@ -175,21 +185,12 @@ int hostapd_reload_config(struct hostapd
- +@@ -179,21 +189,12 @@ int hostapd_reload_config(struct hostapd
- oldconf = hapd->iconf;
- iface->conf = newconf;
-
- diff --git a/package/network/services/hostapd/patches/350-nl80211_del_beacon_bss.patch b/package/network/services/hostapd/patches/350-nl80211_del_beacon_bss.patch
- index a14fa03..247f154 100644
- --- a/package/network/services/hostapd/patches/350-nl80211_del_beacon_bss.patch
- +++ b/package/network/services/hostapd/patches/350-nl80211_del_beacon_bss.patch
- @@ -1,6 +1,6 @@
- --- a/src/drivers/driver_nl80211.c
- +++ b/src/drivers/driver_nl80211.c
- -@@ -2254,13 +2254,18 @@ wpa_driver_nl80211_finish_drv_init(struc
- +@@ -2394,13 +2394,18 @@ wpa_driver_nl80211_finish_drv_init(struc
- }
-
-
- @@ -22,7 +22,7 @@
- return send_and_recv_msgs(drv, msg, NULL, NULL);
- }
-
- -@@ -2311,7 +2316,7 @@ static void wpa_driver_nl80211_deinit(st
- +@@ -2452,7 +2457,7 @@ static void wpa_driver_nl80211_deinit(st
- nl80211_remove_monitor_interface(drv);
-
- if (is_ap_interface(drv->nlmode))
- @@ -31,7 +31,7 @@
-
- if (drv->eapol_sock >= 0) {
- eloop_unregister_read_sock(drv->eapol_sock);
- -@@ -4140,8 +4145,7 @@ static void nl80211_teardown_ap(struct i
- +@@ -4385,8 +4390,7 @@ static void nl80211_teardown_ap(struct i
- nl80211_remove_monitor_interface(drv);
- else
- nl80211_mgmt_unsubscribe(bss, "AP teardown");
- @@ -41,7 +41,7 @@
- }
-
-
- -@@ -6066,8 +6070,6 @@ static int wpa_driver_nl80211_if_remove(
- +@@ -6387,8 +6391,6 @@ static int wpa_driver_nl80211_if_remove(
- } else {
- wpa_printf(MSG_DEBUG, "nl80211: First BSS - reassign context");
- nl80211_teardown_ap(bss);
- @@ -50,7 +50,7 @@
- nl80211_destroy_bss(bss);
- if (!bss->added_if)
- i802_set_iface_flags(bss, 0);
- -@@ -6389,8 +6391,7 @@ static int wpa_driver_nl80211_deinit_ap(
- +@@ -6750,8 +6752,7 @@ static int wpa_driver_nl80211_deinit_ap(
- struct wpa_driver_nl80211_data *drv = bss->drv;
- if (!is_ap_interface(drv->nlmode))
- return -1;
- @@ -60,7 +60,7 @@
-
- /*
- * If the P2P GO interface was dynamically added, then it is
- -@@ -6409,8 +6410,7 @@ static int wpa_driver_nl80211_stop_ap(vo
- +@@ -6770,8 +6771,7 @@ static int wpa_driver_nl80211_stop_ap(vo
- struct wpa_driver_nl80211_data *drv = bss->drv;
- if (!is_ap_interface(drv->nlmode))
- return -1;
- diff --git a/package/network/services/hostapd/patches/360-ctrl_iface_reload.patch b/package/network/services/hostapd/patches/360-ctrl_iface_reload.patch
- index 06b005e..1e405cb 100644
- --- a/package/network/services/hostapd/patches/360-ctrl_iface_reload.patch
- +++ b/package/network/services/hostapd/patches/360-ctrl_iface_reload.patch
- @@ -1,22 +1,22 @@
- --- a/hostapd/ctrl_iface.c
- +++ b/hostapd/ctrl_iface.c
- -@@ -45,6 +45,7 @@
- - #include "wps/wps.h"
- +@@ -54,6 +54,7 @@
- + #include "fst/fst_ctrl_iface.h"
- #include "config_file.h"
- #include "ctrl_iface.h"
- +#include "config_file.h"
-
-
- - struct wpa_ctrl_dst {
- -@@ -55,6 +56,7 @@ struct wpa_ctrl_dst {
- - int errors;
- - };
- + #define HOSTAPD_CLI_DUP_VALUE_MAX_LEN 256
- +@@ -72,6 +73,7 @@ static void hostapd_ctrl_iface_send(stru
- + enum wpa_msg_type type,
- + const char *buf, size_t len);
-
- +static char *reload_opts = NULL;
-
- - static void hostapd_ctrl_iface_send(struct hostapd_data *hapd, int level,
- - const char *buf, size_t len);
- -@@ -164,6 +166,61 @@ static int hostapd_ctrl_iface_new_sta(st
- + static int hostapd_ctrl_iface_attach(struct hostapd_data *hapd,
- + struct sockaddr_storage *from,
- +@@ -123,6 +125,61 @@ static int hostapd_ctrl_iface_new_sta(st
- return 0;
- }
-
- @@ -78,7 +78,7 @@
-
- #ifdef CONFIG_IEEE80211W
- #ifdef NEED_AP_MLME
- -@@ -2086,6 +2143,8 @@ static void hostapd_ctrl_iface_receive(i
- +@@ -2483,6 +2540,8 @@ static int hostapd_ctrl_iface_receive_pr
- } else if (os_strncmp(buf, "VENDOR ", 7) == 0) {
- reply_len = hostapd_ctrl_iface_vendor(hapd, buf + 7, reply,
- reply_size);
- @@ -89,7 +89,7 @@
- #ifdef RADIUS_SERVER
- --- a/src/ap/ctrl_iface_ap.c
- +++ b/src/ap/ctrl_iface_ap.c
- -@@ -541,5 +541,11 @@ int hostapd_parse_csa_settings(const cha
- +@@ -593,7 +593,13 @@ int hostapd_parse_csa_settings(const cha
-
- int hostapd_ctrl_iface_stop_ap(struct hostapd_data *hapd)
- {
- @@ -102,3 +102,5 @@
- +
- + return 0;
- }
- +
- +
- diff --git a/package/network/services/hostapd/patches/370-ap_sta_support.patch b/package/network/services/hostapd/patches/370-ap_sta_support.patch
- index ea235e6..7a4ba0b 100644
- --- a/package/network/services/hostapd/patches/370-ap_sta_support.patch
- +++ b/package/network/services/hostapd/patches/370-ap_sta_support.patch
- @@ -1,6 +1,6 @@
- --- a/wpa_supplicant/wpa_supplicant_i.h
- +++ b/wpa_supplicant/wpa_supplicant_i.h
- -@@ -110,6 +110,11 @@ struct wpa_interface {
- +@@ -100,6 +100,11 @@ struct wpa_interface {
- const char *ifname;
-
- /**
- @@ -12,8 +12,8 @@
- * bridge_ifname - Optional bridge interface name
- *
- * If the driver interface (ifname) is included in a Linux bridge
- -@@ -442,6 +447,8 @@ struct wpa_supplicant {
- - #endif /* CONFIG_CTRL_IFACE_DBUS_NEW */
- +@@ -484,6 +489,8 @@ struct wpa_supplicant {
- + #endif /* CONFIG_CTRL_IFACE_BINDER */
- char bridge_ifname[16];
-
- + struct wpa_ctrl *hostapd;
- @@ -23,7 +23,7 @@
-
- --- a/wpa_supplicant/Makefile
- +++ b/wpa_supplicant/Makefile
- -@@ -14,6 +14,10 @@ CFLAGS += $(EXTRA_CFLAGS)
- +@@ -26,6 +26,10 @@ CFLAGS += $(EXTRA_CFLAGS)
- CFLAGS += -I$(abspath ../src)
- CFLAGS += -I$(abspath ../src/utils)
-
- @@ -34,7 +34,7 @@
- -include .config
- -include $(if $(MULTICALL),../hostapd/.config)
-
- -@@ -84,6 +88,8 @@ OBJS_c += ../src/utils/wpa_debug.o
- +@@ -113,6 +117,8 @@ OBJS_c += ../src/utils/wpa_debug.o
- OBJS_c += ../src/utils/common.o
- OBJS += wmm_ac.o
-
- @@ -45,7 +45,7 @@
- CONFIG_OS=win32
- --- a/wpa_supplicant/wpa_supplicant.c
- +++ b/wpa_supplicant/wpa_supplicant.c
- -@@ -107,6 +107,55 @@ const char *wpa_supplicant_full_license5
- +@@ -112,6 +112,55 @@ const char *const wpa_supplicant_full_li
- "\n";
- #endif /* CONFIG_NO_STDOUT_DEBUG */
-
- @@ -73,7 +73,7 @@
- + int ret;
- +
- + if (!bss)
- -+ return;
- ++ return -1;
- +
- + if (bss->ht_param & HT_INFO_HT_PARAM_STA_CHNL_WIDTH) {
- + int sec = bss->ht_param & HT_INFO_HT_PARAM_SECONDARY_CHNL_OFF_MASK;
- @@ -101,7 +101,7 @@
- /* Configure default/group WEP keys for static WEP */
- int wpa_set_wep_keys(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid)
- {
- -@@ -743,8 +792,12 @@ void wpa_supplicant_set_state(struct wpa
- +@@ -812,8 +861,12 @@ void wpa_supplicant_set_state(struct wpa
- wpas_p2p_completed(wpa_s);
-
- sme_sched_obss_scan(wpa_s, 1);
- @@ -114,7 +114,7 @@
- wpa_s->new_connection = 1;
- wpa_drv_set_operstate(wpa_s, 0);
- #ifndef IEEE8021X_EAPOL
- -@@ -4038,6 +4091,20 @@ static int wpa_supplicant_init_iface(str
- +@@ -4646,6 +4699,20 @@ static int wpa_supplicant_init_iface(str
- sizeof(wpa_s->bridge_ifname));
- }
-
- @@ -135,7 +135,7 @@
- /* RSNA Supplicant Key Management - INITIALIZE */
- eapol_sm_notify_portEnabled(wpa_s->eapol, FALSE);
- eapol_sm_notify_portValid(wpa_s->eapol, FALSE);
- -@@ -4280,6 +4347,11 @@ static void wpa_supplicant_deinit_iface(
- +@@ -4937,6 +5004,11 @@ static void wpa_supplicant_deinit_iface(
- if (terminate)
- wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_TERMINATING);
-
- @@ -157,7 +157,7 @@
- #include "drivers/driver.h"
- #include "wpa_supplicant_i.h"
- #include "config.h"
- -@@ -277,6 +278,10 @@ static void calculate_update_time(const
- +@@ -287,6 +288,10 @@ static void calculate_update_time(const
- static void wpa_bss_copy_res(struct wpa_bss *dst, struct wpa_scan_res *src,
- struct os_reltime *fetch_time)
- {
- @@ -168,7 +168,7 @@
- dst->flags = src->flags;
- os_memcpy(dst->bssid, src->bssid, ETH_ALEN);
- dst->freq = src->freq;
- -@@ -289,6 +294,15 @@ static void wpa_bss_copy_res(struct wpa_
- +@@ -299,6 +304,15 @@ static void wpa_bss_copy_res(struct wpa_
- dst->est_throughput = src->est_throughput;
- dst->snr = src->snr;
-
- @@ -186,7 +186,7 @@
-
- --- a/wpa_supplicant/main.c
- +++ b/wpa_supplicant/main.c
- -@@ -33,7 +33,7 @@ static void usage(void)
- +@@ -34,7 +34,7 @@ static void usage(void)
- "vW] [-P<pid file>] "
- "[-g<global ctrl>] \\\n"
- " [-G<group>] \\\n"
- @@ -195,24 +195,24 @@
- "[-p<driver_param>] \\\n"
- " [-b<br_ifname>] [-e<entropy file>]"
- #ifdef CONFIG_DEBUG_FILE
- -@@ -84,6 +84,7 @@ static void usage(void)
- - #endif /* CONFIG_DEBUG_LINUX_TRACING */
- - printf(" -t = include timestamp in debug messages\n"
- +@@ -74,6 +74,7 @@ static void usage(void)
- + " -g = global ctrl_interface\n"
- + " -G = global ctrl_interface group\n"
- " -h = show this help text\n"
- + " -H = connect to a hostapd instance to manage state changes\n"
- - " -L = show license (BSD)\n"
- - " -o = override driver parameter for new interfaces\n"
- - " -O = override ctrl_interface parameter for new interfaces\n"
- -@@ -175,7 +176,7 @@ int main(int argc, char *argv[])
- + " -i = interface name\n"
- + " -I = additional configuration file\n"
- + " -K = include keys (passwords, etc.) in debug output\n"
- +@@ -201,7 +202,7 @@ int main(int argc, char *argv[])
-
- for (;;) {
- c = getopt(argc, argv,
- -- "b:Bc:C:D:de:f:g:G:hi:I:KLm:No:O:p:P:qsTtuvW");
- -+ "b:Bc:C:D:de:f:g:G:hH:i:I:KLm:No:O:p:P:qsTtuvW");
- +- "b:Bc:C:D:de:f:g:G:hi:I:KLMm:No:O:p:P:qsTtuvW");
- ++ "b:Bc:C:D:de:f:g:G:hH:i:I:KLMm:No:O:p:P:qsTtuvW");
- if (c < 0)
- break;
- switch (c) {
- -@@ -222,6 +223,9 @@ int main(int argc, char *argv[])
- +@@ -248,6 +249,9 @@ int main(int argc, char *argv[])
- usage();
- exitcode = 0;
- goto out;
- @@ -224,8 +224,8 @@
- break;
- --- a/wpa_supplicant/bss.h
- +++ b/wpa_supplicant/bss.h
- -@@ -72,6 +72,10 @@ struct wpa_bss {
- - u8 ssid[32];
- +@@ -79,6 +79,10 @@ struct wpa_bss {
- + u8 ssid[SSID_MAX_LEN];
- /** Length of SSID */
- size_t ssid_len;
- + /** HT caapbilities */
- diff --git a/package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch b/package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch
- index 3a41b82..9e815e9 100644
- --- a/package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch
- +++ b/package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch
- @@ -1,18 +1,18 @@
- --- a/hostapd/Makefile
- +++ b/hostapd/Makefile
- -@@ -168,6 +168,9 @@ endif
- +@@ -212,6 +212,9 @@ endif
- ifdef CONFIG_NO_CTRL_IFACE
- CFLAGS += -DCONFIG_NO_CTRL_IFACE
- else
- +ifdef CONFIG_CTRL_IFACE_MIB
- +CFLAGS += -DCONFIG_CTRL_IFACE_MIB
- +endif
- - OBJS += ctrl_iface.o
- - OBJS += ../src/ap/ctrl_iface_ap.o
- - endif
- + ifeq ($(CONFIG_CTRL_IFACE), udp)
- + CFLAGS += -DCONFIG_CTRL_IFACE_UDP
- + else
- --- a/hostapd/ctrl_iface.c
- +++ b/hostapd/ctrl_iface.c
- -@@ -1953,6 +1953,7 @@ static void hostapd_ctrl_iface_receive(i
- +@@ -2342,6 +2342,7 @@ static int hostapd_ctrl_iface_receive_pr
- reply_size);
- } else if (os_strcmp(buf, "STATUS-DRIVER") == 0) {
- reply_len = hostapd_drv_status(hapd, reply, reply_size);
- @@ -20,18 +20,18 @@
- } else if (os_strcmp(buf, "MIB") == 0) {
- reply_len = ieee802_11_get_mib(hapd, reply, reply_size);
- if (reply_len >= 0) {
- -@@ -1994,6 +1995,7 @@ static void hostapd_ctrl_iface_receive(i
- +@@ -2383,6 +2384,7 @@ static int hostapd_ctrl_iface_receive_pr
- } else if (os_strncmp(buf, "STA-NEXT ", 9) == 0) {
- reply_len = hostapd_ctrl_iface_sta_next(hapd, buf + 9, reply,
- reply_size);
- +#endif
- } else if (os_strcmp(buf, "ATTACH") == 0) {
- - if (hostapd_ctrl_iface_attach(hapd, &from, fromlen))
- + if (hostapd_ctrl_iface_attach(hapd, from, fromlen))
- reply_len = -1;
- --- a/wpa_supplicant/Makefile
- +++ b/wpa_supplicant/Makefile
- -@@ -837,6 +837,9 @@ ifdef CONFIG_WNM
- - OBJS += ../src/ap/wnm_ap.o
- +@@ -874,6 +874,9 @@ ifdef CONFIG_MBO
- + OBJS += ../src/ap/mbo_ap.o
- endif
- ifdef CONFIG_CTRL_IFACE
- +ifdef CONFIG_CTRL_IFACE_MIB
- @@ -42,7 +42,7 @@
-
- --- a/wpa_supplicant/ctrl_iface.c
- +++ b/wpa_supplicant/ctrl_iface.c
- -@@ -1795,7 +1795,7 @@ static int wpa_supplicant_ctrl_iface_sta
- +@@ -1895,7 +1895,7 @@ static int wpa_supplicant_ctrl_iface_sta
- pos += ret;
- }
-
- @@ -51,7 +51,7 @@
- if (wpa_s->ap_iface) {
- pos += ap_ctrl_iface_wpa_get_status(wpa_s, pos,
- end - pos,
- -@@ -7896,6 +7896,7 @@ char * wpa_supplicant_ctrl_iface_process
- +@@ -8687,6 +8687,7 @@ char * wpa_supplicant_ctrl_iface_process
- reply_len = -1;
- } else if (os_strncmp(buf, "NOTE ", 5) == 0) {
- wpa_printf(MSG_INFO, "NOTE: %s", buf + 5);
- @@ -59,7 +59,7 @@
- } else if (os_strcmp(buf, "MIB") == 0) {
- reply_len = wpa_sm_get_mib(wpa_s->wpa, reply, reply_size);
- if (reply_len >= 0) {
- -@@ -7903,6 +7904,7 @@ char * wpa_supplicant_ctrl_iface_process
- +@@ -8694,6 +8695,7 @@ char * wpa_supplicant_ctrl_iface_process
- reply + reply_len,
- reply_size - reply_len);
- }
- @@ -67,7 +67,7 @@
- } else if (os_strncmp(buf, "STATUS", 6) == 0) {
- reply_len = wpa_supplicant_ctrl_iface_status(
- wpa_s, buf + 6, reply, reply_size);
- -@@ -8353,6 +8355,7 @@ char * wpa_supplicant_ctrl_iface_process
- +@@ -9164,6 +9166,7 @@ char * wpa_supplicant_ctrl_iface_process
- reply_len = wpa_supplicant_ctrl_iface_bss(
- wpa_s, buf + 4, reply, reply_size);
- #ifdef CONFIG_AP
- @@ -75,7 +75,7 @@
- } else if (os_strcmp(buf, "STA-FIRST") == 0) {
- reply_len = ap_ctrl_iface_sta_first(wpa_s, reply, reply_size);
- } else if (os_strncmp(buf, "STA ", 4) == 0) {
- -@@ -8361,12 +8364,15 @@ char * wpa_supplicant_ctrl_iface_process
- +@@ -9172,12 +9175,15 @@ char * wpa_supplicant_ctrl_iface_process
- } else if (os_strncmp(buf, "STA-NEXT ", 9) == 0) {
- reply_len = ap_ctrl_iface_sta_next(wpa_s, buf + 9, reply,
- reply_size);
- @@ -93,15 +93,15 @@
- reply_len = -1;
- --- a/src/ap/ctrl_iface_ap.c
- +++ b/src/ap/ctrl_iface_ap.c
- -@@ -22,6 +22,7 @@
- - #include "ctrl_iface_ap.h"
- +@@ -24,6 +24,7 @@
- #include "ap_drv_ops.h"
- + #include "mbo_ap.h"
-
- +#ifdef CONFIG_CTRL_IFACE_MIB
-
- static int hostapd_get_sta_tx_rx(struct hostapd_data *hapd,
- struct sta_info *sta,
- -@@ -224,6 +225,7 @@ int hostapd_ctrl_iface_sta_next(struct h
- +@@ -249,6 +250,7 @@ int hostapd_ctrl_iface_sta_next(struct h
- return hostapd_ctrl_iface_sta_mib(hapd, sta->next, buf, buflen);
- }
-
- @@ -111,33 +111,33 @@
- static int p2p_manager_disconnect(struct hostapd_data *hapd, u16 stype,
- --- a/src/ap/ieee802_1x.c
- +++ b/src/ap/ieee802_1x.c
- -@@ -2337,6 +2337,7 @@ static const char * bool_txt(Boolean boo
- - return bool_val ? "TRUE" : "FALSE";
- +@@ -2441,6 +2441,7 @@ static const char * bool_txt(Boolean val
- + return val ? "TRUE" : "FALSE";
- }
-
- +#ifdef CONFIG_CTRL_IFACE_MIB
-
- int ieee802_1x_get_mib(struct hostapd_data *hapd, char *buf, size_t buflen)
- {
- -@@ -2512,6 +2513,7 @@ int ieee802_1x_get_mib_sta(struct hostap
- +@@ -2616,6 +2617,7 @@ int ieee802_1x_get_mib_sta(struct hostap
- return len;
- }
-
- +#endif
-
- - static void ieee802_1x_finished(struct hostapd_data *hapd,
- - struct sta_info *sta, int success,
- + #ifdef CONFIG_HS20
- + static void ieee802_1x_wnm_notif_send(void *eloop_ctx, void *timeout_ctx)
- --- a/src/ap/wpa_auth.c
- +++ b/src/ap/wpa_auth.c
- -@@ -2999,6 +2999,7 @@ static const char * wpa_bool_txt(int boo
- - return bool ? "TRUE" : "FALSE";
- +@@ -3069,6 +3069,7 @@ static const char * wpa_bool_txt(int val
- + return val ? "TRUE" : "FALSE";
- }
-
- +#ifdef CONFIG_CTRL_IFACE_MIB
-
- #define RSN_SUITE "%02x-%02x-%02x-%d"
- #define RSN_SUITE_ARG(s) \
- -@@ -3143,7 +3144,7 @@ int wpa_get_mib_sta(struct wpa_state_mac
- +@@ -3213,7 +3214,7 @@ int wpa_get_mib_sta(struct wpa_state_mac
-
- return len;
- }
- @@ -148,7 +148,7 @@
- {
- --- a/src/rsn_supp/wpa.c
- +++ b/src/rsn_supp/wpa.c
- -@@ -2032,6 +2032,8 @@ static u32 wpa_key_mgmt_suite(struct wpa
- +@@ -2108,6 +2108,8 @@ static u32 wpa_key_mgmt_suite(struct wpa
- }
-
-
- @@ -157,7 +157,7 @@
- #define RSN_SUITE "%02x-%02x-%02x-%d"
- #define RSN_SUITE_ARG(s) \
- ((s) >> 24) & 0xff, ((s) >> 16) & 0xff, ((s) >> 8) & 0xff, (s) & 0xff
- -@@ -2115,6 +2117,7 @@ int wpa_sm_get_mib(struct wpa_sm *sm, ch
- +@@ -2191,6 +2193,7 @@ int wpa_sm_get_mib(struct wpa_sm *sm, ch
-
- return (int) len;
- }
- @@ -167,7 +167,7 @@
-
- --- a/wpa_supplicant/ap.c
- +++ b/wpa_supplicant/ap.c
- -@@ -1015,7 +1015,7 @@ int wpas_ap_wps_nfc_report_handover(stru
- +@@ -1114,7 +1114,7 @@ int wpas_ap_wps_nfc_report_handover(stru
- #endif /* CONFIG_WPS */
-
-
- diff --git a/package/network/services/hostapd/patches/390-wpa_ie_cap_workaround.patch b/package/network/services/hostapd/patches/390-wpa_ie_cap_workaround.patch
- index 1065a7f..c9e7bf4 100644
- --- a/package/network/services/hostapd/patches/390-wpa_ie_cap_workaround.patch
- +++ b/package/network/services/hostapd/patches/390-wpa_ie_cap_workaround.patch
- @@ -1,6 +1,6 @@
- --- a/src/common/wpa_common.c
- +++ b/src/common/wpa_common.c
- -@@ -1228,6 +1228,31 @@ u32 wpa_akm_to_suite(int akm)
- +@@ -1244,6 +1244,31 @@ u32 wpa_akm_to_suite(int akm)
- }
-
-
- @@ -32,7 +32,7 @@
- int wpa_compare_rsn_ie(int ft_initial_assoc,
- const u8 *ie1, size_t ie1len,
- const u8 *ie2, size_t ie2len)
- -@@ -1235,8 +1260,19 @@ int wpa_compare_rsn_ie(int ft_initial_as
- +@@ -1251,8 +1276,19 @@ int wpa_compare_rsn_ie(int ft_initial_as
- if (ie1 == NULL || ie2 == NULL)
- return -1;
-
- diff --git a/package/network/services/hostapd/patches/400-wps_single_auth_enc_type.patch b/package/network/services/hostapd/patches/400-wps_single_auth_enc_type.patch
- index 083af5b..f5872cd 100644
- --- a/package/network/services/hostapd/patches/400-wps_single_auth_enc_type.patch
- +++ b/package/network/services/hostapd/patches/400-wps_single_auth_enc_type.patch
- @@ -1,25 +1,22 @@
- --- a/src/ap/wps_hostapd.c
- +++ b/src/ap/wps_hostapd.c
- -@@ -1052,11 +1052,9 @@ int hostapd_init_wps(struct hostapd_data
- -
- - if (conf->rsn_pairwise & (WPA_CIPHER_CCMP | WPA_CIPHER_GCMP))
- +@@ -352,8 +352,7 @@ static int hapd_wps_reconfig_in_memory(s
- + bss->wpa_pairwise |= WPA_CIPHER_GCMP;
- + else
- + bss->wpa_pairwise |= WPA_CIPHER_CCMP;
- +- }
- +- if (cred->encr_type & WPS_ENCR_TKIP)
- ++ } else if (cred->encr_type & WPS_ENCR_TKIP)
- + bss->wpa_pairwise |= WPA_CIPHER_TKIP;
- + bss->rsn_pairwise = bss->wpa_pairwise;
- + bss->wpa_group = wpa_select_ap_group_cipher(bss->wpa,
- +@@ -1073,8 +1072,7 @@ int hostapd_init_wps(struct hostapd_data
- + if (conf->rsn_pairwise & (WPA_CIPHER_CCMP | WPA_CIPHER_GCMP)) {
- wps->encr_types |= WPS_ENCR_AES;
- -- if (conf->rsn_pairwise & WPA_CIPHER_TKIP)
- -+ else if (conf->rsn_pairwise & WPA_CIPHER_TKIP)
- + wps->encr_types_rsn |= WPS_ENCR_AES;
- +- }
- +- if (conf->rsn_pairwise & WPA_CIPHER_TKIP) {
- ++ } else if (conf->rsn_pairwise & WPA_CIPHER_TKIP) {
- wps->encr_types |= WPS_ENCR_TKIP;
- -- }
- --
- -- if (conf->wpa & WPA_PROTO_WPA) {
- -+ } else if (conf->wpa & WPA_PROTO_WPA) {
- - if (conf->wpa_key_mgmt & WPA_KEY_MGMT_PSK)
- - wps->auth_types |= WPS_AUTH_WPAPSK;
- - if (conf->wpa_key_mgmt & WPA_KEY_MGMT_IEEE8021X)
- -@@ -1064,7 +1062,7 @@ int hostapd_init_wps(struct hostapd_data
- -
- - if (conf->wpa_pairwise & WPA_CIPHER_CCMP)
- - wps->encr_types |= WPS_ENCR_AES;
- -- if (conf->wpa_pairwise & WPA_CIPHER_TKIP)
- -+ else if (conf->wpa_pairwise & WPA_CIPHER_TKIP)
- - wps->encr_types |= WPS_ENCR_TKIP;
- - }
- -
- + wps->encr_types_rsn |= WPS_ENCR_TKIP;
- + }
- diff --git a/package/network/services/hostapd/patches/410-limit_debug_messages.patch b/package/network/services/hostapd/patches/410-limit_debug_messages.patch
- index da88732..a48b696 100644
- --- a/package/network/services/hostapd/patches/410-limit_debug_messages.patch
- +++ b/package/network/services/hostapd/patches/410-limit_debug_messages.patch
- @@ -64,7 +64,7 @@
- #ifdef CONFIG_DEBUG_FILE
- static char *last_path = NULL;
- #endif /* CONFIG_DEBUG_FILE */
- -@@ -602,7 +576,7 @@ void wpa_msg_register_ifname_cb(wpa_msg_
- +@@ -604,7 +578,7 @@ void wpa_msg_register_ifname_cb(wpa_msg_
- }
-
-
- @@ -73,7 +73,7 @@
- {
- va_list ap;
- char *buf;
- -@@ -640,7 +614,7 @@ void wpa_msg(void *ctx, int level, const
- +@@ -642,7 +616,7 @@ void wpa_msg(void *ctx, int level, const
- }
-
-
- @@ -183,7 +183,7 @@
-
- /*
- * wpa_dbg() behaves like wpa_msg(), but it can be removed from build to reduce
- -@@ -181,7 +222,12 @@ void wpa_hexdump_ascii_key(int level, co
- +@@ -182,7 +223,12 @@ void wpa_hexdump_ascii_key(int level, co
- *
- * Note: New line '\n' is added to the end of the text when printing to stdout.
- */
- @@ -197,7 +197,7 @@
-
- /**
- * wpa_msg_ctrl - Conditional printf for ctrl_iface monitors
- -@@ -195,8 +241,13 @@ void wpa_msg(void *ctx, int level, const
- +@@ -196,8 +242,13 @@ void wpa_msg(void *ctx, int level, const
- * attached ctrl_iface monitors. In other words, it can be used for frequent
- * events that do not need to be sent to syslog.
- */
- diff --git a/package/network/services/hostapd/patches/420-indicate-features.patch b/package/network/services/hostapd/patches/420-indicate-features.patch
- index 64c92df..335e71e 100644
- --- a/package/network/services/hostapd/patches/420-indicate-features.patch
- +++ b/package/network/services/hostapd/patches/420-indicate-features.patch
- @@ -8,16 +8,16 @@
- #include "crypto/random.h"
- #include "crypto/tls.h"
- #include "common/version.h"
- -@@ -567,7 +568,7 @@ int main(int argc, char *argv[])
- -
- +@@ -668,7 +669,7 @@ int main(int argc, char *argv[])
- wpa_supplicant_event = hostapd_wpa_event;
- + wpa_supplicant_event_global = hostapd_wpa_event_global;
- for (;;) {
- -- c = getopt(argc, argv, "b:Bde:f:hKP:Ttu:vg:G:");
- -+ c = getopt(argc, argv, "b:Bde:f:hKP:Ttu:g:G:v::");
- +- c = getopt(argc, argv, "b:Bde:f:hi:KP:STtu:vg:G:");
- ++ c = getopt(argc, argv, "b:Bde:f:hi:KP:STtu:g:G:v::");
- if (c < 0)
- break;
- switch (c) {
- -@@ -604,6 +605,8 @@ int main(int argc, char *argv[])
- +@@ -705,6 +706,8 @@ int main(int argc, char *argv[])
- break;
- #endif /* CONFIG_DEBUG_LINUX_TRACING */
- case 'v':
- @@ -33,19 +33,19 @@
-
- #include "common.h"
- +#include "build_features.h"
- + #include "fst/fst.h"
- #include "wpa_supplicant_i.h"
- #include "driver_i.h"
- - #include "p2p_supplicant.h"
- -@@ -176,7 +177,7 @@ int main(int argc, char *argv[])
- +@@ -202,7 +203,7 @@ int main(int argc, char *argv[])
-
- for (;;) {
- c = getopt(argc, argv,
- -- "b:Bc:C:D:de:f:g:G:hH:i:I:KLm:No:O:p:P:qsTtuvW");
- -+ "b:Bc:C:D:de:f:g:G:hH:i:I:KLm:No:O:p:P:qsTtuv::W");
- +- "b:Bc:C:D:de:f:g:G:hH:i:I:KLMm:No:O:p:P:qsTtuvW");
- ++ "b:Bc:C:D:de:f:g:G:hH:i:I:KLMm:No:O:p:P:qsTtuv::W");
- if (c < 0)
- break;
- switch (c) {
- -@@ -279,8 +280,12 @@ int main(int argc, char *argv[])
- +@@ -305,8 +306,12 @@ int main(int argc, char *argv[])
- break;
- #endif /* CONFIG_DBUS */
- case 'v':
- diff --git a/package/network/services/hostapd/patches/430-hostapd_cli_ifdef.patch b/package/network/services/hostapd/patches/430-hostapd_cli_ifdef.patch
- index 85d2e16..d07b747 100644
- --- a/package/network/services/hostapd/patches/430-hostapd_cli_ifdef.patch
- +++ b/package/network/services/hostapd/patches/430-hostapd_cli_ifdef.patch
- @@ -1,6 +1,6 @@
- --- a/hostapd/hostapd_cli.c
- +++ b/hostapd/hostapd_cli.c
- -@@ -67,7 +67,6 @@ static const char *commands_help =
- +@@ -69,7 +69,6 @@ static const char *const commands_help =
- #ifdef CONFIG_IEEE80211W
- " sa_query <addr> send SA Query to a station\n"
- #endif /* CONFIG_IEEE80211W */
- @@ -8,7 +8,7 @@
- " wps_pin <uuid> <pin> [timeout] [addr] add WPS Enrollee PIN\n"
- " wps_check_pin <PIN> verify PIN checksum\n"
- " wps_pbc indicate button pushed to initiate PBC\n"
- -@@ -80,7 +79,6 @@ static const char *commands_help =
- +@@ -82,7 +81,6 @@ static const char *const commands_help =
- " wps_ap_pin <cmd> [params..] enable/disable AP PIN\n"
- " wps_config <SSID> <auth> <encr> <key> configure AP\n"
- " wps_get_status show current WPS status\n"
- @@ -16,7 +16,7 @@
- " get_config show current configuration\n"
- " help show this usage help\n"
- " interface [ifname] show interfaces/select interface\n"
- -@@ -353,7 +351,6 @@ static int hostapd_cli_cmd_sa_query(stru
- +@@ -418,7 +416,6 @@ static int hostapd_cli_cmd_sa_query(stru
- #endif /* CONFIG_IEEE80211W */
-
-
- @@ -24,7 +24,7 @@
- static int hostapd_cli_cmd_wps_pin(struct wpa_ctrl *ctrl, int argc,
- char *argv[])
- {
- -@@ -579,7 +576,6 @@ static int hostapd_cli_cmd_wps_config(st
- +@@ -644,7 +641,6 @@ static int hostapd_cli_cmd_wps_config(st
- ssid_hex, argv[1]);
- return wpa_ctrl_command(ctrl, buf);
- }
- @@ -32,7 +32,7 @@
-
-
- static int hostapd_cli_cmd_disassoc_imminent(struct wpa_ctrl *ctrl, int argc,
- -@@ -1027,7 +1023,6 @@ static struct hostapd_cli_cmd hostapd_cl
- +@@ -1236,7 +1232,6 @@ static const struct hostapd_cli_cmd host
- #ifdef CONFIG_IEEE80211W
- { "sa_query", hostapd_cli_cmd_sa_query },
- #endif /* CONFIG_IEEE80211W */
- @@ -40,7 +40,7 @@
- { "wps_pin", hostapd_cli_cmd_wps_pin },
- { "wps_check_pin", hostapd_cli_cmd_wps_check_pin },
- { "wps_pbc", hostapd_cli_cmd_wps_pbc },
- -@@ -1041,7 +1036,6 @@ static struct hostapd_cli_cmd hostapd_cl
- +@@ -1250,7 +1245,6 @@ static const struct hostapd_cli_cmd host
- { "wps_ap_pin", hostapd_cli_cmd_wps_ap_pin },
- { "wps_config", hostapd_cli_cmd_wps_config },
- { "wps_get_status", hostapd_cli_cmd_wps_get_status },
- diff --git a/package/network/services/hostapd/patches/431-wpa_cli_ifdef.patch b/package/network/services/hostapd/patches/431-wpa_cli_ifdef.patch
- index 874ff4b..256f6b5 100644
- --- a/package/network/services/hostapd/patches/431-wpa_cli_ifdef.patch
- +++ b/package/network/services/hostapd/patches/431-wpa_cli_ifdef.patch
- @@ -1,13 +1,12 @@
- --- a/wpa_supplicant/wpa_cli.c
- +++ b/wpa_supplicant/wpa_cli.c
- -@@ -26,6 +26,10 @@
- +@@ -25,6 +25,9 @@
- + #include <cutils/properties.h>
- #endif /* ANDROID */
-
- -
- +#ifndef CONFIG_P2P
- +#define CONFIG_P2P
- +#endif
- -+
- - static const char *wpa_cli_version =
- +
- + static const char *const wpa_cli_version =
- "wpa_cli v" VERSION_STR "\n"
- - "Copyright (c) 2004-2015, Jouni Malinen <j@w1.fi> and contributors";
- diff --git a/package/network/services/hostapd/patches/432-missing-typedef.patch b/package/network/services/hostapd/patches/432-missing-typedef.patch
- new file mode 100644
- index 0000000..7a100f1
- --- /dev/null
- +++ b/package/network/services/hostapd/patches/432-missing-typedef.patch
- @@ -0,0 +1,10 @@
- +--- a/src/drivers/linux_wext.h
- ++++ b/src/drivers/linux_wext.h
- +@@ -26,6 +26,7 @@ typedef int32_t __s32;
- + typedef uint16_t __u16;
- + typedef int16_t __s16;
- + typedef uint8_t __u8;
- ++typedef int8_t __s8;
- + #ifndef __user
- + #define __user
- + #endif /* __user */
- diff --git a/package/network/services/hostapd/patches/440-max_num_sta_probe.patch b/package/network/services/hostapd/patches/440-max_num_sta_probe.patch
- deleted file mode 100644
- index 74aef26..0000000
- --- a/package/network/services/hostapd/patches/440-max_num_sta_probe.patch
- +++ /dev/null
- @@ -1,13 +0,0 @@
- ---- a/src/ap/beacon.c
- -+++ b/src/ap/beacon.c
- -@@ -664,6 +664,10 @@ void handle_probe_req(struct hostapd_dat
- - return;
- - }
- -
- -+ if (!sta && hapd->num_sta >= hapd->conf->max_num_sta)
- -+ wpa_printf(MSG_MSGDUMP, "Probe Request from " MACSTR " ignored,"
- -+ " too many connected stations.", MAC2STR(mgmt->sa));
- -+
- - #ifdef CONFIG_INTERWORKING
- - if (hapd->conf->interworking &&
- - elems.interworking && elems.interworking_len >= 1) {
- diff --git a/package/network/services/hostapd/patches/450-scan_wait.patch b/package/network/services/hostapd/patches/450-scan_wait.patch
- index 87ebd45..78cf306 100644
- --- a/package/network/services/hostapd/patches/450-scan_wait.patch
- +++ b/package/network/services/hostapd/patches/450-scan_wait.patch
- @@ -1,6 +1,6 @@
- --- a/hostapd/main.c
- +++ b/hostapd/main.c
- -@@ -36,6 +36,8 @@ struct hapd_global {
- +@@ -37,6 +37,8 @@ struct hapd_global {
- };
-
- static struct hapd_global global;
- @@ -9,7 +9,7 @@
-
-
- #ifndef CONFIG_NO_HOSTAPD_LOGGER
- -@@ -142,6 +144,14 @@ static void hostapd_logger_cb(void *ctx,
- +@@ -143,6 +145,14 @@ static void hostapd_logger_cb(void *ctx,
- }
- #endif /* CONFIG_NO_HOSTAPD_LOGGER */
-
- @@ -24,7 +24,7 @@
-
- /**
- * hostapd_driver_init - Preparate driver interface
- -@@ -160,6 +170,8 @@ static int hostapd_driver_init(struct ho
- +@@ -161,6 +171,8 @@ static int hostapd_driver_init(struct ho
- return -1;
- }
-
- @@ -33,7 +33,7 @@
- /* Initialize the driver interface */
- if (!(b[0] | b[1] | b[2] | b[3] | b[4] | b[5]))
- b = NULL;
- -@@ -381,8 +393,6 @@ static void hostapd_global_deinit(const
- +@@ -401,8 +413,6 @@ static void hostapd_global_deinit(const
- #endif /* CONFIG_NATIVE_WINDOWS */
-
- eap_server_unregister_methods();
- @@ -42,19 +42,26 @@
- }
-
-
- -@@ -408,11 +418,6 @@ static int hostapd_global_run(struct hap
- +@@ -428,18 +438,6 @@ static int hostapd_global_run(struct hap
- }
- #endif /* EAP_SERVER_TNC */
-
- -- if (daemonize && os_daemonize(pid_file)) {
- -- wpa_printf(MSG_ERROR, "daemon: %s", strerror(errno));
- -- return -1;
- +- if (daemonize) {
- +- if (os_daemonize(pid_file)) {
- +- wpa_printf(MSG_ERROR, "daemon: %s", strerror(errno));
- +- return -1;
- +- }
- +- if (eloop_sock_requeue()) {
- +- wpa_printf(MSG_ERROR, "eloop_sock_requeue: %s",
- +- strerror(errno));
- +- return -1;
- +- }
- - }
- -
- eloop_run();
-
- return 0;
- -@@ -542,8 +547,7 @@ int main(int argc, char *argv[])
- +@@ -638,8 +636,7 @@ int main(int argc, char *argv[])
- struct hapd_interfaces interfaces;
- int ret = 1;
- size_t i, j;
- diff --git a/package/network/services/hostapd/patches/460-wpa_supplicant-add-new-config-params-to-be-used-with.patch b/package/network/services/hostapd/patches/460-wpa_supplicant-add-new-config-params-to-be-used-with.patch
- index 217e701..6a5866e 100644
- --- a/package/network/services/hostapd/patches/460-wpa_supplicant-add-new-config-params-to-be-used-with.patch
- +++ b/package/network/services/hostapd/patches/460-wpa_supplicant-add-new-config-params-to-be-used-with.patch
- @@ -18,15 +18,15 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
-
- #define WPA_SUPPLICANT_DRIVER_VERSION 4
-
- -+#include "drivers/nl80211_copy.h"
- ++#include "ap/sta_info.h"
- #include "common/defs.h"
- + #include "common/ieee802_11_defs.h"
- #include "utils/list.h"
- -
- -@@ -538,6 +539,9 @@ struct wpa_driver_associate_params {
- +@@ -587,6 +588,9 @@ struct wpa_driver_associate_params {
- * responsible for selecting with which BSS to associate. */
- const u8 *bssid;
-
- -+ unsigned char rates[NL80211_MAX_SUPP_RATES];
- ++ unsigned char rates[WLAN_SUPP_RATES_MAX];
- + int mcast_rate;
- +
- /**
- @@ -34,15 +34,15 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
- *
- --- a/wpa_supplicant/config.c
- +++ b/wpa_supplicant/config.c
- -@@ -15,6 +15,7 @@
- - #include "rsn_supp/wpa.h"
- +@@ -16,6 +16,7 @@
- #include "eap_peer/eap.h"
- #include "p2p/p2p.h"
- -+#include "drivers/nl80211_copy.h"
- + #include "fst/fst.h"
- ++#include "ap/sta_info.h"
- #include "config.h"
-
-
- -@@ -1722,6 +1723,97 @@ static char * wpa_config_write_mesh_basi
- +@@ -1816,6 +1817,97 @@ static char * wpa_config_write_mesh_basi
- #endif /* CONFIG_MESH */
-
-
- @@ -88,7 +88,7 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
- + pos = (char *)value;
- + r = strtok_r(pos, ",", &sptr);
- + i = 0;
- -+ while (pos && i < NL80211_MAX_SUPP_RATES) {
- ++ while (pos && i < WLAN_SUPP_RATES_MAX) {
- + rate = 0.0;
- + if (r)
- + rate = strtod(r, &end);
- @@ -113,11 +113,11 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
- + if (ssid->rates[0] <= 0)
- + return NULL;
- +
- -+ value = os_malloc(6 * NL80211_MAX_SUPP_RATES + 1);
- ++ value = os_malloc(6 * WLAN_SUPP_RATES_MAX + 1);
- + if (value == NULL)
- + return NULL;
- + pos = value;
- -+ for (i = 0; i < NL80211_MAX_SUPP_RATES - 1; i++) {
- ++ for (i = 0; i < WLAN_SUPP_RATES_MAX - 1; i++) {
- + res = os_snprintf(pos, 6, "%.1f,", (double)ssid->rates[i] / 2);
- + if (res < 0) {
- + os_free(value);
- @@ -126,13 +126,13 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
- + pos += res;
- + }
- + res = os_snprintf(pos, 6, "%.1f",
- -+ (double)ssid->rates[NL80211_MAX_SUPP_RATES - 1] / 2);
- ++ (double)ssid->rates[WLAN_SUPP_RATES_MAX - 1] / 2);
- + if (res < 0) {
- + os_free(value);
- + return NULL;
- + }
- +
- -+ value[6 * NL80211_MAX_SUPP_RATES] = '\0';
- ++ value[6 * WLAN_SUPP_RATES_MAX] = '\0';
- + return value;
- +}
- +#endif /* NO_CONFIG_WRITE */
- @@ -140,7 +140,7 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
- /* Helper macros for network block parser */
-
- #ifdef OFFSET
- -@@ -1947,6 +2039,9 @@ static const struct parse_data ssid_fiel
- +@@ -2047,6 +2139,9 @@ static const struct parse_data ssid_fiel
- { INT(ap_max_inactivity) },
- { INT(dtim_period) },
- { INT(beacon_int) },
- @@ -152,19 +152,22 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
- #endif /* CONFIG_MACSEC */
- --- a/wpa_supplicant/config_ssid.h
- +++ b/wpa_supplicant/config_ssid.h
- -@@ -12,6 +12,7 @@
- +@@ -10,8 +10,10 @@
- + #define CONFIG_SSID_H
- +
- #include "common/defs.h"
- ++#include "ap/sta_info.h"
- #include "utils/list.h"
- #include "eap_peer/eap_config.h"
- +#include "drivers/nl80211_copy.h"
-
- - #define MAX_SSID_LEN 32
-
- -@@ -675,6 +676,9 @@ struct wpa_ssid {
- + #define DEFAULT_EAP_WORKAROUND ((unsigned int) -1)
- +@@ -711,6 +713,9 @@ struct wpa_ssid {
- */
- void *parent_cred;
-
- -+ unsigned char rates[NL80211_MAX_SUPP_RATES];
- ++ unsigned char rates[WLAN_SUPP_RATES_MAX];
- + double mcast_rate;
- +
- #ifdef CONFIG_MACSEC
- @@ -172,13 +175,13 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
- * macsec_policy - Determines the policy for MACsec secure session
- --- a/wpa_supplicant/wpa_supplicant.c
- +++ b/wpa_supplicant/wpa_supplicant.c
- -@@ -2266,6 +2266,13 @@ static void wpas_start_assoc_cb(struct w
- +@@ -2518,6 +2518,13 @@ static void wpas_start_assoc_cb(struct w
- params.beacon_int = ssid->beacon_int;
- else
- params.beacon_int = wpa_s->conf->beacon_int;
- + params.fixed_freq = ssid->fixed_freq;
- + i = 0;
- -+ while (i < NL80211_MAX_SUPP_RATES) {
- ++ while (i < WLAN_SUPP_RATES_MAX) {
- + params.rates[i] = ssid->rates[i];
- + i++;
- + }
- diff --git a/package/network/services/hostapd/patches/461-driver_nl80211-use-new-parameters-during-ibss-join.patch b/package/network/services/hostapd/patches/461-driver_nl80211-use-new-parameters-during-ibss-join.patch
- index 730cc31..459bdb9 100644
- --- a/package/network/services/hostapd/patches/461-driver_nl80211-use-new-parameters-during-ibss-join.patch
- +++ b/package/network/services/hostapd/patches/461-driver_nl80211-use-new-parameters-during-ibss-join.patch
- @@ -10,7 +10,7 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
-
- --- a/src/drivers/driver_nl80211.c
- +++ b/src/drivers/driver_nl80211.c
- -@@ -4398,7 +4398,7 @@ static int wpa_driver_nl80211_ibss(struc
- +@@ -4644,7 +4644,7 @@ static int wpa_driver_nl80211_ibss(struc
- struct wpa_driver_associate_params *params)
- {
- struct nl_msg *msg;
- @@ -19,7 +19,7 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
- int count = 0;
-
- wpa_printf(MSG_DEBUG, "nl80211: Join IBSS (ifindex=%d)", drv->ifindex);
- -@@ -4425,6 +4425,37 @@ retry:
- +@@ -4671,6 +4671,37 @@ retry:
- nl80211_put_beacon_int(msg, params->beacon_int))
- goto fail;
-
- diff --git a/package/network/services/hostapd/patches/462-wpa_s-support-htmode-param.patch b/package/network/services/hostapd/patches/462-wpa_s-support-htmode-param.patch
- index 30bb2dc..80fe49c 100644
- --- a/package/network/services/hostapd/patches/462-wpa_s-support-htmode-param.patch
- +++ b/package/network/services/hostapd/patches/462-wpa_s-support-htmode-param.patch
- @@ -16,9 +16,9 @@ Signed-off-by: Antonio Quartulli <ordex@autistici.org>
-
- --- a/src/drivers/driver.h
- +++ b/src/drivers/driver.h
- -@@ -541,6 +541,8 @@ struct wpa_driver_associate_params {
- +@@ -590,6 +590,8 @@ struct wpa_driver_associate_params {
-
- - unsigned char rates[NL80211_MAX_SUPP_RATES];
- + unsigned char rates[WLAN_SUPP_RATES_MAX];
- int mcast_rate;
- + int ht_set;
- + unsigned int htmode;
- @@ -27,7 +27,7 @@ Signed-off-by: Antonio Quartulli <ordex@autistici.org>
- * bssid_hint - BSSID of a proposed AP
- --- a/src/drivers/driver_nl80211.c
- +++ b/src/drivers/driver_nl80211.c
- -@@ -4456,6 +4456,22 @@ retry:
- +@@ -4702,6 +4702,22 @@ retry:
- nla_put_u32(msg, NL80211_ATTR_MCAST_RATE, params->mcast_rate);
- }
-
- @@ -52,7 +52,7 @@ Signed-off-by: Antonio Quartulli <ordex@autistici.org>
- goto fail;
- --- a/wpa_supplicant/config.c
- +++ b/wpa_supplicant/config.c
- -@@ -1754,6 +1754,71 @@ static char * wpa_config_write_mcast_rat
- +@@ -1848,6 +1848,71 @@ static char * wpa_config_write_mcast_rat
- }
- #endif /* NO_CONFIG_WRITE */
-
- @@ -124,7 +124,7 @@ Signed-off-by: Antonio Quartulli <ordex@autistici.org>
- static int wpa_config_parse_rates(const struct parse_data *data,
- struct wpa_ssid *ssid, int line,
- const char *value)
- -@@ -2042,6 +2107,7 @@ static const struct parse_data ssid_fiel
- +@@ -2142,6 +2207,7 @@ static const struct parse_data ssid_fiel
- { INT_RANGE(fixed_freq, 0, 1) },
- { FUNC(rates) },
- { FUNC(mcast_rate) },
- @@ -134,9 +134,9 @@ Signed-off-by: Antonio Quartulli <ordex@autistici.org>
- #endif /* CONFIG_MACSEC */
- --- a/wpa_supplicant/config_ssid.h
- +++ b/wpa_supplicant/config_ssid.h
- -@@ -678,6 +678,8 @@ struct wpa_ssid {
- +@@ -715,6 +715,8 @@ struct wpa_ssid {
-
- - unsigned char rates[NL80211_MAX_SUPP_RATES];
- + unsigned char rates[WLAN_SUPP_RATES_MAX];
- double mcast_rate;
- + int ht_set;
- + unsigned int htmode;
- @@ -145,7 +145,7 @@ Signed-off-by: Antonio Quartulli <ordex@autistici.org>
- /**
- --- a/wpa_supplicant/wpa_supplicant.c
- +++ b/wpa_supplicant/wpa_supplicant.c
- -@@ -2273,6 +2273,8 @@ static void wpas_start_assoc_cb(struct w
- +@@ -2525,6 +2525,8 @@ static void wpas_start_assoc_cb(struct w
- i++;
- }
- params.mcast_rate = ssid->mcast_rate;
- diff --git a/package/network/services/hostapd/patches/470-survey_data_fallback.patch b/package/network/services/hostapd/patches/470-survey_data_fallback.patch
- new file mode 100644
- index 0000000..4e40a87
- --- /dev/null
- +++ b/package/network/services/hostapd/patches/470-survey_data_fallback.patch
- @@ -0,0 +1,45 @@
- +--- a/src/ap/acs.c
- ++++ b/src/ap/acs.c
- +@@ -292,18 +292,12 @@ static void acs_fail(struct hostapd_ifac
- + static long double
- + acs_survey_interference_factor(struct freq_survey *survey, s8 min_nf)
- + {
- +- long double factor, busy, total;
- ++ long double factor, busy = 0, total;
- +
- + if (survey->filled & SURVEY_HAS_CHAN_TIME_BUSY)
- + busy = survey->channel_time_busy;
- + else if (survey->filled & SURVEY_HAS_CHAN_TIME_RX)
- + busy = survey->channel_time_rx;
- +- else {
- +- /* This shouldn't really happen as survey data is checked in
- +- * acs_sanity_check() */
- +- wpa_printf(MSG_ERROR, "ACS: Survey data missing");
- +- return 0;
- +- }
- +
- + total = survey->channel_time;
- +
- +@@ -395,20 +389,19 @@ static int acs_usable_vht80_chan(struct
- + static int acs_survey_is_sufficient(struct freq_survey *survey)
- + {
- + if (!(survey->filled & SURVEY_HAS_NF)) {
- ++ survey->nf = -95;
- + wpa_printf(MSG_INFO, "ACS: Survey is missing noise floor");
- +- return 0;
- + }
- +
- + if (!(survey->filled & SURVEY_HAS_CHAN_TIME)) {
- ++ survey->channel_time = 0;
- + wpa_printf(MSG_INFO, "ACS: Survey is missing channel time");
- +- return 0;
- + }
- +
- + if (!(survey->filled & SURVEY_HAS_CHAN_TIME_BUSY) &&
- + !(survey->filled & SURVEY_HAS_CHAN_TIME_RX)) {
- + wpa_printf(MSG_INFO,
- + "ACS: Survey is missing RX and busy time (at least one is required)");
- +- return 0;
- + }
- +
- + return 1;
- diff --git a/package/network/services/hostapd/patches/470-wait-for-nullfunc-longer.patch b/package/network/services/hostapd/patches/470-wait-for-nullfunc-longer.patch
- deleted file mode 100644
- index e6bbddd..0000000
- --- a/package/network/services/hostapd/patches/470-wait-for-nullfunc-longer.patch
- +++ /dev/null
- @@ -1,11 +0,0 @@
- ---- a/src/ap/sta_info.h
- -+++ b/src/ap/sta_info.h
- -@@ -179,7 +179,7 @@ struct sta_info {
- - * AP_DISASSOC_DELAY seconds. Similarly, the station will be deauthenticated
- - * after AP_DEAUTH_DELAY seconds has passed after disassociation. */
- - #define AP_MAX_INACTIVITY (5 * 60)
- --#define AP_DISASSOC_DELAY (1)
- -+#define AP_DISASSOC_DELAY (3)
- - #define AP_DEAUTH_DELAY (1)
- - /* Number of seconds to keep STA entry with Authenticated flag after it has
- - * been disassociated. */
- diff --git a/package/network/services/hostapd/patches/600-ubus_support.patch b/package/network/services/hostapd/patches/600-ubus_support.patch
- index df2eac8..feacdf2 100644
- --- a/package/network/services/hostapd/patches/600-ubus_support.patch
- +++ b/package/network/services/hostapd/patches/600-ubus_support.patch
- @@ -1,6 +1,6 @@
- --- a/hostapd/Makefile
- +++ b/hostapd/Makefile
- -@@ -121,6 +121,11 @@ OBJS += ../src/common/hw_features_common
- +@@ -157,6 +157,11 @@ OBJS += ../src/common/hw_features_common
-
- OBJS += ../src/eapol_auth/eapol_auth_sm.o
-
- @@ -22,7 +22,7 @@
-
- struct wpa_ctrl_dst;
- struct radius_server_data;
- -@@ -103,6 +104,7 @@ struct hostapd_data {
- +@@ -118,6 +119,7 @@ struct hostapd_data {
- struct hostapd_iface *iface;
- struct hostapd_config *iconf;
- struct hostapd_bss_config *conf;
- @@ -30,7 +30,7 @@
- int interface_added; /* virtual interface added for this BSS */
- unsigned int started:1;
- unsigned int disabled:1;
- -@@ -286,6 +288,8 @@ struct hostapd_iface {
- +@@ -323,6 +325,8 @@ struct hostapd_iface {
- struct hostapd_config *conf;
- char phy[16]; /* Name of the PHY (radio) */
-
- @@ -41,10 +41,10 @@
- HAPD_IFACE_DISABLED,
- --- /dev/null
- +++ b/src/ap/ubus.c
- -@@ -0,0 +1,511 @@
- +@@ -0,0 +1,536 @@
- +/*
- + * hostapd / ubus support
- -+ * Copyright (c) 2013, Felix Fietkau <nbd@openwrt.org>
- ++ * Copyright (c) 2013, Felix Fietkau <nbd@nbd.name>
- + *
- + * This software may be distributed under the terms of the BSD license.
- + * See README for more details.
- @@ -58,6 +58,8 @@
- +#include "wps_hostapd.h"
- +#include "sta_info.h"
- +#include "ubus.h"
- ++#include "ap_drv_ops.h"
- ++#include "beacon.h"
- +
- +static struct ubus_context *ctx;
- +static struct blob_buf b;
- @@ -417,6 +419,10 @@
- +{
- + struct blob_attr *tb[__VENDOR_ELEMENTS_MAX];
- + struct hostapd_data *hapd = get_hapd_from_object(obj);
- ++ struct hostapd_bss_config *bss = hapd->conf;
- ++ struct wpabuf *elems;
- ++ const char *pos;
- ++ size_t len;
- +
- + blobmsg_parse(ve_policy, __VENDOR_ELEMENTS_MAX, tb,
- + blob_data(msg), blob_len(msg));
- @@ -424,10 +430,29 @@
- + if (!tb[VENDOR_ELEMENTS])
- + return UBUS_STATUS_INVALID_ARGUMENT;
- +
- -+ const char *vendor_elements = blobmsg_data(tb[VENDOR_ELEMENTS]);
- -+ if (hostapd_set_iface(hapd->iconf, hapd->conf, "vendor_elements",
- -+ vendor_elements) != 0)
- -+ return UBUS_STATUS_NOT_SUPPORTED;
- ++ pos = blobmsg_data(tb[VENDOR_ELEMENTS]);
- ++ len = os_strlen(pos);
- ++ if (len & 0x01)
- ++ return UBUS_STATUS_INVALID_ARGUMENT;
- ++
- ++ len /= 2;
- ++ if (len == 0) {
- ++ wpabuf_free(bss->vendor_elements);
- ++ bss->vendor_elements = NULL;
- ++ return 0;
- ++ }
- ++
- ++ elems = wpabuf_alloc(len);
- ++ if (elems == NULL)
- ++ return 1;
- ++
- ++ if (hexstr2bin(pos, wpabuf_put(elems, len), len)) {
- ++ wpabuf_free(elems);
- ++ return UBUS_STATUS_INVALID_ARGUMENT;
- ++ }
- ++
- ++ wpabuf_free(bss->vendor_elements);
- ++ bss->vendor_elements = elems;
- +
- + /* update beacons if vendor elements were set successfully */
- + if (ieee802_11_update_beacons(hapd->iface) != 0)
- @@ -558,7 +583,7 @@
- @@ -0,0 +1,78 @@
- +/*
- + * hostapd / ubus support
- -+ * Copyright (c) 2013, Felix Fietkau <nbd@openwrt.org>
- ++ * Copyright (c) 2013, Felix Fietkau <nbd@nbd.name>
- + *
- + * This software may be distributed under the terms of the BSD license.
- + * See README for more details.
- @@ -636,7 +661,7 @@
- +#endif
- --- a/src/ap/hostapd.c
- +++ b/src/ap/hostapd.c
- -@@ -277,6 +277,7 @@ static void hostapd_free_hapd_data(struc
- +@@ -284,6 +284,7 @@ static void hostapd_free_hapd_data(struc
- hapd->started = 0;
-
- wpa_printf(MSG_DEBUG, "%s(%s)", __func__, hapd->conf->iface);
- @@ -644,7 +669,7 @@
- iapp_deinit(hapd->iapp);
- hapd->iapp = NULL;
- accounting_deinit(hapd);
- -@@ -1098,6 +1099,8 @@ static int hostapd_setup_bss(struct host
- +@@ -1139,6 +1140,8 @@ static int hostapd_setup_bss(struct host
- if (hapd->driver && hapd->driver->set_operstate)
- hapd->driver->set_operstate(hapd->drv_priv, 1);
-
- @@ -653,7 +678,7 @@
- return 0;
- }
-
- -@@ -1384,6 +1387,7 @@ int hostapd_setup_interface_complete(str
- +@@ -1664,6 +1667,7 @@ static int hostapd_setup_interface_compl
- if (err)
- goto fail;
-
- @@ -661,15 +686,15 @@
- wpa_printf(MSG_DEBUG, "Completing interface initialization");
- if (iface->conf->channel) {
- #ifdef NEED_AP_MLME
- -@@ -1544,6 +1548,7 @@ dfs_offload:
- +@@ -1844,6 +1848,7 @@ dfs_offload:
-
- fail:
- wpa_printf(MSG_ERROR, "Interface initialization failed");
- + hostapd_ubus_free_iface(iface);
- hostapd_set_state(iface, HAPD_IFACE_DISABLED);
- wpa_msg(hapd->msg_ctx, MSG_INFO, AP_EVENT_DISABLED);
- - if (iface->interfaces && iface->interfaces->terminate_on_error)
- -@@ -1873,6 +1878,7 @@ void hostapd_interface_deinit_free(struc
- + #ifdef CONFIG_FST
- +@@ -2277,6 +2282,7 @@ void hostapd_interface_deinit_free(struc
- (unsigned int) iface->conf->num_bss);
- driver = iface->bss[0]->driver;
- drv_priv = iface->bss[0]->drv_priv;
- @@ -679,7 +704,7 @@
- __func__, driver, drv_priv);
- --- a/src/ap/ieee802_11.c
- +++ b/src/ap/ieee802_11.c
- -@@ -881,7 +881,8 @@ int auth_sae_init_committed(struct hosta
- +@@ -980,7 +980,8 @@ int auth_sae_init_committed(struct hosta
-
-
- static void handle_auth(struct hostapd_data *hapd,
- @@ -689,7 +714,7 @@
- {
- u16 auth_alg, auth_transaction, status_code;
- u16 resp = WLAN_STATUS_SUCCESS;
- -@@ -897,6 +898,11 @@ static void handle_auth(struct hostapd_d
- +@@ -996,6 +997,11 @@ static void handle_auth(struct hostapd_d
- char *identity = NULL;
- char *radius_cui = NULL;
- u16 seq_ctrl;
- @@ -699,9 +724,9 @@
- + .frame_info = fi,
- + };
-
- - if (len < IEEE80211_HDRLEN + sizeof(mgmt->u.auth)) {
- - wpa_printf(MSG_INFO, "handle_auth - too short payload (len=%lu)",
- -@@ -983,6 +989,14 @@ static void handle_auth(struct hostapd_d
- + os_memset(&vlan_id, 0, sizeof(vlan_id));
- +
- +@@ -1149,6 +1155,14 @@ static void handle_auth(struct hostapd_d
- resp = WLAN_STATUS_UNSPECIFIED_FAILURE;
- goto fail;
- }
- @@ -716,7 +741,7 @@
- if (res == HOSTAPD_ACL_PENDING) {
- wpa_printf(MSG_DEBUG, "Authentication frame from " MACSTR
- " waiting for an external authentication",
- -@@ -1694,13 +1708,18 @@ static void send_assoc_resp(struct hosta
- +@@ -2033,13 +2047,18 @@ static u16 send_assoc_resp(struct hostap
-
- static void handle_assoc(struct hostapd_data *hapd,
- const struct ieee80211_mgmt *mgmt, size_t len,
- @@ -724,7 +749,7 @@
- + int reassoc, struct hostapd_frame_info *fi)
- {
- u16 capab_info, listen_interval, seq_ctrl, fc;
- - u16 resp = WLAN_STATUS_SUCCESS;
- + u16 resp = WLAN_STATUS_SUCCESS, reply_res;
- const u8 *pos;
- int left, i;
- struct sta_info *sta;
- @@ -736,9 +761,9 @@
-
- if (len < IEEE80211_HDRLEN + (reassoc ? sizeof(mgmt->u.reassoc_req) :
- sizeof(mgmt->u.assoc_req))) {
- -@@ -1820,6 +1839,13 @@ static void handle_assoc(struct hostapd_
- - goto fail;
- +@@ -2159,6 +2178,13 @@ static void handle_assoc(struct hostapd_
- }
- + #endif /* CONFIG_MBO */
-
- + if (hostapd_ubus_handle_event(hapd, &req)) {
- + wpa_printf(MSG_DEBUG, "Station " MACSTR " assoc rejected by ubus handler.\n",
- @@ -747,10 +772,10 @@
- + goto fail;
- + }
- +
- - sta->capability = capab_info;
- - sta->listen_interval = listen_interval;
- -
- -@@ -2236,7 +2262,7 @@ int ieee802_11_mgmt(struct hostapd_data
- + /*
- + * sta->capability is used in check_assoc_ies() for RRM enabled
- + * capability element.
- +@@ -2639,7 +2665,7 @@ int ieee802_11_mgmt(struct hostapd_data
-
-
- if (stype == WLAN_FC_STYPE_PROBE_REQ) {
- @@ -759,7 +784,7 @@
- return 1;
- }
-
- -@@ -2251,17 +2277,17 @@ int ieee802_11_mgmt(struct hostapd_data
- +@@ -2657,17 +2683,17 @@ int ieee802_11_mgmt(struct hostapd_data
- switch (stype) {
- case WLAN_FC_STYPE_AUTH:
- wpa_printf(MSG_DEBUG, "mgmt::auth");
- @@ -782,7 +807,7 @@
- case WLAN_FC_STYPE_DISASSOC:
- --- a/src/ap/beacon.c
- +++ b/src/ap/beacon.c
- -@@ -542,7 +542,7 @@ static enum ssid_match_result ssid_match
- +@@ -675,7 +675,7 @@ sta_track_seen_on(struct hostapd_iface *
-
- void handle_probe_req(struct hostapd_data *hapd,
- const struct ieee80211_mgmt *mgmt, size_t len,
- @@ -791,22 +816,23 @@
- {
- u8 *resp;
- struct ieee802_11_elems elems;
- -@@ -550,8 +550,14 @@ void handle_probe_req(struct hostapd_dat
- - size_t ie_len;
- - struct sta_info *sta = NULL;
- +@@ -684,9 +684,15 @@ void handle_probe_req(struct hostapd_dat
- size_t i, resp_len;
- -+ int ssi_signal = fi->ssi_signal;
- int noack;
- enum ssid_match_result res;
- ++ int ssi_signal = fi->ssi_signal;
- + int ret;
- + u16 csa_offs[2];
- + size_t csa_offs_len;
- + struct hostapd_ubus_request req = {
- + .type = HOSTAPD_UBUS_PROBE_REQ,
- + .mgmt_frame = mgmt,
- + .frame_info = fi,
- + };
-
- - ie = mgmt->u.probe_req.variable;
- - if (len < IEEE80211_HDRLEN + sizeof(mgmt->u.probe_req))
- -@@ -710,6 +716,12 @@ void handle_probe_req(struct hostapd_dat
- + if (len < IEEE80211_HDRLEN)
- + return;
- +@@ -838,6 +844,12 @@ void handle_probe_req(struct hostapd_dat
- }
- #endif /* CONFIG_P2P */
-
- @@ -832,7 +858,7 @@
- int ieee802_11_update_beacons(struct hostapd_iface *iface);
- --- a/src/ap/drv_callbacks.c
- +++ b/src/ap/drv_callbacks.c
- -@@ -49,6 +49,10 @@ int hostapd_notif_assoc(struct hostapd_d
- +@@ -52,6 +52,10 @@ int hostapd_notif_assoc(struct hostapd_d
- u16 reason = WLAN_REASON_UNSPECIFIED;
- u16 status = WLAN_STATUS_SUCCESS;
- const u8 *p2p_dev_addr = NULL;
- @@ -843,9 +869,9 @@
-
- if (addr == NULL) {
- /*
- -@@ -113,6 +117,12 @@ int hostapd_notif_assoc(struct hostapd_d
- +@@ -124,6 +128,12 @@ int hostapd_notif_assoc(struct hostapd_d
- + goto fail;
- }
- - sta->flags &= ~(WLAN_STA_WPS | WLAN_STA_MAYBE_WPS | WLAN_STA_WPS2);
-
- + if (hostapd_ubus_handle_event(hapd, &req)) {
- + wpa_printf(MSG_DEBUG, "Station " MACSTR " assoc rejected by ubus handler.\n",
- diff --git a/package/network/utils/iw/Makefile b/package/network/utils/iw/Makefile
- index ad82081..d17cbca 100644
- --- a/package/network/utils/iw/Makefile
- +++ b/package/network/utils/iw/Makefile
- @@ -12,10 +12,10 @@ PKG_VERSION:=4.3
- PKG_RELEASE:=1
-
- PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
- -PKG_SOURCE_URL:=https://www.kernel.org/pub/software/network/iw
- +PKG_SOURCE_URL:=@KERNEL/software/network/iw
- PKG_MD5SUM:=7adec72e91ebdd9c55429fa34a23a6f5
-
- -PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
- +PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
- PKG_LICENSE:=GPL-2.0
-
- include $(INCLUDE_DIR)/package.mk
- diff --git a/package/network/utils/iw/patches/001-nl80211_h_sync.patch b/package/network/utils/iw/patches/001-nl80211_h_sync.patch
- index 7de2258..e5ea8f7 100644
- --- a/package/network/utils/iw/patches/001-nl80211_h_sync.patch
- +++ b/package/network/utils/iw/patches/001-nl80211_h_sync.patch
- @@ -8,7 +8,17 @@
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- -@@ -328,7 +329,15 @@
- +@@ -321,14 +322,24 @@
- + * @NL80211_CMD_GET_SCAN: get scan results
- + * @NL80211_CMD_TRIGGER_SCAN: trigger a new scan with the given parameters
- + * %NL80211_ATTR_TX_NO_CCK_RATE is used to decide whether to send the
- +- * probe requests at CCK rate or not.
- ++ * probe requests at CCK rate or not. %NL80211_ATTR_MAC can be used to
- ++ * specify a BSSID to scan for; if not included, the wildcard BSSID will
- ++ * be used.
- + * @NL80211_CMD_NEW_SCAN_RESULTS: scan notification (as a reply to
- + * NL80211_CMD_GET_SCAN and on the "scan" multicast group)
- + * @NL80211_CMD_SCAN_ABORTED: scan was aborted, for unspecified reasons,
- * partial scan results may be available
- *
- * @NL80211_CMD_START_SCHED_SCAN: start a scheduled scan at certain
- @@ -25,7 +35,82 @@
- * Like with normal scans, if SSIDs (%NL80211_ATTR_SCAN_SSIDS)
- * are passed, they are used in the probe requests. For
- * broadcast, a broadcast SSID must be passed (ie. an empty
- -@@ -1761,6 +1770,22 @@ enum nl80211_commands {
- +@@ -418,7 +429,11 @@
- + * @NL80211_CMD_ASSOCIATE: association request and notification; like
- + * NL80211_CMD_AUTHENTICATE but for Association and Reassociation
- + * (similar to MLME-ASSOCIATE.request, MLME-REASSOCIATE.request,
- +- * MLME-ASSOCIATE.confirm or MLME-REASSOCIATE.confirm primitives).
- ++ * MLME-ASSOCIATE.confirm or MLME-REASSOCIATE.confirm primitives). The
- ++ * %NL80211_ATTR_PREV_BSSID attribute is used to specify whether the
- ++ * request is for the initial association to an ESS (that attribute not
- ++ * included) or for reassociation within the ESS (that attribute is
- ++ * included).
- + * @NL80211_CMD_DEAUTHENTICATE: deauthentication request and notification; like
- + * NL80211_CMD_AUTHENTICATE but for Deauthentication frames (similar to
- + * MLME-DEAUTHENTICATION.request and MLME-DEAUTHENTICATE.indication
- +@@ -468,6 +483,9 @@
- + * set of BSSID,frequency parameters is used (i.e., either the enforcing
- + * %NL80211_ATTR_MAC,%NL80211_ATTR_WIPHY_FREQ or the less strict
- + * %NL80211_ATTR_MAC_HINT and %NL80211_ATTR_WIPHY_FREQ_HINT).
- ++ * %NL80211_ATTR_PREV_BSSID can be used to request a reassociation within
- ++ * the ESS in case the device is already associated and an association with
- ++ * a different BSS is desired.
- + * Background scan period can optionally be
- + * specified in %NL80211_ATTR_BG_SCAN_PERIOD,
- + * if not specified default background scan configuration
- +@@ -811,6 +829,10 @@
- + * as an event to indicate changes for devices with wiphy-specific regdom
- + * management.
- + *
- ++ * @NL80211_CMD_ABORT_SCAN: Stop an ongoing scan. Returns -ENOENT if a scan is
- ++ * not running. The driver indicates the status of the scan through
- ++ * cfg80211_scan_done().
- ++ *
- + * @NL80211_CMD_MAX: highest used command number
- + * @__NL80211_CMD_AFTER_LAST: internal use
- + */
- +@@ -997,6 +1019,8 @@ enum nl80211_commands {
- +
- + NL80211_CMD_WIPHY_REG_CHANGE,
- +
- ++ NL80211_CMD_ABORT_SCAN,
- ++
- + /* add new commands above here */
- +
- + /* used to define NL80211_CMD_MAX below */
- +@@ -1270,8 +1294,11 @@ enum nl80211_commands {
- + * @NL80211_ATTR_RESP_IE: (Re)association response information elements as
- + * sent by peer, for ROAM and successful CONNECT events.
- + *
- +- * @NL80211_ATTR_PREV_BSSID: previous BSSID, to be used by in ASSOCIATE
- +- * commands to specify using a reassociate frame
- ++ * @NL80211_ATTR_PREV_BSSID: previous BSSID, to be used in ASSOCIATE and CONNECT
- ++ * commands to specify a request to reassociate within an ESS, i.e., to use
- ++ * Reassociate Request frame (with the value of this attribute in the
- ++ * Current AP address field) instead of Association Request frame which is
- ++ * used for the initial association to an ESS.
- + *
- + * @NL80211_ATTR_KEY: key information in a nested attribute with
- + * %NL80211_KEY_* sub-attributes
- +@@ -1712,6 +1739,8 @@ enum nl80211_commands {
- + * underlying device supports these minimal RRM features:
- + * %NL80211_FEATURE_DS_PARAM_SET_IE_IN_PROBES,
- + * %NL80211_FEATURE_QUIET,
- ++ * Or, if global RRM is supported, see:
- ++ * %NL80211_EXT_FEATURE_RRM
- + * If this flag is used, driver must add the Power Capabilities IE to the
- + * association request. In addition, it must also set the RRM capability
- + * flag in the association request's Capability Info field.
- +@@ -1755,12 +1784,44 @@ enum nl80211_commands {
- + * over all channels.
- + *
- + * @NL80211_ATTR_SCHED_SCAN_DELAY: delay before the first cycle of a
- +- * scheduled scan (or a WoWLAN net-detect scan) is started, u32
- +- * in seconds.
- ++ * scheduled scan is started. Or the delay before a WoWLAN
- ++ * net-detect scan is started, counting from the moment the
- ++ * system is suspended. This value is a u32, in seconds.
- +
- * @NL80211_ATTR_REG_INDOOR: flag attribute, if set indicates that the device
- * is operating in an indoor environment.
- *
- @@ -41,6 +126,21 @@
- + * thus it must not specify the number of iterations, only the interval
- + * between scans. The scan plans are executed sequentially.
- + * Each scan plan is a nested attribute of &enum nl80211_sched_scan_plan.
- ++ * @NL80211_ATTR_PBSS: flag attribute. If set it means operate
- ++ * in a PBSS. Specified in %NL80211_CMD_CONNECT to request
- ++ * connecting to a PCP, and in %NL80211_CMD_START_AP to start
- ++ * a PCP instead of AP. Relevant for DMG networks only.
- ++ * @NL80211_ATTR_BSS_SELECT: nested attribute for driver supporting the
- ++ * BSS selection feature. When used with %NL80211_CMD_GET_WIPHY it contains
- ++ * attributes according &enum nl80211_bss_select_attr to indicate what
- ++ * BSS selection behaviours are supported. When used with %NL80211_CMD_CONNECT
- ++ * it contains the behaviour-specific attribute containing the parameters for
- ++ * BSS selection to be done by driver and/or firmware.
- ++ *
- ++ * @NL80211_ATTR_STA_SUPPORT_P2P_PS: whether P2P PS mechanism supported
- ++ * or not. u8, one of the values of &enum nl80211_sta_p2p_ps_status
- ++ *
- ++ * @NL80211_ATTR_PAD: attribute used for padding for 64-bit alignment
- + *
- + * @NL80211_ATTR_WIPHY_ANTENNA_GAIN: Configured antenna gain. Used to reduce
- + * transmit power to stay within regulatory limits. u32, dBi.
- @@ -48,7 +148,7 @@
- * @NUM_NL80211_ATTR: total number of nl80211_attrs available
- * @NL80211_ATTR_MAX: highest attribute number currently defined
- * @__NL80211_ATTR_AFTER_LAST: internal use
- -@@ -2130,6 +2155,13 @@ enum nl80211_attrs {
- +@@ -2130,6 +2191,21 @@ enum nl80211_attrs {
-
- NL80211_ATTR_REG_INDOOR,
-
- @@ -57,30 +157,147 @@
- + NL80211_ATTR_MAX_SCAN_PLAN_ITERATIONS,
- + NL80211_ATTR_SCHED_SCAN_PLANS,
- +
- ++ NL80211_ATTR_PBSS,
- ++
- ++ NL80211_ATTR_BSS_SELECT,
- ++
- ++ NL80211_ATTR_STA_SUPPORT_P2P_PS,
- ++
- ++ NL80211_ATTR_PAD,
- ++
- + NL80211_ATTR_WIPHY_ANTENNA_GAIN,
- +
- /* add attributes here, update the policy in nl80211.c */
-
- __NL80211_ATTR_AFTER_LAST,
- -@@ -3364,6 +3396,9 @@ enum nl80211_bss_scan_width {
- +@@ -2273,6 +2349,20 @@ enum nl80211_sta_flags {
- + NL80211_STA_FLAG_MAX = __NL80211_STA_FLAG_AFTER_LAST - 1
- + };
- +
- ++/**
- ++ * enum nl80211_sta_p2p_ps_status - station support of P2P PS
- ++ *
- ++ * @NL80211_P2P_PS_UNSUPPORTED: station doesn't support P2P PS mechanism
- ++ * @@NL80211_P2P_PS_SUPPORTED: station supports P2P PS mechanism
- ++ * @NUM_NL80211_P2P_PS_STATUS: number of values
- ++ */
- ++enum nl80211_sta_p2p_ps_status {
- ++ NL80211_P2P_PS_UNSUPPORTED = 0,
- ++ NL80211_P2P_PS_SUPPORTED,
- ++
- ++ NUM_NL80211_P2P_PS_STATUS,
- ++};
- ++
- + #define NL80211_STA_FLAG_MAX_OLD_API NL80211_STA_FLAG_TDLS_PEER
- +
- + /**
- +@@ -2430,6 +2520,9 @@ enum nl80211_sta_bss_param {
- + * TID+1 and the special TID 16 (i.e. value 17) is used for non-QoS frames;
- + * each one of those is again nested with &enum nl80211_tid_stats
- + * attributes carrying the actual values.
- ++ * @NL80211_STA_INFO_RX_DURATION: aggregate PPDU duration for all frames
- ++ * received from the station (u64, usec)
- ++ * @NL80211_STA_INFO_PAD: attribute used for padding for 64-bit alignment
- + * @__NL80211_STA_INFO_AFTER_LAST: internal
- + * @NL80211_STA_INFO_MAX: highest possible station info attribute
- + */
- +@@ -2466,6 +2559,8 @@ enum nl80211_sta_info {
- + NL80211_STA_INFO_BEACON_RX,
- + NL80211_STA_INFO_BEACON_SIGNAL_AVG,
- + NL80211_STA_INFO_TID_STATS,
- ++ NL80211_STA_INFO_RX_DURATION,
- ++ NL80211_STA_INFO_PAD,
- +
- + /* keep last */
- + __NL80211_STA_INFO_AFTER_LAST,
- +@@ -2482,6 +2577,7 @@ enum nl80211_sta_info {
- + * transmitted MSDUs (not counting the first attempt; u64)
- + * @NL80211_TID_STATS_TX_MSDU_FAILED: number of failed transmitted
- + * MSDUs (u64)
- ++ * @NL80211_TID_STATS_PAD: attribute used for padding for 64-bit alignment
- + * @NUM_NL80211_TID_STATS: number of attributes here
- + * @NL80211_TID_STATS_MAX: highest numbered attribute here
- + */
- +@@ -2491,6 +2587,7 @@ enum nl80211_tid_stats {
- + NL80211_TID_STATS_TX_MSDU,
- + NL80211_TID_STATS_TX_MSDU_RETRIES,
- + NL80211_TID_STATS_TX_MSDU_FAILED,
- ++ NL80211_TID_STATS_PAD,
- +
- + /* keep last */
- + NUM_NL80211_TID_STATS,
- +@@ -2927,6 +3024,7 @@ enum nl80211_user_reg_hint_type {
- + * transmitting data (on channel or globally)
- + * @NL80211_SURVEY_INFO_TIME_SCAN: time the radio spent for scan
- + * (on this channel or globally)
- ++ * @NL80211_SURVEY_INFO_PAD: attribute used for padding for 64-bit alignment
- + * @NL80211_SURVEY_INFO_MAX: highest survey info attribute number
- + * currently defined
- + * @__NL80211_SURVEY_INFO_AFTER_LAST: internal use
- +@@ -2942,6 +3040,7 @@ enum nl80211_survey_info {
- + NL80211_SURVEY_INFO_TIME_RX,
- + NL80211_SURVEY_INFO_TIME_TX,
- + NL80211_SURVEY_INFO_TIME_SCAN,
- ++ NL80211_SURVEY_INFO_PAD,
- +
- + /* keep last */
- + __NL80211_SURVEY_INFO_AFTER_LAST,
- +@@ -3364,6 +3463,10 @@ enum nl80211_bss_scan_width {
- * (not present if no beacon frame has been received yet)
- * @NL80211_BSS_PRESP_DATA: the data in @NL80211_BSS_INFORMATION_ELEMENTS and
- * @NL80211_BSS_TSF is known to be from a probe response (flag attribute)
- + * @NL80211_BSS_LAST_SEEN_BOOTTIME: CLOCK_BOOTTIME timestamp when this entry
- + * was last updated by a received frame. The value is expected to be
- + * accurate to about 10ms. (u64, nanoseconds)
- ++ * @NL80211_BSS_PAD: attribute used for padding for 64-bit alignment
- * @__NL80211_BSS_AFTER_LAST: internal
- * @NL80211_BSS_MAX: highest BSS attribute
- */
- -@@ -3383,6 +3418,7 @@ enum nl80211_bss {
- +@@ -3383,6 +3486,8 @@ enum nl80211_bss {
- NL80211_BSS_CHAN_WIDTH,
- NL80211_BSS_BEACON_TSF,
- NL80211_BSS_PRESP_DATA,
- + NL80211_BSS_LAST_SEEN_BOOTTIME,
- ++ NL80211_BSS_PAD,
-
- /* keep last */
- __NL80211_BSS_AFTER_LAST,
- -@@ -4589,4 +4625,28 @@ enum nl80211_tdls_peer_capability {
- +@@ -3568,11 +3673,15 @@ enum nl80211_txrate_gi {
- + * @NL80211_BAND_2GHZ: 2.4 GHz ISM band
- + * @NL80211_BAND_5GHZ: around 5 GHz band (4.9 - 5.7 GHz)
- + * @NL80211_BAND_60GHZ: around 60 GHz band (58.32 - 64.80 GHz)
- ++ * @NUM_NL80211_BANDS: number of bands, avoid using this in userspace
- ++ * since newer kernel versions may support more bands
- + */
- + enum nl80211_band {
- + NL80211_BAND_2GHZ,
- + NL80211_BAND_5GHZ,
- + NL80211_BAND_60GHZ,
- ++
- ++ NUM_NL80211_BANDS,
- + };
- +
- + /**
- +@@ -4358,12 +4467,18 @@ enum nl80211_feature_flags {
- + /**
- + * enum nl80211_ext_feature_index - bit index of extended features.
- + * @NL80211_EXT_FEATURE_VHT_IBSS: This driver supports IBSS with VHT datarates.
- ++ * @NL80211_EXT_FEATURE_RRM: This driver supports RRM. When featured, user can
- ++ * can request to use RRM (see %NL80211_ATTR_USE_RRM) with
- ++ * %NL80211_CMD_ASSOCIATE and %NL80211_CMD_CONNECT requests, which will set
- ++ * the ASSOC_REQ_USE_RRM flag in the association request even if
- ++ * NL80211_FEATURE_QUIET is not advertized.
- + *
- + * @NUM_NL80211_EXT_FEATURES: number of extended features.
- + * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
- + */
- + enum nl80211_ext_feature_index {
- + NL80211_EXT_FEATURE_VHT_IBSS,
- ++ NL80211_EXT_FEATURE_RRM,
- +
- + /* add new features before the definition below */
- + NUM_NL80211_EXT_FEATURES,
- +@@ -4589,4 +4704,72 @@ enum nl80211_tdls_peer_capability {
- NL80211_TDLS_PEER_WMM = 1<<2,
- };
-
- @@ -108,4 +325,48 @@
- + __NL80211_SCHED_SCAN_PLAN_AFTER_LAST - 1
- +};
- +
- ++/**
- ++ * struct nl80211_bss_select_rssi_adjust - RSSI adjustment parameters.
- ++ *
- ++ * @band: band of BSS that must match for RSSI value adjustment.
- ++ * @delta: value used to adjust the RSSI value of matching BSS.
- ++ */
- ++struct nl80211_bss_select_rssi_adjust {
- ++ __u8 band;
- ++ __s8 delta;
- ++} __attribute__((packed));
- ++
- ++/**
- ++ * enum nl80211_bss_select_attr - attributes for bss selection.
- ++ *
- ++ * @__NL80211_BSS_SELECT_ATTR_INVALID: reserved.
- ++ * @NL80211_BSS_SELECT_ATTR_RSSI: Flag indicating only RSSI-based BSS selection
- ++ * is requested.
- ++ * @NL80211_BSS_SELECT_ATTR_BAND_PREF: attribute indicating BSS
- ++ * selection should be done such that the specified band is preferred.
- ++ * When there are multiple BSS-es in the preferred band, the driver
- ++ * shall use RSSI-based BSS selection as a second step. The value of
- ++ * this attribute is according to &enum nl80211_band (u32).
- ++ * @NL80211_BSS_SELECT_ATTR_RSSI_ADJUST: When present the RSSI level for
- ++ * BSS-es in the specified band is to be adjusted before doing
- ++ * RSSI-based BSS selection. The attribute value is a packed structure
- ++ * value as specified by &struct nl80211_bss_select_rssi_adjust.
- ++ * @NL80211_BSS_SELECT_ATTR_MAX: highest bss select attribute number.
- ++ * @__NL80211_BSS_SELECT_ATTR_AFTER_LAST: internal use.
- ++ *
- ++ * One and only one of these attributes are found within %NL80211_ATTR_BSS_SELECT
- ++ * for %NL80211_CMD_CONNECT. It specifies the required BSS selection behaviour
- ++ * which the driver shall use.
- ++ */
- ++enum nl80211_bss_select_attr {
- ++ __NL80211_BSS_SELECT_ATTR_INVALID,
- ++ NL80211_BSS_SELECT_ATTR_RSSI,
- ++ NL80211_BSS_SELECT_ATTR_BAND_PREF,
- ++ NL80211_BSS_SELECT_ATTR_RSSI_ADJUST,
- ++
- ++ /* keep last */
- ++ __NL80211_BSS_SELECT_ATTR_AFTER_LAST,
- ++ NL80211_BSS_SELECT_ATTR_MAX = __NL80211_BSS_SELECT_ATTR_AFTER_LAST - 1
- ++};
- ++
- #endif /* __LINUX_NL80211_H */
- diff --git a/package/network/utils/iw/patches/300-display_interface_TX_power.patch b/package/network/utils/iw/patches/300-display_interface_TX_power.patch
- index 574c490..2cdf360 100644
- --- a/package/network/utils/iw/patches/300-display_interface_TX_power.patch
- +++ b/package/network/utils/iw/patches/300-display_interface_TX_power.patch
- @@ -12,11 +12,9 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
- interface.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
- -diff --git a/interface.c b/interface.c
- -index 73ccecd..4f0821d 100644
- --- a/interface.c
- +++ b/interface.c
- -@@ -368,6 +368,13 @@ static int print_iface_handler(struct nl_msg *msg, void *arg)
- +@@ -368,6 +368,13 @@ static int print_iface_handler(struct nl
- printf("\n");
- }
-
- diff --git a/package/network/utils/iw/patches/301-ibss_add_VHT80.patch b/package/network/utils/iw/patches/301-ibss_add_VHT80.patch
- index 709fbb2..0627bcc 100644
- --- a/package/network/utils/iw/patches/301-ibss_add_VHT80.patch
- +++ b/package/network/utils/iw/patches/301-ibss_add_VHT80.patch
- @@ -14,8 +14,6 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
- ibss.c | 49 +++++++++++++++++++++++++++++++++++++++++--------
- 1 file changed, 41 insertions(+), 8 deletions(-)
-
- -diff --git a/ibss.c b/ibss.c
- -index 7a0b707..a99a262 100644
- --- a/ibss.c
- +++ b/ibss.c
- @@ -16,6 +16,39 @@
- @@ -58,7 +56,7 @@ index 7a0b707..a99a262 100644
- static int join_ibss(struct nl80211_state *state,
- struct nl_msg *msg,
- int argc, char **argv,
- -@@ -30,12 +63,8 @@ static int join_ibss(struct nl80211_state *state,
- +@@ -30,12 +63,8 @@ static int join_ibss(struct nl80211_stat
- int bintval;
- int i;
- unsigned long freq;
- @@ -73,7 +71,7 @@ index 7a0b707..a99a262 100644
- { .name = "HT20",
- .width = NL80211_CHAN_WIDTH_20,
- .freq1_diff = 0,
- -@@ -60,6 +89,10 @@ static int join_ibss(struct nl80211_state *state,
- +@@ -60,6 +89,10 @@ static int join_ibss(struct nl80211_stat
- .width = NL80211_CHAN_WIDTH_10,
- .freq1_diff = 0,
- .chantype = -1 },
- @@ -84,7 +82,7 @@ index 7a0b707..a99a262 100644
- };
-
- if (argc < 2)
- -@@ -90,7 +123,7 @@ static int join_ibss(struct nl80211_state *state,
- +@@ -90,7 +123,7 @@ static int join_ibss(struct nl80211_stat
- NLA_PUT_U32(msg, NL80211_ATTR_CHANNEL_WIDTH,
- chanmode_selected->width);
- NLA_PUT_U32(msg, NL80211_ATTR_CENTER_FREQ1,
- diff --git a/package/network/utils/iw/patches/302-ibss_use_MHz_instead_MHZ.patch b/package/network/utils/iw/patches/302-ibss_use_MHz_instead_MHZ.patch
- index fc44427..f96d5ea 100644
- --- a/package/network/utils/iw/patches/302-ibss_use_MHz_instead_MHZ.patch
- +++ b/package/network/utils/iw/patches/302-ibss_use_MHz_instead_MHZ.patch
- @@ -7,11 +7,9 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
- ibss.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
- -diff --git a/ibss.c b/ibss.c
- -index a99a262..23bda70 100644
- --- a/ibss.c
- +++ b/ibss.c
- -@@ -81,15 +81,15 @@ static int join_ibss(struct nl80211_state *state,
- +@@ -81,15 +81,15 @@ static int join_ibss(struct nl80211_stat
- .width = NL80211_CHAN_WIDTH_20_NOHT,
- .freq1_diff = 0,
- .chantype = NL80211_CHAN_NO_HT },
- diff --git a/package/network/utils/iw/patches/303-mesh_add_VHT80.patch b/package/network/utils/iw/patches/303-mesh_add_VHT80.patch
- index fe8dc21..956b050 100644
- --- a/package/network/utils/iw/patches/303-mesh_add_VHT80.patch
- +++ b/package/network/utils/iw/patches/303-mesh_add_VHT80.patch
- @@ -15,8 +15,6 @@ Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
- util.c | 26 ++++++++++++++++++++++++++
- 4 files changed, 43 insertions(+), 41 deletions(-)
-
- -diff --git a/ibss.c b/ibss.c
- -index 23bda70..ac06fc5 100644
- --- a/ibss.c
- +++ b/ibss.c
- @@ -16,39 +16,6 @@
- @@ -59,8 +57,6 @@ index 23bda70..ac06fc5 100644
- static int join_ibss(struct nl80211_state *state,
- struct nl_msg *msg,
- int argc, char **argv,
- -diff --git a/iw.h b/iw.h
- -index cef9da8..8e1a37a 100644
- --- a/iw.h
- +++ b/iw.h
- @@ -59,6 +59,13 @@ struct cmd {
- @@ -77,7 +73,7 @@ index cef9da8..8e1a37a 100644
- #define ARRAY_SIZE(ar) (sizeof(ar)/sizeof(ar[0]))
- #define DIV_ROUND_UP(x, y) (((x) + (y - 1)) / (y))
-
- -@@ -174,6 +181,8 @@ void print_ies(unsigned char *ie, int ielen, bool unknown,
- +@@ -174,6 +181,8 @@ void print_ies(unsigned char *ie, int ie
- void parse_bitrate(struct nlattr *bitrate_attr, char *buf, int buflen);
- void iw_hexdump(const char *prefix, const __u8 *data, size_t len);
-
- @@ -86,11 +82,9 @@ index cef9da8..8e1a37a 100644
- #define SCHED_SCAN_OPTIONS "interval <in_msecs> [delay <in_secs>] " \
- "[freqs <freq>+] [matches [ssid <ssid>]+]] [active [ssid <ssid>]+|passive] [randomise[=<addr>/<mask>]]"
- int parse_sched_scan(struct nl_msg *msg, int *argc, char ***argv);
- -diff --git a/mesh.c b/mesh.c
- -index 0090530..930d58f 100644
- --- a/mesh.c
- +++ b/mesh.c
- -@@ -439,12 +439,8 @@ static int join_mesh(struct nl80211_state *state,
- +@@ -439,12 +439,8 @@ static int join_mesh(struct nl80211_stat
- int bintval, dtim_period, i, n_rates = 0;
- char *end, *value = NULL, *sptr = NULL;
- unsigned long freq = 0;
- @@ -105,7 +99,7 @@ index 0090530..930d58f 100644
- { .name = "HT20",
- .width = NL80211_CHAN_WIDTH_20,
- .freq1_diff = 0,
- -@@ -461,6 +457,10 @@ static int join_mesh(struct nl80211_state *state,
- +@@ -461,6 +457,10 @@ static int join_mesh(struct nl80211_stat
- .width = NL80211_CHAN_WIDTH_20_NOHT,
- .freq1_diff = 0,
- .chantype = NL80211_CHAN_NO_HT },
- @@ -116,7 +110,7 @@ index 0090530..930d58f 100644
- };
-
- if (argc < 1)
- -@@ -497,7 +497,7 @@ static int join_mesh(struct nl80211_state *state,
- +@@ -497,7 +497,7 @@ static int join_mesh(struct nl80211_stat
- NLA_PUT_U32(msg, NL80211_ATTR_CHANNEL_WIDTH,
- chanmode_selected->width);
- NLA_PUT_U32(msg, NL80211_ATTR_CENTER_FREQ1,
- @@ -125,7 +119,7 @@ index 0090530..930d58f 100644
- if (chanmode_selected->chantype != -1)
- NLA_PUT_U32(msg,
- NL80211_ATTR_WIPHY_CHANNEL_TYPE,
- -@@ -599,7 +599,7 @@ static int join_mesh(struct nl80211_state *state,
- +@@ -599,7 +599,7 @@ static int join_mesh(struct nl80211_stat
- nla_put_failure:
- return -ENOBUFS;
- }
- @@ -134,11 +128,9 @@ index 0090530..930d58f 100644
- " [basic-rates <rate in Mbps,rate2,...>]], [mcast-rate <rate in Mbps>]"
- " [beacon-interval <time in TUs>] [dtim-period <value>]"
- " [vendor_sync on|off] [<param>=<value>]*",
- -diff --git a/util.c b/util.c
- -index 4efc4c8..d75ffe0 100644
- --- a/util.c
- +++ b/util.c
- -@@ -728,3 +728,29 @@ void iw_hexdump(const char *prefix, const __u8 *buf, size_t size)
- +@@ -728,3 +728,29 @@ void iw_hexdump(const char *prefix, cons
- }
- printf("\n\n");
- }
- diff --git a/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.c b/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.c
- index d382453..20bb06e 100644
- --- a/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.c
- +++ b/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.c
- @@ -39,6 +39,18 @@ __init void ap9x_pci_setup_wmac_led_pin(unsigned wmac, int pin)
- }
- }
-
- +__init void ap9x_pci_setup_wmac_led_name(unsigned wmac, const char *led_name)
- +{
- + switch (wmac) {
- + case 0:
- + ap9x_wmac0_data.led_name = led_name;
- + break;
- + case 1:
- + ap9x_wmac1_data.led_name = led_name;
- + break;
- + }
- +}
- +
- __init struct ath9k_platform_data *ap9x_pci_get_wmac_data(unsigned wmac)
- {
- switch (wmac) {
- @@ -81,6 +93,20 @@ __init void ap9x_pci_setup_wmac_leds(unsigned wmac, struct gpio_led *leds,
- }
- }
-
- +__init void ap9x_pci_setup_wmac_btns(unsigned wmac,
- + struct gpio_keys_button *btns,
- + unsigned num_btns, unsigned poll_interval)
- +{
- + struct ath9k_platform_data *ap9x_wmac_data;
- +
- + if (!(ap9x_wmac_data = ap9x_pci_get_wmac_data(wmac)))
- + return;
- +
- + ap9x_wmac_data->btns = btns;
- + ap9x_wmac_data->num_btns = num_btns;
- + ap9x_wmac_data->btn_poll_interval = poll_interval;
- +}
- +
- static int ap91_pci_plat_dev_init(struct pci_dev *dev)
- {
- switch (PCI_SLOT(dev->devfn)) {
- diff --git a/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.h b/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.h
- index ad288cb..d7c0185 100644
- --- a/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.h
- +++ b/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.h
- @@ -12,6 +12,7 @@
- #define _ATH79_DEV_AP9X_PCI_H
-
- struct gpio_led;
- +struct gpio_keys_button;
- struct ath9k_platform_data;
-
- #if defined(CONFIG_ATH79_DEV_AP9X_PCI)
- @@ -19,6 +20,9 @@ void ap9x_pci_setup_wmac_led_pin(unsigned wmac, int pin);
- void ap9x_pci_setup_wmac_gpio(unsigned wmac, u32 mask, u32 val);
- void ap9x_pci_setup_wmac_leds(unsigned wmac, struct gpio_led *leds,
- int num_leds);
- +void ap9x_pci_setup_wmac_led_name(unsigned wmac, const char *led_name);
- +void ap9x_pci_setup_wmac_btns(unsigned wmac, struct gpio_keys_button *btns,
- + unsigned num_btns, unsigned poll_interval);
- struct ath9k_platform_data *ap9x_pci_get_wmac_data(unsigned wmac);
-
- void ap91_pci_init(u8 *cal_data, u8 *mac_addr);
- @@ -33,6 +37,12 @@ static inline void ap9x_pci_setup_wmac_gpio(unsigned wmac,
- static inline void ap9x_pci_setup_wmac_leds(unsigned wmac,
- struct gpio_led *leds,
- int num_leds) {}
- +static inline void ap9x_pci_setup_wmac_led_name(unsigned wmac,
- + const char *led_name) {}
- +static inline void ap9x_pci_setup_wmac_btns(unsigned wmac,
- + struct gpio_keys_button *btns,
- + unsigned num_btns,
- + unsigned poll_interval) {}
- static inline struct ath9k_platform_data *ap9x_pci_get_wmac_data(unsigned wmac)
- {
- return NULL;
- diff --git a/target/linux/generic/files/include/linux/ath9k_platform.h b/target/linux/generic/files/include/linux/ath9k_platform.h
- index 30ce216..2c19f3b 100644
- --- a/target/linux/generic/files/include/linux/ath9k_platform.h
- +++ b/target/linux/generic/files/include/linux/ath9k_platform.h
- @@ -31,6 +31,10 @@ struct ath9k_platform_data {
- u32 gpio_mask;
- u32 gpio_val;
-
- + u32 bt_active_pin;
- + u32 bt_priority_pin;
- + u32 wlan_active_pin;
- +
- bool endian_check;
- bool is_clk_25mhz;
- bool tx_gain_buffalo;
- @@ -45,6 +49,11 @@ struct ath9k_platform_data {
-
- int num_leds;
- const struct gpio_led *leds;
- + const char *led_name;
- +
- + unsigned num_btns;
- + const struct gpio_keys_button *btns;
- + unsigned btn_poll_interval;
- };
-
- #endif /* _LINUX_ATH9K_PLATFORM_H */
|
