Message ID | 5402B519.1080002@gmail.com (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers | show |
poma wrote: > > A new patch[1] mainly based on patches at > https://github.com/ashaffer/rt3573sta > and several network throughput tests via the Iperf. > Tested with kernels: > - 3.15.10-200.fc20.x86_64 > - 3.16.1-301.fc21.x86_64 > - 3.17.0-0.rc2.git3.1.fc22.x86_64 > - 3.16.1-301.fc21.i686 > - 3.17.0-0.rc2.git3.1.fc22.i686 > > <Proximity> > Wi-Fi <~20cm LOS~> AP(Wi-Fi <-bridge-> 100Mbit switch) <-> Ethernet > > <AP> > # iwconfig ra0 > ra0 RTWIFI SoftAP ESSID:"Geppetto" > Mode:Managed Channel=13 Access Point: 00:22:44:66:88:aa > Bit Rate=150 Mb/s > </AP> > > <Wi-Fi> > $ iwconfig ra0 > ra0 Ralink STA ESSID:"Geppetto" Nickname:"MT7601STA" > Mode:Managed Frequency=2.472 GHz Access Point: 00:22:44:66:88:aa > Bit Rate=150 Mb/s > RTS thr:off Fragment thr:off > Link Quality=100/100 Signal level:-22 dBm Noise level:-53 dBm > Rx invalid nwid:0 Rx invalid crypt:0 Rx invalid frag:0 > Tx excessive retries:0 Invalid misc:0 Missed beacon:0 > </Wi-Fi> > > <Ethernet> > $ ifconfig bridge0 > bridge0: flags=4163<UP,BROADCAST,RUNNING,MULTICAST> mtu 1500 > inet 192.168.2.2 netmask 255.255.255.0 broadcast 192.168.2.255 > ether 00:12:34:56:78:90 txqueuelen 0 (Ethernet) > RX errors 0 dropped 0 overruns 0 frame 0 > TX errors 0 dropped 0 overruns 0 carrier 0 collisions 0 > </Ethernet> > > <Ethernet-TCP> > $ iperf -s -i 1 > ------------------------------------------------------------ > Server listening on TCP port 5001 > TCP window size: 85.3 KByte (default) > ------------------------------------------------------------ > [ 4] local 192.168.2.2 port 5001 connected with 192.168.2.36 port 58536 > [ ID] Interval Transfer Bandwidth > [ 4] 0.0- 1.0 sec 10.6 MBytes 88.9 Mbits/sec > [ 4] 1.0- 2.0 sec 11.2 MBytes 94.1 Mbits/sec > [ 4] 2.0- 3.0 sec 11.2 MBytes 94.1 Mbits/sec > [ 4] 3.0- 4.0 sec 11.2 MBytes 94.1 Mbits/sec > [ 4] 4.0- 5.0 sec 11.2 MBytes 94.1 Mbits/sec > [ 4] 5.0- 6.0 sec 11.2 MBytes 94.1 Mbits/sec > [ 4] 6.0- 7.0 sec 11.2 MBytes 94.1 Mbits/sec > [ 4] 7.0- 8.0 sec 11.2 MBytes 94.1 Mbits/sec > [ 4] 8.0- 9.0 sec 11.2 MBytes 94.1 Mbits/sec > [ 4] 9.0-10.0 sec 11.2 MBytes 94.1 Mbits/sec > [ 4] 0.0-10.1 sec 113 MBytes 93.6 Mbits/sec > </Ethernet-TCP> ... Thanks for providing test results. With respect to the bottleneck fast ethernet switch in between and that it is most probably a 1x1:1 mimo config according[1], they are fine! The 64bit patch you attached is fine for use with tunneling, like vxlan, too! Regards, Andreas [1] (one line) https://wikidevi.com/wiki/Special:Ask?title=Special:Ask&q=[[Chip1+model::~MT7601U*]]&po=?Interface%250D%250A?Form+factor=FF%250D%250A?Interface+connector+type=USB+conn.%250D%250A?FCC+ID%250D%250A?Manuf%250D%250A?Manuf+product+model=Manuf.+mdl%250D%250A?Vendor+ID%250D%250A?Device+ID%250D%250A?Chip1+model%250D%250A?Supported+802dot11+protocols=PHY+modes%250D%250A?MIMO+config%250D%250A?OUI%250D%250A?Estimated+year+of+release=Est.+year&eq=yes&p[format]=broadtable&order[0]=ASC&sort_num=&order_num=ASC&p[limit]=500&p[offset]=&p[link]=all&p[sort]=&p[headers]=show&p[mainlabel]=&p[intro]=&p[outro]=&p[searchlabel]=…+further+results&p[default]=&p[class]=sortable+wikitable+smwtable -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
BUG: unable to handle kernel paging request at ffffc9000277c070 IP: [<ffffffff8165272c>] __netdev_watchdog_up+0xc/0x80 PGD 12b01c067 PUD 12b01d067 PMD 1295e8067 PTE 0 Oops: 0000 [#1] SMP CPU: 3 PID: 1497 Comm: wpa_supplicant Tainted: G OE 3.17.0-1.fc21.x86_64 #1 task: ffff88007ec44e80 ti: ffff8800beddc000 task.ti: ffff8800beddc000 RIP: 0010:[<ffffffff8165272c>] [<ffffffff8165272c>] __netdev_watchdog_up+0xc/0x80 RSP: 0018:ffff8800beddfcd8 EFLAGS: 00010202 RAX: ffffc9000277c000 RBX: ffff8800caa3c000 RCX: ffff8800ca22a948 RDX: 0000000000000000 RSI: 0000000000000005 RDI: ffff8800caa3c000 RBP: ffff8800beddfce8 R08: 0000000000000000 R09: 0000000000000208 R10: 0000000000000400 R11: 0000000000000010 R12: 0000000000000000 R13: ffffc9000277c000 R14: 0000000000000000 R15: 0000000000000001 FS: 00007fce557aa800(0000) GS:ffff88012fcc0000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b CR2: ffffc9000277c070 CR3: 000000007eeed000 CR4: 00000000000007e0 Stack: ffffffff816527e8 ffff8800caa3c000 ffff8800beddfd20 ffffffffa05e4655 ffffffffa05e4ab0 ffffffffa05e4510 000000005abd5236 ffff8800caa3c000 0000000000001003 ffff8800beddfd58 ffffffff8163135e ffff8800caa3c000 Call Trace: [<ffffffff816527e8>] ? netif_carrier_on+0x48/0x50 [<ffffffffa05e4655>] MainVirtualIF_open+0x85/0xe0 [mt7601Usta] [<ffffffffa05e4ab0>] ? RtmpOSIRQRequest+0x60/0x60 [mt7601Usta] [<ffffffffa05e4510>] ? RT28xx_get_ether_stats+0x150/0x150 [mt7601Usta] [<ffffffff8163135e>] __dev_open+0xce/0x150 [<ffffffff8163168d>] __dev_change_flags+0x9d/0x160 [<ffffffff81631779>] dev_change_flags+0x29/0x70 [<ffffffff816a5bac>] devinet_ioctl+0x63c/0x710 [<ffffffff816a6d05>] inet_ioctl+0x65/0x90 [<ffffffff816105d5>] sock_do_ioctl+0x25/0x50 [<ffffffff81610b30>] sock_ioctl+0x1f0/0x2c0 [<ffffffff81220340>] do_vfs_ioctl+0x2d0/0x4b0 [<ffffffff812205a1>] SyS_ioctl+0x81/0xa0 [<ffffffff81135a16>] ? __audit_syscall_exit+0x1f6/0x2a0 [<ffffffff81743469>] system_call_fastpath+0x16/0x1b Code: 9b 48 a4 ff c6 05 bd 12 6b 00 01 48 8b 45 d8 e9 09 ff ff ff 66 66 2e 0f 1f 84 00 00 00 00 00 66 66 66 66 90 48 8b 87 e8 01 00 00 <48> 83 78 70 00 74 41 55 48 89 e5 53 48 63 87 c0 03 00 00 85 c0 RIP [<ffffffff8165272c>] __netdev_watchdog_up+0xc/0x80 RSP <ffff8800beddfcd8> CR2: ffffc9000277c070 ---[ end trace 97a7adc75a3f40f8 ]--- -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
You probably shold be sending this to MediaTek. The driver you are using is not part of the upstream Linux kernel. John On Tue, Oct 07, 2014 at 04:47:11AM +0200, poma wrote: > > BUG: unable to handle kernel paging request at ffffc9000277c070 > IP: [<ffffffff8165272c>] __netdev_watchdog_up+0xc/0x80 > PGD 12b01c067 PUD 12b01d067 PMD 1295e8067 PTE 0 > Oops: 0000 [#1] SMP > CPU: 3 PID: 1497 Comm: wpa_supplicant Tainted: G OE 3.17.0-1.fc21.x86_64 #1 > task: ffff88007ec44e80 ti: ffff8800beddc000 task.ti: ffff8800beddc000 > RIP: 0010:[<ffffffff8165272c>] [<ffffffff8165272c>] __netdev_watchdog_up+0xc/0x80 > RSP: 0018:ffff8800beddfcd8 EFLAGS: 00010202 > RAX: ffffc9000277c000 RBX: ffff8800caa3c000 RCX: ffff8800ca22a948 > RDX: 0000000000000000 RSI: 0000000000000005 RDI: ffff8800caa3c000 > RBP: ffff8800beddfce8 R08: 0000000000000000 R09: 0000000000000208 > R10: 0000000000000400 R11: 0000000000000010 R12: 0000000000000000 > R13: ffffc9000277c000 R14: 0000000000000000 R15: 0000000000000001 > FS: 00007fce557aa800(0000) GS:ffff88012fcc0000(0000) knlGS:0000000000000000 > CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b > CR2: ffffc9000277c070 CR3: 000000007eeed000 CR4: 00000000000007e0 > Stack: > ffffffff816527e8 ffff8800caa3c000 ffff8800beddfd20 ffffffffa05e4655 > ffffffffa05e4ab0 ffffffffa05e4510 000000005abd5236 ffff8800caa3c000 > 0000000000001003 ffff8800beddfd58 ffffffff8163135e ffff8800caa3c000 > Call Trace: > [<ffffffff816527e8>] ? netif_carrier_on+0x48/0x50 > [<ffffffffa05e4655>] MainVirtualIF_open+0x85/0xe0 [mt7601Usta] > [<ffffffffa05e4ab0>] ? RtmpOSIRQRequest+0x60/0x60 [mt7601Usta] > [<ffffffffa05e4510>] ? RT28xx_get_ether_stats+0x150/0x150 [mt7601Usta] > [<ffffffff8163135e>] __dev_open+0xce/0x150 > [<ffffffff8163168d>] __dev_change_flags+0x9d/0x160 > [<ffffffff81631779>] dev_change_flags+0x29/0x70 > [<ffffffff816a5bac>] devinet_ioctl+0x63c/0x710 > [<ffffffff816a6d05>] inet_ioctl+0x65/0x90 > [<ffffffff816105d5>] sock_do_ioctl+0x25/0x50 > [<ffffffff81610b30>] sock_ioctl+0x1f0/0x2c0 > [<ffffffff81220340>] do_vfs_ioctl+0x2d0/0x4b0 > [<ffffffff812205a1>] SyS_ioctl+0x81/0xa0 > [<ffffffff81135a16>] ? __audit_syscall_exit+0x1f6/0x2a0 > [<ffffffff81743469>] system_call_fastpath+0x16/0x1b > Code: 9b 48 a4 ff c6 05 bd 12 6b 00 01 48 8b 45 d8 e9 09 ff ff ff 66 66 2e 0f 1f 84 00 00 00 00 00 66 66 66 66 90 48 8b 87 e8 01 00 00 <48> 83 78 70 00 74 41 55 48 89 e5 53 48 63 87 c0 03 00 00 85 c0 > RIP [<ffffffff8165272c>] __netdev_watchdog_up+0xc/0x80 > RSP <ffff8800beddfcd8> > CR2: ffffc9000277c070 > ---[ end trace 97a7adc75a3f40f8 ]--- > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >
On 07.10.2014 15:57, John W. Linville wrote: > You probably shold be sending this to MediaTek. The driver you are > using is not part of the upstream Linux kernel. > > John > No problemos! > On Tue, Oct 07, 2014 at 04:47:11AM +0200, poma wrote: >> >> BUG: unable to handle kernel paging request at ffffc9000277c070 >> IP: [<ffffffff8165272c>] __netdev_watchdog_up+0xc/0x80 >> PGD 12b01c067 PUD 12b01d067 PMD 1295e8067 PTE 0 >> Oops: 0000 [#1] SMP >> CPU: 3 PID: 1497 Comm: wpa_supplicant Tainted: G OE 3.17.0-1.fc21.x86_64 #1 >> task: ffff88007ec44e80 ti: ffff8800beddc000 task.ti: ffff8800beddc000 >> RIP: 0010:[<ffffffff8165272c>] [<ffffffff8165272c>] __netdev_watchdog_up+0xc/0x80 >> RSP: 0018:ffff8800beddfcd8 EFLAGS: 00010202 >> RAX: ffffc9000277c000 RBX: ffff8800caa3c000 RCX: ffff8800ca22a948 >> RDX: 0000000000000000 RSI: 0000000000000005 RDI: ffff8800caa3c000 >> RBP: ffff8800beddfce8 R08: 0000000000000000 R09: 0000000000000208 >> R10: 0000000000000400 R11: 0000000000000010 R12: 0000000000000000 >> R13: ffffc9000277c000 R14: 0000000000000000 R15: 0000000000000001 >> FS: 00007fce557aa800(0000) GS:ffff88012fcc0000(0000) knlGS:0000000000000000 >> CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b >> CR2: ffffc9000277c070 CR3: 000000007eeed000 CR4: 00000000000007e0 >> Stack: >> ffffffff816527e8 ffff8800caa3c000 ffff8800beddfd20 ffffffffa05e4655 >> ffffffffa05e4ab0 ffffffffa05e4510 000000005abd5236 ffff8800caa3c000 >> 0000000000001003 ffff8800beddfd58 ffffffff8163135e ffff8800caa3c000 >> Call Trace: >> [<ffffffff816527e8>] ? netif_carrier_on+0x48/0x50 >> [<ffffffffa05e4655>] MainVirtualIF_open+0x85/0xe0 [mt7601Usta] >> [<ffffffffa05e4ab0>] ? RtmpOSIRQRequest+0x60/0x60 [mt7601Usta] >> [<ffffffffa05e4510>] ? RT28xx_get_ether_stats+0x150/0x150 [mt7601Usta] >> [<ffffffff8163135e>] __dev_open+0xce/0x150 >> [<ffffffff8163168d>] __dev_change_flags+0x9d/0x160 >> [<ffffffff81631779>] dev_change_flags+0x29/0x70 >> [<ffffffff816a5bac>] devinet_ioctl+0x63c/0x710 >> [<ffffffff816a6d05>] inet_ioctl+0x65/0x90 >> [<ffffffff816105d5>] sock_do_ioctl+0x25/0x50 >> [<ffffffff81610b30>] sock_ioctl+0x1f0/0x2c0 >> [<ffffffff81220340>] do_vfs_ioctl+0x2d0/0x4b0 >> [<ffffffff812205a1>] SyS_ioctl+0x81/0xa0 >> [<ffffffff81135a16>] ? __audit_syscall_exit+0x1f6/0x2a0 >> [<ffffffff81743469>] system_call_fastpath+0x16/0x1b >> Code: 9b 48 a4 ff c6 05 bd 12 6b 00 01 48 8b 45 d8 e9 09 ff ff ff 66 66 2e 0f 1f 84 00 00 00 00 00 66 66 66 66 90 48 8b 87 e8 01 00 00 <48> 83 78 70 00 74 41 55 48 89 e5 53 48 63 87 c0 03 00 00 85 c0 >> RIP [<ffffffff8165272c>] __netdev_watchdog_up+0xc/0x80 >> RSP <ffff8800beddfcd8> >> CR2: ffffc9000277c070 >> ---[ end trace 97a7adc75a3f40f8 ]--- >> >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html >> > -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 07.10.2014 16:59, poma wrote: > On 07.10.2014 15:57, John W. Linville wrote: >> You probably shold be sending this to MediaTek. The driver you are >> using is not part of the upstream Linux kernel. >> >> John >> > > No problemos! > > BTW, pán Gruszka, when will these devices be supported as a part of the upstream Linux kernel? poma >> On Tue, Oct 07, 2014 at 04:47:11AM +0200, poma wrote: >>> >>> BUG: unable to handle kernel paging request at ffffc9000277c070 >>> IP: [<ffffffff8165272c>] __netdev_watchdog_up+0xc/0x80 >>> PGD 12b01c067 PUD 12b01d067 PMD 1295e8067 PTE 0 >>> Oops: 0000 [#1] SMP >>> CPU: 3 PID: 1497 Comm: wpa_supplicant Tainted: G OE 3.17.0-1.fc21.x86_64 #1 >>> task: ffff88007ec44e80 ti: ffff8800beddc000 task.ti: ffff8800beddc000 >>> RIP: 0010:[<ffffffff8165272c>] [<ffffffff8165272c>] __netdev_watchdog_up+0xc/0x80 >>> RSP: 0018:ffff8800beddfcd8 EFLAGS: 00010202 >>> RAX: ffffc9000277c000 RBX: ffff8800caa3c000 RCX: ffff8800ca22a948 >>> RDX: 0000000000000000 RSI: 0000000000000005 RDI: ffff8800caa3c000 >>> RBP: ffff8800beddfce8 R08: 0000000000000000 R09: 0000000000000208 >>> R10: 0000000000000400 R11: 0000000000000010 R12: 0000000000000000 >>> R13: ffffc9000277c000 R14: 0000000000000000 R15: 0000000000000001 >>> FS: 00007fce557aa800(0000) GS:ffff88012fcc0000(0000) knlGS:0000000000000000 >>> CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b >>> CR2: ffffc9000277c070 CR3: 000000007eeed000 CR4: 00000000000007e0 >>> Stack: >>> ffffffff816527e8 ffff8800caa3c000 ffff8800beddfd20 ffffffffa05e4655 >>> ffffffffa05e4ab0 ffffffffa05e4510 000000005abd5236 ffff8800caa3c000 >>> 0000000000001003 ffff8800beddfd58 ffffffff8163135e ffff8800caa3c000 >>> Call Trace: >>> [<ffffffff816527e8>] ? netif_carrier_on+0x48/0x50 >>> [<ffffffffa05e4655>] MainVirtualIF_open+0x85/0xe0 [mt7601Usta] >>> [<ffffffffa05e4ab0>] ? RtmpOSIRQRequest+0x60/0x60 [mt7601Usta] >>> [<ffffffffa05e4510>] ? RT28xx_get_ether_stats+0x150/0x150 [mt7601Usta] >>> [<ffffffff8163135e>] __dev_open+0xce/0x150 >>> [<ffffffff8163168d>] __dev_change_flags+0x9d/0x160 >>> [<ffffffff81631779>] dev_change_flags+0x29/0x70 >>> [<ffffffff816a5bac>] devinet_ioctl+0x63c/0x710 >>> [<ffffffff816a6d05>] inet_ioctl+0x65/0x90 >>> [<ffffffff816105d5>] sock_do_ioctl+0x25/0x50 >>> [<ffffffff81610b30>] sock_ioctl+0x1f0/0x2c0 >>> [<ffffffff81220340>] do_vfs_ioctl+0x2d0/0x4b0 >>> [<ffffffff812205a1>] SyS_ioctl+0x81/0xa0 >>> [<ffffffff81135a16>] ? __audit_syscall_exit+0x1f6/0x2a0 >>> [<ffffffff81743469>] system_call_fastpath+0x16/0x1b >>> Code: 9b 48 a4 ff c6 05 bd 12 6b 00 01 48 8b 45 d8 e9 09 ff ff ff 66 66 2e 0f 1f 84 00 00 00 00 00 66 66 66 66 90 48 8b 87 e8 01 00 00 <48> 83 78 70 00 74 41 55 48 89 e5 53 48 63 87 c0 03 00 00 85 c0 >>> RIP [<ffffffff8165272c>] __netdev_watchdog_up+0xc/0x80 >>> RSP <ffff8800beddfcd8> >>> CR2: ffffc9000277c070 >>> ---[ end trace 97a7adc75a3f40f8 ]--- >>> >>> >>> -- >>> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in >>> the body of a message to majordomo@vger.kernel.org >>> More majordomo info at http://vger.kernel.org/majordomo-info.html >>> >> > -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Oct 07, 2014 at 05:12:47PM +0200, poma wrote:
> BTW, pán Gruszka, when will these devices be supported as a part of the upstream Linux kernel?
I'm not an oracle :-)
Larry declared to work on some mt76xx chip support, I'm cc him.
I can also work on new chips for rt2x00, but wanted to finish some
other work before.
Stanislaw
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
On 08.10.2014 11:53, Stanislaw Gruszka wrote: > On Tue, Oct 07, 2014 at 05:12:47PM +0200, poma wrote: >> BTW, pán Gruszka, when will these devices be supported as a part of the upstream Linux kernel? > > I'm not an oracle :-) > > Larry declared to work on some mt76xx chip support, I'm cc him. > > I can also work on new chips for rt2x00, but wanted to finish some > other work before. > > Stanislaw > Even better pán Gruszka, MediaTek has spoken. :) I hope that they really support further development here. Toodooloo -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Oct 28, 2014 at 08:47:29AM +0100, poma wrote: > On 08.10.2014 11:53, Stanislaw Gruszka wrote: > > On Tue, Oct 07, 2014 at 05:12:47PM +0200, poma wrote: > >> BTW, pán Gruszka, when will these devices be supported as a part of the upstream Linux kernel? > > > > I'm not an oracle :-) > > > > Larry declared to work on some mt76xx chip support, I'm cc him. > > > > I can also work on new chips for rt2x00, but wanted to finish some > > other work before. > > > > Stanislaw > > > > Even better pán Gruszka, MediaTek has spoken. :) > I hope that they really support further development here. Me too. Stanislaw -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff -ur a/common/crypt_aes.c b/common/crypt_aes.c --- a/common/crypt_aes.c 2013-09-12 07:27:14.000000000 +0200 +++ b/common/crypt_aes.c 2014-08-29 22:51:56.252033992 +0200 @@ -1456,7 +1456,7 @@ /* if ((pResult = (UINT8 *) kmalloc(sizeof(UINT8)*PlainTextLength, GFP_ATOMIC)) == NULL) { */ if (pResult == NULL) { - DBGPRINT(RT_DEBUG_ERROR, ("AES_Key_Wrap: allocate %d bytes memory failure.\n", sizeof(UINT8)*PlainTextLength)); + DBGPRINT(RT_DEBUG_ERROR, ("AES_Key_Wrap: allocate %d bytes memory failure.\n", (UINT)(sizeof(UINT8)*PlainTextLength))); return -2; } /* End of if */ @@ -1551,7 +1551,7 @@ /* if ((pResult = (UINT8 *) kmalloc(sizeof(UINT8)*PlainLength, GFP_ATOMIC)) == NULL) { */ if (pResult == NULL) { - DBGPRINT(RT_DEBUG_ERROR, ("AES_Key_Unwrap: allocate %d bytes memory failure.\n", sizeof(UINT8)*PlainLength)); + DBGPRINT(RT_DEBUG_ERROR, ("AES_Key_Unwrap: allocate %d bytes memory failure.\n", (UINT)(sizeof(UINT8)*PlainLength))); return -2; } /* End of if */ diff -ur a/common/mlme.c b/common/mlme.c --- a/common/mlme.c 2013-09-12 07:27:14.000000000 +0200 +++ b/common/mlme.c 2014-08-28 20:54:24.000000000 +0200 @@ -541,8 +541,8 @@ #endif /* RALINK_ATE */ /* for performace enchanement */ NdisZeroMemory(&pAd->RalinkCounters, - (UINT32)&pAd->RalinkCounters.OneSecEnd - - (UINT32)&pAd->RalinkCounters.OneSecStart); + (ULONG)&pAd->RalinkCounters.OneSecEnd - + (ULONG)&pAd->RalinkCounters.OneSecStart); return; } diff -ur a/common/rtmp_init_inf.c b/common/rtmp_init_inf.c --- a/common/rtmp_init_inf.c 2013-09-17 11:16:36.000000000 +0200 +++ b/common/rtmp_init_inf.c 2014-08-29 20:57:04.000000000 +0200 @@ -665,7 +665,9 @@ { UINT32 reg = 0; RTMP_IO_READ32(pAd, 0x1300, ®); /* clear garbage interrupts*/ +#ifdef DBG printk("0x1300 = %08x\n", reg); +#endif /* DBG */ } { diff -ur a/common/rtusb_bulk.c b/common/rtusb_bulk.c --- a/common/rtusb_bulk.c 2013-09-12 07:27:14.000000000 +0200 +++ b/common/rtusb_bulk.c 2014-08-29 20:57:43.000000000 +0200 @@ -1585,7 +1585,9 @@ if (pCmdRspEventContext->IRPPending == TRUE) { +#ifdef DBG printk("unlink cmd rsp urb\n"); +#endif /* DBG */ RTUSB_UNLINK_URB(pCmdRspEventContext->pUrb); pCmdRspEventContext->IRPPending = FALSE; pCmdRspEventContext->InUse = FALSE; diff -ur a/common/spectrum.c b/common/spectrum.c --- a/common/spectrum.c 2013-09-12 07:27:14.000000000 +0200 +++ b/common/spectrum.c 2014-08-29 23:03:23.250333353 +0200 @@ -1969,7 +1969,7 @@ /* if ((pMeasureReportInfo = kmalloc(sizeof(MEASURE_RPI_REPORT), GFP_ATOMIC)) == NULL)*/ if (pMeasureReportInfo == NULL) { - DBGPRINT(RT_DEBUG_ERROR, ("%s unable to alloc memory for measure report buffer (size=%d).\n", __FUNCTION__, sizeof(MEASURE_RPI_REPORT))); + DBGPRINT(RT_DEBUG_ERROR, ("%s unable to alloc memory for measure report buffer (size=%d).\n", __FUNCTION__, (UINT)sizeof(MEASURE_RPI_REPORT))); return; } diff -ur a/include/os/rt_linux.h b/include/os/rt_linux.h --- a/include/os/rt_linux.h 2013-09-12 07:27:14.000000000 +0200 +++ b/include/os/rt_linux.h 2014-08-28 20:54:24.000000000 +0200 @@ -879,12 +879,19 @@ (RTPKT_TO_OSPKT(_pkt)->len) #define SET_OS_PKT_LEN(_pkt, _len) \ (RTPKT_TO_OSPKT(_pkt)->len) = (_len) - + +#ifdef NET_SKBUFF_DATA_USES_OFFSET +#define GET_OS_PKT_DATATAIL(_pkt) \ + (RTPKT_TO_OSPKT(_pkt)->head + (ULONG)RTPKT_TO_OSPKT(_pkt)->tail) +#define SET_OS_PKT_DATATAIL(_pkt, _start, _len) \ + ((RTPKT_TO_OSPKT(_pkt))->tail) = (ULONG)_start - (ULONG)(RTPKT_TO_OSPKT(_pkt)->head) + (_len) +#else #define GET_OS_PKT_DATATAIL(_pkt) \ - (RTPKT_TO_OSPKT(_pkt)->tail) + (RTPKT_TO_OSPKT(_pkt)->tail) #define SET_OS_PKT_DATATAIL(_pkt, _start, _len) \ ((RTPKT_TO_OSPKT(_pkt))->tail) = (PUCHAR)((_start) + (_len)) - +#endif + #define GET_OS_PKT_HEAD(_pkt) \ (RTPKT_TO_OSPKT(_pkt)->head) diff -ur a/os/linux/config.mk b/os/linux/config.mk --- a/os/linux/config.mk 2013-09-12 08:05:55.000000000 +0200 +++ b/os/linux/config.mk 2014-08-28 20:54:24.000000000 +0200 @@ -150,7 +150,7 @@ HAS_BGFP_OPEN_SUPPORT=n # Support HOSTAPD function -HAS_HOSTAPD_SUPPORT=n +HAS_HOSTAPD_SUPPORT=y #Support GreenAP function HAS_GREENAP_SUPPORT=n @@ -290,7 +290,7 @@ # config for STA mode ifeq ($(RT28xx_MODE),STA) -WFLAGS += -DCONFIG_STA_SUPPORT -DSCAN_SUPPORT -DDBG +WFLAGS += -DCONFIG_STA_SUPPORT -DSCAN_SUPPORT ifeq ($(HAS_XLINK),y) WFLAGS += -DXLINK_SUPPORT @@ -1054,11 +1054,16 @@ export CFLAGS endif +GCCVERSION = $(shell gcc -dumpversion) + ifeq ($(PLATFORM),PC) ifneq (,$(findstring 2.4,$(LINUX_SRC))) # Linux 2.4 CFLAGS := -D__KERNEL__ -I$(LINUX_SRC)/include -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -DMODULE -DMODVERSIONS -include $(LINUX_SRC)/include/linux/modversions.h $(WFLAGS) export CFLAGS + else ifneq (,$(findstring 4.9,$(GCCVERSION))) + # GCC 4.9 + EXTRA_CFLAGS := -Wno-error=date-time $(WFLAGS) else # Linux 2.6 EXTRA_CFLAGS := $(WFLAGS) diff -ur a/os/linux/rt_linux.c b/os/linux/rt_linux.c --- a/os/linux/rt_linux.c 2013-09-12 07:27:14.000000000 +0200 +++ b/os/linux/rt_linux.c 2014-08-28 20:54:24.000000000 +0200 @@ -494,9 +494,11 @@ MEM_DBG_PKT_ALLOC_INC(skb); skb_reserve(skb, 2); - NdisMoveMemory(skb->tail, pHeader802_3, HdrLen); + + NdisMoveMemory(GET_OS_PKT_DATATAIL(skb), pHeader802_3, HdrLen); skb_put(skb, HdrLen); - NdisMoveMemory(skb->tail, pData, DataSize); + NdisMoveMemory(GET_OS_PKT_DATATAIL(skb), pData, DataSize); + skb_put(skb, DataSize); skb->dev = pNetDev; /*get_netdev_from_bssid(pAd, FromWhichBSSID); */ pPacket = OSPKT_TO_RTPKT(skb); @@ -647,7 +649,7 @@ pClonedPkt->dev = pRxPkt->dev; pClonedPkt->data = pData; pClonedPkt->len = DataSize; - pClonedPkt->tail = pClonedPkt->data + pClonedPkt->len; + SET_OS_PKT_DATATAIL(pClonedPkt, pClonedPkt->data, pClonedPkt->len); ASSERT(DataSize < 1530); } return pClonedPkt; @@ -692,7 +694,7 @@ pOSPkt->dev = pNetDev; pOSPkt->data = pData; pOSPkt->len = DataSize; - pOSPkt->tail = pOSPkt->data + pOSPkt->len; + SET_OS_PKT_DATATAIL(pOSPkt, pOSPkt->data, pOSPkt->len); /* copy 802.3 header */ @@ -1117,6 +1119,11 @@ pOSFSInfo->fsuid = current->fsuid; pOSFSInfo->fsgid = current->fsgid; current->fsuid = current->fsgid = 0; + +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,10) + pOSFSInfo->fsuid = current_fsuid().val; + pOSFSInfo->fsgid = current_fsgid().val; + #else pOSFSInfo->fsuid = current_fsuid(); pOSFSInfo->fsgid = current_fsgid(); diff -ur a/os/linux/rt_main_dev.c b/os/linux/rt_main_dev.c --- a/os/linux/rt_main_dev.c 2013-09-12 07:27:14.000000000 +0200 +++ b/os/linux/rt_main_dev.c 2014-08-29 21:14:46.000000000 +0200 @@ -746,7 +746,9 @@ /* Unregister network device */ if (net_dev != NULL) { +#ifdef DBG printk("RtmpOSNetDevDetach(): RtmpOSNetDeviceDetach(), dev->name=%s!\n", net_dev->name); +#endif /* DBG */ RtmpOSNetDevDetach(net_dev); } diff -ur a/os/linux/rt_profile.c b/os/linux/rt_profile.c --- a/os/linux/rt_profile.c 2013-09-12 07:27:14.000000000 +0200 +++ b/os/linux/rt_profile.c 2014-08-29 23:23:18.033710839 +0200 @@ -396,7 +396,7 @@ if (pRxBlk->DataSize + sizeof(wlan_ng_prism2_header) > RX_BUFFER_AGGRESIZE) { - DBGPRINT(RT_DEBUG_ERROR, ("%s : Size is too large! (%d)\n", __FUNCTION__, pRxBlk->DataSize + sizeof(wlan_ng_prism2_header))); + DBGPRINT(RT_DEBUG_ERROR, ("%s : Size is too large! (%d)\n", __FUNCTION__, pRxBlk->DataSize + (UINT)sizeof(wlan_ng_prism2_header))); goto err_free_sk_buff; } diff -ur a/os/linux/usb_main_dev.c b/os/linux/usb_main_dev.c --- a/os/linux/usb_main_dev.c 2013-09-12 07:27:14.000000000 +0200 +++ b/os/linux/usb_main_dev.c 2014-08-29 21:12:35.000000000 +0200 @@ -516,7 +516,9 @@ /* Init driver module */ INT __init rtusb_init(void) { +#ifdef DBG printk("rtusb init %s --->\n", RTMP_DRV_NAME); +#endif /* DBG */ return usb_register(&rtusb_driver); } @@ -524,7 +526,9 @@ VOID __exit rtusb_exit(void) { usb_deregister(&rtusb_driver); +#ifdef DBG printk("<--- rtusb exit\n"); +#endif /* DBG */ } module_init(rtusb_init); diff -ur a/sta/sta_cfg.c b/sta/sta_cfg.c --- a/sta/sta_cfg.c 2013-09-12 07:27:14.000000000 +0200 +++ b/sta/sta_cfg.c 2014-08-28 20:54:24.000000000 +0200 @@ -8274,6 +8274,7 @@ RTMPIoctlGetSiteSurvey(pAd, pRequest); break; +#ifdef DBG case CMD_RTPRIV_IOCTL_MAC: RTMPIoctlMAC(pAd, pRequest); break; @@ -8285,6 +8286,7 @@ case CMD_RTPRIV_IOCTL_RF: RTMPIoctlRF(pAd, pRequest); break; +#endif /* DBG */ case CMD_RTPRIV_IOCTL_BBP: RTMPIoctlBbp(pAd, pRequest, pData, Data);