https://github.com/torvalds/linux
Revision 12464bb8de021a01fa7ec9299c273c247df7f198 authored by Toshiaki Makita on 27 March 2014, 12:46:55 UTC, committed by David S. Miller on 28 March 2014, 20:33:09 UTC
Bridge vlan code (br_vlan_get_tag()) assumes that all frames have vlan_tci if they are tagged, but if vlan tx offload is manually disabled on bridge device and frames are sent from vlan device on the bridge device, the tags are embedded in skb->data and they break this assumption. Extract embedded vlan tags and move them to vlan_tci at ingress. Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp> Acked-by: Vlad Yasevich <vyasevic@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent a39ee44
Tip revision: 12464bb8de021a01fa7ec9299c273c247df7f198 authored by Toshiaki Makita on 27 March 2014, 12:46:55 UTC
bridge: Fix inabillity to retrieve vlan tags when tx offload is disabled
bridge: Fix inabillity to retrieve vlan tags when tx offload is disabled
Tip revision: 12464bb
whiteheat_loader_debug.HEX
:10000000000000000302098D0000003303020E709F
:100010000000004303020B000000004B030205B385
:100020000000010010907FA5E05410FFC4540F445D
:1000300050F50F13E4000110000001101033F5110A
:10004000907FE9E0245EB407004003020300012032
:1000500000000120107C900128F82828730201BCC0
:100060000201BC02010001300000013010910201C8
:100070003D02015302016F02019A907F000001408E
:100080000000014010E511F0907FB57401F0907F01
:10009000B4E04402F0000150000001501002037C63
:1000A000907F92E0FFC4540F907F00F090000160B9
:1000B00000000160107FB57401F0907FB4E044024D
:1000C000F002037C1200017000000170100A8950D8
:1000D00007E4907F00F08006907F00740F0001809D
:1000E0000000018010F0907FB57401F0907FB4E0C3
:1000F0004402F0020300019000000190107C907F08
:10010000EAE0F50F02037C907F007407F00001A085
:10011000000001A010907FB57401F0907FB4E0441E
:1001200002F07FE87E0001B0000001B01003120D64
:10013000D5D206120D0D02037C907FEAE00001C0CB
:10014000000001C010752900F52AA3E0FEE4EE428C
:1001500029907FEEE00001D0000001D010752B0047
:10016000F52CA3E0FEE4EE422B907FE8E00001E0F6
:10017000000001E01064C060030202C9E52C452BB9
:10018000700302037C0001F0000001F010C3E52CB5
:100190009440E52B94005008852B2D852C000200FF
:1001A00000000200102E8006752D00752E40907FF5
:1001B000E9E064A370000210000002101034F53171
:1001C000F532C3E532952EE531952D505C000220C5
:1001D0000000022010E52A2532F582E5313529F5A7
:1001E00083E0FF740000023000000230102532F579
:1001F00082E4347FF583EFF00532E532700002408F
:10020000000002401002053180D0E4F531F532C320
:10021000E532952EE5000250000002501031952D78
:10022000501874002532F582E4347FF583000260B3
:10023000000002601074CDF00532E5327002053125
:1002400080DDAF2AAE000270000002701029AD2ED2
:100250007A7F79007B00120BF4907FB5E500028075
:1002600000000280102EF0E52E252AF52AE52D3516
:1002700029F529C3E500029000000290102C952E6C
:10028000F52CE52B952DF52B907F92E0FF0002A039
:10029000000002A010C4540F752F00F530D3940055
:1002A000E52F9400500002B0000002B0100C907FC7
:1002B000B4E020E1030201E780F4907FB40002C0C3
:1002C000000002C010E020E2030201E780F4907F0A
:1002D000E8E06440600002D0000002D01003020396
:1002E0007CE52C452B700302037CE4907F0002E048
:1002F000000002E010C5F0907F92E0FFC4540F753B
:100300002F00F530D30002F0000002F0109400E559
:100310002F94005009907FC4E030E1098000030071
:100320000000030010F7907FB4E020E3F9907FC550
:10033000E0752D00F500031000000310102E907FD3
:10034000E9E064A3703890206BF0F531F5000320EC
:10035000000003201032C3E532952EE531952D5073
:100360003474C025320003300000033010F582E4FD
:10037000347EF583E0FFE52A2532F582E50003406F
:100380000000034010313529F583EFF00532E532E6
:1003900070020531800003500000035010D0AF2AD6
:1003A000AE29AD2E7A7E79C07BC0120C800003602E
:1003B0000000036010E52E252AF52AE52D3529F5E4
:1003C00029C3E52C95000370000003700D2EF52C59
:1003D000E52B952DF52B0202D4C300000000037D10
:1003E000012200000000037E10907FE9E07003020C
:1003F00004561470030204D22400038E0000038EFE
:1004000010FE700302054624FB70030204501470B2
:100410000300039E0000039E1002044A14700302AE
:10042000043E147003020444240003AE000003AE33
:100430001005600302059A120E7B40030205AB9083
:100440007F0003BE000003BE10EBE024FE60161424
:100450006040240270697411900003CE000003CE46
:10046000107FD4F07400907FD5F00205AB907FEA46
:10047000E00003DE000003DE10FF120B588B268A1B
:10048000278928EA496011AE020003EE000003EE5E
:1004900010EE907FD4F0AF01EF907FD5F00205AB66
:1004A000900003FE000003FE107FB4E04401F00260
:1004B00005AB907FEAE0FF120C00040E0000040E72
:1004C000103F8B268A278928EA496011AE02EE90F8
:1004D0007F00041E0000041E10D4F0AF01EF907FD7
:1004E000D5F00205AB907FB4E000042E0000042E8E
:1004F000104401F00205AB907FB4E04401F0020526
:10050000AB00043E0000043E10120E520205AB1276
:100510000E600205AB120AF70200044E0000044E02
:100520001005AB1208F10205AB120E7D4003020567
:10053000AB00045E0000045E10907FE8E0247F6062
:10054000241460312402705BA200046E0000046E6B
:100550001000E433FF25E0FFA202E4334F907F0058
:10056000F000047E0000047E10E4A3F0907FB574D8
:1005700002F00205ABE4907F0000048E0000048EC0
:1005800010F0A3F0907FB57402F00205AB907FEC01
:10059000E000049E0000049E10F45480FFC4540F39
:1005A000FFE054072F25E024B40004AE000004AEA1
:1005B00010F582E4347FF583E054FD907F00F0E491
:1005C000A30004BE000004BE10F0907FB57402F0DA
:1005D0000205AB907FB4E044010004CE000004CEDD
:1005E00010F00205AB120E7F40030205AB907FE8CE
:1005F000E00004DE000004DE1024FE601D24026022
:10060000030205AB907FEAE0B40004EE000004EEC4
:10061000100105C2000205AB907FB4E04401F00276
:10062000050004FE000004FE10AB907FEAE0703885
:10063000907FECE0F45480FFC400050E0000050E2E
:1006400010540FFFE054072F25E024B4F582E43462
:100650007F00051E0000051E10F583E4F0907FEC7E
:10066000E05480FF131313541F00052E0000052EC5
:1006700010FFE054072F907FD7F0E04420F0806E09
:100680009000053E0000053E107FB4E04401F0807C
:1006900065120E815060907FE800054E0000054E07
:1006A00010E024FE601824027054907FEAE0B40148
:1006B0000400055E0000055E10D2008049907FB402
:1006C000E04401F08040907FEA00056E0000056E76
:1006D00010E07020907FECE0F45480FFC4540FFFD2
:1006E000E000057E0000057E1054072F25E024B4AD
:1006F000F582E4347FF583740100058E0000058ED9
:1007000010F0801A907FB4E04401F08011E4902052
:100710006A00059E0000059E10F01201005007902F
:100720007FB4E04401F0907FB40005AE000005AE58
:1007300004E04402F0000000000005B201220000C5
:10074000000005B310C0E0C083C082C085C084C073
:1007500086758600C00005C3000005C310D0C00028
:10076000C001C002C003C006C007907FA50005D32A
:10077000000005D310E030E206750D0602067F90FA
:100780007FA5E020E10005E3000005E3100CE50D86
:1007900064026006750D0702067FAF0DEF0005F3DA
:1007A000000005F31024FE604814602C24FE6077DE
:1007B00024046003020006030000060310067FAB5A
:1007C00009AA0AA90BAF0C050C8F827583000613CA
:1007D000000006131000120785907FA6F0E50C6557
:1007E00008705E750D000623000006231005805971
:1007F000907FA6E0AB09AA0AA90BAE0C8E000633C7
:100800000000063310827583001207B2750D028056
:1008100040E50824FE0006430000064310B50C071F
:10082000907FA5E04420F0E50814B50C0A000653BB
:100830000000065310907FA5E04440F0E4F50D90D1
:100840007FA6E0AB090006630000066310AA0AA9B0
:100850000BAE0C8E827583001207B2050C00067376
:100860000000067310800A907FA5E04440F0E4F594
:100870000D5391DFD0000683000006831007D006D9
:10088000D003D002D001D000D0D0D086D0000693C3
:10089000000006930A84D085D082D083D0E0320055
:1008A0000000069D10C204D205E4F525C203C20073
:1008B000C202C201120006AD000006AD100E74D2D5
:1008C000E843D820907FAB74FFF0907FA90006BD6D
:1008D000000006BD10F0907FAAF05391EF907F9535
:1008E000E044C0F0900006CD000006CD107F937468
:1008F00030F0120A1975244875239275220006DD1E
:10090000000006DD1000752100E4FFFE7E0590204A
:10091000687401F0A30006ED000006ED10DEFC7E19
:10092000007F05907FAFE04401F0907FAE0006FDB0
:10093000000006FD10E0440DF0D2AF120E68300149
:100940000AE490206900070D0000070D10F0120363
:100950007EC20130041A120E775013120900071DCF
:100960000000071D1000300007907FD6E030E7F34D
:10097000120D8B120E00072D0000072D1079C203F7
:100980007FFF7EFF7DFF7CFF782112081D00073D61
:100990000000073D107B007A0079007800C3120840
:1009A0000C701B752400074D0000074D104875237F
:1009B00092F522F5216325FF902068E52500075D6B
:1009C0000000075D0EF0A37401F0A3F0A3F012087D
:1009D000FF809B000000076B012200000000076CF5
:1009E00010BB010689828A83E0225002E722BBFE07
:1009F0000200077C0000077C09E32289828A83E4E5
:100A0000932200000000078510BB010CE58229F548
:100A100082E5833AF583E0225000079500000795B0
:100A20001006E92582F8E622BBFE06E92582F8E2F7
:100A3000220007A5000007A50DE58229F582E583C0
:100A40003AF583E493220000000007B210F8BB01DE
:100A50000DE58229F582E5833AF583E8F00007C2C7
:100A6000000007C210225006E92582C8F622BBFE0C
:100A700005E92582C80007D2000007D202F2220051
:100A8000000007D410BB0110E58229F582E5833A06
:100A9000F583E0F5F00007E4000007E410A3E0228E
:100AA0005009E92582F886F008E622BBFE0007F42B
:100AB000000007F4100AE92582F8E2F5F008E222C6
:100AC000E5832AF5830008040000080408E993F58B
:100AD000F0A3E993220000000000080C10EB9FF542
:100AE000F0EA9E42F0E99D42F0E89C45F000081CC7
:100AF0000000081C012200000000081D1008080862
:100B0000E62FFFF618E63EFEF618E63DFD00082D3E
:100B10000000082D07F618E63CFCF6220000083419
:100B2000048C348D350000000000083810907F954B
:100B3000E044C0F0E4F536F537C3E53795000848E2
:100B4000000008481035E53695345069EF2537F533
:100B500082E5363EF500085800000858108374FFFF
:100B6000F0F46002C322EF2537F582E5360008680D
:100B700000000868103EF583E4F06002C322EF2510
:100B800037F582E53600087800000878103EF583D6
:100B900074AAF064AA6002C322EF2537F500088822
:100BA000000008881082E5363EF5837455F06455E0
:100BB0006002C322AD000898000008981037E5379E
:100BC0002FF582E5363EF583EDF0FCAC050008A874
:100BD000000008A810ED6C6002C3220537E53770ED
:100BE000020536808C0008B8000008B810E4F5361D
:100BF000F537C3E5379535E536953450270008C8F5
:100C0000000008C810EF2537F582E5363EF583E091
:100C100065376002C30008D8000008D81022EF250D
:100C200037F582E5363EF583E4F00537E50008E860
:100C3000000008E808377002053680CED3000000B7
:100C4000000008F001220000000008F10E907F0073
:100C5000E510F0907FB57401F0D32200000008FF8A
:100C6000012200000000090009907FD6E04480F0D6
:100C7000807400000000097D10438701000000001F
:100C800000000000000000002200098D0000098D16
:100C90000C787FE4F6D8FD75813A0209D400000093
:100CA000000009991002069DE493A3F8E493A34081
:100CB00003F68001F20009A9000009A91008DFF479
:100CC0008029E493A3F85407240CC8C3330009B95E
:100CD000000009B910C4540F4420C8834004F456DE
:100CE000800146F6DF0009C9000009C910E4800B45
:100CF0000102040810204080900E2DE47E0009D9E6
:100D0000000009D910019360BCA3FF543F30E509EE
:100D1000541FFEE4930009E9000009E910A36001F3
:100D20000ECF54C025E060A840B8E493A30009F9B1
:100D3000000009F910FAE493A3F8E493A3C8C5826C
:100D4000C8CAC583CA000A0900000A0910F0A3C86E
:100D5000C582C8CAC583CADFE9DEE780BE000A19BA
:100D600000000A1910E4907F9CF07F0AFE120DD556
:100D7000907F967489000A2900000A2910F0907F5C
:100D80009C74CFF07FF47E01120DD5907F000A395C
:100D900000000A391096E054FEF07F0A7E00120D22
:100DA000D57F057E00000A4900000A4910120DD5C2
:100DB000907F96E04402F0E0547FF07F05000A59EE
:100DC00000000A59107E00120DD5907F96E0444035
:100DD000F07F057E00000A6900000A6910120DD537
:100DE000907F96E054BFF07F327E00120D000A79AA
:100DF00000000A7910D5907F96E04440F07F327E63
:100E000000120DD522000A8900000A8910753301ED
:100E1000E533601B7F01120E187F007E0E000A99D9
:100E200000000A99107D007C01120834E433F53388
:100E300070057F0F12000AA900000AA9100E18E51C
:100E400033601B7F02120E187F007E807D000AB97E
:100E500000000AB910007C80120834E433F53370C6
:100E6000057F0F120E000AC900000AC91018E533E9
:100E7000601B7F03120E187F007E207D40000AD980
:100E800000000AD9107C5B120834E433F533700596
:100E90007F0F120E18000AE900000AE90DE5336021
:100EA00005E4FF120E18E53324FF000000000AF6E7
:100EB0000122000000000AF708907FEAE0F510D355
:100EC0002200000000000AFF0132000000000B00B9
:100ED00010020DA500020DEC00020D7000020DBD08
:100EE00000000B1000000B1010020E0200020AFF9F
:100EF00000020E8300020E8400000B2000000B2075
:100F000010020E8500020E8600020E8700020E8877
:100F100000000B3000000B3010020E8900020E8A18
:100F200000020E8B00020E8C00000B4000000B40F4
:100F300010020E8D00020E8E00020E8F00020E9027
:100F400000000B5000000B5008020E9100020E92A0
:100F50000000000000000B5810E4FE752BFF752CFC
:100F600011752D12AB2BAA2CA9000B6800000B6881
:100F7000102D9000011207856402702DAD060EED54
:100F8000B5000B7800000B781007012290000212C8
:100F900007D485F029F52A6229000B8800000B8808
:100FA00010E529622AE52A622929FDE5293AA905E1
:100FB00075000B9800000B980E2BFFF52C892D80E7
:100FC000C37B007A0079000000000BA6012200001C
:100FD00000000BA706AB07AA06AC050000000BAD8E
:100FE00010E4FDE5116011EAFFAE050DEE2410F5E9
:100FF00082000BBD00000BBD10E4340FF583EFF051
:10100000EBAE050D74102EF582000BCD00000BCD5C
:1010100010E4340FF583EBF0AF050D74102FF5825B
:10102000E4000BDD00000BDD10340FF583ECF0AFB6
:101030000F7A0F7B10120D517F000BED00000BEDAE
:10104000060A7E00120DD50000000BF301220000FD
:1010500000000BF40A8E338F348D358A368B3700BF
:1010600000000BFE10E4FDF538E5116012E533FFDA
:10107000AE050DEE24000C0E00000C0E1013F582D0
:10108000E4340FF583EFF0E534AE050D74000C1E6B
:1010900000000C1E10132EF582E4340FF583E534A6
:1010A000F0AF0F7A0F000C2E00000C2E107B1312E5
:1010B0000D51AF0FAD35AB37AA36120D32000C3ED5
:1010C00000000C3E0122000000000C3F028F2900AE
:1010D00000000C4110E4F52A752BFF752C11752DBD
:1010E00032AB2BAA2C000C5100000C5110A92D90F2
:1010F0000001120785B4031DAF2A052AEF000C6119
:1011000000000C6110B529012212076C7E0029FF36
:10111000EE3AA90775000C7100000C710E2BFFF55B
:101120002C892D80D47B007A0079000000000C7F90
:101130000122000000000C800A8E338F348D358A26
:10114000368B370000000C8A10E4F538E538C3957B
:101150003550200534E534AE33000C9A00000C9A6B
:10116000107002053314FFE5372538F582E4353673
:10117000F5000CAA00000CAA0A83E0FD120BA705DB
:101180003880D90000000CB40122000000000CB52A
:1011900010A907E50D7025907FA5E04480F0E925B2
:1011A000E0000CC500000CC5104401907FA6F08D36
:1011B00008AF03A9077509018A000CD500000CD5FA
:1011C0000D0A890BE4F50C750D03D322C322000030
:1011D00000000CE210A907E50D7023907FA5E04404
:1011E00080F0E925E0000CF200000CF210907FA6E0
:1011F000F08D08AF03A9077509018A0A89000D025D
:1012000000000D020B0BE4F50C750D01D322C32277
:1012100000000D0D10907FD6E054FBF0E04408F084
:10122000300604E044000D1D00000D1D1002F07F8B
:10123000D07E07120DD5907FD6E054F7F0000D2D2B
:1012400000000D2D05E04404F022000000000D32E6
:1012500010120CB5E50D24FA601014600724077015
:10126000F3000D4200000D420F7F0822E4F50D7FD0
:101270000722E4F50D7F062200000D5110120CE24A
:10128000E50D24FA6010146007240770F3000D6167
:1012900000000D610F7F0822E4F50D7F0722E4F5C1
:1012A0000D7F062200000D7010C0E0C083C0829048
:1012B0007FC4E4F05391EF907F000D8000000D801B
:1012C0000BAB7404F0D082D083D0E03200000D8BE1
:1012D00010907FD6E030E712E04401F07F147E00EA
:1012E00012000D9B00000D9B0A0DD5907FD6E05497
:1012F000FEF0220000000DA510C0E0C083C082D225
:10130000015391EF907FAB7401000DB500000DB556
:1013100008F0D082D083D0E03200000000000DBD84
:1013200010C0E0C083C082D2035391EF907FAB74B2
:1013300008000DCD00000DCD08F0D082D083D0E0A4
:101340003200000000000DD5108E398F3AE53A15B5
:101350003AAE39700215394E60000DE500000DE51A
:101360000705120E4180EE2200000DEC10C0E0C017
:1013700083C0825391EF907FAB7402F0D0000DFCDC
:1013800000000DFC0682D083D0E0320000000E0287
:1013900010C0E0C083C0825391EF907FAB7410F017
:1013A000D0000E1200000E120682D083D0E0320070
:1013B00000000E1810AE077F217D0174002EF5820B
:1013C000E4340FAB82000E2800000E2805FA120D3F
:1013D0005122000000000E2D10500F00C0F9A4B0E3
:1013E000999282F880988883C6000E3D00000E3DD9
:1013F00003A1868E00000E400100000000000E4197
:10140000107400F58690FDA57C05A3E582458370E8
:10141000F9000E5100000E510122000000000E5292
:101420000E907F00E50EF0907FB57401F0D322009E
:1014300000000E6008907FEAE0F50ED32200000065
:1014400000000E6808E4F50DD2E9D2AF22000000DA
:1014500000000E700453D8EF3200000000000E743C
:1014600003D2002200000E7702D3220000000E7982
:1014700002D3220000000E7B02D3220000000E7D6A
:1014800002D3220000000E7F02D3220000000E8152
:1014900002D3220000000E830132000000000E84FF
:1014A0000132000000000E850132000000000E86AF
:1014B0000132000000000E870132000000000E889B
:1014C0000132000000000E890132000000000E8A87
:1014D0000132000000000E8B0132000000000E8C73
:1014E0000132000000000E8D0132000000000E8E5F
:1014F0000132000000000E8F0132000000000E904B
:101500000132000000000E910132000000000E9236
:101510000132000000001100101201000100000063
:1015200040470510270100010200111000001110B2
:1015300010000109022000010103A00009040000BD
:10154000020011200000112010FF00000407058296
:101550000240000007050202400011300000113077
:1015600010000004030904260341006E00630068B4
:101570000000114000001140106F00720020004375
:1015800000680069007000730000115000001150E5
:10159000102C00200049006E0063002E0028034636
:1015A000000011600000116010690072006D00778A
:1015B00000610072006500200000117000001170D1
:1015C000104600720061006D00650057006F0072E8
:1015D0000000118000001180106B0073002A03438B
:1015E000006F006E0066006900001190000011900D
:1015F000106700750072006100740069006F006E72
:10160000000011A0000011A010200053007400720F
:101610000069006E00670022030011B0000011B0E5
:101620001049006E0074006500720066006100637E
:10163000000011C0000011C01065002000530074AC
:1016400000720069006E0067000011D0000011D028
:091650000200000000000000008F
:00000001FF
/*****************************************************************************
*
* whiteheat.h -- ConnectTech WhiteHEAT Firmware.
*
* Copyright (C) 2000-2002 ConnectTech Inc (http://www.connecttech.com/)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* (10/09/2002) Stuart MacDonald
* Firmware 4.06
*
* (04/09/2000) gkh
* Updated the firmware with the latest provided by ConnectTech.
*
* (01/16/2000) gkh
* Fixed my intel hex processing tool, so now the firmware actually
* matches the original file (this was causing a few problems...)
*
* (01/15/2000) gkh
* Added debug loader firmware if DEBUG is #defined:
* Port 1 LED flashes when the vend_ax program is running
* Port 2 LED flashes when any SETUP command arrives
* Port 3 LED flashes when any valid VENDOR request occurs
* Port 4 LED flashes when the EXTERNAL RAM DOWNLOAD request occurs
*
* version 1.0 (01/09/2000) gkh
* Original firmware from ConnectTech massaged a little to be program
* readable.
*
*****************************************************************************/
#define whiteheat_DATE "20000106"
Computing file changes ...
