[git.ipfire.org] IPFire 2.x development tree branch, next, updated. eb2f4a4d2623d8e3646156126884dd78b8357dc7
by gitï¼ ipfire.org 28 Jan '16
by gitï¼ ipfire.org 28 Jan '16
28 Jan '16
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via eb2f4a4d2623d8e3646156126884dd78b8357dc7 (commit)
from ecd50190976df0b55c912ee4b2eb004652cd3b4d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit eb2f4a4d2623d8e3646156126884dd78b8357dc7
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Jan 28 13:24:50 2016 +0100
hwdate: update databases
pci.ids: 2016.01.28
usb.ids: 2015.12.17
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
.../{oldcore/77 => core/97}/filelists/hwdata | 0
src/hwdata/pci.ids | 2163 ++++++++++++++------
src/hwdata/usb.ids | 1075 ++++++++--
3 files changed, 2523 insertions(+), 715 deletions(-)
copy config/rootfiles/{oldcore/77 => core/97}/filelists/hwdata (100%)
Difference in files:
diff --git a/config/rootfiles/core/97/filelists/hwdata b/config/rootfiles/core/97/filelists/hwdata
new file mode 100644
index 0000000..5a9672f
--- /dev/null
+++ b/config/rootfiles/core/97/filelists/hwdata
@@ -0,0 +1,2 @@
+usr/share/hwdata/pci.ids
+usr/share/hwdata/usb.ids
diff --git a/src/hwdata/pci.ids b/src/hwdata/pci.ids
index f16fb54..721cd6b 100644
--- a/src/hwdata/pci.ids
+++ b/src/hwdata/pci.ids
@@ -1,11 +1,11 @@
#
# List of PCI ID's
#
-# Version: 2015.02.14
-# Date: 2015-02-14 03:15:02
+# Version: 2016.01.28
+# Date: 2016-01-28 03:15:02
#
-# Maintained by Martin Mares <mj(a)ucw.cz> and other volunteers from the
-# PCI ID Project at http://pci-ids.ucw.cz/.
+# Maintained by Albert Pool, Martin Mares, and other volunteers from
+# the PCI ID Project at http://pci-ids.ucw.cz/.
#
# New data are always welcome, especially if they are accurate. If you have
# anything to contribute, please follow the instructions at the web site.
@@ -21,6 +21,7 @@
# device device_name <-- single tab
# subvendor subdevice subsystem_name <-- two tabs
+0001 SafeNet (wrong ID)
0010 Allied Telesis, Inc (Wrong ID)
# This is a relabelled RTL-8139
8139 AT-2500TX V3 Ethernet
@@ -285,6 +286,10 @@
0050 SAS1064 PCI-X Fusion-MPT SAS
1028 1f04 SAS 5/E
1028 1f09 SAS 5i/R
+ 0052 MegaRAID SAS-3 3216/3224 [Cutlass]
+ 0053 MegaRAID SAS-3 3216/3224 [Cutlass]
+ 1000 9350 MegaRAID SAS 9341-16i
+ 1000 9351 MegaRAID SAS 9341-24i
0054 SAS1068 PCI-X Fusion-MPT SAS
1028 1f04 SAS 5/E Adapter Controller
1028 1f05 SAS 5/i Adapter Controller
@@ -342,6 +347,7 @@
8086 3513 RMS25CB080 RAID Controller
005c SAS1064A PCI-X Fusion-MPT SAS
005d MegaRAID SAS-3 3108 [Invader]
+ 1000 9361 MegaRAID SAS 9361-8i
1028 1f41 PERC H830 Adapter
1028 1f42 PERC H730P Adapter
1028 1f43 PERC H730 Adapter
@@ -360,6 +366,8 @@
1028 1f4b PERC H330 Mini
1028 1f4c PERC H330 Mini (for blades)
1028 1f4d PERC H330 Embedded (for monolithic)
+ 1054 306a SAS 3004 iMR ROMB
+ 1d49 04db ServeRAID M1210 SAS/SATA Controller
0060 MegaRAID SAS 1078
1000 1006 MegaRAID SAS 8888ELP
1000 100a MegaRAID SAS 8708ELP
@@ -490,6 +498,21 @@
0097 SAS3008 PCI-Express Fusion-MPT SAS-3
1028 1f45 12GB/s HBA internal
1028 1f46 12Gbps HBA
+ 00c0 SAS3324 PCI-Express Fusion-MPT SAS-3
+ 00c1 SAS3324 PCI-Express Fusion-MPT SAS-3
+ 00c2 SAS3324 PCI-Express Fusion-MPT SAS-3
+ 00c3 SAS3324 PCI-Express Fusion-MPT SAS-3
+ 00c4 SAS3224 PCI-Express Fusion-MPT SAS-3
+ 00c5 SAS3316 PCI-Express Fusion-MPT SAS-3
+ 00c6 SAS3316 PCI-Express Fusion-MPT SAS-3
+ 00c7 SAS3316 PCI-Express Fusion-MPT SAS-3
+ 00c8 SAS3316 PCI-Express Fusion-MPT SAS-3
+ 00c9 SAS3216 PCI-Express Fusion-MPT SAS-3
+ 00ce MegaRAID SAS-3 3316 [Intruder]
+ 1000 9371 MegaRAID SAS 9361-16i
+ 1000 9390 MegaRAID SAS 9380-8i8e
+ 00cf MegaRAID SAS-3 3324 [Intruder]
+ 1000 9370 MegaRAID SAS 9361-24i
0407 MegaRAID
1000 0530 MegaRAID 530 SCSI 320-0X RAID Controller
1000 0531 MegaRAID 531 SCSI 320-4X RAID Controller
@@ -643,6 +666,7 @@
18bc 0101 GC-R9600PRO (Primary)
4151 RV350 [Radeon 9600 Series]
1043 c004 A9600SE
+ 174b 7c37 Radeon 9600 SE
4152 RV360 [Radeon 9600/X1050 Series]
1002 0002 Radeon 9600XT
1002 4772 All-in-Wonder 9600 XT
@@ -672,6 +696,7 @@
18bc 0100 GC-R9600PRO (Secondary)
4171 RV350 [Radeon 9600] (Secondary)
1043 c005 A9600SE (Secondary)
+ 174b 7c36 Radeon 9600 SE (secondary)
4172 RV350 [Radeon 9600/X1050 Series] (Secondary)
1002 0003 Radeon 9600XT (Secondary)
1002 4773 All-in-Wonder 9600 XT (Secondary)
@@ -1067,8 +1092,9 @@
4e4a R360 [Radeon 9800 XXL/XT]
1002 4e4a R360 [Radeon 9800 XT]
4e4b R350 GL [FireGL X2 AGP Pro]
- 4e50 RV350/M10 [Mobility Radeon 9600 PRO Turbo]
+ 4e50 RV350/M10 / RV360/M11 [Mobility Radeon 9600 (PRO) / 9700]
1025 005a TravelMate 290
+ 1025 0064 Extensa 3000 series laptop: ATI RV360/M11 [Mobility Radeon 9700]
103c 088c NC8000 laptop
103c 0890 NC6000 laptop
144d c00c P35 notebook
@@ -1168,6 +1194,7 @@
1458 4002 RV100 QY [RADEON 7000 PRO MAYA AV Series]
148c 2003 RV100 QY [Radeon 7000 Multi-Display Edition]
148c 2023 RV100 QY [Radeon 7000 Evil Master Multi-Display]
+ 148c 2081 RV6DE
174b 0280 Radeon RV100 QY [Radeon 7000/VE]
174b 7112 Radeon VE 7000
174b 7c28 Radeon VE 7000 DDR
@@ -1252,7 +1279,7 @@
5652 RV410/M26 [Mobility Radeon X700]
5653 RV410/M26 [Mobility Radeon X700]
1025 0080 Aspire 5024WLMi
- 103c 0940 HP Compaq NW8240 Mobile Workstation
+ 103c 0940 Compaq NW8240 Mobile Workstation
5654 264VT [Mach64 VT]
1002 5654 Mach64VT Reference
5655 264VT3 [Mach64 VT3]
@@ -1443,25 +1470,31 @@
6602 Mars
6603 Mars
6604 Opal XT [Radeon R7 M265]
+ 103c 8006 FirePro M4170
+ 17aa 3643 Radeon R7 A360
6605 Opal PRO [Radeon R7 M260]
6606 Mars XTX [Radeon HD 8790M]
1028 0684 FirePro W4170M
6607 Mars LE [Radeon HD 8530M / R5 M240]
6608 Oland GL [FirePro W2100]
- 6610 Oland XT [Radeon HD 8670 / R7 250]
+ 6610 Oland XT [Radeon HD 8670 / R7 250/350]
1019 0030 Radeon HD 8670
1028 2120 Radeon R7 250
1028 2322 Radeon R7 250
1462 2910 Radeon HD 8670
1462 2911 Radeon HD 8670
+ 148c 7350 Radeon R7 350
1642 3c81 Radeon HD 8670
1642 3c91 Radeon HD 8670
- 6611 Oland [Radeon HD 8570 / R7 240 OEM]
+ 1642 3f09 Radeon R7 350
+ 6611 Oland [Radeon HD 8570 / R7 240/340 OEM]
1028 210b Radeon R5 240 OEM
174b 4248 Radeon R7 240 OEM
174b a240 Radeon R7 240 OEM
+ 174b d340 Radeon R7 340 OEM
1b0a 90d3 Radeon R7 240 OEM
- 6613 Oland PRO [Radeon R7 240]
+ 6613 Oland PRO [Radeon R7 240/340]
+ 148c 7340 Radeon R7 340
1682 7240 R7 240 2048 MB
6620 Mars
6621 Mars PRO
@@ -1474,28 +1507,48 @@
6649 Bonaire [FirePro W5100]
6650 Bonaire
6651 Bonaire
- 6658 Bonaire XTX [Radeon R7 260X]
- 665c Bonaire XT [Radeon HD 7790/8770 / R9 260 OEM]
+ 6658 Bonaire XTX [Radeon R7 260X/360]
+ 148c 0907 Radeon R7 360
+ 1682 0907 Radeon R7 360
+ 1682 7360 Radeon R7 360
+ 665c Bonaire XT [Radeon HD 7790/8770 / R7 360 / R9 260/360 OEM]
1043 0452 Radeon HD 7790 DirectCU II OC
# R7790-1GD5/OC
1462 2930 Radeon HD 7790 OC
1462 2932 Radeon HD 8770
1462 2934 Radeon R9 260 OEM
+ 1462 2938 Radeon R9 360 OEM
+ 148c 0907 Radeon R7 360
148c 9260 Radeon R9 260 OEM
+ 148c 9360 Radeon R9 360 OEM
+ 1682 0907 Radeon R7 360
# FX-779A-CDB4 / FX-779A-CDBC
1682 3310 Radeon HD 7790 Black Edition 2 GB
# 100356OCL / 11210-01-20G
174b e253 Radeon HD 7790 Dual-X OC
1787 2329 Radeon HD 7790 TurboDuo
665d Bonaire [Radeon R7 200 Series]
- 6660 Sun XT [Radeon HD 8670A/8670M/8690M]
+ 665f Tobago PRO [Radeon R7 360 / R9 360 OEM]
+ 1028 0b04 Radeon R9 360 OEM
+ 1462 2938 Radeon R9 360 OEM
+ 1462 3271 Radeon R9 360 OEM
+ 1682 7360 Radeon R7 360
+ 6660 Sun XT [Radeon HD 8670A/8670M/8690M / R5 M330]
+ 1028 05ea Radeon HD 8670M
+ 1028 06bf Radeon R5 M335
+ 103c 1970 Radeon HD 8670M
+ 103c 80be Radeon R5 M330
+ 103c 8136 Radeon R5 M330
+ 17aa 3804 Radeon R5 M330
+ 17aa 3809 Radeon R5 M330
+ 17aa 390c Radeon R5 M330
6663 Sun PRO [Radeon HD 8570A/8570M]
1025 0846 Radeon HD 8570A
6664 Jet XT [Radeon R5 M240]
6665 Jet PRO [Radeon R5 M230]
+ 17aa 368f Radeon R5 A230
6667 Jet ULT [Radeon R5 M230]
666f Sun LE [Radeon HD 8550M / R5 M230]
- 6670 Hainan
6704 Cayman PRO GL [FirePro V7900]
6707 Cayman LE GL [FirePro V5900]
6718 Cayman XT [Radeon HD 6970]
@@ -1514,8 +1567,6 @@
1558 5104 Radeon HD 6990M
1558 7201 Radeon HD 6990M
174b e188 Radeon HD 6970M
- 6724 Blackcomb [Mobility Radeon HD 6000 series]
- 6725 Blackcomb [Radeon HD 6900M Series]
6738 Barts XT [Radeon HD 6870]
# HD-687A-ZDFC
1682 3103 Radeon HD 8670
@@ -1927,17 +1978,21 @@
17aa 3658 Radeon HD 7470A
6771 Caicos XTX [Radeon HD 8490 / R5 235X OEM]
6772 Caicos [Radeon HD 7450A]
- 6778 Caicos XT [Radeon HD 7470/8470 / R5 235 OEM]
+ 6778 Caicos XT [Radeon HD 7470/8470 / R5 235/310 OEM]
1019 0024 Radeon HD 7470
1019 0027 Radeon HD 8470
1028 2120 Radeon HD 7470
1462 b491 Radeon HD 8470
1462 b492 Radeon HD 8470
1462 b493 Radeon HD 8470 OEM
+ 1462 b499 Radeon R5 235 OEM
1642 3c65 Radeon HD 8470
1642 3c75 Radeon HD 8470
174b 8145 Radeon HD 8470
+ 174b d145 Radeon R5 235 OEM
+ 174b d335 Radeon R5 310 OEM
174b e145 Radeon HD 7470
+ 17aa 3694 Radeon R5 A220
6779 Caicos [Radeon HD 6450/7450/8450 / R5 230 OEM]
1019 0016 Radeon HD 6450
1019 0017 Radeon HD 6450
@@ -1973,8 +2028,8 @@
1b0a 90bb Radeon HD 7450A
677b Caicos PRO [Radeon HD 7450]
6780 Tahiti XT GL [FirePro W9000]
- 6784 Tahiti [ATI FirePro V (FireGL V) Graphics Adapter]
- 6788 Tahiti [ATI FirePro V (FireGL V) Graphics Adapter]
+ 6784 Tahiti [FirePro Series Graphics Adapter]
+ 6788 Tahiti [FirePro Series Graphics Adapter]
678a Tahiti PRO GL [FirePro Series]
1002 030c FirePro W8000
1002 0310 FirePro S9000
@@ -1984,9 +2039,7 @@
1002 0b0e FirePro S10000 Passive
1002 0b2a FirePro S10000
1028 030c FirePro W8000
- 6790 Tahiti
- 6791 Tahiti
- 6792 Tahiti
+ 1028 0710 FirePro S9000
6798 Tahiti XT [Radeon HD 7970/8970 OEM / R9 280X]
1002 3000 Tahiti XT2 [Radeon HD 7970 GHz Edition]
1002 3001 Tahiti XTL [Radeon R9 280X]
@@ -2027,12 +2080,37 @@
679e Tahiti LE [Radeon HD 7870 XT]
679f Tahiti
67a0 Hawaii XT GL [FirePro W9100]
+ 1002 0335 FirePro S9150
+ 1028 031f FirePro W9100
+ 1028 0335 FirePro S9150
67a1 Hawaii PRO GL [FirePro W8100]
+ 1002 0335 FirePro S9100
+ 1028 0335 FirePro S9100
67a2 Hawaii GL
67a8 Hawaii
67a9 Hawaii
67aa Hawaii
67b0 Hawaii XT [Radeon R9 290X]
+ 1043 046a R9 290X DirectCU II
+ 1043 046c R9 290X DirectCU II OC
+ 1043 0474 Matrix R9 290X Platinum
+ 1043 0476 ARES III
+ 1458 227c R9 290X WindForce 3X OC
+ 1458 2281 R9 290X WindForce 3X OC
+ 1458 228c R9 290X WindForce 3X
+ 1458 228d R9 290X WindForce 3X OC
+ 1458 2290 R9 290X WindForce 3X
+ 1458 22c1 Grenada PRO [Radeon R9 390]
+ 1462 3070 R9 290X Lightning
+ 1462 3071 R9 290X Lightning
+ 1462 3072 R9 290X Lightning LE
+ 1462 3080 R9 290X Gaming
+ 1462 3082 R9 290X Gaming OC
+ 148c 2347 Devil 13 Dual Core R9 290X
+ 1682 9290 Double Dissipation R9 290X
+ 174b e282 Vapor-X R9 290X Tri-X OC
+ 174b e285 R9 290X Tri-X OC
+ 1787 2020 R9 290X IceQ X² Turbo
67b1 Hawaii PRO [Radeon R9 290]
67b9 Vesuvius [Radeon R9 295X2]
67be Hawaii LE
@@ -2051,22 +2129,38 @@
1002 0310 FirePro S7000
1002 0420 Radeon Sky 500
6809 Pitcairn LE GL [FirePro W5000]
- 6810 Curacao XT [Radeon R9 270X]
- 6811 Curacao PRO [Radeon R9 270]
+ 6810 Curacao XT [Radeon R7 370 / R9 270X/370 OEM]
+ 148c 0908 Radeon R9 370 OEM
+ 1682 7370 Radeon R7 370
+ 6811 Curacao PRO [Radeon R7 370 / R9 270/370 OEM]
+ 1028 0b00 Trinidad PRO [Radeon R9 370 OEM]
+ 1043 2016 Trinidad PRO [Radeon R9 370 OEM]
+ 1458 2016 Trinidad PRO [Radeon R9 370 OEM]
+ 1462 2016 Trinidad PRO [Radeon R9 370 OEM]
+ 148c 2016 Trinidad PRO [Radeon R9 370 OEM]
+ 1682 2015 Trinidad PRO [Radeon R7 370]
+ 174b 2016 Trinidad PRO [Radeon R9 370 OEM]
+ 1787 2016 Trinidad PRO [Radeon R9 370 OEM]
6816 Pitcairn
6817 Pitcairn
6818 Pitcairn XT [Radeon HD 7870 GHz Edition]
1002 0b05 Radeon HD 8870 OEM
174b 8b04 Radeon HD 8860
- 6819 Pitcairn PRO [Radeon HD 7850]
+ 6819 Pitcairn PRO [Radeon HD 7850 / R7 265 / R9 270 1024SP]
+ 1682 7269 Radeon R9 270 1024SP
+ 1682 9278 Radeon R9 270 1024SP
+ 174b a008 Radeon R9 270 1024SP
174b e221 Radeon HD 7850 2GB GDDR5 DVI-I/DVI-D/HDMI/DP
- 6820 Venus XTX [Radeon HD 8890M / R9 M275X]
+ 6820 Venus XTX [Radeon HD 8890M / R9 M275X/M375X]
103c 1851 Radeon HD 7750M
+ 17aa 3643 Radeon R9 A375
17aa 3801 Radeon R9 M275
- 6821 Venus XT [Radeon HD 8870M / R9 M270X]
+ 17aa 3824 Radeon R9 M375
+ 6821 Venus XT [Radeon HD 8870M / R9 M270X/M370X]
1002 031e FirePro SX4000
1028 05cc FirePro M5100
1028 15cc FirePro M5100
+ 106b 0149 Radeon R9 M370X Mac Edition
6822 Venus PRO [Radeon E8860]
6823 Venus PRO [Radeon HD 8850M / R9 M265X]
6825 Heathrow XT [Radeon HD 7870M]
@@ -2093,9 +2187,6 @@
1462 8092 Radeon HD 8730
148c 8730 Radeon HD 8730
1787 3000 Radeon HD 6570
- 6838 Cape Verde
- 6839 Cape Verde
- 683b Cape Verde [Radeon HD 7700 Series]
683d Cape Verde XT [Radeon HD 7770/8760 / R7 250X]
1002 0030 Radeon HD 8760 OEM
1019 0030 Radeon HD 8760 OEM
@@ -2103,7 +2194,10 @@
1043 8760 Radeon HD 8760 OEM
1462 2710 R7770-PMD1GD5
174b 8304 Radeon HD 8760 OEM
- 683f Cape Verde PRO [Radeon HD 7750 / R7 250E]
+ 683f Cape Verde PRO [Radeon HD 7750/8740 / R7 250E]
+ 1462 2790 Radeon HD 8740
+ 1462 2791 Radeon HD 8740
+ 1642 3b97 Radeon HD 8740
6840 Thames [Radeon HD 7500M/7600M Series]
1025 050e Radeon HD 7670M
1025 050f Radeon HD 7670M
@@ -2682,12 +2776,16 @@
1179 f903 Radeon R7 M260
1179 f934 Radeon R7 M260
6901 Topaz PRO [Radeon R5 M255]
- 6920 Tonga
6921 Amethyst XT [Radeon R9 M295X]
+ 6929 Tonga XT GL [FirePro S7150]
692b Tonga PRO GL [FirePro W7100]
- 692f Tonga XT GL [FirePro W8100]
- 6938 Amethyst XT [Radeon R9 M295X Mac Edition]
- 6939 Tonga PRO [Radeon R9 285]
+ 692f Tonga XTV GL [FirePro S7150V]
+ 6938 Tonga XT / Amethyst XT [Radeon R9 380X / R9 M295X Mac Edition]
+ 174b e308 Radeon R9 380X Nitro 4G D5
+ 6939 Tonga PRO [Radeon R9 285/380]
+ 148c 9380 Radeon R9 380
+# Make naming scheme consistent
+ 174b e308 Radeon R9 380 Nitro 4G D5
700f RS100 AGP Bridge
7010 RS200/RS250 AGP Bridge
7100 R520 [Radeon X1800 XT]
@@ -2808,6 +2906,11 @@
72a8 RV570 [Radeon X1950 GT] (Secondary)
72b1 RV560 [Radeon X1650 XT] (Secondary)
72b3 RV560 [Radeon X1650 GT] (Secondary)
+ 7300 Fiji [Radeon R9 FURY / NANO Series]
+ 1002 0b36 Radeon R9 FURY X / NANO
+ 1043 049e Radeon R9 FURY
+ 1043 04a0 Radeon R9 FURY X
+ 174b e329 Radeon R9 FURY
7833 RS350 Host Bridge
7834 RS350 [Radeon 9100 PRO/XT IGP]
7835 RS350M [Mobility Radeon 9000 IGP]
@@ -3054,12 +3157,7 @@
9837 Kabini [Radeon HD 8280E]
9838 Kabini [Radeon HD 8240 / R3 Series]
9839 Kabini [Radeon HD 8180]
- 983a Kabini
- 983b Kabini
- 983c Kabini
983d Temash [Radeon HD 8250/8280G]
- 983e Kabini
- 983f Kabini
9840 Kabini HDMI/DP Audio
9850 Mullins [Radeon R3 Graphics]
9851 Mullins [Radeon R4/R5 Graphics]
@@ -3077,11 +3175,14 @@
985d Mullins
985e Mullins
985f Mullins
+ 9874 Carrizo
9900 Trinity [Radeon HD 7660G]
+ 103c 1985 Pavilion 17-e163sg Notebook PC
# AMD A10-5800K CPU
9901 Trinity [Radeon HD 7660D]
9902 Trinity HDMI Audio Controller
103c 194e ProBook 455 G1 Notebook
+ 103c 1985 Pavilion 17-e163sg Notebook PC
9903 Trinity [Radeon HD 7640G]
103c 194e ProBook 455 G1 Notebook
103c 1952 ProBook 455 G1 Notebook
@@ -3102,6 +3203,8 @@
9917 Trinity [Radeon HD 7620G]
9918 Trinity [Radeon HD 7600G]
9919 Trinity [Radeon HD 7500G]
+ 9920 Liverpool Graphics
+ 9921 Liverpool HDMI/DP Audio Controller
9990 Trinity [Radeon HD 7520G]
9991 Trinity [Radeon HD 7540D]
9992 Trinity [Radeon HD 7420G]
@@ -3148,6 +3251,11 @@
174b aa98 Radeon HD 6450 1GB DDR3
aaa0 Tahiti XT HDMI Audio [Radeon HD 7970 Series]
aab0 Cape Verde/Pitcairn HDMI Audio [Radeon HD 7700/7800 Series]
+ aac0 Tobago HDMI Audio [Radeon R7 360 / R9 360 OEM]
+ aac8 Hawaii HDMI Audio
+# I have a Tonga card and this is the HDMI Audio part
+ aad8 Tonga HDMI Audio [Radeon R9 285/380]
+ 174b aad8 Radeon R9 285/380 HDMI Audio
ac00 Theater 600 Pro
ac02 TV Wonder HD 600 PCIe
ac12 Theater HD T507 (DVB-T) TV tuner/capture device
@@ -3474,7 +3582,7 @@
009f PCI 4758 Cryptographic Accelerator
00a5 ATM Controller (1410a500)
00a6 ATM 155MBPS MM Controller (1410a600)
- 00b7 256-bit Graphics Rasterizer [FireGL1]
+ 00b7 GXT2000P Graphics Adapter
1092 00b8 FireGL1 AGP 32Mb
00b8 GXT2000P Graphics Adapter
00be ATM 622MBPS Controller (1410be00)
@@ -3492,6 +3600,9 @@
016e GXT4000P Graphics Adapter
0170 GXT6000P Graphics Adapter
1092 0172 Fire GL2
+ 1092 0173 Fire GL3
+ 1092 0174 Fire GL4
+ 1092 0184 Fire GL4s
017d GXT300P Graphics Adapter
0180 Snipe chipset SCSI controller
1014 0241 iSeries 2757 DASD IOA
@@ -3561,9 +3672,12 @@
1014 049a PCIe3 x16 SAS RAID Internal Adapter 6Gb (57EE)
1014 04c7 PCIe3 x 8 Cache SAS RAID Internal Adapter 6GB(2CCA)
1014 04c8 PCIe3 x 8 Cache SAS RAID Internal Adapter 6GB(2CD2)
- 1014 0c49 PCIe3 x 8 Cache SAS RAID Internal Adapter 6GB(2CCD)
+ 1014 04c9 PCIe3 x 8 Cache SAS RAID Internal Adapter 6GB(2CCD)
044b GenWQE Accelerator Adapter
04aa Flash Adapter 90 (PCIe2 0.9TB)
+ 04da PCI-E IPR SAS+ Adapter (ASIC)
+ 1014 04fb PCIe3 x16 20GB Cache 12Gb Quad SAS RAID+ Adapter(580B)
+ 1014 04fc PCIe3 x8 12Gb Quad SAS RAID+ Adapter(580A)
3022 QLA3022 Network Adapter
4022 QLA3022 Network Adapter
ffff MPIC-2 interrupt controller
@@ -3658,9 +3772,12 @@
1404 Family 15h (Models 10h-1fh) Processor Function 4
1405 Family 15h (Models 10h-1fh) Processor Function 5
1410 Family 15h (Models 10h-1fh) Processor Root Complex
+ 103c 1985 Pavilion 17-e163sg Notebook PC
1412 Family 15h (Models 10h-1fh) Processor Root Port
+ 1022 1234 Trinity A-series APU
1413 Family 15h (Models 10h-1fh) Processor Root Port
1414 Family 15h (Models 10h-1fh) Processor Root Port
+ 1022 1234 Trinity A-series APU
1415 Family 15h (Models 10h-1fh) Processor Root Port
1416 Family 15h (Models 10h-1fh) Processor Root Port
1417 Family 15h (Models 10h-1fh) Processor Root Port
@@ -3675,7 +3792,11 @@
1422 Family 15h (Models 30h-3fh) Processor Root Complex
1423 Family 15h (Models 30h-3fh) I/O Memory Management Unit
1426 Family 15h (Models 30h-3fh) Processor Root Port
+ 1436 Liverpool Processor Root Complex
+ 1437 Liverpool I/O Memory Management Unit
+ 1438 Liverpool Processor Root Port
1439 Family 16h Processor Functions 5:1
+ 145b Zeppelin Non-Transparent Bridge
1510 Family 14h Processor Root Complex
174b 1001 PURE Fusion Mini
1512 Family 14h Processor Root Port
@@ -3821,27 +3942,34 @@
7802 FCH SATA Controller [RAID mode]
7803 FCH SATA Controller [RAID mode]
7804 FCH SATA Controller [AHCI mode]
+ 103c 1985 Pavilion 17-e163sg Notebook PC
7805 FCH SATA Controller [RAID mode]
7806 FCH SD Flash Controller
7807 FCH USB OHCI Controller
103c 194e ProBook 455 G1 Notebook
+ 103c 1985 Pavilion 17-e163sg Notebook PC
7808 FCH USB EHCI Controller
103c 194e ProBook 455 G1 Notebook
+ 103c 1985 Pavilion 17-e163sg Notebook PC
7809 FCH USB OHCI Controller
103c 194e ProBook 455 G1 Notebook
780b FCH SMBus Controller
103c 194e ProBook 455 G1 Notebook
+ 103c 1985 Pavilion 17-e163sg Notebook PC
780c FCH IDE Controller
780d FCH Azalia Controller
103c 194e ProBook 455 G1 Notebook
+ 103c 1985 Pavilion 17-e163sg Notebook PC
1043 8444 F2A85-M Series
780e FCH LPC Bridge
103c 194e ProBook 455 G1 Notebook
+ 103c 1985 Pavilion 17-e163sg Notebook PC
780f FCH PCI Bridge
7812 FCH USB XHCI Controller
7813 FCH SD Flash Controller
7814 FCH USB XHCI Controller
103c 194e ProBook 455 G1 Notebook
+ 103c 1985 Pavilion 17-e163sg Notebook PC
7900 FCH SATA Controller [IDE mode]
7901 FCH SATA Controller [AHCI mode]
7902 FCH SATA Controller [RAID mode]
@@ -3854,6 +3982,7 @@
790f FCH PCI Bridge
7914 FCH USB XHCI Controller
9600 RS780 Host Bridge
+ 1043 82ee M378A-CM Motherboard
1043 82f1 M3A78-EH Motherboard
9601 RS880 Host Bridge
1019 2120 A785GM-M
@@ -4060,6 +4189,7 @@
102b 2100 MGA-2164W Millennium II
051e MGA 1064SG [Mystique] AGP
051f MGA 2164W [Millennium II] AGP
+ 102b 2100 MGA-2164WA [Millennium II A]
0520 MGA G200
102b dbc2 G200 Multi-Monitor
102b dbc8 G200 Multi-Monitor
@@ -4100,7 +4230,7 @@
102b f806 Mystique G200 Video AGP
102b ff00 MGA-G200 AGP
102b ff02 Mystique G200 AGP
- 102b ff03 Millennium G200 AGP
+ 102b ff03 Millennium G200A AGP
102b ff04 Marvel G200 AGP
110a 0032 MGA-G200 AGP
0522 MGA G200e [Pilot] ServerEngines (SEP1)
@@ -4409,6 +4539,7 @@
103c 1293 USB add-in card
103c 1294 USB 2.0 add-in card
1179 0001 USB
+ 1186 0035 DUB-C2 USB 2.0 2-port 32-bit cardbus controller
12ee 7000 Root Hub
14c2 0105 PTI-205N USB 2.0 Host Controller
1799 0001 Root Hub
@@ -4440,6 +4571,7 @@
00ce uPD72871 [Firewarden] IEEE1394a OHCI 1.0 Link/1-port PHY Controller
00df Vr4131
00e0 uPD72010x USB 2.0 Controller
+ 1186 f100 DUB-C2 USB 2.0 2-port 32-bit cardbus controller
12ee 7001 Root hub
14c2 0205 PTI-205N USB 2.0 Host Controller
1799 0002 Root Hub
@@ -4455,6 +4587,7 @@
1028 04b2 Vostro 3350
1028 04da Vostro 3750
1043 8413 P8P67 Deluxe Motherboard
+ 104d 907a Vaio VPCF1
1af4 1100 QEMU Virtual Machine
1b96 0001 USB 3.0 PCIe Card
01e7 uPD72873 [Firewarden] IEEE1394a OHCI 1.1 Link/2-port PHY Controller
@@ -4470,10 +4603,12 @@
0002 AGP Port (virtual PCI-to-PCI bridge)
0003 AGP Port (virtual PCI-to-PCI bridge)
0004 PCI-to-PCI bridge
+ 1039 0000 PCIe x16 port
0006 85C501/2/3
0008 SiS85C503/5513 (LPC Bridge)
0009 5595 Power Management Controller
000a PCI-to-PCI bridge
+ 1039 0000 PCIe x1 port
0016 SiS961/2/3 SMBus controller
0018 SiS85C503/5513 (LPC Bridge)
0163 163 802.11b/g Wireless LAN Adapter
@@ -4484,6 +4619,7 @@
0186 AHCI Controller (0106)
0190 190 Ethernet Adapter
0191 191 Gigabit Ethernet Adapter
+ 1043 8139 P5SD2-FM/S mainboard
0200 5597/5598/6326 VGA
1039 0000 SiS5597 SVGA (Shared RAM)
0204 82C204
@@ -4530,7 +4666,7 @@
1734 1099 D2030-A1 Motherboard
0900 SiS900 PCI Fast Ethernet
1019 0a14 K7S5A motherboard
- 1039 0900 SiS900 10/100 Ethernet Adapter onboard [Asus P4SC-EA]
+ 1039 0900 SiS900 10/100 Ethernet Adapter onboard
1043 8035 CUSI-FX motherboard
1043 80a7 Motherboard P4S800D-X
1462 0900 MS-6701 motherboard
@@ -4543,7 +4679,9 @@
0968 SiS968 [MuTIOL Media IO]
1180 SATA Controller / IDE mode
1182 SATA Controller / RAID mode
+ 1039 0180 SiS 966 4-port SATA controller
1183 SATA Controller / IDE mode
+ 1039 0180 SiS 966 4-port SATA controller
1184 AHCI Controller / RAID mode
1185 AHCI IDE Controller (0106)
3602 83C602
@@ -4610,7 +4748,7 @@
1019 0f05 A928 (i-Buddie)
1039 7012 SiS 7012 onboard [Asus P4SC-EA] AC'97 Sound Controller
1043 818f A8S-X Motherboard
- 13f6 0300 CMI9739(A) on ECS K7SOM+ motherboard
+ 13f6 0300 CMI9739(A) on ECS K7S series motherboard
1462 5850 MSI 648 Max (MS-6585)
1462 7010 MS-6701 motherboard
15bd 1001 DFI 661FX motherboard
@@ -4647,6 +4785,7 @@
a0a0 0022 SiS PCI Audio Accelerator
7019 SiS7019 Audio Accelerator
7502 Azalia Audio Controller
+ 1043 81a1 P5SD2-FM/S mainboard
103a Seiko Epson Corporation
103b Tatung Corp. Of America
103c Hewlett-Packard Company
@@ -4719,30 +4858,30 @@
103c 3212 Smart Array E200
3239 Smart Array Gen9 Controllers
103c 21bd P244br
- 103c 21be Smart Array
+ 103c 21be P741m
103c 21bf H240ar
103c 21c0 P440ar
- 103c 21c1 Smart Array
+ 103c 21c1 P840ar
103c 21c2 P440
103c 21c3 P441
103c 21c4 Smart Array
- 103c 21c5 Smart Array
+ 103c 21c5 P841
103c 21c6 H244br
103c 21c7 H240
103c 21c8 H241
103c 21c9 Smart Array
- 103c 21ca Smart Array
+ 103c 21ca P246br
103c 21cb P840
103c 21cc Smart Array
- 103c 21cd Smart Array
- 103c 21ce Smart Array
+ 103c 21cd P240nr
+ 103c 21ce H240nr
323a Smart Array G6 controllers
103c 3241 Smart Array P212
103c 3243 Smart Array P410
103c 3245 Smart Array P410i
103c 3247 Smart Array P411
103c 3249 Smart Array P812
- 103c 324a HP Smart Array 712m (Mezzanine RAID controller)
+ 103c 324a Smart Array 712m (Mezzanine RAID controller)
103c 324b Smart Array P711m (Mezzanine RAID controller)
323b Smart Array Gen8 Controllers
103c 3350 P222
@@ -5023,16 +5162,19 @@
802e PCI7x20 1394a-2000 OHCI Two-Port PHY/Link-Layer Controller
1028 018d Inspiron 700m/710m
8031 PCIxx21/x515 Cardbus Controller
+ 1025 0064 Extensa 3000 series laptop
1025 0080 Aspire 5024WLMi
103c 0934 Compaq nw8240/nx8220
103c 099c NX6110/NC6120
103c 308b MX6125
8032 OHCI Compliant IEEE 1394 Host Controller
+ 1025 0064 Extensa 3000 series laptop
1025 0080 Aspire 5024WLMi
103c 0934 Compaq nw8240/nx8220
103c 099c NX6110/NC6120
103c 308b MX6125
8033 PCIxx21 Integrated FlashMedia Controller
+ 1025 0064 Extensa 3000 series laptop
1025 0080 Aspire 5024WLMi
103c 0934 Compaq nw8240/nx8220
103c 099c NX6110/NC6120
@@ -5060,6 +5202,7 @@
803b 5-in-1 Multimedia Card Reader (SD/MMC/MS/MS PRO/xD)
103c 309f nx9420
103c 30a3 Compaq nw8440
+ 104d 8212 VAIO VGN-N21E
104d 902d VAIO VGN-NR120E
803c PCIxx12 SDA Standard Compliant SD Host Controller
103c 309f nx9420
@@ -5214,6 +5357,14 @@
8056 Rockwell HCF 56K modem
808a Memory Stick Controller
81ce SxS Pro memory card
+ 908f Aeolia ACPI
+ 909e Aeolia Ethernet Controller (Marvell Yukon 2 Family)
+ 909f Aeolia SATA AHCI Controller
+ 90a0 Aeolia SD/MMC Host Controller
+ 90a1 Aeolia PCI Express Glue and Miscellaneous Devices
+ 90a2 Aeolia DMA Controller
+ 90a3 Aeolia Memory (DDR3/SPM)
+ 90a4 Aeolia USB 3.0 xHCI Host Controller
104e Oak Technology, Inc
0017 OTI-64017
0107 OTI-107 [Spitfire]
@@ -5355,7 +5506,6 @@
6400 MPC190 Security Processor (S1 family, encryption)
6405 MPC184 Security Processor (S1 family)
1058 Electronics & Telecommunications RSH
-# Formerly: Teknor Industrial Computers Inc
1059 Kontron
105a Promise Technology, Inc.
0d30 PDC20265 (FastTrak100 Lite/Ultra100)
@@ -5621,6 +5771,7 @@
0074 U4 HT Bridge
# should be 14e4:1645
1645 Broadcom NetXtreme BCM5701 Gigabit Ethernet
+ 2001 PCI Express SSD
106c Hynix Semiconductor
8139 8139c 100BaseTX Ethernet Controller
8801 Dual Pentium ISA/PCI Motherboard
@@ -5677,12 +5828,44 @@
101e 8493 QLA12160 on AMI MegaRAID
1240 ISP1240 SCSI Host Adapter
1280 ISP1280 SCSI Host Adapter
+ 1634 FastLinQ QL45000 Series 40GbE Controller
+ 1077 e4f1 FastLinQ QL45212H 40GbE Adapter
+ 1077 e4f2 FastLinQ QL45211H 40GbE Adapter
+ 1077 e4f3 FastLinQ QL45412H 40GbE Adapter
+ 1077 e4f4 FastLinQ QL45411H 40GbE Adapter
+ 1644 FastLinQ QL45000 Series 100GbE Controller
+ 1077 e4f8 FastLinQ QL45611H 100GbE Adapter
+ 1656 FastLinQ QL45000 Series 25GbE Controller
+ 1077 e4f6 FastLinQ QL45211H 25GbE Adapter
+ 1077 e4f7 FastLinQ QL45212H 25GbE Adapter
+ 165c FastLinQ QL45000 Series 40GbE Controller (FCoE)
+ 1077 e4f1 FastLinQ QL45462H 40GbE FCoE Adapter
+ 1077 e4f2 FastLinQ QL45461H 40GbE FCoE Adapter
+ 165e FastLinQ QL45000 Series 40GbE Controller (iSCSI)
+ 1077 e4f1 FastLinQ QL45462H 40GbE iSCSI Adapter
+ 1077 e4f2 FastLinQ QL45461H 40GbE iSCSI Adapter
+ 1664 FastLinQ QL45000 Series Gigabit Ethernet Controller (SR-IOV VF)
+ 1077 e4f1 FastLinQ QL45462H 40GbE Adapter (SR-IOV VF)
+ 1077 e4f2 FastLinQ QL45461H 40GbE Adapter (SR-IOV VF)
+ 1077 e4f3 FastLinQ QL45412H 40GbE Adapter (SR-IOV VF)
+ 1077 e4f4 FastLinQ QL45411H 40GbE Adapter (SR-IOV VF)
+ 1077 e4f6 FastLinQ QL45211H 25GbE Adapter (SR-IOV VF)
+ 1077 e4f7 FastLinQ QL45212H 25GbE Adapter (SR-IOV VF)
+ 1077 e4f8 FastLinQ QL45611H 100GbE Adapter (SR-IOV VF)
2020 ISP2020A Fast!SCSI Basic Adapter
2031 ISP8324-based 16Gb Fibre Channel to PCI Express Adapter
+ 103c 17e7 HP SN1000Q 16Gb Single Port Fibre Channel Adapter
+ 103c 17e8 HP SN1000Q 16Gb Dual Port Fibre Channel Adapter
+ 103c 1939 HP QMH2672 16Gb Dual Port Fibre Channel Adapter
+ 103c 8002 3830C 16G Fibre Channel Host Bus Adapter
+ 2071 ISP2714-based 16/32Gb Fibre Channel to PCIe Adapter
2100 QLA2100 64-bit Fibre Channel Adapter
1077 0001 QLA2100 64-bit Fibre Channel Adapter
2200 QLA2200 64-bit Fibre Channel Adapter
1077 0002 QLA2200
+ 2261 ISP2722-based 16/32Gb Fibre Channel to PCIe Adapter
+ 1590 00f9 HPE StoreFabric SN1100Q 16Gb Single Port Fibre Channel Host Bus Adapter
+ 1590 00fa HPE StoreFabric SN1100Q 16Gb Dual Port Fibre Channel Host Bus Adapter
2300 QLA2300 64-bit Fibre Channel Adapter
2312 ISP2312-based 2Gb Fibre Channel to PCI-X HBA
103c 0131 2Gb Fibre Channel - Single port [A7538A]
@@ -5696,6 +5879,7 @@
2532 ISP2532-based 8Gb Fibre Channel to PCI Express HBA
103c 3262 StorageWorks 81Q
1077 0167 QME2572 Dual Port FC8 HBA Mezzanine
+ 1590 00fc HPE StoreFabric 84Q 8Gb Quad Port Fibre Channel Host Bus Adapter
3022 ISP4022-based Ethernet NIC
3032 ISP4032-based Ethernet IPv6 NIC
4010 ISP4010-based iSCSI TOE HBA
@@ -5718,6 +5902,7 @@
1077 020c 3200 Series Quad Port 1Gb Intelligent Ethernet Adapter
1077 020f 3200 Series Single Port 10Gb Intelligent Ethernet Adapter
1077 0210 QME8242-k 10GbE Dual Port Mezzanine Card
+ 1077 0233 QME8262-k 10GbE Dual Port Mezzanine Card
8021 8200 Series 10GbE Converged Network Adapter (FCoE)
103c 3348 CN1000Q Dual Port Converged Network Adapter
1077 0211 QME8242-k 10GbE Dual Port Mezzanine Card, FCoE
@@ -5912,6 +6097,7 @@
1093 National Instruments
0160 PCI-DIO-96
0162 PCI-MIO-16XE-50
+ 0fe1 PXI-8320
1150 PCI-6533 (PCI-DIO-32HS)
1170 PCI-MIO-16XE-10
1180 PCI-MIO-16E-1
@@ -6003,7 +6189,10 @@
7004 PXI-6551
700b PXI-5421
700c PCI-5421
+ 701a VXIpc-87xB
+ 701b VXIpc-770
7023 PXI-2593
+ 7027 PCI-MXI-2 Universal
702c PXI-7831R
702d PCI-7831R
702e PXI-7811R
@@ -6272,6 +6461,7 @@
731d PXI-2536
7322 PXIe-6124
7327 PXI-6529
+ 732c VXI-8360T
7331 PXIe-5602
7332 PXIe-5601
7333 PXI-5900
@@ -6411,6 +6601,7 @@
75e5 PXI-6683
75e6 PXI-6683H
75ef PXIe-5632
+ 761c VXI-8360LT
761f PXI-2540
7620 PXIe-2540
7621 PXI-2541
@@ -6441,6 +6632,7 @@
76a3 PXIe-6535B
76a4 PXIe-6536B
76a5 PXIe-6537B
+ 783e PXI-8368
9020 PXI-2501
9030 PXI-2503
9040 PXI-2527
@@ -6450,6 +6642,7 @@
9080 PXI-2580
9090 PCI-4021
90a0 PXI-4021
+ a001 PCI-MXI-2
b001 PCI-1408
b011 PXI-1408
b021 PCI-1424
@@ -6539,7 +6732,9 @@
1093 762b PXIe-4138
1093 762c PXIe-4144
1093 762d PXIe-4145
+ 1093 762e PXIe-5606
1093 7644 PXIe-4841
+ 1093 764a PCIe-8237R-S
1093 7658 PXIe-5162 (4CH)
1093 76ab PXIe-4322
1093 76ad PXIe-4112
@@ -6547,14 +6742,25 @@
1093 76b5 PXIe-7971R
1093 76b6 PXIe-7972R
1093 76b7 PXIe-7975R
+ 1093 76b8 PXIe-5696
+ 1093 76b9 PXIe-5654
1093 76c8 PXIe-6614
1093 76c9 PXIe-6612
1093 76cb PXIe-5646R
1093 76cc PXIe-5162 (2CH)
+ 1093 76ce CVS-1459
1093 76d0 PXIe-5160 (2CH)
1093 76d1 PXIe-5160 (4CH)
1093 76dc PXIe-4610
+ 1093 76ec PXIe-2524
+ 1093 76ed PXIe-2525
+ 1093 76ee PXIe-2526
+ 1093 76ef PXIe-2737
+ 1093 76f0 PXIe-2738
+ 1093 76f1 PXIe-2739
1093 76fb PCIe-1473R-LX110
+ 1093 76fc PXIe-5105
+ 1093 76fd PXIe-5114
1093 76fe PXIe-5644R
1093 76ff PXIe-5644R
1093 7700 PXIe-5644R
@@ -6563,24 +6769,49 @@
1093 7703 PXIe-5645R
1093 770c PXIe-4139
1093 7711 PXIe-4464
+ 1093 7712 PXIe-4463
1093 7716 PCIe-6612
+ 1093 771d Unconfigured CA4 Switch
1093 771e PXIe-4339
1093 7735 cRIO-9033
+ 1093 773e PXIe-5624R
1093 774b cRIO-9031
1093 774d cRIO-9034
1093 7755 cRIO-9030
+ 1093 7768 PXIe-2747
+ 1093 7769 PXIe-2748
+ 1093 776a PXIe-2746
1093 7777 PXIe-7976R
1093 7782 PXIe-5646R
1093 7783 PXIe-5646R
1093 7784 PXIe-5646R
+ 1093 7790 PXIe-5170R (4CH)
+ 1093 7791 PXIe-5170R (8CH)
+ 1093 7793 PXIe-5171R (8CH)
1093 77a5 PXIe-6345
1093 77a6 PXIe-6355
1093 77a7 PXIe-6365
1093 77a8 PXIe-6375
+ 1093 77aa CVS-1458
+ 1093 77ad IC-3173
1093 77b4 PXIe-7820R
1093 77b5 PXIe-7821R
1093 77b6 PXIe-7822R
1093 77b9 cRIO-9038
+ 1093 77ba PXIe-4136
+ 1093 77bb PXIe-4137
+ 1093 77c0 PXIe-5624R
+ 1093 77c1 PXIe-5624R
+ 1093 77c2 PXIe-5624R
+ 1093 77ca PXIe-6738
+ 1093 77cb PXIe-6739
+ 1093 77db cRIO-9035
+ 1093 77dc cRIO-9036
+ 1093 77dd cRIO-9039
+ 1093 7802 PXIe-4302
+ 1093 7803 PXIe-4303
+ 1093 7805 PXIe-4305
+ 1093 788e PXIe-4304
c801 PCI-GPIB
c811 PCI-GPIB+
c821 PXI-GPIB
@@ -6618,6 +6849,13 @@
e251 PXI-8460 (2 ports)
e261 PCI-CAN/DS
e271 PXI-8462
+ f110 VMEpc-650
+ f120 VXIpc-650
+ fe00 VXIpc-87x
+ fe41 VXIpc-860
+ fe51 VXIpc-74x
+ fe61 VXIpc-850
+ fe70 VXIpc-880
1094 First International Computers [FIC]
# nee CMD Technology Inc
1095 Silicon Image, Inc.
@@ -6991,6 +7229,7 @@
8747 PEX 8747 48-Lane, 5-Port PCI Express Gen 3 (8.0 GT/s) Switch
# This is the Non-Transparent-Bridge Virtualized Port as presented by the PLX PEX 8732 chip, the physical bridges show up at 10b5:8732
87b0 PEX 8732 32-lane, 8-Port PCI Express Gen 3 (8.0 GT/s) Switch
+ 1093 7761 PXIe-8830mc
9016 PLX 9016 8-port serial controller
9030 PCI9030 32-bit 33MHz PCI <-> IOBus Bridge
10b5 2695 Hilscher CIF50-PB/DPS Profibus
@@ -7002,6 +7241,7 @@
10b5 3025 Alpermann+Velte PCL PCI L (3V/5V): Timecode Reader Board
10b5 3068 Alpermann+Velte PCL PCI HD (3V/5V): Timecode Reader Board
10b5 3463 Alpermann+Velte PCL PCI D (v2) (3V/5V): Timecode Reader Board
+ 10b5 3591 PLURA PCL PCI L (v2) (3.3V/5V): Time Code Reader Board
12fe 0111 CPCI-ASIO4 (ESD 4-port Serial Interface Board)
1369 9c01 VX222v2
1369 9d01 VX222-Mic
@@ -7014,7 +7254,7 @@
1369 a801 LCM200
1397 3136 4xS0-ISDN PCI Adapter
1397 3137 S2M-E1-ISDN PCI Adapter
- 1518 0200 Kontron ThinkIO-C
+ 1518 0200 ThinkIO-C
15ed 1002 MCCS 8-port Serial Hot Swap
15ed 1003 MCCS 16-port Serial Hot Swap
# MIL-STD-1553B Board
@@ -7125,6 +7365,8 @@
1517 000f ECDR-GC314-PMC Receiver
1885 0700 Tsunami FPGA PMC with Altera Stratix S40
1885 0701 Tsunami FPGA PMC with Altera Stratix S30
+ 9733 PEX 9733 33-lane, 9-port PCI Express Gen 3 (8.0 GT/s) Switch
+ 9749 PEX 9749 49-lane, 13-port PCI Express Gen 3 (8.0 GT/s) Switch
a100 Blackmagic Design DeckLink
bb04 B&B 3PCIOSD1A Isolated PCI Serial
c001 CronyxOmega-PCI (8-port RS232)
@@ -7515,8 +7757,8 @@
10cd Advanced System Products, Inc
1100 ASC1100
1200 ASC1200 [(abp940) Fast SCSI-II]
- 1300 ABP940-U / ABP960-U
- 10cd 1310 ASC1300 SCSI Adapter
+ 1300 ASC1300 / ASC3030 [ABP940-U / ABP960-U / ABP3925]
+ 10cd 1310 ASC1300/3030 SCSI adapter
1195 1320 Ultra-SCSI CardBus PC Card REX CB31
2300 ABP940-UW
2500 ABP940-U2W
@@ -7852,6 +8094,7 @@
00c9 NV41M [GeForce Go 6800 Ultra]
00cc NV41GLM [Quadro FX Go1400]
00cd NV42GL [Quadro FX 3450/4000 SDI]
+ 10de 029b Quadro FX 3450
00ce NV41GL [Quadro FX 1400]
00cf NV41
00d0 nForce3 LPC Bridge
@@ -8123,6 +8366,8 @@
1462 0345 7300LE PCI Express Graphics Adapter
01d2 G72 [GeForce 7550 LE]
01d3 G72 [GeForce 7200 GS / 7300 SE]
+ 1043 8203 EN7300SE
+ 1043 8250 EN7200GS
01d5 G72
01d6 G72M [GeForce Go 7200]
01d7 G72M [Quadro NVS 110M/GeForce Go 7300]
@@ -8664,7 +8909,7 @@
0446 MCP65 SMBus
103c 30cf Pavilion dv9668eg Laptop
0447 MCP65 SMU
- 103c 30cf Pavilion dv9668eg Laptop
+ 103c 30cf Pavilion dv9500/9600/9700 series
0448 MCP65 IDE
103c 30cf Pavilion dv9668eg Laptop
0449 MCP65 PCI bridge
@@ -8752,15 +8997,20 @@
1849 0569 K10N78FullHD-hSLI R3.0 PCI Express Bridge
056a MCP73 [nForce 630i] USB 2.0 Controller (EHCI)
1019 297a MCP73PVT-SM
- 056c MCP73 IDE
+ 147b 1c3e I-N73V motherboard
+ 056c MCP73 IDE Controller
1019 297a MCP73PVT-SM
+ 147b 1c3e I-N73V motherboard
1afa 7150 JW-IN7150-HD
056d MCP73 PCI Express bridge
1019 297a MCP73PVT-SM
+ 10de cb73 MCP73 PCI Bridge
056e MCP73 PCI Express bridge
1019 297a MCP73PVT-SM
+ 10de 0000 MCP73 PCIe x16 port
056f MCP73 PCI Express bridge
1019 297a MCP73PVT-SM
+ 10de 0000 MCP73 PCIe x1 port
05b1 NF200 PCIe 2.0 switch
05b8 NF200 PCIe 2.0 switch for GTX 295
05be NF200 PCIe 2.0 switch for Quadro Plex S4 / Tesla S870 / Tesla S1070 / Tesla S2050
@@ -8860,6 +9110,7 @@
0642 G96 [D9M-10]
0643 G96 [GeForce 9500 GT]
0644 G96 [GeForce 9500 GS]
+ 174b 9600 Geforce 9500GS 512M DDR2 V/D/HDMI
0645 G96 [GeForce 9500 GS]
0646 G96 [GeForce GT 120]
0647 G96M [GeForce 9600M GT]
@@ -8919,6 +9170,7 @@
10de 084d Tesla M2070-Q
10de 087f Tesla M2070-Q
06e0 G98 [GeForce 9300 GE]
+ 107d 5a96 Geforce 9300GE
06e1 G98 [GeForce 9300 GS]
06e2 G98 [GeForce 8400]
06e3 G98 [GeForce 8300 GS]
@@ -9033,49 +9285,65 @@
07c1 MCP73 Host Bridge
1019 297a MCP73PVT-SM
07c2 MCP73 Host Bridge
+ 07c3 MCP73 Host Bridge
+ 147b 1c3e I-N73V motherboard
07c5 MCP73 Host Bridge
07c8 MCP73 Memory Controller
1019 297a MCP73PVT-SM
+ 147b 1c3e I-N73V motherboard
1afa 7150 JW-IN7150-HD
- 07cb nForce 630i memory controller
+ 07cb nForce 610i/630i memory controller
1019 297a MCP73PVT-SM
+ 147b 1c3e I-N73V motherboard
1afa 7150 JW-IN7150-HD
- 07cd nForce 630i memory controller
+ 07cd nForce 610i/630i memory controller
1019 297a MCP73PVT-SM
+ 147b 1c3e I-N73V motherboard
1afa 7150 JW-IN7150-HD
- 07ce nForce 630i memory controller
+ 07ce nForce 610i/630i memory controller
1019 297a MCP73PVT-SM
+ 147b 1c3e I-N73V motherboard
1afa 7150 JW-IN7150-HD
- 07cf nForce 630i memory controller
+ 07cf nForce 610i/630i memory controller
1019 297a MCP73PVT-SM
+ 147b 1c3e I-N73V motherboard
1afa 7150 JW-IN7150-HD
- 07d0 nForce 630i memory controller
+ 07d0 nForce 610i/630i memory controller
1019 297a MCP73PVT-SM
+ 147b 1c3e I-N73V motherboard
1afa 7150 JW-IN7150-HD
- 07d1 nForce 630i memory controller
+ 07d1 nForce 610i/630i memory controller
1019 297a MCP73PVT-SM
+ 147b 1c3e I-N73V motherboard
1afa 7150 JW-IN7150-HD
- 07d2 nForce 630i memory controller
+ 07d2 nForce 610i/630i memory controller
1019 297a MCP73PVT-SM
+ 147b 1c3e I-N73V motherboard
1afa 7150 JW-IN7150-HD
- 07d3 nForce 630i memory controller
+ 07d3 nForce 610i/630i memory controller
1019 297a MCP73PVT-SM
+ 147b 1c3e I-N73V motherboard
1afa 7150 JW-IN7150-HD
- 07d6 nForce 630i memory controller
+ 07d6 nForce 610i/630i memory controller
1019 297a MCP73PVT-SM
+ 147b 1c3e I-N73V motherboard
1afa 7150 JW-IN7150-HD
07d7 MCP73 LPC Bridge
1019 297a MCP73PVT-SM
+ 147b 1c3e I-N73V motherboard
1afa 7150 JW-IN7150-HD
07d8 MCP73 SMBus
1019 297a MCP73PVT-SM
+ 147b 1c3e I-N73V motherboard
1afa 7150 JW-IN7150-HD
07d9 MCP73 Memory Controller
1019 297a MCP73PVT-SM
+ 147b 1c3e I-N73V motherboard
1afa 7150 JW-IN7150-HD
07da MCP73 Co-processor
1afa 7150 JW-IN7150-HD
07dc MCP73 Ethernet
+ 147b 1c3e I-N73V motherboard
07dd MCP73 Ethernet
07de MCP73 Ethernet
07df MCP73 Ethernet
@@ -9085,16 +9353,22 @@
1019 297a MCP73PVT-SM
07e2 C73 [GeForce 7050 / nForce 630i]
07e3 C73 [GeForce 7050 / nForce 610i]
+ 147b 1c3e I-N73V motherboard
07e5 C73 [GeForce 7100 / nForce 620i]
- 07f0 MCP73 IDE
+ 07f0 MCP73 SATA Controller (IDE mode)
+ 147b 1c3e I-N73V motherboard
07f4 GeForce 7100/nForce 630i SATA
1019 297a MCP73PVT-SM
+ 147b 1c3e I-N73V motherboard
07f8 MCP73 SATA RAID Controller
+ 147b 1c3e I-N73V motherboard
07fc MCP73 High Definition Audio
1019 297a MCP73PVT-SM
10de 07fc MCP73 High Definition Audio
- 07fe GeForce 7100/nForce 630i USB
+ 147b 1c3e I-N73V motherboard
+ 07fe MCP73 OHCI USB 1.1 Controller
1019 297a MCP73PVT-SM
+ 147b 1c3e I-N73V motherboard
1afa 7150 JW-IN7150-HD
0840 C77 [GeForce 8200M]
0844 C77 [GeForce 9100M G]
@@ -9178,6 +9452,7 @@
0a64 GT218 [ION]
0a65 GT218 [GeForce 210]
1043 8334 EN210 SILENT
+ 1462 8094 N210 [Geforce 210] PCIe graphics adapter
0a66 GT218 [GeForce 310]
0a67 GT218 [GeForce 315]
0a68 GT218M [GeForce G 105M]
@@ -9331,6 +9606,7 @@
0be3 High Definition Audio Controller
1028 040b Latitude E6510
10de 066d G98 [GeForce 8400GS]
+ 1462 8094 N210 [Geforce 210] PCIe graphics adapter
0be4 High Definition Audio Controller
0be5 GF100 High Definition Audio Controller
0be9 GF106 High Definition Audio Controller
@@ -9457,6 +9733,7 @@
0f00 GF108 [GeForce GT 630]
0f01 GF108 [GeForce GT 620]
0f02 GF108 [GeForce GT 730]
+ 0f06 GF108 [GeForce GT 730]
0fbb GM204 High Definition Audio Controller
0fc0 GK107 [GeForce GT 640 OEM]
0fc1 GK107 [GeForce GT 640]
@@ -9464,6 +9741,7 @@
0fc6 GK107 [GeForce GTX 650]
1043 8428 GTX650-DC-1GD5
0fc8 GK107 [GeForce GT 740]
+ 0fc9 GK107 [GeForce GT 730]
0fcd GK107M [GeForce GT 755M]
0fce GK107M [GeForce GT 640M LE]
0fd1 GK107M [GeForce GT 650M]
@@ -9498,6 +9776,9 @@
10de 101e GRID K100
0fe9 GK107M [GeForce GT 750M Mac Edition]
0fea GK107M [GeForce GT 755M Mac Edition]
+ 0fec GK107M [GeForce 710A]
+ 0fed GK107M [GeForce 820M]
+ 0fee GK107M [GeForce 810M]
0fef GK107GL [GRID K340]
0ff1 GK107 [NVS 1000]
0ff2 GK107GL [GRID K1]
@@ -9522,7 +9803,7 @@
3842 0784 GK110B [GeForce GTX 780 SC w/ ACX Cooler]
3842 1784 GK110B [GeForce GTX 780 Dual FTW w/ ACX Cooler]
3842 1788 GK110B [GeForce GTX 780 Dual Classified w/ ACX Cooler]
- 1005 GK110 [GeForce GTX Titan]
+ 1005 GK110 [GeForce GTX TITAN]
1043 8451 GTXTITAN-6GD5
# Reference Model
10de 1035 GeForce GTX Titan
@@ -9539,13 +9820,14 @@
1007 GK110 [GeForce GTX 780 Rev. 2]
1008 GK110 [GeForce GTX 780 Ti Rev. 2]
100a GK110B [GeForce GTX 780 Ti]
- 100c GK110B [GeForce GTX Titan Black]
+ 100c GK110B [GeForce GTX TITAN Black]
101e GK110GL [Tesla K20X]
101f GK110GL [Tesla K20]
1020 GK110GL [Tesla K20X]
1021 GK110GL [Tesla K20Xm]
1022 GK110GL [Tesla K20c]
1023 GK110BGL [Tesla K40m]
+ 10de 097e 12GB Computational Accelerator
1024 GK110BGL [Tesla K40c]
1026 GK110GL [Tesla K20s]
1027 GK110BGL [Tesla K40st]
@@ -9624,7 +9906,8 @@
10c3 GT218 [GeForce 8400 GS Rev. 3]
10c5 GT218 [GeForce 405]
10d8 GT218 [NVS 300]
- 1140 GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M]
+ 1140 GF117M [GeForce 610M/710M/810M/820M / GT 620M/625M/630M/720M]
+ 1019 0799 GeForce 820M
1019 999f GeForce GT 720M
1025 0600 GeForce GT 620M
1025 0606 GeForce GT 620M
@@ -9675,6 +9958,7 @@
1025 0856 GeForce 820M
1025 0857 GeForce 820M
1025 0858 GeForce 820M
+ 1025 0863 GeForce 820M
1025 0868 GeForce 820M
1025 0869 GeForce 810M
1025 0873 GeForce 820M
@@ -9688,6 +9972,7 @@
1025 0921 GeForce 820M
1025 092e GeForce 810M
1025 092f GeForce 820M
+ 1025 0932 GeForce 820M
1025 093a GeForce 820M
1025 093c GeForce 820M
1025 093f GeForce 820M
@@ -9722,6 +10007,7 @@
1028 065e GeForce 820M
1028 0662 GeForce 820M
1028 068d GeForce 820M
+ 1028 06c1 GeForce 820M
103c 18ef GeForce GT 630M
103c 18f9 GeForce GT 630M
103c 18fb GeForce GT 630M
@@ -9852,9 +10138,13 @@
17aa 2220 GeForce GT 720M
17aa 309c GeForce GT 720A
17aa 30b4 GeForce 820A
+ 17aa 30b7 GeForce 720A
+ 17aa 361b GeForce 820A
+ 17aa 361c GeForce 820A
17aa 3656 GeForce GT 620M
17aa 365a GeForce 705M
17aa 365e GeForce 800M
+ 17aa 3661 GeForce 820A
17aa 366c GeForce 800M
17aa 3685 GeForce 800M
17aa 3686 GeForce 800M
@@ -9865,6 +10155,9 @@
17aa 369d GeForce 820A
17aa 369e GeForce 820A
17aa 36a9 GeForce 820A
+ 17aa 36af GeForce 820A
+ 17aa 36b0 GeForce 820A
+ 17aa 36b6 GeForce 820A
17aa 3800 GeForce GT 720M
17aa 3801 GeForce GT 720M
17aa 3802 GeForce GT 720M
@@ -9921,12 +10214,18 @@
1854 0180 GeForce 710M
1854 0190 GeForce GT 720M
1854 0192 GeForce GT 720M
+ 1854 0224 GeForce 820M
+ 1b0a 01c0 GeForce 820M
1b0a 20dd GeForce GT 620M
1b0a 20df GeForce GT 620M
1b0a 210e GeForce 820M
1b0a 2202 GeForce GT 720M
1b0a 90d7 GeForce 820M
1b0a 90dd GeForce 820M
+ 1b50 5530 GeForce 820M
+ 1b6c 5531 GeForce GT 720M
+ 1bab 0106 GeForce 820M
+ 1d05 1013 GeForce 810M
1180 GK104 [GeForce GTX 680]
1043 83f1 GTX680-DC2-2GD5
3842 3682 GeForce GTX 680 Mac Edition
@@ -9989,14 +10288,17 @@
11c3 GK106 [GeForce GTX 650 Ti OEM]
10de 1030 GeForce GTX 650 Ti OEM
11c4 GK106 [GeForce GTX 645 OEM]
+ 11c5 GK106 [GeForce GT 740]
11c6 GK106 [GeForce GTX 650 Ti]
11c7 GK106 [GeForce GTX 750 Ti]
11c8 GK106 [GeForce GTX 650 OEM]
+ 11cb GK106 [GeForce GT 740]
11e0 GK106M [GeForce GTX 770M]
11e1 GK106M [GeForce GTX 765M]
11e2 GK106M [GeForce GTX 765M]
11e3 GK106M [GeForce GTX 760M]
17aa 3683 GeForce GTX 760A
+ 11e7 GK106M
11fa GK106GL [Quadro K4000]
11fc GK106GLM [Quadro K2100M]
1200 GF114 [GeForce GTX 560 Ti]
@@ -10050,6 +10352,7 @@
1286 GK208 [GeForce GT 720]
1287 GK208 [GeForce GT 730]
1288 GK208 [GeForce GT 720]
+ 1289 GK208 [GeForce GT 710]
1290 GK208M [GeForce GT 730M]
103c 2afa GeForce GT 730A
103c 2b04 GeForce GT 730A
@@ -10058,19 +10361,23 @@
1291 GK208M [GeForce GT 735M]
1292 GK208M [GeForce GT 740M]
17aa 3675 GeForce GT 740A
+ 17aa 367c GeForce GT 740A
17aa 3684 GeForce GT 740A
1293 GK208M [GeForce GT 730M]
1294 GK208M [GeForce GT 740M]
1295 GK208M [GeForce 710M]
- 103c 2b0d GeForce GT 710A
- 103c 2b0f GeForce GT 710A
- 103c 2b11 GeForce GT 710A
+ 103c 2b0d GeForce 710A
+ 103c 2b0f GeForce 710A
+ 103c 2b11 GeForce 710A
103c 2b20 GeForce 810A
- 103c 2b21 GeForce GT 810A
- 103c 2b22 GeForce GT 810A
+ 103c 2b21 GeForce 810A
+ 103c 2b22 GeForce 810A
+ 17aa 367a GeForce 805A
+ 17aa 367c GeForce 710A
1296 GK208M [GeForce 825M]
1298 GK208M [GeForce GT 720M]
1299 GK208M [GeForce 920M]
+ 129a GK208M [GeForce 910M]
12a0 GK208
12b9 GK208GLM [Quadro K610M]
12ba GK208GLM [Quadro K510M]
@@ -10080,8 +10387,12 @@
17aa 3697 GeForce 840A
17aa 3699 GeForce 840A
17aa 369c GeForce 840A
+ 1344 GM108M [GeForce 845M]
1346 GM108M [GeForce 930M]
1347 GM108M [GeForce 940M]
+ 134d GM108M [GeForce 940MX]
+ 137a GM108GLM [Quadro K620M]
+ 137d GM108M [GeForce 940A]
1380 GM107 [GeForce GTX 750 Ti]
1381 GM107 [GeForce GTX 750]
1382 GM107 [GeForce GTX 745]
@@ -10094,10 +10405,19 @@
1393 GM107M [GeForce 840M]
1398 GM107M [GeForce 845M]
139a GM107M [GeForce GTX 950M]
+ 17aa 362c GeForce GTX 950A
+ 17aa 362f GeForce GTX 950A
+ 17aa 363f GeForce GTX 950A
+ 17aa 3640 GeForce GTX 950A
+ 17aa 36b9 GeForce GTX 950A
139b GM107M [GeForce GTX 960M]
+ 103c 2b4c GeForce GTX 960A
139c GM107M [GeForce 940M]
- 13b0 GM107GLM [N16P-Q3]
+ 13b0 GM107GLM [Quadro M2000M]
+ 13b1 GM107GLM [Quadro M1000M]
+ 13b2 GM107GLM [Quadro M600M]
13b3 GM107GLM [Quadro K2200M]
+ 13b9 GM107GL [NVS 810]
13ba GM107GL [Quadro K2200]
13bb GM107GL [Quadro K620]
13bc GM107GL [Quadro K1200]
@@ -10110,13 +10430,36 @@
13d7 GM204M [GeForce GTX 980M]
13d8 GM204M [GeForce GTX 970M]
13d9 GM204M [GeForce GTX 965M]
+ 13da GM204M [GeForce GTX 980]
+ 13f0 GM204GL [Quadro M5000]
+ 13f1 GM204GL [Quadro M4000]
+ 13f2 GM204GL [Tesla M60]
+ 13f8 GM204GLM [Quadro M5000M]
+ 13f9 GM204GLM [Quadro M4000M]
+ 13fa GM204GLM [Quadro M3000M]
1401 GM206 [GeForce GTX 960]
+ 1402 GM206 [GeForce GTX 950]
+ 1407 GM206 [GeForce GTX 750 v2]
+ 1427 GM206M [GeForce GTX 965M]
+ 1617 GM204M [GeForce GTX 980M]
+ 1618 GM204M [GeForce GTX 970M]
+ 1619 GM204M [GeForce GTX 965M]
+ 161a GM204M [GeForce GTX 980]
+ 17c2 GM200 [GeForce GTX TITAN X]
+ 17c8 GM200 [GeForce GTX 980 Ti]
17f0 GM200GL [Quadro M6000]
+ 17fd GM200GL [Tesla M40]
10df Emulex Corporation
0720 OneConnect NIC (Skyhawk)
+ 103c 1934 FlexFabric 20Gb 2-port 650M Adapter
+ 103c 1935 FlexFabric 20Gb 2-port 650FLB Adapter
+ 103c 21d4 StoreFabric CN1200E 10Gb Converged Network Adapter
+ 103c 220a FlexFabric 10Gb 2-port 556FLR-SFP+ Adapter
+ 103c 803f Ethernet 10Gb 2-port 557SFP+ Adapter
17aa 1056 ThinkServer OCm14102-UX-L AnyFabric
17aa 1057 ThinkServer OCm14104-UX-L AnyFabric
17aa 1059 ThinkServer OCm14104-UT-L AnyFabric
+ 17aa 4014 ThinkServer OCm14102-NX-L AnyFabric
0722 OneConnect iSCSI Initiator (Skyhawk)
0723 OneConnect iSCSI Initiator + Target (Skyhawk)
0724 OneConnect FCoE Initiator (Skyhawk)
@@ -10265,8 +10608,14 @@
5229 RTS5229 PCI Express Card Reader
1025 0813 Aspire R7-571
103c 194e ProBook 455 G1 Notebook
+ 103c 1985 Pavilion 17-e163sg Notebook PC
+ 522a RTS522A PCI Express Card Reader
5249 RTS5249 PCI Express Card Reader
103c 1909 ZBook 15
+ 524a RTS524A PCI Express Card Reader
+ 5250 RTS5250 PCI Express Card Reader
+ 525a RTS525A PCI Express Card Reader
+ 5286 RTS5286 PCI Express Card Reader
5288 RTS5288 PCI Express Card Reader
5289 RTL8411 PCI Express Card Reader
1043 1457 K55A Laptop
@@ -10280,11 +10629,12 @@
8129 RTL-8129
10ec 8129 RT8129 Fast Ethernet Adapter
11ec 8129 RTL8111/8168 PCIe Gigabit Ethernet (misconfigured)
- 8136 RTL8101E/RTL8102E PCI Express Fast Ethernet controller
+ 8136 RTL8101/2/6E PCI Express Fast/Gigabit Ethernet controller
+ 103c 1985 Pavilion 17-e163sg Notebook PC
103c 2ab1 Pavilion p6774
103c 30cc Pavilion dv6700
1179 ff64 RTL8102E PCI-E Fast Ethernet NIC
- 17c0 1053 AzureWave AW-NE766 802.11B/G/N Mini PCIe Card Model RT2700E
+ 17c0 1053 RTL8101e Medion WIM 2210 Notebook PC [MD96850]
8138 RT8139 (B/C) Cardbus Fast Ethernet Adapter
10ec 8138 RT8139 (B/C) Fast Ethernet Adapter
8139 RTL-8100/8101L/8139 PCI Fast Ethernet Adapter
@@ -10302,6 +10652,7 @@
10ec 8139 RTL-8100/8101L/8139 PCI Fast Ethernet Adapter
10f7 8338 Panasonic CF-Y5 laptop
1113 ec01 LevelOne FNC-0107TX/FNC-0109TX
+ 1186 1104 DFE-520TX Fast Ethernet PCI Adapter (rev. D1)
1186 1300 DFE-538TX
1186 1320 SN5200
1186 8139 DRN-32TX
@@ -10352,7 +10703,7 @@
1043 11f5 A6J-Q008
1043 16d5 U6V/U31J laptop
1043 81aa P5B
- 1043 82c6 M3A78-EH Motherboard
+ 1043 82c6 M3A78 Series Motherboard
1043 83a3 M4A785TD Motherboard
1043 8432 P8P67 and other motherboards
1043 8505 P8 series motherboard
@@ -10365,6 +10716,7 @@
1462 7522 X58 Pro-E
1775 11cc CC11/CL11
1849 8168 Motherboard (one of many)
+ 7470 3468 TG-3468 Gigabit PCI Express Network Adapter
8086 d615 Desktop Board D510MO/D525MW
8169 RTL8169 PCI Gigabit Ethernet Controller
1025 0079 Aspire 5024WLMi
@@ -10421,7 +10773,6 @@
0405 Wildcard TE405P (2nd Gen)
0410 Wildcard TE410P (2nd Gen)
0600 Xilinx 6 Designs (Xilinx IP)
- 2b00 Zomojo Zcard
3fc0 RME Digi96
3fc1 RME Digi96/8
3fc2 RME Digi96/8 Pro
@@ -10541,7 +10892,7 @@
7005 SB Audigy LS Game Port
1102 1001 SB0310 Audigy LS MIDI/Game port
1102 1002 SB0312 Audigy LS MIDI/Game port
- 7006 [SB X-Fi Xtreme Audio] CA0110-IBG PCI to PCIe Bridge
+ 7006 [SB X-Fi Xtreme Audio] CA0110-IBG PCIe to PCI Bridge
8938 Ectiva EV1938
1033 80e5 SlimTower-Jim (NEC)
1071 7150 Mitac 7150
@@ -10574,8 +10925,11 @@
0620 RocketRAID 620 2 Port SATA-III Controller
0622 RocketRAID 622 2 Port SATA-III Controller
0640 RocketRAID 640 4 Port SATA-III Controller
+ 0641 RocketRAID 640L 4 Port SATA-III Controller
+ 0642 RocketRAID 642L SATA-III Controller (2 eSATA ports + 2 internal SATA ports)
0644 RocketRAID 644 4 Port SATA-III Controller (eSATA)
0645 RocketRAID 644L 4 Port SATA-III Controller (eSATA)
+ 0646 RocketRAID 644LS SATA-III Controller (4 eSATA devices connected by 1 SAS cable)
1720 RocketRAID 1720 (2x SATA II RAID Controller)
1740 RocketRAID 1740
1742 RocketRAID 1742
@@ -10612,6 +10966,8 @@
127d 0000 CineView II
8485 EM8485 REALmagic DVD/MPEG-4 A/V Decoder
8486 EM8486 REALmagic DVD/MPEG-4 A/V Decoder
+# Found in Cisco DMP-4305G
+ c621 EM8621L Digital Media Processor
c622 EM8622L MPEG-4.10 (H.264) and SMPTE 421M (VC-1) A/V Decoder
1106 VIA Technologies, Inc.
0102 Embedded VIA Ethernet Controller
@@ -10773,9 +11129,8 @@
287d VT8251 PCIE Root Port
287e VT8237/8251 Ultra VLINK Controller
3022 CLE266
- 3038 VT82xxxxx UHCI USB 1.1 Controller
-# possibly Hewlett-Packard D9840-60001 [Brio BA410 Motherboard]
- 0925 1234 VA-502 Mainboard
+ 3038 VT82xx/62xx UHCI USB 1.1 Controller
+ 0925 1234 onboard UHCI USB 1.1 Controller
1019 0985 P6VXA Motherboard
1019 0a81 L7VTA v1.0 Motherboard (KT400-8235)
1043 8080 A7V333 motherboard
@@ -10799,13 +11154,13 @@
3043 VT86C100A [Rhine]
10bd 0000 VT86C100A Fast Ethernet Adapter
1106 0100 VT86C100A Fast Ethernet Adapter
- 1186 1400 DFE-530TX rev A
+ 1186 1400 DFE-530TX PCI Fast Ethernet Adapter (rev. A)
3044 VT6306/7/8 [Fire II(M)] IEEE 1394 OHCI Controller
0010 0001 IEEE 1394 4port DCST 1394-3+1B
1025 005a TravelMate 290
103c 2a20 Pavilion t3030.de Desktop PC
103c 2a3b Media Center PC m7590n
- 1043 808a A8V/A8N/P4P800 series motherboard
+ 1043 808a A8V/A8N/P4P800/P5SD2 series motherboard
1043 81fe Motherboard
1458 1000 GA-7VT600-1394 Motherboard
1462 207d K8NGM2 series motherboard
@@ -10816,6 +11171,7 @@
3050 VT82C596 Power Management
3051 VT82C596 Power Management
3053 VT6105M [Rhine-III]
+ 1186 1404 DFE-530TX PCI Fast Ethernet Adapter (rev. D)
3057 VT82C686 [Apollo Super ACPI]
1019 0985 P6VXA Motherboard
1019 0987 K7VZA Motherboard
@@ -10838,9 +11194,11 @@
1462 3091 MS-6309 Onboard Audio
1462 3092 MS-6309 v2.x Mainboard (VIA VT1611A codec)
1462 3300 MS-6330 Onboard Audio
+ 1462 3400 MS-6340 (VT8363) motherboard
15dd 7609 Onboard Audio
3059 VT8233/A/8235/8237 AC97 Audio Controller
1019 0a81 L7VTA v1.0 Motherboard (KT400-8235)
+ 1019 1841 M811 (VT8367/VT8235/VT6103) [KT333] motherboard
1019 1877 K8M800-M2 (V2.0) onboard audio
1043 8095 A7V8X Motherboard (Realtek ALC650 codec)
1043 80a1 A7V8X-X Motherboard
@@ -10860,7 +11218,7 @@
1462 5901 KT6 Delta-FIS2R (MS-6590)
1462 7181 K8MM3-V mainboard
147b 1407 KV8-MAX3 motherboard
- 1695 300c EP-8KRA2+ Mainboard
+ 1695 300c Realtek ALC655 audio on EP-8KRA series mainboard
1849 0850 ASRock 775Dual-880 Pro onboard audio (Realtek ALC850)
1849 9739 P4VT8 Mainboard (C-Media CMI9739A codec)
# probably all K7VT2/4*/6
@@ -10868,18 +11226,18 @@
4005 4710 MSI K7T266 Pro2-RU (MSI-6380 v2) onboard audio (Realtek/ALC 200/200P)
a0a0 01b6 AK77-8XN onboard audio
a0a0 0342 AK86-L motherboard
- 3065 VT6102 [Rhine-II]
+ 3065 VT6102/VT6103 [Rhine-II]
1043 80a1 A7V8X-X Motherboard
1043 80ed A7V600-X Motherboard
- 1106 0102 VT6102 [Rhine II] Embeded Ethernet Controller on VT8235
- 1186 1400 DFE-530TX rev A
- 1186 1401 DFE-530TX rev B
+ 1106 0102 VT6102/6103 [Rhine II] Ethernet Controller
+ 1186 1400 DFE-530TX PCI Fast Ethernet Adapter (rev. A)
+ 1186 1401 DFE-530TX PCI Fast Ethernet Adapter (rev. B)
+ 1186 1402 DFE-530TX PCI Fast Ethernet Adapter (rev. B)
13b9 1421 LD-10/100AL PCI Fast Ethernet Adapter (rev.B)
1462 7061 MS-7061
1462 7181 K8MM3-V mainboard
147b 1c09 NV7 Motherboard
1695 3005 VT6103
- 1695 300c Realtek ALC655 sound chip
# probably all K7VT2/4*/6
1849 3065 K7VT series Motherboards
# This hosts more than just the Intel 537 codec, it also hosts PCtel (SIL33) and SmartLink (SIL34) codecs
@@ -10889,6 +11247,7 @@
1043 8052 VT8233A
3091 VT8633 [Apollo Pro266]
3099 VT8366/A/7 [Apollo KT266/A/333]
+ 1019 1841 M811 (VT8367/VT8235/VT6103) [KT333] motherboard
1043 8064 A7V266-E Mainboard
1043 807f A7V333 Mainboard
1849 3099 K7VT2 motherboard
@@ -10896,6 +11255,7 @@
3102 VT8662 Host Bridge
3103 VT8615 Host Bridge
3104 USB 2.0
+ 0925 1234 onboard EHCI USB 2.0 Controller
1019 0a81 L7VTA v1.0 Motherboard (KT400-8235)
1043 808c A7V8X motherboard
1043 80a1 A7V8X-X motherboard rev 1.01
@@ -10915,7 +11275,7 @@
19da a179 ZBOX nano VD01
3106 VT6105/VT6106S [Rhine-III]
1106 0105 VT6106S [Rhine-III]
- 1186 1403 DFE-530TX rev C
+ 1186 1403 DFE-530TX PCI Fast Ethernet Adapter (rev. C)
1186 1405 DFE-520TX Fast Ethernet PCI Adapter
1186 1406 DFE-530TX+ rev F2
1186 1407 DFE-538TX
@@ -10955,6 +11315,7 @@
1849 3168 P4VT8 Mainboard
3177 VT8235 ISA Bridge
1019 0a81 L7VTA v1.0 Motherboard (KT400-8235)
+ 1019 1841 M811 (VT8367/VT8235/VT6103) [KT333] motherboard
1043 808c A7V8X motherboard
1043 80a1 A7V8X-X motherboard
1106 0000 KT4AV motherboard
@@ -11034,6 +11395,7 @@
3432 VL80x xHCI USB 3.0 Controller
3456 VX11 Standard Host Bridge
345b VX11 Miscellaneous Bus
+ 3483 VL805 USB 3.0 Host Controller
3a01 VX11 Graphics [Chrome 645/640]
4149 VIA VT6420 (ATA133) Controller
4204 K8M800 Host Bridge
@@ -11431,6 +11793,10 @@
1093 75ff PXIe-8383mc DMA
1093 7600 PXIe-8383mc DMA
1093 7602 PXIe-8384
+# 32 port / 8 lane PCIe Gen 2 packet switch
+ 808f PES32NT8AG2
+ 80cf F32P08xG3 [PCIe boot mode]
+ 80d2 F32P08xG3 NVMe controller
111e Eldec
111f Precision Digital Images
4a47 Precision MX Video engine interface
@@ -11688,7 +12054,8 @@
0070 8993 WinTV HVR-2200
0070 89a0 WinTV HVR-2200
0070 89a1 WinTV HVR-2200
- 0070 f123 WinTV HVR-2205
+ 0070 f120 WinTV HVR-2205
+ 0070 f123 WinTV HVR-2215
7231 SAA7231
5ace 8000 Behold TV H8
5ace 8001 Behold TV H8
@@ -11815,6 +12182,7 @@
1137 012c VIC 1340 Dual 40Gb MLOM
1137 012e VIC 1227 Dual 10Gb SFP+ PCIe
1137 0137 VIC 1380 Dual 40Gb Mezzanine
+ 1137 014d VIC 1385 Dual 40Gb PCIe
0041 VIC PCIe Downstream Port
0042 VIC Management Controller
1137 0047 VIC P81E PCIe Management Controller
@@ -11822,6 +12190,7 @@
1137 00cd VIC 1285 PCIe Management Controller
1137 00ce VIC 1225T PCIe Management Controller
1137 012e VIC 1227 PCIe Management Controller
+ 1137 014d VIC 1385 PCIe Management Controller
0043 VIC Ethernet NIC
1137 0047 VIC P81E PCIe Ethernet NIC
1137 0048 VIC M81KR Mezzanine Ethernet NIC
@@ -11834,6 +12203,7 @@
1137 012c VIC 1340 MLOM Ethernet NIC
1137 012e VIC 1227 PCIe Ethernet NIC
1137 0137 VIC 1380 Mezzanine Ethernet NIC
+ 1137 014d VIC 1385 PCIe Ethernet NIC
0044 VIC Ethernet NIC Dynamic
1137 0047 VIC P81E PCIe Ethernet NIC Dynamic
1137 0048 VIC M81KR Mezzanine Ethernet NIC Dynamic
@@ -11846,6 +12216,7 @@
1137 012c VIC 1340 MLOM Ethernet NIC Dynamic
1137 012e VIC 1227 PCIe Ethernet NIC Dynamic
1137 0137 VIC 1380 Mezzanine Ethernet NIC Dynamic
+ 1137 014d VIC 1385 PCIe Ethernet NIC Dynamic
0045 VIC FCoE HBA
1137 0047 VIC P81E PCIe FCoE HBA
1137 0048 VIC M81KR Mezzanine FCoE HBA
@@ -11858,6 +12229,7 @@
1137 012c VIC 1340 MLOM FCoE HBA
1137 012e VIC 1227 PCIe FCoE HBA
1137 0137 VIC 1380 Mezzanine FCoE HBA
+ 1137 014d VIC 1385 PCIe FCoE HBA
0046 VIC SCSI Controller
1137 012a VIC M4308 SCSI Controller
004e VIC 82 PCIe Upstream Port
@@ -11866,6 +12238,7 @@
1137 012a VIC M4308 Dual 40Gb
1137 012c VIC 1340 Dual 40Gb MLOM
1137 0137 VIC 1380 Dual 40Gb Mezzanine
+ 1137 014d VIC 1385 Dual 40Gb PCIe
00cf VIC Userspace NIC
1137 004f VIC 1280 Mezzanine Userspace NIC
1137 0084 VIC 1240 MLOM Userspace NIC
@@ -11879,7 +12252,7 @@
1138 Ziatech Corporation
8905 8905 [STD 32 Bridge]
1139 Dynamic Pictures, Inc
- 0001 VGA Compatable 3D Graphics
+ 0001 VGA Compatible 3D Graphics
113a FWB Inc
113b Network Computing Devices
113c Cyclone Microsystems, Inc.
@@ -12339,7 +12712,7 @@
103c 30b5 Presario V3242AU
103c 30b7 Presario V6133CL
103c 30cc Pavilion dv6700
- 103c 30cf Pavilion dv9668eg Laptop
+ 103c 30cf Pavilion dv9500/9600/9700 series
1043 1237 A6J-Q008
1043 1967 V6800V
144d c018 X20 IV
@@ -12385,6 +12758,7 @@
1028 024f Dell Latitude e6500
103c 03b5 Presario V3242AU
103c 30b7 Presario V6133CL
+ 103c 30cf Pavilion dv9500/9600/9700 series
1183 0843 Alienware Aurora m9700
0852 xD-Picture Card Controller
1025 0121 Aspire 5920G
@@ -12434,7 +12808,10 @@
3a11 AirXpert DWL-AG520 Wireless PCI Adapter(rev.B)
4000 DL2000-based Gigabit Ethernet
4001 DGE-550SX PCI-X Gigabit Ethernet Adapter
+ 4200 DFE-520TX Fast Ethernet PCI Adapter
+ 1186 1103 DFE-520TX Fast Ethernet PCI Adapter (rev. C1)
4300 DGE-528T Gigabit Ethernet Adapter
+ 1186 4300 DGE-528T PCI Gigabit Ethernet Adapter
# rev. B1; RealTek RTL8168E.
1186 4b10 DGE-560T PCI Express (x1) Gigabit Ethernet Adapter
4302 DGE-530T Gigabit Ethernet Adapter (rev.C1) [Realtek RTL8169]
@@ -12509,7 +12886,6 @@
1198 Lambda Systems Inc
1199 Attachmate Corporation
0101 Advanced ISCA/PCI Adapter
- 6832 Sierra Wireless MC8780 Device
119a Mind Share, Inc.
119b Omega Micro Inc.
1221 82C092G
@@ -12564,6 +12940,7 @@
2a43 88W8366 [TopDog] 802.11n Wireless
2a55 88W8864 [Avastar] 802.11ac Wireless
2b36 88W8764 [Avastar] 802.11n Wireless
+ 2b38 88W8897 [AVASTAR] 802.11ac Wireless
4101 OLPC Cafe Controller Secure Digital Controller
4320 88E8001 Gigabit Ethernet Controller
1019 0f38 Marvell 88E8001 Gigabit Ethernet Controller (ECS)
@@ -13354,7 +13731,9 @@
0800 C4 ISDN
0a00 A1 ISDN [Fritz]
1244 0a00 FRITZ!Card ISDN Controller
- 0e00 Fritz!PCI v2.0 ISDN
+ 0e00 Fritz!Card PCI v2.0 ISDN
+ 0e80 Fritz!Card PCI v2.1 ISDN
+ 1244 0e00 PSB 3100F (AVM KAFKA) [Fritz!Card PCI v2.1]
1100 C2 ISDN
1200 T1 ISDN
2700 Fritz!Card DSL SL
@@ -13456,6 +13835,12 @@
14fe 0429 ES56-PI Data Fax Modem
125e Specialvideo Engineering SRL
125f Concurrent Technologies, Inc.
+# 4 x serial ports, 2 x printer ports
+ 2071 CC PMC/232
+# 4 x serial ports, 2 x printer ports
+ 2084 CC PMC/23P
+# 4 x serial ports, RS422
+ 2091 CC PMC/422
1260 Intersil Corporation
3872 ISL3872 [Prism 3]
1468 0202 LAN-Express IEEE 802.11b Wireless LAN
@@ -13524,6 +13909,7 @@
0718 SM718 LynxSE+
0720 SM720 Lynx3DM
0730 SM731 Cougar3DR
+ 0750 SM750
0810 SM810 LynxE
0811 SM811 LynxE
0820 SM820 Lynx3D
@@ -13534,14 +13920,14 @@
1273 Hughes Network Systems
0002 DirecPC
1274 Ensoniq
- 1171 ES1373 [AudioPCI] (also Creative Labs CT5803)
- 1371 ES1371 / Creative Labs CT2518 [AudioPCI-97]
+ 1171 ES1373 / Creative Labs CT5803 [AudioPCI]
+ 1371 ES1371 / Creative Labs CT2518/ES1373
0e11 0024 AudioPCI on Motherboard Compaq Deskpro
0e11 b1a7 ES1371, ES1373 AudioPCI
1033 80ac ES1371, ES1373 AudioPCI
1042 1854 Tazer
107b 8054 Tabor2
- 1274 1371 AudioPCI 64V/128 / Creative Sound Blaster CT4810
+ 1274 1371 AudioPCI 64V/128 / Creative CT4810/CT5803/CT5806 [Sound Blaster PCI]
1274 8001 CT4751 board
1462 6470 ES1371, ES1373 AudioPCI On Motherboard MS-6147 1.1A
1462 6560 ES1371, ES1373 AudioPCI On Motherboard MS-6156 1.10
@@ -13592,10 +13978,10 @@
8086 5643 ES1371, ES1373 AudioPCI On Motherboard Vancouver
8086 5753 ES1371, ES1373 AudioPCI On Motherboard WS440BX
5000 ES1370 [AudioPCI]
- 5880 5880B [AudioPCI]
- 1274 2000 Creative Sound Blaster AudioPCI128
+ 5880 5880B / Creative Labs CT5880
+ 1274 2000 Creative CT4810 [Sound Blaster AudioPCI 128]
1274 2003 Creative SoundBlaster AudioPCI 128
- 1274 5880 Creative Sound Blaster AudioPCI128
+ 1274 5880 Creative CT4750 [Sound Blaster PCI 128]
1274 8001 Sound Blaster 16PCI 4.1ch
1458 a000 5880 AudioPCI On Motherboard 6OXET
1462 6880 5880 AudioPCI On Motherboard MS-6188 1.00
@@ -13761,9 +14147,10 @@
8213 IT8213 IDE Controller
1458 b000 GA-EG45M-DS2H Mainboard
8330 IT8330G
- 8872 IT8874F PCI Dual Serial Port Controller
+ 8872 IT887xF PCI to ISA I/O chip with SMB, GPIO, Serial or Parallel Port
8888 IT8888F/G PCI to ISA Bridge with SMB [Golden Gate]
8889 IT8889F PCI to ISA Bridge
+ 8893 IT8893E PCIe to PCI Bridge
e886 IT8330G
1284 Sahara Networks, Inc.
1285 Platform Technologies, Inc.
@@ -14540,19 +14927,52 @@
1396 Cipher Systems Inc
1397 Cologne Chip Designs GmbH
08b4 ISDN network Controller [HFC-4S]
+ 1397 08b4 HFC-4S [Cologne Chip HFC-4S Eval. Board]
+ 1397 b51a HFC-4S [Allo.com BRI card]
1397 b520 HFC-4S [IOB4ST]
- 1397 b540 HFC-4S [Swyx 4xS0 SX2 QuadBri]
- 1397 b550 HFC-4S [Junghanns quadBRI]
- 1397 b556 HFC-4S [Junghanns DuoDBRI]
+ 1397 b540 HFC-4S [Swyx SX2 QuadBri]
+ 1397 b550 HFC-4S [Junghanns.NET quadBRI]
+ 1397 b556 HFC-4S [Junghanns.NET duoBRI]
+ 1397 b559 HFC-4S [Junghanns.NET duoBRI miniPCI]
+ 1397 b560 HFC-4S [BeroNet BN4S0]
+ 1397 b566 HFC-4S [BeroNet BN2S0]
+ 1397 b567 HFC-4S [BeroNet BN1S0 miniPCI]
+ 1397 b568 HFC-4S [BeroNet BN4S0 miniPCI]
+ 1397 b569 HFC-4S [BeroNet BN2S0 miniPCI]
+ 1397 b620 HFC-4S
+ 1397 b752 HFC-4S [Junghanns.NET quadBRI PCIe]
+ 1397 b761 HFC-4S [BeroNet BN2S0 PCIe]
+ 1397 b762 HFC-4S [BeroNet BN4S0 PCIe]
+ 1397 e884 HFC-4S [OpenVox B200P]
1397 e888 HFC-4S [OpenVox B200P / B400P]
16b8 ISDN network Controller [HFC-8S]
- 1397 b562 HFC-8S [IOB8ST]
+ 1397 16b8 HFC-8S [Cologne Chip HFC-8S Eval. Board]
+ 1397 b521 HFC-8S [IOB4ST Recording]
+ 1397 b522 HFC-8S [IOB8ST]
+ 1397 b552 HFC-8S [Junghanns.NET octoBRI]
+ 1397 b55b HFC-8S [Junghanns.NET octoBRI]
+ 1397 b562 HFC-8S [BeroNet BN8S0]
+ 1397 b56b HFC-8S [BeroNet BN8S0+]
+ 1397 b622 HFC-8S
+ 1397 e998 HFC-8S [OpenVox B800P]
2bd0 ISDN network controller [HFC-PCI]
0675 1704 ISDN Adapter (PCI Bus, D, C)
0675 1708 ISDN Adapter (PCI Bus, D, C, ACPI)
1397 2bd0 ISDN Board
e4bf 1000 CI1-1-Harp
30b1 ISDN network Controller [HFC-E1]
+ 1397 30b1 HFC-E1 [Cologne Chip HFC-E1 Eval. Board]
+ 1397 b523 HFC-E1 [IOB1E1]
+ 1397 b543 HFC-E1 [Swyx SX2 SinglePRI V2]
+ 1397 b544 HFC-E1 [Swyx SX2 DualPRI V2]
+ 1397 b553 HFC-E1 [Junghanns.NET singleE1]
+ 1397 b554 HFC-E1 [Junghanns.NET doubleE1]
+ 1397 b555 HFC-E1 [Junghanns.NET doubleE1 2.0]
+ 1397 b55a HFC-E1 [Junghanns.NET singleE1 miniPCI]
+ 1397 b563 HFC-E1 [beroNet BN1E1]
+ 1397 b564 HFC-E1 [beroNet BN2E1]
+ 1397 b565 HFC-E1 [beroNet BN2E1+]
+ 1397 b56a HFC-E1 [beroNet BN1E1 miniPCI]
b700 ISDN network controller PrimuX S0 [HFC-PCI]
f001 GSM Network Controller [HFC-4GSM]
1398 Clarion co. Ltd
@@ -14812,6 +15232,8 @@
1752 PCI-1752
1754 PCI-1754
1756 PCI-1756
+# FPGA bridge to two SJA1000
+ c302 MIOe-3680 2-Port CAN-Bus MIOe Module with Isolation Protection
13ff Silicon Spice Inc
1400 Artx Inc
1401 9432 TX
@@ -14926,7 +15348,7 @@
7168 PCI2S550 (Dual 16550 UART)
1409 0002 SER4036A3V (2x RS232 port)
1409 4027 SER4027A (1x RS232 port)
- 1409 4037 SER4037A (2x RS232 port)
+ 1409 4037 SER4037A(L) [SUNIX SUN1889] (2x RS232 port)
# Single DC-37 connector
1409 4056 SER4056A (4x RS232)
1409 5027 SER4027D
@@ -14951,7 +15373,6 @@
1412 VIA Technologies Inc.
1712 ICE1712 [Envy24] PCI Multi-Channel I/O Controller
1412 1712 Hoontech ST Audio DSP 24
- 1412 3632 M-Audio Delta Audiophile 192
1412 d630 M-Audio Delta 1010
1412 d631 M-Audio Delta DiO
1412 d632 M-Audio Delta 66
@@ -14976,6 +15397,7 @@
1412 1724 Albatron PX865PE 7.1
1412 3630 M-Audio Revolution 7.1
1412 3631 M-Audio Revolution 5.1
+ 1412 3632 M-Audio Audiophile 192
153b 1145 Aureon 7.1 Space
153b 1147 Aureon 5.1 Sky
153b 1150 PHASE 22
@@ -15223,8 +15645,10 @@
5011 T520-LL-CR Unified Wire Ethernet Controller
5012 T560-CR Unified Wire Ethernet Controller
5013 T580-CHR Unified Wire Ethernet Controller
- 5014 T580-LP-SO-CR Unified Wire Ethernet Controller
+ 5014 T580-SO-CR Unified Wire Ethernet Controller
5015 T502-BT Unified Wire Ethernet Controller
+ 5016 T580-OCP-SO Unified Wire Ethernet Controller
+ 5017 T520-OCP-SO Unified Wire Ethernet Controller
5080 T540-5080 Unified Wire Ethernet Controller
5081 T540-5081 Unified Wire Ethernet Controller
5082 T504-5082 Unified Wire Ethernet Controller
@@ -15235,6 +15659,17 @@
5087 T580-5087 Unified Wire Ethernet Controller
5088 T570-5088 Unified Wire Ethernet Controller
5089 T520-5089 Unified Wire Ethernet Controller
+ 5090 T540-5090 Unified Wire Ethernet Controller
+ 5091 T522-5091 Unified Wire Ethernet Controller
+ 5092 T520-5092 Unified Wire Ethernet Controller
+ 5093 T580-5093 Unified Wire Ethernet Controller
+ 5094 T540-5094 Unified Wire Ethernet Controller
+ 5095 T540-5095 Unified Wire Ethernet Controller
+ 5096 T580-5096 Unified Wire Ethernet Controller
+ 5097 T520-5097 Unified Wire Ethernet Controller
+ 5098 T580-5098 Unified Wire Ethernet Controller
+ 5099 T580-5099 Unified Wire Ethernet Controller
+ 509a T520-509A Unified Wire Ethernet Controller
5401 T520-CR Unified Wire Ethernet Controller
5402 T522-CR Unified Wire Ethernet Controller
5403 T540-CR Unified Wire Ethernet Controller
@@ -15254,8 +15689,10 @@
5411 T520-LL-CR Unified Wire Ethernet Controller
5412 T560-CR Unified Wire Ethernet Controller
5413 T580-CHR Unified Wire Ethernet Controller
- 5414 T580-LP-SO-CR Unified Wire Ethernet Controller
+ 5414 T580-SO-CR Unified Wire Ethernet Controller
5415 T502-BT Unified Wire Ethernet Controller
+ 5416 T580-OCP-SO Unified Wire Ethernet Controller
+ 5417 T520-OCP-SO Unified Wire Ethernet Controller
5480 T540-5080 Unified Wire Ethernet Controller
5481 T540-5081 Unified Wire Ethernet Controller
5482 T504-5082 Unified Wire Ethernet Controller
@@ -15266,6 +15703,17 @@
5487 T580-5087 Unified Wire Ethernet Controller
5488 T570-5088 Unified Wire Ethernet Controller
5489 T520-5089 Unified Wire Ethernet Controller
+ 5490 T540-5090 Unified Wire Ethernet Controller
+ 5491 T522-5091 Unified Wire Ethernet Controller
+ 5492 T520-5092 Unified Wire Ethernet Controller
+ 5493 T580-5093 Unified Wire Ethernet Controller
+ 5494 T540-5094 Unified Wire Ethernet Controller
+ 5495 T540-5095 Unified Wire Ethernet Controller
+ 5496 T580-5096 Unified Wire Ethernet Controller
+ 5497 T520-5097 Unified Wire Ethernet Controller
+ 5498 T580-5098 Unified Wire Ethernet Controller
+ 5499 T580-5099 Unified Wire Ethernet Controller
+ 549a T520-509A Unified Wire Ethernet Controller
5501 T520-CR Unified Wire Storage Controller
5502 T522-CR Unified Wire Storage Controller
5503 T540-CR Unified Wire Storage Controller
@@ -15285,8 +15733,10 @@
5511 T520-LL-CR Unified Wire Storage Controller
5512 T560-CR Unified Wire Storage Controller
5513 T580-CHR Unified Wire Storage Controller
- 5514 T580-LP-SO-CR Unified Wire Storage Controller
+ 5514 T580-SO-CR Unified Wire Storage Controller
5515 T502-BT Unified Wire Storage Controller
+ 5516 T580-OCP-SO Unified Wire Storage Controller
+ 5517 T520-OCP-SO Unified Wire Storage Controller
5580 T540-5080 Unified Wire Storage Controller
5581 T540-5081 Unified Wire Storage Controller
5582 T504-5082 Unified Wire Storage Controller
@@ -15297,6 +15747,17 @@
5587 T580-5087 Unified Wire Storage Controller
5588 T570-5088 Unified Wire Storage Controller
5589 T520-5089 Unified Wire Storage Controller
+ 5590 T540-5090 Unified Wire Storage Controller
+ 5591 T522-5091 Unified Wire Storage Controller
+ 5592 T520-5092 Unified Wire Storage Controller
+ 5593 T580-5093 Unified Wire Storage Controller
+ 5594 T540-5094 Unified Wire Storage Controller
+ 5595 T540-5095 Unified Wire Storage Controller
+ 5596 T580-5096 Unified Wire Storage Controller
+ 5597 T520-5097 Unified Wire Storage Controller
+ 5598 T580-5098 Unified Wire Storage Controller
+ 5599 T580-5099 Unified Wire Storage Controller
+ 559a T520-509A Unified Wire Storage Controller
5601 T520-CR Unified Wire Storage Controller
5602 T522-CR Unified Wire Storage Controller
5603 T540-CR Unified Wire Storage Controller
@@ -15316,8 +15777,10 @@
5611 T520-LL-CR Unified Wire Storage Controller
5612 T560-CR Unified Wire Storage Controller
5613 T580-CHR Unified Wire Storage Controller
- 5614 T580-LP-SO-CR Unified Wire Storage Controller
+ 5614 T580-SO-CR Unified Wire Storage Controller
5615 T502-BT Unified Wire Storage Controller
+ 5616 T580-OCP-SO Unified Wire Storage Controller
+ 5617 T520-OCP-SO Unified Wire Storage Controller
5680 T540-5080 Unified Wire Storage Controller
5681 T540-5081 Unified Wire Storage Controller
5682 T504-5082 Unified Wire Storage Controller
@@ -15328,6 +15791,17 @@
5687 T580-5087 Unified Wire Storage Controller
5688 T570-5088 Unified Wire Storage Controller
5689 T520-5089 Unified Wire Storage Controller
+ 5690 T540-5090 Unified Wire Storage Controller
+ 5691 T522-5091 Unified Wire Storage Controller
+ 5692 T520-5092 Unified Wire Storage Controller
+ 5693 T580-5093 Unified Wire Storage Controller
+ 5694 T540-5094 Unified Wire Storage Controller
+ 5695 T540-5095 Unified Wire Storage Controller
+ 5696 T580-5096 Unified Wire Storage Controller
+ 5697 T520-5097 Unified Wire Storage Controller
+ 5698 T580-5098 Unified Wire Storage Controller
+ 5699 T580-5099 Unified Wire Storage Controller
+ 569a T520-509A Unified Wire Storage Controller
5701 T520-CR Unified Wire Ethernet Controller
5702 T522-CR Unified Wire Ethernet Controller
5703 T540-CR Unified Wire Ethernet Controller
@@ -15347,7 +15821,7 @@
5711 T520-LL-CR Unified Wire Ethernet Controller
5712 T560-CR Unified Wire Ethernet Controller
5713 T580-CR Unified Wire Ethernet Controller
- 5714 T580-LP-SO-CR Unified Wire Ethernet Controller
+ 5714 T580-SO-CR Unified Wire Ethernet Controller
5715 T502-BT Unified Wire Ethernet Controller
5780 T540-5080 Unified Wire Ethernet Controller
5781 T540-5081 Unified Wire Ethernet Controller
@@ -15359,6 +15833,14 @@
5787 T580-5087 Unified Wire Ethernet Controller
5788 T570-5088 Unified Wire Ethernet Controller
5789 T520-5089 Unified Wire Ethernet Controller
+ 5790 T540-5090 Unified Wire Ethernet Controller
+ 5791 T522-5091 Unified Wire Ethernet Controller
+ 5792 T520-5092 Unified Wire Ethernet Controller
+ 5793 T580-5093 Unified Wire Ethernet Controller
+ 5794 T540-5094 Unified Wire Ethernet Controller
+ 5795 T540-5095 Unified Wire Ethernet Controller
+ 5796 T580-5096 Unified Wire Ethernet Controller
+ 5797 T520-5097 Unified Wire Ethernet Controller
5801 T520-CR Unified Wire Ethernet Controller [VF]
5802 T522-CR Unified Wire Ethernet Controller [VF]
5803 T540-CR Unified Wire Ethernet Controller [VF]
@@ -15378,8 +15860,10 @@
5811 T520-LL-CR Unified Wire Ethernet Controller [VF]
5812 T560-CR Unified Wire Ethernet Controller [VF]
5813 T580-CHR Unified Wire Ethernet Controller [VF]
- 5814 T580-LP-SO-CR Unified Wire Ethernet Controller [VF]
+ 5814 T580-SO-CR Unified Wire Ethernet Controller [VF]
5815 T502-BT Unified Wire Ethernet Controller [VF]
+ 5816 T580-OCP-SO Unified Wire Ethernet Controller [VF]
+ 5817 T520-OCP-SO Unified Wire Ethernet Controller [VF]
5880 T540-5080 Unified Wire Ethernet Controller [VF]
5881 T540-5081 Unified Wire Ethernet Controller [VF]
5882 T504-5082 Unified Wire Ethernet Controller [VF]
@@ -15390,6 +15874,17 @@
5887 T580-5087 Unified Wire Ethernet Controller [VF]
5888 T570-5088 Unified Wire Ethernet Controller [VF]
5889 T520-5089 Unified Wire Ethernet Controller [VF]
+ 5890 T540-5090 Unified Wire Ethernet Controller [VF]
+ 5891 T522-5091 Unified Wire Ethernet Controller [VF]
+ 5892 T520-5092 Unified Wire Ethernet Controller [VF]
+ 5893 T580-5093 Unified Wire Ethernet Controller [VF]
+ 5894 T540-5094 Unified Wire Ethernet Controller [VF]
+ 5895 T540-5095 Unified Wire Ethernet Controller [VF]
+ 5896 T580-5096 Unified Wire Ethernet Controller [VF]
+ 5897 T520-5097 Unified Wire Ethernet Controller [VF]
+ 5898 T580-5098 Unified Wire Ethernet Controller [VF]
+ 5899 T580-5099 Unified Wire Ethernet Controller [VF]
+ 589a T520-509A Unified Wire Ethernet Controller [VF]
a000 PE10K Unified Wire Ethernet Controller
1426 Storage Technology Corp.
1427 Better On-Line Solutions
@@ -15459,10 +15954,23 @@
144d Samsung Electronics Co Ltd
1600 Apple PCIe SSD
a800 XP941 PCIe SSD
+ a802 NVMe SSD Controller
a820 NVMe SSD Controller 171X
1028 1f95 Express Flash NVMe XS1715 SSD 400GB
1028 1f96 Express Flash NVMe XS1715 SSD 800GB
1028 1f97 Express Flash NVMe XS1715 SSD 1600GB
+ 1028 1fa4 Express Flash NVMe SM1715 3.2TB SFF
+ 1028 1fa6 Express Flash NVMe SM1715 3.2TB AIC
+ 1028 1fba Express Flash NVMe SM1715 800GB SFF
+ 1028 1fbb Express Flash NVMe SM1715 1.6TB SFF
+ 1028 1fbc Express Flash NVMe SM1715 1.6TB AIC
+ a821 NVMe SSD Controller 172X
+ 1028 1fb7 Express Flash NVMe PM1725 3.2TB SFF
+ 1028 1fb8 Express Flash NVMe PM1725 3.2TB AIC
+ 1028 1fb9 Express Flash NVMe PM1725 6.4TB AIC
+ 1028 1fc1 Express Flash NVMe PM1725 800GB SFF
+ 1028 1fc2 Express Flash NVMe PM1725 1.6TB SFF
+ 1028 1fc4 Express Flash NVMe PM1725 1.6TB AIC
144e OLITEC
144f Askey Computer Corp.
1450 Octave Communications Ind.
@@ -15533,7 +16041,6 @@
1485 ERMA - Electronic GmBH
1486 L3 Communications Telemetry & Instrumentation
1487 MARQUETTE Medical Systems
-1488 KONTRON Electronik GmBH
1489 KYE Systems Corporation
148a OPTO
148b INNOMEDIALOGIC Inc.
@@ -15542,7 +16049,6 @@
1003 HCF 56k Data/Fax Modem
148e OSI Plus Corporation
148f Plant Equipment, Inc.
- 5370 Dexlink AUWL15I1
1490 Stone Microsystems PTY Ltd.
1491 ZEAL Corporation
1492 Time Logic Corporation
@@ -15573,9 +16079,9 @@
14a1 Systembase Co Ltd
14a2 Millennium Engineering Inc
14a3 Maverick Networks
-# registered as GVC/BCM Advanced Research
-14a4 Broadcom Corporation (Wrong ID)
- 4318 BCM4318 [AirForce One 54g] 802.11g Wireless LAN Controller
+14a4 Lite-On Technology Corporation
+# Wrong vendor ID used
+ 4318 Broadcom BCM4318 [AirForce One 54g] 802.11g WLAN Controller
14a5 XIONICS Document Technologies Inc
14a6 INOVA Computers GmBH & Co KG
14a7 MYTHOS Systems Inc
@@ -15627,6 +16133,7 @@
14be L3 Communications
14bf SPIDER Communications Inc.
14c0 COMPAL Electronics Inc
+# now owned by CSP, Inc.
14c1 MYRICOM Inc.
0008 Myri-10G Dual-Protocol NIC
14c1 0008 10G-PCIE-8A
@@ -15864,6 +16371,7 @@
1656 NetXtreme BCM5718 Gigabit Ethernet PCIe
1657 NetXtreme BCM5719 Gigabit Ethernet PCIe
103c 169d Ethernet 1Gb 4-port 331FLR Adapter
+ 103c 22be Ethernet 1Gb 4-port 331i Adapter
1659 NetXtreme BCM5721 Gigabit Ethernet PCI Express
1014 02c6 eServer xSeries server mainboard
1028 01e6 PowerEdge 860
@@ -15933,8 +16441,8 @@
103c 280a DC5750 Microtower
167d NetXtreme BCM5751M Gigabit Ethernet PCI Express
1014 0577 ThinkPad Z60t
- 103c 0934 HP nx8220
- 103c 0940 HP Compaq nw8240 Mobile Workstation
+ 103c 0934 nx8220
+ 103c 0940 Compaq nw8240 Mobile Workstation
17aa 2081 ThinkPad R60e
167e NetXtreme BCM5751F Fast Ethernet PCI Express
167f NetLink BCM5787F Fast Ethernet PCI Express
@@ -15957,15 +16465,15 @@
168d NetXtreme II BCM57840 10/20 Gigabit Ethernet
168e NetXtreme II BCM57810 10 Gigabit Ethernet
103c 1798 Flex-10 10Gb 2-port 530FLB Adapter [Meru]
- 103c 17a5 HP Flex-10 10Gb 2-port 530M Adapter
- 103c 18d3 HP Ethernet 10Gb 2-port 530T Adapter
- 103c 1930 HP FlexFabric 10Gb 2-port 534FLR-SFP+ Adapter
- 103c 1931 HP StoreFabric CN1100R Dual Port Converged Network Adapter
- 103c 1932 HP FlexFabric 10Gb 2-port 534FLB Adapter
- 103c 1933 HP FlexFabric 10Gb 2-port 534M Adapter
- 103c 193a HP FlexFabric 10Gb 2-port 533FLR-T Adapter
- 103c 3382 HP Ethernet 10Gb 2-port 530FLR-SFP+ Adapter
- 103c 339d HP Ethernet 10Gb 2-port 530SFP+ Adapter
+ 103c 17a5 Flex-10 10Gb 2-port 530M Adapter
+ 103c 18d3 Ethernet 10Gb 2-port 530T Adapter
+ 103c 1930 FlexFabric 10Gb 2-port 534FLR-SFP+ Adapter
+ 103c 1931 StoreFabric CN1100R Dual Port Converged Network Adapter
+ 103c 1932 FlexFabric 10Gb 2-port 534FLB Adapter
+ 103c 1933 FlexFabric 10Gb 2-port 534M Adapter
+ 103c 193a FlexFabric 10Gb 2-port 533FLR-T Adapter
+ 103c 3382 Ethernet 10Gb 2-port 530FLR-SFP+ Adapter
+ 103c 339d Ethernet 10Gb 2-port 530SFP+ Adapter
1690 NetXtreme BCM57760 Gigabit Ethernet PCIe
1691 NetLink BCM57788 Gigabit Ethernet PCIe
1028 04aa XPS 8300
@@ -15991,12 +16499,16 @@
16a0 NetLink BCM5785 Fast Ethernet
16a1 BCM57840 NetXtreme II 10 Gigabit Ethernet
16a2 BCM57840 NetXtreme II 10/20-Gigabit Ethernet
- 103c 1916 HP FlexFabric 20Gb 2-port 630FLB Adapter
- 103c 1917 HP FlexFabric 20Gb 2-port 630M Adapter
+ 103c 1916 FlexFabric 20Gb 2-port 630FLB Adapter
+ 103c 1917 FlexFabric 20Gb 2-port 630M Adapter
+ 103c 2231 3820C 10/20Gb Converged Network Adapter
+ 103c 22fa FlexFabric 10Gb 2-port 536FLB Adapter
16a3 NetXtreme BCM57786 Gigabit Ethernet PCIe
16a4 BCM57840 NetXtreme II Ethernet Multi Function
- 103c 1916 HP NPAR 20Gb 2-port 630FLB Adapter
- 103c 1917 HP NPAR 20Gb 2-port 630M Adapter
+ 103c 1916 NPAR 20Gb 2-port 630FLB Adapter
+ 103c 1917 NPAR 20Gb 2-port 630M Adapter
+ 103c 2231 3820C 10/20Gb Converged Network Adapter (NPAR 1.5)
+ 103c 22fa FlexFabric 10Gb 2-port 536FLB Adapter (NPAR 1.5)
# The Broadcom 57800 device has two 1Gig ports and two 10Gig ports. The subsystem information can be used to differentiate.
16a5 NetXtreme II BCM57800 1/10 Gigabit Ethernet Multi Function
1028 1f5c NetXtreme II BCM57800 10-Gigabit Ethernet Multi Function
@@ -16040,30 +16552,32 @@
103c 703b NC373i Integrated Multifunction Gigabit Server Adapter
103c 703d NC373F PCI Express Multifunction Gigabit Server Adapter
16ad NetXtreme II BCM57840 10/20 Gigabit Ethernet Virtual Function
- 103c 1916 HP FlexFabric 20Gb 2-port 630FLB Adapter
- 103c 1917 HP FlexFabric 20Gb 2-port 630M Adapter
+ 103c 1916 FlexFabric 20Gb 2-port 630FLB Adapter
+ 103c 1917 FlexFabric 20Gb 2-port 630M Adapter
+ 103c 2231 3820C 10/20Gb Converged Network Adapter (SR-IOV VF)
+ 103c 22fa FlexFabric 10Gb 2-port 536FLB Adapter (SR-IOV VF)
16ae NetXtreme II BCM57810 10 Gigabit Ethernet Multi Function
- 103c 1798 HP NPAR 10Gb 2-port 530FLB Adapter
- 103c 17a5 HP NPAR 10Gb 2-port 530M Adapter
- 103c 18d3 HP NPAR 10Gb 2-port 530T Adapter
- 103c 1930 HP NPAR 10Gb 2-port 534FLR-SFP+ Adapter
- 103c 1931 HP NPAR CN1100R Dual Port Converged Network Adapter
- 103c 1932 HP NPAR 10Gb 2-port 534FLB Adapter
- 103c 1933 HP NPAR 10Gb 2-port 534M Adapter
- 103c 193a HP NPAR 10Gb 2-port 533FLR-T Adapter
- 103c 3382 HP NPAR 10Gb 2-port 530FLR-SFP+ Adapter
- 103c 339d HP NPAR 10Gb 2-port 530SFP+ Adapter
+ 103c 1798 NPAR 10Gb 2-port 530FLB Adapter
+ 103c 17a5 NPAR 10Gb 2-port 530M Adapter
+ 103c 18d3 NPAR 10Gb 2-port 530T Adapter
+ 103c 1930 NPAR 10Gb 2-port 534FLR-SFP+ Adapter
+ 103c 1931 NPAR CN1100R Dual Port Converged Network Adapter
+ 103c 1932 NPAR 10Gb 2-port 534FLB Adapter
+ 103c 1933 NPAR 10Gb 2-port 534M Adapter
+ 103c 193a NPAR 10Gb 2-port 533FLR-T Adapter
+ 103c 3382 NPAR 10Gb 2-port 530FLR-SFP+ Adapter
+ 103c 339d NPAR 10Gb 2-port 530SFP+ Adapter
16af NetXtreme II BCM57810 10 Gigabit Ethernet Virtual Function
- 103c 1798 HP Flex-10 10Gb 2-port 530FLB Adapter
- 103c 17a5 HP Flex-10 10Gb 2-port 530M Adapter
- 103c 18d3 HP Ethernet 10Gb 2-port 530T Adapter
- 103c 1930 HP FlexFabric 10Gb 2-port 534FLR-SFP+ Adapter
- 103c 1931 HP StoreFabric CN1100R Dual Port Converged Network Adapter
- 103c 1932 HP FlexFabric 10Gb 2-port 534FLB Adapter
- 103c 1933 HP FlexFabric 10Gb 2-port 534M Adapter
- 103c 193a HP FlexFabric 10Gb 2-port 533FLR-T Adapter
- 103c 3382 HP Ethernet 10Gb 2-port 530FLR-SFP+ Adapter
- 103c 339d HP Ethernet 10Gb 2-port 530SFP+ Adapter
+ 103c 1798 Flex-10 10Gb 2-port 530FLB Adapter
+ 103c 17a5 Flex-10 10Gb 2-port 530M Adapter
+ 103c 18d3 Ethernet 10Gb 2-port 530T Adapter
+ 103c 1930 FlexFabric 10Gb 2-port 534FLR-SFP+ Adapter
+ 103c 1931 StoreFabric CN1100R Dual Port Converged Network Adapter
+ 103c 1932 FlexFabric 10Gb 2-port 534FLB Adapter
+ 103c 1933 FlexFabric 10Gb 2-port 534M Adapter
+ 103c 193a FlexFabric 10Gb 2-port 533FLR-T Adapter
+ 103c 3382 Ethernet 10Gb 2-port 530FLR-SFP+ Adapter
+ 103c 339d Ethernet 10Gb 2-port 530SFP+ Adapter
16b0 NetXtreme BCM57761 Gigabit Ethernet PCIe
16b1 NetLink BCM57781 Gigabit Ethernet PCIe
1849 96b1 Z77 Extreme4 motherboard
@@ -16088,6 +16602,14 @@
103c 1321 Core I/O LAN/SCSI Combo [AB314A]
14e4 0009 NetXtreme BCM5703 1000Base-T
14e4 000a NetXtreme BCM5703 1000Base-SX
+ 16c8 BCM57301 NetXtreme-C Single-port 10Gb Ethernet
+ 16c9 BCM57302 NetXtreme-C Dual-port 10Gb/25Gb Ethernet
+ 16ca BCM57304 NetXtreme-C Dual-port 10Gb/25Gb/40Gb/50Gb Ethernet
+ 16cb BCM57304 NetXtreme-C Ethernet Virtual Function
+ 16d0 BCM57402 NetXtreme-E Dual-port 10Gb Ethernet
+ 16d1 BCM57404 NetXtreme-E Dual-port 10Gb/25Gb Ethernet
+ 16d2 BCM57406 NetXtreme-E Dual-port 10GBase-T Ethernet
+ 16d3 BCM57404 NetXtreme-E Ethernet Virtual Function
16dd NetLink BCM5781 Gigabit Ethernet PCI Express
16f3 NetXtreme BCM5727 Gigabit Ethernet PCIe
16f7 NetXtreme BCM5753 Gigabit Ethernet PCI Express
@@ -16288,6 +16810,7 @@
43a0 BCM4360 802.11ac Wireless Network Adapter
43a1 BCM4360 802.11ac Wireless Network Adapter
43a2 BCM4360 802.11ac Wireless Network Adapter
+ 43a3 BCM4350 802.11ac Wireless Network Adapter
43a9 BCM43217 802.11b/g/n
43aa BCM43131 802.11b/g/n
43b1 BCM4352 802.11ac Wireless Network Adapter
@@ -16297,9 +16820,12 @@
43d3 BCM43567 802.11ac Wireless Network Adapter
43d9 BCM43570 802.11ac Wireless Network Adapter
43df BCM4354 802.11ac Wireless LAN SoC
+ 43e9 BCM4358 802.11ac Wireless LAN SoC
43ec BCM4356 802.11ac Wireless Network Adapter
4401 BCM4401 100Base-T
1025 0035 TravelMate 660
+ 1025 0064 Extensa 3000 series laptop
+ 1028 8127 Dimension 2400
103c 08b0 tc1100 tablet
1043 80a8 A7V8X motherboard
4402 BCM4402 Integrated 10/100BaseT
@@ -16356,6 +16882,7 @@
5850 BCM5850 Crypto Accelerator
8602 BCM7400/BCM7405 Serial ATA Controller
a8d8 BCM43224/5 Wireless Network Adapter
+ aa52 BCM43602 802.11ac Wireless LAN SoC
b302 BCM56302 StrataXGS 24x1GE 2x10GE Switch Controller
b334 BCM56334 StrataXGS 24x1GE 4x10GE Switch Controller
b800 BCM56800 StrataXGS 10GE Switch Controller
@@ -16515,6 +17042,8 @@
2464 HSF 56k Data/Fax/Voice Modem (Mob SmartDAA)
2465 HSF 56k Data/Fax/Voice/Spkp (w/HS) Modem (Mob SmartDAA)
2466 HSF 56k Data/Fax/Voice/Spkp Modem (Mob SmartDAA)
+ 2702 HSFi modem RD01-D270
+ 1028 8d88 SmartHSFi V92 56K PCI Modem
2f00 HSF 56k HSFi Modem
13e0 8d84 IBM HSFi V.90
13e0 8d85 Compaq Stinger
@@ -16639,6 +17168,7 @@
4254 9580 T9580
4254 980c T980C
8880 CX23887/8 PCIe Broadcast Audio and Video Decoder with 3D Comb
+ 0070 2259 WinTV HVR-1250
0070 c108 WinTV-HVR-4400-HD model 1278
5654 2389 GoTView X5 DVD Hybrid PCI-E
5654 2390 GoTView X5 3D HYBRID PCI-E
@@ -16708,8 +17238,8 @@
1320 10bd SURECOM EP-320X-S 100/10M Ethernet PCI Adapter
0891 MTD-8xx 100/10M Ethernet PCI Adapter
1517 ECHOTEK Corp
-# nee PEP MODULAR Computers GmbH
-1518 Kontron Modular Computers GmbH
+# old ID, now 1059
+1518 Kontron
1519 TELEFON AKTIEBOLAGET LM Ericsson
151a Globetek
1002 PCI-1002
@@ -16930,8 +17460,8 @@
158d Point Multimedia Systems
158e Lara Technology Inc
158f Ditect Coop
-# nee 3PAR Inc.
-1590 Hewlett-Packard Company
+# formerly 3PAR Inc.
+1590 Hewlett Packard Enterprise
0001 Eagle Cluster Manager
0002 Osprey Cluster Manager
0003 Harrier Cluster Manager
@@ -16998,15 +17528,28 @@
01f6 MT27500 Family [ConnectX-3 Flash Recovery]
01ff MT27600 Family [Connect-IB Flash Recovery]
0209 MT27700 Family [ConnectX-4 Flash Recovery]
+ 020b MT27710 Family [ConnectX-4 Lx Flash Recovery]
+ 020d MT28800 Family [ConnectX-5 Flash Recovery]
+ 0262 MT27710 [ConnectX-4 Lx Programmable] EN
+ 0263 MT27710 [ConnectX-4 Lx Programmable Virtual Function] EN
1002 MT25400 Family [ConnectX-2 Virtual Function]
1003 MT27500 Family [ConnectX-3]
103c 1777 InfiniBand FDR/EN 10/40Gb Dual Port 544FLR-QSFP Adapter (Rev Cx)
103c 17c9 Infiniband QDR/Ethernet 10Gb 2-port 544i Adapter
+ 103c 18ce InfiniBand QDR/EN 10Gb Dual Port 544M Adapter
+ 103c 18cf InfiniBand FDR/EN 10/40Gb Dual Port 544M Adapter
103c 18d6 InfiniBand FDR/EN 10/40Gb Dual Port 544QSFP Adapter
1004 MT27500/MT27520 Family [ConnectX-3/ConnectX-3 Pro Virtual Function]
1005 MT27510 Family
1006 MT27511 Family
1007 MT27520 Family [ConnectX-3 Pro]
+ 103c 22f3 InfiniBand FDR/Ethernet 10Gb/40Gb 2-port 544+QSFP Adapter
+ 103c 22f4 InfiniBand FDR/Ethernet 10Gb/40Gb 2-port 544+FLR-QSFP Adapter
+ 103c 801f Ethernet 10G 2-port 546SFP+ Adapter
+ 117c 0090 FastFrame NQ41
+ 117c 0091 FastFrame NQ42
+ 117c 0092 FastFrame NQ11
+ 117c 0093 FastFrame NQ12
1009 MT27530 Family
100a MT27531 Family
100b MT27540 Family
@@ -17019,10 +17562,10 @@
1012 MT27600 Family [Connect-IB Virtual Function]
1013 MT27700 Family [ConnectX-4]
1014 MT27700 Family [ConnectX-4 Virtual Function]
- 1015 MT27630 Family
- 1016 MT27631 Family
- 1017 MT27640 Family
- 1018 MT27641 Family
+ 1015 MT27710 Family [ConnectX-4 Lx]
+ 1016 MT27710 Family [ConnectX-4 Lx Virtual Function]
+ 1017 MT28800 Family [ConnectX-5]
+ 1018 MT28800 Family [ConnectX-5 Virtual Function]
5274 MT21108 InfiniBridge
5a44 MT23108 InfiniHost
5a45 MT23108 [Infinihost HCA Flash Recovery]
@@ -17039,15 +17582,23 @@
6372 MT25408 [ConnectX EN 10GigE 10GBaseT, PCIe 2.0 2.5GT/s]
6732 MT26418 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE]
673c MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE]
+ 103c 1782 4X QDR InfiniBand Mezzanine HCA for c-Class BladeSystem
+ 15b3 0021 HP InfiniBand 4X QDR CX-2 PCI-e G2 Dual Port HCA
6746 MT26438 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE Virtualization+]
103c 1781 NC543i 1-port 4x QDR IB/Flex-10 10Gb Adapter
103c 3349 NC543i 2-port 4xQDR IB/10Gb Adapter
6750 MT26448 [ConnectX EN 10GigE, PCIe 2.0 5GT/s]
+ 15b3 0018 HP 10 GbE PCI-e G2 Dual-Port NIC (rev C1)
675a MT25408 [ConnectX EN 10GigE 10GBaseT, PCIe Gen2 5GT/s]
6764 MT26468 [ConnectX EN 10GigE, PCIe 2.0 5GT/s Virtualization+]
- 103c 3313 HP NC542m Dual Port Flex-10 10GbE BLc Adapter
+ 103c 3313 NC542m Dual Port Flex-10 10GbE BLc Adapter
676e MT26478 [ConnectX EN 40GigE, PCIe 2.0 5GT/s]
6778 MT26488 [ConnectX VPI PCIe 2.0 5GT/s - IB DDR / 10GigE Virtualization+]
+# SwitchX-2, 40GbE switch
+ c738 MT51136
+ caf1 ConnectX-4 CAPI Function
+# Spectrum, 100GbE Switch
+ cb84 MT52100
15b4 CCI/TRIAD
15b5 Cimetrics Inc
15b6 Texas Memory Systems Inc
@@ -17226,15 +17777,15 @@
1642 Bitland(ShenZhen) Information Technology Co., Ltd.
1657 Brocade Communications Systems, Inc.
0013 425/825/42B/82B 4Gbps/8Gbps PCIe dual port FC HBA
- 103c 1742 HP 82B 8Gbps dual port FC HBA
- 103c 1744 HP 42B 4Gbps dual port FC HBA
+ 103c 1742 82B 8Gbps dual port FC HBA
+ 103c 1744 42B 4Gbps dual port FC HBA
1657 0014 425/825 4Gbps/8Gbps PCIe dual port FC HBA
0014 1010/1020/1007/1741 10Gbps CNA
1657 0014 1010/1020/1007/1741 10Gbps CNA - FCOE
1657 0015 1010/1020/1007/1741 10Gbps CNA - LL
0017 415/815/41B/81B 4Gbps/8Gbps PCIe single port FC HBA
- 103c 1741 HP 41B 4Gbps single port FC HBA
- 103c 1743 HP 81B 8Gbps single port FC HBA
+ 103c 1741 41B 4Gbps single port FC HBA
+ 103c 1743 81B 8Gbps single port FC HBA
1657 0014 415/815 4Gbps/8Gbps single port PCIe FC HBA
0021 804 8Gbps FC HBA for HP Bladesystem c-class
# AnyIO Adapter
@@ -17251,6 +17802,74 @@
d200 PIXCI(R) D2X Digital Video Capture Board [custom QL5232]
d300 PIXCI(R) D3X Digital Video Capture Board [custom QL5232]
eb01 PIXCI(R) EB1 PCI Camera Link Video Capture Board
+# Gidel Reconfigurable Computing
+165c Gidel Ltd.
+ 5361 PROCStarII60-1
+ 5362 PROCStarII60-2
+ 5364 PROCStarII60-4
+ 5435 ProcSparkII
+ 5661 ProcE60
+ 56e1 ProcE180
+ 5911 ProcStarIII110-1
+ 5912 ProcStarIII110-2
+ 5913 ProcStarIII110-3
+ 5914 ProcStarIII110-4
+ 5921 ProcStarIII150-1
+ 5922 ProcStarIII150-2
+ 5923 ProcStarIII150-3
+ 5924 ProcStarIII150-4
+ 5931 ProcStarIII260-1
+ 5932 ProcStarIII260-2
+ 5933 ProcStarIII260-3
+ 5934 ProcStarIII260-4
+ 5941 ProcStarIII340-1
+ 5942 ProcStarIII340-2
+ 5943 ProcStarIII340-3
+ 5944 ProcStarIII340-4
+ 5a01 ProceIII80
+ 5a11 ProceIII110
+ 5a21 ProceIII150
+ 5a31 ProceIII260
+ 5a41 ProceIII340
+ 5b51 ProceIV360
+ 5b61 ProceIV530
+ 5b71 ProceIV820
+ 5c01 ProcStarIV80-1
+ 5c02 ProcStarIV80-2
+ 5c03 ProcStarIV80-3
+ 5c04 ProcStarIV80-4
+ 5c11 ProcStarIV110-1
+ 5c12 ProcStarIV110-2
+ 5c13 ProcStarIV110-3
+ 5c14 ProcStarIV110-4
+ 5c51 ProcStarIV360-1
+ 5c52 ProcStarIV360-2
+ 5c53 ProcStarIV360-3
+ 5c54 ProcStarIV360-4
+ 5c61 ProcStarIV530-1
+ 5c62 ProcStarIV530-2
+ 5c63 ProcStarIV530-3
+ 5c64 ProcStarIV530-4
+ 5c71 ProcStarIV820-1
+ 5c72 ProcStarIV820-2
+ 5c73 ProcStarIV820-3
+ 5c74 ProcStarIV820-4
+ 5d01 Proc10480
+ 5d11 Proc104110
+ 5f01 ProceV_A3
+ 5f11 ProceV_A7
+ 5f21 ProceV_AB
+ 5f31 ProceV_D5
+ 5f41 ProceV_D8
+ 6732 Proc6M
+ 6832 Proc12M
+ 7101 Proc10a_27
+ 7111 Proc10a_48
+ 7121 Proc10a_66
+ 7141 Proc10a_115
+ 7181 Proc10a_27S
+ 7191 Proc10a_48S
+ 71a1 Proc10a_66S
165d Hsing Tech. Enterprise Co., Ltd.
165f Linux Media Labs, LLC
1020 LMLM4 MPEG-4 encoder
@@ -17298,8 +17917,7 @@
126c 8031 2201 Mobile Adapter
1385 4400 WAB501 802.11ab Wireless CardBus Card
1b47 aa00 8460 802.11ab Wireless CardBus Adapter
-# AR5001G, AR5001X+, AR5002G, AR5002X, AR5004G, AR5004X chipsets
- 0013 AR5212/AR5213 Wireless Network Adapter
+ 0013 AR5212/5213/2414 Wireless Network Adapter
0308 3402 AG-100 802.11ag Wireless Cardbus Adapter
0308 3405 G-102 v2 802.11g Wireless Cardbus Adapter
0308 3408 G-170S 802.11g Wireless CardBus Adapter
@@ -17330,7 +17948,7 @@
1385 4b00 WG511T 108 Mbps Wireless PC Card (rev.A/B)
1385 4d00 WG311T 108 Mbps Wireless PCI Adapter (rev.A2)
1385 4f00 WG511U Double 108 Mbps Wireless PC Card
- 1385 5a00 WG311T 108 Mbps Wireless PCI Adapter (rev.A3)
+ 1385 5a00 WG311T (rev.A3 v1h3/v1h4) 108 Mbps Wireless PCI Adapter [AR2412]
1385 5b00 WG511T 108 Mbps Wireless PC Card (rev.C)
1385 5d00 WPN511 RangeMax Wireless PC Card
1458 e911 GN-WIAG02
@@ -17457,6 +18075,7 @@
002a AR928X Wireless Network Adapter (PCI-Express)
0777 4f05 SR71-X 802.11abgn Wireless ExpressCard Adapter [AR9280]
103c 3041 AR5BHB92-H 802.11abgn Wireless Half-size Mini PCIe Card [AR9280]
+ 103c 3042 AzureWave AW-NE773 802.11abgn Wireless Half-size Mini PCIe Card [AR9280]
105b e006 T77H053.00 802.11bgn Wireless Mini PCIe Card [AR9281]
105b e01f T77H047.31 802.11bgn Wireless Half-size Mini PCIe Card [AR9283]
106b 008f AirPort Extreme
@@ -17493,8 +18112,10 @@
1a56 2000 Killer Wireless-N 1102 Half-size Mini PCIe Card [AR9382]
1a56 2001 Killer Wireless-N 1103 Half-size Mini PCIe Card [AR9380]
0032 AR9485 Wireless Network Adapter
+ 1028 0208 Wireless 1506 WLAN Half Mini-Card
103c 1838 AR9485/HB125 802.11bgn 1×1 Wi-Fi Adapter
105b e044 Unex DHXA-225
+ 1a3b 1186 AW-NE186H
0033 AR9580 Wireless Network Adapter
0034 AR9462 Wireless Network Adapter
1a56 2003 Killer Wireless-N 1202 Half-size Mini PCIe Card
@@ -17502,9 +18123,12 @@
0037 AR9485 Wireless Network Adapter
# Also used as Gigabyte GC-WB150 on a PCIe-to-mini-PCIe converter
1a3b 2100 AW-NB100H 802.11n Wireless Mini PCIe Card
- 003c QCA988x 802.11ac Wireless Network Adapter
-# all QCA6174 devices?
- 003e Killer N1525 Wireless-AC
+ 003c QCA986x/988x 802.11ac Wireless Network Adapter
+ 003e QCA6174 802.11ac Wireless Network Adapter
+ 1a56 1525 Killer N1525 Wireless-AC
+ 0040 QCA9980/9990 802.11ac Wireless Network Adapter
+ 0041 QCA6164 802.11ac Wireless Network Adapter
+ 0050 QCA9887 802.11ac Wireless Network Adapter
0207 AR5210 Wireless Network Adapter [AR5000 802.11a]
1014 AR5212 802.11abg NIC
1014 058a ThinkPad 11a/b/g Wireless LAN Mini Express Adapter (AR5BXB6)
@@ -17530,6 +18154,8 @@
0001 SafeXcel 1140
000a SafeXcel 1841
1141 SafeXcel 1141
+# misused vendor ID 0001
+ 0001 0001 SafeXcel 1141 v. 1.1
1841 SafeXcel 1842
16af SparkLAN Communications, Inc.
16b4 Aspex Semiconductor Ltd
@@ -17618,6 +18244,8 @@
7003 XMC-7K410AX: User-Configurable Kintex-7 FPGA, 410k logic cells with AXM Plug-In I/O
7004 XMC-7K325CC: User-Configurable Kintex-7 FPGA, 325k logic cells, conduction-cooled
7005 XMC-7K410CC: User-Configurable Kintex-7 FPGA, 410k logic cells, conduction-cooled
+ 7006 XMC-7A200: User-Configurable Artix-7 FPGA, 200k logic cells with Plug-In I/O
+ 7007 XMC-7A200CC: User-Configurable Conduction-Cooled Artix-7 FPGA, with 200k logic cells
16da Advantech Co., Ltd.
0011 INES GPIB-PCI
16df PIKA Technologies Inc.
@@ -17710,6 +18338,8 @@
0094 Octeon Fusion CNF71XX Cell processor
0095 Octeon III CN78XX Network Processor
0096 Octeon III CN70XX Network Processor
+ 9700 Octeon III CN73XX Network Processor
+ 9800 Octeon Fusion CNF75XX Processor
a001 THUNDERX MRML Bridge
a002 THUNDERX PCC Bridge
177d a102 CN88XX PCC Bridge
@@ -17774,7 +18404,9 @@
0011 SIS1100-e single link
0012 SIS1100-e quad link
0015 SIS8100 [Gigabit link, MicroTCA]
-1797 Techwell Inc.
+# nee Techwell, Inc.
+1797 Intersil Techwell
+ 5864 TW5864 multimedia video controller
6801 TW6802 multimedia video card
6802 TW6802 multimedia other device
6810 TW6816 multimedia video controller
@@ -17842,6 +18474,11 @@
1170 ARC-1170 24-Port PCI-X to SATA RAID Controller
1201 ARC-1200 2-Port PCI-Express to SATA II RAID Controller
1210 ARC-1210 4-Port PCI-Express to SATA RAID Controller
+ 1214 ARC-12x4 PCIe 2.0 to SAS/SATA 6Gb RAID Controller
+ 17d3 1214 ARC-1214 4-Port PCIe 2.0 to SAS/SATA 6Gb RAID Controller
+ 17d3 1224 ARC-1224 8-Port PCIe 2.0 to SAS/SATA 6Gb RAID Controller
+ 17d3 1264 ARC-1264 12/16 Port PCIe 2.0 to SATA 6Gb RAID Controller
+ 17d3 1284 ARC-1284 24 Port PCIe 2.0 to SATA 6Gb RAID Controller
1220 ARC-1220 8-Port PCI-Express to SATA RAID Controller
1222 ARC-1222 8-Port PCI-Express to SAS/SATA II RAID Controller
1230 ARC-1230 12-Port PCI-Express to SATA RAID Controller
@@ -17849,9 +18486,22 @@
1280 ARC-1280/1280ML 24-Port PCI-Express to SATA II RAID Controller
17d3 1221 ARC-1221 8-Port PCI-Express to SATA RAID Controller
1300 ARC-1300ix-16 16-Port PCI-Express to SAS Non-RAID Host Adapter
- 1680 ARC-1680 8 port PCIe/PCI-X to SAS/SATA II RAID Controller
+ 1320 ARC-1320 8/16 Port PCIe 2.0 to SAS/SATA 6Gb Non-RAID Host Adapter
+ 1330 ARC-1330 16 Port PCIe 3.0 to SAS/SATA 12Gb Non-RAID Host Adapter
+ 1680 ARC-1680 series PCIe to SAS/SATA 3Gb RAID Controller
17d3 1212 ARC-1212 4-Port PCIe to SAS/SATA II RAID Controller
- 1880 ARC-1880 8/12 port PCIe/PCI-X to SAS/SATA II RAID Controller
+ 17d3 1222 ARC-1222 8-Port PCIe to SAS/SATA 3Gb RAID Controller
+ 17d3 1680 ARC-1680 8/12/16/24 Port PCIe to SAS/SATA 3Gb RAID Controller
+ 1880 ARC-188x series PCIe 2.0/3.0 to SAS/SATA 6/12Gb RAID Controller
+ 17d3 1213 ARC-1213 4-Port PCIe 2.0 to SAS/SATA 6Gb RAID Controller
+ 17d3 1215 ARC-1215 4-Port PCIe 3.0 to SAS/SATA 6Gb RAID Controller
+ 17d3 1216 ARC-1216 4-Port PCIe 3.0 to SAS/SATA 12Gb RAID Controller
+ 17d3 1223 ARC-1223 8-Port PCIe 2.0 to SAS/SATA 6Gb RAID Controller
+ 17d3 1225 ARC-1225 8-Port PCIe 3.0 to SAS/SATA 6Gb RAID Controller
+ 17d3 1226 ARC-1226 8-Port PCIe 3.0 to SAS/SATA 12Gb RAID Controller
+ 17d3 1880 ARC-1880 8/12/16/24 Port PCIe 2.0 to SAS/SATA 6Gb RAID Controller
+ 17d3 1882 ARC-1882 8/12/16/24 Port PCIe 3.0 to SAS/SATA 6Gb RAID Controller
+ 17d3 1883 ARC-1883 8/12/16/24 Port PCIe 3.0 to SAS/SATA 12Gb RAID Controller
# nee Neterion Inc., previously S2io Inc.
17d5 Exar Corp.
5731 Xframe 10-Gigabit Ethernet PCI-X
@@ -17999,9 +18649,11 @@
5360 RT5360 Wireless 802.11n 1T/1R
1186 3c05 DWA-525 Wireless N 150 Desktop Adapter (rev.A2)
20f4 703a TEW-703PI N150 Wireless PCI Adapter
+ 5362 RT5362 PCI 802.11n Wireless Network Adapter
5390 RT5390 Wireless 802.11n 1T/1R PCIe
103c 1636 U98Z077.00 Half-size Mini PCIe Card
5392 RT5392 PCIe Wireless Network Adapter
+ 539b RT5390R 802.11bgn PCIe Wireless Network Adapter
539f RT5390 [802.11 b/g/n 1T1R G-band PCI Express Single Chip]
103c 1637 Pavilion DM1Z-3000 PCIe wireless card
5592 RT5592 PCIe Wireless Network Adapter
@@ -18030,6 +18682,8 @@
1849 ASRock Incorporation
184a Thales Computers
1100 MAX II cPLD
+1850 Advantest Corporation
+ 0048 EK220-66401 Computer Interface Card
1851 Microtune, Inc.
1852 Anritsu Corp.
1853 SMSC Automotive Infotainment System Group
@@ -18193,6 +18847,7 @@
0135 NT20E2-PTP Network Adapter 2x10Gb
0145 NT40E3-4-PTP Network Adapter 4x10Gb
0155 NT100E3-1-PTP Network Adapter 1x100Gb
+ 0175 NT20E3-2-PTP Network Adapter 2x10Gb
18f6 NextIO
1000 [Nexsis] Switch Virtual P2P PCIe Bridge
1001 [Texsis] Switch Virtual P2P PCIe Bridge
@@ -18253,6 +18908,9 @@
0013 SH7757 PCIe Switch [PS]
0014 uPD720201 USB 3.0 Host Controller
0015 uPD720202 USB 3.0 Host Controller
+ 001a SH7758 PCIe-PCI Bridge [PPB]
+ 001b SH7758 PCIe End-Point [PBI]
+ 001d SH7758 PCIe Switch [PS]
1919 Soltek Computer Inc.
1923 Sangoma Technologies Corp.
0040 A200/Remora FXO/FXS Analog AFT card
@@ -18336,8 +18994,16 @@
1924 8007 SFN7322F-R2 Precision Time SFP+ Server Adapter
1924 8009 SFN7x22F-R2 Flareon Ultra 7000 Series 10G Adapter
1924 800a SFN7x02F-R2 Flareon 7000 Series 10G Adapter
+ 1924 800c SFN7x22F-R3 Flareon Ultra 7000 Series 10G Adapter
+ 1924 800d SFN7x02F-R3 Flareon 7000 Series 10G Adapter
+ 1924 8010 SFA7942Q-R1 QSFP+ AOE Adapter
0923 SFC9140
1924 800b SFN7x42Q-R1 Flareon Ultra 7000 Series 10/40G Adapter
+ 1924 800e SFN7x42Q-R2 Flareon Ultra 7000 Series 10/40G Adapter
+ 1924 800f SFN7xx4F-R1 Flareon Ultra 7000 Series 10G Adapter
+ 0a03 SFC9220
+ 1924 8012 SFN8522-R1 Flareon Ultra 8000 Series 10G Adapter
+ 1924 8014 SFN8542-R1 Flareon Ultra 8000 Series 10/40G Adapter
1803 SFC9020 Virtual Function [Solarstorm]
1813 SFL9021 Virtual Function [Solarstorm]
1903 SFC9120 Virtual Function
@@ -18468,6 +19134,10 @@
7018 MPC8610
c006 MPC8308
1a56 1201 Killer E2100 Gigabit Ethernet Controller
+# PCIe interface for emulator
+ fc02 RedStone
+# CFI device over PCIe
+ fc03 CFI
1958 Faster Technology, LLC.
1959 PA Semi, Inc
a000 PA6T Core
@@ -18502,6 +19172,7 @@
1073 AR8151 v1.0 Gigabit Ethernet
1083 AR8151 v2.0 Gigabit Ethernet
1090 AR8162 Fast Ethernet
+ 1043 108d VivoBook X202E, X202EV
1091 AR8161 Gigabit Ethernet
1043 1477 N56VZ
10a0 QCA8172 Fast Ethernet
@@ -18511,6 +19182,7 @@
2062 AR8152 v2.0 Fast Ethernet
# E2200, E2201, E2205
e091 Killer E220x Gigabit Ethernet Controller
+ e0a1 Killer E2400 Gigabit Ethernet Controller
196a Sensory Networks Inc.
0101 NodalCore C-1000 Content Classification Accelerator
0102 NodalCore C-2000 Content Classification Accelerator
@@ -18572,6 +19244,7 @@
8521 AU8521 TV card
# nee ServerEngines Corp.
19a2 Emulex Corporation
+ 0120 x1 PCIe Gen2 Bridge[Pilot4]
0200 BladeEngine 10Gb PCI-E iSCSI adapter
0201 BladeEngine 10Gb PCIe Network Adapter
0211 BladeEngine2 10Gb Gen2 PCIe Network Adapter
@@ -18602,6 +19275,8 @@
19ae Progeny Systems Corporation
0520 4135 HFT Interface Controller
0521 Decimator
+19ba ZyXEL Communications Corp.
+ 2330 ZyWALL Turbo Card
19c1 Exegy Inc.
# nee NextNet Wireless
19d1 Motorola Expedience
@@ -18714,6 +19389,7 @@
0001 Vulcan SP HT6210 10-Gigabit Ethernet (rev 02)
1a88 MEN Mikro Elektronik
4d45 Multifunction IP core
+1a8a StarBridge, Inc.
1a8c Verigy Pte. Ltd.
1100 E8001-66443 PCI Express CIC
1a8e DRS Technologies
@@ -18752,6 +19428,8 @@
0301 Wil6200 802.11ad Wireless Network Adapter
0302 Wil6200 802.11ad Wireless Network Adapter
0310 Wil6200 802.11ad Wireless Network Adapter
+1aea Alcor Micro
+ 6601 AU6601 PCI-E Flash card reader controller
1aec Wolfson Microelectronics
# nee Fusion-io
1aed SanDisk
@@ -18789,6 +19467,7 @@
1afa J & W Electronics Co., Ltd.
1b03 Magnum Semiconductor, Inc,
6100 DXT/DXTPro Multiformat Broadcast HD/SD Encoder/Decoder/Transcoder
+ 7000 D7 Multiformat Broadcast HD/SD Encoder/Decoder/Transcoder
1b08 MSC Vertriebs GmbH
1b0a Pegatron
1b13 Jaton Corp
@@ -18804,6 +19483,7 @@
1080 ASM1083/1085 PCIe to PCI Bridge
1849 1080 Motherboard
1142 ASM1042A USB 3.0 Host Controller
+ 1242 ASM1142 USB 3.1 Host Controller
1b2c Opal-RT Technologies Inc.
1b36 Red Hat, Inc.
0001 QEMU PCI-PCI bridge
@@ -18818,7 +19498,20 @@
0100 QXL paravirtual graphic card
1af4 1100 QEMU Virtual Machine
1b37 Signal Processing Devices Sweden AB
+ 0001 ADQ214
+ 0003 ADQ114
+ 0005 ADQ112
+ 000e ADQ108
+ 000f ADQDSP
0014 ADQ412
+ 0015 ADQ212
+ 001b SDR14
+ 001c ADQ1600
+ 001e ADQ208
+ 001f DSU
+ 0020 ADQ14
+ 2014 TX320
+ 2019 S6000
# now owned by HGST (a Western Digital subsidiary)
1b39 sTec, Inc.
0001 S1120 PCIe Accelerator SSD
@@ -18837,6 +19530,7 @@
0640 88SE9128 SATA III 6Gb/s RAID Controller
9120 88SE9120 SATA 6Gb/s Controller
9123 88SE9123 PCIe SATA 6.0 Gb/s controller
+ dc93 600e DC-6xxe series SATA 6G controller
9125 88SE9125 PCIe SATA 6.0 Gb/s controller
9128 88SE9128 PCIe SATA 6 Gb/s RAID controller
9130 88SE9128 PCIe SATA 6 Gb/s RAID controller with HyperDuo
@@ -18870,6 +19564,7 @@
1000 FL1000G USB 3.0 Host Controller
1d5c 1000 Anker USB 3.0 Express Card
1009 FL1009 USB 3.0 Host Controller
+ 1100 FL1100 USB 3.0 Host Controller
1b74 OpenVox Communication Co. Ltd.
0115 D115P/D115E Single-port E1/T1 card
d130 D130P/D130E Single-port E1/T1 card (3rd GEN)
@@ -18880,12 +19575,31 @@
1b85 OCZ Technology Group, Inc.
1041 RevoDrive 3 X2 PCI-Express SSD 240 GB (Marvell Controller)
8788 RevoDrive Hybrid
+1b94 Signatec / Dynamic Signals Corp
+ e400 PX14400 Dual Xilinx Virtex5 based Digitizer
1b96 Western Digital
1b9a XAVi Technologies Corp.
1bad ReFLEX CES
1bb0 SimpliVity Corporation
0002 OmniCube Accelerator OA-3000
0010 OmniCube Accelerator OA-3000-2
+1bb1 Seagate Technology PLC
+ 005d Nytro PCIe Flash Storage
+ 1bb1 6501 Nytro XP6500-8A1536 1.5TB
+# 2TB Nytro PCIe controller
+ 1bb1 6502 Nytro XP6500-8A2048
+# 4TB Nytro PCIe controller
+ 1bb1 6503 Nytro XP6500-8A4096
+# 2GB DRAM variant of Nytro card
+ 1bb1 6511 Nytro XH6550-2GB DRAM
+# 8GB variant of Nytro PCIe controller
+ 1bb1 6512 Nytro XH6550-8GB DRAM
+# 1.5 TB Nytro PCIe controller
+ 1bb1 6521 Nytro XP6500-8A1536 1.5TB
+# 2TB Nytro PCIe controller
+ 1bb1 6522 Nytro XP6500-8A2048
+# 4TB Nytro PCIe controller
+ 1bb1 6523 Nytro XP6500-8A4096
1bb3 Bluecherry
4304 BC-04120A MPEG4 4 port video encoder / decoder
4309 BC-08240A MPEG4 4 port video encoder / decoder
@@ -18900,11 +19614,24 @@
1bbf Maxeler Technologies Ltd.
0003 MAX3
0004 MAX4
+1bd0 Astronics Corporation
+ 1001 Mx5 PMC/XMC Databus Interface Card
+ 1002 PM1553-5 (PC/104+ MIL-STD-1553 Interface Card)
+ 1004 AB3000 Series Rugged Computer
+ 1005 PE1000 (Multi-Protocol PCIe/104 Interface Card)
+ 1101 OmniBus II PCIe Multi-Protocol Interface Card
+ 1102 OmniBusBox II Multi-Protocol Interface Core
+ 1103 OmniBus II cPCIe/PXIe Multi-Protocol Interface Card
+1bd4 Inspur Electronic Information Industry Co., Ltd.
1bee IXXAT Automation GmbH
0003 CAN-IB200/PCIe
1bf4 VTI Instruments Corporation
0001 SentinelEX
1bfd EeeTOP
+1c09 CSP, Inc.
+ 4254 10G-PCIE3-8D-2S
+ 4255 10G-PCIE3-8D-Q
+ 4256 10G-PCIE3-8D-2S
1c1c Symphony
0001 82C101
1c28 Lite-On IT Corp. / Plextor
@@ -18919,6 +19646,8 @@
00a4 FBC4XGG3 Capture 4x10Gb
00a5 FBC2XLG Capture 2x40Gb
00a6 FBC1CG Capture 1x100Gb
+ 00a9 FBC2XGHH Capture 2x10Gb
+ 00af Capture slave device
# Used on V120 VME Crate Controller
1c32 Highland Technology, Inc.
1c33 Daktronics, Inc
@@ -18928,6 +19657,11 @@
0300 Telas 2.V
1c44 Enmotus Inc
8000 8000 Storage IO Controller
+# A Western Digital Subsidiary
+1c58 HGST, Inc.
+ 0003 Ultrastar SN100 Series NVMe SSD
+ 1014 04f5 PCIe3 1.6TB NVMe Adapter
+ 1014 04f6 PCIe3 3.2TB NVMe Adapter
1c7e TTTech Computertechnik AG
0200 zFAS Debug Port
1c7f Elektrobit Austria GmbH
@@ -18939,20 +19673,43 @@
0100 CAN-PCIe-02
1cd2 SesKion GmbH
0301 Simulyzer-RT CompactPCI Serial DIO-1 card
+ 0302 Simulyzer-RT CompactPCI Serial PSI5-ECU-1 card
+ 0303 Simulyzer-RT CompactPCI Serial PSI5-SIM-1 card
+ 0304 Simulyzer-RT CompactPCI Serial PWR-ANA-1 card
+1cdd secunet Security Networks AG
1ce4 Exablaze
0001 ExaNIC X4
0002 ExaNIC X2
+ 0003 ExaNIC X10
1cf7 Subspace Dynamics
+1d00 Pure Storage
+1d1d CNEX Labs
+ 1f1f QEMU NVM Express LightNVM Controller
+ 2807 8800 series NVMe SSD
# CEM Solutions Pvt. Ltd.
1d21 Allo
1d26 Kalray Inc.
0040 Turbocard2 Accelerator
e004 AB01/EMB01 Development Board
+1d40 Techman Electronics (Changshu) Co., Ltd.
1d44 DPT
a400 PM2x24/PM3224
+1d49 Lenovo
1d5c Fantasia Trading LLC
+1d61 Technobox, Inc.
+1d65 Imagine Communications Corp.
+ 04de Taurus/McKinley
+1d6c Atomic Rules LLC
+ 1001 A5PL-E1
+ 1002 A5PL-E7
+ 1003 S5PEDS-AB
+ 1004 KC705-K325
+ 1005 ZC706-Z045
+ 1006 KCU105-KU040
+ 1007 XUSP3S-VU095 [Jasper]
+ 4200 A5PL-E1-10GETI [10 GbE Ethernet Traffic Instrument]
1de1 Tekram Technology Co.,Ltd.
- 0391 TRM-S1040
+ 0391 TRM-S1040 [DC-315 / DC-395 series]
2020 DC-390
690c 690c
dc29 DC290
@@ -18988,6 +19745,19 @@
0000 3011 10-Giga TOE Dual Port SFP+/CX4 Low Profile SmartNIC
0000 3012 10-Giga TOE Dual Port CX4/SFP+ Low Profile SmartNIC
0000 3014 10-Giga TOE Dual Port CX4 Low Profile SmartNIC
+ 4010 TN4010 Clean SROM
+ 4020 TN9030 10GbE CX4 Ethernet Adapter
+ 4022 TN9310 10GbE SFP+ Ethernet Adapter
+ 1186 4d00 DXE-810S 10GbE SFP+ Ethernet Adapter
+ 1fc9 3015 Ethernet Adapter
+ 4024 TN9210 10GBase-T Ethernet Adapter
+ 4025 TN9510 10GBase-T/NBASE-T Ethernet Adapter
+ 1186 2900 DXE-810T 10GBase-T Ethernet Adapter
+ 1fc9 3015 Ethernet Adapter
+ 4026 TN9610 10GbE SFP+ Ethernet Adapter
+1fcc StreamLabs
+ f416 MS416
+ fb01 MH4LM
1fce Cognio Inc.
0001 Spectrum Analyzer PC Card (SAgE)
1fd4 SUNIX Co., Ltd.
@@ -19012,7 +19782,9 @@
2955 Connectix Virtual PC
6e61 OHCI USB 1.1 controller
2a15 3D Vision(???)
+2bd8 ROPEX Industrie-Elektronik GmbH
3000 Hansol Electronics Inc.
+3112 Satelco Ingenieria S.A.
3142 Post Impression Systems.
31ab Zonet
1faa ZEW1602 802.11b/g Wireless Adapter
@@ -19055,6 +19827,7 @@
1140 VR-12-PCI
# multiport serial board
1141 PCI-485(422)
+ 1142 PCI-CAN2
3842 eVga.com. Corp.
38ef 4Links
3d3d 3DLabs
@@ -19156,6 +19929,14 @@
0200 CPC
4254 DVBSky
4321 Tata Power Strategic Electronics Division
+4348 WCH.CN
+ 2273 CH351 PCI Dual Serial Port Controller
+ 3253 CH352 PCI Dual Serial Port Controller
+ 3453 CH353 PCI Quad Serial Port Controller
+ 5053 CH352 PCI Serial and Parallel Port Controller
+ 7053 CH353 PCI Dual Serial and Parallel Ports Controller
+ 7073 CH356 PCI Quad Serial and Parallel Ports Controller
+ 7173 CH355 PCI Quad Serial Port Controller
434e CAST Navigation LLC
4444 Internext Compression Inc
0016 iTVC16 (CX23416) Video Decoder
@@ -19490,6 +20271,10 @@
5431 AuzenTech, Inc.
544c Teralogic Inc
0350 TL880-based HDTV/ATSC tuner
+544d TBS Technologies
+ 6178 DVB-S2 4 Tuner PCIe Card
+ 544d 6904 TBS6904 DVB-S2 Quad Tuner PCIe Card
+ 544d 6905 TBS6905 DVB-S2 Quad Tuner PCIe Card
5452 SCANLAB AG
3443 RTC4
5455 Technische University Berlin
@@ -19510,6 +20295,7 @@
8032 tDVR8032 32-chan video capture card
5853 XenSource, Inc.
0001 Xen Platform Device
+ c000 Citrix XenServer PCI Device for Windows Update
# Virtual device surfaced in guests to provide HID events.
c110 Virtualized HID
# Device surfaced in guests to provide 2d graphics capabilities
@@ -19551,6 +20337,7 @@
7284 HT OMEGA Inc.
7401 EndRun Technologies
e100 PTP3100 PCIe PTP Slave Clock
+7470 TP-LINK Technologies Co., Ltd.
7604 O.N. Electronic Co Ltd.
7bde MIDAC Corporation
7fed PowerTV
@@ -19571,12 +20358,14 @@
0044 Core Processor DRAM Controller
1025 0347 Aspire 7740G
1025 0487 TravelMate 5742
+ 1028 040a Latitude E6410
144d c06a R730 Laptop
17c0 10d2 Medion Akoya E7214 Notebook PC [MD98410]
e4bf 50c1 PC1-GROOVE
0045 Core Processor PCI Express x16 Root Port
17c0 10d2 Medion Akoya E7214 Notebook PC [MD98410]
0046 Core Processor Integrated Graphics Controller
+ 1028 040a Latitude E6410
144d c06a R730 Laptop
17c0 10d9 Medion Akoya E7214 Notebook PC [MD98410]
e4bf 50c1 PC1-GROOVE
@@ -19682,13 +20471,16 @@
0153 3rd Gen Core Processor Thermal Subsystem
1043 1517 Zenbook Prime UX31A
0154 3rd Gen Core processor DRAM Controller
+ 1025 0806 Aspire E1-470G
1025 0813 Aspire R7-571
103c 17f6 ProBook 4540s
+ 1043 108d VivoBook X202EV
1043 1477 N56VZ
1043 1517 Zenbook Prime UX31A
0155 Xeon E3-1200 v2/3rd Gen Core processor PCI Express Root Port
8086 2010 Server Board S1200BTS
0156 3rd Gen Core processor Graphics Controller
+ 1043 108d VivoBook X202EV
0158 Xeon E3-1200 v2/Ivy Bridge DRAM Controller
1043 844d P8 series motherboard
8086 2010 Server Board S1200BTS
@@ -19728,9 +20520,9 @@
0336 80331 [Lindsay] I/O processor (ATU)
0340 41210 [Lanai] Serial to Parallel PCI Bridge (A-Segment Bridge)
0341 41210 [Lanai] Serial to Parallel PCI Bridge (B-Segment Bridge)
- 0370 80333 Segment-A PCI Express-to-PCI Express Bridge
+ 0370 80333 Segment-A PCIe Express to PCI-X bridge
0371 80333 A-Bus IOAPIC
- 0372 80333 Segment-B PCI Express-to-PCI Express Bridge
+ 0372 80333 Segment-B PCIe Express to PCI-X bridge
0373 80333 B-Bus IOAPIC
0374 80333 Address Translation Unit
0402 Xeon E3-1200 v3/4th Gen Core Processor Integrated Graphics Controller
@@ -19741,13 +20533,15 @@
17aa 220e ThinkPad T440p
041a Xeon E3-1200 v3 Processor Integrated Graphics Controller
041e 4th Generation Core Processor Family Integrated Graphics Controller
- 0433 Coleto Creek ACC - ME/CPM interface
- 0435 Coleto Creek PCIe Endpoint
+ 0434 DH89XXCC Series QAT
+ 0435 DH895XCC Series QAT
0436 DH8900CC Null Device
0438 DH8900CC Series Gigabit Network Connection
043a DH8900CC Series Gigabit Fiber Network Connection
043c DH8900CC Series Gigabit Backplane Network Connection
0440 DH8900CC Series Gigabit SFP Network Connection
+ 0442 DH89XXCC Series QAT Virtual Function
+ 0443 DH895XCC Series QAT Virtual Function
0482 82375EB/SB PCI to EISA Bridge
0483 82424TX/ZX [Saturn] CPU to PCI bridge
0484 82378ZB/IB, 82379AB (SIO, SIO.A) PCI to ISA Bridge
@@ -20060,6 +20854,8 @@
8086 3705 DC P3500 SSD [2.5" SFF]
8086 3709 DC P3600 SSD [Add-in Card]
8086 370a DC P3600 SSD [2.5" SFF]
+ 8086 370d SSD 750 Series [Add-in Card]
+ 8086 370e SSD 750 Series [2.5" SFF]
095a Wireless 7265
# Stone Peak 2 AC
8086 1010 Dual Band Wireless-AC 7265
@@ -20201,6 +20997,10 @@
0c48 Atom Processor S1200 PCI Express Root Port 3
0c49 Atom Processor S1200 PCI Express Root Port 4
0c4e Atom Processor S1200 NTB Primary
+ 0c50 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QuickData Technology Device
+ 0c51 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QuickData Technology Device
+ 0c52 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QuickData Technology Device
+ 0c53 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QuickData Technology Device
0c54 Atom Processor S1200 Internal
0c55 Atom Processor S1200 DFX 1
0c56 Atom Processor S1200 DFX 2
@@ -20393,7 +21193,8 @@
0f28 Atom Processor Z36xxx/Z37xxx Series LPE Audio Controller
0f31 Atom Processor Z36xxx/Z37xxx Series Graphics & Display
0f34 Atom Processor Z36xxx/Z37xxx Series USB EHCI
- 0f35 Atom Processor Z36xxx/Z37xxx Series USB xHCI
+ 0f35 Atom Processor Z36xxx/Z37xxx, Celeron N2000 Series USB xHCI
+ 1025 0936 Aspire ES1
0f37 Atom Processor Z36xxx/Z37xxx Series OTG USB Device
0f38 Atom Processor Z36xxx/Z37xxx Series Camera ISP
0f40 Atom Processor Z36xxx/Z37xxx Series LPIO2 DMA Controller
@@ -20747,7 +21548,7 @@
8086 1199 PRO/1000 GT Quad Port Server Adapter
10b6 82598 10GbE PCI-Express Ethernet Controller
10b9 82572EI Gigabit Ethernet Controller (Copper)
- 103c 704a HP 110T PCIe Gigabit Server Adapter
+ 103c 704a 110T PCIe Gigabit Server Adapter
8086 1083 PRO/1000 PT Desktop Adapter
8086 1093 PRO/1000 PT Desktop Adapter
10ba 80003ES2LAN Gigabit Ethernet Controller (Copper)
@@ -20862,6 +21663,7 @@
1028 1f63 10GbE 2P X520k bNDC
103c 17d2 Ethernet 10Gb 2-port 560M Adapter
103c 18d0 Ethernet 10Gb 2-port 560FLB Adapter
+ 1059 0111 T4007 10GbE interface
8086 000c Ethernet X520 10GbE Dual Port KX4-KR Mezz
10f9 82599 10 Gigabit Dual Port Network Connection
10fb 82599ES 10-Gigabit SFI/SFP+ Network Connection
@@ -20875,6 +21677,7 @@
108e 7b11 Ethernet Server Adapter X520-2
1734 11a9 10 Gigabit Dual Port Network Connection
17aa 1071 ThinkServer X520-2 AnyFabric
+ 17aa 4007 82599ES 10-Gigabit SFI/SFP+ Network Connection
8086 0002 Ethernet Server Adapter X520-DA2
8086 0003 Ethernet Server Adapter X520-2
8086 0006 Ethernet Server Adapter X520-1
@@ -20890,14 +21693,14 @@
1025 1016 Travelmate 612 TX
1043 8027 TUSL2-C Mainboard
104d 80df Vaio PCG-FX403
- 8086 4532 D815EEA2 mainboard
+ 8086 4532 Desktop Board D815EEA2/D815EFV
8086 4557 D815EGEW Mainboard
1131 82815 815 Chipset AGP Bridge
1132 82815 Chipset Graphics Controller (CGC)
1025 1016 Travelmate 612 TX
103c 2001 e-pc 40
104d 80df Vaio PCG-FX403
- 8086 4532 D815EEA2 Mainboard
+ 8086 4532 Desktop Board D815EEA2/D815EFV
8086 4541 D815EEA Motherboard
8086 4557 D815EGEW Mainboard
1161 82806AA PCI64 Hub Advanced Programmable Interrupt Controller
@@ -21152,6 +21955,7 @@
103c 337f Ethernet 1Gb 2-port 361i Adapter
103c 3380 Ethernet 1Gb 4-port 366i Adapter
103c 339e Ethernet 1Gb 2-port 361T Adapter
+ 103c 8157 Ethernet 1Gb 4-port 366T Adapter
108e 7b16 Quad Port GbE PCIe 2.0 ExpressModule, UTP
108e 7b18 Quad Port GbE PCIe 2.0 Low Profile Adapter, UTP
1093 7648 PCIe-8237R Ethernet Adapter
@@ -21160,6 +21964,7 @@
1093 775b PCIe-8237 Ethernet Adapter
10a9 802a UV2-BaseIO dual-port GbE
17aa 1074 ThinkServer I350-T4 AnyFabric
+ 17aa 4005 I350 Gigabit Network Connection
8086 0001 Ethernet Server Adapter I350-T4
8086 0002 Ethernet Server Adapter I350-T2
8086 00a1 Ethernet Server Adapter I350-T4
@@ -21197,16 +22002,19 @@
103c 192d 561FLR-T 2-port 10Gb Ethernet Adapter
103c 2004 Ethernet 10Gb 2-port 561i Adapter
103c 211a Ethernet 10Gb 2-port 561T Adapter
+ 108e 4853 Ethernet Controller 10-Gigabit X540-AT2
108e 7b14 Sun Dual Port 10 GbE PCIe 2.0 ExpressModule, Base-T
108e 7b15 Sun Dual Port 10 GbE PCIe 2.0 Low Profile Adapter, Base-T
1137 00bf Ethernet Converged Network Adapter X540-T2
17aa 1073 ThinkServer X540-T2 AnyFabric
+ 17aa 4006 Ethernet Controller 10-Gigabit X540-AT2
8086 0001 Ethernet Converged Network Adapter X540-T2
8086 0002 Ethernet Converged Network Adapter X540-T1
8086 001a Ethernet Converged Network Adapter X540-T2
8086 00a2 Ethernet Converged Network Adapter X540-T1
8086 1f61 Ethernet 10G 4P X540/I350 rNDC
8086 5003 Ethernet 10G 2P X540-t Adapter
+ 8086 5004 Ethernet 10G 2P X540-t Adapter
1529 82599 10 Gigabit Dual Port Network Connection with FCoE
152a 82599 10 Gigabit Dual Port Backplane Connection with FCoE
1533 I210 Gigabit Network Connection
@@ -21219,6 +22027,9 @@
8086 0002 Ethernet Server Adapter I210-T1
1536 I210 Gigabit Fiber Network Connection
1537 I210 Gigabit Backplane Connection
+ 1059 0110 T4005 1GbE interface
+ 1059 0111 T4007 1GbE interface
+ 1059 0120 T4008 1GbE interface
1538 I210 Gigabit Network Connection
1539 I211 Gigabit Network Connection
153a Ethernet Connection I217-LM
@@ -21235,6 +22046,7 @@
154d Ethernet 10G 2P X520 Adapter
8086 7b11 10GbE 2P X520 Adapter
1557 82599 10 Gigabit Network Connection
+ 17aa 4008 82599EN 10 Gigabit Network Connection
8086 0001 Ethernet OCP Server Adapter X520-1
1558 Ethernet Converged Network Adapter X520-Q1
8086 011a Ethernet Converged Network Adapter X520-Q1
@@ -21248,13 +22060,26 @@
8086 0001 Ethernet Server Bypass Adapter X520-SR2
8086 0002 Ethernet Server Bypass Adapter X520-LR2
1560 Ethernet Controller X540
+ 1563 Ethernet Controller 10G X550T
+ 8086 0001 Ethernet Converged Network Adapter X550-T2
+ 8086 001a Ethernet Converged Network Adapter X550-T2
+ 156c DSL5520 Thunderbolt [Falcon Ridge]
+ 156d DSL5520 Thunderbolt [Falcon Ridge]
156f Ethernet Connection I219-LM
1570 Ethernet Connection I219-V
1571 XL710/X710 Virtual Function
1572 Ethernet Controller X710 for 10GbE SFP+
+ 1028 0000 Ethernet 10G X710 rNDC
1028 1f99 Ethernet 10G 4P X710/I350 rNDC
- 17aa 0000 ThinkServer XL710 AnyFabric
- 17aa 4001 ThinkServer XL710-4 AnyFabric
+ 1028 1f9c Ethernet 10G 4P X710 SFP+ rNDC
+ 103c 0000 Ethernet 10Gb 562SFP+ Adapter
+ 103c 22fc HP Ethernet 10Gb 2-port 562FLR-SFP+ Adapter
+ 103c 22fd HP Ethernet 10Gb 2-port 562SFP+ Adapter
+ 1137 0000 Ethernet Converged NIC X710-4
+ 1137 013b Ethernet Converged NIC X710-4
+ 17aa 0000 ThinkServer X710 AnyFabric for 10GbE SFP+
+ 17aa 4001 ThinkServer X710-4 AnyFabric for 10GbE SFP+
+ 17aa 4002 ThinkServer X710-2 AnyFabric for 10GbE SFP+
8086 0000 Ethernet Converged Network Adapter X710
8086 0001 Ethernet Converged Network Adapter X710-4
8086 0002 Ethernet Converged Network Adapter X710-4
@@ -21263,37 +22088,81 @@
8086 0006 Ethernet 10G 2P X710 Adapter
8086 0007 Ethernet Converged Network Adapter X710-2
8086 0008 Ethernet Converged Network Adapter X710-2
+ 8086 0009 Ethernet Controller X710 for 10GbE SFP+
+ 8086 000a Ethernet Controller X710 for 10GbE SFP+
+ 8086 000d Ethernet Controller X710 for 10GbE SFP+
+ 8086 4005 Ethernet Controller XL710 for 10 Gigabit SFP+
+ 8086 4006 Ethernet Controller X710 for 10GbE SFP+
+ 1578 DSL6540 Thunderbolt [Alpine Ridge]
157b I210 Gigabit Network Connection
157c I210 Gigabit Backplane Connection
1580 Ethernet Controller XL710 for 40GbE backplane
1581 Ethernet Controller X710 for 10GbE backplane
+ 1028 0000 Ethernet 10G X710-k bNDC
1028 1f98 Ethernet 10G 4P X710-k bNDC
+ 1028 1f9e Ethernet 10G 2P X710-k bNDC
+ 8086 0000 Ethernet Converged Network Adapter XL710-Q2
1583 Ethernet Controller XL710 for 40GbE QSFP+
+ 1028 0000 Ethernet 40G 2P XL710 QSFP+ rNDC
+ 1028 1f9f Ethernet 40G 2P XL710 QSFP+ rNDC
+ 108e 0000 10 Gb/40 Gb Ethernet Adapter
+ 108e 7b1b 10 Gb/40 Gb Ethernet Adapter
+ 1137 0000 Ethernet Converged NIC XL710-Q2
+ 1137 013c Ethernet Converged NIC XL710-Q2
8086 0000 Ethernet Converged Network Adapter XL710-Q2
8086 0001 Ethernet Converged Network Adapter XL710-Q2
8086 0002 Ethernet Converged Network Adapter XL710-Q2
8086 0003 Ethernet I/O Module XL710-Q2
+ 8086 0004 Ethernet Server Adapter XL710-Q2OCP
+ 8086 0006 Ethernet Converged Network Adapter XL710-Q2
1584 Ethernet Controller XL710 for 40GbE QSFP+
8086 0000 Ethernet Converged Network Adapter XL710-Q1
8086 0001 Ethernet Converged Network Adapter XL710-Q1
8086 0002 Ethernet Converged Network Adapter XL710-Q1
8086 0003 Ethernet I/O Module XL710-Q1
- 1585 Ethernet Controller XL710 for 10GbE QSFP+
+ 8086 0004 Ethernet Server Adapter XL710-Q1OCP
+ 1585 Ethernet Controller X710 for 10GbE QSFP+
+ 1586 Ethernet Controller X710 for 10GBASE-T
+ 108e 0000 Ethernet Controller X710 for 10GBASE-T
+ 108e 4857 Ethernet Controller X710 for 10GBASE-T
+ 1587 Ethernet Controller XL710 for 20GbE backplane
+ 103c 0000 HP Flex-20 20Gb 2-port 660FLB Adapter
+ 103c 22fe HP Flex-20 20Gb 2-port 660FLB Adapter
+ 1588 Ethernet Controller XL710 for 20GbE backplane
+ 103c 0000 HP Flex-20 20Gb 2-port 660M Adapter
+ 103c 22ff HP Flex-20 20Gb 2-port 660M Adapter
+ 1589 Ethernet Controller X710/X557-AT 10GBASE-T
+ 8086 0000 Ethernet Converged Network Adapter X710-T
+ 8086 0001 Ethernet Converged Network Adapter X710-T4
+ 8086 0002 Ethernet Converged Network Adapter X710-T4
15a0 Ethernet Connection (2) I218-LM
15a1 Ethernet Connection (2) I218-V
15a2 Ethernet Connection (3) I218-LM
15a3 Ethernet Connection (3) I218-V
+ 15a4 Ethernet Switch FM10000 Host Interface
+ 15a5 Ethernet Switch FM10000 Host Virtual Interface
15a8 Ethernet Connection X552 Virtual Function
15aa Ethernet Connection X552 10 GbE Backplane
+ 1059 0120 T4008 10GbE interface
15ab Ethernet Connection X552 10 GbE Backplane
15ac Ethernet Connection X552 10 GbE SFP+
15ad Ethernet Connection X552/X557-AT 10GBASE-T
+ 15ae Ethernet Connection X552 1000BASE-T
+ 15b6 DSL6540 USB 3.1 Controller [Alpine Ridge]
15b7 Ethernet Connection (2) I219-LM
15b8 Ethernet Connection (2) I219-V
+ 15b9 Ethernet Connection (3) I219-LM
+ 15d1 Ethernet Controller 10G X550T
+ 8086 0002 Ethernet Converged Network Adapter X550-T1
+ 8086 00a2 Ethernet Converged Network Adapter X550-T1
+ 15d6 Ethernet Connection (5) I219-V
+ 15d7 Ethernet Connection (4) I219-LM
+ 15d8 Ethernet Connection (4) I219-V
+ 15e3 Ethernet Connection (5) I219-LM
1600 Broadwell-U Host Bridge -OPI
1601 Broadwell-U PCI Express x16 Controller
1602 Broadwell-U Integrated Graphics
- 1603 Broadwell-U Camarillo Device
+ 1603 Broadwell-U Processor Thermal Subsystem
1604 Broadwell-U Host Bridge -OPI
1605 Broadwell-U PCI Express x8 Controller
1606 Broadwell-U Integrated Graphics
@@ -21310,6 +22179,7 @@
1612 Broadwell-U Integrated Graphics
1614 Broadwell-U Host Bridge - DMI
1616 Broadwell-U Integrated Graphics
+ 103c 2216 ZBook 15u G2 Mobile Workstation
1618 Broadwell-U Host Bridge - DMI
161a Broadwell-U Integrated Graphics
161b Broadwell-U Integrated Graphics
@@ -21327,8 +22197,9 @@
163b Broadwell-U Integrated Graphics
163d Broadwell-U Integrated Graphics
163e Broadwell-U Integrated Graphics
- 1900 Sky Lake Host Bridge/DRAM Registers
+ 1900 Skylake Host Bridge/DRAM Registers
1901 Sky Lake PCIe Controller (x16)
+ 1903 Skylake Processor Thermal Subsystem
1904 Sky Lake Host Bridge/DRAM Registers
1905 Sky Lake PCIe Controller (x8)
1908 Sky Lake Host Bridge/DRAM Registers
@@ -21341,6 +22212,7 @@
1916 Sky Lake Integrated Graphics
1918 Sky Lake Host Bridge/DRAM Registers
1919 Sky Lake Imaging Unit
+ 191b Skylake Integrated Graphics
191e Sky Lake Integrated Graphics
191f Sky Lake Host Bridge/DRAM Registers
1926 Sky Lake Integrated Graphics
@@ -21373,11 +22245,13 @@
e4bf 3100 CX1-BAND
1962 80960RM (i960RM) Microprocessor
105a 0000 SuperTrak SX6000 I2O CPU
+ 19df DNV SMBus controller
1a21 82840 840 [Carmel] Chipset Host Bridge (Hub A)
1a23 82840 840 [Carmel] Chipset AGP Bridge
1a24 82840 840 [Carmel] Chipset PCI Bridge (Hub B)
1a30 82845 845 [Brookdale] Chipset Host Bridge
1028 010e Optiplex GX240
+ 147b 0505 BL7 motherboard
15d9 3280 Supermicro P4SBE Mainboard
1a31 82845 845 [Brookdale] Chipset AGP Bridge
1a38 5000 Series Chipset DMA Engine
@@ -21588,6 +22462,7 @@
1043 84ca P8 series motherboard
1849 1e02 Motherboard
1e03 7 Series Chipset Family 6-port SATA Controller [AHCI mode]
+ 1043 108d VivoBook X202EV
1043 1477 N56VZ
1043 1517 Zenbook Prime UX31A
1e04 7 Series/C210 Series Chipset Family SATA Controller [RAID mode]
@@ -21598,15 +22473,18 @@
1e09 7 Series Chipset Family 2-port SATA Controller [IDE mode]
1e0e 7 Series/C210 Series Chipset Family SATA Controller [RAID mode]
1e10 7 Series/C210 Series Chipset Family PCI Express Root Port 1
+ 1043 108d VivoBook X202EV
1043 1477 N56VZ
1043 1517 Zenbook Prime UX31A
1043 84ca P8H77-I Motherboard
1849 1e10 Motherboard
1e12 7 Series/C210 Series Chipset Family PCI Express Root Port 2
+ 1043 108d VivoBook X202EV
1043 1477 N56VZ
1043 1517 Zenbook Prime UX31A
1e14 7 Series/C210 Series Chipset Family PCI Express Root Port 3
1e16 7 Series/C210 Series Chipset Family PCI Express Root Port 4
+ 1043 108d VivoBook X202EV
1043 1477 N56VZ
1849 1618 Z77 Extreme4 motherboard
1e18 7 Series/C210 Series Chipset Family PCI Express Root Port 5
@@ -21618,12 +22496,14 @@
1e1e 7 Series/C210 Series Chipset Family PCI Express Root Port 8
1849 1e1e Motherboard
1e20 7 Series/C210 Series Chipset Family High Definition Audio Controller
+ 1043 108d VivoBook X202EV
1043 1477 N56VZ
1043 1517 Zenbook Prime UX31A
1043 8415 P8H77-I Motherboard
1043 8445 ASUS P8Z77-V LX Motherboard
1849 1898 Z77 Extreme4 motherboard
1e22 7 Series/C210 Series Chipset Family SMBus Controller
+ 1043 108d VivoBook X202EV
1043 1477 N56VZ
1043 1517 Zenbook Prime UX31A
1043 84ca P8 series motherboard
@@ -21632,23 +22512,27 @@
1043 1517 Zenbook Prime UX31A
1e25 7 Series/C210 Series Chipset Family DMI to PCI Bridge
1e26 7 Series/C210 Series Chipset Family USB Enhanced Host Controller #1
+ 1043 108d VivoBook X202EV
1043 1477 N56VZ
1043 1517 Zenbook Prime UX31A
1043 84ca P8 series motherboard
1849 1e26 Motherboard
1e2d 7 Series/C210 Series Chipset Family USB Enhanced Host Controller #2
+ 1043 108d VivoBook X202EV
1043 1477 N56VZ
1043 1517 Zenbook Prime UX31A
1043 84ca P8 series motherboard
1849 1e2d Motherboard
1e31 7 Series/C210 Series Chipset Family USB xHCI Host Controller
103c 17ab ProBook 6570b
+ 1043 108d VivoBook X202EV
1043 1477 N56VZ
1043 1517 Zenbook Prime UX31A
1043 84ca P8 series motherboard
1849 1e31 Motherboard
1e33 7 Series/C210 Series Chipset Family LAN Controller
1e3a 7 Series/C210 Series Chipset Family MEI Controller #1
+ 1043 108d VivoBook X202EV
1043 1477 N56VZ
1043 1517 Zenbook Prime UX31A
1043 84ca P8 series motherboard
@@ -21691,6 +22575,7 @@
1e5c 7 Series Chipset Family LPC Controller
1e5d HM75 Express Chipset LPC Controller
1e5e 7 Series Chipset Family LPC Controller
+ 1043 108d VivoBook X202EV
1e5f 7 Series Chipset Family LPC Controller
1f00 Atom processor C2000 SoC Transaction Router
1f01 Atom processor C2000 SoC Transaction Router
@@ -21715,8 +22600,8 @@
1f14 Atom processor C2000 RAS
1f15 Atom processor C2000 SMBus 2.0
1f16 Atom processor C2000 RCEC
- 1f18 Atom processor C2000 nCPM
- 1f19 Atom processor C2000 nCPM
+ 1f18 Atom processor C2000 QAT
+ 1f19 Atom processor C2000 QAT
1f20 Atom processor C2000 4-Port IDE SATA2 Controller
1f21 Atom processor C2000 4-Port IDE SATA2 Controller
1f22 Atom processor C2000 AHCI SATA2 Controller
@@ -21807,26 +22692,26 @@
2360 DH89xxCC Watchdog Timer
2364 DH89xxCC MEI 0
2365 DH89xxCC MEI 1
- 2390 Coleto Creek LPC Controller
- 23a1 Coleto Creek 2-Port SATA Controller [IDE Mode]
- 23a3 Coleto Creek 4-Port SATA Controller [AHCI Mode]
- 23a6 Coleto Creek 2-Port SATA Controller [IDE Mode]
- 23b0 Coleto Creek SMBus Controller
- 23b1 Coleto Creek CHAP Counter
- 23b2 Coleto Creek Thermal Management Controller
- 23b4 Coleto Creek USB2 Enhanced Host Controller #1
- 23b5 Coleto Creek USB2 Enhanced Host Controller #1
- 23c2 Coleto Creek PCI Express Root Port #1
- 23c3 Coleto Creek PCI Express Root Port #1
- 23c4 Coleto Creek PCI Express Root Port #2
- 23c5 Coleto Creek PCI Express Root Port #2
- 23c6 Coleto Creek PCI Express Root Port #3
- 23c7 Coleto Creek PCI Express Root Port #3
- 23c8 Coleto Creek PCI Express Root Port #4
- 23c9 Coleto Creek PCI Express Root Port #4
- 23e0 Coleto Creek Watchdog Timer
- 23e4 Coleto Creek MEI Controller #1
- 23e5 Coleto Creek MEI Controller #2
+ 2390 DH895XCC Series LPC Controller
+ 23a1 DH895XCC Series 2-Port SATA Controller [IDE Mode]
+ 23a3 DH895XCC Series 4-Port SATA Controller [AHCI Mode]
+ 23a6 DH895XCC Series 2-Port SATA Controller [IDE Mode]
+ 23b0 DH895XCC Series SMBus Controller
+ 23b1 DH895XCC Series CHAP Counter
+ 23b2 DH895XCC Series Thermal Management Controller
+ 23b4 DH895XCC Series USB2 Enhanced Host Controller #1
+ 23b5 DH895XCC Series USB2 Enhanced Host Controller #1
+ 23c2 DH895XCC Series PCI Express Root Port #1
+ 23c3 DH895XCC Series PCI Express Root Port #1
+ 23c4 DH895XCC Series PCI Express Root Port #2
+ 23c5 DH895XCC Series PCI Express Root Port #2
+ 23c6 CDH895XCC Series PCI Express Root Port #3
+ 23c7 DH895XCC Series PCI Express Root Port #3
+ 23c8 DH895XCC Series PCI Express Root Port #4
+ 23c9 DH895XCC Series PCI Express Root Port #4
+ 23e0 DH895XCC Series Watchdog Timer
+ 23e4 DH895XCC Series MEI Controller #1
+ 23e5 DH895XCC Series MEI Controller #2
2410 82801AA ISA Bridge (LPC)
2411 82801AA IDE Controller
2412 82801AA USB Controller
@@ -21853,7 +22738,7 @@
2428 82801AB PCI Bridge
2440 82801BA ISA Bridge (LPC)
8086 5744 S845WD1-E
- 2442 82801BA/BAM USB Controller #1
+ 2442 82801BA/BAM UHCI USB 1.1 Controller #1
1014 01c6 Netvista A40/A40p
1025 1016 Travelmate 612 TX
1028 00c7 Dimension 8100
@@ -21862,8 +22747,9 @@
103c 126f e-pc 40
1043 8027 TUSL2-C Mainboard
104d 80df Vaio PCG-FX403
+ 147b 0505 BL7 motherboard
147b 0507 TH7II-RAID
- 8086 4532 D815EEA2 mainboard
+ 8086 4532 Desktop Board D815EEA2/D815EFV
8086 4557 D815EGEW Mainboard
8086 5744 S845WD1-E mainboard
2443 82801BA/BAM SMBus Controller
@@ -21875,12 +22761,13 @@
103c 126f e-pc 40
1043 8027 TUSL2-C Mainboard
104d 80df Vaio PCG-FX403
+ 147b 0505 BL7 motherboard
147b 0507 TH7II-RAID
15d9 3280 Supermicro P4SBE Mainboard
- 8086 4532 D815EEA2 mainboard
+ 8086 4532 Desktop Board D815EEA2/D815EFV
8086 4557 D815EGEW Mainboard
8086 5744 S845WD1-E mainboard
- 2444 82801BA/BAM USB Controller #1
+ 2444 82801BA/BAM UHCI USB 1.1 Controller #2
1025 1016 Travelmate 612 TX
1028 00c7 Dimension 8100
1028 00d8 Precision 530
@@ -21888,8 +22775,9 @@
103c 126f e-pc 40
1043 8027 TUSL2-C Mainboard
104d 80df Vaio PCG-FX403
+ 147b 0505 BL7 motherboard
147b 0507 TH7II-RAID
- 8086 4532 D815EEA2 mainboard
+ 8086 4532 Desktop Board D815EEA2/D815EFV
8086 5744 S845WD1-E mainboard
2445 82801BA/BAM AC'97 Audio Controller
0e11 000b Compaq Deskpro EN Audio
@@ -21900,14 +22788,17 @@
103c 126f e-pc 40
104d 80df Vaio PCG-FX403
1462 3370 STAC9721 AC
+ 147b 0505 BL7 motherboard
147b 0507 TH7II-RAID
8086 4557 D815EGEW Mainboard
+ 8086 4656 Desktop Board D815EFV
2446 82801BA/BAM AC'97 Modem Controller
1025 1016 Travelmate 612 TX
104d 80df Vaio PCG-FX403
2448 82801 Mobile PCI Bridge
+ 1028 040a Latitude E6410
1028 040b Latitude E6510
- 103c 0934 HP Compaq nw8240 Mobile Workstation
+ 103c 0934 Compaq nw8240 Mobile Workstation
103c 099c NX6110/NC6120
103c 309f Compaq nx9420 Notebook
103c 30a3 Compaq nw8440
@@ -21967,9 +22858,10 @@
1028 010e Optiplex GX240
103c 126f e-pc 40
1043 8027 TUSL2-C Mainboard
+ 147b 0505 BL7 motherboard
147b 0507 TH7II-RAID
15d9 3280 Supermicro P4SBE Mainboard
- 8086 4532 D815EEA2 mainboard
+ 8086 4532 Desktop Board D815EEA2/D815EFV
8086 4557 D815EGEW Mainboard
8086 5744 S845WD1-E mainboard
244c 82801BAM ISA Bridge (LPC)
@@ -22061,7 +22953,9 @@
1014 0267 NetVista A30p
1014 052d ThinkPad
1025 005a TravelMate 290
+ 1025 0064 Extensa 3000 series laptop: Intel 82801DBM (ICH4-M)
1028 0126 Optiplex GX260
+ 1028 0160 Dimension 2400
1028 0163 Latitude D505
1028 018d Inspiron 700m/710m
1028 0196 Inspiron 5160
@@ -22086,8 +22980,10 @@
1014 0267 NetVista A30p
1014 052d ThinkPad
1025 005a TravelMate 290
+ 1025 0064 Extensa 3000 series laptop: Intel 82801DBM (ICH4-M)
1028 0126 Optiplex GX260
1028 014f Latitude X300
+ 1028 0160 Dimension 2400
1028 018d Inspiron 700m/710m
103c 088c NC8000 laptop
103c 0890 NC6000 laptop
@@ -22107,7 +23003,9 @@
1014 0267 NetVista A30p
1014 052d ThinkPad
1025 005a TravelMate 290
+ 1025 0064 Extensa 3000 series laptop: Intel 82801DBM (ICH4-M)
1028 0126 Optiplex GX260
+ 1028 0160 Dimension 2400
1028 0163 Latitude D505
1028 018d Inspiron 700m/710m
1028 0196 Inspiron 5160
@@ -22131,9 +23029,11 @@
1014 0537 ThinkPad T4x Series
1014 055f Thinkpad R50e model 1634
1025 005a TravelMate 290
+ 1025 0064 Extensa 3000 series laptop: Intel 82801DBM (ICH4-M)
1028 0139 Latitude D400
1028 014f Latitude X300
1028 0152 Latitude D500
+ 1028 0160 Dimension 2400
1028 0163 Latitude D505
1028 018d Inspiron 700m/710m [SigmaTel STAC9750,51]
1028 0196 Inspiron 5160
@@ -22150,13 +23050,13 @@
1462 5800 845PE Max (MS-6580)
1734 1005 D1451 (SCENIC N300, i845GV) Sigmatel STAC9750T
1734 1055 Amilo M1420
- 8086 24c5 Dell Dimension 2400
24c6 82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Modem Controller
1014 0524 ThinkPad T4x Series
1014 0525 ThinkPad
1014 0559 ThinkPad R50e
1025 003c Aspire 2001WLCi (Compal CL50 motherboard) implementation
1025 005a TravelMate 290
+ 1025 0064 Extensa 3000 series laptop: Intel 82801DBM (ICH4-M)
1028 0196 Inspiron 5160
103c 088c NC8000 laptop
103c 0890 NC6000 laptop
@@ -22173,7 +23073,9 @@
1014 0267 NetVista A30p
1014 052d ThinkPad
1025 005a TravelMate 290
+ 1025 0064 Extensa 3000 series laptop: Intel 82801DBM (ICH4-M)
1028 0126 Optiplex GX260
+ 1028 0160 Dimension 2400
1028 0163 Latitude D505
1028 018d Inspiron 700m/710m
1028 0196 Inspiron 5160
@@ -22194,6 +23096,7 @@
24ca 82801DBM (ICH4-M) IDE Controller
1014 052d ThinkPad
1025 005a TravelMate 290
+ 1025 0064 Extensa 3000 series laptop: Intel 82801DBM (ICH4-M)
1028 014f Latitude X300
1028 0163 Latitude D505
1028 018d Inspiron 700m/710m
@@ -22209,6 +23112,7 @@
24cb 82801DB (ICH4) IDE Controller
1014 0267 NetVista A30p
1028 0126 Optiplex GX260
+ 1028 0160 Dimension 2400
1043 8089 P4B533
114a 0582 PC8 onboard IDE
1458 24c2 GA-8PE667 Ultra
@@ -22224,10 +23128,12 @@
1014 0267 NetVista A30p
1014 052e ThinkPad
1025 005a TravelMate 290
+ 1025 0064 Extensa 3000 series laptop: Intel 82801DBM (ICH4-M)
1028 011d Latitude D600
1028 0126 Optiplex GX260
1028 0139 Latitude D400
1028 0152 Latitude D500
+ 1028 0160 Dimension 2400
1028 0163 Latitude D505
1028 018d Inspiron 700m/710m
1028 0196 Inspiron 5160
@@ -22434,6 +23340,14 @@
8086 524c D865PERL mainboard
24df 82801ER (ICH5R) SATA Controller
1028 0168 Precision Workstation 670 Mainboard
+ 24f0 Omni-Path HFI Silicon 100 Series [discrete]
+ 10a9 802e Omni-path HFI 100 Series, 1-port
+ 10a9 802f Omni-path HFI 100 Series, 2-port
+ 8086 2628 Omni-Path HFI Adapter 100 Series, 1 Port, PCIe x16
+ 8086 2629 Omni-Path HFI Adapter 100 Series, 1 Port, PCIe x8
+ 8086 262a Omni-Path HFI Adapter 100 Series, 2 Ports, Split PCIe x16
+ 8086 262d Omni-Path HFI Adapter 100 Series, 1 Port, PCIe x16, IO Module AHWKPTP100HF
+ 24f1 Omni-Path HFI Silicon 100 Series [integrated]
24f3 Wireless 8260
# Snow Field Peak AC
8086 0010 Dual Band Wireless-AC 8260
@@ -22487,6 +23401,7 @@
2562 82845G/GL[Brookdale-G]/GE Chipset Integrated Graphics Device
0e11 00b9 Evo D510 SFF
1014 0267 NetVista A30p
+ 1028 0160 Dimension 2400
1734 1003 D1521 Mainboard (Fujitsu-Siemens)
1734 1004 D1451 Mainboard (SCENIC N300, i845GV)
2570 82865G/PE/P DRAM Controller/Host-Hub Interface
@@ -22541,7 +23456,7 @@
e4bf 0cd3 CD3-JIVE
e4bf 58b1 XB1
2591 Mobile 915GM/PM Express PCI Express Root Port
- 103c 0934 HP Compaq nw8240 Mobile Workstation
+ 103c 0934 Compaq nw8240 Mobile Workstation
2592 Mobile 915GM/GMS/910GML Express Graphics Controller
103c 099c NX6110/NC6120
103c 308a NC6220
@@ -22791,13 +23706,13 @@
e4bf 0cd3 CD3-JIVE
e4bf 58b1 XB1
2660 82801FB/FBM/FR/FW/FRW (ICH6 Family) PCI Express Port 1
- 103c 0934 HP Compaq nw8240 Mobile Workstation
+ 103c 0934 Compaq nw8240 Mobile Workstation
103c 099c NX6110/NC6120
e4bf 0ccd CCD-CALYPSO
e4bf 0cd3 CD3-JIVE
e4bf 58b1 XB1
2662 82801FB/FBM/FR/FW/FRW (ICH6 Family) PCI Express Port 2
- 103c 0934 HP Compaq nw8240 Mobile Workstation
+ 103c 0934 Compaq nw8240 Mobile Workstation
e4bf 0ccd CCD-CALYPSO
e4bf 0cd3 CD3-JIVE
e4bf 58b1 XB1
@@ -23284,6 +24199,7 @@
2822 SATA Controller [RAID mode]
1028 020d Inspiron 530
103c 2a6f Asus IPIBL-LB Motherboard
+ 1043 8277 P5K PRO Motherboard
2823 C610/X99 series chipset sSATA Controller [RAID mode]
2824 82801HB (ICH8) 4 port SATA Controller [AHCI mode]
1043 81ec P5B
@@ -23457,7 +24373,7 @@
1028 01f9 Dell Latitude D630
1028 01ff Dell Precision M4300
1028 0256 Studio 1735
- 103c 2802 HP Compaq dc7700p
+ 103c 2802 Compaq dc7700p
103c 30c0 Compaq 6710b
103c 30c1 Compaq 6910p
103c 30cc Pavilion dv6700
@@ -23513,6 +24429,7 @@
1028 0237 PowerEdge T610 SATA IDE Controller
1462 7360 G33/P35 Neo
2922 82801IR/IO/IH (ICH9R/DO/DH) 6 port SATA Controller [AHCI mode]
+ 1043 8277 P5K PRO Motherboard
1af4 1100 QEMU Virtual Machine
8086 5044 Desktop Board DP35DP
2923 82801IB (ICH9) 4 port SATA Controller [AHCI mode]
@@ -23987,9 +24904,9 @@
2cf3 Xeon C5500/C3500 Integrated Memory Controller Channel 2 Thermal Control
2d01 Core Processor QuickPath Architecture System Address Decoder
2d10 Core Processor QPI Link 0
- 2d11 1st Generation Core Processor QPI Physical 0
- 2d12 1st Generation Core Processor Reserved
- 2d13 1st Generation Core Processor Reserved
+ 2d11 1st Generation Core i3/5/7 Processor QPI Physical 0
+ 2d12 1st Generation Core i3/5/7 Processor Reserved
+ 2d13 1st Generation Core i3/5/7 Processor Reserved
2d81 Xeon 5600 Series QuickPath Architecture System Address Decoder
2d90 Xeon 5600 Series QPI Link 0
2d91 Xeon 5600 Series QPI Physical 0
@@ -24093,170 +25010,172 @@
2e94 4 Series Chipset HECI Controller
2e95 4 Series Chipset HECI Controller
2e96 4 Series Chipset PT IDER Controller
- 2f00 Xeon E5 v3/Core i7 DMI2
- 2f01 Xeon E5 v3/Core i7 PCI Express Root Port 0
- 2f02 Xeon E5 v3/Core i7 PCI Express Root Port 1
- 2f03 Xeon E5 v3/Core i7 PCI Express Root Port 1
- 2f04 Xeon E5 v3/Core i7 PCI Express Root Port 2
- 2f05 Xeon E5 v3/Core i7 PCI Express Root Port 2
- 2f06 Xeon E5 v3/Core i7 PCI Express Root Port 2
- 2f07 Xeon E5 v3/Core i7 PCI Express Root Port 2
- 2f08 Xeon E5 v3/Core i7 PCI Express Root Port 3
- 2f09 Xeon E5 v3/Core i7 PCI Express Root Port 3
- 2f0a Xeon E5 v3/Core i7 PCI Express Root Port 3
- 2f0b Xeon E5 v3/Core i7 PCI Express Root Port 3
- 2f10 Xeon E5 v3/Core i7 IIO Debug
- 2f11 Xeon E5 v3/Core i7 IIO Debug
- 2f12 Xeon E5 v3/Core i7 IIO Debug
- 2f13 Xeon E5 v3/Core i7 IIO Debug
- 2f14 Xeon E5 v3/Core i7 IIO Debug
- 2f15 Xeon E5 v3/Core i7 IIO Debug
- 2f16 Xeon E5 v3/Core i7 IIO Debug
- 2f17 Xeon E5 v3/Core i7 IIO Debug
- 2f18 Xeon E5 v3/Core i7 IIO Debug
- 2f19 Xeon E5 v3/Core i7 IIO Debug
- 2f1a Xeon E5 v3/Core i7 IIO Debug
- 2f1b Xeon E5 v3/Core i7 IIO Debug
- 2f1c Xeon E5 v3/Core i7 IIO Debug
- 2f1d Xeon E5 v3/Core i7 PCIe Ring Interface
- 2f1e Xeon E5 v3/Core i7 Scratchpad & Semaphore Registers
- 2f1f Xeon E5 v3/Core i7 Scratchpad & Semaphore Registers
- 2f20 Xeon E5 v3/Core i7 DMA Channel 0
- 2f21 Xeon E5 v3/Core i7 DMA Channel 1
- 2f22 Xeon E5 v3/Core i7 DMA Channel 2
- 2f23 Xeon E5 v3/Core i7 DMA Channel 3
- 2f24 Xeon E5 v3/Core i7 DMA Channel 4
- 2f25 Xeon E5 v3/Core i7 DMA Channel 5
- 2f26 Xeon E5 v3/Core i7 DMA Channel 6
- 2f27 Xeon E5 v3/Core i7 DMA Channel 7
- 2f28 Xeon E5 v3/Core i7 Address Map, VTd_Misc, System Management
- 2f29 Xeon E5 v3/Core i7 Hot Plug
- 2f2a Xeon E5 v3/Core i7 RAS, Control Status and Global Errors
- 2f2c Xeon E5 v3/Core i7 I/O APIC
- 2f2e Xeon E5 v3/Core i7 RAID 5/6
- 2f2f Xeon E5 v3/Core i7 RAID 5/6
- 2f30 Xeon E5 v3/Core i7 Home Agent 0
- 2f32 Xeon E5 v3/Core i7 QPI Link 0
- 2f33 Xeon E5 v3/Core i7 QPI Link 1
- 2f34 Xeon E5 v3/Core i7 PCIe Ring Interface
- 2f36 Xeon E5 v3/Core i7 R3 QPI Link 0 & 1 Monitoring
- 2f37 Xeon E5 v3/Core i7 R3 QPI Link 0 & 1 Monitoring
- 2f38 Xeon E5 v3/Core i7 Home Agent 1
- 2f39 Xeon E5 v3/Core i7 I/O Performance Monitoring
- 2f3a Xeon E5 v3/Core i7 QPI Link 2
- 2f3e Xeon E5 v3/Core i7 R3 QPI Link 2 Monitoring
- 2f3f Xeon E5 v3/Core i7 R3 QPI Link 2 Monitoring
- 2f40 Xeon E5 v3/Core i7 QPI Link 2
- 2f41 Xeon E5 v3/Core i7 R3 QPI Link 2 Monitoring
- 2f43 Xeon E5 v3/Core i7 QPI Link 2
- 2f45 Xeon E5 v3/Core i7 QPI Link 2 Debug
- 2f46 Xeon E5 v3/Core i7 QPI Link 2 Debug
- 2f47 Xeon E5 v3/Core i7 QPI Link 2 Debug
- 2f60 Xeon E5 v3/Core i7 Home Agent 1
- 2f68 Xeon E5 v3/Core i7 Integrated Memory Controller 1 Target Address, Thermal & RAS Registers
- 2f6a Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel Target Address Decoder
- 2f6b Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel Target Address Decoder
- 2f6c Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel Target Address Decoder
- 2f6d Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel Target Address Decoder
- 2f6e Xeon E5 v3/Core i7 DDRIO Channel 2/3 Broadcast
- 2f6f Xeon E5 v3/Core i7 DDRIO Global Broadcast
- 2f70 Xeon E5 v3/Core i7 Home Agent 0 Debug
- 2f71 Xeon E5 v3/Core i7 Integrated Memory Controller 0 Target Address, Thermal & RAS Registers
- 2f76 Xeon E5 v3/Core i7 E3 QPI Link Debug
- 2f78 Xeon E5 v3/Core i7 Home Agent 1 Debug
- 2f79 Xeon E5 v3/Core i7 Integrated Memory Controller 1 Target Address, Thermal & RAS Registers
- 2f7d Xeon E5 v3/Core i7 Scratchpad & Semaphore Registers
- 2f7e Xeon E5 v3/Core i7 E3 QPI Link Debug
- 2f80 Xeon E5 v3/Core i7 QPI Link 0
- 2f81 Xeon E5 v3/Core i7 R3 QPI Link 0 & 1 Monitoring
- 2f83 Xeon E5 v3/Core i7 QPI Link 0
- 2f85 Xeon E5 v3/Core i7 QPI Link 0 Debug
- 2f86 Xeon E5 v3/Core i7 QPI Link 0 Debug
- 2f87 Xeon E5 v3/Core i7 QPI Link 0 Debug
- 2f88 Xeon E5 v3/Core i7 VCU
- 2f8a Xeon E5 v3/Core i7 VCU
- 2f90 Xeon E5 v3/Core i7 QPI Link 1
- 2f93 Xeon E5 v3/Core i7 QPI Link 1
- 2f95 Xeon E5 v3/Core i7 QPI Link 1 Debug
- 2f96 Xeon E5 v3/Core i7 QPI Link 1 Debug
- 2f98 Xeon E5 v3/Core i7 Power Control Unit
- 2f99 Xeon E5 v3/Core i7 Power Control Unit
- 2f9a Xeon E5 v3/Core i7 Power Control Unit
- 2f9c Xeon E5 v3/Core i7 Power Control Unit
- 2fa0 Xeon E5 v3/Core i7 Home Agent 0
- 2fa8 Xeon E5 v3/Core i7 Integrated Memory Controller 0 Target Address, Thermal & RAS Registers
- 2faa Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel Target Address Decoder
- 2fab Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel Target Address Decoder
- 2fac Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel Target Address Decoder
- 2fad Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel Target Address Decoder
- 2fae Xeon E5 v3/Core i7 DDRIO Channel 0/1 Broadcast
- 2faf Xeon E5 v3/Core i7 DDRIO Global Broadcast
- 2fb0 Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 0 Thermal Control
- 2fb1 Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 1 Thermal Control
- 2fb2 Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 0 ERROR Registers
- 2fb3 Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 1 ERROR Registers
- 2fb4 Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 2 Thermal Control
- 2fb5 Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 3 Thermal Control
- 2fb6 Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 2 ERROR Registers
- 2fb7 Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 3 ERROR Registers
- 2fb8 Xeon E5 v3/Core i7 DDRIO (VMSE) 2 & 3
- 2fb9 Xeon E5 v3/Core i7 DDRIO (VMSE) 2 & 3
- 2fba Xeon E5 v3/Core i7 DDRIO (VMSE) 2 & 3
- 2fbb Xeon E5 v3/Core i7 DDRIO (VMSE) 2 & 3
- 2fbc Xeon E5 v3/Core i7 DDRIO (VMSE) 0 & 1
- 2fbd Xeon E5 v3/Core i7 DDRIO (VMSE) 0 & 1
- 2fbe Xeon E5 v3/Core i7 DDRIO (VMSE) 0 & 1
- 2fbf Xeon E5 v3/Core i7 DDRIO (VMSE) 0 & 1
- 2fc0 Xeon E5 v3/Core i7 Power Control Unit
- 2fc1 Xeon E5 v3/Core i7 Power Control Unit
- 2fc2 Xeon E5 v3/Core i7 Power Control Unit
- 2fc3 Xeon E5 v3/Core i7 Power Control Unit
- 2fc4 Xeon E5 v3/Core i7 Power Control Unit
- 2fc5 Xeon E5 v3/Core i7 Power Control Unit
- 2fd0 Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 0 Thermal Control
- 2fd1 Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 1 Thermal Control
- 2fd2 Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 0 ERROR Registers
- 2fd3 Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 1 ERROR Registers
- 2fd4 Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 2 Thermal Control
- 2fd5 Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 3 Thermal Control
- 2fd6 Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 2 ERROR Registers
- 2fd7 Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 3 ERROR Registers
- 2fe0 Xeon E5 v3/Core i7 Unicast Registers
- 2fe1 Xeon E5 v3/Core i7 Unicast Registers
- 2fe2 Xeon E5 v3/Core i7 Unicast Registers
- 2fe3 Xeon E5 v3/Core i7 Unicast Registers
- 2fe4 Xeon E5 v3/Core i7 Unicast Registers
- 2fe5 Xeon E5 v3/Core i7 Unicast Registers
- 2fe6 Xeon E5 v3/Core i7 Unicast Registers
- 2fe7 Xeon E5 v3/Core i7 Unicast Registers
- 2fe8 Xeon E5 v3/Core i7 Unicast Registers
- 2fe9 Xeon E5 v3/Core i7 Unicast Registers
- 2fea Xeon E5 v3/Core i7 Unicast Registers
- 2feb Xeon E5 v3/Core i7 Unicast Registers
- 2fec Xeon E5 v3/Core i7 Unicast Registers
- 2fed Xeon E5 v3/Core i7 Unicast Registers
- 2fee Xeon E5 v3/Core i7 Unicast Registers
- 2fef Xeon E5 v3/Core i7 Unicast Registers
- 2ff0 Xeon E5 v3/Core i7 Unicast Registers
- 2ff1 Xeon E5 v3/Core i7 Unicast Registers
- 2ff2 Xeon E5 v3/Core i7 Unicast Registers
- 2ff3 Xeon E5 v3/Core i7 Unicast Registers
- 2ff4 Xeon E5 v3/Core i7 Unicast Registers
- 2ff5 Xeon E5 v3/Core i7 Unicast Registers
- 2ff6 Xeon E5 v3/Core i7 Unicast Registers
- 2ff7 Xeon E5 v3/Core i7 Unicast Registers
- 2ff8 Xeon E5 v3/Core i7 Buffered Ring Agent
- 2ff9 Xeon E5 v3/Core i7 Buffered Ring Agent
- 2ffa Xeon E5 v3/Core i7 Buffered Ring Agent
- 2ffb Xeon E5 v3/Core i7 Buffered Ring Agent
- 2ffc Xeon E5 v3/Core i7 System Address Decoder & Broadcast Registers
- 2ffd Xeon E5 v3/Core i7 System Address Decoder & Broadcast Registers
- 2ffe Xeon E5 v3/Core i7 System Address Decoder & Broadcast Registers
+ 2f00 Xeon E7 v3/Xeon E5 v3/Core i7 DMI2
+ 2f01 Xeon E7 v3/Xeon E5 v3/Core i7 PCI Express Root Port 0
+ 2f02 Xeon E7 v3/Xeon E5 v3/Core i7 PCI Express Root Port 1
+ 2f03 Xeon E7 v3/Xeon E5 v3/Core i7 PCI Express Root Port 1
+ 2f04 Xeon E7 v3/Xeon E5 v3/Core i7 PCI Express Root Port 2
+ 2f05 Xeon E7 v3/Xeon E5 v3/Core i7 PCI Express Root Port 2
+ 2f06 Xeon E7 v3/Xeon E5 v3/Core i7 PCI Express Root Port 2
+ 2f07 Xeon E7 v3/Xeon E5 v3/Core i7 PCI Express Root Port 2
+ 2f08 Xeon E7 v3/Xeon E5 v3/Core i7 PCI Express Root Port 3
+ 2f09 Xeon E7 v3/Xeon E5 v3/Core i7 PCI Express Root Port 3
+ 2f0a Xeon E7 v3/Xeon E5 v3/Core i7 PCI Express Root Port 3
+ 2f0b Xeon E7 v3/Xeon E5 v3/Core i7 PCI Express Root Port 3
+ 2f10 Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
+ 2f11 Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
+ 2f12 Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
+ 2f13 Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
+ 2f14 Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
+ 2f15 Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
+ 2f16 Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
+ 2f17 Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
+ 2f18 Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
+ 2f19 Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
+ 2f1a Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
+ 2f1b Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
+ 2f1c Xeon E7 v3/Xeon E5 v3/Core i7 IIO Debug
+ 2f1d Xeon E7 v3/Xeon E5 v3/Core i7 PCIe Ring Interface
+ 2f1e Xeon E7 v3/Xeon E5 v3/Core i7 Scratchpad & Semaphore Registers
+ 2f1f Xeon E7 v3/Xeon E5 v3/Core i7 Scratchpad & Semaphore Registers
+ 2f20 Xeon E7 v3/Xeon E5 v3/Core i7 DMA Channel 0
+ 2f21 Xeon E7 v3/Xeon E5 v3/Core i7 DMA Channel 1
+ 2f22 Xeon E7 v3/Xeon E5 v3/Core i7 DMA Channel 2
+ 2f23 Xeon E7 v3/Xeon E5 v3/Core i7 DMA Channel 3
+ 2f24 Xeon E7 v3/Xeon E5 v3/Core i7 DMA Channel 4
+ 2f25 Xeon E7 v3/Xeon E5 v3/Core i7 DMA Channel 5
+ 2f26 Xeon E7 v3/Xeon E5 v3/Core i7 DMA Channel 6
+ 2f27 Xeon E7 v3/Xeon E5 v3/Core i7 DMA Channel 7
+ 2f28 Xeon E7 v3/Xeon E5 v3/Core i7 Address Map, VTd_Misc, System Management
+ 2f29 Xeon E7 v3/Xeon E5 v3/Core i7 Hot Plug
+ 2f2a Xeon E7 v3/Xeon E5 v3/Core i7 RAS, Control Status and Global Errors
+ 2f2c Xeon E7 v3/Xeon E5 v3/Core i7 I/O APIC
+ 2f2e Xeon E7 v3/Xeon E5 v3/Core i7 RAID 5/6
+ 2f2f Xeon E7 v3/Xeon E5 v3/Core i7 RAID 5/6
+ 2f30 Xeon E7 v3/Xeon E5 v3/Core i7 Home Agent 0
+ 2f32 Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 0
+ 2f33 Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 1
+ 2f34 Xeon E7 v3/Xeon E5 v3/Core i7 PCIe Ring Interface
+ 2f36 Xeon E7 v3/Xeon E5 v3/Core i7 R3 QPI Link 0 & 1 Monitoring
+ 2f37 Xeon E7 v3/Xeon E5 v3/Core i7 R3 QPI Link 0 & 1 Monitoring
+ 2f38 Xeon E7 v3/Xeon E5 v3/Core i7 Home Agent 1
+ 2f39 Xeon E7 v3/Xeon E5 v3/Core i7 I/O Performance Monitoring
+ 2f3a Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 2
+ 2f3e Xeon E7 v3/Xeon E5 v3/Core i7 R3 QPI Link 2 Monitoring
+ 2f3f Xeon E7 v3/Xeon E5 v3/Core i7 R3 QPI Link 2 Monitoring
+ 2f40 Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 2
+ 2f41 Xeon E7 v3/Xeon E5 v3/Core i7 R3 QPI Link 2 Monitoring
+ 2f43 Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 2
+ 2f45 Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 2 Debug
+ 2f46 Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 2 Debug
+ 2f47 Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 2 Debug
+ 2f60 Xeon E7 v3/Xeon E5 v3/Core i7 Home Agent 1
+ 2f68 Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Target Address, Thermal & RAS Registers
+ 2f6a Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel Target Address Decoder
+ 2f6b Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel Target Address Decoder
+ 2f6c Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel Target Address Decoder
+ 2f6d Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel Target Address Decoder
+ 2f6e Xeon E7 v3/Xeon E5 v3/Core i7 DDRIO Channel 2/3 Broadcast
+ 2f6f Xeon E7 v3/Xeon E5 v3/Core i7 DDRIO Global Broadcast
+ 2f70 Xeon E7 v3/Xeon E5 v3/Core i7 Home Agent 0 Debug
+ 2f71 Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Target Address, Thermal & RAS Registers
+ 2f76 Xeon E7 v3/Xeon E5 v3/Core i7 E3 QPI Link Debug
+ 2f78 Xeon E7 v3/Xeon E5 v3/Core i7 Home Agent 1 Debug
+ 2f79 Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Target Address, Thermal & RAS Registers
+ 2f7d Xeon E7 v3/Xeon E5 v3/Core i7 Scratchpad & Semaphore Registers
+ 2f7e Xeon E7 v3/Xeon E5 v3/Core i7 E3 QPI Link Debug
+ 2f80 Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 0
+ 2f81 Xeon E7 v3/Xeon E5 v3/Core i7 R3 QPI Link 0 & 1 Monitoring
+ 2f83 Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 0
+ 2f85 Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 0 Debug
+ 2f86 Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 0 Debug
+ 2f87 Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 0 Debug
+ 2f88 Xeon E7 v3/Xeon E5 v3/Core i7 VCU
+ 2f8a Xeon E7 v3/Xeon E5 v3/Core i7 VCU
+ 2f90 Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 1
+ 2f93 Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 1
+ 2f95 Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 1 Debug
+ 2f96 Xeon E7 v3/Xeon E5 v3/Core i7 QPI Link 1 Debug
+ 2f98 Xeon E7 v3/Xeon E5 v3/Core i7 Power Control Unit
+ 2f99 Xeon E7 v3/Xeon E5 v3/Core i7 Power Control Unit
+ 2f9a Xeon E7 v3/Xeon E5 v3/Core i7 Power Control Unit
+ 2f9c Xeon E7 v3/Xeon E5 v3/Core i7 Power Control Unit
+ 2fa0 Xeon E7 v3/Xeon E5 v3/Core i7 Home Agent 0
+ 2fa8 Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Target Address, Thermal & RAS Registers
+ 2faa Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel Target Address Decoder
+ 2fab Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel Target Address Decoder
+ 2fac Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel Target Address Decoder
+ 2fad Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel Target Address Decoder
+ 2fae Xeon E7 v3/Xeon E5 v3/Core i7 DDRIO Channel 0/1 Broadcast
+ 2faf Xeon E7 v3/Xeon E5 v3/Core i7 DDRIO Global Broadcast
+ 2fb0 Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 0 Thermal Control
+ 2fb1 Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 1 Thermal Control
+ 2fb2 Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 0 ERROR Registers
+ 2fb3 Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 1 ERROR Registers
+ 2fb4 Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 2 Thermal Control
+ 2fb5 Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 3 Thermal Control
+ 2fb6 Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 2 ERROR Registers
+ 2fb7 Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 0 Channel 3 ERROR Registers
+ 2fb8 Xeon E7 v3/Xeon E5 v3/Core i7 DDRIO (VMSE) 2 & 3
+ 2fb9 Xeon E7 v3/Xeon E5 v3/Core i7 DDRIO (VMSE) 2 & 3
+ 2fba Xeon E7 v3/Xeon E5 v3/Core i7 DDRIO (VMSE) 2 & 3
+ 2fbb Xeon E7 v3/Xeon E5 v3/Core i7 DDRIO (VMSE) 2 & 3
+ 2fbc Xeon E7 v3/Xeon E5 v3/Core i7 DDRIO (VMSE) 0 & 1
+ 2fbd Xeon E7 v3/Xeon E5 v3/Core i7 DDRIO (VMSE) 0 & 1
+ 2fbe Xeon E7 v3/Xeon E5 v3/Core i7 DDRIO (VMSE) 0 & 1
+ 2fbf Xeon E7 v3/Xeon E5 v3/Core i7 DDRIO (VMSE) 0 & 1
+ 2fc0 Xeon E7 v3/Xeon E5 v3/Core i7 Power Control Unit
+ 2fc1 Xeon E7 v3/Xeon E5 v3/Core i7 Power Control Unit
+ 2fc2 Xeon E7 v3/Xeon E5 v3/Core i7 Power Control Unit
+ 2fc3 Xeon E7 v3/Xeon E5 v3/Core i7 Power Control Unit
+ 2fc4 Xeon E7 v3/Xeon E5 v3/Core i7 Power Control Unit
+ 2fc5 Xeon E7 v3/Xeon E5 v3/Core i7 Power Control Unit
+ 2fd0 Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 0 Thermal Control
+ 2fd1 Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 1 Thermal Control
+ 2fd2 Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 0 ERROR Registers
+ 2fd3 Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 1 ERROR Registers
+ 2fd4 Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 2 Thermal Control
+ 2fd5 Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 3 Thermal Control
+ 2fd6 Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 2 ERROR Registers
+ 2fd7 Xeon E7 v3/Xeon E5 v3/Core i7 Integrated Memory Controller 1 Channel 3 ERROR Registers
+ 2fe0 Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+ 2fe1 Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+ 2fe2 Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+ 2fe3 Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+ 2fe4 Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+ 2fe5 Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+ 2fe6 Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+ 2fe7 Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+ 2fe8 Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+ 2fe9 Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+ 2fea Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+ 2feb Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+ 2fec Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+ 2fed Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+ 2fee Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+ 2fef Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+ 2ff0 Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+ 2ff1 Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+ 2ff2 Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+ 2ff3 Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+ 2ff4 Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+ 2ff5 Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+ 2ff6 Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+ 2ff7 Xeon E7 v3/Xeon E5 v3/Core i7 Unicast Registers
+ 2ff8 Xeon E7 v3/Xeon E5 v3/Core i7 Buffered Ring Agent
+ 2ff9 Xeon E7 v3/Xeon E5 v3/Core i7 Buffered Ring Agent
+ 2ffa Xeon E7 v3/Xeon E5 v3/Core i7 Buffered Ring Agent
+ 2ffb Xeon E7 v3/Xeon E5 v3/Core i7 Buffered Ring Agent
+ 2ffc Xeon E7 v3/Xeon E5 v3/Core i7 System Address Decoder & Broadcast Registers
+ 2ffd Xeon E7 v3/Xeon E5 v3/Core i7 System Address Decoder & Broadcast Registers
+ 2ffe Xeon E7 v3/Xeon E5 v3/Core i7 System Address Decoder & Broadcast Registers
3165 Wireless 3165
# Stone Peak 1x1
8086 4010 Dual Band Wireless AC 3165
# Stone Peak 1x1
8086 4210 Dual Band Wireless AC 3165
+# Stone Peak 1x1
+ 3166 Intel Dual Band Wireless-AC 3165 Plus Bluetooth
3200 GD31244 PCI-X SATA HBA
1775 c200 C2K onboard SATA host bus adapter
3310 IOP348 I/O Processor
@@ -24361,6 +25280,7 @@
3578 82830M/MG/MP Host Bridge
3580 82852/82855 GM/GME/PM/GMV Processor to I/O Controller
1014 055c ThinkPad R50e
+ 1025 0064 Extensa 3000 series laptop
1028 0139 Latitude D400
1028 014f Latitude X300
1028 0152 Latitude D500
@@ -24393,6 +25313,7 @@
e4bf 0cd2 CD2-BEBOP
3584 82852/82855 GM/GME/PM/GMV Processor to I/O Controller
1014 055d ThinkPad R50e
+ 1025 0064 Extensa 3000 series laptop
1028 0139 Latitude D400
1028 014f Latitude X300
1028 0152 Latitude D500
@@ -24407,6 +25328,7 @@
4c53 10e0 PSL09 PrPMC
3585 82852/82855 GM/GME/PM/GMV Processor to I/O Controller
1014 055e ThinkPad R50e
+ 1025 0064 Extensa 3000 series laptop
1028 0139 Latitude D400
1028 014f Latitude X300
1028 0152 Latitude D500
@@ -24649,34 +25571,35 @@
3a7c 82801JD/DO (ICH10 Family) Gigabit Ethernet Controller
3b00 5 Series/3400 Series Chipset LPC Interface Controller
3b01 Mobile 5 Series Chipset LPC Interface Controller
- 3b02 5 Series Chipset LPC Interface Controller
- 3b03 Mobile 5 Series Chipset LPC Interface Controller
+ 3b02 P55 Chipset LPC Interface Controller
+ 3b03 PM55 Chipset LPC Interface Controller
3b04 5 Series Chipset LPC Interface Controller
3b05 Mobile 5 Series Chipset LPC Interface Controller
- 3b06 5 Series Chipset LPC Interface Controller
- 3b07 Mobile 5 Series Chipset LPC Interface Controller
+ 3b06 H55 Chipset LPC Interface Controller
+ 3b07 QM57 Chipset LPC Interface Controller
+ 1028 040a Latitude E6410
1028 040b Latitude E6510
e4bf 50c1 PC1-GROOVE
- 3b08 5 Series Chipset LPC Interface Controller
- 3b09 Mobile 5 Series Chipset LPC Interface Controller
+ 3b08 H57 Chipset LPC Interface Controller
+ 3b09 HM55 Chipset LPC Interface Controller
1025 0347 Aspire 7740G
144d c06a R730 Laptop
17c0 10d2 Medion Akoya E7214 Notebook PC [MD98410]
- 3b0a 5 Series Chipset LPC Interface Controller
+ 3b0a Q57 Chipset LPC Interface Controller
1028 02da OptiPlex 980
15d9 060d C7SIM-Q Motherboard
- 3b0b Mobile 5 Series Chipset LPC Interface Controller
+ 3b0b HM57 Chipset LPC Interface Controller
3b0c 5 Series Chipset LPC Interface Controller
3b0d 5 Series/3400 Series Chipset LPC Interface Controller
3b0e 5 Series/3400 Series Chipset LPC Interface Controller
- 3b0f 5 Series/3400 Series Chipset LPC Interface Controller
+ 3b0f QS57 Chipset LPC Interface Controller
3b10 5 Series/3400 Series Chipset LPC Interface Controller
3b11 5 Series/3400 Series Chipset LPC Interface Controller
3b12 3400 Series Chipset LPC Interface Controller
3b13 5 Series/3400 Series Chipset LPC Interface Controller
- 3b14 3400 Series Chipset LPC Interface Controller
+ 3b14 3420 Chipset LPC Interface Controller
3b15 5 Series/3400 Series Chipset LPC Interface Controller
- 3b16 3400 Series Chipset LPC Interface Controller
+ 3b16 3450 Chipset LPC Interface Controller
3b17 5 Series/3400 Series Chipset LPC Interface Controller
3b18 5 Series/3400 Series Chipset LPC Interface Controller
3b19 5 Series/3400 Series Chipset LPC Interface Controller
@@ -24693,7 +25616,7 @@
15d9 060d C7SIM-Q Motherboard
3b23 5 Series/3400 Series Chipset 4 port SATA AHCI Controller
3b25 5 Series/3400 Series Chipset SATA RAID Controller
- 103c 3118 HP Smart Array B110i SATA RAID Controller
+ 103c 3118 Smart Array B110i SATA RAID Controller
3b26 5 Series/3400 Series Chipset 2 port SATA IDE Controller
3b28 5 Series/3400 Series Chipset 4 port SATA IDE Controller
144d c06a R730 Laptop
@@ -24710,11 +25633,13 @@
3b2e 5 Series/3400 Series Chipset 4 port SATA IDE Controller
e4bf 50c1 PC1-GROOVE
3b2f 5 Series/3400 Series Chipset 6 port SATA AHCI Controller
+ 1028 040a Latitude E6410
1028 040b Latitude E6510
e4bf 50c1 PC1-GROOVE
3b30 5 Series/3400 Series Chipset SMBus Controller
1025 0347 Aspire 7740G
1028 02da OptiPlex 980
+ 1028 040a Latitude E6410
1028 040b Latitude E6510
144d c06a R730 Laptop
15d9 060d C7SIM-Q Motherboard
@@ -24722,11 +25647,13 @@
e4bf 50c1 PC1-GROOVE
3b32 5 Series/3400 Series Chipset Thermal Subsystem
1025 0347 Aspire 7740G
+ 1028 040a Latitude E6410
144d c06a R730 Laptop
17c0 10d2 Medion Akoya E7214 Notebook PC [MD98410]
3b34 5 Series/3400 Series Chipset USB2 Enhanced Host Controller
1025 0347 Aspire 7740G
1028 02da OptiPlex 980
+ 1028 040a Latitude E6410
1028 040b Latitude E6510
144d c06a R730 Laptop
15d9 060d C7SIM-Q Motherboard
@@ -24741,6 +25668,7 @@
3b3c 5 Series/3400 Series Chipset USB2 Enhanced Host Controller
1025 0347 Aspire 7740G
1028 02da OptiPlex 980
+ 1028 040a Latitude E6410
1028 040b Latitude E6510
144d c06a R730 Laptop
15d9 060d C7SIM-Q Motherboard
@@ -24752,19 +25680,23 @@
3b41 5 Series/3400 Series Chipset LAN Controller
3b42 5 Series/3400 Series Chipset PCI Express Root Port 1
1028 02da OptiPlex 980
+ 1028 040a Latitude E6410
1028 040b Latitude E6510
144d c06a R730 Laptop
15d9 060d C7SIM-Q Motherboard
17c0 10d2 Medion Akoya E7214 Notebook PC [MD98410]
3b44 5 Series/3400 Series Chipset PCI Express Root Port 2
+ 1028 040a Latitude E6410
1028 040b Latitude E6510
15d9 060d C7SIM-Q Motherboard
17c0 10d2 Medion Akoya E7214 Notebook PC [MD98410]
3b46 5 Series/3400 Series Chipset PCI Express Root Port 3
+ 1028 040a Latitude E6410
1028 040b Latitude E6510
144d c06a R730 Laptop
17c0 10d2 Medion Akoya E7214 Notebook PC [MD98410]
3b48 5 Series/3400 Series Chipset PCI Express Root Port 4
+ 1028 040a Latitude E6410
1028 040b Latitude E6510
144d c06a R730 Laptop
3b4a 5 Series/3400 Series Chipset PCI Express Root Port 5
@@ -24777,6 +25709,7 @@
3b56 5 Series/3400 Series Chipset High Definition Audio
1025 0347 Aspire 7740G
1028 02da OptiPlex 980
+ 1028 040a Latitude E6410
1028 040b Latitude E6510
144d c06a R730 Laptop
15d9 060d C7SIM-Q Motherboard
@@ -24903,7 +25836,7 @@
4220 PRO/Wireless 2200BG [Calexico2] Network Connection
103c 0934 Compaq nw8240/nx8220
103c 12f6 nc6120/nx8220/nw8240
- 8086 2701 WM3B2300BG Mini-PCI Card
+ 8086 2701 WM3B2200BG Mini-PCI Card
8086 2712 IBM ThinkPad R50e
8086 2721 Dell B130 laptop integrated WLAN
8086 2722 Dell Latitude D600
@@ -25042,6 +25975,7 @@
530d 80310 (IOP) IO Processor
5845 QEMU NVM Express Controller
1af4 1100 QEMU Virtual Machine
+ 5ad4 Broxton SMBus Controller
65c0 5100 Chipset Memory Controller Hub
65e2 5100 Chipset PCI Express x4 Port 2
65e3 5100 Chipset PCI Express x4 Port 3
@@ -25062,167 +25996,171 @@
65f9 5100 Chipset PCI Express x8 Port 6-7
65fa 5100 Chipset PCI Express x16 Port 4-7
65ff 5100 Chipset DMA Engine
- 6f00 Broadwell DMI2
- 6f01 Broadwell PCI Express Root Port 0
- 6f02 Broadwell PCI Express Root Port 1
- 6f03 Broadwell PCI Express Root Port 1
- 6f04 Broadwell PCI Express Root Port 2
- 6f05 Broadwell PCI Express Root Port 2
- 6f06 Broadwell PCI Express Root Port 2
- 6f07 Broadwell PCI Express Root Port 2
- 6f08 Broadwell PCI Express Root Port 3
- 6f09 Broadwell PCI Express Root Port 3
- 6f0a Broadwell PCI Express Root Port 3
- 6f0b Broadwell PCI Express Root Port 3
- 6f10 Broadwell IIO Debug
- 6f11 Broadwell IIO Debug
- 6f12 Broadwell IIO Debug
- 6f13 Broadwell IIO Debug
- 6f14 Broadwell IIO Debug
- 6f15 Broadwell IIO Debug
- 6f16 Broadwell IIO Debug
- 6f17 Broadwell IIO Debug
- 6f18 Broadwell IIO Debug
- 6f19 Broadwell IIO Debug
- 6f1a Broadwell IIO Debug
- 6f1b Broadwell IIO Debug
- 6f1c Broadwell IIO Debug
- 6f1d Broadwell R2PCIe Agent
- 6f1e Broadwell Ubox
- 6f1f Broadwell Ubox
- 6f20 Broadwell-DE Crystal Beach DMA Channel 0
- 6f21 Broadwell-DE Crystal Beach DMA Channel 1
- 6f22 Broadwell-DE Crystal Beach DMA Channel 2
- 6f23 Broadwell-DE Crystal Beach DMA Channel 3
- 6f24 Broadwell-DE Crystal Beach DMA Channel 4
- 6f25 Broadwell-DE Crystal Beach DMA Channel 5
- 6f26 Broadwell-DE Crystal Beach DMA Channel 6
- 6f27 Broadwell-DE Crystal Beach DMA Channel 7
- 6f28 Broadwell Adress Map/VTd_Misc/System Management
- 6f29 Broadwell IIO Hot Plug
- 6f2a Broadwell IIO RAS/Control Status/Global Errors
- 6f2c Broadwell I/O APIC
- 6f30 Broadwell Home Agent 0
- 6f32 Broadwell QPI Link 0
- 6f33 Broadwell QPI Link 1
- 6f34 Broadwell R2PCIe Agent
- 6f36 Broadwell R3 QPI Link 0/1
- 6f37 Broadwell R3 QPI Link 0/1
- 6f38 Broadwell Home Agent 1
- 6f39 Broadwell IO Performance Monitoring
- 6f3a Broadwell QPI Link 2
- 6f3e Broadwell R3 QPI Link 2
- 6f3f Broadwell R3 QPI Link 2
- 6f40 Broadwell QPI Link 2
- 6f41 Broadwell R3 QPI Link 2
- 6f43 Broadwell QPI Link 2
- 6f45 Broadwell QPI Link 2 Debug
- 6f46 Broadwell QPI Link 2 Debug
- 6f47 Broadwell QPI Link 2 Debug
- 6f60 Broadwell Home Agent 1
- 6f68 Broadwell Target Address/Thermal/RAS
- 6f6a Broadwell Channel Target Address Decoder
- 6f6b Broadwell Channel Target Address Decoder
- 6f6c Broadwell Channel Target Address Decoder
- 6f6d Broadwell Channel Target Address Decoder
- 6f6e Broadwell DDRIO Channel 2/3 Broadcast
- 6f6f Broadwell DDRIO Global Broadcast
- 6f70 Broadwell Home Agent 0 Debug
- 6f71 Broadwell Memory Controller 0 - Target Address/Thermal/RAS
- 6f76 Broadwell R3 QPI Link Debug
- 6f78 Broadwell Home Agent 1 Debug
- 6f79 Broadwell Target Address/Thermal/RAS
- 6f7d Broadwell Ubox
- 6f7e Broadwell R3 QPI Link Debug
- 6f80 Broadwell QPI Link 0
- 6f81 Broadwell R3 QPI Link 0/1
- 6f83 Broadwell QPI Link 0
- 6f85 Broadwell QPI Link 0 Debug
- 6f86 Broadwell QPI Link 0 Debug
- 6f87 Broadwell QPI Link 0 Debug
- 6f88 Broadwell Power Control Unit
- 6f8a Broadwell Power Control Unit
- 6f90 Broadwell QPI Link 1
- 6f93 Broadwell QPI Link 1
- 6f95 Broadwell QPI Link 1 Debug
- 6f96 Broadwell QPI Link 1 Debug
- 6f98 Broadwell Power Control Unit
- 6f99 Broadwell Power Control Unit
- 6f9a Broadwell Power Control Unit
- 6f9c Broadwell Power Control Unit
- 6fa0 Broadwell Home Agent 0
- 6fa8 Broadwell Memory Controller 0 - Target Address/Thermal/RAS
- 6faa Broadwell Memory Controller 0 - Channel Target Address Decoder
- 6fab Broadwell Memory Controller 0 - Channel Target Address Decoder
- 6fac Broadwell Memory Controller 0 - Channel Target Address Decoder
- 6fad Broadwell Memory Controller 0 - Channel Target Address Decoder
- 6fae Broadwell DDRIO Channel 0/1 Broadcast
- 6faf Broadwell DDRIO Global Broadcast
- 6fb0 Broadwell Memory Controller 0 - Channel 0 Thermal Control
- 6fb1 Broadwell Memory Controller 0 - Channel 1 Thermal Control
- 6fb2 Broadwell Memory Controller 0 - Channel 0 Error
- 6fb3 Broadwell Memory Controller 0 - Channel 1 Error
- 6fb4 Broadwell Memory Controller 0 - Channel 2 Thermal Control
- 6fb5 Broadwell Memory Controller 0 - Channel 3 Thermal Control
- 6fb6 Broadwell Memory Controller 0 - Channel 2 Error
- 6fb7 Broadwell Memory Controller 0 - Channel 3 Error
- 6fb8 Broadwell DDRIO Channel 2/3 Interface
- 6fb9 Broadwell DDRIO Channel 2/3 Interface
- 6fba Broadwell DDRIO Channel 2/3 Interface
- 6fbb Broadwell DDRIO Channel 2/3 Interface
- 6fbc Broadwell DDRIO Channel 0/1 Interface
- 6fbd Broadwell DDRIO Channel 0/1 Interface
- 6fbe Broadwell DDRIO Channel 0/1 Interface
- 6fbf Broadwell DDRIO Channel 0/1 Interface
- 6fc0 Broadwell Power Control Unit
- 6fc1 Broadwell Power Control Unit
- 6fc2 Broadwell Power Control Unit
- 6fc3 Broadwell Power Control Unit
- 6fc4 Broadwell Power Control Unit
- 6fc5 Broadwell Power Control Unit
- 6fc6 Broadwell Power Control Unit
- 6fc7 Broadwell Power Control Unit
- 6fc8 Broadwell Power Control Unit
- 6fc9 Broadwell Power Control Unit
- 6fca Broadwell Power Control Unit
- 6fcb Broadwell Power Control Unit
- 6fcc Broadwell Power Control Unit
- 6fcd Broadwell Power Control Unit
- 6fce Broadwell Power Control Unit
- 6fcf Broadwell Power Control Unit
- 6fd0 Broadwell Memory Controller 1 - Channel 0 Thermal Control
- 6fd1 Broadwell Memory Controller 1 - Channel 1 Thermal Control
- 6fd2 Broadwell Memory Controller 1 - Channel 0 Error
- 6fd3 Broadwell Memory Controller 1 - Channel 1 Error
- 6fd4 Broadwell Memory Controller 1 - Channel 2 Thermal Control
- 6fd5 Broadwell Memory Controller 1 - Channel 3 Thermal Control
- 6fd6 Broadwell Memory Controller 1 - Channel 2 Error
- 6fd7 Broadwell Memory Controller 1 - Channel 3 Error
- 6fe0 Broadwell Caching Agent
- 6fe1 Broadwell Caching Agent
- 6fe2 Broadwell Caching Agent
- 6fe3 Broadwell Caching Agent
- 6fe4 Broadwell Caching Agent
- 6fe5 Broadwell Caching Agent
- 6fe6 Broadwell Caching Agent
- 6fe7 Broadwell Caching Agent
- 6fe8 Broadwell Caching Agent
- 6fe9 Broadwell Caching Agent
- 6fea Broadwell Caching Agent
- 6feb Broadwell Caching Agent
- 6fec Broadwell Caching Agent
- 6fed Broadwell Caching Agent
- 6fee Broadwell Caching Agent
- 6fef Broadwell Caching Agent
- 6ff0 Broadwell Caching Agent
- 6ff1 Broadwell Caching Agent
- 6ff8 Broadwell Caching Agent
- 6ff9 Broadwell Caching Agent
- 6ffa Broadwell Caching Agent
- 6ffb Broadwell Caching Agent
- 6ffc Broadwell Caching Agent
- 6ffd Broadwell Caching Agent
- 6ffe Broadwell Caching Agent
+ 6f00 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D DMI2
+ 6f01 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI Express Root Port 0
+ 6f02 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI Express Root Port 1
+ 6f03 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI Express Root Port 1
+ 6f04 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI Express Root Port 2
+ 6f05 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI Express Root Port 2
+ 6f06 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI Express Root Port 2
+ 6f07 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI Express Root Port 2
+ 6f08 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI Express Root Port 3
+ 6f09 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI Express Root Port 3
+ 6f0a Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI Express Root Port 3
+ 6f0b Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI Express Root Port 3
+ 6f10 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D IIO Debug
+ 6f11 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D IIO Debug
+ 6f12 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D IIO Debug
+ 6f13 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D IIO Debug
+ 6f14 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D IIO Debug
+ 6f15 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D IIO Debug
+ 6f16 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D IIO Debug
+ 6f17 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D IIO Debug
+ 6f18 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D IIO Debug
+ 6f19 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D IIO Debug
+ 6f1a Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D IIO Debug
+ 6f1b Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D IIO Debug
+ 6f1c Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D IIO Debug
+ 6f1d Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D R2PCIe Agent
+ 6f1e Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Ubox
+ 6f1f Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Ubox
+ 6f20 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Crystal Beach DMA Channel 0
+ 6f21 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Crystal Beach DMA Channel 1
+ 6f22 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Crystal Beach DMA Channel 2
+ 6f23 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Crystal Beach DMA Channel 3
+ 6f24 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Crystal Beach DMA Channel 4
+ 6f25 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Crystal Beach DMA Channel 5
+ 6f26 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Crystal Beach DMA Channel 6
+ 6f27 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Crystal Beach DMA Channel 7
+ 6f28 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Map/VTd_Misc/System Management
+ 6f29 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D IIO Hot Plug
+ 6f2a Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D IIO RAS/Control Status/Global Errors
+ 6f2c Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D I/O APIC
+ 6f30 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Home Agent 0
+ 6f32 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QPI Link 0
+ 6f33 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QPI Link 1
+ 6f34 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D R2PCIe Agent
+ 6f36 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D R3 QPI Link 0/1
+ 6f37 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D R3 QPI Link 0/1
+ 6f38 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Home Agent 1
+ 6f39 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D IO Performance Monitoring
+ 6f3a Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QPI Link 2
+ 6f3e Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D R3 QPI Link 2
+ 6f3f Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D R3 QPI Link 2
+ 6f40 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QPI Link 2
+ 6f41 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D R3 QPI Link 2
+ 6f43 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QPI Link 2
+ 6f45 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QPI Link 2 Debug
+ 6f46 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QPI Link 2 Debug
+ 6f47 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QPI Link 2 Debug
+ 6f50 Xeon Processor D Family QuickData Technology Register DMA Channel 0
+ 6f51 Xeon Processor D Family QuickData Technology Register DMA Channel 1
+ 6f52 Xeon Processor D Family QuickData Technology Register DMA Channel 2
+ 6f53 Xeon Processor D Family QuickData Technology Register DMA Channel 3
+ 6f60 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Home Agent 1
+ 6f68 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Target Address/Thermal/RAS
+ 6f6a Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Channel Target Address Decoder
+ 6f6b Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Channel Target Address Decoder
+ 6f6c Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Channel Target Address Decoder
+ 6f6d Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Channel Target Address Decoder
+ 6f6e Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D DDRIO Channel 2/3 Broadcast
+ 6f6f Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D DDRIO Global Broadcast
+ 6f70 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Home Agent 0 Debug
+ 6f71 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 0 - Target Address/Thermal/RAS
+ 6f76 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D R3 QPI Link Debug
+ 6f78 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Home Agent 1 Debug
+ 6f79 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Target Address/Thermal/RAS
+ 6f7d Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Ubox
+ 6f7e Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D R3 QPI Link Debug
+ 6f80 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QPI Link 0
+ 6f81 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D R3 QPI Link 0/1
+ 6f83 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QPI Link 0
+ 6f85 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QPI Link 0 Debug
+ 6f86 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QPI Link 0 Debug
+ 6f87 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QPI Link 0 Debug
+ 6f88 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+ 6f8a Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+ 6f90 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QPI Link 1
+ 6f93 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QPI Link 1
+ 6f95 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QPI Link 1 Debug
+ 6f96 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D QPI Link 1 Debug
+ 6f98 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+ 6f99 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+ 6f9a Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+ 6f9c Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+ 6fa0 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Home Agent 0
+ 6fa8 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 0 - Target Address/Thermal/RAS
+ 6faa Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 0 - Channel Target Address Decoder
+ 6fab Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 0 - Channel Target Address Decoder
+ 6fac Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 0 - Channel Target Address Decoder
+ 6fad Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 0 - Channel Target Address Decoder
+ 6fae Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D DDRIO Channel 0/1 Broadcast
+ 6faf Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D DDRIO Global Broadcast
+ 6fb0 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 0 - Channel 0 Thermal Control
+ 6fb1 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 0 - Channel 1 Thermal Control
+ 6fb2 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 0 - Channel 0 Error
+ 6fb3 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 0 - Channel 1 Error
+ 6fb4 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 0 - Channel 2 Thermal Control
+ 6fb5 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 0 - Channel 3 Thermal Control
+ 6fb6 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 0 - Channel 2 Error
+ 6fb7 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 0 - Channel 3 Error
+ 6fb8 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D DDRIO Channel 2/3 Interface
+ 6fb9 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D DDRIO Channel 2/3 Interface
+ 6fba Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D DDRIO Channel 2/3 Interface
+ 6fbb Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D DDRIO Channel 2/3 Interface
+ 6fbc Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D DDRIO Channel 0/1 Interface
+ 6fbd Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D DDRIO Channel 0/1 Interface
+ 6fbe Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D DDRIO Channel 0/1 Interface
+ 6fbf Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D DDRIO Channel 0/1 Interface
+ 6fc0 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+ 6fc1 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+ 6fc2 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+ 6fc3 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+ 6fc4 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+ 6fc5 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+ 6fc6 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+ 6fc7 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+ 6fc8 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+ 6fc9 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+ 6fca Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+ 6fcb Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+ 6fcc Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+ 6fcd Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+ 6fce Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+ 6fcf Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Power Control Unit
+ 6fd0 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 1 - Channel 0 Thermal Control
+ 6fd1 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 1 - Channel 1 Thermal Control
+ 6fd2 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 1 - Channel 0 Error
+ 6fd3 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 1 - Channel 1 Error
+ 6fd4 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 1 - Channel 2 Thermal Control
+ 6fd5 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 1 - Channel 3 Thermal Control
+ 6fd6 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 1 - Channel 2 Error
+ 6fd7 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Memory Controller 1 - Channel 3 Error
+ 6fe0 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+ 6fe1 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+ 6fe2 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+ 6fe3 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+ 6fe4 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+ 6fe5 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+ 6fe6 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+ 6fe7 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+ 6fe8 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+ 6fe9 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+ 6fea Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+ 6feb Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+ 6fec Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+ 6fed Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+ 6fee Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+ 6fef Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+ 6ff0 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+ 6ff1 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+ 6ff8 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+ 6ff9 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+ 6ffa Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+ 6ffb Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+ 6ffc Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+ 6ffd Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
+ 6ffe Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Caching Agent
7000 82371SB PIIX3 ISA [Natoma/Triton II]
1af4 1100 Qemu virtual machine
7010 82371SB PIIX3 IDE [Natoma/Triton II]
@@ -25616,6 +26554,7 @@
9c2d 8 Series USB EHCI #2
9c31 8 Series USB xHCI HC
17aa 2214 ThinkPad X240
+ 8086 7270 Apple MacBookAir6,2 / MacBookPro11,1
9c35 8 Series SDIO Controller
9c36 8 Series Audio DSP Controller
9c3a 8 Series HECI #0
@@ -25674,6 +26613,17 @@
9ce4 Wildcat Point-LP Serial IO UART Controller #1
9ce5 Wildcat Point-LP Serial IO GSPI Controller #0
9ce6 Wildcat Point-LP Serial IO GSPI Controller #1
+ 9d03 Sunrise Point-LP SATA Controller [AHCI mode]
+ 9d14 Sunrise Point-LP PCI Express Root Port #5
+ 9d21 Sunrise Point-LP PMC
+ 9d23 Sunrise Point-LP SMBus
+ 9d27 Sunrise Point-LP LPSS UART #0
+ 9d2d Sunrise Point-LP Secure Digital IO Controller
+ 9d2f Sunrise Point-LP USB 3.0 xHCI Controller
+ 9d31 Sunrise Point-LP Thermal subsystem
+ 9d3a Sunrise Point-LP CSME HECI #1
+ 9d48 Sunrise Point-LP LPC Controller
+ 9d70 Sunrise Point-LP HD Audio
a000 Atom Processor D4xx/D5xx/N4xx/N5xx DMI Bridge
1458 5000 GA-D525TUD
8086 4f4d DeskTop Board D510MO
@@ -25691,6 +26641,7 @@
a012 Atom Processor D4xx/D5xx/N4xx/N5xx Integrated Graphics Controller
144d c072 Notebook N150P
a013 Atom Processor D4xx/D5xx/N4xx/N5xx CHAPS counter
+ a102 Sunrise Point-H SATA controller [AHCI mode]
a103 Sunrise Point-H SATA Controller [AHCI mode]
a105 Sunrise Point-H SATA Controller [RAID mode]
a107 Sunrise Point-H SATA Controller [RAID mode]
@@ -25772,7 +26723,55 @@
a169 Sunrise Point-H PCI Root Port #19
a16a Sunrise Point-H PCI Root Port #20
a170 Sunrise Point-H HD Audio
+ a182 Lewisburg SATA Controller [AHCI mode]
+ a190 Lewisburg PCI Express Root Port #1
+ a191 Lewisburg PCI Express Root Port #2
+ a192 Lewisburg PCI Express Root Port #3
+ a193 Lewisburg PCI Express Root Port #4
+ a194 Lewisburg PCI Express Root Port #5
+ a195 Lewisburg PCI Express Root Port #6
+ a196 Lewisburg PCI Express Root Port #7
+ a197 Lewisburg PCI Express Root Port #8
+ a198 Lewisburg PCI Express Root Port #9
+ a199 Lewisburg PCI Express Root Port #10
+ a19a Lewisburg PCI Express Root Port #11
+ a19b Lewisburg PCI Express Root Port #12
+ a19c Lewisburg PCI Express Root Port #13
+ a19d Lewisburg PCI Express Root Port #14
+ a19e Lewisburg PCI Express Root Port #15
+ a19f Lewisburg PCI Express Root Port #16
+ a1a0 Lewisburg P2SB
+ a1a1 Lewisburg PMC
+ a1a2 Lewisburg cAVS
+ a1a3 Lewisburg SMBus
+ a1a4 Lewisburg SPI Controller
+ a1af Lewisburg USB 3.0 xHCI Controller
+ a1ba Lewisburg CSME: HECI #1
+ a1bb Lewisburg CSME: HECI #2
+ a1bc Lewisburg CSME: IDE-r
+ a1bd Lewisburg CSME: KT Controller
+ a1be Lewisburg CSME: HECI #3
+ a1c1 Lewisburg LPC Controller
+ a1c2 Lewisburg LPC Controller
+ a1c3 Lewisburg LPC Controller
+ a1c4 Lewisburg LPC Controller
+ a1c5 Lewisburg LPC Controller
+ a1c6 Lewisburg LPC Controller
+ a1c7 Lewisburg LPC Controller
+ a1d2 Lewisburg SSATA Controller [AHCI mode]
+ a1e7 Lewisburg PCI Express Root Port #17
+ a1e8 Lewisburg PCI Express Root Port #18
+ a1e9 Lewisburg PCI Express Root Port #19
+ a1ea Lewisburg PCI Express Root Port #20
+ a1f0 Lewisburg MROM 0
+ a1f1 Lewisburg MROM 1
+ a1f8 Lewisburg IE: HECI #1
+ a1f9 Lewisburg IE: HECI #2
+ a1fa Lewisburg IE: IDE-r
+ a1fb Lewisburg IE: KT Controller
+ a1fc Lewisburg IE: HECI #3
a620 6400/6402 Advanced Memory Buffer (AMB)
+ abc0 Omni-Path Fabric Switch Silicon 100 Series
b152 21152 PCI-to-PCI Bridge
8086 b152 21152 PCI-to-PCI Bridge
# observed, and documented in Intel revision note; new mask of 1011:0026
@@ -25817,7 +26816,7 @@
8686 ScaleMP
1010 vSMPowered system controller [vSMP CTL]
8800 Trigem Computer Inc.
- 2008 Video assistent component
+ 2008 Video assistant component
8866 T-Square Design Inc.
8888 Silicon Magic
8912 TRX
@@ -25835,8 +26834,8 @@
3860 AHA-2930CU
3b78 AHA-4844W/4844UW
5075 AIC-755x
- 5078 AIC-7850
- 9004 7850 AHA-2904/Integrated AIC-7850
+ 5078 AIC-7850T/7856T [AVA-2902/4/6 / AHA-2910]
+ 9004 7850 AIC-7850T/7856T [AVA-290x / AHA-2910]
5175 AIC-755x
5178 AIC-7851
5275 AIC-755x
@@ -25885,7 +26884,7 @@
9004 8020 ANA62022 2-port 64 bit 10/100
9004 8028 ANA69011A/TX 64 bit 10/100
7078 AHA-294x / AIC-7870
- 7178 AHA-2940/2940W / AIC-7871
+ 7178 AIC-7870P/7871 [AHA-2940/W/S76]
7278 AHA-3940/3940W / AIC-7872
7378 AHA-3985 / AIC-7873
7478 AHA-2944/2944W / AIC-7874
@@ -25924,7 +26923,7 @@
7897 AIC-789x
8078 AIC-7880U
9004 7880 AIC-7880P Ultra/Ultra Wide SCSI Chipset
- 8178 AHA-2940U/UW/D / AIC-7881U
+ 8178 AIC-7870P/7881U [AHA-2940U/UW/D/S76]
9004 7881 AHA-2940UW SCSI Host Adapter
8278 AHA-3940U/UW/UWD / AIC-7882U
8378 AHA-3940U/UW / AIC-7883U
@@ -25943,7 +26942,7 @@
9005 2180 AHA-2940U2 SCSI Controller
9005 8100 AHA-2940U2B SCSI Controller
9005 a100 AHA-2940U2B SCSI Controller
- 9005 a180 AHA-2940U2W SCSI Controller
+ 9005 a180 AIC-3860Q [AHA-2940U2W/GE] SCSI Controller
9005 e100 AHA-2950U2B SCSI Controller
0011 AHA-2930U2
0013 78902
@@ -26207,6 +27206,9 @@
919a Gigapixel Corp
9412 Holtek
6565 6565
+9413 Softlogic Co., Ltd.
+ 6010 SOLO6010 MPEG-4 Video encoder/decoder
+ 6110 SOLO6110 H.264 Video encoder/decoder
9618 JusonTech Corporation
0001 JusonTech Gigabit Ethernet Controller
9699 Omni Media Technology Inc
@@ -26313,7 +27315,10 @@ bdbd Blackmagic Design
a12f DeckLink Mini Monitor
a130 DeckLink Mini Recorder
a132 UltraStudio 4K
+ a136 DeckLink 4K Extreme 12G
+ a137 DeckLink Studio 4K
a138 Decklink SDI 4K
+ a139 Intensity Pro 4K
c001 TSI Telsys
c0a9 Micron/Crucial Technology
c0de Motorola
@@ -26389,6 +27394,7 @@ dada Datapath Limited
1153 VisionDVI-DL
1154 VisionSDI2
db10 Diablo Technologies
+dc93 Dawicontrol GmbH
dcba Dynamic Engineering
0046 PCIe Altera Cyclone IV
# VPX format Receiver Controller Board
@@ -26409,15 +27415,24 @@ dd01 Digital Devices GmbH
dd01 0021 Cine S2 V6.5 DVB adapter
dd01 0030 Cine CT V6.1 DVB adapter
dd01 db03 Mystique SaTiX-S2 V3 DVB adapter
+ 0006 Cine V7
+ 0007 Max
+ dd01 0023 Max S8 4/8
0011 Octopus CI DVB Adapter
dd01 0040 Octopus CI
dd01 0041 Octopus CI Single
+ 0201 Resi DVB-C Modulator
+ dd01 0001 Resi DVB-C Modulator
dead Indigita Corporation
deaf Middle Digital Inc.
9050 PC Weasel Virtual VGA
9051 PC Weasel Serial Port
9052 PC Weasel Watchdog Timer
-deda SoftHard Technology Ltd.
+# formerly SoftHard Technology Ltd.
+deda XIMEA
+ 4001 Camera CB
+# Thunderbolt based camera MT family
+ 4021 Camera MT
e000 Winbond
e000 W89C940
e159 Tiger Jet Network Inc.
@@ -26591,6 +27606,7 @@ C 02 Network controller
05 WorldFip controller
06 PICMG controller
07 Infiniband controller
+ 08 Fabric controller
80 Network controller
C 03 Display controller
00 VGA compatible controller
@@ -26744,4 +27760,5 @@ C 11 Signal processing controller
C 12 Processing accelerators
00 Processing accelerators
C 13 Non-Essential Instrumentation
+C 40 Coprocessor
C ff Unassigned class
diff --git a/src/hwdata/usb.ids b/src/hwdata/usb.ids
index e44dfa3..c029e2c 100644
--- a/src/hwdata/usb.ids
+++ b/src/hwdata/usb.ids
@@ -9,8 +9,8 @@
# The latest version can be obtained from
# http://www.linux-usb.org/usb.ids
#
-# Version: 2015.02.03
-# Date: 2015-02-03 20:34:06
+# Version: 2015.12.17
+# Date: 2015-12-17 20:34:05
#
# Vendors, devices and interfaces. Please keep sorted.
@@ -26,7 +26,7 @@
0003 Club Mac
0004 Nebraska Furniture Mart
0011 Unknown
- 7788 Flash mass storage drive
+ 7788 counterfeit flash drive
0053 Planex
5301 GW-US54ZGL 802.11bg
0079 DragonRise Inc.
@@ -174,8 +174,9 @@
0117 LaserJet 3200
011c hn210w 802.11b Adapter
011d Bluetooth 1.2 Interface [Broadcom BCM2035]
- 0121 HP49g+ Calculator
+ 0121 HP 39g+ [F2224A], 39gs [F2223A], 40gs [F2225A], 48gII [F2226A], 49g+ [F2228A], 50g [F2229A, NW240AA]
0122 HID Internet Keyboard
+ 0125 DAT72 Tape
0139 Barcode Scanner 4430
0201 ScanJet 6200c
0202 PhotoSmart S20
@@ -187,6 +188,8 @@
0212 DeskJet 1220C
0217 LaserJet 2200
0218 APOLLO P2500/2600
+ 0221 StreamSmart 400 [F2235AA]
+ 022a Laserjet CP1525nw
0241 Link-5 micro dongle
0304 DeskJet 810c/812c
0305 ScanJet 4300c
@@ -205,7 +208,7 @@
0417 LaserJet 1200 series
0423 HS-COMBO Cardreader
042a LaserJet M1132 MFP
- 0441 HP Prime Calculator
+ 0441 Prime [NW280AA, G8X92AA]
0504 DeskJet 885c
0505 ScanJet 2100c
0507 DVD+RW
@@ -223,9 +226,11 @@
0701 ScanJet 5300c/5370c
0704 DeskJet 825c
0705 ScanJet 4400c
+ 070c Personal Media Drive
0711 OfficeJet K80
0712 DeskJet 1180c
0714 Printing Support
+ 0741 Prime Wireless Kit [FOK65AA]
0801 ScanJet 7400c
0804 DeskJet 816c
0805 HP4470C
@@ -268,11 +273,13 @@
1116 Jornada 568 Pocket PC
1117 LaserJet 1300n
1151 PSC-750xi Printer/Scanner/Copier
+ 1198 HID-compliant mouse
1202 PhotoSmart 320 series
1204 DeskJet 930c
1205 ScanJet 4500C/5550C
1211 OfficeJet v60xi
1217 LaserJet 2300L
+ 1227 Virtual CD-ROM
1302 PhotoSmart 370 series
1305 ScanJet 4570c
1311 OfficeJet V30
@@ -291,6 +298,7 @@
1517 color LaserJet 3500
1524 Smart Card Keyboard - KR
1539 Mini Magnetic Stripe Reader
+ 1541 Prime [G8X92AA]
1602 PhotoSmart 330 series
1604 DeskJet 940c
1605 ScanJet 5530C PhotoSmart
@@ -390,6 +398,7 @@
2917 LaserJet 2420
2a11 PSC 2150 series
2a17 LaserJet 2430
+ 2a1d Integrated Module with Bluetooth 2.1 Wireless technology
2b11 PSC 2170 series
2b17 LaserJet 1020
2c12 Officejet J4680
@@ -458,8 +467,8 @@
3e17 LaserJet P1006
3f02 PhotoSmart 7550~
3f11 PSC-1315/PSC-1317
- 4002 PhotoSmart 635/715/720/735/935 (storage)
- 4004 cp1160
+ 4002 PhotoSmart 635/715/720/735/935/E337 (storage)
+ 4004 CP1160
4102 PhotoSmart 618
4105 ScanJet 4370
4111 OfficeJet 7200 series
@@ -513,6 +522,7 @@
5912 Officejet Pro 8600
5a11 PhotoSmart C7100 series
5b11 OfficeJet J2100 series
+ 5b12 Officejet Pro 8100
5c11 PhotoSmart C4200 Printer series
5c12 OfficeJet 6700
5c17 LaserJet P2055 series
@@ -645,6 +655,7 @@
c702 PhotoSmart D7300 series
c802 PhotoSmart D5060 Printer
d104 Bluetooth Dongle
+ d507 39gII [NW249AA]
efbe NEC Picty900
f0be NEC Picty920
f1be NEC Picty800
@@ -703,6 +714,7 @@
5635 M5635 Flash Card Reader
5636 USB 2.0 Storage Device
5637 M5637 IDE Controller
+ 5642 Storage Device
5661 M5661 MP3 player
5667 M5667 MP3 player
9665 Gateway Webcam
@@ -711,7 +723,8 @@
0232 Serial Converter
1060 JTAG adapter
1234 IronLogic RFID Adapter [Z-2 USB]
- 6001 FT232 USB-Serial (UART) IC
+ 1235 Iron Logic Z-397 RS-485/422 converter
+ 6001 FT232 Serial (UART) IC
6002 Lumel PD12
6007 Serial Converter
6008 Serial Converter
@@ -735,6 +748,7 @@
8b2a Alpermann+Velte Rubidium Q1
8b2b Alpermann+Velte TCD
8b2c Alpermann+Velte TCC70
+ 9090 SNAP Stick 200
9132 LCD and Temperature Interface
9133 CallerID
9135 Rotary Pub alarm
@@ -796,6 +810,7 @@
d739 Propox ISPcable III
d9a9 Actisense USG-1 NMEA Serial Gateway
d9aa Actisense NGT-1 NMEA2000 PC Interface
+ d9ab Actisense NGT-1 NMEA2000 Gateway
daf4 Qundis Serial Infrared Head
e0d0 Total Phase Aardvark I2C/SPI Host Adapter
e521 EVER Sinline XL Series UPS
@@ -844,6 +859,7 @@
fc82 SEMC DSS-20/DSS-25 SyncStation
fd48 ShipModul MiniPlex-4xUSB NMEA Multiplexer
fd49 ShipModul MiniPlex-4xUSB-AIS NMEA Multiplexer
+ fd4b ShipModul MiniPlex NMEA Multiplexer
ff08 ToolHouse LoopBack Adapter
ff18 ScienceScope Logbook ML
ff19 Logbook Bus
@@ -1060,6 +1076,7 @@
402b Photo Printer 6850
402e 605 Photo Printer
4034 805 Photo Printer
+ 404f 305 Photo Printer
4056 ESP 7200 Series AiO
4109 EasyShare Printer Dock Series 3
410d EasyShare G600 Printer Dock
@@ -1070,6 +1087,8 @@
6003 i50
6004 i60
6005 i80
+ 6029 i900
+ 602a i900
040b Weltrend Semiconductor
0a68 Func MS-3 gaming mouse [WT6573F MCU]
6510 Weltrend Bar Code Reader
@@ -1123,6 +1142,7 @@
00db External Hard Drive HD-PF32OU2 [Buffalo Ministation]
00e8 WLI-UC-G300N Wireless LAN Adapter [Ralink RT2870]
0105 External Hard Drive HD-CEU2 [Drive Station]
+ 012c SATA Bridge
012e WLI-UC-AG300N Wireless LAN Adapter
0148 WLI-UC-G300HP Wireless LAN Adapter
0150 WLP-UC-AG300 Wireless LAN Adapter
@@ -1243,6 +1263,7 @@
3061 SoundBlaster Audigy 2 ZS Video Editor
3090 Sound Blaster Digital Music SX
30d3 Sound Blaster Play!
+ 3100 IR Receiver (SB0540)
3121 WoW tap chat
3220 Sound Blaster Tactic(3D) Sigma sound card
3f00 E-Mu Xboard 25 MIDI Controller
@@ -1308,6 +1329,7 @@
4083 Live! Cam Socialize [VF0640]
4087 Live! Cam Socialize HD 1080 [VF0680]
4088 Live! Cam Chat HD [VF0700]
+ 4095 Live! Cam Sync HD [VF0770]
4100 Nomad Jukebox 2
4101 Nomad Jukebox 3
4102 NOMAD MuVo^2
@@ -1407,8 +1429,11 @@
02e3 5230 (PC-Suite mode)
02e4 5230 (Imaging mode)
0360 C1-01 Ovi Suite Mode
+ 0396 C7-00 (Modem mode)
03a4 C5 (Storage mode)
- 03c0 C7-00
+ 03c0 C7-00 (Mass storage mode)
+ 03c1 C7-00 (Media transfer mode)
+ 03cd C7-00 (Nokia Suite mode)
03d1 N950
0400 7600 Phone Parent
0401 6650 GSM Phone
@@ -1475,9 +1500,12 @@
0508 E65 (PC Suite mode)
0509 E65 (Storage mode)
0518 N9 Phone
+ 054d C2-01
0600 Digital Pen SU-1B
0610 CS-15 (Internet Stick 3G modem)
- 0661 Lumia 920
+ 0661 Lumia 620/920
+ 069a 130 [RM-1035] (Charging only)
+ 0720 X (RM-980)
0800 Connectivity Cable DKU-5
0801 Data Cable DKU-6
0802 CA-42 Phone Parent
@@ -1502,6 +1530,7 @@
2020 USB Hub
20cd Sitecom Internal Multi Memory reader/writer MD-005
20fc 6-in-1 Card Reader
+ 2134 Hub
2228 9-in-2 Card Reader
223a 8-in-1 Card Reader
2503 USB 2.0 Hub
@@ -1518,6 +1547,7 @@
4060 Ultra Fast Media Reader
4064 Ultra Fast Media Reader
5434 Hub
+ 5534 Hub
7500 LAN7500 Ethernet 10/100/1000 Adapter
9512 SMC9512/9514 USB Hub
9514 SMC9514 Hub
@@ -1812,6 +1842,8 @@
6070 RNDIS/BeWAN ADSL2+
625f TUSB6250 ATA Bridge
8042 Hub
+ 8142 TUSB8041 4-Port Hub
+ 926b TUSB9260 Boot Loader
dbc0 Device Bay Controller
e001 GraphLink [SilverLink]
e003 TI-84 Plus Calculator
@@ -1848,9 +1880,10 @@
0006 Easy Mouse+
000b NetMouse Wheel(P+U)
000c TACOMA Fingerprint V1.06.01
- 000e VideoCAM Web
+ 000e Genius NetScroll Optical
0013 TACOMA Fingerprint Mouse V1.06.01
001a Genius WebScroll+
+ 002e NetScroll + Traveler / NetScroll 110
0036 Pocket Mouse LE
0039 NetScroll+ Superior
003a NetScroll+ Mini Traveler / Genius NetScroll 120
@@ -1867,6 +1900,7 @@
0072 Navigator 335
0083 Bluetooth Dongle
0087 Ergo 525V Laser Mouse
+ 0089 Genius Traveler 350
00ca Pen Mouse
0100 EasyPen Tablet
0101 CueCat
@@ -2241,7 +2275,9 @@
0779 LifeCam HD-3000
0780 Comfort Curve Keyboard 3000
0797 Optical Mouse 200
+ 07a5 Wireless Receiver 1461C
07f8 Wired Keyboard 600 (model 1576)
+ 07fd Nano Transceiver 1.1
930a ISOUSB.SYS Intel 82930 Isochronous IO Test Board
ffca Catalina
fff8 Keyboard
@@ -2251,7 +2287,7 @@
0006 LCD Tablet (12x9)
0008 Tablet (3x2.25)
0461 Primax Electronics, Ltd
- 0010 HP Keyboard
+ 0010 HP PR1101U / Primax PMX-KPR1101U Keyboard
0300 G2-300 Scanner
0301 G2E-300 Scanner
0302 G2-300 #2 Scanner
@@ -2333,6 +2369,7 @@
0080 eHealth Terminal ST 1503
0081 eHealth Keyboard G87 1504
0106 R-300 Wireless Mouse Receiver
+ 010d MX-Board 3.0 Keyboard
046b American Megatrends, Inc.
0001 Keyboard
0101 PS/2 Keyboard, Mouse & Joystick Ports
@@ -2370,6 +2407,7 @@
082b Webcam C170
082d HD Pro Webcam C920
0830 QuickClip
+ 0836 B525 HD Webcam
0837 BCC950 ConferenceCam
0840 QuickCam Express
0843 Webcam C930e
@@ -2474,15 +2512,16 @@
0a17 G330 Headset
0a1f G930
0a29 H600 [Wireless Headset]
+ 0a37 USB Headset H540
0a38 Headset H340
- 0a44 Wired headset
+ 0a44 Headset H390
0a4d G430 Surround Sound Gaming Headset
0b02 C-UV35 [Bluetooth Mini-Receiver] (HID proxy mode)
8801 Video Camera
b305 BT Mini-Receiver
bfe4 Premium Optical Wheel Mouse
c000 N43 [Pilot Mouse]
- c001 N48/M-BB48 [FirstMouse Plus]
+ c001 N48/M-BB48/M-UK96A [FirstMouse Plus]
c002 M-BA47 [MouseMan Plus]
c003 MouseMan
c004 WingMan Gaming Mouse
@@ -2548,6 +2587,7 @@
c06b G700 Wireless Gaming Mouse
c06c Optical Mouse
c077 M105 Optical Mouse
+ c07c M-R0017 [G700s Rechargeable Gaming Mouse]
c101 UltraX Media Remote
c110 Harmony 785/885 Remote
c111 Harmony 525 Remote
@@ -2555,7 +2595,7 @@
c11f Harmony 900/1100 Remote
c121 Harmony One Remote
c122 Harmony 650/700 Remote
- c124 Harmony 300 Remote
+ c124 Harmony 300/350 Remote
c125 Harmony 200 Remote
c126 Harmony Link
c129 Harmony Hub
@@ -2623,7 +2663,7 @@
c305 Internet Keyboard
c307 Internet Keyboard
c308 Internet Navigator Keyboard
- c309 Internet Keyboard
+ c309 Y-BF37 [Internet Navigator Keyboard]
c30a iTouch Composite
c30b NetPlay Keyboard
c30c Internet Keys (X)
@@ -2676,6 +2716,7 @@
c52d R700 Remote Presenter receiver
c52e MK260 Wireless Combo Receiver
c52f Unifying Receiver
+ c531 C-U0007 [Unifying Receiver]
c532 Unifying Receiver
c534 Unifying Receiver
c603 3Dconnexion Spacemouse Plus XT
@@ -2830,6 +2871,7 @@
20d0 SPZ2000 Webcam [PixArt PAC7332]
20e3 GoGear Raga
20e4 GoGear ViBE 8GB
+ 2160 Mio LINK Heart Rate Monitor
262c SPC230NC Webcam
485d Senselock SenseIV v2.x
df55 LPCXpresso LPC-Link
@@ -2964,8 +3006,9 @@
4254 BUA-100 Bluetooth Adapter
ac01 Savi 7xx
ad01 GameCom 777 5.1 Headset
+ c008 Audio 655 DSP
c00e Blackwire C310 headset
-0480 Toshiba America Info. Systems, Inc.
+0480 Toshiba America Inc
0001 InTouch Module
0004 InTouch Module
0011 InTouch Module
@@ -2976,7 +3019,9 @@
a007 External Disk USB 3.0
a009 Stor.E Basics
a00d STOR.E BASICS 500GB
+ a202 Canvio Basics HDD
b001 Stor.E Partner
+ d000 External Disk 2TB Model DT01ABA200
d010 External Disk 3TB
d011 Canvio Desk
0481 Zenith Data Systems
@@ -3002,9 +3047,11 @@
2017 Biometric Smart Card Reader
2018 BioSimKey
2302 Portable Flash Device (PFD)
+ 347b ST-LINK/V2-1
3744 STLINK Pseudo disk
3747 ST Micro Connect Lite
3748 ST-LINK/V2
+ 374b ST-LINK/V2.1 (Nucleo-F103RB)
4810 ISDN adapter
481d BT Digital Access adapter
5000 ST Micro/Ergenic ERG BT-002 Bluetooth Adapter
@@ -3012,9 +3059,11 @@
5710 Joystick in FS Mode
5720 STM microSD Flash Device
5721 Hantek DDS-3X25 Arbitrary Waveform Generator
+ 5730 STM32 Audio Streaming
5740 STM32F407
7270 ST Micro Serial Bridge
7554 56k SoftModem
+ 91d1 Sensor Hub
df11 STM Device in DFU Mode
ff10 Swann ST56 Modem
0484 Specialix
@@ -3032,8 +3081,12 @@
e003 Pirelli DP-L10
e00d Broadcom Bluetooth 2.1 Device
e00f Foxconn T77H114 BCM2070 [Single-Chip Bluetooth 2.1 + EDR Adapter]
+ e011 Acer Bluetooth module
e016 Ubee PXU1900 WiMAX Adapter [Beceem BCSM250]
e02c Atheros AR5BBU12 Bluetooth Device
+ e032 Broadcom BCM20702 Bluetooth
+ e042 Broadcom BCM20702 Bluetooth
+ e04d Atheros AR3012 Bluetooth
048a S-MOS Systems, Inc.
048c Alps Electric Ireland, Ltd
048d Integrated Technology Express, Inc.
@@ -3111,6 +3164,7 @@
1037 PSR-E403
103c MOTIF-RACK ES
1054 S90XS Keyboard/Music Synthesizer
+ 160f P-105
2000 DGP-7
2001 DGP-5
3001 YST-MS55D USB Speaker
@@ -3411,11 +3465,14 @@
1728 MX310 ser
1729 MX700 ser
172b MP140 ser
+ 1736 PIXMA MX320 series
+ 173a MP250 series printer
173b PIXMA MP270 All-In-One Printer
173e MP560
173f Pixma MP640 Multifunction device
1748 Pixma MG5150
174d MX360 ser
+ 176d PIXMA MG2550
1900 CanoScan LiDE 90
1901 CanoScan 8800F
1904 CanoScan LiDE 100
@@ -3425,6 +3482,7 @@
1909 CanoScan LiDE 110
190a CanoScan LiDE 210
190d CanoScan 9000F Mark II
+ 190e CanoScan LiDE 120
2200 CanoScan LiDE 25
2201 CanoScan FB320U
2202 CanoScan FB620U
@@ -3698,6 +3756,7 @@
3160 Digital IXUS 860 IS
3170 SELPHY CP750
3171 SELPHY CP740
+ 3172 SELPHY CP520
3173 PowerShot SD890 IS DIGITAL ELPH / Digital IXUS 970 IS / IXY DIGITAL 820 IS
3174 PowerShot SD790 IS DIGITAL ELPH / Digital IXUS 90 IS / IXY DIGITAL 95 IS
3175 IXY Digital 25 IS
@@ -3821,9 +3880,14 @@
3289 PowerShot ELPH 340 HS / IXUS 265 HS
328a PowerShot ELPH 150 IS / IXUS 155
328b PowerShot N Facebook(R) Ready
+ 3299 EOS M3
329a PowerShot SX60 HS
329b PowerShot SX520 HS
329c PowerShot SX400 IS
+ 329f PowerShot SX530 HS
+ 32a6 PowerShot SX710 HS
+ 32aa Powershot ELPH 160 / IXUS 160
+ 32ac PowerShot ELPH 170 IS / IXUS 170
04aa DaeWoo Telecom, Ltd
04ab Chromatic Research
04ac Micro Audiometrics Corp.
@@ -3928,7 +3992,7 @@
4427 Portable CD ROM
4482 Serial Converter
4484 SMSC USB20H04 3-Port Hub [ThinkPad X4 UltraBase, Wistron S Note-3 Media Slice]
- 4485 Serial Converter
+ 4485 ThinkPad Dock Hub
4524 40 Character Vacuum Fluorescent Display
4525 Double sided CRT
4535 4610 Suremark Printer
@@ -4152,13 +4216,13 @@
0879 EP-904A/EP-904F [Artisan 837/Stylus Photo PX830FWD Series]
087b EP-804A/EP-804AR/EP-804AW [Stylus Photo PX730WD/Artisan 730 Series]
087c PX-1700F
- 087d PX-B750F
+ 087d PX-B750F/WP-4525 Series
087f PX-403A
0880 PX-434A [Stylus NX330 Series]
0881 PX-404A [ME OFFICE 535]
0883 ME 340 Series/Stylus NX130 Series
0884 Stylus NX430W Series
- 0885 Stylus NX230 Series
+ 0885 Stylus NX230/SX235W Series
088f Stylus Office BX635FWD
0890 ME OFFICE 940FW Series/Stylus Office BX630FW Series
0891 Stylus Office BX535WD
@@ -4291,7 +4355,13 @@
004f SK-9020 keyboard
1766 HID Monitor Controls
2004 Bluetooth 4.0 [Broadcom BCM20702A0]
+ 2006 Broadcom BCM43142A0 Bluetooth Device
+ 300b Atheros AR3012 Bluetooth
+ 300d Atheros AR3012 Bluetooth
+ 300f Atheros AR3012 Bluetooth
+ 3014 Qualcoom Atheros Bluetooth
7025 HP HD Webcam
+ 7046 TOSHIBA Web Camera - HD
9304 Hub
f01c TT1280DA DVB-T TV Tuner
04cb Fuji Photo Film Co., Ltd
@@ -4438,13 +4508,17 @@
8001 ICD2 in-circuit debugger
8101 PIC24F Starter Kit
8107 Microstick II
+ 8108 ChipKit Pro MX7 (PIC32MX)
9004 Microchip REAL ICE
900a PICkit3
c001 PicoLCD 20x4
e11c TL866CS EEPROM Programmer [MiniPRO]
+ f2c4 Macareux-labs Hygrometry Temperature Sensor
+ f3aa Macareux-labs Usbce Bootloader mode
f437 SBE Tech Ultrasonic Anemometer
f4b5 SmartScope
f8da Hughski Ltd. ColorHug
+ f8e8 Harmony 300/350 Remote
f91c SPROG IIv3
faff Dangerous Prototypes BusPirate v4 Bootloader mode
fb00 Dangerous Prototypes BusPirate v4
@@ -4453,6 +4527,7 @@
fbbb DiscFerret Magnetic Disc Analyser (active mode)
fc1e Bachrus Speedometer Interface
fc92 Open Bench Logic Sniffer
+ ffee Devantech USB-ISS
ffef PICoPLC [APStech]
04d9 Holtek Semiconductor, Inc.
0022 Portable Keyboard
@@ -4460,9 +4535,10 @@
0499 Optical Mouse
1203 Keyboard
1400 PS/2 keyboard + mouse controller
- 1503 Shortboard Lefty
+ 1503 Keyboard
1603 Keyboard
1702 Keyboard LKS02
+ 2011 Keyboard [Diatec Filco Majestouch 1]
2013 Keyboard [Das Keyboard]
2221 Keyboard
2323 Keyboard
@@ -4696,6 +4772,7 @@
3296 ML-2580N Mono Laser Printer
3297 ML-191x/ML-252x Laser Printer
329f CLP-325 Color Laser Printer
+ 3301 ML-1660 Series
330c ML-1865
3310 ML-331x Series Laser Printer
3315 ML-2540 Series Laser Printer
@@ -4794,6 +4871,8 @@
60b3 M2 Portable Hard Drive
60c4 M2 Portable Hard Drive USB 3.0
6124 D3 Station External Hard Drive
+ 6125 D3 Station External Hard Drive
+ 61b5 M3 Portable Hard Drive 2TB
61b6 M3 Portable Hard Drive 1TB
6601 Mobile Phone
6602 Galaxy
@@ -4811,7 +4890,7 @@
662e MITs Sync
6630 MITs Sync
6632 MITs Sync
- 663e D900e Phone
+ 663e D900e/B2100 Phone
663f SGH-E720/SGH-E840
6640 Usb Modem Enumerator
6651 i8510 Innov8
@@ -4819,8 +4898,8 @@
6708 U600 Phone
6709 U600
6734 Juke
- 6759 D900e Media Player
- 675a D900e Mass Storage
+ 6759 D900e/B2100 Media Player
+ 675a D900e/B2100 Mass Storage
675b D900e Camera
6772 Standalone LTE device (Trial)
6795 S5230
@@ -4835,7 +4914,7 @@
685c GT-I9250 Phone [Galaxy Nexus] (Mass storage mode)
685d GT-I9100 Phone [Galaxy S II] (Download mode)
685e GT-I9100 / GT-C3350 Phones (USB Debugging mode)
- 6860 GT-I9100 Phone [Galaxy S II], GT-I9300 Phone [Galaxy S III], GT-P7500 [Galaxy Tab 10.1] , GT-I9500 [Galaxy S 4]
+ 6860 Galaxy (MTP)
6863 GT-I9500 [Galaxy S4] / GT-I9250 [Galaxy Nexus] (network tethering)
6864 GT-I9070 (network tethering, USB debugging enabled)
6865 GT-I9300 Phone [Galaxy S III] (PTP mode)
@@ -4844,6 +4923,7 @@
6875 GT-B3710 Standalone LTE device (Commercial)
6876 GT-B3710 LTE Modem
6877 Galaxy S
+ 687a GT-E2370 mobile phone
6888 GT-B3730 Composite LTE device (Commercial)
6889 GT-B3730 Composite LTE device (Commercial)
689a LTE Storage Driver [CMC2xx]
@@ -4895,6 +4975,7 @@
0760 Acer KU-0760 Keyboard
0841 HP Multimedia Keyboard
0860 2.4G Multimedia Wireless Kit
+ 1061 HP KG-1061 Wireless Keyboard+Mouse
1121 Periboard 717 Mini Wireless Keyboard
a001 E-Video DC-100 Camera
a120 ORITE CCD Webcam(PC370R)
@@ -4905,6 +4986,7 @@
a128 PC Camera (SN9C202 + OV7663 + EEPROM)
a133 Gateway Webcam
a136 LabTec Webcam 5500
+ a147 Medion Webcam
a204 DSC WIA Device (1300)
a208 DSC WIA Device (2320)
a209 Labtec DC-2320
@@ -4961,16 +5043,21 @@
b330 Asus 720p CMOS webcam
b354 UVC 1.00 device HD UVC WebCam
b394 Integrated Camera
+ b3f6 HD WebCam (Acer)
+ b40e HP Truevision HD camera
+ b444 Lenovo Integrated Webcam
04f3 Elan Microelectronics Corp.
000a Touchscreen
0103 ActiveJet K-2024 Multimedia Keyboard
01a4 Wireless Keyboard
+ 0201 Touchscreen
0210 Optical Mouse
0212 Laser Mouse
0214 Lynx M9 Optical Mouse
0230 3D Optical Mouse
0232 Mouse
02f4 2.4G Cordless Mouse
+ 0381 Touchscreen
04a0 Dream Cheeky Stress/Panic Button
04f4 Harting Elektronik, Inc.
04f5 Fujitsu-ICL Systems, Inc.
@@ -5030,16 +5117,17 @@
010b MFC-860
010c MFC-7400J
010d MFC-9200J
- 010e MFC3100C Scanner
- 010f MFC 5100C
- 0110 MFC4800 Scanner
- 0111 MFC 6800
+ 010e MFC-3100C Scanner
+ 010f MFC-5100C
+ 0110 MFC-4800 Scanner
+ 0111 MFC-6800
0112 DCP1000 Port(FaxModem)
0113 MFC-8500
0114 MFC9700 Port(FaxModem)
- 0115 MFC9800 Scanner
+ 0115 MFC-9800 Scanner
0116 DCP1400 Scanner
0119 MFC-9660
+ 011a MFC-9860
011b MFC-9880
011c MFC-9760
011d MFC-9070
@@ -5048,13 +5136,20 @@
0120 MFC580 Port(FaxModem)
0121 MFC-590
0122 MFC-5100J
+ 0124 MFC-4800J
+ 0125 MFC-6800J
+ 0127 MFC-9800J
+ 0128 MFC-8500J
0129 Imagistics 2500 (MFC-8640D clone)
+ 012b MFC-9030
+ 012e FAX4100e IntelliFax 4100e
012f FAX-4750e
+ 0130 FAX-5750e
0132 MFC-5200C RemovableDisk
0135 MFC-100 Scanner
0136 MFC-150CL Scanner
013c MFC-890 Port
- 013d MFC-5200J Printer
+ 013d MFC-5200J
013e MFC-4420C RemovableDisk
013f MFC-4820C RemovableDisk
0140 DCP-8020
@@ -5064,14 +5159,17 @@
0144 DCP-4020C RemovableDisk
0146 MFC-3220C
0147 FAX-1820C Printer
- 0148 MFC-3320CN Printer
+ 0148 MFC-3320CN
0149 FAX-1920CN Printer
014a MFC-3420C
014b MFC-3820CN
+ 014c DCP-3020C
014d FAX-1815C Printer
014e MFC-8820J
+ 014f DCP-8025J
0150 MFC-8220 Port(FaxModem)
0151 MFC-8210J
+ 0153 DCP-1000J
0157 MFC-3420J Printer
0158 MFC-3820JN Port(FaxModem)
015d MFC Composite Device
@@ -5097,7 +5195,7 @@
017b Imagistics sx2100
0180 MFC-7420
0181 MFC-7820N Port(FaxModem)
- 0182 Composite Device
+ 0182 DCP-7010
0183 DCP-7020
0184 DCP-7025 Printer
0185 MFC-7220 Printer
@@ -5131,31 +5229,44 @@
01ae DCP-750CW RemovableDisk
01af MFC-440CN
01b0 MFC-660CN
- 01b1 MFC-665CW Remote Setup Port
- 01b2 MFC-845CW Remote Setup Port
- 01b4 MFC-460CN Remote Setup Port
+ 01b1 MFC-665CW
+ 01b2 MFC-845CW
+ 01b4 MFC-460CN
01b5 MFC-630CD
01b6 MFC-850CDN
- 01b7 MFC-5460CN Remote Setup Port
+ 01b7 MFC-5460CN
01b8 MFC-5860CN
01ba MFC-3360C
01bd MFC-8660DN
01be DCP-750CN RemovableDisk
- 01bf MFC-860CDN Remote Setup Port
+ 01bf MFC-860CDN
01c0 DCP-128C
01c1 DCP-129C
01c2 DCP-131C
01c3 DCP-329C
01c4 DCP-331C
01c5 MFC-239C
- 01ca MFC-9440CN Remote Setup Port
+ 01c9 DCP-9040CN
+ 01ca MFC-9440CN
+ 01cb DCP-9045CDN
+ 01cc MFC-9840CDW
01ce DCP-135C
01cf DCP-150C
01d0 DCP-350C
01d1 DCP-560CN
+ 01d2 DCP-770CW
+ 01d3 DCP-770CN
01d4 MFC-230C
01d5 MFC-235C
01d6 MFC-260C
+ 01d7 MFC-465CN
+ 01d8 MFC-680CN
+ 01d9 MFC-685CW
+ 01da MFC-885CW
+ 01db MFC-480CN
+ 01dc MFC-650CD
+ 01dd MFC-870CDN
+ 01de MFC-880CDN
01df DCP-155C
01e0 MFC-265C
01e1 DCP-153C
@@ -5166,12 +5277,281 @@
01e9 DCP-7040
01ea DCP-7030
01eb MFC-7320
+ 01ec MFC-9640CW
01f4 MFC-5890CN
+ 020a MFC-8670DN
+ 020c DCP-9042CDN
+ 020d MFC-9450CDN
+ 0216 MFC-8880DN
0217 MFC-8480DN
+ 0219 MFC-8380DN
+ 021a MFC-8370DN
+ 021b DCP-8070D
+ 021c MFC-9320CW
+ 021d MFC-9120CN
+ 021e DCP-9010CN
+ 0220 MFC-9010CN
+ 0222 DCP-195C
0223 DCP-365CN
+ 0224 DCP-375CW
+ 0225 DCP-395CN
+ 0227 DCP-595CN
+ 0228 MFC-255CW
+ 0229 MFC-295CN
+ 022a MFC-495CW
+ 022b MFC-495CN
+ 022c MFC-795CW
+ 022d MFC-675CD
+ 022e MFC-695CDN
+ 022f MFC-735CD
+ 0230 MFC-935CDN
+ 0234 DCP-373CW
+ 0235 DCP-377CW
+ 0236 DCP-390CN
+ 0239 MFC-253CW
+ 023a MFC-257CW
+ 023e DCP-197C
+ 023f MFC-8680DN
+ 0240 MFC-J950DN
0248 DCP-7055 scanner/printer
+ 0253 DCP-J125
+ 0254 DCP-J315W
+ 0255 DCP-J515W
+ 0256 DCP-J515N
+ 0257 DCP-J715W
+ 0258 DCP-J715N
+ 0259 MFC-J220
+ 025a MFC-J410
+ 025b MFC-J265W
+ 025c MFC-J415W
+ 025d MFC-J615W
+ 025e MFC-J615N
+ 025f MFC-J700D
+ 0260 MFC-J800D
+ 0261 MFC-J850DN
+ 026b MFC-J630W
+ 026d MFC-J805D
+ 026e MFC-J855DN
+ 026f MFC-J270W
0273 DCP-7057 scanner/printer
- 02b3 MFC J4510DW
+ 0276 MFC-5895CW
+ 0278 MFC-J410W
+ 0279 DCP-J525W
+ 027a DCP-J525N
+ 027b DCP-J725DW
+ 027c DCP-J725N
+ 027d DCP-J925DW
+ 027e MFC-J955DN
+ 027f MFC-J280W
+ 0280 MFC-J435W
+ 0281 MFC-J430W
+ 0282 MFC-J625DW
+ 0283 MFC-J825DW
+ 0284 MFC-J825N
+ 0285 MFC-J705D
+ 0287 MFC-J860DN
+ 0288 MFC-J5910DW
+ 0289 MFC-J5910CDW
+ 028a DCP-J925N
+ 028d MFC-J835DW
+ 028f MFC-J425W
+ 0290 MFC-J432W
+ 0291 DCP-8110DN
+ 0292 DCP-8150DN
+ 0293 DCP-8155DN
+ 0294 DCP-8250DN
+ 0295 MFC-8510DN
+ 0296 MFC-8520DN
+ 0298 MFC-8910DW
+ 0299 MFC-8950DW
+ 029a MFC-8690DW
+ 029c MFC-8515DN
+ 029e MFC-9125CN
+ 029f MFC-9325CW
+ 02a0 DCP-J140W
+ 02a5 MFC-7240
+ 02a6 FAX-2940
+ 02a7 FAX-2950
+ 02a8 MFC-7290
+ 02ab FAX-2990
+ 02ac DCP-8110D
+ 02ad MFC-9130CW
+ 02ae MFC-9140CDN
+ 02af MFC-9330CDW
+ 02b0 MFC-9340CDW
+ 02b1 DCP-9020CDN
+ 02b2 MFC-J810DN
+ 02b3 MFC-J4510DW
+ 02b4 MFC-J4710DW
+ 02b5 DCP-8112DN
+ 02b6 DCP-8152DN
+ 02b7 DCP-8157DN
+ 02b8 MFC-8512DN
+ 02ba MFC-8912DW
+ 02bb MFC-8952DW
+ 02bc DCP-J540N
+ 02bd DCP-J740N
+ 02be MFC-J710D
+ 02bf MFC-J840N
+ 02c0 DCP-J940N
+ 02c1 MFC-J960DN
+ 02c2 DCP-J4110DW
+ 02c3 MFC-J4310DW
+ 02c4 MFC-J4410DW
+ 02c5 MFC-J4610DW
+ 02c6 DCP-J4210N
+ 02c7 MFC-J4510N
+ 02c8 MFC-J4910CDW
+ 02c9 MFC-J4810DN
+ 02ca MFC-8712DW
+ 02cb MFC-8710DW
+ 02cc MFC-J2310
+ 02cd MFC-J2510
+ 02ce DCP-7055W
+ 02cf DCP-7057W
+ 02d0 DCP-1510
+ 02d1 MFC-1810
+ 02d3 DCP-9020CDW
+ 02d4 MFC-8810DW
+ 02dd DCP-J4215N
+ 02de DCP-J132W
+ 02df DCP-J152W
+ 02e0 DCP-J152N
+ 02e1 DCP-J172W
+ 02e2 DCP-J552DW
+ 02e3 DCP-J552N
+ 02e4 DCP-J752DW
+ 02e5 DCP-J752N
+ 02e6 DCP-J952N
+ 02e7 MFC-J245
+ 02e8 MFC-J470DW
+ 02e9 MFC-J475DW
+ 02ea MFC-J285DW
+ 02eb MFC-J650DW
+ 02ec MFC-J870DW
+ 02ed MFC-J870N
+ 02ee MFC-J720D
+ 02ef MFC-J820DN
+ 02f0 MFC-J980DN
+ 02f1 MFC-J890DN
+ 02f2 MFC-J6520DW
+ 02f3 MFC-J6570CDW
+ 02f4 MFC-J6720DW
+ 02f5 MFC-J6920DW
+ 02f6 MFC-J6970CDW
+ 02f7 MFC-J6975CDW
+ 02f8 MFC-J6770CDW
+ 02f9 DCP-J132N
+ 02fa MFC-J450DW
+ 02fb MFC-J875DW
+ 02fc DCP-J100
+ 02fd DCP-J105
+ 02fe MFC-J200
+ 02ff MFC-J3520
+ 0300 MFC-J3720
+ 030f DCP-L8400CDN
+ 0310 DCP-L8450CDW
+ 0311 MFC-L8600CDW
+ 0312 MFC-L8650CDW
+ 0313 MFC-L8850CDW
+ 0314 MFC-L9550CDW
+ 0318 MFC-7365DN
+ 0320 MFC-L2740DW
+ 0321 DCP-L2500D
+ 0322 DCP-L2520DW
+ 0324 DCP-L2520D
+ 0326 DCP-L2540DN
+ 0328 DCP-L2540DW
+ 0329 DCP-L2560DW
+ 0330 HL-L2380DW
+ 0331 MFC-L2700DW
+ 0335 FAX-L2700DN
+ 0337 MFC-L2720DW
+ 0338 MFC-L2720DN
+ 0339 DCP-J4120DW
+ 033a MFC-J4320DW
+ 033c MFC-J2320
+ 033d MFC-J4420DW
+ 0340 MFC-J4620DW
+ 0341 MFC-J2720
+ 0342 MFC-J4625DW
+ 0343 MFC-J5320DW
+ 0346 MFC-J5620DW
+ 0347 MFC-J5720DW
+ 0349 DCP-J4220N
+ 034b MFC-J4720N
+ 034e MFC-J5720CDW
+ 034f MFC-J5820DN
+ 0350 MFC-J5620CDW
+ 0351 DCP-J137N
+ 0353 DCP-J557N
+ 0354 DCP-J757N
+ 0355 DCP-J957N
+ 0356 MFC-J877N
+ 0357 MFC-J727D
+ 0358 MFC-J987DN
+ 0359 MFC-J827DN
+ 035a MFC-J897DN
+ 035b DCP-1610W
+ 035c DCP-1610NW
+ 035d MFC-1910W
+ 035e MFC-1910NW
+ 0360 DCP-1618W
+ 0361 MFC-1919NW
+ 0364 MFC-J5625DW
+ 0365 MFC-J4520DW
+ 0366 MFC-J5520DW
+ 0367 DCP-7080D
+ 0368 DCP-7080
+ 0369 DCP-7180DN
+ 036a DCP-7189DW
+ 036b MFC-7380
+ 036c MFC-7480D
+ 036d MFC-7880DN
+ 036e MFC-7889DW
+ 036f DCP-9022CDW
+ 0370 MFC-9142CDN
+ 0371 MFC-9332CDW
+ 0372 MFC-9342CDW
+ 0373 MFC-L2700D
+ 0376 DCP-1600
+ 0377 MFC-1900
+ 0378 DCP-1608
+ 0379 DCP-1619
+ 037a MFC-1906
+ 037b MFC-1908
+ 037c ADS-2000e
+ 037d ADS-2100e
+ 037e ADS-2500We
+ 037f ADS-2600We
+ 0380 DCP-J562DW
+ 0381 DCP-J562N
+ 0383 DCP-J962N
+ 0384 MFC-J480DW
+ 0385 MFC-J485DW
+ 0386 MFC-J460DW
+ 0388 MFC-J680DW
+ 0389 MFC-J880DW
+ 038a MFC-J885DW
+ 038b MFC-J880N
+ 038c MFC-J730DN
+ 038d MFC-J990DN
+ 038e MFC-J830DN
+ 038f MFC-J900DN
+ 0390 MFC-J5920DW
+ 0392 MFC-L2705DW
+ 0393 DCP-T300
+ 0394 DCP-T500W
+ 0395 DCP-T700W
+ 0396 MFC-T800W
+ 0397 DCP-J963N
+ 03b3 MFC-J6925DW
+ 03b4 MFC-J6573CDW
+ 03b5 MFC-J6973CDW
+ 03b6 MFC-J6990CDW
+ 03bb MFC-L2680W
+ 03bc MFC-L2700DN
+ 03bd DCP-J762N
1000 Printer
1002 Printer
2002 PTUSB Printing
@@ -5183,6 +5563,14 @@
2027 QL-560 P-Touch Label Printer
202b PT-7600 P-Touch Label Printer
2100 Card Reader Writer
+ 60a0 ADS-2000
+ 60a1 ADS-2100
+ 60a4 ADS-2500W
+ 60a5 ADS-2600W
+ 60a6 ADS-1000W
+ 60a7 ADS-1100W
+ 60a8 ADS-1500W
+ 60a9 ADS-1600W
04fa Dallas Semiconductor
2490 DS1490F 2-in-1 Fob, 1-Wire adapter
4201 DS4201 Audio DAC
@@ -5440,7 +5828,7 @@
7569 Live! Pro (A)
756a Live! Pro Audio (O)
0529 Aladdin Knowledge Systems
- 0001 HASP v0.06
+ 0001 HASP copy protection dongle
030b eToken R1 v3.1.3.x
0313 eToken R1 v3.2.3.x
031b eToken R1 v3.3.3.x
@@ -5737,6 +6125,7 @@
0485 MHS-PM5 HD camcorder
04cb WALKMAN NWZ-E354
0541 DSC-HX100V [Cybershot Digital Still Camera]
+ 05c4 DualShock 4
0689 Walkman NWZ-B173F
06bb WALKMAN NWZ-F805
088c Portable Headphone Amplifier
@@ -5750,6 +6139,7 @@
0005 InkJet Color Printer
000b Workcentre 24
014e CM215b Printer
+ 0165 DocuPrint M215b
0551 CompuTrend Systems, Inc.
0552 Philips Monitors
0553 STMicroelectronics Imaging Division (VLSI Vision)
@@ -5901,27 +6291,27 @@
0000 PenPartner
0001 PenPartner 4x5
0002 PenPartner 6x8
- 0003 Cintiq Partner
- 0010 Graphire
- 0011 Graphire 2 4x5
- 0012 Graphire 2 5x7
- 0013 Graphire 3 4x5
- 0014 Graphire 3 6x8
- 0015 Graphire 4 4x5
- 0016 Graphire 4 6x8
- 0017 CTE-450 [Bamboo Fun]
- 0018 Bamboo Fun 6x8
- 0019 Bamboo One Medium
- 0020 Intuos 4x5
- 0021 Intuos 6x8
- 0022 Intuos 9x12
- 0023 Intuos 12x12
- 0024 Intuos 12x18
- 0026 Intuos5 touch S
- 0027 Intuos5 touch M
- 0028 Intuos5 touch L
- 0029 Intuos5 S
- 002a Intuos5 M
+ 0003 PTU-600 [Cintiq Partner]
+ 0010 ET-0405 [Graphire]
+ 0011 ET-0405A [Graphire2 (4x5)]
+ 0012 ET-0507A [Graphire2 (5x7)]
+ 0013 CTE-430 [Graphire3 (4x5)]
+ 0014 CTE-630 [Graphire3 (6x8)]
+ 0015 CTE-440 [Graphire4 (4x5)]
+ 0016 CTE-640 [Graphire4 (6x8)]
+ 0017 CTE-450 [Bamboo Fun (small)]
+ 0018 CTE-650 [Bamboo Fun (medium)]
+ 0019 CTE-631 [Bamboo One]
+ 0020 GD-0405 [Intuos (4x5)]
+ 0021 GD-0608 [Intuos (6x8)]
+ 0022 GD-0912 [Intuos (9x12)]
+ 0023 GD-1212 [Intuos (12x12)]
+ 0024 GD-1218 [Intuos (12x18)]
+ 0026 PTH-450 [Intuos5 touch (S)]
+ 0027 PTH-650 [Intuos5 touch (M)]
+ 0028 PTH-850 [Intuos5 touch (L)]
+ 0029 PTK-450 [Intuos5 (S)]
+ 002a PTK-650 [Intuos5 (M)]
0030 PL400
0031 PL500
0032 PL600
@@ -5931,56 +6321,105 @@
0037 PL700
0038 PL510
0039 DTU-710
- 003f Cintiq 21UX (DTZ-2100)
- 0041 Intuos2 4x5
- 0042 Intuos2 6x8
- 0043 Intuos2 9x12
- 0044 Intuos2 12x12
- 0045 Intuos2 12x18
+ 003f DTZ-2100 [Cintiq 21UX]
+ 0041 XD-0405-U [Intuos2 (4x5)]
+ 0042 XD-0608-U [Intuos2 (6x8)]
+ 0043 XD-0912-U [Intuos2 (9x12)]
+ 0044 XD-1212-U [Intuos2 (12x12)]
+ 0045 XD-1218-U [Intuos2 (12x18)]
0047 Intuos2 6x8
- 0060 Volito
- 0061 PenStation2
- 0062 Volito2 4x5
- 0063 Volito2 2x3
- 0064 PenPartner2
- 0065 Bamboo
- 0069 Bamboo One
- 0081 Graphire Wireless 6x8
+ 0057 DTK-2241
+ 0059 DTH-2242 tablet
+ 005b DTH-2200 [Cintiq 22HD Touch] tablet
+ 005d DTH-2242 touchscreen
+ 005e DTH-2200 [Cintiq 22HD Touch] touchscreen
+ 0060 FT-0405 [Volito, PenPartner, PenStation (4x5)]
+ 0061 FT-0203 [Volito, PenPartner, PenStation (2x3)]
+ 0062 CTF-420 [Volito2]
+ 0063 CTF-220 [BizTablet]
+ 0064 CTF-221 [PenPartner2]
+ 0065 MTE-450 [Bamboo]
+ 0069 CTF-430 [Bamboo One]
+ 006a CTE-460 [Bamboo One Pen (S)]
+ 006b CTE-660 [Bamboo One Pen (M)]
+ 0081 CTE-630BT [Graphire Wireless (6x8)]
0084 Wireless adapter for Bamboo tablets
0090 TPC90
0093 TPC93
+ 0097 TPC97
009a TPC9A
- 00b0 Intuos3 4x5
- 00b1 Intuos3 6x18
- 00b2 Intuos3 9x12
- 00b3 Intuos3 12x12
- 00b4 Intuos3 12x19
- 00b5 Intuos3 6x11 (PTZ-631W)
- 00b7 Intuos3 4x6
- 00b8 Intuos4 4x6
- 00b9 Intuos4 6x9
- 00ba Intuos4 8x13
- 00bb Intuos4 12x19
+ 00b0 PTZ-430 [Intuos3 (4x5)]
+ 00b1 PTZ-630 [Intuos3 (6x8)]
+ 00b2 PTZ-930 [Intuos3 (9x12)]
+ 00b3 PTZ-1230 [Intuos3 (12x12)]
+ 00b4 PTZ-1231W [Intuos3 (12x19)]
+ 00b5 PTZ-631W [Intuos3 (6x11)]
+ 00b7 PTZ-431W [Intuos3 (4x6)]
+ 00b8 PTK-440 [Intuos4 (4x6)]
+ 00b9 PTK-640 [Intuos4 (6x9)]
+ 00ba PTK-840 [Intuos4 (8x13)]
+ 00bb PTK-1240 [Intuos4 (12x19)]
00c0 DTF-521
00c4 DTF-720
- 00c5 Cintiq 20WSX
- 00c6 Cintiq 12WX
+ 00c5 DTZ-20WSX [Cintiq 20WSX]
+ 00c6 DTZ-12WX [Cintiq 12WX]
00c7 DTU-1931
- 00cc Cintiq 21UX (DTK-2100)
- 00d1 Bamboo Pen & Touch (CTH-460-DE)
- 00d3 Bamboo Fun (CTH-661)
- 00d4 Bamboo Pen (CTL-460)
- 00d6 Bamboo Pen & Touch (CTH-460)
- 00db Bamboo Fun (CTH-661SE-NL)
- 00dd Bamboo Pen (CTL-470)
+ 00cc DTK-2100 [Cintiq 21UX]
+ 00ce DTU-2231
+ 00d0 CTT-460 [Bamboo Touch]
+ 00d1 CTH-460 [Bamboo Pen & Touch]
+ 00d2 CTH-461 [Bamboo Fun/Craft/Comic Pen & Touch (S)]
+ 00d3 CTH-661 [Bamboo Fun/Comic Pen & Touch (M)]
+ 00d4 CTL-460 [Bamboo Pen (S)]
+ 00d5 CTL-660 [Bamboo Pen (M)]
+ 00d6 CTH-460 [Bamboo Pen & Touch]
+ 00d7 CTH-461 [Bamboo Fun/Craft/Comic Pen & Touch (S)]
+ 00d8 CTH-661 [Bamboo Fun/Comic Pen & Touch (M)]
+ 00d9 CTT-460 [Bamboo Touch]
+ 00da CTH-461SE [Bamboo Pen & Touch Special Edition (S)]
+ 00db CTH-661SE [Bamboo Pen & Touch Special Edition (M)]
+ 00dc CTT-470 [Bamboo Touch]
+ 00dd CTL-470 [Bamboo Connect]
00de CTH-470 [Bamboo Fun Pen & Touch]
- 00f6 Cintiq 24HD touch (DTH-2400) touchscreen
- 00f8 Cintiq 24HD touch (DTH-2400) tablet
- 0307 Cintiq Companion Hybrid 13HD (DTH-A1300) tablet
- 0309 Cintiq Companion Hybrid 13HD (DTH-A1300) touchscreen
- 030e Intuos Pen Small (CTL480)
+ 00df CTH-670 [Bamboo Create/Fun]
+ 00e2 TPCE2
+ 00e3 TPCE3
+ 00e5 TPCE5
+ 00e6 TPCE6
+ 00ec TPCEC
+ 00ed TPCED
+ 00ef TPCEF
+ 00f4 DTK-2400 [Cintiq 24HD] tablet
+ 00f6 DTH-2400 [Cintiq 24HD touch] touchscreen
+ 00f8 DTH-2400 [Cintiq 24HD touch] tablet
+ 00fa DTK-2200 [Cintiq 22HD] tablet
+ 00fb DTU-1031
+ 0100 TPC100
+ 0101 TPC101
+ 010d TPC10D
+ 010e TPC10E
+ 010f TPC10F
+ 0116 TPC116
+ 012c TPC12C
+ 0300 CTL-471 [Bamboo Splash, One by Wacom (S)]
+ 0301 CTL-671 [One by Wacom (M)]
+ 0302 CTH-480 [Intuos Pen & Touch (S)]
+ 0303 CTH-680 [Intuos Pen & Touch (M)]
+ 0304 DTK-1300 [Cintiq 13HD]
+ 0307 DTH-A1300 [Cintiq Companion Hybrid] tablet
+ 0309 DTH-A1300 [Cintiq Companion Hybrid] touchscreen
+ 030e CTL-480 [Intuos Pen (S)]
+ 0314 PTH-451 [Intuos pro (S)]
+ 0315 PTH-651 [Intuos pro (M)]
+ 0317 PTH-851 [Intuos pro (L)]
+ 032f DTU-1031X
0400 PenPartner 4x5
+ 4001 TPC4001
+ 4004 TPC4004
4850 PenPartner 6x8
+ 5000 TPC5000
+ 5002 TPC5002
+ 5010 TPC5010
056b Decicon, Inc.
056c eTEK Labs
0006 KwikLink Host-Host Connector
@@ -6034,6 +6473,7 @@
c686 Geniatech T220A DVB-T2 TV Stick
c688 Geniatech T230 DVB-T2 TV Stick
cafc CX861xx ROM Boot Loader
+ cafd CX82310 ROM Boot Loader
cafe AccessRunner ADSL Modem
cb00 ADSL Modem
cb01 ADSL Modem
@@ -6144,6 +6584,7 @@
8402 Fritz!WLAN N 2.4 [Atheros AR9001U]
8403 Fritz!WLAN N v2 [Atheros AR9271]
84ff AVM Fritz!WLAN USB N (in CD-ROM-mode)
+ 8501 FRITZ WLAN N v2 [RT5572/rt2870.bin]
057d Shark Multimedia, Inc.
057e Nintendo Co., Ltd
0305 Broadcom BCM2045A Bluetooth Radio [Nintendo Wii]
@@ -6400,8 +6841,10 @@
000f Digital Camera
0586 ZyXEL Communications Corp.
0025 802.11b/g/n USB Wireless Network Adapter
- 0102 omni.net II ISDN TA
- 1000 Omni NET Modem / ISDN TA
+ 0100 omni.net
+ 0102 omni.net II ISDN TA [HFC-S]
+ 0110 omni.net Plus
+ 1000 omni.net LCD Plus - ISDN TA
1500 Omni 56K Plus
2011 Scorpion-980N keyboard
3304 LAN Modem
@@ -6481,6 +6924,7 @@
6386 Memory Card
6387 Flash Drive
6390 USB 2.0-IDE bridge
+ 6391 IDE Bridge
9213 MacAlly Kbd Hub
9215 AU9814 Hub
9254 Hub
@@ -6495,6 +6939,7 @@
9361 Multimedia Card Reader
9368 Multimedia Card Reader
9380 Flash Drive
+ 9381 Flash Drive
9382 Acer/Sweex Flash drive
9384 qdi U2Disk T209M
9410 Keyboard
@@ -6589,6 +7034,7 @@
0829 BigDisk Extreme+
100c Rugged Triple Interface Mobile Hard Drive
1010 Desktop Hard Drive
+ 1018 Desktop Hard Drive
1019 Desktop Hard Drive
1021 Little Disk
1027 iamaKey V2
@@ -6596,6 +7042,7 @@
1049 rikiki Harddrive
1052 P'9220 Mobile Drive
1064 Rugged 16 and 32 GB
+ 106e Porsche Design Desktop Drive
a601 HardDrive
a602 CD R/W
05a0 Vetronix Corp.
@@ -6638,6 +7085,7 @@
2800 SuperCAM
4519 Webcam Classic
7670 OV7670 Webcam
+ 8065 GAIA Sensor FPGA Demo Board
8519 OV519 Webcam
a511 OV511+ Webcam
a518 D-Link DSB-C310 Webcam
@@ -6783,10 +7231,10 @@
12a4 iPad 3 (wifi)
12a5 iPad 3 (CDMA)
12a6 iPad 3 (3G, 16 GB)
- 12a8 iPhone5/5C/5S
+ 12a8 iPhone5/5C/5S/6
12a9 iPad 2
12aa iPod Touch 5.Gen [A1421]
- 12ab iPad 4 (WiFi, 32GB)
+ 12ab iPad 4/Mini1
1300 iPod Shuffle
1301 iPod Shuffle 2.Gen
1302 iPod Shuffle 3.Gen
@@ -6817,6 +7265,7 @@
8242 Built-in IR Receiver
8281 Bluetooth Host Controller
8286 Bluetooth Host Controller
+ 828c Bluetooth Host Controller
8300 Built-in iSight (no firmware loaded)
8403 Internal Memory Card Reader
8404 Internal Memory Card Reader
@@ -6856,7 +7305,7 @@
1389 Bluetooth Wireless Adapter
05b4 LG Semicon Co., Ltd
4857 M-Any DAH-210
- 6001 Digisette DUO-MP3 AR-100
+ 6001 HYUNDAI GDS30C6001 SSFDC / MMC I/F Controller
05b5 Dialogic Corp.
05b6 Proxima Corp.
05b7 Medianix Semiconductor, Inc.
@@ -6889,9 +7338,11 @@
6000 Siemens SG75
6503 AnyData APE-540H
6613 Onda H600/N501HS ZTE MF330
+ 6764 A0001 Phone [OnePlus One]
9000 SIMCom SIM5218 modem
9001 Gobi Wireless Modem
9002 Gobi Wireless Modem
+ 9003 Quectel UC20
9008 Gobi Wireless Modem (QDL mode)
9018 Qualcomm HSUSB Device
9025 Qualcomm HSUSB Device
@@ -6944,6 +7395,7 @@
1810 Pavilion Webcam [R5U870]
1812 Pavilion Webcam
1814 HD Webcam
+ 1815 Dell Laptop Integrated Webcam
1820 Integrated Webcam
1830 Visual Communication Camera VGP-VCC2 [R5U870]
1832 Visual Communication Camera VGP-VCC3 [R5U870]
@@ -7083,6 +7535,7 @@
20e0 ScanMaker 9700XL
20ed ScanMaker 4700
20ee Micortek ScanMaker X12USL
+ 2838 RT2832U
3008 Scanner
300a 4800 ICE Scanner
300b 4800 Scanner
@@ -7202,6 +7655,7 @@
a811 16GB Gizmo!
a813 16gB flash thumb drive
a815 JumpDrive V10
+ a833 JumpDrive S23 64GB
b002 USB CF Reader
b018 Multi-Card Reader
b047 SDHC Reader [RW047-7000]
@@ -7290,6 +7744,7 @@
0736 microSD Reader/Writer
0741 microSD Card Reader
0743 SDXC and microSDXC CardReader
+ 0745 Logilink CR0012
0760 USB 2.0 Card Reader/Writer
0761 Genesys Mass Storage Device
0780 USBFS DFU Adapter
@@ -7540,6 +7995,8 @@
064c Ji-Haw Industrial Co., Ltd
064d TriTech Microelectronics, Ltd
064e Suyin Corp.
+ 2100 Sony Visual Communication Camera
+ 9700 Asus Integrated Webcam
a100 Acer OrbiCam
a101 Acer CrystalEye Webcam
a102 Acer/Lenovo Webcam [CN0316]
@@ -7550,6 +8007,7 @@
a136 Asus Integrated Webcam [CN031B]
a219 1.3M WebCam (notebook emachines E730, Acer sub-brand)
c107 HP webcam [dv6-1190en]
+ c335 HP TrueVision HD
d101 Acer CrystalEye Webcam
d217 HP TrueVision HD
e201 Lenovo Integrated Webcam
@@ -7743,8 +8201,8 @@
0110 Vigor 128 ISDN TA
0530 Vigor530 IEEE 802.11G Adapter (ISL3880+NET2280)
0550 Vigor550
- 1688 miniVigor 128 ISDN TA
- 6694 USB ISDN TA
+ 1688 miniVigor 128 ISDN TA [HFC-S]
+ 6694 miniVigor 128 ISDN TA
0676 Teles AG
0677 Aiwa Co., Ltd
07d5 TM-ED1285(USB)
@@ -8427,8 +8885,9 @@
32bb Music Mediatouch
071c Xionics Document Technologies, Inc.
071d Eicon Networks Corp.
- 1000 Diva ISDN TA
- 1003 Diva
+ 1000 Diva 2.01 S/T [PSB2115F]
+ 1003 Diva ISDN 2.0
+ 1005 Diva ISDN 4.0 [HFC-S]
2000 Teledat Surf
071e Ariston Technologies
0723 Centillium Communications Corp.
@@ -8553,6 +9012,10 @@
0d00 StarSign Bio Token 3.0 EU
073e NEC, Inc.
0301 Game Pad
+0742 Stollmann
+ 2008 ISDN TA [HFC-S]
+ 2009 ISDN TA [HFC-S]
+ 200a ISDN TA [HFC-S]
0745 Syntech Information Co., Ltd
0746 Onkyo Corp.
5500 SE-U55 Audio Device
@@ -8637,6 +9100,7 @@
0764 Cyber Power System, Inc.
0005 Cyber Power UPS
0501 CP1500 AVR UPS
+ 0601 PR1500LCDRT2U UPS
0765 X-Rite, Inc.
5001 Huey PRO Colorimeter
5020 i1 Display Pro
@@ -8661,6 +9125,7 @@
1221 CardMan 1221
1784 CardMan 6020
3021 CardMan 3121
+ 3022 CardMan 3021
3610 CardMan 3620
3621 CardMan 3621
3821 CardMan 3821
@@ -8740,6 +9205,7 @@
556d Memory Vault
5571 Cruzer Fit
5576 Cruzer Facet
+ 557d Cruzer Force (64GB)
5580 SDCZ80 Flash Drive
5581 Ultra
5e10 Encrypted
@@ -8941,8 +9407,8 @@
0002 ISDN TA128 Plus
0003 ISDN TA128 Deluxe
0005 ISDN TA128 SE
- 0006 ISDN TA128 CE
- 0007 ISDN TA
+ 0006 ISDN TA 128 [HFC-S]
+ 0007 ISDN TA [HFC-S]
0008 ISDN TA
07b1 IMP, Inc.
07b2 Motorola BCS, Inc.
@@ -8987,12 +9453,13 @@
090c OpticBook 3600 Plus Scanner
0a06 TVcam VD100
0b00 SmartPhoto F50
+ 0c00 OpticPro ST64 Scanner
0c03 OpticPro ST64+ Scanner
0c04 Optic Film 7200i scanner
0c0c PL806 Scanner
0c26 OpticBook 4600 Scanner
0c2b Mobile Office D428 Scanner
- 0e08 Plustek OpticBook A300 Scanner
+ 0e08 OpticBook A300 Scanner
1300 OpticBook 3800 Scanner
1301 OpticBook 4800 Scanner
07b4 Olympus Optical Co., Ltd
@@ -9002,7 +9469,7 @@
0109 C-370Z/C-500Z/D-535Z/X-450
010a MAUSB-10 xD and SmartMedia Card Reader
0112 MAUSB-100 xD Card Reader
- 0113 Mju 500
+ 0113 Mju 500 / Stylus Digital Camera (PTP)
0114 C-350Z Camera
0118 Mju Mini Digital/Mju Digital 500 Camera / Stylus 850 SW
0125 Tough TG-1 Camera
@@ -9335,6 +9802,8 @@
07f9 Dotop Technology, Inc.
07fa DrayTek Corp.
0778 miniVigor 128 ISDN TA
+ 0846 ISDN TA [HFC-S]
+ 0847 ISDN TA [HFC-S]
1012 BeWAN ADSL USB ST (grey)
1196 BWIFI-USB54AR 802.11bg
a904 BeWAN ADSL
@@ -9550,6 +10019,7 @@
9040 WNA1000 Wireless-N 150 [Atheros AR9170+AR9101]
9041 WNA1000M 802.11bgn [Realtek RTL8188CUS]
9042 On Networks N150MA 802.11bgn [Realtek RTL8188CUS]
+ 9043 WNA1000Mv2 802.11bgn [Realtek RTL8188CUS?]
9050 A6200 802.11a/b/g/n/ac Wireless Adapter [Broadcom BCM43526]
9052 A6100 AC600 DB Wireless Adapter [Realtek RTL8811AU]
a001 PA101 10 Mbps HPNA Home Phoneline RJ-1
@@ -9711,6 +10181,8 @@
0013 USBee AX-Plus
0014 USBee AX-Pro
0015 USBee DX
+08ac Macraigor Systems LLC
+ 2024 usbWiggler
08ae Macally (Mace Group, Inc.)
08b0 Metrohm
0006 814 Sample Processor
@@ -9829,8 +10301,9 @@
0100 Interface ADSL
0101 Interface ADSL
0102 ADSL
- 0301 RNIS
+ 0301 RNIS ISDN TA [HFC-S]
08e4 Pioneer Corp.
+ 0184 DDJ-WeGO
0185 DDJ-WeGO2
08e5 Litronic
08e6 Gemalto (was Gemplus)
@@ -10004,6 +10477,8 @@
0908 Siemens AG
01f4 SIMATIC NET CP 5711
01fe SIMATIC NET PC Adapter A2
+ 04b1 MediSET
+ 04b2 NC interface
2701 ShenZhen SANZHAI Technology Co.,Ltd Spy Pen VGA
0909 Audio-Technica Corp.
090a Trumpion Microelectronics, Inc.
@@ -10017,6 +10492,7 @@
0373 Silicon Motion Camera
037a Silicon Motion Camera
037b Silicon Motion Camera
+ 037c 300k Pixel Camera
1000 Flash Drive
1132 5-in-1 Card Reader
337b Silicon Motion Camera
@@ -10031,6 +10507,7 @@
937b Silicon Motion Camera
b370 Silicon Motion SM370 Camera
b371 Silicon Motion SM371 Camera
+ f37d Endoscope camera
090d Multiport Computer Vertriebs GmbH
090e Shining Technology, Inc.
090f Fujitsu Devices, Inc.
@@ -10128,6 +10605,7 @@
0927 Summus, Ltd
0928 PLX Technology, Inc. (formerly Oxford Semiconductor, Ltd)
8000 Firmware uploader
+ ffff Blank Oxford Device
0929 American Biometric Co.
092a Toshiba Information & Industrial Sys. And Services
092b Sena Technologies, Inc.
@@ -10139,6 +10617,7 @@
000c Gigabeat F (mtp)
0010 Gigabeat S (mtp)
0200 Integrated Bluetooth (Taiyo Yuden)
+ 021c Atheros AR3012 Bluetooth
0301 PCX1100U Cable Modem (WDM)
0302 PCX2000 Cable Modem (WDM)
0305 Cable Modem PCX3000
@@ -10307,6 +10786,7 @@
1606 Eee PC 701 SD Card Reader [ENE UB6225]
1607 DataTraveler 100
160d DataTraveler Vault Privacy
+ 160e DT110P/1GB Capless
1613 DataTraveler DT101C Flash Drive
1616 DataTraveler Locker 4GB
161a Dell HyperVisor internal flash drive
@@ -10350,7 +10830,7 @@
fb18 LC Device
0958 CompuLink Research, Inc.
0959 Cologne Chip AG
- 2bd0 Intelligent ISDN (Ver. 3.60.04)
+ 2bd0 Intelligent ISDN (Ver. 3.60.04) [HFC-S]
095a Portsmith
3003 Express Ethernet
095b Medialogic Corp.
@@ -10542,6 +11022,7 @@
0a00 Liquid Audio
0a01 ViA, Inc.
0a05 Unknown Manufacturer
+ 0001 Hub
7211 hub
0a07 Ontrak Control Systems Inc.
0064 ADU100 Data Acquisition Interface
@@ -10597,6 +11078,7 @@
0015 Optio S40/S5i
003b Optio 50 (mass storage mode)
003d Optio S55
+ 0041 Optio S5z
0043 *ist DL
0047 Optio S60
0052 Optio 60 Digital Camera
@@ -10734,6 +11216,8 @@
2150 BCM2046 Bluetooth Device
2151 Bluetooth
2154 BCM92046DG-CL1ROM Bluetooth 2.1 UHE Dongle
+ 216c BCM43142A0 Bluetooth Device
+ 216f BCM20702A0 Bluetooth
217d HP Bluethunder
217f BCM2045B (BDC-2.1)
2198 Bluetooth 3.0 Device
@@ -10759,6 +11243,7 @@
5801 BCM5880 Secure Applications Processor with fingerprint swipe sensor
5802 BCM5880 Secure Applications Processor with fingerprint touch sensor
5803 BCM5880 Secure Applications Processor with secure keyboard
+ 5804 BCM5880 Secure Applications Processor with fingerprint swipe sensor
6300 Pirelli Remote NDIS Device
bd11 TiVo AG0100 802.11bg Wireless Adapter [Broadcom BCM4320]
bd13 BCM4323 802.11abgn Wireless Adapter
@@ -10809,6 +11294,34 @@
0a84 Maui Innovative Peripherals
0a85 Idexx Labs
0a86 NITGen Co., Ltd
+0a89 Aktiv
+ 0001 Guardant Stealth/Net
+ 0002 Guardant ID
+ 0003 Guardant Stealth 2
+ 0004 Rutoken
+ 0005 Guardant Fidus
+ 0006 Guardant Stealth 3
+ 0007 Guardant Stealth 2
+ 0008 Guardant Stealth 3 Sign/Time
+ 0009 Guardant Code
+ 000a Guardant Sign Pro
+ 000b Guardant Sign Pro HID
+ 000c Guardant Stealth 3 Sign/Time
+ 000d Guardant Code HID
+ 000f Guardant System Firmware Update
+ 0020 Rutoken S
+ 0025 Rutoken lite
+ 0026 Rutoken lite HID
+ 002a Rutoken Mass Storage
+ 002b Guardant Mass Storage
+ 0030 Rutoken ECP
+ 0040 Rutoken ECP HID
+ 0060 Rutoken Magistra
+ 0061 Rutoken Magistra
+ 0069 Reader
+ 0080 Rutoken PinPad Ex
+ 0081 Rutoken PinPad In
+ 0082 Rutoken PinPad 2
0a8d Picturetel
0a8e Japan Aviation Electronics Industry, Ltd
2011 Filter Driver For JAE XMC R/W
@@ -11091,6 +11604,7 @@
17ba N10 Nano 802.11n Network Adapter [Realtek RTL8192CU]
17c7 WL-330NUL
17c9 USB-AC53 802.11a/b/g/n/ac Wireless Adapter [Broadcom BCM43526]
+ 17cb Broadcom BCM20702A0 Bluetooth
17d1 AC51 802.11a/b/g/n/ac Wireless Adapter [Mediatek MT7610/Ralink RT2870]
4c80 Transformer Pad TF300TG
4c90 Transformer Pad Infinity TF700
@@ -11249,7 +11763,7 @@
0b7b Taiko Denki Co., Ltd
0b7c ITRAN Communications, Ltd
0b7d Astrodesign, Inc.
-0b81 id3 Semiconductors
+0b81 id3 Technologies
0001 Biothentic II smartcard reader with fingerprint sensor
0002 DFU-Enabled Devices (DFU)
0012 BioPAD biometric module (DFU + CDC)
@@ -11512,6 +12026,7 @@
0ca5 Android Phone [Evo Shift 4G]
0cae T-Mobile MyTouch 4G Slide [Doubleshot]
0dea M7_UL [HTC One]
+ 0f25 One M8
0f64 Desire 601
0ff8 Desire HD (Tethering Mode)
0ff9 Desire / Desire HD / Hero / Thunderbolt (Charge Mode)
@@ -11627,6 +12142,7 @@
2831 RTL2831U DVB-T
2832 RTL2832U DVB-T
2838 RTL2838 DVB-T
+ 5401 RTL 8153 USB 3.0 hub with gigabit ethernet
5730 HP 2.0MP High Definition Webcam
5775 HP "Truevision HD" laptop camera
8150 RTL8150 Fast Ethernet Adapter
@@ -11945,6 +12461,9 @@
0401 cyberJack pinpad(a2)
0500 cyberJack RFID standard dual interface smartcard reader
0501 cyberJack RFID comfort dual interface smartcard reader
+ 0502 cyberJack compact
+ 0504 cyberJack go / go plus
+ 0505 cyberJack wave
9102 cyberJack RFID basis contactless smartcard reader
0c4c Needham's Electronics
0021 EMP-21 Universal Programmer
@@ -12014,6 +12533,16 @@
0c5a TRS International Mfg., Inc.
0c5e Xytronix Research & Design
0c60 Apogee Electronics Corp.
+ 0001 MiniMe
+ 0002 MiniDAC
+ 0003 ONE
+ 0004 GiO
+ 0007 Duet
+ 0009 Jam
+ 000a Jam Bootloader
+ 000b MiC
+ 000c MiC Bootloader
+ 8007 Duet DFU Mode
0c62 Chant Sincere Co., Ltd
0c63 Toko, Inc.
0c64 Signality System Engineering Co., Ltd
@@ -12216,6 +12745,7 @@
0cf2 ENE Technology, Inc.
6220 SD Card Reader (SG361)
6225 SD card reader (UB6225)
+ 6230 SD Card Reader (UB623X)
6250 SD card reader (UB6250)
0cf3 Atheros Communications, Inc.
0001 AR5523
@@ -12355,6 +12885,7 @@
0d62 Darfon Electronics Corp.
0003 Smartcard Reader
0004 Keyboard
+ 001b Keyboard
001c Benq X120 Internet Keyboard Pro
0306 M530 Mouse
0800 Magic Wheel
@@ -12442,6 +12973,7 @@
0107 CM108 Audio Controller
010f CM108 Audio Controller
0115 CM108 Audio Controller
+ 0139 Multimedia Headset [Gigaware by Ignition L.P.]
013c CM108 Audio Controller
0201 CM6501
5000 Mass Storage Controller
@@ -12528,7 +13060,7 @@
0da1 Suzhou Peter's Precise Industrial Co., Ltd
0da2 Land Instruments International, Ltd
0da3 Nippon Electro-Sensory Devices Corp.
-0da4 Polar Electro OY
+0da4 Polar Electro Oy
0001 Interface
0008 Loop
0da7 IOGear, Inc.
@@ -12576,6 +13108,11 @@
0db2 Shian Hwi Plug Parts, Plastic Factory
0db3 Tekram Technology Co., Ltd
0db4 Chung Fu Chen Yeh Enterprise Corp.
+0db5 Access IS
+ 0139 Barcode Module - CDC serial
+ 013a Barcode Module - Virtual Keyboard
+ 013b Barcode Module - HID
+ 0160 NFC and Smartcard Module (NSM)
0db7 ELCON Systemtechnik
0002 Goldpfeil P-LAN
0dba Digidesign
@@ -12712,6 +13249,7 @@
2200 Sitecom bluetooth2.0 class 2 dongle CN-512
2208 Sitecom bluetooth2.0 class 2 dongle CN-520
2209 Sitecom bluetooth2.0 class 1 dongle CN-521
+ 3068 DC-104v2 ISDN Adapter [HFC-S]
9071 WL-113 rev 1 Wireless Network USB Adapter
9075 WL-117 Hi-Speed USB Adapter
90ac WL-172 Wireless Network USB Adapter 54g Turbo
@@ -12753,6 +13291,7 @@
0e1b Crewave
0e20 Pegasus Technologies Ltd.
0101 NoteTaker
+ 0200 Seiko Instruments InkLink Handwriting System
0e21 Cowon Systems, Inc.
0300 iAudio CW200
0400 MP3 Player
@@ -12857,6 +13396,7 @@
0003 Freebird wireless Controller
0005 Eclipse wireless Controller
0006 Edge wireless Controller
+ 0128 Wireless PS3 Controller
0e70 Tokyo Electronic Industry Co., Ltd
0e72 Hsi-Chin Electronics Co., Ltd
0e75 TVS Electronics, Ltd
@@ -12893,6 +13433,7 @@
0016 4 port USB 1.1 hub UH-174
0020 USB to PS/2 Adapter
0021 Multimedia Keyboard Controller
+ 0022 multimedia keyboard controller
0201 SmartJoy Frag Xpad/PS2 adaptor
0e90 WiebeTech, LLC
0100 Storage Adapter V1
@@ -12973,6 +13514,7 @@
0ee3 ComTrue Technology Corp.
1000 Image Tank 1.5
0ee4 Sunrich Technology, Ltd
+ 0690 SATA 3 Adapter
0eee Digital Stream Technology, Inc.
8810 Mass Storage Drive
0eef D-WAV Scientific Co., Ltd
@@ -13049,6 +13591,7 @@
0f38 Nien-Yi Industrial Corp.
0f39 TG3 Electronics
0876 Keyboard [87 Francium Pro]
+ 1086 DK2108SZ Keyboard [Ducky Zero]
0f3d Airprime, Incorporated
0112 CDMA 1xEVDO PC Card, PC 5220
0f41 RDC Semiconductor Co., Ltd
@@ -13165,12 +13708,14 @@
00d4 C902 [MTP]
00d9 C702 Phone
0112 W995 Walkman Phone
+ 014e J108i Cedar (MTP mode)
015a Xperia Pro [Media Transfer Protocol]
0166 Xperia Mini Pro
0167 ST15i (Xperia mini)
0169 Xperia S
0172 Xperia P
0177 Xperia Ion [Mass Storage]
+ 01bb D5803 [Xperia Z3 Compact] (MTP mode)
0dde Xperia Mini Pro Bootloader
1010 WMC Modem
10af V640i Phone [PictBridge]
@@ -13179,6 +13724,7 @@
2137 Xperia X10 mini (USB debug)
2138 Xperia X10 mini pro (Debug)
2149 Xperia X8 (debug)
+ 214e J108i Cedar (Windows-driver mode)
3137 Xperia X10 mini
3138 Xperia X10 mini pro
3149 Xperia X8
@@ -13216,7 +13762,7 @@
d0e1 MD400 Mobile Broadband Modem
d12a U100i Yari Phone
d12e Xperia X10
- d14e J108i Cedar
+ d14e J108i Cedar (modem mode)
e000 K810 (PictBridge mode)
e039 K800i (msc mode)
e042 W810i Phone
@@ -13235,13 +13781,14 @@
e112 W995 Phone (Mass Storage)
e12e X10i Phone
e133 Vivaz
+ e14e J108i Cedar (mass-storage mode)
e14f Xperia Arc/X12
e15a Xperia Pro [Mass Storage Class]
e161 Xperia Ray
e166 Xperia Mini Pro
e167 XPERIA mini
e19b C2005 [Xperia M dual] (Mass Storage)
- f0fa Liveview micro display MN800 in DFU mode
+ f0fa MN800 / Smartwatch 2 (DFU mode)
0fcf Dynastream Innovations, Inc.
1003 ANT Development Board
1004 ANTUSB Stick
@@ -13315,15 +13862,18 @@
61c5 P880 / Charge only
61c6 Vortex (msc)
61cc Optimus S
+ 61da G2 Android Phone [tethering mode]
61f1 Optimus Android Phone [LG Software mode]
61f9 Optimus (Various Models) MTP Mode
61fc Optimus 3
61fe Optimus Android Phone [USB tethering mode]
- 6300 Optimus Android Phone
- 631c Optimus Android Phone [MTP mode]
+ 6300 G2/Optimus Android Phone
+ 631c G2/Optimus Android Phone [MTP mode]
631d Optimus Android Phone (Camera/PTP Mode)
- 631e Optimus Android Phone [Camera/PTP mode]
+ 631e G2/Optimus Android Phone [Camera/PTP mode]
631f Optimus Android Phone (Charge Mode)
+ 633e G2 Android Phone [MTP mode]
+ 6344 G2 Android Phone [tethering mode]
6356 Optimus Android Phone [Virtual CD mode]
6800 CDMA Modem
7000 LG LDP-7024D(LD)USB
@@ -13434,6 +13984,7 @@
8901 Bluetooth Device
9967 W9967CF/W9968CF Webcam IC
1048 Targus Group International
+ 2010 4-Port hub
104b Mylex / Buslogic
104c AMCO TEC International, Inc.
104d Newport Corporation
@@ -13449,9 +14000,14 @@
0009 RE-BL PlayStation 3 IR-to-Bluetooth converter
1050 Yubico.com
0010 Yubikey
- 0110 Yubikey NEO OTP
- 0111 Yubikey NEO OTP+CCID
- 0112 Yubikey NEO CCID
+ 0110 Yubikey NEO(-N) OTP
+ 0111 Yubikey NEO(-N) OTP+CCID
+ 0112 Yubikey NEO(-N) CCID
+ 0113 Yubikey NEO(-N) U2F
+ 0114 Yubikey NEO(-N) OTP+U2F
+ 0115 Yubikey NEO(-N) U2F+CCID
+ 0116 Yubikey NEO(-N) OTP+U2F+CCID
+ 0120 Yubikey Touch U2F Security Key
0200 U2F Gnubby
0211 Gnubby
1053 Immanuel Electronics Co., Ltd
@@ -13483,6 +14039,7 @@
07a8 My Passport (WDBBEP), My Passport for Mac (WDBLUZ)
0810 My Passport Ultra (WDBZFP)
0820 My Passport Ultra (WDBMWV, WDBZFP)
+ 0830 My Passport Ultra (WDBZFP)
0900 MyBook Essential External HDD
0901 My Book Essential Edition (Green Ring) (WDG1U)
0902 My Book Pro Edition (WDG1T)
@@ -13513,6 +14070,8 @@
1230 My Book (WDBFJK0030HBK)
1059 Giesecke & Devrient GmbH
000b StarSign Bio Token 3.0
+105b Foxconn International, Inc.
+ e065 BCM43142A0 Bluetooth module
105c Hong Ji Electric Wire & Cable (Dongguan) Co., Ltd
105d Delkin Devices, Inc.
105e Valence Semiconductor Design, Ltd
@@ -13604,6 +14163,7 @@
1076 GCT Semiconductor, Inc.
0031 Bluetooth Device
0032 Bluetooth Device
+ 8002 LU150 LTE Modem [Yota LU150]
107b Gateway, Inc.
3009 eHome Infrared Transceiver
55b2 WBU-110 802.11b Wireless Adapter [Intersil PRISM 3]
@@ -13618,6 +14178,7 @@
1084 Pantech Co., Ltd
108a Chloride Power Protection
108b Grand-tek Technology Co., Ltd
+ 0005 HID Keyboard/Mouse PS/2 Translator
108c Robert Bosch GmbH
108e Lotes Co., Ltd.
1099 Surface Optics Corp.
@@ -13725,7 +14286,8 @@
8863 C8051F34x Bootloader
8897 C8051F38x HDMI Splitter [UHBX]
8918 C8051F38x HDMI Audio Extractor [VSA-HA-DP]
- 8973 C8051F38x HDMI Splitter [UHBX-8X]
+ 8973 C8051F38x HDMI Extender [UHBX-8X]
+ 89e1 C8051F38x HDMI Extender [UHBX-SW3-WP]
ea60 CP210x UART Bridge / myAVR mySmartUSB light
ea61 CP210x UART Bridge
ea70 CP210x UART Bridge
@@ -13750,12 +14312,15 @@
0101 USB-Module for Spider8, CP32
0202 CP22 - Communication Processor
0301 CP42 - Communication Processor
+10d2 RayComposer - R. Adams
+ 5243 RayComposer
10d4 Man Boon Manufactory, Ltd
10d5 Uni Class Technology Co., Ltd
0004 PS/2 Converter
5552 KVM Human Interface Composite Device (Keyboard/Mouse ports)
55a2 2Port KVMSwitcher
10d6 Actions Semiconductor Co., Ltd
+ 0c02 BioniQ 1001 Tablet
1000 MP3 Player
1100 MPMan MP-Ki 128 MP3 Player/Recorder
1101 D-Wave 2GB MP4 Player / AK1025 MP3/MP4 Player
@@ -13827,6 +14392,7 @@
112e Master Hill Electric Wire and Cable Co., Ltd
112f Cellon International, Inc.
1130 Tenx Technology, Inc.
+ 0001 BlyncLight
0002 iBuddy
0202 Rocket Launcher
6604 MCE IR-Receiver
@@ -13998,6 +14564,28 @@
1003 IBSecureCam-P
1004 IBSecureCam-O
1005 IBSecureCam-N
+ 1006 Mini IO-Board
+ 2000 Zygmunt Krynicki Lantern Brightness Sensor
+ 2048 Housedillon.com MRF49XA Transciever
+ 2222 LabConnect Signalgenerator
+ 2300 Keyboardio Keyboardio Model 01 Bootloader
+ 2301 Keyboardio Keyboardio Model 01
+ 2337 /Dev or SlashDev /Net
+ 3000 lloyd3000
+ 3333 LabConnect Digitalnetzteil
+ 5222 telavivmakers attami
+ 5a22 ikari_01 sd2snes
+ 7bd0 pokey9000 Tiny Bit Dingus
+ abd0 tibounise ADB converter
+ beef Modal MC-USB
+ c0f5 unethi PERswitch
+ ca1c KnightOS Hub
+ ca1d KnightOS MTP Device
+ cafe ii iigadget
+ dada Rebel Technology OWL
+ dead chaosfield.at AVR-Ruler
+ fa11 moonglow OpenXHC
+ feed ProgramGyar AVR-IR Sender
120e Hudson Soft Co., Ltd
120f Magellan
524e RoadMate 1475T
@@ -14008,6 +14596,8 @@
001c RP255 Guitar Multi-Effects Processor
121e Jungsoft Co., Ltd
3403 Muzio JM250 Audio Player
+1221 Unknown manufacturer
+ 3234 Disk (Thumb drive)
1223 SKYCABLE ENTERPRISE. CO., LTD.
1228 Datapaq Limited
0012 Q18 Data Logger
@@ -14195,8 +14785,8 @@
140b EC1260 Wireless Data Modem HSD USB Card
140c E180v
1412 EC168c
- 1436 E173 3G Modem (modem-mode)
- 1446 E1552/E1800/E173 (HSPA modem)
+ 1436 Broadband stick
+ 1446 Broadband stick (modem on)
1465 K3765 HSPA
14c3 K5005 Vodafone LTE/UMTS/GSM Modem/Networkcard
14c8 K5005 Vodafone LTE/UMTS/GSM MOdem/Networkcard
@@ -14216,7 +14806,7 @@
1575 K5150 LTE modem
15ca E3131 3G/UMTS/HSPA+ Modem (Mass Storage Mode)
1805 AT&T Go Phone U2800A phone
- 1c05 E173s 3G broadband stick (modem on)
+ 1c05 Broadband stick (modem on)
1c0b E173s 3G broadband stick (modem off)
1c20 R205 Mobile WiFi (Charging)
1d50 ET302s TD-SCDMA/TD-HSDPA Mobile Broadband
@@ -14400,6 +14990,7 @@
1390 TOMTOM B.V.
0001 GO 520 T/GO 630/ONE XL (v9)
5454 Blue & Me 2
+ 7474 GPS Sport Watch [Runner, Multi-Sport]
1391 IdealTEK, Inc.
1000 URTC-1000
1395 Sennheiser Communications
@@ -14497,9 +15088,11 @@
3304 Asus Integrated Bluetooth module [AR3011]
3306 Mediao 802.11n WLAN [Realtek RTL8191SU]
3315 Bluetooth module
+ 3362 Atheros AR3012 Bluetooth 4.0 Adapter
3375 Atheros AR3012 Bluetooth 4.0 Adapter
3392 Azurewave 43228+20702
3394 Bluetooth
+ 3474 Atheros AR3012 Bluetooth
5070 Webcam
5111 Integrated Webcam
5115 Integrated Webcam
@@ -14768,7 +15361,6 @@
0501 WR-G528e 'CHEETAH'
14e1 Dialogue Technology Corp.
5000 PenMount 5000 Touch Controller
-14e4 Broadcom Corp.
14e5 SAIN Information & Communications Co., Ltd.
14ea Planex Communications
ab10 GW-US54GZ
@@ -14803,6 +15395,7 @@
0002 HDReye (before firmware loads)
1519 Comneon
0020 HSIC Device
+ 0443 Telit LN930
1520 Bitwire Corp.
1524 ENE Technology Inc
6680 UTS 6680
@@ -14812,11 +15405,35 @@
1529 UBIQUAM Co., Ltd.
3100 CDMA 1xRTT USB Modem (U-100/105/200/300/520)
152a Thesycon Systemsoftware & Consulting GmbH
+ 8350 NET Gmbh iCube Camera
8400 INI DVS128
840d INI DAViS
841a INI DAViS FX3
+152b MIR Srl
+ 0001 spirobank II
+ 0002 spirolab III
+ 0003 MiniSpir
+ 0004 Oxi
+ 0005 spiros II
+ 0006 smiths spirobank II
+ 0007 smiths spirobank G-USB
+ 0008 smiths MiniSpir
+ 0009 spirobank G-USB
+ 000a smiths Oxi
+ 000b smiths spirolab III
+ 000c chorus III
+ 000d spirolab III Bw
+ 000e spirolab III
+ 000f easySpiro
+ 0010 Spirotel converter
+ 0011 spirobank
+ 0012 spiro3 Zimmer
+ 0013 spirotel serial
+ 0014 spirotel II
+ 0015 spirodoc
152d JMicron Technology Corp. / JMicron USA Technology Corp.
- 0539 JMS539 SuperSpeed SATA II 3.0G Bridge
+ 0539 JMS539/567 SuperSpeed SATA II/III 3.0G/6.0G Bridge
+ 0567 JMS567 SATA 6Gb/s bridge
0770 Alienware Integrated Webcam
2329 JM20329 SATA Bridge
2335 ATA/ATAPI Bridge
@@ -14826,6 +15443,11 @@
2339 JM20339 SATA Bridge
2352 ATA/ATAPI Bridge
2509 JMS539 SuperSpeed SATA II 3.0G Bridge
+ 2551 JMS551 SATA 3Gb/s bridge
+ 2566 JMS566 SATA 3Gb/s bridge
+ 2590 Seatay ATA/ATAPI Bridge
+ 3562 JMS567 SATA 6Gb/s bridge
+ 3569 JMS566 SATA 3Gb/s bridge
152e LG (HLDS)
2507 PL-2507 IDE Controller
e001 GSA-5120D DVD-RW
@@ -14850,6 +15472,7 @@
1181 Cinergy S2 PCIe Dual Port 1
1182 Cinergy S2 PCIe Dual Port 2
1546 U-Blox AG
+ 01a5 NL-402U
1547 SG Intec Ltd & Co KG
1000 SG-Lock[U2]
154a Celectronic GmbH
@@ -14858,9 +15481,13 @@
0010 USB 2.0 Flash Drive
0048 Flash Drive
004d 8 GB Flash Drive
+ 0053 Flash Drive
0057 32GB Micro Slide Attache Flash Drive
- 007a 8GB Classic Attache Flash Drive
+ 005b Flash Drive
+ 0062 Flash Drive
+ 007a Classic Attache Flash Drive
6545 FD Device
+ fa05 Flash Drive
154d ConnectCounty Holdings Berhad
154e D&M Holdings, Inc. (Denon/Marantz)
3000 Marantz RC9001 Remote Control
@@ -14920,6 +15547,7 @@
0006 Wireless 11n USB Adapter
0010 802.11n USB Wireless Card
0012 WUBR-208N 802.11abgn Wireless Adapter [Ralink RT2870]
+ 002d WLTUBA-107 [Yota 4G LTE]
15aa Gearway Electronics (Dong Guan) Co., Ltd.
15ad VMware Inc.
15ba Olimex Ltd.
@@ -15100,6 +15728,8 @@
0404 WMA9109 UMTS Phone
0600 Vodafone VDA GPS / Toschiba Protege G710
0804 WP-S1 Phone
+1617 Sony Corp.
+ 2002 NVX-P1 Personal Navigation System
1619 L & K Precision Technology Co., Ltd.
1621 Wionics Research
1628 Stonestreet One, Inc.
@@ -15112,7 +15742,7 @@
1631 Good Way Technology
6200 GWUSB2E
c019 RT2573
-1645 Cross Match Technologies GmbH
+1645 Entrega [hex]
0001 1S Serial Port
0002 2S Serial Port
0003 1S25 Serial Port
@@ -15151,6 +15781,8 @@
165c Kondo Kagaku
0002 Serial Adapter
1660 Creatix Polymedia GmbH
+1667 GIGA-TMS INC.
+ 0005 PCR330A RFID Reader (125 kHz, keyboard emulation)
1668 Actiontec Electronics, Inc. [hex]
0009 Gateway
0333 Modem
@@ -15199,6 +15831,7 @@
1687 Kingmax Digital Inc.
5289 FlashDisk
6211 FlashDisk
+ 6213 FlashDisk
1688 Saab AB
1689 Razer USA, Ltd
fd00 Onza Tournament Edition controller
@@ -15291,6 +15924,8 @@
05e4 Free shared USB VID/PID pair for MIDI devices
06b4 USB2LPT with 2 interfaces
06b5 USB2LPT with 3 interfaces (native, HID, printer)
+ 074e DSP-Weuffen USB-HPI-Programmer
+ 074f DSP-Weuffen USB2-HPI-Programmer
0762 Osmocom SIMtrace
076b OpenPCD 13.56MHz RFID Reader
076c OpenPICC 13.56MHz RFID Simulator (native)
@@ -15364,6 +15999,7 @@
0011 MIDI-USB 1x1
170d Avnera
1711 Leica Microsystems
+ 0101 DFC-365FX camera
3020 IC80 HD Camera
1724 Meyer Instruments (MIS)
0115 PAXcam5
@@ -15417,9 +16053,12 @@
1748 MQP Electronics
0101 Packet-Master USB12
174c ASMedia Technology Inc.
- 5106 Transcend StoreJet 25M3
+ 1153 ASM2115 SATA 6Gb/s bridge
+ 2074 ASM1074 High-Speed hub
+ 3074 ASM1074 SuperSpeed hub
+ 5106 ASM1051 SATA 3Gb/s bridge
5136 ASM1053 SATA 6Gb/s bridge
- 55aa ASM1051 SATA 3Gb/s bridge
+ 55aa ASM1051E SATA 6Gb/s bridge, ASM1053E SATA 6Gb/s bridge, ASM1153 SATA 3Gb/s bridge
174f Syntek
1105 SM-MS/Pro-MMC-XD Card Reader
110b HP Webcam
@@ -15459,10 +16098,22 @@
083e MetaGeek Wi-Spy
083f MetaGeek Wi-Spy 2.4x
0938 Iguanaworks USB IR Transceiver
+ 0a96 raphnet.net usb_game12
+ 0a97 raphnet.net SNES mouse adapter
+ 0a98 raphnet.net USBTenki
+ 0a99 raphnet.net NES
+ 0a9a raphnet.net Gamecube/N64 controller
+ 0a9b raphnet.net DB9Joy
+ 0a9c raphnet.net Intellivision
+ 0a9d raphnet.net 4nes4snes
+ 0a9e raphnet.net Megadrive multitap
+ 0a9f raphnet.net MultiDB9joy
0c30 Telldus TellStick
0c31 Telldus TellStick Duo
0c9f USBtiny
1eef OpenAPC SecuKey
+ 1ef0 E1701 Modular Controller Card
+ 1ef1 E1701 Modular Controller Card
1782 Spreadtrum Communications Inc.
1784 TopSeed Technology Corp.
0001 eHome Infrared Transceiver
@@ -15614,6 +16265,7 @@
0001 iNexio Touchscreen controller
1871 Aveo Technology Corp.
0101 UVC camera (Bresser microscope)
+ 0141 Camera
0d01 USB2.0 Camera
1873 Navilock
ee93 EasyLogger
@@ -15641,10 +16293,14 @@
0214 Portable Hard Drive
0216 External Hard Drive
0218 External Hard Drive
+ 0224 Store 'n' Go Micro Plus
0227 Pocket Hard Drive
022b Portable Hard Drive (Store'n'Go)
- 0237 Portable Harddrive (500 GB)
+ 0237 Portable Harddrive
+ 0243 Flash Drive (Store'n'Go)
0302 Flash Drive
+ 0304 Store 'n' Go
+ 4123 Store N Go
18b1 Petalynx
0037 Maxter Remote Control
18b4 e3C Technologies
@@ -15662,6 +16318,10 @@
18cd Ecamm
cafe Pico iMage
18d1 Google Inc.
+ 0001 Onda V972 (storage access)
+ 0003 Android-powered device using AllWinner Technology SoC
+ 0006 Onda V972 MTP
+ 0008 Onda V972 PTP (camera)
0d02 Celkon A88
2d00 Android-powered device in accessory mode
2d01 Android-powered device in accessory mode with ADB support
@@ -15672,16 +16332,23 @@
4e21 Nexus S
4e22 Nexus S (debug)
4e24 Nexus S (tether)
+ 4e30 Galaxy Nexus (fastboot)
4e40 Nexus 7 (fastboot)
4e41 Nexus 7 (MTP)
4e42 Nexus 7 (debug)
4e43 Nexus 7 (PTP)
- 4ee1 Nexus 4 / 10
- 4ee2 Nexus 4 (debug)
- 4ee3 Nexus 4 (tether)
- 4ee4 Nexus 4 (debug + tether)
+ 4e44 Nexus 7 2012 (PTP)
+ 4ee0 Nexus 4 (bootloader)
+ 4ee1 Nexus Device (MTP)
+ 4ee2 Nexus Device (debug)
+ 4ee3 Nexus 4/5/7/10 (tether)
+ 4ee4 Nexus 4/5/7/10 (debug + tether)
+ 4ee5 Nexus 4 (PTP)
+ 4ee6 Nexus 4/5 (PTP + debug)
7102 Toshiba Thrive tablet
b004 Pandigital / B&N Novel 9" tablet
+ d001 Nexus 4 (fastboot)
+ d002 Nexus 4 (debug)
d109 LG G2x MTP
d10a LG G2x MTP (debug)
18d5 Starline International Group Limited
@@ -15810,6 +16477,10 @@
1995 Trillium Technology Pty. Ltd.
3202 REC-ADPT-USB (recorder)
3203 REC-A-ADPT-USB (recorder)
+1996 PixeLINK
+ 3010 Camera Release 4
+ 3011 OEM Camera
+ 3012 e-ImageData Corp. ScanPro
199b MicroStrain, Inc.
3065 3DM-GX3-25 Orientation Sensor
199e The Imaging Source Europe GmbH
@@ -16180,13 +16851,20 @@
1200 LE920
1bce Contac Cable Industrial Limited
1bcf Sunplus Innovation Technology Inc.
+ 0005 Optical Mouse
0007 Optical Mouse
053a Targa Silvercrest OMC807-C optische Funkmaus
05c5 SPRF2413A [2.4GHz Wireless Keyboard/Mouse Receiver]
05cf Micro keyboard & mouse receiver
0c31 SPIF30x Serial-ATA bridge
+ 2880 Dell HD Webcam
2885 ASUS Webcam
2888 HP Universal Camera
+ 28a2 Dell Integrated Webcam
+ 28a6 DELL XPS Integrated Webcam
+ 28ae Laptop Integrated Webcam HD
+ 28bd Dell Integrated HD Webcam
+ 2985 Laptop Integrated Webcam HD
2b83 Laptop Integrated Webcam FHD
1bd0 Hangzhou Riyue Electronic Co., Ltd.
1bd5 BG Systems, Inc.
@@ -16456,6 +17134,7 @@
0628 Data capturing and control module
1f4d G-Tek Electronics Group
b803 Lifeview LV5TDLX DVB-T [RTL2832U]
+ d220 Geniatech T220 DVB-T2 TV Stick
1f6f Aliph
0023 Jawbone Jambox
8000 Jawbone Jambox - Updating
@@ -16547,6 +17226,8 @@
f117 Formosa 3
f118 Formosa 4
2002 DAP Technologies
+2003 detectomat
+ ea61 dc3500
200c Reloop
100b Play audio soundcard
2013 PCTV Systems
@@ -16579,6 +17260,8 @@
ed16 GW-USMicroN2W 802.11bgn Wireless Adapter [Realtek RTL8188SU]
ed17 GW-USValue-EZ 802.11n Wireless Adapter [Realtek RTL8188CUS]
ed18 GW-USHyper300 / GW-USH300N 802.11bgn Wireless Adapter [Realtek RTL8191SU]
+203d Encore Electronics Inc.
+ 1480 ENUWI-N3 [802.11n Wireless N150 Adapter]
2040 Hauppauge
0c80 Windham
0c90 Windham
@@ -16624,11 +17307,16 @@
0200 MSP430 USB HID Bootstrap Loader
0855 Invensense Embedded MotionApp HID Sensor
0964 Inventio Software MSP430
+2058 Nano River Technology
+ 2058 ViperBoard I2C, SPI, GPIO interface
+2077 Taicang T&W Electronics Co. Ltd
+ 9002 W1M100 HSPA/WCDMA Module
2080 Barnes & Noble
0001 nook
0002 NOOKcolor
0003 NOOK Simple Touch
0004 NOOK Tablet
+2086 SIMPASS
2087 Cando
0a01 Multi Touch Panel
0a02 Multi Touch Panel
@@ -16651,12 +17339,43 @@
1db6 IDBG in normal mode
c25b C2 Dongle
cb72 ben-wpan, cntr
+20ce Minicircuits
+ 0012 RF Sythesizer 250-4200MHz model SSG-4000LH
+ 0021 RF Switch Matrix
+ 0022 I/O Controller
20df Simtec Electronics
0001 Entropy Key [UDEKEY01]
+20f1 NET New Electronic Technology GmbH
+ 0101 iCube3 Camera
20f4 TRENDnet
648b TEW-648UBM 802.11n 150Mbps Micro Wireless N Adapter [Realtek RTL8188CUS]
+20f7 XIMEA
+ 3001 Camera with CMOS sensor [MQ]
+ 3021 Camera with CCD sensor [MD]
+ 30b3 Camera with CMOS sensor in Vision mode [MQ]
+ a003 Subminiature 5Mpix B/W Camera, MU9PM-MH
+2100 RT Systems
+ 9e52 Yaesu VX-7
+ 9e54 CT29B Radio Cable
+ 9e57 RTS01 Radio Cable
+ 9e5d K4Y Radio Cable
+ 9e5f FT232RL [RTS05 Serial Cable]
2101 ActionStar
0201 SIIG 4-to-2 Printer Switch
+2109 VIA Labs, Inc.
+ 0700 VL700 SATA 3Gb/s bridge
+ 0701 VL701 SATA 3Gb/s bridge
+ 0810 VL81x Hub
+ 0811 Hub
+ 0812 VL812 Hub
+ 2811 Hub
+ 2812 VL812 Hub
+ 3431 Hub
+ 8110 Hub
+2113 Softkinetic
+ 0137 DepthSense 311 (3D)
+ 0145 DepthSense 325
+ 8000 DepthSense 311 (Color)
2149 Advanced Silicon S.A.
211b Touchscreen Controller
2703 TS58xxA/TC56xxA [CoolTouch]
@@ -16687,6 +17406,15 @@
6323 USB Electronic Scale
2237 Kobo Inc.
4161 eReader White
+225d Morpho
+ 0001 FINGER VP Multimodal Biometric Sensor
+ 0008 CBM-E3 Fingerprint Sensor
+ 0009 CBM Fingerprint Sensor [CBM-V3]
+ 000a MSO1300-E3 Fingerprint Sensor
+ 000b MSO1300 Fingerprint Sensor [MSO1300-V3]
+ 000c MSO1350-E3 Fingerprint Sensor & SmartCard Reader
+ 000d MSO1350 Fingerprint Sensor & SmartCard Reader [MSO1350-V3]
+ 000e MorphoAccess SIGMA Biometric Access Control Terminal
228d 8D Technologies inc.
0001 Terminal Bike Key Reader
22a6 Pie Digital, Inc.
@@ -16850,7 +17578,12 @@
00dc aes220 FPGA Mini-Module
2478 Tripp-Lite
2008 U209-000-R Serial Port
+248a Maxxter
+ 8366 Wireless Optical Mouse ACT-MUSW-002
249c M2Tech s.r.l.
+24e1 Paratronic
+ 3001 Adp-usb
+ 3005 Radius
2632 TwinMOS
3209 7-in-1 Card Reader
2639 Xsens
@@ -16941,11 +17674,62 @@
3300 WL-140 / Hawking HWU36D 802.11b Wireless Adapter [Intersil PRISM 3]
2899 Toptronic Industrial Co., Ltd
012c Camera Device
+289b Dracal/Raphnet technologies
+ 0001 Gamecube/N64 controller v2.2
+ 0002 2nes2snes
+ 0003 4nes4snes
+ 0004 Gamecube/N64 controller v2.3
+ 0005 Saturn (Joystick mode)
+ 0006 Saturn (Mouse mode)
+ 0007 Famicom controller
+ 0008 Dreamcast (Joystick mode)
+ 0009 Dreamcast (Mouse mode)
+ 000a Dreamcast (Keyboard mode)
+ 000b Gamecube/N64 controller v2.9 (Keyboard mode)
+ 000c Gamecube/N64 controller v2.9 (Joystick mode)
+ 0100 Dual-relay board
+ 0500 Energy meter
+ 0502 Precision barometer
2931 Jolla Oy
0a01 Jolla Phone MTP
0a02 Jolla Phone Developer
0a05 Jolla PC connection
0afe Jolla charging only
+2a03 dog hunter AG
+ 0001 Linino ONE (bootloader)
+ 0036 Arduino Leonardo (bootloader)
+ 0037 Arduino Micro (bootloader)
+ 0038 Arduino Robot Control (bootloader)
+ 0039 Arduino Robot Motor (bootloader)
+ 003a Arduino Micro ADK rev3 (bootloader)
+ 003b Arduino Serial
+ 003c Arduino Explora (bootloader)
+ 003d Arduino Due (usb2serial)
+ 003e Arduino Due
+ 0041 Arduino Yun (bootloader)
+ 0042 Arduino Mega 2560 Rev3
+ 0043 Arduino Uno Rev3
+ 004d Arduino Zero Pro (bootloader)
+ 8001 Linino ONE (CDC ACM)
+ 8036 Arduino Leonardo (CDC ACM)
+ 8037 Arduino Micro (CDC ACM)
+ 8038 Arduino Robot Control (CDC ACM)
+ 8039 Arduino Robot Motor (CDC ACM)
+ 803a Arduino Micro ADK rev3 (CDC ACM)
+ 803c Arduino Explora (CDC ACM)
+ 8041 Arduino Yun (CDC ACM)
+ 804d Arduino Zero Pro (CDC ACM)
+2a37 RTD Embedded Technologies, Inc.
+ 5110 UPS35110/UPS25110
+2a45 Meizu Corp.
+ 0001 MX Phone (BICR)
+ 0c02 MX Phone (MTP & ADB)
+ 0c03 MX Phone (BICR & ADB)
+ 2008 MX Phone (MTP)
+ 200a MX Phone (MTP & ACM & ADB)
+ 200b MX Phone (PTP)
+ 200c MX Phone (PTP & ADB)
+ 2012 MX Phone (MTP & ACM)
2c02 Planex Communications
14ea GW-US11H WLAN
2c1a Dolphin Peripherals
@@ -16981,6 +17765,8 @@
0054 Flash Drive (2GB)
3579 DIVA
6901 Media Reader
+357d Sharkoon
+ 7788 QuickPort XT
3636 InVibro
3838 WEM
0001 5-in-1 Card Reader
@@ -17245,6 +18031,8 @@
b200 Compact Flash Reader
b204 MMC/ SD Reader
b207 Memory Stick Reader
+5654 Gotview
+ ca42 MasterHD 3
5656 Uni-Trend Group Limited
0832 UT2000/UT3000 Digital Storage Oscilloscope
595a IRTOUCHSYSTEMS Co. Ltd.
@@ -17338,6 +18126,8 @@
734c TBS Technologies China
5920 Q-Box II DVB-S2 HD
5928 Q-Box II DVB-S2 HD
+7373 Beijing STONE Technology Co. Ltd.
+ 5740 Intelligent TFT-LCD Module
7392 Edimax Technology Co., Ltd
7711 EW-7711UTn nLite Wireless Adapter [Ralink RT2870]
7717 EW-7717UN 802.11n Wireless Adapter [Ralink RT2870]
@@ -17400,7 +18190,6 @@
2000 Flashdisk
8564 Transcend Information, Inc.
1000 JetFlash
- 8564 1000 JetFlash
4000 RDF8
8644 Intenso GmbG
8003 Micro Line
@@ -17435,6 +18224,8 @@
8988 V.cap Camera Device
9ac4 J. Westhues
4b8f ProxMark-3 RFID Instrument
+9e88 Marvell Semiconductor, Inc.
+ 9e8f Plug Computer Basic [SheevaPlug]
a128 AnMo Electronics Corp. / Dino-Lite (?)
0610 Dino-Lite Digital Microscope (SN9C201 + HV7131R)
0611 Dino-Lite Digital Microscope (SN9C201 + HV7131R)
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ecd50190976df0b55c912ee4b2eb004652cd3b4d
by gitï¼ ipfire.org 28 Jan '16
by gitï¼ ipfire.org 28 Jan '16
28 Jan '16
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via ecd50190976df0b55c912ee4b2eb004652cd3b4d (commit)
via 6fa8a1a9cc50d2df78650f1fc0f8f6f3b9111398 (commit)
via 235888599a4afa54d54421328733bf003c45711a (commit)
from 8998dde892d3e515747ee9a2e6e3fdf04ae607b9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ecd50190976df0b55c912ee4b2eb004652cd3b4d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Jan 28 13:08:59 2016 +0100
core97: prepare new core97 with openssl and openssh update.
the update itself has to be done...
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 6fa8a1a9cc50d2df78650f1fc0f8f6f3b9111398
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Jan 28 13:03:39 2016 +0100
rename core97 to 98 because we have to insert OpenSSL security update
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 235888599a4afa54d54421328733bf003c45711a
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Jan 28 13:02:09 2016 +0100
backports: update to 4.2.6
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
.../{oldcore/96 => core/97}/filelists/openssl | 0
config/rootfiles/core/97/update.sh | 15 +-
config/rootfiles/{oldcore/96 => core/98}/exclude | 0
config/rootfiles/core/{97 => 98}/filelists/bind | 0
config/rootfiles/core/{97 => 98}/filelists/dnsmasq | 0
config/rootfiles/core/{97 => 98}/filelists/files | 0
config/rootfiles/core/{97 => 98}/filelists/ntp | 0
.../{oldcore/94 => core/98}/filelists/openssh | 0
config/rootfiles/core/{97 => 98}/filelists/openvpn | 0
config/rootfiles/core/{97 => 98}/filelists/squid | 0
config/rootfiles/{oldcore/96 => core/98}/meta | 0
config/rootfiles/core/{97 => 98}/update.sh | 2 +-
lfs/backports | 32 +-
... => backports-4.2.6-1-add_usbnet_modules.patch} | 3067 +++++++++-----------
...ty.patch => backports-4.2.6-1-grsecurity.patch} | 1095 ++++---
.../backports-4.2.6-1-mt7601_upstream_fixes.patch | 441 +++
src/patches/linux-3.10-dvb_tevi_s482.patch | 240 --
17 files changed, 2443 insertions(+), 2449 deletions(-)
copy config/rootfiles/{oldcore/96 => core/97}/filelists/openssl (100%)
copy config/rootfiles/{oldcore/96 => core/98}/exclude (100%)
rename config/rootfiles/core/{97 => 98}/filelists/bind (100%)
rename config/rootfiles/core/{97 => 98}/filelists/dnsmasq (100%)
copy config/rootfiles/core/{97 => 98}/filelists/files (100%)
rename config/rootfiles/core/{97 => 98}/filelists/ntp (100%)
copy config/rootfiles/{oldcore/94 => core/98}/filelists/openssh (100%)
rename config/rootfiles/core/{97 => 98}/filelists/openvpn (100%)
rename config/rootfiles/core/{97 => 98}/filelists/squid (100%)
copy config/rootfiles/{oldcore/96 => core/98}/meta (100%)
copy config/rootfiles/core/{97 => 98}/update.sh (99%)
rename src/patches/{backports-3.18.1-1-add_usbnet_modules.patch => backports-4.2.6-1-add_usbnet_modules.patch} (93%)
rename src/patches/{backports-3.18.1-1-grsecurity.patch => backports-4.2.6-1-grsecurity.patch} (72%)
create mode 100644 src/patches/backports-4.2.6-1-mt7601_upstream_fixes.patch
delete mode 100644 src/patches/linux-3.10-dvb_tevi_s482.patch
Difference in files:
diff --git a/config/rootfiles/core/97/filelists/bind b/config/rootfiles/core/97/filelists/bind
deleted file mode 120000
index 48a0eba..0000000
--- a/config/rootfiles/core/97/filelists/bind
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/bind
\ No newline at end of file
diff --git a/config/rootfiles/core/97/filelists/dnsmasq b/config/rootfiles/core/97/filelists/dnsmasq
deleted file mode 120000
index d469c74..0000000
--- a/config/rootfiles/core/97/filelists/dnsmasq
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/dnsmasq
\ No newline at end of file
diff --git a/config/rootfiles/core/97/filelists/ntp b/config/rootfiles/core/97/filelists/ntp
deleted file mode 120000
index 7542d86..0000000
--- a/config/rootfiles/core/97/filelists/ntp
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/ntp
\ No newline at end of file
diff --git a/config/rootfiles/core/97/filelists/openssl b/config/rootfiles/core/97/filelists/openssl
new file mode 120000
index 0000000..e011a92
--- /dev/null
+++ b/config/rootfiles/core/97/filelists/openssl
@@ -0,0 +1 @@
+../../../common/openssl
\ No newline at end of file
diff --git a/config/rootfiles/core/97/filelists/openvpn b/config/rootfiles/core/97/filelists/openvpn
deleted file mode 120000
index 493f3f7..0000000
--- a/config/rootfiles/core/97/filelists/openvpn
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/openvpn
\ No newline at end of file
diff --git a/config/rootfiles/core/97/filelists/squid b/config/rootfiles/core/97/filelists/squid
deleted file mode 120000
index 2dc8372..0000000
--- a/config/rootfiles/core/97/filelists/squid
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/core/97/update.sh b/config/rootfiles/core/97/update.sh
index 541c5f8..912bde9 100644
--- a/config/rootfiles/core/97/update.sh
+++ b/config/rootfiles/core/97/update.sh
@@ -17,7 +17,7 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2015 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2016 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
@@ -32,28 +32,17 @@ do
done
# Stop services
-/etc/init.d/squid stop
-/etc/init.d/dnsmasq stop
# Extract files
extract_files
-# Fix hardening flags in grub
-paxctl -mpexs /usr/bin/grub-script-check
-
# Update Language cache
# /usr/local/bin/update-lang-cache
# Start services
-/etc/init.d/dnsmasq start
-/etc/init.d/sshd restart
-/etc/init.d/squid start
-
-# Delete old QoS enabled indicator
-rm -f /var/ipfire/qos/enable
# This update need a reboot...
-#touch /var/run/need_reboot
+touch /var/run/need_reboot
# Finish
/etc/init.d/fireinfo start
diff --git a/config/rootfiles/core/98/exclude b/config/rootfiles/core/98/exclude
new file mode 100644
index 0000000..d87f175
--- /dev/null
+++ b/config/rootfiles/core/98/exclude
@@ -0,0 +1,25 @@
+boot/config.txt
+etc/alternatives
+etc/collectd.custom
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+etc/snort/snort.conf
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
+etc/sudoers
+etc/sysconfig/firewall.local
+etc/sysconfig/rc.local
+etc/udev/rules.d/30-persistent-network.rules
+srv/web/ipfire/html/proxy.pac
+var/ipfire/dma
+var/ipfire/time
+var/ipfire/ovpn
+var/lib/alternatives
+var/log/cache
+var/state/dhcp/dhcpd.leases
+var/updatecache
diff --git a/config/rootfiles/core/98/filelists/bind b/config/rootfiles/core/98/filelists/bind
new file mode 120000
index 0000000..48a0eba
--- /dev/null
+++ b/config/rootfiles/core/98/filelists/bind
@@ -0,0 +1 @@
+../../../common/bind
\ No newline at end of file
diff --git a/config/rootfiles/core/98/filelists/dnsmasq b/config/rootfiles/core/98/filelists/dnsmasq
new file mode 120000
index 0000000..d469c74
--- /dev/null
+++ b/config/rootfiles/core/98/filelists/dnsmasq
@@ -0,0 +1 @@
+../../../common/dnsmasq
\ No newline at end of file
diff --git a/config/rootfiles/core/98/filelists/files b/config/rootfiles/core/98/filelists/files
new file mode 100644
index 0000000..8586e6a
--- /dev/null
+++ b/config/rootfiles/core/98/filelists/files
@@ -0,0 +1,18 @@
+etc/system-release
+etc/issue
+etc/rc.d/init.d/firewall
+etc/modprobe.d/nf_conntrack.conf
+srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat
+srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat
+srv/web/ipfire/cgi-bin/logs.cgi/firewalllogip.dat
+srv/web/ipfire/cgi-bin/logs.cgi/firewalllogport.dat
+srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat
+srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromip.dat
+srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromport.dat
+srv/web/ipfire/cgi-bin/optionsfw.cgi
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
+srv/web/ipfire/cgi-bin/qos.cgi
+srv/web/ipfire/cgi-bin/webaccess.cgi
+usr/bin/pgrep
+usr/local/bin/qosctrl
+usr/local/bin/timectrl
diff --git a/config/rootfiles/core/98/filelists/ntp b/config/rootfiles/core/98/filelists/ntp
new file mode 120000
index 0000000..7542d86
--- /dev/null
+++ b/config/rootfiles/core/98/filelists/ntp
@@ -0,0 +1 @@
+../../../common/ntp
\ No newline at end of file
diff --git a/config/rootfiles/core/98/filelists/openssh b/config/rootfiles/core/98/filelists/openssh
new file mode 120000
index 0000000..d8c77fd
--- /dev/null
+++ b/config/rootfiles/core/98/filelists/openssh
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/core/98/filelists/openvpn b/config/rootfiles/core/98/filelists/openvpn
new file mode 120000
index 0000000..493f3f7
--- /dev/null
+++ b/config/rootfiles/core/98/filelists/openvpn
@@ -0,0 +1 @@
+../../../common/openvpn
\ No newline at end of file
diff --git a/config/rootfiles/core/98/filelists/squid b/config/rootfiles/core/98/filelists/squid
new file mode 120000
index 0000000..2dc8372
--- /dev/null
+++ b/config/rootfiles/core/98/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/core/98/meta b/config/rootfiles/core/98/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/98/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/98/update.sh b/config/rootfiles/core/98/update.sh
new file mode 100644
index 0000000..72c5373
--- /dev/null
+++ b/config/rootfiles/core/98/update.sh
@@ -0,0 +1,68 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire 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 3 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire 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 IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2015 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+# Remove old core updates from pakfire cache to save space...
+core=98
+for (( i=1; i<=$core; i++ ))
+do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+# Stop services
+/etc/init.d/squid stop
+/etc/init.d/dnsmasq stop
+
+# Extract files
+extract_files
+
+# Fix hardening flags in grub
+paxctl -mpexs /usr/bin/grub-script-check
+
+# Update Language cache
+# /usr/local/bin/update-lang-cache
+
+# Start services
+/etc/init.d/dnsmasq start
+/etc/init.d/sshd restart
+/etc/init.d/squid start
+
+# Delete old QoS enabled indicator
+rm -f /var/ipfire/qos/enable
+
+# This update need a reboot...
+#touch /var/run/need_reboot
+
+# Finish
+/etc/init.d/fireinfo start
+sendprofile
+# Update grub config to display new core version
+if [ -e /boot/grub/grub.cfg ]; then
+ grub-mkconfig -o /boot/grub/grub.cfg
+fi
+sync
+
+# Don't report the exitcode last command
+exit 0
diff --git a/lfs/backports b/lfs/backports
index ab6fbdc..bbaef2c 100644
--- a/lfs/backports
+++ b/lfs/backports
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> #
# #
# 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 #
@@ -26,7 +26,7 @@ include Config
VERSUFIX = ipfire$(KCFG)
-VER = 3.18.1-1
+VER = 4.2.6-1
THISAPP = backports-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 6cef5f2c800e12441d2cba9fa42b6a5b
+$(DL_FILE)_MD5 = 3f978eb56473d9289cf21ebbcb5aa80b
install : $(TARGET)
@@ -78,23 +78,28 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
+
+ # remove replaced kernel modules
+ rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/wireless/rtl818x/rtl8180/rtl8180.ko
+ rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/media/platform
+
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-3.18.1-1-ipfire-build.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-3.18.1-1-grsecurity.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-3.18.1-1-add_usbnet_modules.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-4.2.6-1-grsecurity.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-4.2.6-1-add_usbnet_modules.patch
ifeq "$(MACHINE)" "x86_64"
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-3.18.1-1_no_dma_sgtable_on_x86_64.patch
endif
# DVB patches
cd $(DIR_APP) && patch -Np2 < $(DIR_SRC)/src/patches/v4l-dvb_fix_tua6034_pll.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10-dvb_tevi_s482.patch
# Wlan patches
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-drivers-3.8.3-ath_ignore_eeprom_regdomain.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.22-iwlwifi-noibss_only_on_radar_chan.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.37-rt2800usb_add_dlink_dwa137_usbid.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-3.18.1-1_rt2x00usb_suppress_queue_warnings.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-4.2.6-1-mt7601_upstream_fixes.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-3.18.1-1_add_libertas_uap.patch
# smsc mac address patch for pandaboard and raspberry pi
@@ -110,9 +115,6 @@ endif
# Disable some settings
cd $(DIR_APP) && sed -i -e "s/CPTCFG_CFG80211_DEVELOPER_WARNINGS=y/# CPTCFG_CFG80211_DEVELOPER_WARNINGS is not set/g" .config
- cd $(DIR_APP) && sed -i -e "s/CPTCFG_CFG80211_CERTIFICATION_ONUS=y/# CPTCFG_CFG80211_CERTIFICATION_ONUS is not set/g" .config
- cd $(DIR_APP) && sed -i -e "s/CPTCFG_CFG80211_REG_CELLULAR_HINTS=y/# CPTCFG_CFG80211_REG_CELLULAR_HINTS is not set/g" .config
- cd $(DIR_APP) && sed -i -e "s/CPTCFG_CFG80211_REG_RELAX_NO_IR=y/# CPTCFG_CFG80211_REG_RELAX_NO_IR is not set/g" .config
cd $(DIR_APP) && sed -i -e "s/CPTCFG_CFG80211_INTERNAL_REGDB=y/# CPTCFG_CFG80211_INTERNAL_REGDB is not set/g" .config
cd $(DIR_APP) && sed -i -e "s/CPTCFG_CFG80211_DEFAULT_PS=y/# CPTCFG_CFG80211_DEFAULT_PS is not set/g" .config
cd $(DIR_APP) && sed -i -e "s/CPTCFG_NFC=m/# CPTCFG_NFC is not set/g" .config
@@ -121,21 +123,19 @@ ifeq "$(MACHINE)" "x86_64"
cd $(DIR_APP) && sed -i -e "s/CPTCFG_LIBERTAS_UAP=m/# CPTCFG_LIBERTAS_UAP is not set/g" .config
endif
- # Disable some modules (build fail)
+ # Disable some modules (build fail/missing symbols)
+ cd $(DIR_APP) && sed -i -e "s/CPTCFG_VIDEO_AM437X_VPFE=m/# CPTCFG_VIDEO_AM437X_VPFE is not set/g" .config
cd $(DIR_APP) && sed -i -e "s/CPTCFG_VIDEO_VIA_CAMERA=m/# CPTCFG_VIDEO_VIA_CAMERA is not set/g" .config
+ cd $(DIR_APP) && sed -i -e "s/CPTCFG_VIDEO_XILINX=m/# CPTCFG_VIDEO_XILINX is not set/g" .config
+ cd $(DIR_APP) && sed -i -e "s/CPTCFG_IR_SUNXI=m/# CPTCFG_IR_SUNXI is not set/g" .config
+ cd $(DIR_APP) && sed -i -e "s/CPTCFG_BT_6LOWPAN=m/# CPTCFG_BT_6LOWPAN is not set/g" .config
# Disable DEBUG
cd $(DIR_APP) && sed -i -e "s/.*DEBUG=y/# & is not set/g" .config
cd $(DIR_APP) && sed -i -e "s/.*DEBUGFS=y/# & is not set/g" .config
cd $(DIR_APP) && sed -i -e "s/=y is not set/ is not set/g" .config
- # Disable OF_GRAPH (not supported by kernel 3.14)
- cd $(DIR_APP) && sed -i -e "s/CONFIG_OF/CONFIG_OF_IGNORE/g" include/linux/of_graph.h
-
cd $(DIR_APP) && make $(MAKETUNING) KLIB=/lib/modules/$(KVER)-$(VERSUFIX)/ install
- # Remove vsp1 module (not mach to our platforms)
- rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/media/platform/vsp1
-
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/src/patches/backports-3.18.1-1-add_usbnet_modules.patch b/src/patches/backports-3.18.1-1-add_usbnet_modules.patch
deleted file mode 100644
index 11b9638..0000000
--- a/src/patches/backports-3.18.1-1-add_usbnet_modules.patch
+++ /dev/null
@@ -1,29383 +0,0 @@
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/asix_common.c backports-3.18.1-1/drivers/net/usb/asix_common.c
---- backports-3.18.1-1.org/drivers/net/usb/asix_common.c 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/asix_common.c 2014-12-16 18:39:45.000000000 +0100
-@@ -0,0 +1,582 @@
-+/*
-+ * ASIX AX8817X based USB 2.0 Ethernet Devices
-+ * Copyright (C) 2003-2006 David Hollis <dhollis(a)davehollis.com>
-+ * Copyright (C) 2005 Phil Chang <pchang23(a)sbcglobal.net>
-+ * Copyright (C) 2006 James Painter <jamie.painter(a)iname.com>
-+ * Copyright (c) 2002-2003 TiVo Inc.
-+ *
-+ * 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, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include "asix.h"
-+
-+int asix_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
-+ u16 size, void *data)
-+{
-+ int ret;
-+ ret = usbnet_read_cmd(dev, cmd,
-+ USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-+ value, index, data, size);
-+
-+ if (ret != size && ret >= 0)
-+ return -EINVAL;
-+ return ret;
-+}
-+
-+int asix_write_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
-+ u16 size, void *data)
-+{
-+ return usbnet_write_cmd(dev, cmd,
-+ USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-+ value, index, data, size);
-+}
-+
-+void asix_write_cmd_async(struct usbnet *dev, u8 cmd, u16 value, u16 index,
-+ u16 size, void *data)
-+{
-+ usbnet_write_cmd_async(dev, cmd,
-+ USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-+ value, index, data, size);
-+}
-+
-+int asix_rx_fixup_internal(struct usbnet *dev, struct sk_buff *skb,
-+ struct asix_rx_fixup_info *rx)
-+{
-+ int offset = 0;
-+
-+ while (offset + sizeof(u16) <= skb->len) {
-+ u16 remaining = 0;
-+ unsigned char *data;
-+
-+ if (!rx->size) {
-+ if ((skb->len - offset == sizeof(u16)) ||
-+ rx->split_head) {
-+ if(!rx->split_head) {
-+ rx->header = get_unaligned_le16(
-+ skb->data + offset);
-+ rx->split_head = true;
-+ offset += sizeof(u16);
-+ break;
-+ } else {
-+ rx->header |= (get_unaligned_le16(
-+ skb->data + offset)
-+ << 16);
-+ rx->split_head = false;
-+ offset += sizeof(u16);
-+ }
-+ } else {
-+ rx->header = get_unaligned_le32(skb->data +
-+ offset);
-+ offset += sizeof(u32);
-+ }
-+
-+ /* get the packet length */
-+ rx->size = (u16) (rx->header & 0x7ff);
-+ if (rx->size != ((~rx->header >> 16) & 0x7ff)) {
-+ netdev_err(dev->net, "asix_rx_fixup() Bad Header Length 0x%x, offset %d\n",
-+ rx->header, offset);
-+ rx->size = 0;
-+ return 0;
-+ }
-+ rx->ax_skb = netdev_alloc_skb_ip_align(dev->net,
-+ rx->size);
-+ if (!rx->ax_skb)
-+ return 0;
-+ }
-+
-+ if (rx->size > dev->net->mtu + ETH_HLEN + VLAN_HLEN) {
-+ netdev_err(dev->net, "asix_rx_fixup() Bad RX Length %d\n",
-+ rx->size);
-+ kfree_skb(rx->ax_skb);
-+ rx->ax_skb = NULL;
-+ rx->size = 0U;
-+
-+ return 0;
-+ }
-+
-+ if (rx->size > skb->len - offset) {
-+ remaining = rx->size - (skb->len - offset);
-+ rx->size = skb->len - offset;
-+ }
-+
-+ data = skb_put(rx->ax_skb, rx->size);
-+ memcpy(data, skb->data + offset, rx->size);
-+ if (!remaining)
-+ usbnet_skb_return(dev, rx->ax_skb);
-+
-+ offset += (rx->size + 1) & 0xfffe;
-+ rx->size = remaining;
-+ }
-+
-+ if (skb->len != offset) {
-+ netdev_err(dev->net, "asix_rx_fixup() Bad SKB Length %d, %d\n",
-+ skb->len, offset);
-+ return 0;
-+ }
-+
-+ return 1;
-+}
-+
-+int asix_rx_fixup_common(struct usbnet *dev, struct sk_buff *skb)
-+{
-+ struct asix_common_private *dp = dev->driver_priv;
-+ struct asix_rx_fixup_info *rx = &dp->rx_fixup_info;
-+
-+ return asix_rx_fixup_internal(dev, skb, rx);
-+}
-+
-+struct sk_buff *asix_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
-+ gfp_t flags)
-+{
-+ int padlen;
-+ int headroom = skb_headroom(skb);
-+ int tailroom = skb_tailroom(skb);
-+ u32 packet_len;
-+ u32 padbytes = 0xffff0000;
-+
-+ padlen = ((skb->len + 4) & (dev->maxpacket - 1)) ? 0 : 4;
-+
-+ /* We need to push 4 bytes in front of frame (packet_len)
-+ * and maybe add 4 bytes after the end (if padlen is 4)
-+ *
-+ * Avoid skb_copy_expand() expensive call, using following rules :
-+ * - We are allowed to push 4 bytes in headroom if skb_header_cloned()
-+ * is false (and if we have 4 bytes of headroom)
-+ * - We are allowed to put 4 bytes at tail if skb_cloned()
-+ * is false (and if we have 4 bytes of tailroom)
-+ *
-+ * TCP packets for example are cloned, but skb_header_release()
-+ * was called in tcp stack, allowing us to use headroom for our needs.
-+ */
-+ if (!skb_header_cloned(skb) &&
-+ !(padlen && skb_cloned(skb)) &&
-+ headroom + tailroom >= 4 + padlen) {
-+ /* following should not happen, but better be safe */
-+ if (headroom < 4 ||
-+ tailroom < padlen) {
-+ skb->data = memmove(skb->head + 4, skb->data, skb->len);
-+ skb_set_tail_pointer(skb, skb->len);
-+ }
-+ } else {
-+ struct sk_buff *skb2;
-+
-+ skb2 = skb_copy_expand(skb, 4, padlen, flags);
-+ dev_kfree_skb_any(skb);
-+ skb = skb2;
-+ if (!skb)
-+ return NULL;
-+ }
-+
-+ packet_len = ((skb->len ^ 0x0000ffff) << 16) + skb->len;
-+ skb_push(skb, 4);
-+ cpu_to_le32s(&packet_len);
-+ skb_copy_to_linear_data(skb, &packet_len, sizeof(packet_len));
-+
-+ if (padlen) {
-+ cpu_to_le32s(&padbytes);
-+ memcpy(skb_tail_pointer(skb), &padbytes, sizeof(padbytes));
-+ skb_put(skb, sizeof(padbytes));
-+ }
-+ return skb;
-+}
-+
-+int asix_set_sw_mii(struct usbnet *dev)
-+{
-+ int ret;
-+ ret = asix_write_cmd(dev, AX_CMD_SET_SW_MII, 0x0000, 0, 0, NULL);
-+ if (ret < 0)
-+ netdev_err(dev->net, "Failed to enable software MII access\n");
-+ return ret;
-+}
-+
-+int asix_set_hw_mii(struct usbnet *dev)
-+{
-+ int ret;
-+ ret = asix_write_cmd(dev, AX_CMD_SET_HW_MII, 0x0000, 0, 0, NULL);
-+ if (ret < 0)
-+ netdev_err(dev->net, "Failed to enable hardware MII access\n");
-+ return ret;
-+}
-+
-+int asix_read_phy_addr(struct usbnet *dev, int internal)
-+{
-+ int offset = (internal ? 1 : 0);
-+ u8 buf[2];
-+ int ret = asix_read_cmd(dev, AX_CMD_READ_PHY_ID, 0, 0, 2, buf);
-+
-+ netdev_dbg(dev->net, "asix_get_phy_addr()\n");
-+
-+ if (ret < 0) {
-+ netdev_err(dev->net, "Error reading PHYID register: %02x\n", ret);
-+ goto out;
-+ }
-+ netdev_dbg(dev->net, "asix_get_phy_addr() returning 0x%04x\n",
-+ *((__le16 *)buf));
-+ ret = buf[offset];
-+
-+out:
-+ return ret;
-+}
-+
-+int asix_get_phy_addr(struct usbnet *dev)
-+{
-+ /* return the address of the internal phy */
-+ return asix_read_phy_addr(dev, 1);
-+}
-+
-+
-+int asix_sw_reset(struct usbnet *dev, u8 flags)
-+{
-+ int ret;
-+
-+ ret = asix_write_cmd(dev, AX_CMD_SW_RESET, flags, 0, 0, NULL);
-+ if (ret < 0)
-+ netdev_err(dev->net, "Failed to send software reset: %02x\n", ret);
-+
-+ return ret;
-+}
-+
-+u16 asix_read_rx_ctl(struct usbnet *dev)
-+{
-+ __le16 v;
-+ int ret = asix_read_cmd(dev, AX_CMD_READ_RX_CTL, 0, 0, 2, &v);
-+
-+ if (ret < 0) {
-+ netdev_err(dev->net, "Error reading RX_CTL register: %02x\n", ret);
-+ goto out;
-+ }
-+ ret = le16_to_cpu(v);
-+out:
-+ return ret;
-+}
-+
-+int asix_write_rx_ctl(struct usbnet *dev, u16 mode)
-+{
-+ int ret;
-+
-+ netdev_dbg(dev->net, "asix_write_rx_ctl() - mode = 0x%04x\n", mode);
-+ ret = asix_write_cmd(dev, AX_CMD_WRITE_RX_CTL, mode, 0, 0, NULL);
-+ if (ret < 0)
-+ netdev_err(dev->net, "Failed to write RX_CTL mode to 0x%04x: %02x\n",
-+ mode, ret);
-+
-+ return ret;
-+}
-+
-+u16 asix_read_medium_status(struct usbnet *dev)
-+{
-+ __le16 v;
-+ int ret = asix_read_cmd(dev, AX_CMD_READ_MEDIUM_STATUS, 0, 0, 2, &v);
-+
-+ if (ret < 0) {
-+ netdev_err(dev->net, "Error reading Medium Status register: %02x\n",
-+ ret);
-+ return ret; /* TODO: callers not checking for error ret */
-+ }
-+
-+ return le16_to_cpu(v);
-+
-+}
-+
-+int asix_write_medium_mode(struct usbnet *dev, u16 mode)
-+{
-+ int ret;
-+
-+ netdev_dbg(dev->net, "asix_write_medium_mode() - mode = 0x%04x\n", mode);
-+ ret = asix_write_cmd(dev, AX_CMD_WRITE_MEDIUM_MODE, mode, 0, 0, NULL);
-+ if (ret < 0)
-+ netdev_err(dev->net, "Failed to write Medium Mode mode to 0x%04x: %02x\n",
-+ mode, ret);
-+
-+ return ret;
-+}
-+
-+int asix_write_gpio(struct usbnet *dev, u16 value, int sleep)
-+{
-+ int ret;
-+
-+ netdev_dbg(dev->net, "asix_write_gpio() - value = 0x%04x\n", value);
-+ ret = asix_write_cmd(dev, AX_CMD_WRITE_GPIOS, value, 0, 0, NULL);
-+ if (ret < 0)
-+ netdev_err(dev->net, "Failed to write GPIO value 0x%04x: %02x\n",
-+ value, ret);
-+
-+ if (sleep)
-+ msleep(sleep);
-+
-+ return ret;
-+}
-+
-+/*
-+ * AX88772 & AX88178 have a 16-bit RX_CTL value
-+ */
-+void asix_set_multicast(struct net_device *net)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+ struct asix_data *data = (struct asix_data *)&dev->data;
-+ u16 rx_ctl = AX_DEFAULT_RX_CTL;
-+
-+ if (net->flags & IFF_PROMISC) {
-+ rx_ctl |= AX_RX_CTL_PRO;
-+ } else if (net->flags & IFF_ALLMULTI ||
-+ netdev_mc_count(net) > AX_MAX_MCAST) {
-+ rx_ctl |= AX_RX_CTL_AMALL;
-+ } else if (netdev_mc_empty(net)) {
-+ /* just broadcast and directed */
-+ } else {
-+ /* We use the 20 byte dev->data
-+ * for our 8 byte filter buffer
-+ * to avoid allocating memory that
-+ * is tricky to free later */
-+ struct netdev_hw_addr *ha;
-+ u32 crc_bits;
-+
-+ memset(data->multi_filter, 0, AX_MCAST_FILTER_SIZE);
-+
-+ /* Build the multicast hash filter. */
-+ netdev_for_each_mc_addr(ha, net) {
-+ crc_bits = ether_crc(ETH_ALEN, ha->addr) >> 26;
-+ data->multi_filter[crc_bits >> 3] |=
-+ 1 << (crc_bits & 7);
-+ }
-+
-+ asix_write_cmd_async(dev, AX_CMD_WRITE_MULTI_FILTER, 0, 0,
-+ AX_MCAST_FILTER_SIZE, data->multi_filter);
-+
-+ rx_ctl |= AX_RX_CTL_AM;
-+ }
-+
-+ asix_write_cmd_async(dev, AX_CMD_WRITE_RX_CTL, rx_ctl, 0, 0, NULL);
-+}
-+
-+int asix_mdio_read(struct net_device *netdev, int phy_id, int loc)
-+{
-+ struct usbnet *dev = netdev_priv(netdev);
-+ __le16 res;
-+
-+ mutex_lock(&dev->phy_mutex);
-+ asix_set_sw_mii(dev);
-+ asix_read_cmd(dev, AX_CMD_READ_MII_REG, phy_id,
-+ (__u16)loc, 2, &res);
-+ asix_set_hw_mii(dev);
-+ mutex_unlock(&dev->phy_mutex);
-+
-+ netdev_dbg(dev->net, "asix_mdio_read() phy_id=0x%02x, loc=0x%02x, returns=0x%04x\n",
-+ phy_id, loc, le16_to_cpu(res));
-+
-+ return le16_to_cpu(res);
-+}
-+
-+void asix_mdio_write(struct net_device *netdev, int phy_id, int loc, int val)
-+{
-+ struct usbnet *dev = netdev_priv(netdev);
-+ __le16 res = cpu_to_le16(val);
-+
-+ netdev_dbg(dev->net, "asix_mdio_write() phy_id=0x%02x, loc=0x%02x, val=0x%04x\n",
-+ phy_id, loc, val);
-+ mutex_lock(&dev->phy_mutex);
-+ asix_set_sw_mii(dev);
-+ asix_write_cmd(dev, AX_CMD_WRITE_MII_REG, phy_id, (__u16)loc, 2, &res);
-+ asix_set_hw_mii(dev);
-+ mutex_unlock(&dev->phy_mutex);
-+}
-+
-+void asix_get_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+ u8 opt;
-+
-+ if (asix_read_cmd(dev, AX_CMD_READ_MONITOR_MODE, 0, 0, 1, &opt) < 0) {
-+ wolinfo->supported = 0;
-+ wolinfo->wolopts = 0;
-+ return;
-+ }
-+ wolinfo->supported = WAKE_PHY | WAKE_MAGIC;
-+ wolinfo->wolopts = 0;
-+ if (opt & AX_MONITOR_LINK)
-+ wolinfo->wolopts |= WAKE_PHY;
-+ if (opt & AX_MONITOR_MAGIC)
-+ wolinfo->wolopts |= WAKE_MAGIC;
-+}
-+
-+int asix_set_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+ u8 opt = 0;
-+
-+ if (wolinfo->wolopts & WAKE_PHY)
-+ opt |= AX_MONITOR_LINK;
-+ if (wolinfo->wolopts & WAKE_MAGIC)
-+ opt |= AX_MONITOR_MAGIC;
-+
-+ if (asix_write_cmd(dev, AX_CMD_WRITE_MONITOR_MODE,
-+ opt, 0, 0, NULL) < 0)
-+ return -EINVAL;
-+
-+ return 0;
-+}
-+
-+int asix_get_eeprom_len(struct net_device *net)
-+{
-+ return AX_EEPROM_LEN;
-+}
-+
-+int asix_get_eeprom(struct net_device *net, struct ethtool_eeprom *eeprom,
-+ u8 *data)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+ u16 *eeprom_buff;
-+ int first_word, last_word;
-+ int i;
-+
-+ if (eeprom->len == 0)
-+ return -EINVAL;
-+
-+ eeprom->magic = AX_EEPROM_MAGIC;
-+
-+ first_word = eeprom->offset >> 1;
-+ last_word = (eeprom->offset + eeprom->len - 1) >> 1;
-+
-+ eeprom_buff = kmalloc(sizeof(u16) * (last_word - first_word + 1),
-+ GFP_KERNEL);
-+ if (!eeprom_buff)
-+ return -ENOMEM;
-+
-+ /* ax8817x returns 2 bytes from eeprom on read */
-+ for (i = first_word; i <= last_word; i++) {
-+ if (asix_read_cmd(dev, AX_CMD_READ_EEPROM, i, 0, 2,
-+ &(eeprom_buff[i - first_word])) < 0) {
-+ kfree(eeprom_buff);
-+ return -EIO;
-+ }
-+ }
-+
-+ memcpy(data, (u8 *)eeprom_buff + (eeprom->offset & 1), eeprom->len);
-+ kfree(eeprom_buff);
-+ return 0;
-+}
-+
-+int asix_set_eeprom(struct net_device *net, struct ethtool_eeprom *eeprom,
-+ u8 *data)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+ u16 *eeprom_buff;
-+ int first_word, last_word;
-+ int i;
-+ int ret;
-+
-+ netdev_dbg(net, "write EEPROM len %d, offset %d, magic 0x%x\n",
-+ eeprom->len, eeprom->offset, eeprom->magic);
-+
-+ if (eeprom->len == 0)
-+ return -EINVAL;
-+
-+ if (eeprom->magic != AX_EEPROM_MAGIC)
-+ return -EINVAL;
-+
-+ first_word = eeprom->offset >> 1;
-+ last_word = (eeprom->offset + eeprom->len - 1) >> 1;
-+
-+ eeprom_buff = kmalloc(sizeof(u16) * (last_word - first_word + 1),
-+ GFP_KERNEL);
-+ if (!eeprom_buff)
-+ return -ENOMEM;
-+
-+ /* align data to 16 bit boundaries, read the missing data from
-+ the EEPROM */
-+ if (eeprom->offset & 1) {
-+ ret = asix_read_cmd(dev, AX_CMD_READ_EEPROM, first_word, 0, 2,
-+ &(eeprom_buff[0]));
-+ if (ret < 0) {
-+ netdev_err(net, "Failed to read EEPROM at offset 0x%02x.\n", first_word);
-+ goto free;
-+ }
-+ }
-+
-+ if ((eeprom->offset + eeprom->len) & 1) {
-+ ret = asix_read_cmd(dev, AX_CMD_READ_EEPROM, last_word, 0, 2,
-+ &(eeprom_buff[last_word - first_word]));
-+ if (ret < 0) {
-+ netdev_err(net, "Failed to read EEPROM at offset 0x%02x.\n", last_word);
-+ goto free;
-+ }
-+ }
-+
-+ memcpy((u8 *)eeprom_buff + (eeprom->offset & 1), data, eeprom->len);
-+
-+ /* write data to EEPROM */
-+ ret = asix_write_cmd(dev, AX_CMD_WRITE_ENABLE, 0x0000, 0, 0, NULL);
-+ if (ret < 0) {
-+ netdev_err(net, "Failed to enable EEPROM write\n");
-+ goto free;
-+ }
-+ msleep(20);
-+
-+ for (i = first_word; i <= last_word; i++) {
-+ netdev_dbg(net, "write to EEPROM at offset 0x%02x, data 0x%04x\n",
-+ i, eeprom_buff[i - first_word]);
-+ ret = asix_write_cmd(dev, AX_CMD_WRITE_EEPROM, i,
-+ eeprom_buff[i - first_word], 0, NULL);
-+ if (ret < 0) {
-+ netdev_err(net, "Failed to write EEPROM at offset 0x%02x.\n",
-+ i);
-+ goto free;
-+ }
-+ msleep(20);
-+ }
-+
-+ ret = asix_write_cmd(dev, AX_CMD_WRITE_DISABLE, 0x0000, 0, 0, NULL);
-+ if (ret < 0) {
-+ netdev_err(net, "Failed to disable EEPROM write\n");
-+ goto free;
-+ }
-+
-+ ret = 0;
-+free:
-+ kfree(eeprom_buff);
-+ return ret;
-+}
-+
-+void asix_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *info)
-+{
-+ /* Inherit standard device info */
-+ usbnet_get_drvinfo(net, info);
-+ strlcpy(info->driver, DRIVER_NAME, sizeof(info->driver));
-+ strlcpy(info->version, DRIVER_VERSION, sizeof(info->version));
-+ info->eedump_len = AX_EEPROM_LEN;
-+}
-+
-+int asix_set_mac_address(struct net_device *net, void *p)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+ struct asix_data *data = (struct asix_data *)&dev->data;
-+ struct sockaddr *addr = p;
-+
-+ if (netif_running(net))
-+ return -EBUSY;
-+ if (!is_valid_ether_addr(addr->sa_data))
-+ return -EADDRNOTAVAIL;
-+
-+ memcpy(net->dev_addr, addr->sa_data, ETH_ALEN);
-+
-+ /* We use the 20 byte dev->data
-+ * for our 6 byte mac buffer
-+ * to avoid allocating memory that
-+ * is tricky to free later */
-+ memcpy(data->mac_addr, addr->sa_data, ETH_ALEN);
-+ asix_write_cmd_async(dev, AX_CMD_WRITE_NODE_ID, 0, 0, ETH_ALEN,
-+ data->mac_addr);
-+
-+ return 0;
-+}
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/asix_devices.c backports-3.18.1-1/drivers/net/usb/asix_devices.c
---- backports-3.18.1-1.org/drivers/net/usb/asix_devices.c 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/asix_devices.c 2014-12-16 18:39:45.000000000 +0100
-@@ -0,0 +1,1104 @@
-+/*
-+ * ASIX AX8817X based USB 2.0 Ethernet Devices
-+ * Copyright (C) 2003-2006 David Hollis <dhollis(a)davehollis.com>
-+ * Copyright (C) 2005 Phil Chang <pchang23(a)sbcglobal.net>
-+ * Copyright (C) 2006 James Painter <jamie.painter(a)iname.com>
-+ * Copyright (c) 2002-2003 TiVo Inc.
-+ *
-+ * 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, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include "asix.h"
-+
-+#define PHY_MODE_MARVELL 0x0000
-+#define MII_MARVELL_LED_CTRL 0x0018
-+#define MII_MARVELL_STATUS 0x001b
-+#define MII_MARVELL_CTRL 0x0014
-+
-+#define MARVELL_LED_MANUAL 0x0019
-+
-+#define MARVELL_STATUS_HWCFG 0x0004
-+
-+#define MARVELL_CTRL_TXDELAY 0x0002
-+#define MARVELL_CTRL_RXDELAY 0x0080
-+
-+#define PHY_MODE_RTL8211CL 0x000C
-+
-+struct ax88172_int_data {
-+ __le16 res1;
-+ u8 link;
-+ __le16 res2;
-+ u8 status;
-+ __le16 res3;
-+} __packed;
-+
-+static void asix_status(struct usbnet *dev, struct urb *urb)
-+{
-+ struct ax88172_int_data *event;
-+ int link;
-+
-+ if (urb->actual_length < 8)
-+ return;
-+
-+ event = urb->transfer_buffer;
-+ link = event->link & 0x01;
-+ if (netif_carrier_ok(dev->net) != link) {
-+ usbnet_link_change(dev, link, 1);
-+ netdev_dbg(dev->net, "Link Status is: %d\n", link);
-+ }
-+}
-+
-+static void asix_set_netdev_dev_addr(struct usbnet *dev, u8 *addr)
-+{
-+ if (is_valid_ether_addr(addr)) {
-+ memcpy(dev->net->dev_addr, addr, ETH_ALEN);
-+ } else {
-+ netdev_info(dev->net, "invalid hw address, using random\n");
-+ eth_hw_addr_random(dev->net);
-+ }
-+}
-+
-+/* Get the PHY Identifier from the PHYSID1 & PHYSID2 MII registers */
-+static u32 asix_get_phyid(struct usbnet *dev)
-+{
-+ int phy_reg;
-+ u32 phy_id;
-+ int i;
-+
-+ /* Poll for the rare case the FW or phy isn't ready yet. */
-+ for (i = 0; i < 100; i++) {
-+ phy_reg = asix_mdio_read(dev->net, dev->mii.phy_id, MII_PHYSID1);
-+ if (phy_reg != 0 && phy_reg != 0xFFFF)
-+ break;
-+ mdelay(1);
-+ }
-+
-+ if (phy_reg <= 0 || phy_reg == 0xFFFF)
-+ return 0;
-+
-+ phy_id = (phy_reg & 0xffff) << 16;
-+
-+ phy_reg = asix_mdio_read(dev->net, dev->mii.phy_id, MII_PHYSID2);
-+ if (phy_reg < 0)
-+ return 0;
-+
-+ phy_id |= (phy_reg & 0xffff);
-+
-+ return phy_id;
-+}
-+
-+static u32 asix_get_link(struct net_device *net)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+
-+ return mii_link_ok(&dev->mii);
-+}
-+
-+static int asix_ioctl (struct net_device *net, struct ifreq *rq, int cmd)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+
-+ return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
-+}
-+
-+/* We need to override some ethtool_ops so we require our
-+ own structure so we don't interfere with other usbnet
-+ devices that may be connected at the same time. */
-+static const struct ethtool_ops ax88172_ethtool_ops = {
-+ .get_drvinfo = asix_get_drvinfo,
-+ .get_link = asix_get_link,
-+ .get_msglevel = usbnet_get_msglevel,
-+ .set_msglevel = usbnet_set_msglevel,
-+ .get_wol = asix_get_wol,
-+ .set_wol = asix_set_wol,
-+ .get_eeprom_len = asix_get_eeprom_len,
-+ .get_eeprom = asix_get_eeprom,
-+ .set_eeprom = asix_set_eeprom,
-+ .get_settings = usbnet_get_settings,
-+ .set_settings = usbnet_set_settings,
-+ .nway_reset = usbnet_nway_reset,
-+};
-+
-+static void ax88172_set_multicast(struct net_device *net)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+ struct asix_data *data = (struct asix_data *)&dev->data;
-+ u8 rx_ctl = 0x8c;
-+
-+ if (net->flags & IFF_PROMISC) {
-+ rx_ctl |= 0x01;
-+ } else if (net->flags & IFF_ALLMULTI ||
-+ netdev_mc_count(net) > AX_MAX_MCAST) {
-+ rx_ctl |= 0x02;
-+ } else if (netdev_mc_empty(net)) {
-+ /* just broadcast and directed */
-+ } else {
-+ /* We use the 20 byte dev->data
-+ * for our 8 byte filter buffer
-+ * to avoid allocating memory that
-+ * is tricky to free later */
-+ struct netdev_hw_addr *ha;
-+ u32 crc_bits;
-+
-+ memset(data->multi_filter, 0, AX_MCAST_FILTER_SIZE);
-+
-+ /* Build the multicast hash filter. */
-+ netdev_for_each_mc_addr(ha, net) {
-+ crc_bits = ether_crc(ETH_ALEN, ha->addr) >> 26;
-+ data->multi_filter[crc_bits >> 3] |=
-+ 1 << (crc_bits & 7);
-+ }
-+
-+ asix_write_cmd_async(dev, AX_CMD_WRITE_MULTI_FILTER, 0, 0,
-+ AX_MCAST_FILTER_SIZE, data->multi_filter);
-+
-+ rx_ctl |= 0x10;
-+ }
-+
-+ asix_write_cmd_async(dev, AX_CMD_WRITE_RX_CTL, rx_ctl, 0, 0, NULL);
-+}
-+
-+static int ax88172_link_reset(struct usbnet *dev)
-+{
-+ u8 mode;
-+ struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET };
-+
-+ mii_check_media(&dev->mii, 1, 1);
-+ mii_ethtool_gset(&dev->mii, &ecmd);
-+ mode = AX88172_MEDIUM_DEFAULT;
-+
-+ if (ecmd.duplex != DUPLEX_FULL)
-+ mode |= ~AX88172_MEDIUM_FD;
-+
-+ netdev_dbg(dev->net, "ax88172_link_reset() speed: %u duplex: %d setting mode to 0x%04x\n",
-+ ethtool_cmd_speed(&ecmd), ecmd.duplex, mode);
-+
-+ asix_write_medium_mode(dev, mode);
-+
-+ return 0;
-+}
-+
-+static const struct net_device_ops ax88172_netdev_ops = {
-+ .ndo_open = usbnet_open,
-+ .ndo_stop = usbnet_stop,
-+ .ndo_start_xmit = usbnet_start_xmit,
-+ .ndo_tx_timeout = usbnet_tx_timeout,
-+ .ndo_change_mtu = usbnet_change_mtu,
-+ .ndo_set_mac_address = eth_mac_addr,
-+ .ndo_validate_addr = eth_validate_addr,
-+ .ndo_do_ioctl = asix_ioctl,
-+ .ndo_set_rx_mode = ax88172_set_multicast,
-+};
-+
-+static int ax88172_bind(struct usbnet *dev, struct usb_interface *intf)
-+{
-+ int ret = 0;
-+ u8 buf[ETH_ALEN];
-+ int i;
-+ unsigned long gpio_bits = dev->driver_info->data;
-+
-+ usbnet_get_endpoints(dev,intf);
-+
-+ /* Toggle the GPIOs in a manufacturer/model specific way */
-+ for (i = 2; i >= 0; i--) {
-+ ret = asix_write_cmd(dev, AX_CMD_WRITE_GPIOS,
-+ (gpio_bits >> (i * 8)) & 0xff, 0, 0, NULL);
-+ if (ret < 0)
-+ goto out;
-+ msleep(5);
-+ }
-+
-+ ret = asix_write_rx_ctl(dev, 0x80);
-+ if (ret < 0)
-+ goto out;
-+
-+ /* Get the MAC address */
-+ ret = asix_read_cmd(dev, AX88172_CMD_READ_NODE_ID, 0, 0, ETH_ALEN, buf);
-+ if (ret < 0) {
-+ netdev_dbg(dev->net, "read AX_CMD_READ_NODE_ID failed: %d\n",
-+ ret);
-+ goto out;
-+ }
-+
-+ asix_set_netdev_dev_addr(dev, buf);
-+
-+ /* Initialize MII structure */
-+ dev->mii.dev = dev->net;
-+ dev->mii.mdio_read = asix_mdio_read;
-+ dev->mii.mdio_write = asix_mdio_write;
-+ dev->mii.phy_id_mask = 0x3f;
-+ dev->mii.reg_num_mask = 0x1f;
-+ dev->mii.phy_id = asix_get_phy_addr(dev);
-+
-+ dev->net->netdev_ops = &ax88172_netdev_ops;
-+ dev->net->ethtool_ops = &ax88172_ethtool_ops;
-+ dev->net->needed_headroom = 4; /* cf asix_tx_fixup() */
-+ dev->net->needed_tailroom = 4; /* cf asix_tx_fixup() */
-+
-+ asix_mdio_write(dev->net, dev->mii.phy_id, MII_BMCR, BMCR_RESET);
-+ asix_mdio_write(dev->net, dev->mii.phy_id, MII_ADVERTISE,
-+ ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP);
-+ mii_nway_restart(&dev->mii);
-+
-+ return 0;
-+
-+out:
-+ return ret;
-+}
-+
-+static const struct ethtool_ops ax88772_ethtool_ops = {
-+ .get_drvinfo = asix_get_drvinfo,
-+ .get_link = asix_get_link,
-+ .get_msglevel = usbnet_get_msglevel,
-+ .set_msglevel = usbnet_set_msglevel,
-+ .get_wol = asix_get_wol,
-+ .set_wol = asix_set_wol,
-+ .get_eeprom_len = asix_get_eeprom_len,
-+ .get_eeprom = asix_get_eeprom,
-+ .set_eeprom = asix_set_eeprom,
-+ .get_settings = usbnet_get_settings,
-+ .set_settings = usbnet_set_settings,
-+ .nway_reset = usbnet_nway_reset,
-+};
-+
-+static int ax88772_link_reset(struct usbnet *dev)
-+{
-+ u16 mode;
-+ struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET };
-+
-+ mii_check_media(&dev->mii, 1, 1);
-+ mii_ethtool_gset(&dev->mii, &ecmd);
-+ mode = AX88772_MEDIUM_DEFAULT;
-+
-+ if (ethtool_cmd_speed(&ecmd) != SPEED_100)
-+ mode &= ~AX_MEDIUM_PS;
-+
-+ if (ecmd.duplex != DUPLEX_FULL)
-+ mode &= ~AX_MEDIUM_FD;
-+
-+ netdev_dbg(dev->net, "ax88772_link_reset() speed: %u duplex: %d setting mode to 0x%04x\n",
-+ ethtool_cmd_speed(&ecmd), ecmd.duplex, mode);
-+
-+ asix_write_medium_mode(dev, mode);
-+
-+ return 0;
-+}
-+
-+static int ax88772_reset(struct usbnet *dev)
-+{
-+ struct asix_data *data = (struct asix_data *)&dev->data;
-+ int ret, embd_phy;
-+ u16 rx_ctl;
-+
-+ ret = asix_write_gpio(dev,
-+ AX_GPIO_RSE | AX_GPIO_GPO_2 | AX_GPIO_GPO2EN, 5);
-+ if (ret < 0)
-+ goto out;
-+
-+ embd_phy = ((asix_get_phy_addr(dev) & 0x1f) == 0x10 ? 1 : 0);
-+
-+ ret = asix_write_cmd(dev, AX_CMD_SW_PHY_SELECT, embd_phy, 0, 0, NULL);
-+ if (ret < 0) {
-+ netdev_dbg(dev->net, "Select PHY #1 failed: %d\n", ret);
-+ goto out;
-+ }
-+
-+ ret = asix_sw_reset(dev, AX_SWRESET_IPPD | AX_SWRESET_PRL);
-+ if (ret < 0)
-+ goto out;
-+
-+ msleep(150);
-+
-+ ret = asix_sw_reset(dev, AX_SWRESET_CLEAR);
-+ if (ret < 0)
-+ goto out;
-+
-+ msleep(150);
-+
-+ if (embd_phy) {
-+ ret = asix_sw_reset(dev, AX_SWRESET_IPRL);
-+ if (ret < 0)
-+ goto out;
-+ } else {
-+ ret = asix_sw_reset(dev, AX_SWRESET_PRTE);
-+ if (ret < 0)
-+ goto out;
-+ }
-+
-+ msleep(150);
-+ rx_ctl = asix_read_rx_ctl(dev);
-+ netdev_dbg(dev->net, "RX_CTL is 0x%04x after software reset\n", rx_ctl);
-+ ret = asix_write_rx_ctl(dev, 0x0000);
-+ if (ret < 0)
-+ goto out;
-+
-+ rx_ctl = asix_read_rx_ctl(dev);
-+ netdev_dbg(dev->net, "RX_CTL is 0x%04x setting to 0x0000\n", rx_ctl);
-+
-+ ret = asix_sw_reset(dev, AX_SWRESET_PRL);
-+ if (ret < 0)
-+ goto out;
-+
-+ msleep(150);
-+
-+ ret = asix_sw_reset(dev, AX_SWRESET_IPRL | AX_SWRESET_PRL);
-+ if (ret < 0)
-+ goto out;
-+
-+ msleep(150);
-+
-+ asix_mdio_write(dev->net, dev->mii.phy_id, MII_BMCR, BMCR_RESET);
-+ asix_mdio_write(dev->net, dev->mii.phy_id, MII_ADVERTISE,
-+ ADVERTISE_ALL | ADVERTISE_CSMA);
-+ mii_nway_restart(&dev->mii);
-+
-+ ret = asix_write_medium_mode(dev, AX88772_MEDIUM_DEFAULT);
-+ if (ret < 0)
-+ goto out;
-+
-+ ret = asix_write_cmd(dev, AX_CMD_WRITE_IPG0,
-+ AX88772_IPG0_DEFAULT | AX88772_IPG1_DEFAULT,
-+ AX88772_IPG2_DEFAULT, 0, NULL);
-+ if (ret < 0) {
-+ netdev_dbg(dev->net, "Write IPG,IPG1,IPG2 failed: %d\n", ret);
-+ goto out;
-+ }
-+
-+ /* Rewrite MAC address */
-+ memcpy(data->mac_addr, dev->net->dev_addr, ETH_ALEN);
-+ ret = asix_write_cmd(dev, AX_CMD_WRITE_NODE_ID, 0, 0, ETH_ALEN,
-+ data->mac_addr);
-+ if (ret < 0)
-+ goto out;
-+
-+ /* Set RX_CTL to default values with 2k buffer, and enable cactus */
-+ ret = asix_write_rx_ctl(dev, AX_DEFAULT_RX_CTL);
-+ if (ret < 0)
-+ goto out;
-+
-+ rx_ctl = asix_read_rx_ctl(dev);
-+ netdev_dbg(dev->net, "RX_CTL is 0x%04x after all initializations\n",
-+ rx_ctl);
-+
-+ rx_ctl = asix_read_medium_status(dev);
-+ netdev_dbg(dev->net,
-+ "Medium Status is 0x%04x after all initializations\n",
-+ rx_ctl);
-+
-+ return 0;
-+
-+out:
-+ return ret;
-+
-+}
-+
-+static const struct net_device_ops ax88772_netdev_ops = {
-+ .ndo_open = usbnet_open,
-+ .ndo_stop = usbnet_stop,
-+ .ndo_start_xmit = usbnet_start_xmit,
-+ .ndo_tx_timeout = usbnet_tx_timeout,
-+ .ndo_change_mtu = usbnet_change_mtu,
-+ .ndo_set_mac_address = asix_set_mac_address,
-+ .ndo_validate_addr = eth_validate_addr,
-+ .ndo_do_ioctl = asix_ioctl,
-+ .ndo_set_rx_mode = asix_set_multicast,
-+};
-+
-+static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf)
-+{
-+ int ret, embd_phy, i;
-+ u8 buf[ETH_ALEN];
-+ u32 phyid;
-+
-+ usbnet_get_endpoints(dev,intf);
-+
-+ /* Get the MAC address */
-+ if (dev->driver_info->data & FLAG_EEPROM_MAC) {
-+ for (i = 0; i < (ETH_ALEN >> 1); i++) {
-+ ret = asix_read_cmd(dev, AX_CMD_READ_EEPROM, 0x04 + i,
-+ 0, 2, buf + i * 2);
-+ if (ret < 0)
-+ break;
-+ }
-+ } else {
-+ ret = asix_read_cmd(dev, AX_CMD_READ_NODE_ID,
-+ 0, 0, ETH_ALEN, buf);
-+ }
-+
-+ if (ret < 0) {
-+ netdev_dbg(dev->net, "Failed to read MAC address: %d\n", ret);
-+ return ret;
-+ }
-+
-+ asix_set_netdev_dev_addr(dev, buf);
-+
-+ /* Initialize MII structure */
-+ dev->mii.dev = dev->net;
-+ dev->mii.mdio_read = asix_mdio_read;
-+ dev->mii.mdio_write = asix_mdio_write;
-+ dev->mii.phy_id_mask = 0x1f;
-+ dev->mii.reg_num_mask = 0x1f;
-+ dev->mii.phy_id = asix_get_phy_addr(dev);
-+
-+ dev->net->netdev_ops = &ax88772_netdev_ops;
-+ dev->net->ethtool_ops = &ax88772_ethtool_ops;
-+ dev->net->needed_headroom = 4; /* cf asix_tx_fixup() */
-+ dev->net->needed_tailroom = 4; /* cf asix_tx_fixup() */
-+
-+ embd_phy = ((dev->mii.phy_id & 0x1f) == 0x10 ? 1 : 0);
-+
-+ /* Reset the PHY to normal operation mode */
-+ ret = asix_write_cmd(dev, AX_CMD_SW_PHY_SELECT, embd_phy, 0, 0, NULL);
-+ if (ret < 0) {
-+ netdev_dbg(dev->net, "Select PHY #1 failed: %d\n", ret);
-+ return ret;
-+ }
-+
-+ ax88772_reset(dev);
-+
-+ /* Read PHYID register *AFTER* the PHY was reset properly */
-+ phyid = asix_get_phyid(dev);
-+ netdev_dbg(dev->net, "PHYID=0x%08x\n", phyid);
-+
-+ /* Asix framing packs multiple eth frames into a 2K usb bulk transfer */
-+ if (dev->driver_info->flags & FLAG_FRAMING_AX) {
-+ /* hard_mtu is still the default - the device does not support
-+ jumbo eth frames */
-+ dev->rx_urb_size = 2048;
-+ }
-+
-+ dev->driver_priv = kzalloc(sizeof(struct asix_common_private), GFP_KERNEL);
-+ if (!dev->driver_priv)
-+ return -ENOMEM;
-+
-+ return 0;
-+}
-+
-+static void ax88772_unbind(struct usbnet *dev, struct usb_interface *intf)
-+{
-+ if (dev->driver_priv)
-+ kfree(dev->driver_priv);
-+}
-+
-+static const struct ethtool_ops ax88178_ethtool_ops = {
-+ .get_drvinfo = asix_get_drvinfo,
-+ .get_link = asix_get_link,
-+ .get_msglevel = usbnet_get_msglevel,
-+ .set_msglevel = usbnet_set_msglevel,
-+ .get_wol = asix_get_wol,
-+ .set_wol = asix_set_wol,
-+ .get_eeprom_len = asix_get_eeprom_len,
-+ .get_eeprom = asix_get_eeprom,
-+ .set_eeprom = asix_set_eeprom,
-+ .get_settings = usbnet_get_settings,
-+ .set_settings = usbnet_set_settings,
-+ .nway_reset = usbnet_nway_reset,
-+};
-+
-+static int marvell_phy_init(struct usbnet *dev)
-+{
-+ struct asix_data *data = (struct asix_data *)&dev->data;
-+ u16 reg;
-+
-+ netdev_dbg(dev->net, "marvell_phy_init()\n");
-+
-+ reg = asix_mdio_read(dev->net, dev->mii.phy_id, MII_MARVELL_STATUS);
-+ netdev_dbg(dev->net, "MII_MARVELL_STATUS = 0x%04x\n", reg);
-+
-+ asix_mdio_write(dev->net, dev->mii.phy_id, MII_MARVELL_CTRL,
-+ MARVELL_CTRL_RXDELAY | MARVELL_CTRL_TXDELAY);
-+
-+ if (data->ledmode) {
-+ reg = asix_mdio_read(dev->net, dev->mii.phy_id,
-+ MII_MARVELL_LED_CTRL);
-+ netdev_dbg(dev->net, "MII_MARVELL_LED_CTRL (1) = 0x%04x\n", reg);
-+
-+ reg &= 0xf8ff;
-+ reg |= (1 + 0x0100);
-+ asix_mdio_write(dev->net, dev->mii.phy_id,
-+ MII_MARVELL_LED_CTRL, reg);
-+
-+ reg = asix_mdio_read(dev->net, dev->mii.phy_id,
-+ MII_MARVELL_LED_CTRL);
-+ netdev_dbg(dev->net, "MII_MARVELL_LED_CTRL (2) = 0x%04x\n", reg);
-+ reg &= 0xfc0f;
-+ }
-+
-+ return 0;
-+}
-+
-+static int rtl8211cl_phy_init(struct usbnet *dev)
-+{
-+ struct asix_data *data = (struct asix_data *)&dev->data;
-+
-+ netdev_dbg(dev->net, "rtl8211cl_phy_init()\n");
-+
-+ asix_mdio_write (dev->net, dev->mii.phy_id, 0x1f, 0x0005);
-+ asix_mdio_write (dev->net, dev->mii.phy_id, 0x0c, 0);
-+ asix_mdio_write (dev->net, dev->mii.phy_id, 0x01,
-+ asix_mdio_read (dev->net, dev->mii.phy_id, 0x01) | 0x0080);
-+ asix_mdio_write (dev->net, dev->mii.phy_id, 0x1f, 0);
-+
-+ if (data->ledmode == 12) {
-+ asix_mdio_write (dev->net, dev->mii.phy_id, 0x1f, 0x0002);
-+ asix_mdio_write (dev->net, dev->mii.phy_id, 0x1a, 0x00cb);
-+ asix_mdio_write (dev->net, dev->mii.phy_id, 0x1f, 0);
-+ }
-+
-+ return 0;
-+}
-+
-+static int marvell_led_status(struct usbnet *dev, u16 speed)
-+{
-+ u16 reg = asix_mdio_read(dev->net, dev->mii.phy_id, MARVELL_LED_MANUAL);
-+
-+ netdev_dbg(dev->net, "marvell_led_status() read 0x%04x\n", reg);
-+
-+ /* Clear out the center LED bits - 0x03F0 */
-+ reg &= 0xfc0f;
-+
-+ switch (speed) {
-+ case SPEED_1000:
-+ reg |= 0x03e0;
-+ break;
-+ case SPEED_100:
-+ reg |= 0x03b0;
-+ break;
-+ default:
-+ reg |= 0x02f0;
-+ }
-+
-+ netdev_dbg(dev->net, "marvell_led_status() writing 0x%04x\n", reg);
-+ asix_mdio_write(dev->net, dev->mii.phy_id, MARVELL_LED_MANUAL, reg);
-+
-+ return 0;
-+}
-+
-+static int ax88178_reset(struct usbnet *dev)
-+{
-+ struct asix_data *data = (struct asix_data *)&dev->data;
-+ int ret;
-+ __le16 eeprom;
-+ u8 status;
-+ int gpio0 = 0;
-+ u32 phyid;
-+
-+ asix_read_cmd(dev, AX_CMD_READ_GPIOS, 0, 0, 1, &status);
-+ netdev_dbg(dev->net, "GPIO Status: 0x%04x\n", status);
-+
-+ asix_write_cmd(dev, AX_CMD_WRITE_ENABLE, 0, 0, 0, NULL);
-+ asix_read_cmd(dev, AX_CMD_READ_EEPROM, 0x0017, 0, 2, &eeprom);
-+ asix_write_cmd(dev, AX_CMD_WRITE_DISABLE, 0, 0, 0, NULL);
-+
-+ netdev_dbg(dev->net, "EEPROM index 0x17 is 0x%04x\n", eeprom);
-+
-+ if (eeprom == cpu_to_le16(0xffff)) {
-+ data->phymode = PHY_MODE_MARVELL;
-+ data->ledmode = 0;
-+ gpio0 = 1;
-+ } else {
-+ data->phymode = le16_to_cpu(eeprom) & 0x7F;
-+ data->ledmode = le16_to_cpu(eeprom) >> 8;
-+ gpio0 = (le16_to_cpu(eeprom) & 0x80) ? 0 : 1;
-+ }
-+ netdev_dbg(dev->net, "GPIO0: %d, PhyMode: %d\n", gpio0, data->phymode);
-+
-+ /* Power up external GigaPHY through AX88178 GPIO pin */
-+ asix_write_gpio(dev, AX_GPIO_RSE | AX_GPIO_GPO_1 | AX_GPIO_GPO1EN, 40);
-+ if ((le16_to_cpu(eeprom) >> 8) != 1) {
-+ asix_write_gpio(dev, 0x003c, 30);
-+ asix_write_gpio(dev, 0x001c, 300);
-+ asix_write_gpio(dev, 0x003c, 30);
-+ } else {
-+ netdev_dbg(dev->net, "gpio phymode == 1 path\n");
-+ asix_write_gpio(dev, AX_GPIO_GPO1EN, 30);
-+ asix_write_gpio(dev, AX_GPIO_GPO1EN | AX_GPIO_GPO_1, 30);
-+ }
-+
-+ /* Read PHYID register *AFTER* powering up PHY */
-+ phyid = asix_get_phyid(dev);
-+ netdev_dbg(dev->net, "PHYID=0x%08x\n", phyid);
-+
-+ /* Set AX88178 to enable MII/GMII/RGMII interface for external PHY */
-+ asix_write_cmd(dev, AX_CMD_SW_PHY_SELECT, 0, 0, 0, NULL);
-+
-+ asix_sw_reset(dev, 0);
-+ msleep(150);
-+
-+ asix_sw_reset(dev, AX_SWRESET_PRL | AX_SWRESET_IPPD);
-+ msleep(150);
-+
-+ asix_write_rx_ctl(dev, 0);
-+
-+ if (data->phymode == PHY_MODE_MARVELL) {
-+ marvell_phy_init(dev);
-+ msleep(60);
-+ } else if (data->phymode == PHY_MODE_RTL8211CL)
-+ rtl8211cl_phy_init(dev);
-+
-+ asix_mdio_write(dev->net, dev->mii.phy_id, MII_BMCR,
-+ BMCR_RESET | BMCR_ANENABLE);
-+ asix_mdio_write(dev->net, dev->mii.phy_id, MII_ADVERTISE,
-+ ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP);
-+ asix_mdio_write(dev->net, dev->mii.phy_id, MII_CTRL1000,
-+ ADVERTISE_1000FULL);
-+
-+ mii_nway_restart(&dev->mii);
-+
-+ ret = asix_write_medium_mode(dev, AX88178_MEDIUM_DEFAULT);
-+ if (ret < 0)
-+ return ret;
-+
-+ /* Rewrite MAC address */
-+ memcpy(data->mac_addr, dev->net->dev_addr, ETH_ALEN);
-+ ret = asix_write_cmd(dev, AX_CMD_WRITE_NODE_ID, 0, 0, ETH_ALEN,
-+ data->mac_addr);
-+ if (ret < 0)
-+ return ret;
-+
-+ ret = asix_write_rx_ctl(dev, AX_DEFAULT_RX_CTL);
-+ if (ret < 0)
-+ return ret;
-+
-+ return 0;
-+}
-+
-+static int ax88178_link_reset(struct usbnet *dev)
-+{
-+ u16 mode;
-+ struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET };
-+ struct asix_data *data = (struct asix_data *)&dev->data;
-+ u32 speed;
-+
-+ netdev_dbg(dev->net, "ax88178_link_reset()\n");
-+
-+ mii_check_media(&dev->mii, 1, 1);
-+ mii_ethtool_gset(&dev->mii, &ecmd);
-+ mode = AX88178_MEDIUM_DEFAULT;
-+ speed = ethtool_cmd_speed(&ecmd);
-+
-+ if (speed == SPEED_1000)
-+ mode |= AX_MEDIUM_GM;
-+ else if (speed == SPEED_100)
-+ mode |= AX_MEDIUM_PS;
-+ else
-+ mode &= ~(AX_MEDIUM_PS | AX_MEDIUM_GM);
-+
-+ mode |= AX_MEDIUM_ENCK;
-+
-+ if (ecmd.duplex == DUPLEX_FULL)
-+ mode |= AX_MEDIUM_FD;
-+ else
-+ mode &= ~AX_MEDIUM_FD;
-+
-+ netdev_dbg(dev->net, "ax88178_link_reset() speed: %u duplex: %d setting mode to 0x%04x\n",
-+ speed, ecmd.duplex, mode);
-+
-+ asix_write_medium_mode(dev, mode);
-+
-+ if (data->phymode == PHY_MODE_MARVELL && data->ledmode)
-+ marvell_led_status(dev, speed);
-+
-+ return 0;
-+}
-+
-+static void ax88178_set_mfb(struct usbnet *dev)
-+{
-+ u16 mfb = AX_RX_CTL_MFB_16384;
-+ u16 rxctl;
-+ u16 medium;
-+ int old_rx_urb_size = dev->rx_urb_size;
-+
-+ if (dev->hard_mtu < 2048) {
-+ dev->rx_urb_size = 2048;
-+ mfb = AX_RX_CTL_MFB_2048;
-+ } else if (dev->hard_mtu < 4096) {
-+ dev->rx_urb_size = 4096;
-+ mfb = AX_RX_CTL_MFB_4096;
-+ } else if (dev->hard_mtu < 8192) {
-+ dev->rx_urb_size = 8192;
-+ mfb = AX_RX_CTL_MFB_8192;
-+ } else if (dev->hard_mtu < 16384) {
-+ dev->rx_urb_size = 16384;
-+ mfb = AX_RX_CTL_MFB_16384;
-+ }
-+
-+ rxctl = asix_read_rx_ctl(dev);
-+ asix_write_rx_ctl(dev, (rxctl & ~AX_RX_CTL_MFB_16384) | mfb);
-+
-+ medium = asix_read_medium_status(dev);
-+ if (dev->net->mtu > 1500)
-+ medium |= AX_MEDIUM_JFE;
-+ else
-+ medium &= ~AX_MEDIUM_JFE;
-+ asix_write_medium_mode(dev, medium);
-+
-+ if (dev->rx_urb_size > old_rx_urb_size)
-+ usbnet_unlink_rx_urbs(dev);
-+}
-+
-+static int ax88178_change_mtu(struct net_device *net, int new_mtu)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+ int ll_mtu = new_mtu + net->hard_header_len + 4;
-+
-+ netdev_dbg(dev->net, "ax88178_change_mtu() new_mtu=%d\n", new_mtu);
-+
-+ if (new_mtu <= 0 || ll_mtu > 16384)
-+ return -EINVAL;
-+
-+ if ((ll_mtu % dev->maxpacket) == 0)
-+ return -EDOM;
-+
-+ net->mtu = new_mtu;
-+ dev->hard_mtu = net->mtu + net->hard_header_len;
-+ ax88178_set_mfb(dev);
-+
-+ /* max qlen depend on hard_mtu and rx_urb_size */
-+ usbnet_update_max_qlen(dev);
-+
-+ return 0;
-+}
-+
-+static const struct net_device_ops ax88178_netdev_ops = {
-+ .ndo_open = usbnet_open,
-+ .ndo_stop = usbnet_stop,
-+ .ndo_start_xmit = usbnet_start_xmit,
-+ .ndo_tx_timeout = usbnet_tx_timeout,
-+ .ndo_set_mac_address = asix_set_mac_address,
-+ .ndo_validate_addr = eth_validate_addr,
-+ .ndo_set_rx_mode = asix_set_multicast,
-+ .ndo_do_ioctl = asix_ioctl,
-+ .ndo_change_mtu = ax88178_change_mtu,
-+};
-+
-+static int ax88178_bind(struct usbnet *dev, struct usb_interface *intf)
-+{
-+ int ret;
-+ u8 buf[ETH_ALEN];
-+
-+ usbnet_get_endpoints(dev,intf);
-+
-+ /* Get the MAC address */
-+ ret = asix_read_cmd(dev, AX_CMD_READ_NODE_ID, 0, 0, ETH_ALEN, buf);
-+ if (ret < 0) {
-+ netdev_dbg(dev->net, "Failed to read MAC address: %d\n", ret);
-+ return ret;
-+ }
-+
-+ asix_set_netdev_dev_addr(dev, buf);
-+
-+ /* Initialize MII structure */
-+ dev->mii.dev = dev->net;
-+ dev->mii.mdio_read = asix_mdio_read;
-+ dev->mii.mdio_write = asix_mdio_write;
-+ dev->mii.phy_id_mask = 0x1f;
-+ dev->mii.reg_num_mask = 0xff;
-+ dev->mii.supports_gmii = 1;
-+ dev->mii.phy_id = asix_get_phy_addr(dev);
-+
-+ dev->net->netdev_ops = &ax88178_netdev_ops;
-+ dev->net->ethtool_ops = &ax88178_ethtool_ops;
-+
-+ /* Blink LEDS so users know driver saw dongle */
-+ asix_sw_reset(dev, 0);
-+ msleep(150);
-+
-+ asix_sw_reset(dev, AX_SWRESET_PRL | AX_SWRESET_IPPD);
-+ msleep(150);
-+
-+ /* Asix framing packs multiple eth frames into a 2K usb bulk transfer */
-+ if (dev->driver_info->flags & FLAG_FRAMING_AX) {
-+ /* hard_mtu is still the default - the device does not support
-+ jumbo eth frames */
-+ dev->rx_urb_size = 2048;
-+ }
-+
-+ dev->driver_priv = kzalloc(sizeof(struct asix_common_private), GFP_KERNEL);
-+ if (!dev->driver_priv)
-+ return -ENOMEM;
-+
-+ return 0;
-+}
-+
-+static const struct driver_info ax8817x_info = {
-+ .description = "ASIX AX8817x USB 2.0 Ethernet",
-+ .bind = ax88172_bind,
-+ .status = asix_status,
-+ .link_reset = ax88172_link_reset,
-+ .reset = ax88172_link_reset,
-+ .flags = FLAG_ETHER | FLAG_LINK_INTR,
-+ .data = 0x00130103,
-+};
-+
-+static const struct driver_info dlink_dub_e100_info = {
-+ .description = "DLink DUB-E100 USB Ethernet",
-+ .bind = ax88172_bind,
-+ .status = asix_status,
-+ .link_reset = ax88172_link_reset,
-+ .reset = ax88172_link_reset,
-+ .flags = FLAG_ETHER | FLAG_LINK_INTR,
-+ .data = 0x009f9d9f,
-+};
-+
-+static const struct driver_info netgear_fa120_info = {
-+ .description = "Netgear FA-120 USB Ethernet",
-+ .bind = ax88172_bind,
-+ .status = asix_status,
-+ .link_reset = ax88172_link_reset,
-+ .reset = ax88172_link_reset,
-+ .flags = FLAG_ETHER | FLAG_LINK_INTR,
-+ .data = 0x00130103,
-+};
-+
-+static const struct driver_info hawking_uf200_info = {
-+ .description = "Hawking UF200 USB Ethernet",
-+ .bind = ax88172_bind,
-+ .status = asix_status,
-+ .link_reset = ax88172_link_reset,
-+ .reset = ax88172_link_reset,
-+ .flags = FLAG_ETHER | FLAG_LINK_INTR,
-+ .data = 0x001f1d1f,
-+};
-+
-+static const struct driver_info ax88772_info = {
-+ .description = "ASIX AX88772 USB 2.0 Ethernet",
-+ .bind = ax88772_bind,
-+ .unbind = ax88772_unbind,
-+ .status = asix_status,
-+ .link_reset = ax88772_link_reset,
-+ .reset = ax88772_link_reset,
-+ .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_LINK_INTR | FLAG_MULTI_PACKET,
-+ .rx_fixup = asix_rx_fixup_common,
-+ .tx_fixup = asix_tx_fixup,
-+};
-+
-+static const struct driver_info ax88772b_info = {
-+ .description = "ASIX AX88772B USB 2.0 Ethernet",
-+ .bind = ax88772_bind,
-+ .unbind = ax88772_unbind,
-+ .status = asix_status,
-+ .link_reset = ax88772_link_reset,
-+ .reset = ax88772_reset,
-+ .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_LINK_INTR |
-+ FLAG_MULTI_PACKET,
-+ .rx_fixup = asix_rx_fixup_common,
-+ .tx_fixup = asix_tx_fixup,
-+ .data = FLAG_EEPROM_MAC,
-+};
-+
-+static const struct driver_info ax88178_info = {
-+ .description = "ASIX AX88178 USB 2.0 Ethernet",
-+ .bind = ax88178_bind,
-+ .unbind = ax88772_unbind,
-+ .status = asix_status,
-+ .link_reset = ax88178_link_reset,
-+ .reset = ax88178_reset,
-+ .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_LINK_INTR |
-+ FLAG_MULTI_PACKET,
-+ .rx_fixup = asix_rx_fixup_common,
-+ .tx_fixup = asix_tx_fixup,
-+};
-+
-+/*
-+ * USBLINK 20F9 "USB 2.0 LAN" USB ethernet adapter, typically found in
-+ * no-name packaging.
-+ * USB device strings are:
-+ * 1: Manufacturer: USBLINK
-+ * 2: Product: HG20F9 USB2.0
-+ * 3: Serial: 000003
-+ * Appears to be compatible with Asix 88772B.
-+ */
-+static const struct driver_info hg20f9_info = {
-+ .description = "HG20F9 USB 2.0 Ethernet",
-+ .bind = ax88772_bind,
-+ .unbind = ax88772_unbind,
-+ .status = asix_status,
-+ .link_reset = ax88772_link_reset,
-+ .reset = ax88772_reset,
-+ .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_LINK_INTR |
-+ FLAG_MULTI_PACKET,
-+ .rx_fixup = asix_rx_fixup_common,
-+ .tx_fixup = asix_tx_fixup,
-+ .data = FLAG_EEPROM_MAC,
-+};
-+
-+static const struct usb_device_id products [] = {
-+{
-+ // Linksys USB200M
-+ USB_DEVICE (0x077b, 0x2226),
-+ .driver_info = (unsigned long) &ax8817x_info,
-+}, {
-+ // Netgear FA120
-+ USB_DEVICE (0x0846, 0x1040),
-+ .driver_info = (unsigned long) &netgear_fa120_info,
-+}, {
-+ // DLink DUB-E100
-+ USB_DEVICE (0x2001, 0x1a00),
-+ .driver_info = (unsigned long) &dlink_dub_e100_info,
-+}, {
-+ // Intellinet, ST Lab USB Ethernet
-+ USB_DEVICE (0x0b95, 0x1720),
-+ .driver_info = (unsigned long) &ax8817x_info,
-+}, {
-+ // Hawking UF200, TrendNet TU2-ET100
-+ USB_DEVICE (0x07b8, 0x420a),
-+ .driver_info = (unsigned long) &hawking_uf200_info,
-+}, {
-+ // Billionton Systems, USB2AR
-+ USB_DEVICE (0x08dd, 0x90ff),
-+ .driver_info = (unsigned long) &ax8817x_info,
-+}, {
-+ // ATEN UC210T
-+ USB_DEVICE (0x0557, 0x2009),
-+ .driver_info = (unsigned long) &ax8817x_info,
-+}, {
-+ // Buffalo LUA-U2-KTX
-+ USB_DEVICE (0x0411, 0x003d),
-+ .driver_info = (unsigned long) &ax8817x_info,
-+}, {
-+ // Buffalo LUA-U2-GT 10/100/1000
-+ USB_DEVICE (0x0411, 0x006e),
-+ .driver_info = (unsigned long) &ax88178_info,
-+}, {
-+ // Sitecom LN-029 "USB 2.0 10/100 Ethernet adapter"
-+ USB_DEVICE (0x6189, 0x182d),
-+ .driver_info = (unsigned long) &ax8817x_info,
-+}, {
-+ // Sitecom LN-031 "USB 2.0 10/100/1000 Ethernet adapter"
-+ USB_DEVICE (0x0df6, 0x0056),
-+ .driver_info = (unsigned long) &ax88178_info,
-+}, {
-+ // corega FEther USB2-TX
-+ USB_DEVICE (0x07aa, 0x0017),
-+ .driver_info = (unsigned long) &ax8817x_info,
-+}, {
-+ // Surecom EP-1427X-2
-+ USB_DEVICE (0x1189, 0x0893),
-+ .driver_info = (unsigned long) &ax8817x_info,
-+}, {
-+ // goodway corp usb gwusb2e
-+ USB_DEVICE (0x1631, 0x6200),
-+ .driver_info = (unsigned long) &ax8817x_info,
-+}, {
-+ // JVC MP-PRX1 Port Replicator
-+ USB_DEVICE (0x04f1, 0x3008),
-+ .driver_info = (unsigned long) &ax8817x_info,
-+}, {
-+ // Lenovo U2L100P 10/100
-+ USB_DEVICE (0x17ef, 0x7203),
-+ .driver_info = (unsigned long) &ax88772_info,
-+}, {
-+ // ASIX AX88772B 10/100
-+ USB_DEVICE (0x0b95, 0x772b),
-+ .driver_info = (unsigned long) &ax88772b_info,
-+}, {
-+ // ASIX AX88772 10/100
-+ USB_DEVICE (0x0b95, 0x7720),
-+ .driver_info = (unsigned long) &ax88772_info,
-+}, {
-+ // ASIX AX88178 10/100/1000
-+ USB_DEVICE (0x0b95, 0x1780),
-+ .driver_info = (unsigned long) &ax88178_info,
-+}, {
-+ // Logitec LAN-GTJ/U2A
-+ USB_DEVICE (0x0789, 0x0160),
-+ .driver_info = (unsigned long) &ax88178_info,
-+}, {
-+ // Linksys USB200M Rev 2
-+ USB_DEVICE (0x13b1, 0x0018),
-+ .driver_info = (unsigned long) &ax88772_info,
-+}, {
-+ // 0Q0 cable ethernet
-+ USB_DEVICE (0x1557, 0x7720),
-+ .driver_info = (unsigned long) &ax88772_info,
-+}, {
-+ // DLink DUB-E100 H/W Ver B1
-+ USB_DEVICE (0x07d1, 0x3c05),
-+ .driver_info = (unsigned long) &ax88772_info,
-+}, {
-+ // DLink DUB-E100 H/W Ver B1 Alternate
-+ USB_DEVICE (0x2001, 0x3c05),
-+ .driver_info = (unsigned long) &ax88772_info,
-+}, {
-+ // DLink DUB-E100 H/W Ver C1
-+ USB_DEVICE (0x2001, 0x1a02),
-+ .driver_info = (unsigned long) &ax88772_info,
-+}, {
-+ // Linksys USB1000
-+ USB_DEVICE (0x1737, 0x0039),
-+ .driver_info = (unsigned long) &ax88178_info,
-+}, {
-+ // IO-DATA ETG-US2
-+ USB_DEVICE (0x04bb, 0x0930),
-+ .driver_info = (unsigned long) &ax88178_info,
-+}, {
-+ // Belkin F5D5055
-+ USB_DEVICE(0x050d, 0x5055),
-+ .driver_info = (unsigned long) &ax88178_info,
-+}, {
-+ // Apple USB Ethernet Adapter
-+ USB_DEVICE(0x05ac, 0x1402),
-+ .driver_info = (unsigned long) &ax88772_info,
-+}, {
-+ // Cables-to-Go USB Ethernet Adapter
-+ USB_DEVICE(0x0b95, 0x772a),
-+ .driver_info = (unsigned long) &ax88772_info,
-+}, {
-+ // ABOCOM for pci
-+ USB_DEVICE(0x14ea, 0xab11),
-+ .driver_info = (unsigned long) &ax88178_info,
-+}, {
-+ // ASIX 88772a
-+ USB_DEVICE(0x0db0, 0xa877),
-+ .driver_info = (unsigned long) &ax88772_info,
-+}, {
-+ // Asus USB Ethernet Adapter
-+ USB_DEVICE (0x0b95, 0x7e2b),
-+ .driver_info = (unsigned long) &ax88772_info,
-+}, {
-+ /* ASIX 88172a demo board */
-+ USB_DEVICE(0x0b95, 0x172a),
-+ .driver_info = (unsigned long) &ax88172a_info,
-+}, {
-+ /*
-+ * USBLINK HG20F9 "USB 2.0 LAN"
-+ * Appears to have gazumped Linksys's manufacturer ID but
-+ * doesn't (yet) conflict with any known Linksys product.
-+ */
-+ USB_DEVICE(0x066b, 0x20f9),
-+ .driver_info = (unsigned long) &hg20f9_info,
-+},
-+ { }, // END
-+};
-+MODULE_DEVICE_TABLE(usb, products);
-+
-+static struct usb_driver asix_driver = {
-+ .name = DRIVER_NAME,
-+ .id_table = products,
-+ .probe = usbnet_probe,
-+ .suspend = usbnet_suspend,
-+ .resume = usbnet_resume,
-+ .disconnect = usbnet_disconnect,
-+ .supports_autosuspend = 1,
-+ .disable_hub_initiated_lpm = 1,
-+};
-+
-+module_usb_driver(asix_driver);
-+
-+MODULE_AUTHOR("David Hollis");
-+MODULE_VERSION(DRIVER_VERSION);
-+MODULE_DESCRIPTION("ASIX AX8817X based USB 2.0 Ethernet Devices");
-+MODULE_LICENSE("GPL");
-+
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/asix.h backports-3.18.1-1/drivers/net/usb/asix.h
---- backports-3.18.1-1.org/drivers/net/usb/asix.h 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/asix.h 2014-12-16 18:39:45.000000000 +0100
-@@ -0,0 +1,234 @@
-+/*
-+ * ASIX AX8817X based USB 2.0 Ethernet Devices
-+ * Copyright (C) 2003-2006 David Hollis <dhollis(a)davehollis.com>
-+ * Copyright (C) 2005 Phil Chang <pchang23(a)sbcglobal.net>
-+ * Copyright (C) 2006 James Painter <jamie.painter(a)iname.com>
-+ * Copyright (c) 2002-2003 TiVo Inc.
-+ *
-+ * 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, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#ifndef _ASIX_H
-+#define _ASIX_H
-+
-+// #define DEBUG // error path messages, extra info
-+// #define VERBOSE // more; success messages
-+
-+#include <linux/module.h>
-+#include <linux/kmod.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/ethtool.h>
-+#include <linux/workqueue.h>
-+#include <linux/mii.h>
-+#include <linux/usb.h>
-+#include <linux/crc32.h>
-+#include <linux/usb/usbnet.h>
-+#include <linux/slab.h>
-+#include <linux/if_vlan.h>
-+
-+#define DRIVER_VERSION "22-Dec-2011"
-+#define DRIVER_NAME "asix"
-+
-+/* ASIX AX8817X based USB 2.0 Ethernet Devices */
-+
-+#define AX_CMD_SET_SW_MII 0x06
-+#define AX_CMD_READ_MII_REG 0x07
-+#define AX_CMD_WRITE_MII_REG 0x08
-+#define AX_CMD_SET_HW_MII 0x0a
-+#define AX_CMD_READ_EEPROM 0x0b
-+#define AX_CMD_WRITE_EEPROM 0x0c
-+#define AX_CMD_WRITE_ENABLE 0x0d
-+#define AX_CMD_WRITE_DISABLE 0x0e
-+#define AX_CMD_READ_RX_CTL 0x0f
-+#define AX_CMD_WRITE_RX_CTL 0x10
-+#define AX_CMD_READ_IPG012 0x11
-+#define AX_CMD_WRITE_IPG0 0x12
-+#define AX_CMD_WRITE_IPG1 0x13
-+#define AX_CMD_READ_NODE_ID 0x13
-+#define AX_CMD_WRITE_NODE_ID 0x14
-+#define AX_CMD_WRITE_IPG2 0x14
-+#define AX_CMD_WRITE_MULTI_FILTER 0x16
-+#define AX88172_CMD_READ_NODE_ID 0x17
-+#define AX_CMD_READ_PHY_ID 0x19
-+#define AX_CMD_READ_MEDIUM_STATUS 0x1a
-+#define AX_CMD_WRITE_MEDIUM_MODE 0x1b
-+#define AX_CMD_READ_MONITOR_MODE 0x1c
-+#define AX_CMD_WRITE_MONITOR_MODE 0x1d
-+#define AX_CMD_READ_GPIOS 0x1e
-+#define AX_CMD_WRITE_GPIOS 0x1f
-+#define AX_CMD_SW_RESET 0x20
-+#define AX_CMD_SW_PHY_STATUS 0x21
-+#define AX_CMD_SW_PHY_SELECT 0x22
-+
-+#define AX_PHY_SELECT_MASK (BIT(3) | BIT(2))
-+#define AX_PHY_SELECT_INTERNAL 0
-+#define AX_PHY_SELECT_EXTERNAL BIT(2)
-+
-+#define AX_MONITOR_MODE 0x01
-+#define AX_MONITOR_LINK 0x02
-+#define AX_MONITOR_MAGIC 0x04
-+#define AX_MONITOR_HSFS 0x10
-+
-+/* AX88172 Medium Status Register values */
-+#define AX88172_MEDIUM_FD 0x02
-+#define AX88172_MEDIUM_TX 0x04
-+#define AX88172_MEDIUM_FC 0x10
-+#define AX88172_MEDIUM_DEFAULT \
-+ ( AX88172_MEDIUM_FD | AX88172_MEDIUM_TX | AX88172_MEDIUM_FC )
-+
-+#define AX_MCAST_FILTER_SIZE 8
-+#define AX_MAX_MCAST 64
-+
-+#define AX_SWRESET_CLEAR 0x00
-+#define AX_SWRESET_RR 0x01
-+#define AX_SWRESET_RT 0x02
-+#define AX_SWRESET_PRTE 0x04
-+#define AX_SWRESET_PRL 0x08
-+#define AX_SWRESET_BZ 0x10
-+#define AX_SWRESET_IPRL 0x20
-+#define AX_SWRESET_IPPD 0x40
-+
-+#define AX88772_IPG0_DEFAULT 0x15
-+#define AX88772_IPG1_DEFAULT 0x0c
-+#define AX88772_IPG2_DEFAULT 0x12
-+
-+/* AX88772 & AX88178 Medium Mode Register */
-+#define AX_MEDIUM_PF 0x0080
-+#define AX_MEDIUM_JFE 0x0040
-+#define AX_MEDIUM_TFC 0x0020
-+#define AX_MEDIUM_RFC 0x0010
-+#define AX_MEDIUM_ENCK 0x0008
-+#define AX_MEDIUM_AC 0x0004
-+#define AX_MEDIUM_FD 0x0002
-+#define AX_MEDIUM_GM 0x0001
-+#define AX_MEDIUM_SM 0x1000
-+#define AX_MEDIUM_SBP 0x0800
-+#define AX_MEDIUM_PS 0x0200
-+#define AX_MEDIUM_RE 0x0100
-+
-+#define AX88178_MEDIUM_DEFAULT \
-+ (AX_MEDIUM_PS | AX_MEDIUM_FD | AX_MEDIUM_AC | \
-+ AX_MEDIUM_RFC | AX_MEDIUM_TFC | AX_MEDIUM_JFE | \
-+ AX_MEDIUM_RE)
-+
-+#define AX88772_MEDIUM_DEFAULT \
-+ (AX_MEDIUM_FD | AX_MEDIUM_RFC | \
-+ AX_MEDIUM_TFC | AX_MEDIUM_PS | \
-+ AX_MEDIUM_AC | AX_MEDIUM_RE)
-+
-+/* AX88772 & AX88178 RX_CTL values */
-+#define AX_RX_CTL_SO 0x0080
-+#define AX_RX_CTL_AP 0x0020
-+#define AX_RX_CTL_AM 0x0010
-+#define AX_RX_CTL_AB 0x0008
-+#define AX_RX_CTL_SEP 0x0004
-+#define AX_RX_CTL_AMALL 0x0002
-+#define AX_RX_CTL_PRO 0x0001
-+#define AX_RX_CTL_MFB_2048 0x0000
-+#define AX_RX_CTL_MFB_4096 0x0100
-+#define AX_RX_CTL_MFB_8192 0x0200
-+#define AX_RX_CTL_MFB_16384 0x0300
-+
-+#define AX_DEFAULT_RX_CTL (AX_RX_CTL_SO | AX_RX_CTL_AB)
-+
-+/* GPIO 0 .. 2 toggles */
-+#define AX_GPIO_GPO0EN 0x01 /* GPIO0 Output enable */
-+#define AX_GPIO_GPO_0 0x02 /* GPIO0 Output value */
-+#define AX_GPIO_GPO1EN 0x04 /* GPIO1 Output enable */
-+#define AX_GPIO_GPO_1 0x08 /* GPIO1 Output value */
-+#define AX_GPIO_GPO2EN 0x10 /* GPIO2 Output enable */
-+#define AX_GPIO_GPO_2 0x20 /* GPIO2 Output value */
-+#define AX_GPIO_RESERVED 0x40 /* Reserved */
-+#define AX_GPIO_RSE 0x80 /* Reload serial EEPROM */
-+
-+#define AX_EEPROM_MAGIC 0xdeadbeef
-+#define AX_EEPROM_LEN 0x200
-+
-+/* This structure cannot exceed sizeof(unsigned long [5]) AKA 20 bytes */
-+struct asix_data {
-+ u8 multi_filter[AX_MCAST_FILTER_SIZE];
-+ u8 mac_addr[ETH_ALEN];
-+ u8 phymode;
-+ u8 ledmode;
-+ u8 res;
-+};
-+
-+struct asix_rx_fixup_info {
-+ struct sk_buff *ax_skb;
-+ u32 header;
-+ u16 size;
-+ bool split_head;
-+};
-+
-+struct asix_common_private {
-+ struct asix_rx_fixup_info rx_fixup_info;
-+};
-+
-+extern const struct driver_info ax88172a_info;
-+
-+/* ASIX specific flags */
-+#define FLAG_EEPROM_MAC (1UL << 0) /* init device MAC from eeprom */
-+
-+int asix_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
-+ u16 size, void *data);
-+
-+int asix_write_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
-+ u16 size, void *data);
-+
-+void asix_write_cmd_async(struct usbnet *dev, u8 cmd, u16 value,
-+ u16 index, u16 size, void *data);
-+
-+int asix_rx_fixup_internal(struct usbnet *dev, struct sk_buff *skb,
-+ struct asix_rx_fixup_info *rx);
-+int asix_rx_fixup_common(struct usbnet *dev, struct sk_buff *skb);
-+
-+struct sk_buff *asix_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
-+ gfp_t flags);
-+
-+int asix_set_sw_mii(struct usbnet *dev);
-+int asix_set_hw_mii(struct usbnet *dev);
-+
-+int asix_read_phy_addr(struct usbnet *dev, int internal);
-+int asix_get_phy_addr(struct usbnet *dev);
-+
-+int asix_sw_reset(struct usbnet *dev, u8 flags);
-+
-+u16 asix_read_rx_ctl(struct usbnet *dev);
-+int asix_write_rx_ctl(struct usbnet *dev, u16 mode);
-+
-+u16 asix_read_medium_status(struct usbnet *dev);
-+int asix_write_medium_mode(struct usbnet *dev, u16 mode);
-+
-+int asix_write_gpio(struct usbnet *dev, u16 value, int sleep);
-+
-+void asix_set_multicast(struct net_device *net);
-+
-+int asix_mdio_read(struct net_device *netdev, int phy_id, int loc);
-+void asix_mdio_write(struct net_device *netdev, int phy_id, int loc, int val);
-+
-+void asix_get_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo);
-+int asix_set_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo);
-+
-+int asix_get_eeprom_len(struct net_device *net);
-+int asix_get_eeprom(struct net_device *net, struct ethtool_eeprom *eeprom,
-+ u8 *data);
-+int asix_set_eeprom(struct net_device *net, struct ethtool_eeprom *eeprom,
-+ u8 *data);
-+
-+void asix_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *info);
-+
-+int asix_set_mac_address(struct net_device *net, void *p);
-+
-+#endif /* _ASIX_H */
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/ax88172a.c backports-3.18.1-1/drivers/net/usb/ax88172a.c
---- backports-3.18.1-1.org/drivers/net/usb/ax88172a.c 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/ax88172a.c 2014-12-16 18:39:45.000000000 +0100
-@@ -0,0 +1,422 @@
-+/*
-+ * ASIX AX88172A based USB 2.0 Ethernet Devices
-+ * Copyright (C) 2012 OMICRON electronics GmbH
-+ *
-+ * Supports external PHYs via phylib. Based on the driver for the
-+ * AX88772. Original copyrights follow:
-+ *
-+ * Copyright (C) 2003-2006 David Hollis <dhollis(a)davehollis.com>
-+ * Copyright (C) 2005 Phil Chang <pchang23(a)sbcglobal.net>
-+ * Copyright (C) 2006 James Painter <jamie.painter(a)iname.com>
-+ * Copyright (c) 2002-2003 TiVo Inc.
-+ *
-+ * 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, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include "asix.h"
-+#include <linux/phy.h>
-+
-+struct ax88172a_private {
-+ struct mii_bus *mdio;
-+ struct phy_device *phydev;
-+ char phy_name[20];
-+ u16 phy_addr;
-+ u16 oldmode;
-+ int use_embdphy;
-+ struct asix_rx_fixup_info rx_fixup_info;
-+};
-+
-+/* MDIO read and write wrappers for phylib */
-+static int asix_mdio_bus_read(struct mii_bus *bus, int phy_id, int regnum)
-+{
-+ return asix_mdio_read(((struct usbnet *)bus->priv)->net, phy_id,
-+ regnum);
-+}
-+
-+static int asix_mdio_bus_write(struct mii_bus *bus, int phy_id, int regnum,
-+ u16 val)
-+{
-+ asix_mdio_write(((struct usbnet *)bus->priv)->net, phy_id, regnum, val);
-+ return 0;
-+}
-+
-+static int ax88172a_ioctl(struct net_device *net, struct ifreq *rq, int cmd)
-+{
-+ if (!netif_running(net))
-+ return -EINVAL;
-+
-+ if (!net->phydev)
-+ return -ENODEV;
-+
-+ return phy_mii_ioctl(net->phydev, rq, cmd);
-+}
-+
-+/* set MAC link settings according to information from phylib */
-+static void ax88172a_adjust_link(struct net_device *netdev)
-+{
-+ struct phy_device *phydev = netdev->phydev;
-+ struct usbnet *dev = netdev_priv(netdev);
-+ struct ax88172a_private *priv = dev->driver_priv;
-+ u16 mode = 0;
-+
-+ if (phydev->link) {
-+ mode = AX88772_MEDIUM_DEFAULT;
-+
-+ if (phydev->duplex == DUPLEX_HALF)
-+ mode &= ~AX_MEDIUM_FD;
-+
-+ if (phydev->speed != SPEED_100)
-+ mode &= ~AX_MEDIUM_PS;
-+ }
-+
-+ if (mode != priv->oldmode) {
-+ asix_write_medium_mode(dev, mode);
-+ priv->oldmode = mode;
-+ netdev_dbg(netdev, "speed %u duplex %d, setting mode to 0x%04x\n",
-+ phydev->speed, phydev->duplex, mode);
-+ phy_print_status(phydev);
-+ }
-+}
-+
-+static void ax88172a_status(struct usbnet *dev, struct urb *urb)
-+{
-+ /* link changes are detected by polling the phy */
-+}
-+
-+/* use phylib infrastructure */
-+static int ax88172a_init_mdio(struct usbnet *dev)
-+{
-+ struct ax88172a_private *priv = dev->driver_priv;
-+ int ret, i;
-+
-+ priv->mdio = mdiobus_alloc();
-+ if (!priv->mdio) {
-+ netdev_err(dev->net, "Could not allocate MDIO bus\n");
-+ return -ENOMEM;
-+ }
-+
-+ priv->mdio->priv = (void *)dev;
-+ priv->mdio->read = &asix_mdio_bus_read;
-+ priv->mdio->write = &asix_mdio_bus_write;
-+ priv->mdio->name = "Asix MDIO Bus";
-+ /* mii bus name is usb-<usb bus number>-<usb device number> */
-+ snprintf(priv->mdio->id, MII_BUS_ID_SIZE, "usb-%03d:%03d",
-+ dev->udev->bus->busnum, dev->udev->devnum);
-+
-+ priv->mdio->irq = kzalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);
-+ if (!priv->mdio->irq) {
-+ ret = -ENOMEM;
-+ goto mfree;
-+ }
-+ for (i = 0; i < PHY_MAX_ADDR; i++)
-+ priv->mdio->irq[i] = PHY_POLL;
-+
-+ ret = mdiobus_register(priv->mdio);
-+ if (ret) {
-+ netdev_err(dev->net, "Could not register MDIO bus\n");
-+ goto ifree;
-+ }
-+
-+ netdev_info(dev->net, "registered mdio bus %s\n", priv->mdio->id);
-+ return 0;
-+
-+ifree:
-+ kfree(priv->mdio->irq);
-+mfree:
-+ mdiobus_free(priv->mdio);
-+ return ret;
-+}
-+
-+static void ax88172a_remove_mdio(struct usbnet *dev)
-+{
-+ struct ax88172a_private *priv = dev->driver_priv;
-+
-+ netdev_info(dev->net, "deregistering mdio bus %s\n", priv->mdio->id);
-+ mdiobus_unregister(priv->mdio);
-+ kfree(priv->mdio->irq);
-+ mdiobus_free(priv->mdio);
-+}
-+
-+static const struct net_device_ops ax88172a_netdev_ops = {
-+ .ndo_open = usbnet_open,
-+ .ndo_stop = usbnet_stop,
-+ .ndo_start_xmit = usbnet_start_xmit,
-+ .ndo_tx_timeout = usbnet_tx_timeout,
-+ .ndo_change_mtu = usbnet_change_mtu,
-+ .ndo_set_mac_address = asix_set_mac_address,
-+ .ndo_validate_addr = eth_validate_addr,
-+ .ndo_do_ioctl = ax88172a_ioctl,
-+ .ndo_set_rx_mode = asix_set_multicast,
-+};
-+
-+static int ax88172a_get_settings(struct net_device *net,
-+ struct ethtool_cmd *cmd)
-+{
-+ if (!net->phydev)
-+ return -ENODEV;
-+
-+ return phy_ethtool_gset(net->phydev, cmd);
-+}
-+
-+static int ax88172a_set_settings(struct net_device *net,
-+ struct ethtool_cmd *cmd)
-+{
-+ if (!net->phydev)
-+ return -ENODEV;
-+
-+ return phy_ethtool_sset(net->phydev, cmd);
-+}
-+
-+static int ax88172a_nway_reset(struct net_device *net)
-+{
-+ if (!net->phydev)
-+ return -ENODEV;
-+
-+ return phy_start_aneg(net->phydev);
-+}
-+
-+static const struct ethtool_ops ax88172a_ethtool_ops = {
-+ .get_drvinfo = asix_get_drvinfo,
-+ .get_link = usbnet_get_link,
-+ .get_msglevel = usbnet_get_msglevel,
-+ .set_msglevel = usbnet_set_msglevel,
-+ .get_wol = asix_get_wol,
-+ .set_wol = asix_set_wol,
-+ .get_eeprom_len = asix_get_eeprom_len,
-+ .get_eeprom = asix_get_eeprom,
-+ .set_eeprom = asix_set_eeprom,
-+ .get_settings = ax88172a_get_settings,
-+ .set_settings = ax88172a_set_settings,
-+ .nway_reset = ax88172a_nway_reset,
-+};
-+
-+static int ax88172a_reset_phy(struct usbnet *dev, int embd_phy)
-+{
-+ int ret;
-+
-+ ret = asix_sw_reset(dev, AX_SWRESET_IPPD);
-+ if (ret < 0)
-+ goto err;
-+
-+ msleep(150);
-+ ret = asix_sw_reset(dev, AX_SWRESET_CLEAR);
-+ if (ret < 0)
-+ goto err;
-+
-+ msleep(150);
-+
-+ ret = asix_sw_reset(dev, embd_phy ? AX_SWRESET_IPRL : AX_SWRESET_IPPD);
-+ if (ret < 0)
-+ goto err;
-+
-+ return 0;
-+
-+err:
-+ return ret;
-+}
-+
-+
-+static int ax88172a_bind(struct usbnet *dev, struct usb_interface *intf)
-+{
-+ int ret;
-+ u8 buf[ETH_ALEN];
-+ struct ax88172a_private *priv;
-+
-+ usbnet_get_endpoints(dev, intf);
-+
-+ priv = kzalloc(sizeof(*priv), GFP_KERNEL);
-+ if (!priv)
-+ return -ENOMEM;
-+
-+ dev->driver_priv = priv;
-+
-+ /* Get the MAC address */
-+ ret = asix_read_cmd(dev, AX_CMD_READ_NODE_ID, 0, 0, ETH_ALEN, buf);
-+ if (ret < 0) {
-+ netdev_err(dev->net, "Failed to read MAC address: %d\n", ret);
-+ goto free;
-+ }
-+ memcpy(dev->net->dev_addr, buf, ETH_ALEN);
-+
-+ dev->net->netdev_ops = &ax88172a_netdev_ops;
-+ dev->net->ethtool_ops = &ax88172a_ethtool_ops;
-+
-+ /* are we using the internal or the external phy? */
-+ ret = asix_read_cmd(dev, AX_CMD_SW_PHY_STATUS, 0, 0, 1, buf);
-+ if (ret < 0) {
-+ netdev_err(dev->net, "Failed to read software interface selection register: %d\n",
-+ ret);
-+ goto free;
-+ }
-+
-+ netdev_dbg(dev->net, "AX_CMD_SW_PHY_STATUS = 0x%02x\n", buf[0]);
-+ switch (buf[0] & AX_PHY_SELECT_MASK) {
-+ case AX_PHY_SELECT_INTERNAL:
-+ netdev_dbg(dev->net, "use internal phy\n");
-+ priv->use_embdphy = 1;
-+ break;
-+ case AX_PHY_SELECT_EXTERNAL:
-+ netdev_dbg(dev->net, "use external phy\n");
-+ priv->use_embdphy = 0;
-+ break;
-+ default:
-+ netdev_err(dev->net, "Interface mode not supported by driver\n");
-+ ret = -ENOTSUPP;
-+ goto free;
-+ }
-+
-+ priv->phy_addr = asix_read_phy_addr(dev, priv->use_embdphy);
-+ ax88172a_reset_phy(dev, priv->use_embdphy);
-+
-+ /* Asix framing packs multiple eth frames into a 2K usb bulk transfer */
-+ if (dev->driver_info->flags & FLAG_FRAMING_AX) {
-+ /* hard_mtu is still the default - the device does not support
-+ jumbo eth frames */
-+ dev->rx_urb_size = 2048;
-+ }
-+
-+ /* init MDIO bus */
-+ ret = ax88172a_init_mdio(dev);
-+ if (ret)
-+ goto free;
-+
-+ return 0;
-+
-+free:
-+ kfree(priv);
-+ return ret;
-+}
-+
-+static int ax88172a_stop(struct usbnet *dev)
-+{
-+ struct ax88172a_private *priv = dev->driver_priv;
-+
-+ netdev_dbg(dev->net, "Stopping interface\n");
-+
-+ if (priv->phydev) {
-+ netdev_info(dev->net, "Disconnecting from phy %s\n",
-+ priv->phy_name);
-+ phy_stop(priv->phydev);
-+ phy_disconnect(priv->phydev);
-+ }
-+
-+ return 0;
-+}
-+
-+static void ax88172a_unbind(struct usbnet *dev, struct usb_interface *intf)
-+{
-+ struct ax88172a_private *priv = dev->driver_priv;
-+
-+ ax88172a_remove_mdio(dev);
-+ kfree(priv);
-+}
-+
-+static int ax88172a_reset(struct usbnet *dev)
-+{
-+ struct asix_data *data = (struct asix_data *)&dev->data;
-+ struct ax88172a_private *priv = dev->driver_priv;
-+ int ret;
-+ u16 rx_ctl;
-+
-+ ax88172a_reset_phy(dev, priv->use_embdphy);
-+
-+ msleep(150);
-+ rx_ctl = asix_read_rx_ctl(dev);
-+ netdev_dbg(dev->net, "RX_CTL is 0x%04x after software reset\n", rx_ctl);
-+ ret = asix_write_rx_ctl(dev, 0x0000);
-+ if (ret < 0)
-+ goto out;
-+
-+ rx_ctl = asix_read_rx_ctl(dev);
-+ netdev_dbg(dev->net, "RX_CTL is 0x%04x setting to 0x0000\n", rx_ctl);
-+
-+ msleep(150);
-+
-+ ret = asix_write_cmd(dev, AX_CMD_WRITE_IPG0,
-+ AX88772_IPG0_DEFAULT | AX88772_IPG1_DEFAULT,
-+ AX88772_IPG2_DEFAULT, 0, NULL);
-+ if (ret < 0) {
-+ netdev_err(dev->net, "Write IPG,IPG1,IPG2 failed: %d\n", ret);
-+ goto out;
-+ }
-+
-+ /* Rewrite MAC address */
-+ memcpy(data->mac_addr, dev->net->dev_addr, ETH_ALEN);
-+ ret = asix_write_cmd(dev, AX_CMD_WRITE_NODE_ID, 0, 0, ETH_ALEN,
-+ data->mac_addr);
-+ if (ret < 0)
-+ goto out;
-+
-+ /* Set RX_CTL to default values with 2k buffer, and enable cactus */
-+ ret = asix_write_rx_ctl(dev, AX_DEFAULT_RX_CTL);
-+ if (ret < 0)
-+ goto out;
-+
-+ rx_ctl = asix_read_rx_ctl(dev);
-+ netdev_dbg(dev->net, "RX_CTL is 0x%04x after all initializations\n",
-+ rx_ctl);
-+
-+ rx_ctl = asix_read_medium_status(dev);
-+ netdev_dbg(dev->net, "Medium Status is 0x%04x after all initializations\n",
-+ rx_ctl);
-+
-+ /* Connect to PHY */
-+ snprintf(priv->phy_name, 20, PHY_ID_FMT,
-+ priv->mdio->id, priv->phy_addr);
-+
-+ priv->phydev = phy_connect(dev->net, priv->phy_name,
-+ &ax88172a_adjust_link,
-+ PHY_INTERFACE_MODE_MII);
-+ if (IS_ERR(priv->phydev)) {
-+ netdev_err(dev->net, "Could not connect to PHY device %s\n",
-+ priv->phy_name);
-+ ret = PTR_ERR(priv->phydev);
-+ goto out;
-+ }
-+
-+ netdev_info(dev->net, "Connected to phy %s\n", priv->phy_name);
-+
-+ /* During power-up, the AX88172A set the power down (BMCR_PDOWN)
-+ * bit of the PHY. Bring the PHY up again.
-+ */
-+ genphy_resume(priv->phydev);
-+ phy_start(priv->phydev);
-+
-+ return 0;
-+
-+out:
-+ return ret;
-+
-+}
-+
-+static int ax88172a_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
-+{
-+ struct ax88172a_private *dp = dev->driver_priv;
-+ struct asix_rx_fixup_info *rx = &dp->rx_fixup_info;
-+
-+ return asix_rx_fixup_internal(dev, skb, rx);
-+}
-+
-+const struct driver_info ax88172a_info = {
-+ .description = "ASIX AX88172A USB 2.0 Ethernet",
-+ .bind = ax88172a_bind,
-+ .reset = ax88172a_reset,
-+ .stop = ax88172a_stop,
-+ .unbind = ax88172a_unbind,
-+ .status = ax88172a_status,
-+ .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_LINK_INTR |
-+ FLAG_MULTI_PACKET,
-+ .rx_fixup = ax88172a_rx_fixup,
-+ .tx_fixup = asix_tx_fixup,
-+};
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/ax88179_178a.c backports-3.18.1-1/drivers/net/usb/ax88179_178a.c
---- backports-3.18.1-1.org/drivers/net/usb/ax88179_178a.c 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/ax88179_178a.c 2014-12-16 18:39:45.000000000 +0100
-@@ -0,0 +1,1756 @@
-+/*
-+ * ASIX AX88179/178A USB 3.0/2.0 to Gigabit Ethernet Devices
-+ *
-+ * Copyright (C) 2011-2013 ASIX
-+ *
-+ * 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, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/etherdevice.h>
-+#include <linux/mii.h>
-+#include <linux/usb.h>
-+#include <linux/crc32.h>
-+#include <linux/usb/usbnet.h>
-+#include <uapi/linux/mdio.h>
-+#include <linux/mdio.h>
-+
-+#define AX88179_PHY_ID 0x03
-+#define AX_EEPROM_LEN 0x100
-+#define AX88179_EEPROM_MAGIC 0x17900b95
-+#define AX_MCAST_FLTSIZE 8
-+#define AX_MAX_MCAST 64
-+#define AX_INT_PPLS_LINK ((u32)BIT(16))
-+#define AX_RXHDR_L4_TYPE_MASK 0x1c
-+#define AX_RXHDR_L4_TYPE_UDP 4
-+#define AX_RXHDR_L4_TYPE_TCP 16
-+#define AX_RXHDR_L3CSUM_ERR 2
-+#define AX_RXHDR_L4CSUM_ERR 1
-+#define AX_RXHDR_CRC_ERR ((u32)BIT(29))
-+#define AX_RXHDR_DROP_ERR ((u32)BIT(31))
-+#define AX_ACCESS_MAC 0x01
-+#define AX_ACCESS_PHY 0x02
-+#define AX_ACCESS_EEPROM 0x04
-+#define AX_ACCESS_EFUS 0x05
-+#define AX_PAUSE_WATERLVL_HIGH 0x54
-+#define AX_PAUSE_WATERLVL_LOW 0x55
-+
-+#define PHYSICAL_LINK_STATUS 0x02
-+ #define AX_USB_SS 0x04
-+ #define AX_USB_HS 0x02
-+
-+#define GENERAL_STATUS 0x03
-+/* Check AX88179 version. UA1:Bit2 = 0, UA2:Bit2 = 1 */
-+ #define AX_SECLD 0x04
-+
-+#define AX_SROM_ADDR 0x07
-+#define AX_SROM_CMD 0x0a
-+ #define EEP_RD 0x04
-+ #define EEP_BUSY 0x10
-+
-+#define AX_SROM_DATA_LOW 0x08
-+#define AX_SROM_DATA_HIGH 0x09
-+
-+#define AX_RX_CTL 0x0b
-+ #define AX_RX_CTL_DROPCRCERR 0x0100
-+ #define AX_RX_CTL_IPE 0x0200
-+ #define AX_RX_CTL_START 0x0080
-+ #define AX_RX_CTL_AP 0x0020
-+ #define AX_RX_CTL_AM 0x0010
-+ #define AX_RX_CTL_AB 0x0008
-+ #define AX_RX_CTL_AMALL 0x0002
-+ #define AX_RX_CTL_PRO 0x0001
-+ #define AX_RX_CTL_STOP 0x0000
-+
-+#define AX_NODE_ID 0x10
-+#define AX_MULFLTARY 0x16
-+
-+#define AX_MEDIUM_STATUS_MODE 0x22
-+ #define AX_MEDIUM_GIGAMODE 0x01
-+ #define AX_MEDIUM_FULL_DUPLEX 0x02
-+ #define AX_MEDIUM_EN_125MHZ 0x08
-+ #define AX_MEDIUM_RXFLOW_CTRLEN 0x10
-+ #define AX_MEDIUM_TXFLOW_CTRLEN 0x20
-+ #define AX_MEDIUM_RECEIVE_EN 0x100
-+ #define AX_MEDIUM_PS 0x200
-+ #define AX_MEDIUM_JUMBO_EN 0x8040
-+
-+#define AX_MONITOR_MOD 0x24
-+ #define AX_MONITOR_MODE_RWLC 0x02
-+ #define AX_MONITOR_MODE_RWMP 0x04
-+ #define AX_MONITOR_MODE_PMEPOL 0x20
-+ #define AX_MONITOR_MODE_PMETYPE 0x40
-+
-+#define AX_GPIO_CTRL 0x25
-+ #define AX_GPIO_CTRL_GPIO3EN 0x80
-+ #define AX_GPIO_CTRL_GPIO2EN 0x40
-+ #define AX_GPIO_CTRL_GPIO1EN 0x20
-+
-+#define AX_PHYPWR_RSTCTL 0x26
-+ #define AX_PHYPWR_RSTCTL_BZ 0x0010
-+ #define AX_PHYPWR_RSTCTL_IPRL 0x0020
-+ #define AX_PHYPWR_RSTCTL_AT 0x1000
-+
-+#define AX_RX_BULKIN_QCTRL 0x2e
-+#define AX_CLK_SELECT 0x33
-+ #define AX_CLK_SELECT_BCS 0x01
-+ #define AX_CLK_SELECT_ACS 0x02
-+ #define AX_CLK_SELECT_ULR 0x08
-+
-+#define AX_RXCOE_CTL 0x34
-+ #define AX_RXCOE_IP 0x01
-+ #define AX_RXCOE_TCP 0x02
-+ #define AX_RXCOE_UDP 0x04
-+ #define AX_RXCOE_TCPV6 0x20
-+ #define AX_RXCOE_UDPV6 0x40
-+
-+#define AX_TXCOE_CTL 0x35
-+ #define AX_TXCOE_IP 0x01
-+ #define AX_TXCOE_TCP 0x02
-+ #define AX_TXCOE_UDP 0x04
-+ #define AX_TXCOE_TCPV6 0x20
-+ #define AX_TXCOE_UDPV6 0x40
-+
-+#define AX_LEDCTRL 0x73
-+
-+#define GMII_PHY_PHYSR 0x11
-+ #define GMII_PHY_PHYSR_SMASK 0xc000
-+ #define GMII_PHY_PHYSR_GIGA 0x8000
-+ #define GMII_PHY_PHYSR_100 0x4000
-+ #define GMII_PHY_PHYSR_FULL 0x2000
-+ #define GMII_PHY_PHYSR_LINK 0x400
-+
-+#define GMII_LED_ACT 0x1a
-+ #define GMII_LED_ACTIVE_MASK 0xff8f
-+ #define GMII_LED0_ACTIVE BIT(4)
-+ #define GMII_LED1_ACTIVE BIT(5)
-+ #define GMII_LED2_ACTIVE BIT(6)
-+
-+#define GMII_LED_LINK 0x1c
-+ #define GMII_LED_LINK_MASK 0xf888
-+ #define GMII_LED0_LINK_10 BIT(0)
-+ #define GMII_LED0_LINK_100 BIT(1)
-+ #define GMII_LED0_LINK_1000 BIT(2)
-+ #define GMII_LED1_LINK_10 BIT(4)
-+ #define GMII_LED1_LINK_100 BIT(5)
-+ #define GMII_LED1_LINK_1000 BIT(6)
-+ #define GMII_LED2_LINK_10 BIT(8)
-+ #define GMII_LED2_LINK_100 BIT(9)
-+ #define GMII_LED2_LINK_1000 BIT(10)
-+ #define LED0_ACTIVE BIT(0)
-+ #define LED0_LINK_10 BIT(1)
-+ #define LED0_LINK_100 BIT(2)
-+ #define LED0_LINK_1000 BIT(3)
-+ #define LED0_FD BIT(4)
-+ #define LED0_USB3_MASK 0x001f
-+ #define LED1_ACTIVE BIT(5)
-+ #define LED1_LINK_10 BIT(6)
-+ #define LED1_LINK_100 BIT(7)
-+ #define LED1_LINK_1000 BIT(8)
-+ #define LED1_FD BIT(9)
-+ #define LED1_USB3_MASK 0x03e0
-+ #define LED2_ACTIVE BIT(10)
-+ #define LED2_LINK_1000 BIT(13)
-+ #define LED2_LINK_100 BIT(12)
-+ #define LED2_LINK_10 BIT(11)
-+ #define LED2_FD BIT(14)
-+ #define LED_VALID BIT(15)
-+ #define LED2_USB3_MASK 0x7c00
-+
-+#define GMII_PHYPAGE 0x1e
-+#define GMII_PHY_PAGE_SELECT 0x1f
-+ #define GMII_PHY_PGSEL_EXT 0x0007
-+ #define GMII_PHY_PGSEL_PAGE0 0x0000
-+ #define GMII_PHY_PGSEL_PAGE3 0x0003
-+ #define GMII_PHY_PGSEL_PAGE5 0x0005
-+
-+struct ax88179_data {
-+ u8 eee_enabled;
-+ u8 eee_active;
-+ u16 rxctl;
-+ u16 reserved;
-+};
-+
-+struct ax88179_int_data {
-+ __le32 intdata1;
-+ __le32 intdata2;
-+};
-+
-+static const struct {
-+ unsigned char ctrl, timer_l, timer_h, size, ifg;
-+} AX88179_BULKIN_SIZE[] = {
-+ {7, 0x4f, 0, 0x12, 0xff},
-+ {7, 0x20, 3, 0x16, 0xff},
-+ {7, 0xae, 7, 0x18, 0xff},
-+ {7, 0xcc, 0x4c, 0x18, 8},
-+};
-+
-+static int __ax88179_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
-+ u16 size, void *data, int in_pm)
-+{
-+ int ret;
-+ int (*fn)(struct usbnet *, u8, u8, u16, u16, void *, u16);
-+
-+ BUG_ON(!dev);
-+
-+ if (!in_pm)
-+ fn = usbnet_read_cmd;
-+ else
-+ fn = usbnet_read_cmd_nopm;
-+
-+ ret = fn(dev, cmd, USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-+ value, index, data, size);
-+
-+ if (unlikely(ret < 0))
-+ netdev_warn(dev->net, "Failed to read reg index 0x%04x: %d\n",
-+ index, ret);
-+
-+ return ret;
-+}
-+
-+static int __ax88179_write_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
-+ u16 size, void *data, int in_pm)
-+{
-+ int ret;
-+ int (*fn)(struct usbnet *, u8, u8, u16, u16, const void *, u16);
-+
-+ BUG_ON(!dev);
-+
-+ if (!in_pm)
-+ fn = usbnet_write_cmd;
-+ else
-+ fn = usbnet_write_cmd_nopm;
-+
-+ ret = fn(dev, cmd, USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-+ value, index, data, size);
-+
-+ if (unlikely(ret < 0))
-+ netdev_warn(dev->net, "Failed to write reg index 0x%04x: %d\n",
-+ index, ret);
-+
-+ return ret;
-+}
-+
-+static void ax88179_write_cmd_async(struct usbnet *dev, u8 cmd, u16 value,
-+ u16 index, u16 size, void *data)
-+{
-+ u16 buf;
-+
-+ if (2 == size) {
-+ buf = *((u16 *)data);
-+ cpu_to_le16s(&buf);
-+ usbnet_write_cmd_async(dev, cmd, USB_DIR_OUT | USB_TYPE_VENDOR |
-+ USB_RECIP_DEVICE, value, index, &buf,
-+ size);
-+ } else {
-+ usbnet_write_cmd_async(dev, cmd, USB_DIR_OUT | USB_TYPE_VENDOR |
-+ USB_RECIP_DEVICE, value, index, data,
-+ size);
-+ }
-+}
-+
-+static int ax88179_read_cmd_nopm(struct usbnet *dev, u8 cmd, u16 value,
-+ u16 index, u16 size, void *data)
-+{
-+ int ret;
-+
-+ if (2 == size) {
-+ u16 buf;
-+ ret = __ax88179_read_cmd(dev, cmd, value, index, size, &buf, 1);
-+ le16_to_cpus(&buf);
-+ *((u16 *)data) = buf;
-+ } else if (4 == size) {
-+ u32 buf;
-+ ret = __ax88179_read_cmd(dev, cmd, value, index, size, &buf, 1);
-+ le32_to_cpus(&buf);
-+ *((u32 *)data) = buf;
-+ } else {
-+ ret = __ax88179_read_cmd(dev, cmd, value, index, size, data, 1);
-+ }
-+
-+ return ret;
-+}
-+
-+static int ax88179_write_cmd_nopm(struct usbnet *dev, u8 cmd, u16 value,
-+ u16 index, u16 size, void *data)
-+{
-+ int ret;
-+
-+ if (2 == size) {
-+ u16 buf;
-+ buf = *((u16 *)data);
-+ cpu_to_le16s(&buf);
-+ ret = __ax88179_write_cmd(dev, cmd, value, index,
-+ size, &buf, 1);
-+ } else {
-+ ret = __ax88179_write_cmd(dev, cmd, value, index,
-+ size, data, 1);
-+ }
-+
-+ return ret;
-+}
-+
-+static int ax88179_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
-+ u16 size, void *data)
-+{
-+ int ret;
-+
-+ if (2 == size) {
-+ u16 buf;
-+ ret = __ax88179_read_cmd(dev, cmd, value, index, size, &buf, 0);
-+ le16_to_cpus(&buf);
-+ *((u16 *)data) = buf;
-+ } else if (4 == size) {
-+ u32 buf;
-+ ret = __ax88179_read_cmd(dev, cmd, value, index, size, &buf, 0);
-+ le32_to_cpus(&buf);
-+ *((u32 *)data) = buf;
-+ } else {
-+ ret = __ax88179_read_cmd(dev, cmd, value, index, size, data, 0);
-+ }
-+
-+ return ret;
-+}
-+
-+static int ax88179_write_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
-+ u16 size, void *data)
-+{
-+ int ret;
-+
-+ if (2 == size) {
-+ u16 buf;
-+ buf = *((u16 *)data);
-+ cpu_to_le16s(&buf);
-+ ret = __ax88179_write_cmd(dev, cmd, value, index,
-+ size, &buf, 0);
-+ } else {
-+ ret = __ax88179_write_cmd(dev, cmd, value, index,
-+ size, data, 0);
-+ }
-+
-+ return ret;
-+}
-+
-+static void ax88179_status(struct usbnet *dev, struct urb *urb)
-+{
-+ struct ax88179_int_data *event;
-+ u32 link;
-+
-+ if (urb->actual_length < 8)
-+ return;
-+
-+ event = urb->transfer_buffer;
-+ le32_to_cpus((void *)&event->intdata1);
-+
-+ link = (((__force u32)event->intdata1) & AX_INT_PPLS_LINK) >> 16;
-+
-+ if (netif_carrier_ok(dev->net) != link) {
-+ usbnet_link_change(dev, link, 1);
-+ netdev_info(dev->net, "ax88179 - Link status is: %d\n", link);
-+ }
-+}
-+
-+static int ax88179_mdio_read(struct net_device *netdev, int phy_id, int loc)
-+{
-+ struct usbnet *dev = netdev_priv(netdev);
-+ u16 res;
-+
-+ ax88179_read_cmd(dev, AX_ACCESS_PHY, phy_id, (__u16)loc, 2, &res);
-+ return res;
-+}
-+
-+static void ax88179_mdio_write(struct net_device *netdev, int phy_id, int loc,
-+ int val)
-+{
-+ struct usbnet *dev = netdev_priv(netdev);
-+ u16 res = (u16) val;
-+
-+ ax88179_write_cmd(dev, AX_ACCESS_PHY, phy_id, (__u16)loc, 2, &res);
-+}
-+
-+static inline int ax88179_phy_mmd_indirect(struct usbnet *dev, u16 prtad,
-+ u16 devad)
-+{
-+ u16 tmp16;
-+ int ret;
-+
-+ tmp16 = devad;
-+ ret = ax88179_write_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
-+ MII_MMD_CTRL, 2, &tmp16);
-+
-+ tmp16 = prtad;
-+ ret = ax88179_write_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
-+ MII_MMD_DATA, 2, &tmp16);
-+
-+ tmp16 = devad | MII_MMD_CTRL_NOINCR;
-+ ret = ax88179_write_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
-+ MII_MMD_CTRL, 2, &tmp16);
-+
-+ return ret;
-+}
-+
-+static int
-+ax88179_phy_read_mmd_indirect(struct usbnet *dev, u16 prtad, u16 devad)
-+{
-+ int ret;
-+ u16 tmp16;
-+
-+ ax88179_phy_mmd_indirect(dev, prtad, devad);
-+
-+ ret = ax88179_read_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
-+ MII_MMD_DATA, 2, &tmp16);
-+ if (ret < 0)
-+ return ret;
-+
-+ return tmp16;
-+}
-+
-+static int
-+ax88179_phy_write_mmd_indirect(struct usbnet *dev, u16 prtad, u16 devad,
-+ u16 data)
-+{
-+ int ret;
-+
-+ ax88179_phy_mmd_indirect(dev, prtad, devad);
-+
-+ ret = ax88179_write_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
-+ MII_MMD_DATA, 2, &data);
-+
-+ if (ret < 0)
-+ return ret;
-+
-+ return 0;
-+}
-+
-+static int ax88179_suspend(struct usb_interface *intf, pm_message_t message)
-+{
-+ struct usbnet *dev = usb_get_intfdata(intf);
-+ u16 tmp16;
-+ u8 tmp8;
-+
-+ usbnet_suspend(intf, message);
-+
-+ /* Disable RX path */
-+ ax88179_read_cmd_nopm(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE,
-+ 2, 2, &tmp16);
-+ tmp16 &= ~AX_MEDIUM_RECEIVE_EN;
-+ ax88179_write_cmd_nopm(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE,
-+ 2, 2, &tmp16);
-+
-+ /* Force bulk-in zero length */
-+ ax88179_read_cmd_nopm(dev, AX_ACCESS_MAC, AX_PHYPWR_RSTCTL,
-+ 2, 2, &tmp16);
-+
-+ tmp16 |= AX_PHYPWR_RSTCTL_BZ | AX_PHYPWR_RSTCTL_IPRL;
-+ ax88179_write_cmd_nopm(dev, AX_ACCESS_MAC, AX_PHYPWR_RSTCTL,
-+ 2, 2, &tmp16);
-+
-+ /* change clock */
-+ tmp8 = 0;
-+ ax88179_write_cmd_nopm(dev, AX_ACCESS_MAC, AX_CLK_SELECT, 1, 1, &tmp8);
-+
-+ /* Configure RX control register => stop operation */
-+ tmp16 = AX_RX_CTL_STOP;
-+ ax88179_write_cmd_nopm(dev, AX_ACCESS_MAC, AX_RX_CTL, 2, 2, &tmp16);
-+
-+ return 0;
-+}
-+
-+/* This function is used to enable the autodetach function. */
-+/* This function is determined by offset 0x43 of EEPROM */
-+static int ax88179_auto_detach(struct usbnet *dev, int in_pm)
-+{
-+ u16 tmp16;
-+ u8 tmp8;
-+ int (*fnr)(struct usbnet *, u8, u16, u16, u16, void *);
-+ int (*fnw)(struct usbnet *, u8, u16, u16, u16, void *);
-+
-+ if (!in_pm) {
-+ fnr = ax88179_read_cmd;
-+ fnw = ax88179_write_cmd;
-+ } else {
-+ fnr = ax88179_read_cmd_nopm;
-+ fnw = ax88179_write_cmd_nopm;
-+ }
-+
-+ if (fnr(dev, AX_ACCESS_EEPROM, 0x43, 1, 2, &tmp16) < 0)
-+ return 0;
-+
-+ if ((tmp16 == 0xFFFF) || (!(tmp16 & 0x0100)))
-+ return 0;
-+
-+ /* Enable Auto Detach bit */
-+ tmp8 = 0;
-+ fnr(dev, AX_ACCESS_MAC, AX_CLK_SELECT, 1, 1, &tmp8);
-+ tmp8 |= AX_CLK_SELECT_ULR;
-+ fnw(dev, AX_ACCESS_MAC, AX_CLK_SELECT, 1, 1, &tmp8);
-+
-+ fnr(dev, AX_ACCESS_MAC, AX_PHYPWR_RSTCTL, 2, 2, &tmp16);
-+ tmp16 |= AX_PHYPWR_RSTCTL_AT;
-+ fnw(dev, AX_ACCESS_MAC, AX_PHYPWR_RSTCTL, 2, 2, &tmp16);
-+
-+ return 0;
-+}
-+
-+static int ax88179_resume(struct usb_interface *intf)
-+{
-+ struct usbnet *dev = usb_get_intfdata(intf);
-+ u16 tmp16;
-+ u8 tmp8;
-+
-+ usbnet_link_change(dev, 0, 0);
-+
-+ /* Power up ethernet PHY */
-+ tmp16 = 0;
-+ ax88179_write_cmd_nopm(dev, AX_ACCESS_MAC, AX_PHYPWR_RSTCTL,
-+ 2, 2, &tmp16);
-+ udelay(1000);
-+
-+ tmp16 = AX_PHYPWR_RSTCTL_IPRL;
-+ ax88179_write_cmd_nopm(dev, AX_ACCESS_MAC, AX_PHYPWR_RSTCTL,
-+ 2, 2, &tmp16);
-+ msleep(200);
-+
-+ /* Ethernet PHY Auto Detach*/
-+ ax88179_auto_detach(dev, 1);
-+
-+ /* Enable clock */
-+ ax88179_read_cmd_nopm(dev, AX_ACCESS_MAC, AX_CLK_SELECT, 1, 1, &tmp8);
-+ tmp8 |= AX_CLK_SELECT_ACS | AX_CLK_SELECT_BCS;
-+ ax88179_write_cmd_nopm(dev, AX_ACCESS_MAC, AX_CLK_SELECT, 1, 1, &tmp8);
-+ msleep(100);
-+
-+ /* Configure RX control register => start operation */
-+ tmp16 = AX_RX_CTL_DROPCRCERR | AX_RX_CTL_IPE | AX_RX_CTL_START |
-+ AX_RX_CTL_AP | AX_RX_CTL_AMALL | AX_RX_CTL_AB;
-+ ax88179_write_cmd_nopm(dev, AX_ACCESS_MAC, AX_RX_CTL, 2, 2, &tmp16);
-+
-+ return usbnet_resume(intf);
-+}
-+
-+static void
-+ax88179_get_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+ u8 opt;
-+
-+ if (ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_MONITOR_MOD,
-+ 1, 1, &opt) < 0) {
-+ wolinfo->supported = 0;
-+ wolinfo->wolopts = 0;
-+ return;
-+ }
-+
-+ wolinfo->supported = WAKE_PHY | WAKE_MAGIC;
-+ wolinfo->wolopts = 0;
-+ if (opt & AX_MONITOR_MODE_RWLC)
-+ wolinfo->wolopts |= WAKE_PHY;
-+ if (opt & AX_MONITOR_MODE_RWMP)
-+ wolinfo->wolopts |= WAKE_MAGIC;
-+}
-+
-+static int
-+ax88179_set_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+ u8 opt = 0;
-+
-+ if (wolinfo->wolopts & WAKE_PHY)
-+ opt |= AX_MONITOR_MODE_RWLC;
-+ if (wolinfo->wolopts & WAKE_MAGIC)
-+ opt |= AX_MONITOR_MODE_RWMP;
-+
-+ if (ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_MONITOR_MOD,
-+ 1, 1, &opt) < 0)
-+ return -EINVAL;
-+
-+ return 0;
-+}
-+
-+static int ax88179_get_eeprom_len(struct net_device *net)
-+{
-+ return AX_EEPROM_LEN;
-+}
-+
-+static int
-+ax88179_get_eeprom(struct net_device *net, struct ethtool_eeprom *eeprom,
-+ u8 *data)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+ u16 *eeprom_buff;
-+ int first_word, last_word;
-+ int i, ret;
-+
-+ if (eeprom->len == 0)
-+ return -EINVAL;
-+
-+ eeprom->magic = AX88179_EEPROM_MAGIC;
-+
-+ first_word = eeprom->offset >> 1;
-+ last_word = (eeprom->offset + eeprom->len - 1) >> 1;
-+ eeprom_buff = kmalloc(sizeof(u16) * (last_word - first_word + 1),
-+ GFP_KERNEL);
-+ if (!eeprom_buff)
-+ return -ENOMEM;
-+
-+ /* ax88179/178A returns 2 bytes from eeprom on read */
-+ for (i = first_word; i <= last_word; i++) {
-+ ret = __ax88179_read_cmd(dev, AX_ACCESS_EEPROM, i, 1, 2,
-+ &eeprom_buff[i - first_word],
-+ 0);
-+ if (ret < 0) {
-+ kfree(eeprom_buff);
-+ return -EIO;
-+ }
-+ }
-+
-+ memcpy(data, (u8 *)eeprom_buff + (eeprom->offset & 1), eeprom->len);
-+ kfree(eeprom_buff);
-+ return 0;
-+}
-+
-+static int ax88179_get_settings(struct net_device *net, struct ethtool_cmd *cmd)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+ return mii_ethtool_gset(&dev->mii, cmd);
-+}
-+
-+static int ax88179_set_settings(struct net_device *net, struct ethtool_cmd *cmd)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+ return mii_ethtool_sset(&dev->mii, cmd);
-+}
-+
-+static int
-+ax88179_ethtool_get_eee(struct usbnet *dev, struct ethtool_eee *data)
-+{
-+ int val;
-+
-+ /* Get Supported EEE */
-+ val = ax88179_phy_read_mmd_indirect(dev, MDIO_PCS_EEE_ABLE,
-+ MDIO_MMD_PCS);
-+ if (val < 0)
-+ return val;
-+ data->supported = mmd_eee_cap_to_ethtool_sup_t(val);
-+
-+ /* Get advertisement EEE */
-+ val = ax88179_phy_read_mmd_indirect(dev, MDIO_AN_EEE_ADV,
-+ MDIO_MMD_AN);
-+ if (val < 0)
-+ return val;
-+ data->advertised = mmd_eee_adv_to_ethtool_adv_t(val);
-+
-+ /* Get LP advertisement EEE */
-+ val = ax88179_phy_read_mmd_indirect(dev, MDIO_AN_EEE_LPABLE,
-+ MDIO_MMD_AN);
-+ if (val < 0)
-+ return val;
-+ data->lp_advertised = mmd_eee_adv_to_ethtool_adv_t(val);
-+
-+ return 0;
-+}
-+
-+static int
-+ax88179_ethtool_set_eee(struct usbnet *dev, struct ethtool_eee *data)
-+{
-+ u16 tmp16 = ethtool_adv_to_mmd_eee_adv_t(data->advertised);
-+
-+ return ax88179_phy_write_mmd_indirect(dev, MDIO_AN_EEE_ADV,
-+ MDIO_MMD_AN, tmp16);
-+}
-+
-+static int ax88179_chk_eee(struct usbnet *dev)
-+{
-+ struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET };
-+ struct ax88179_data *priv = (struct ax88179_data *)dev->data;
-+
-+ mii_ethtool_gset(&dev->mii, &ecmd);
-+
-+ if (ecmd.duplex & DUPLEX_FULL) {
-+ int eee_lp, eee_cap, eee_adv;
-+ u32 lp, cap, adv, supported = 0;
-+
-+ eee_cap = ax88179_phy_read_mmd_indirect(dev,
-+ MDIO_PCS_EEE_ABLE,
-+ MDIO_MMD_PCS);
-+ if (eee_cap < 0) {
-+ priv->eee_active = 0;
-+ return false;
-+ }
-+
-+ cap = mmd_eee_cap_to_ethtool_sup_t(eee_cap);
-+ if (!cap) {
-+ priv->eee_active = 0;
-+ return false;
-+ }
-+
-+ eee_lp = ax88179_phy_read_mmd_indirect(dev,
-+ MDIO_AN_EEE_LPABLE,
-+ MDIO_MMD_AN);
-+ if (eee_lp < 0) {
-+ priv->eee_active = 0;
-+ return false;
-+ }
-+
-+ eee_adv = ax88179_phy_read_mmd_indirect(dev,
-+ MDIO_AN_EEE_ADV,
-+ MDIO_MMD_AN);
-+
-+ if (eee_adv < 0) {
-+ priv->eee_active = 0;
-+ return false;
-+ }
-+
-+ adv = mmd_eee_adv_to_ethtool_adv_t(eee_adv);
-+ lp = mmd_eee_adv_to_ethtool_adv_t(eee_lp);
-+ supported = (ecmd.speed == SPEED_1000) ?
-+ SUPPORTED_1000baseT_Full :
-+ SUPPORTED_100baseT_Full;
-+
-+ if (!(lp & adv & supported)) {
-+ priv->eee_active = 0;
-+ return false;
-+ }
-+
-+ priv->eee_active = 1;
-+ return true;
-+ }
-+
-+ priv->eee_active = 0;
-+ return false;
-+}
-+
-+static void ax88179_disable_eee(struct usbnet *dev)
-+{
-+ u16 tmp16;
-+
-+ tmp16 = GMII_PHY_PGSEL_PAGE3;
-+ ax88179_write_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
-+ GMII_PHY_PAGE_SELECT, 2, &tmp16);
-+
-+ tmp16 = 0x3246;
-+ ax88179_write_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
-+ MII_PHYADDR, 2, &tmp16);
-+
-+ tmp16 = GMII_PHY_PGSEL_PAGE0;
-+ ax88179_write_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
-+ GMII_PHY_PAGE_SELECT, 2, &tmp16);
-+}
-+
-+static void ax88179_enable_eee(struct usbnet *dev)
-+{
-+ u16 tmp16;
-+
-+ tmp16 = GMII_PHY_PGSEL_PAGE3;
-+ ax88179_write_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
-+ GMII_PHY_PAGE_SELECT, 2, &tmp16);
-+
-+ tmp16 = 0x3247;
-+ ax88179_write_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
-+ MII_PHYADDR, 2, &tmp16);
-+
-+ tmp16 = GMII_PHY_PGSEL_PAGE5;
-+ ax88179_write_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
-+ GMII_PHY_PAGE_SELECT, 2, &tmp16);
-+
-+ tmp16 = 0x0680;
-+ ax88179_write_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
-+ MII_BMSR, 2, &tmp16);
-+
-+ tmp16 = GMII_PHY_PGSEL_PAGE0;
-+ ax88179_write_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
-+ GMII_PHY_PAGE_SELECT, 2, &tmp16);
-+}
-+
-+static int ax88179_get_eee(struct net_device *net, struct ethtool_eee *edata)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+ struct ax88179_data *priv = (struct ax88179_data *)dev->data;
-+
-+ edata->eee_enabled = priv->eee_enabled;
-+ edata->eee_active = priv->eee_active;
-+
-+ return ax88179_ethtool_get_eee(dev, edata);
-+}
-+
-+static int ax88179_set_eee(struct net_device *net, struct ethtool_eee *edata)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+ struct ax88179_data *priv = (struct ax88179_data *)dev->data;
-+ int ret = -EOPNOTSUPP;
-+
-+ priv->eee_enabled = edata->eee_enabled;
-+ if (!priv->eee_enabled) {
-+ ax88179_disable_eee(dev);
-+ } else {
-+ priv->eee_enabled = ax88179_chk_eee(dev);
-+ if (!priv->eee_enabled)
-+ return -EOPNOTSUPP;
-+
-+ ax88179_enable_eee(dev);
-+ }
-+
-+ ret = ax88179_ethtool_set_eee(dev, edata);
-+ if (ret)
-+ return ret;
-+
-+ mii_nway_restart(&dev->mii);
-+
-+ usbnet_link_change(dev, 0, 0);
-+
-+ return ret;
-+}
-+
-+static int ax88179_ioctl(struct net_device *net, struct ifreq *rq, int cmd)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+ return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
-+}
-+
-+static const struct ethtool_ops ax88179_ethtool_ops = {
-+ .get_link = ethtool_op_get_link,
-+ .get_msglevel = usbnet_get_msglevel,
-+ .set_msglevel = usbnet_set_msglevel,
-+ .get_wol = ax88179_get_wol,
-+ .set_wol = ax88179_set_wol,
-+ .get_eeprom_len = ax88179_get_eeprom_len,
-+ .get_eeprom = ax88179_get_eeprom,
-+ .get_settings = ax88179_get_settings,
-+ .set_settings = ax88179_set_settings,
-+ .get_eee = ax88179_get_eee,
-+ .set_eee = ax88179_set_eee,
-+ .nway_reset = usbnet_nway_reset,
-+};
-+
-+static void ax88179_set_multicast(struct net_device *net)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+ struct ax88179_data *data = (struct ax88179_data *)dev->data;
-+ u8 *m_filter = ((u8 *)dev->data) + 12;
-+
-+ data->rxctl = (AX_RX_CTL_START | AX_RX_CTL_AB | AX_RX_CTL_IPE);
-+
-+ if (net->flags & IFF_PROMISC) {
-+ data->rxctl |= AX_RX_CTL_PRO;
-+ } else if (net->flags & IFF_ALLMULTI ||
-+ netdev_mc_count(net) > AX_MAX_MCAST) {
-+ data->rxctl |= AX_RX_CTL_AMALL;
-+ } else if (netdev_mc_empty(net)) {
-+ /* just broadcast and directed */
-+ } else {
-+ /* We use the 20 byte dev->data for our 8 byte filter buffer
-+ * to avoid allocating memory that is tricky to free later
-+ */
-+ u32 crc_bits;
-+ struct netdev_hw_addr *ha;
-+
-+ memset(m_filter, 0, AX_MCAST_FLTSIZE);
-+
-+ netdev_for_each_mc_addr(ha, net) {
-+ crc_bits = ether_crc(ETH_ALEN, ha->addr) >> 26;
-+ *(m_filter + (crc_bits >> 3)) |= (1 << (crc_bits & 7));
-+ }
-+
-+ ax88179_write_cmd_async(dev, AX_ACCESS_MAC, AX_MULFLTARY,
-+ AX_MCAST_FLTSIZE, AX_MCAST_FLTSIZE,
-+ m_filter);
-+
-+ data->rxctl |= AX_RX_CTL_AM;
-+ }
-+
-+ ax88179_write_cmd_async(dev, AX_ACCESS_MAC, AX_RX_CTL,
-+ 2, 2, &data->rxctl);
-+}
-+
-+static int
-+ax88179_set_features(struct net_device *net, netdev_features_t features)
-+{
-+ u8 tmp;
-+ struct usbnet *dev = netdev_priv(net);
-+ netdev_features_t changed = net->features ^ features;
-+
-+ if (changed & NETIF_F_IP_CSUM) {
-+ ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_TXCOE_CTL, 1, 1, &tmp);
-+ tmp ^= AX_TXCOE_TCP | AX_TXCOE_UDP;
-+ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_TXCOE_CTL, 1, 1, &tmp);
-+ }
-+
-+ if (changed & NETIF_F_IPV6_CSUM) {
-+ ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_TXCOE_CTL, 1, 1, &tmp);
-+ tmp ^= AX_TXCOE_TCPV6 | AX_TXCOE_UDPV6;
-+ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_TXCOE_CTL, 1, 1, &tmp);
-+ }
-+
-+ if (changed & NETIF_F_RXCSUM) {
-+ ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_RXCOE_CTL, 1, 1, &tmp);
-+ tmp ^= AX_RXCOE_IP | AX_RXCOE_TCP | AX_RXCOE_UDP |
-+ AX_RXCOE_TCPV6 | AX_RXCOE_UDPV6;
-+ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_RXCOE_CTL, 1, 1, &tmp);
-+ }
-+
-+ return 0;
-+}
-+
-+static int ax88179_change_mtu(struct net_device *net, int new_mtu)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+ u16 tmp16;
-+
-+ if (new_mtu <= 0 || new_mtu > 4088)
-+ return -EINVAL;
-+
-+ net->mtu = new_mtu;
-+ dev->hard_mtu = net->mtu + net->hard_header_len;
-+
-+ if (net->mtu > 1500) {
-+ ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE,
-+ 2, 2, &tmp16);
-+ tmp16 |= AX_MEDIUM_JUMBO_EN;
-+ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE,
-+ 2, 2, &tmp16);
-+ } else {
-+ ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE,
-+ 2, 2, &tmp16);
-+ tmp16 &= ~AX_MEDIUM_JUMBO_EN;
-+ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE,
-+ 2, 2, &tmp16);
-+ }
-+
-+ /* max qlen depend on hard_mtu and rx_urb_size */
-+ usbnet_update_max_qlen(dev);
-+
-+ return 0;
-+}
-+
-+static int ax88179_set_mac_addr(struct net_device *net, void *p)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+ struct sockaddr *addr = p;
-+ int ret;
-+
-+ if (netif_running(net))
-+ return -EBUSY;
-+ if (!is_valid_ether_addr(addr->sa_data))
-+ return -EADDRNOTAVAIL;
-+
-+ memcpy(net->dev_addr, addr->sa_data, ETH_ALEN);
-+
-+ /* Set the MAC address */
-+ ret = ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_NODE_ID, ETH_ALEN,
-+ ETH_ALEN, net->dev_addr);
-+ if (ret < 0)
-+ return ret;
-+
-+ return 0;
-+}
-+
-+static const struct net_device_ops ax88179_netdev_ops = {
-+ .ndo_open = usbnet_open,
-+ .ndo_stop = usbnet_stop,
-+ .ndo_start_xmit = usbnet_start_xmit,
-+ .ndo_tx_timeout = usbnet_tx_timeout,
-+ .ndo_change_mtu = ax88179_change_mtu,
-+ .ndo_set_mac_address = ax88179_set_mac_addr,
-+ .ndo_validate_addr = eth_validate_addr,
-+ .ndo_do_ioctl = ax88179_ioctl,
-+ .ndo_set_rx_mode = ax88179_set_multicast,
-+ .ndo_set_features = ax88179_set_features,
-+};
-+
-+static int ax88179_check_eeprom(struct usbnet *dev)
-+{
-+ u8 i, buf, eeprom[20];
-+ u16 csum, delay = HZ / 10;
-+ unsigned long jtimeout;
-+
-+ /* Read EEPROM content */
-+ for (i = 0; i < 6; i++) {
-+ buf = i;
-+ if (ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_SROM_ADDR,
-+ 1, 1, &buf) < 0)
-+ return -EINVAL;
-+
-+ buf = EEP_RD;
-+ if (ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_SROM_CMD,
-+ 1, 1, &buf) < 0)
-+ return -EINVAL;
-+
-+ jtimeout = jiffies + delay;
-+ do {
-+ ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_SROM_CMD,
-+ 1, 1, &buf);
-+
-+ if (time_after(jiffies, jtimeout))
-+ return -EINVAL;
-+
-+ } while (buf & EEP_BUSY);
-+
-+ __ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_SROM_DATA_LOW,
-+ 2, 2, &eeprom[i * 2], 0);
-+
-+ if ((i == 0) && (eeprom[0] == 0xFF))
-+ return -EINVAL;
-+ }
-+
-+ csum = eeprom[6] + eeprom[7] + eeprom[8] + eeprom[9];
-+ csum = (csum >> 8) + (csum & 0xff);
-+ if ((csum + eeprom[10]) != 0xff)
-+ return -EINVAL;
-+
-+ return 0;
-+}
-+
-+static int ax88179_check_efuse(struct usbnet *dev, u16 *ledmode)
-+{
-+ u8 i;
-+ u8 efuse[64];
-+ u16 csum = 0;
-+
-+ if (ax88179_read_cmd(dev, AX_ACCESS_EFUS, 0, 64, 64, efuse) < 0)
-+ return -EINVAL;
-+
-+ if (*efuse == 0xFF)
-+ return -EINVAL;
-+
-+ for (i = 0; i < 64; i++)
-+ csum = csum + efuse[i];
-+
-+ while (csum > 255)
-+ csum = (csum & 0x00FF) + ((csum >> 8) & 0x00FF);
-+
-+ if (csum != 0xFF)
-+ return -EINVAL;
-+
-+ *ledmode = (efuse[51] << 8) | efuse[52];
-+
-+ return 0;
-+}
-+
-+static int ax88179_convert_old_led(struct usbnet *dev, u16 *ledvalue)
-+{
-+ u16 led;
-+
-+ /* Loaded the old eFuse LED Mode */
-+ if (ax88179_read_cmd(dev, AX_ACCESS_EEPROM, 0x3C, 1, 2, &led) < 0)
-+ return -EINVAL;
-+
-+ led >>= 8;
-+ switch (led) {
-+ case 0xFF:
-+ led = LED0_ACTIVE | LED1_LINK_10 | LED1_LINK_100 |
-+ LED1_LINK_1000 | LED2_ACTIVE | LED2_LINK_10 |
-+ LED2_LINK_100 | LED2_LINK_1000 | LED_VALID;
-+ break;
-+ case 0xFE:
-+ led = LED0_ACTIVE | LED1_LINK_1000 | LED2_LINK_100 | LED_VALID;
-+ break;
-+ case 0xFD:
-+ led = LED0_ACTIVE | LED1_LINK_1000 | LED2_LINK_100 |
-+ LED2_LINK_10 | LED_VALID;
-+ break;
-+ case 0xFC:
-+ led = LED0_ACTIVE | LED1_ACTIVE | LED1_LINK_1000 | LED2_ACTIVE |
-+ LED2_LINK_100 | LED2_LINK_10 | LED_VALID;
-+ break;
-+ default:
-+ led = LED0_ACTIVE | LED1_LINK_10 | LED1_LINK_100 |
-+ LED1_LINK_1000 | LED2_ACTIVE | LED2_LINK_10 |
-+ LED2_LINK_100 | LED2_LINK_1000 | LED_VALID;
-+ break;
-+ }
-+
-+ *ledvalue = led;
-+
-+ return 0;
-+}
-+
-+static int ax88179_led_setting(struct usbnet *dev)
-+{
-+ u8 ledfd, value = 0;
-+ u16 tmp, ledact, ledlink, ledvalue = 0, delay = HZ / 10;
-+ unsigned long jtimeout;
-+
-+ /* Check AX88179 version. UA1 or UA2*/
-+ ax88179_read_cmd(dev, AX_ACCESS_MAC, GENERAL_STATUS, 1, 1, &value);
-+
-+ if (!(value & AX_SECLD)) { /* UA1 */
-+ value = AX_GPIO_CTRL_GPIO3EN | AX_GPIO_CTRL_GPIO2EN |
-+ AX_GPIO_CTRL_GPIO1EN;
-+ if (ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_GPIO_CTRL,
-+ 1, 1, &value) < 0)
-+ return -EINVAL;
-+ }
-+
-+ /* Check EEPROM */
-+ if (!ax88179_check_eeprom(dev)) {
-+ value = 0x42;
-+ if (ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_SROM_ADDR,
-+ 1, 1, &value) < 0)
-+ return -EINVAL;
-+
-+ value = EEP_RD;
-+ if (ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_SROM_CMD,
-+ 1, 1, &value) < 0)
-+ return -EINVAL;
-+
-+ jtimeout = jiffies + delay;
-+ do {
-+ ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_SROM_CMD,
-+ 1, 1, &value);
-+
-+ if (time_after(jiffies, jtimeout))
-+ return -EINVAL;
-+
-+ } while (value & EEP_BUSY);
-+
-+ ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_SROM_DATA_HIGH,
-+ 1, 1, &value);
-+ ledvalue = (value << 8);
-+
-+ ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_SROM_DATA_LOW,
-+ 1, 1, &value);
-+ ledvalue |= value;
-+
-+ /* load internal ROM for defaule setting */
-+ if ((ledvalue == 0xFFFF) || ((ledvalue & LED_VALID) == 0))
-+ ax88179_convert_old_led(dev, &ledvalue);
-+
-+ } else if (!ax88179_check_efuse(dev, &ledvalue)) {
-+ if ((ledvalue == 0xFFFF) || ((ledvalue & LED_VALID) == 0))
-+ ax88179_convert_old_led(dev, &ledvalue);
-+ } else {
-+ ax88179_convert_old_led(dev, &ledvalue);
-+ }
-+
-+ tmp = GMII_PHY_PGSEL_EXT;
-+ ax88179_write_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
-+ GMII_PHY_PAGE_SELECT, 2, &tmp);
-+
-+ tmp = 0x2c;
-+ ax88179_write_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
-+ GMII_PHYPAGE, 2, &tmp);
-+
-+ ax88179_read_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
-+ GMII_LED_ACT, 2, &ledact);
-+
-+ ax88179_read_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
-+ GMII_LED_LINK, 2, &ledlink);
-+
-+ ledact &= GMII_LED_ACTIVE_MASK;
-+ ledlink &= GMII_LED_LINK_MASK;
-+
-+ if (ledvalue & LED0_ACTIVE)
-+ ledact |= GMII_LED0_ACTIVE;
-+
-+ if (ledvalue & LED1_ACTIVE)
-+ ledact |= GMII_LED1_ACTIVE;
-+
-+ if (ledvalue & LED2_ACTIVE)
-+ ledact |= GMII_LED2_ACTIVE;
-+
-+ if (ledvalue & LED0_LINK_10)
-+ ledlink |= GMII_LED0_LINK_10;
-+
-+ if (ledvalue & LED1_LINK_10)
-+ ledlink |= GMII_LED1_LINK_10;
-+
-+ if (ledvalue & LED2_LINK_10)
-+ ledlink |= GMII_LED2_LINK_10;
-+
-+ if (ledvalue & LED0_LINK_100)
-+ ledlink |= GMII_LED0_LINK_100;
-+
-+ if (ledvalue & LED1_LINK_100)
-+ ledlink |= GMII_LED1_LINK_100;
-+
-+ if (ledvalue & LED2_LINK_100)
-+ ledlink |= GMII_LED2_LINK_100;
-+
-+ if (ledvalue & LED0_LINK_1000)
-+ ledlink |= GMII_LED0_LINK_1000;
-+
-+ if (ledvalue & LED1_LINK_1000)
-+ ledlink |= GMII_LED1_LINK_1000;
-+
-+ if (ledvalue & LED2_LINK_1000)
-+ ledlink |= GMII_LED2_LINK_1000;
-+
-+ tmp = ledact;
-+ ax88179_write_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
-+ GMII_LED_ACT, 2, &tmp);
-+
-+ tmp = ledlink;
-+ ax88179_write_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
-+ GMII_LED_LINK, 2, &tmp);
-+
-+ tmp = GMII_PHY_PGSEL_PAGE0;
-+ ax88179_write_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
-+ GMII_PHY_PAGE_SELECT, 2, &tmp);
-+
-+ /* LED full duplex setting */
-+ ledfd = 0;
-+ if (ledvalue & LED0_FD)
-+ ledfd |= 0x01;
-+ else if ((ledvalue & LED0_USB3_MASK) == 0)
-+ ledfd |= 0x02;
-+
-+ if (ledvalue & LED1_FD)
-+ ledfd |= 0x04;
-+ else if ((ledvalue & LED1_USB3_MASK) == 0)
-+ ledfd |= 0x08;
-+
-+ if (ledvalue & LED2_FD)
-+ ledfd |= 0x10;
-+ else if ((ledvalue & LED2_USB3_MASK) == 0)
-+ ledfd |= 0x20;
-+
-+ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_LEDCTRL, 1, 1, &ledfd);
-+
-+ return 0;
-+}
-+
-+static int ax88179_bind(struct usbnet *dev, struct usb_interface *intf)
-+{
-+ u8 buf[5];
-+ u16 *tmp16;
-+ u8 *tmp;
-+ struct ax88179_data *ax179_data = (struct ax88179_data *)dev->data;
-+ struct ethtool_eee eee_data;
-+
-+ usbnet_get_endpoints(dev, intf);
-+
-+ tmp16 = (u16 *)buf;
-+ tmp = (u8 *)buf;
-+
-+ memset(ax179_data, 0, sizeof(*ax179_data));
-+
-+ /* Power up ethernet PHY */
-+ *tmp16 = 0;
-+ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_PHYPWR_RSTCTL, 2, 2, tmp16);
-+ *tmp16 = AX_PHYPWR_RSTCTL_IPRL;
-+ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_PHYPWR_RSTCTL, 2, 2, tmp16);
-+ msleep(200);
-+
-+ *tmp = AX_CLK_SELECT_ACS | AX_CLK_SELECT_BCS;
-+ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_CLK_SELECT, 1, 1, tmp);
-+ msleep(100);
-+
-+ ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_NODE_ID, ETH_ALEN,
-+ ETH_ALEN, dev->net->dev_addr);
-+ memcpy(dev->net->perm_addr, dev->net->dev_addr, ETH_ALEN);
-+
-+ /* RX bulk configuration */
-+ memcpy(tmp, &AX88179_BULKIN_SIZE[0], 5);
-+ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_RX_BULKIN_QCTRL, 5, 5, tmp);
-+
-+ dev->rx_urb_size = 1024 * 20;
-+
-+ *tmp = 0x34;
-+ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_PAUSE_WATERLVL_LOW, 1, 1, tmp);
-+
-+ *tmp = 0x52;
-+ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_PAUSE_WATERLVL_HIGH,
-+ 1, 1, tmp);
-+
-+ dev->net->netdev_ops = &ax88179_netdev_ops;
-+ dev->net->ethtool_ops = &ax88179_ethtool_ops;
-+ dev->net->needed_headroom = 8;
-+
-+ /* Initialize MII structure */
-+ dev->mii.dev = dev->net;
-+ dev->mii.mdio_read = ax88179_mdio_read;
-+ dev->mii.mdio_write = ax88179_mdio_write;
-+ dev->mii.phy_id_mask = 0xff;
-+ dev->mii.reg_num_mask = 0xff;
-+ dev->mii.phy_id = 0x03;
-+ dev->mii.supports_gmii = 1;
-+
-+ dev->net->features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
-+ NETIF_F_RXCSUM;
-+
-+ dev->net->hw_features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
-+ NETIF_F_RXCSUM;
-+
-+ /* Enable checksum offload */
-+ *tmp = AX_RXCOE_IP | AX_RXCOE_TCP | AX_RXCOE_UDP |
-+ AX_RXCOE_TCPV6 | AX_RXCOE_UDPV6;
-+ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_RXCOE_CTL, 1, 1, tmp);
-+
-+ *tmp = AX_TXCOE_IP | AX_TXCOE_TCP | AX_TXCOE_UDP |
-+ AX_TXCOE_TCPV6 | AX_TXCOE_UDPV6;
-+ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_TXCOE_CTL, 1, 1, tmp);
-+
-+ /* Configure RX control register => start operation */
-+ *tmp16 = AX_RX_CTL_DROPCRCERR | AX_RX_CTL_IPE | AX_RX_CTL_START |
-+ AX_RX_CTL_AP | AX_RX_CTL_AMALL | AX_RX_CTL_AB;
-+ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_RX_CTL, 2, 2, tmp16);
-+
-+ *tmp = AX_MONITOR_MODE_PMETYPE | AX_MONITOR_MODE_PMEPOL |
-+ AX_MONITOR_MODE_RWMP;
-+ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_MONITOR_MOD, 1, 1, tmp);
-+
-+ /* Configure default medium type => giga */
-+ *tmp16 = AX_MEDIUM_RECEIVE_EN | AX_MEDIUM_TXFLOW_CTRLEN |
-+ AX_MEDIUM_RXFLOW_CTRLEN | AX_MEDIUM_FULL_DUPLEX |
-+ AX_MEDIUM_GIGAMODE;
-+ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE,
-+ 2, 2, tmp16);
-+
-+ ax88179_led_setting(dev);
-+
-+ ax179_data->eee_enabled = 0;
-+ ax179_data->eee_active = 0;
-+
-+ ax88179_disable_eee(dev);
-+
-+ ax88179_ethtool_get_eee(dev, &eee_data);
-+ eee_data.advertised = 0;
-+ ax88179_ethtool_set_eee(dev, &eee_data);
-+
-+ /* Restart autoneg */
-+ mii_nway_restart(&dev->mii);
-+
-+ usbnet_link_change(dev, 0, 0);
-+
-+ return 0;
-+}
-+
-+static void ax88179_unbind(struct usbnet *dev, struct usb_interface *intf)
-+{
-+ u16 tmp16;
-+
-+ /* Configure RX control register => stop operation */
-+ tmp16 = AX_RX_CTL_STOP;
-+ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_RX_CTL, 2, 2, &tmp16);
-+
-+ tmp16 = 0;
-+ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_CLK_SELECT, 1, 1, &tmp16);
-+
-+ /* Power down ethernet PHY */
-+ tmp16 = 0;
-+ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_PHYPWR_RSTCTL, 2, 2, &tmp16);
-+}
-+
-+static void
-+ax88179_rx_checksum(struct sk_buff *skb, u32 *pkt_hdr)
-+{
-+ skb->ip_summed = CHECKSUM_NONE;
-+
-+ /* checksum error bit is set */
-+ if ((*pkt_hdr & AX_RXHDR_L3CSUM_ERR) ||
-+ (*pkt_hdr & AX_RXHDR_L4CSUM_ERR))
-+ return;
-+
-+ /* It must be a TCP or UDP packet with a valid checksum */
-+ if (((*pkt_hdr & AX_RXHDR_L4_TYPE_MASK) == AX_RXHDR_L4_TYPE_TCP) ||
-+ ((*pkt_hdr & AX_RXHDR_L4_TYPE_MASK) == AX_RXHDR_L4_TYPE_UDP))
-+ skb->ip_summed = CHECKSUM_UNNECESSARY;
-+}
-+
-+static int ax88179_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
-+{
-+ struct sk_buff *ax_skb;
-+ int pkt_cnt;
-+ u32 rx_hdr;
-+ u16 hdr_off;
-+ u32 *pkt_hdr;
-+
-+ /* This check is no longer done by usbnet */
-+ if (skb->len < dev->net->hard_header_len)
-+ return 0;
-+
-+ skb_trim(skb, skb->len - 4);
-+ memcpy(&rx_hdr, skb_tail_pointer(skb), 4);
-+ le32_to_cpus(&rx_hdr);
-+
-+ pkt_cnt = (u16)rx_hdr;
-+ hdr_off = (u16)(rx_hdr >> 16);
-+ pkt_hdr = (u32 *)(skb->data + hdr_off);
-+
-+ while (pkt_cnt--) {
-+ u16 pkt_len;
-+
-+ le32_to_cpus(pkt_hdr);
-+ pkt_len = (*pkt_hdr >> 16) & 0x1fff;
-+
-+ /* Check CRC or runt packet */
-+ if ((*pkt_hdr & AX_RXHDR_CRC_ERR) ||
-+ (*pkt_hdr & AX_RXHDR_DROP_ERR)) {
-+ skb_pull(skb, (pkt_len + 7) & 0xFFF8);
-+ pkt_hdr++;
-+ continue;
-+ }
-+
-+ if (pkt_cnt == 0) {
-+ /* Skip IP alignment psudo header */
-+ skb_pull(skb, 2);
-+ skb->len = pkt_len;
-+ skb_set_tail_pointer(skb, pkt_len);
-+ skb->truesize = pkt_len + sizeof(struct sk_buff);
-+ ax88179_rx_checksum(skb, pkt_hdr);
-+ return 1;
-+ }
-+
-+ ax_skb = skb_clone(skb, GFP_ATOMIC);
-+ if (ax_skb) {
-+ ax_skb->len = pkt_len;
-+ ax_skb->data = skb->data + 2;
-+ skb_set_tail_pointer(ax_skb, pkt_len);
-+ ax_skb->truesize = pkt_len + sizeof(struct sk_buff);
-+ ax88179_rx_checksum(ax_skb, pkt_hdr);
-+ usbnet_skb_return(dev, ax_skb);
-+ } else {
-+ return 0;
-+ }
-+
-+ skb_pull(skb, (pkt_len + 7) & 0xFFF8);
-+ pkt_hdr++;
-+ }
-+ return 1;
-+}
-+
-+static struct sk_buff *
-+ax88179_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
-+{
-+ u32 tx_hdr1, tx_hdr2;
-+ int frame_size = dev->maxpacket;
-+ int mss = skb_shinfo(skb)->gso_size;
-+ int headroom;
-+
-+ tx_hdr1 = skb->len;
-+ tx_hdr2 = mss;
-+ if (((skb->len + 8) % frame_size) == 0)
-+ tx_hdr2 |= 0x80008000; /* Enable padding */
-+
-+ headroom = skb_headroom(skb) - 8;
-+
-+ if ((skb_header_cloned(skb) || headroom < 0) &&
-+ pskb_expand_head(skb, headroom < 0 ? 8 : 0, 0, GFP_ATOMIC)) {
-+ dev_kfree_skb_any(skb);
-+ return NULL;
-+ }
-+
-+ skb_push(skb, 4);
-+ cpu_to_le32s(&tx_hdr2);
-+ skb_copy_to_linear_data(skb, &tx_hdr2, 4);
-+
-+ skb_push(skb, 4);
-+ cpu_to_le32s(&tx_hdr1);
-+ skb_copy_to_linear_data(skb, &tx_hdr1, 4);
-+
-+ return skb;
-+}
-+
-+static int ax88179_link_reset(struct usbnet *dev)
-+{
-+ struct ax88179_data *ax179_data = (struct ax88179_data *)dev->data;
-+ u8 tmp[5], link_sts;
-+ u16 mode, tmp16, delay = HZ / 10;
-+ u32 tmp32 = 0x40000000;
-+ unsigned long jtimeout;
-+
-+ jtimeout = jiffies + delay;
-+ while (tmp32 & 0x40000000) {
-+ mode = 0;
-+ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_RX_CTL, 2, 2, &mode);
-+ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_RX_CTL, 2, 2,
-+ &ax179_data->rxctl);
-+
-+ /*link up, check the usb device control TX FIFO full or empty*/
-+ ax88179_read_cmd(dev, 0x81, 0x8c, 0, 4, &tmp32);
-+
-+ if (time_after(jiffies, jtimeout))
-+ return 0;
-+ }
-+
-+ mode = AX_MEDIUM_RECEIVE_EN | AX_MEDIUM_TXFLOW_CTRLEN |
-+ AX_MEDIUM_RXFLOW_CTRLEN;
-+
-+ ax88179_read_cmd(dev, AX_ACCESS_MAC, PHYSICAL_LINK_STATUS,
-+ 1, 1, &link_sts);
-+
-+ ax88179_read_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
-+ GMII_PHY_PHYSR, 2, &tmp16);
-+
-+ if (!(tmp16 & GMII_PHY_PHYSR_LINK)) {
-+ return 0;
-+ } else if (GMII_PHY_PHYSR_GIGA == (tmp16 & GMII_PHY_PHYSR_SMASK)) {
-+ mode |= AX_MEDIUM_GIGAMODE | AX_MEDIUM_EN_125MHZ;
-+ if (dev->net->mtu > 1500)
-+ mode |= AX_MEDIUM_JUMBO_EN;
-+
-+ if (link_sts & AX_USB_SS)
-+ memcpy(tmp, &AX88179_BULKIN_SIZE[0], 5);
-+ else if (link_sts & AX_USB_HS)
-+ memcpy(tmp, &AX88179_BULKIN_SIZE[1], 5);
-+ else
-+ memcpy(tmp, &AX88179_BULKIN_SIZE[3], 5);
-+ } else if (GMII_PHY_PHYSR_100 == (tmp16 & GMII_PHY_PHYSR_SMASK)) {
-+ mode |= AX_MEDIUM_PS;
-+
-+ if (link_sts & (AX_USB_SS | AX_USB_HS))
-+ memcpy(tmp, &AX88179_BULKIN_SIZE[2], 5);
-+ else
-+ memcpy(tmp, &AX88179_BULKIN_SIZE[3], 5);
-+ } else {
-+ memcpy(tmp, &AX88179_BULKIN_SIZE[3], 5);
-+ }
-+
-+ /* RX bulk configuration */
-+ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_RX_BULKIN_QCTRL, 5, 5, tmp);
-+
-+ dev->rx_urb_size = (1024 * (tmp[3] + 2));
-+
-+ if (tmp16 & GMII_PHY_PHYSR_FULL)
-+ mode |= AX_MEDIUM_FULL_DUPLEX;
-+ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE,
-+ 2, 2, &mode);
-+
-+ ax179_data->eee_enabled = ax88179_chk_eee(dev);
-+
-+ netif_carrier_on(dev->net);
-+
-+ return 0;
-+}
-+
-+static int ax88179_reset(struct usbnet *dev)
-+{
-+ u8 buf[5];
-+ u16 *tmp16;
-+ u8 *tmp;
-+ struct ax88179_data *ax179_data = (struct ax88179_data *)dev->data;
-+ struct ethtool_eee eee_data;
-+
-+ tmp16 = (u16 *)buf;
-+ tmp = (u8 *)buf;
-+
-+ /* Power up ethernet PHY */
-+ *tmp16 = 0;
-+ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_PHYPWR_RSTCTL, 2, 2, tmp16);
-+
-+ *tmp16 = AX_PHYPWR_RSTCTL_IPRL;
-+ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_PHYPWR_RSTCTL, 2, 2, tmp16);
-+ msleep(200);
-+
-+ *tmp = AX_CLK_SELECT_ACS | AX_CLK_SELECT_BCS;
-+ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_CLK_SELECT, 1, 1, tmp);
-+ msleep(100);
-+
-+ /* Ethernet PHY Auto Detach*/
-+ ax88179_auto_detach(dev, 0);
-+
-+ ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_NODE_ID, ETH_ALEN, ETH_ALEN,
-+ dev->net->dev_addr);
-+ memcpy(dev->net->perm_addr, dev->net->dev_addr, ETH_ALEN);
-+
-+ /* RX bulk configuration */
-+ memcpy(tmp, &AX88179_BULKIN_SIZE[0], 5);
-+ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_RX_BULKIN_QCTRL, 5, 5, tmp);
-+
-+ dev->rx_urb_size = 1024 * 20;
-+
-+ *tmp = 0x34;
-+ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_PAUSE_WATERLVL_LOW, 1, 1, tmp);
-+
-+ *tmp = 0x52;
-+ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_PAUSE_WATERLVL_HIGH,
-+ 1, 1, tmp);
-+
-+ dev->net->features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
-+ NETIF_F_RXCSUM;
-+
-+ dev->net->hw_features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
-+ NETIF_F_RXCSUM;
-+
-+ /* Enable checksum offload */
-+ *tmp = AX_RXCOE_IP | AX_RXCOE_TCP | AX_RXCOE_UDP |
-+ AX_RXCOE_TCPV6 | AX_RXCOE_UDPV6;
-+ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_RXCOE_CTL, 1, 1, tmp);
-+
-+ *tmp = AX_TXCOE_IP | AX_TXCOE_TCP | AX_TXCOE_UDP |
-+ AX_TXCOE_TCPV6 | AX_TXCOE_UDPV6;
-+ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_TXCOE_CTL, 1, 1, tmp);
-+
-+ /* Configure RX control register => start operation */
-+ *tmp16 = AX_RX_CTL_DROPCRCERR | AX_RX_CTL_IPE | AX_RX_CTL_START |
-+ AX_RX_CTL_AP | AX_RX_CTL_AMALL | AX_RX_CTL_AB;
-+ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_RX_CTL, 2, 2, tmp16);
-+
-+ *tmp = AX_MONITOR_MODE_PMETYPE | AX_MONITOR_MODE_PMEPOL |
-+ AX_MONITOR_MODE_RWMP;
-+ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_MONITOR_MOD, 1, 1, tmp);
-+
-+ /* Configure default medium type => giga */
-+ *tmp16 = AX_MEDIUM_RECEIVE_EN | AX_MEDIUM_TXFLOW_CTRLEN |
-+ AX_MEDIUM_RXFLOW_CTRLEN | AX_MEDIUM_FULL_DUPLEX |
-+ AX_MEDIUM_GIGAMODE;
-+ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE,
-+ 2, 2, tmp16);
-+
-+ ax88179_led_setting(dev);
-+
-+ ax179_data->eee_enabled = 0;
-+ ax179_data->eee_active = 0;
-+
-+ ax88179_disable_eee(dev);
-+
-+ ax88179_ethtool_get_eee(dev, &eee_data);
-+ eee_data.advertised = 0;
-+ ax88179_ethtool_set_eee(dev, &eee_data);
-+
-+ /* Restart autoneg */
-+ mii_nway_restart(&dev->mii);
-+
-+ usbnet_link_change(dev, 0, 0);
-+
-+ return 0;
-+}
-+
-+static int ax88179_stop(struct usbnet *dev)
-+{
-+ u16 tmp16;
-+
-+ ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE,
-+ 2, 2, &tmp16);
-+ tmp16 &= ~AX_MEDIUM_RECEIVE_EN;
-+ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE,
-+ 2, 2, &tmp16);
-+
-+ return 0;
-+}
-+
-+static const struct driver_info ax88179_info = {
-+ .description = "ASIX AX88179 USB 3.0 Gigabit Ethernet",
-+ .bind = ax88179_bind,
-+ .unbind = ax88179_unbind,
-+ .status = ax88179_status,
-+ .link_reset = ax88179_link_reset,
-+ .reset = ax88179_reset,
-+ .stop = ax88179_stop,
-+ .flags = FLAG_ETHER | FLAG_FRAMING_AX,
-+ .rx_fixup = ax88179_rx_fixup,
-+ .tx_fixup = ax88179_tx_fixup,
-+};
-+
-+static const struct driver_info ax88178a_info = {
-+ .description = "ASIX AX88178A USB 2.0 Gigabit Ethernet",
-+ .bind = ax88179_bind,
-+ .unbind = ax88179_unbind,
-+ .status = ax88179_status,
-+ .link_reset = ax88179_link_reset,
-+ .reset = ax88179_reset,
-+ .stop = ax88179_stop,
-+ .flags = FLAG_ETHER | FLAG_FRAMING_AX,
-+ .rx_fixup = ax88179_rx_fixup,
-+ .tx_fixup = ax88179_tx_fixup,
-+};
-+
-+static const struct driver_info dlink_dub1312_info = {
-+ .description = "D-Link DUB-1312 USB 3.0 to Gigabit Ethernet Adapter",
-+ .bind = ax88179_bind,
-+ .unbind = ax88179_unbind,
-+ .status = ax88179_status,
-+ .link_reset = ax88179_link_reset,
-+ .reset = ax88179_reset,
-+ .stop = ax88179_stop,
-+ .flags = FLAG_ETHER | FLAG_FRAMING_AX,
-+ .rx_fixup = ax88179_rx_fixup,
-+ .tx_fixup = ax88179_tx_fixup,
-+};
-+
-+static const struct driver_info sitecom_info = {
-+ .description = "Sitecom USB 3.0 to Gigabit Adapter",
-+ .bind = ax88179_bind,
-+ .unbind = ax88179_unbind,
-+ .status = ax88179_status,
-+ .link_reset = ax88179_link_reset,
-+ .reset = ax88179_reset,
-+ .stop = ax88179_stop,
-+ .flags = FLAG_ETHER | FLAG_FRAMING_AX,
-+ .rx_fixup = ax88179_rx_fixup,
-+ .tx_fixup = ax88179_tx_fixup,
-+};
-+
-+static const struct driver_info samsung_info = {
-+ .description = "Samsung USB Ethernet Adapter",
-+ .bind = ax88179_bind,
-+ .unbind = ax88179_unbind,
-+ .status = ax88179_status,
-+ .link_reset = ax88179_link_reset,
-+ .reset = ax88179_reset,
-+ .stop = ax88179_stop,
-+ .flags = FLAG_ETHER | FLAG_FRAMING_AX,
-+ .rx_fixup = ax88179_rx_fixup,
-+ .tx_fixup = ax88179_tx_fixup,
-+};
-+
-+static const struct driver_info lenovo_info = {
-+ .description = "Lenovo OneLinkDock Gigabit LAN",
-+ .bind = ax88179_bind,
-+ .unbind = ax88179_unbind,
-+ .status = ax88179_status,
-+ .link_reset = ax88179_link_reset,
-+ .reset = ax88179_reset,
-+ .stop = ax88179_stop,
-+ .flags = FLAG_ETHER | FLAG_FRAMING_AX,
-+ .rx_fixup = ax88179_rx_fixup,
-+ .tx_fixup = ax88179_tx_fixup,
-+};
-+
-+static const struct usb_device_id products[] = {
-+{
-+ /* ASIX AX88179 10/100/1000 */
-+ USB_DEVICE(0x0b95, 0x1790),
-+ .driver_info = (unsigned long)&ax88179_info,
-+}, {
-+ /* ASIX AX88178A 10/100/1000 */
-+ USB_DEVICE(0x0b95, 0x178a),
-+ .driver_info = (unsigned long)&ax88178a_info,
-+}, {
-+ /* D-Link DUB-1312 USB 3.0 to Gigabit Ethernet Adapter */
-+ USB_DEVICE(0x2001, 0x4a00),
-+ .driver_info = (unsigned long)&dlink_dub1312_info,
-+}, {
-+ /* Sitecom USB 3.0 to Gigabit Adapter */
-+ USB_DEVICE(0x0df6, 0x0072),
-+ .driver_info = (unsigned long)&sitecom_info,
-+}, {
-+ /* Samsung USB Ethernet Adapter */
-+ USB_DEVICE(0x04e8, 0xa100),
-+ .driver_info = (unsigned long)&samsung_info,
-+}, {
-+ /* Lenovo OneLinkDock Gigabit LAN */
-+ USB_DEVICE(0x17ef, 0x304b),
-+ .driver_info = (unsigned long)&lenovo_info,
-+},
-+ { },
-+};
-+MODULE_DEVICE_TABLE(usb, products);
-+
-+static struct usb_driver ax88179_178a_driver = {
-+ .name = "ax88179_178a",
-+ .id_table = products,
-+ .probe = usbnet_probe,
-+ .suspend = ax88179_suspend,
-+ .resume = ax88179_resume,
-+ .reset_resume = ax88179_resume,
-+ .disconnect = usbnet_disconnect,
-+ .supports_autosuspend = 1,
-+ .disable_hub_initiated_lpm = 1,
-+};
-+
-+module_usb_driver(ax88179_178a_driver);
-+
-+MODULE_DESCRIPTION("ASIX AX88179/178A based USB 3.0/2.0 Gigabit Ethernet Devices");
-+MODULE_LICENSE("GPL");
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/catc.c backports-3.18.1-1/drivers/net/usb/catc.c
---- backports-3.18.1-1.org/drivers/net/usb/catc.c 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/catc.c 2014-12-16 18:39:45.000000000 +0100
-@@ -0,0 +1,965 @@
-+/*
-+ * Copyright (c) 2001 Vojtech Pavlik
-+ *
-+ * CATC EL1210A NetMate USB Ethernet driver
-+ *
-+ * Sponsored by SuSE
-+ *
-+ * Based on the work of
-+ * Donald Becker
-+ *
-+ * Old chipset support added by Simon Evans <spse(a)secret.org.uk> 2002
-+ * - adds support for Belkin F5U011
-+ */
-+
-+/*
-+ * 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, see <http://www.gnu.org/licenses/>.
-+ *
-+ * Should you need to contact me, the author, you can do so either by
-+ * e-mail - mail your message to <vojtech(a)suse.cz>, or by paper mail:
-+ * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/string.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/skbuff.h>
-+#include <linux/spinlock.h>
-+#include <linux/ethtool.h>
-+#include <linux/crc32.h>
-+#include <linux/bitops.h>
-+#include <linux/gfp.h>
-+#include <asm/uaccess.h>
-+
-+#undef DEBUG
-+
-+#include <linux/usb.h>
-+
-+/*
-+ * Version information.
-+ */
-+
-+#define DRIVER_VERSION "v2.8"
-+#define DRIVER_AUTHOR "Vojtech Pavlik <vojtech(a)suse.cz>"
-+#define DRIVER_DESC "CATC EL1210A NetMate USB Ethernet driver"
-+#define SHORT_DRIVER_DESC "EL1210A NetMate USB Ethernet"
-+
-+MODULE_AUTHOR(DRIVER_AUTHOR);
-+MODULE_DESCRIPTION(DRIVER_DESC);
-+MODULE_LICENSE("GPL");
-+
-+static const char driver_name[] = "catc";
-+
-+/*
-+ * Some defines.
-+ */
-+
-+#define STATS_UPDATE (HZ) /* Time between stats updates */
-+#define TX_TIMEOUT (5*HZ) /* Max time the queue can be stopped */
-+#define PKT_SZ 1536 /* Max Ethernet packet size */
-+#define RX_MAX_BURST 15 /* Max packets per rx buffer (> 0, < 16) */
-+#define TX_MAX_BURST 15 /* Max full sized packets per tx buffer (> 0) */
-+#define CTRL_QUEUE 16 /* Max control requests in flight (power of two) */
-+#define RX_PKT_SZ 1600 /* Max size of receive packet for F5U011 */
-+
-+/*
-+ * Control requests.
-+ */
-+
-+enum control_requests {
-+ ReadMem = 0xf1,
-+ GetMac = 0xf2,
-+ Reset = 0xf4,
-+ SetMac = 0xf5,
-+ SetRxMode = 0xf5, /* F5U011 only */
-+ WriteROM = 0xf8,
-+ SetReg = 0xfa,
-+ GetReg = 0xfb,
-+ WriteMem = 0xfc,
-+ ReadROM = 0xfd,
-+};
-+
-+/*
-+ * Registers.
-+ */
-+
-+enum register_offsets {
-+ TxBufCount = 0x20,
-+ RxBufCount = 0x21,
-+ OpModes = 0x22,
-+ TxQed = 0x23,
-+ RxQed = 0x24,
-+ MaxBurst = 0x25,
-+ RxUnit = 0x60,
-+ EthStatus = 0x61,
-+ StationAddr0 = 0x67,
-+ EthStats = 0x69,
-+ LEDCtrl = 0x81,
-+};
-+
-+enum eth_stats {
-+ TxSingleColl = 0x00,
-+ TxMultiColl = 0x02,
-+ TxExcessColl = 0x04,
-+ RxFramErr = 0x06,
-+};
-+
-+enum op_mode_bits {
-+ Op3MemWaits = 0x03,
-+ OpLenInclude = 0x08,
-+ OpRxMerge = 0x10,
-+ OpTxMerge = 0x20,
-+ OpWin95bugfix = 0x40,
-+ OpLoopback = 0x80,
-+};
-+
-+enum rx_filter_bits {
-+ RxEnable = 0x01,
-+ RxPolarity = 0x02,
-+ RxForceOK = 0x04,
-+ RxMultiCast = 0x08,
-+ RxPromisc = 0x10,
-+ AltRxPromisc = 0x20, /* F5U011 uses different bit */
-+};
-+
-+enum led_values {
-+ LEDFast = 0x01,
-+ LEDSlow = 0x02,
-+ LEDFlash = 0x03,
-+ LEDPulse = 0x04,
-+ LEDLink = 0x08,
-+};
-+
-+enum link_status {
-+ LinkNoChange = 0,
-+ LinkGood = 1,
-+ LinkBad = 2
-+};
-+
-+/*
-+ * The catc struct.
-+ */
-+
-+#define CTRL_RUNNING 0
-+#define RX_RUNNING 1
-+#define TX_RUNNING 2
-+
-+struct catc {
-+ struct net_device *netdev;
-+ struct usb_device *usbdev;
-+
-+ unsigned long flags;
-+
-+ unsigned int tx_ptr, tx_idx;
-+ unsigned int ctrl_head, ctrl_tail;
-+ spinlock_t tx_lock, ctrl_lock;
-+
-+ u8 tx_buf[2][TX_MAX_BURST * (PKT_SZ + 2)];
-+ u8 rx_buf[RX_MAX_BURST * (PKT_SZ + 2)];
-+ u8 irq_buf[2];
-+ u8 ctrl_buf[64];
-+ struct usb_ctrlrequest ctrl_dr;
-+
-+ struct timer_list timer;
-+ u8 stats_buf[8];
-+ u16 stats_vals[4];
-+ unsigned long last_stats;
-+
-+ u8 multicast[64];
-+
-+ struct ctrl_queue {
-+ u8 dir;
-+ u8 request;
-+ u16 value;
-+ u16 index;
-+ void *buf;
-+ int len;
-+ void (*callback)(struct catc *catc, struct ctrl_queue *q);
-+ } ctrl_queue[CTRL_QUEUE];
-+
-+ struct urb *tx_urb, *rx_urb, *irq_urb, *ctrl_urb;
-+
-+ u8 is_f5u011; /* Set if device is an F5U011 */
-+ u8 rxmode[2]; /* Used for F5U011 */
-+ atomic_t recq_sz; /* Used for F5U011 - counter of waiting rx packets */
-+};
-+
-+/*
-+ * Useful macros.
-+ */
-+
-+#define catc_get_mac(catc, mac) catc_ctrl_msg(catc, USB_DIR_IN, GetMac, 0, 0, mac, 6)
-+#define catc_reset(catc) catc_ctrl_msg(catc, USB_DIR_OUT, Reset, 0, 0, NULL, 0)
-+#define catc_set_reg(catc, reg, val) catc_ctrl_msg(catc, USB_DIR_OUT, SetReg, val, reg, NULL, 0)
-+#define catc_get_reg(catc, reg, buf) catc_ctrl_msg(catc, USB_DIR_IN, GetReg, 0, reg, buf, 1)
-+#define catc_write_mem(catc, addr, buf, size) catc_ctrl_msg(catc, USB_DIR_OUT, WriteMem, 0, addr, buf, size)
-+#define catc_read_mem(catc, addr, buf, size) catc_ctrl_msg(catc, USB_DIR_IN, ReadMem, 0, addr, buf, size)
-+
-+#define f5u011_rxmode(catc, rxmode) catc_ctrl_msg(catc, USB_DIR_OUT, SetRxMode, 0, 1, rxmode, 2)
-+#define f5u011_rxmode_async(catc, rxmode) catc_ctrl_async(catc, USB_DIR_OUT, SetRxMode, 0, 1, &rxmode, 2, NULL)
-+#define f5u011_mchash_async(catc, hash) catc_ctrl_async(catc, USB_DIR_OUT, SetRxMode, 0, 2, &hash, 8, NULL)
-+
-+#define catc_set_reg_async(catc, reg, val) catc_ctrl_async(catc, USB_DIR_OUT, SetReg, val, reg, NULL, 0, NULL)
-+#define catc_get_reg_async(catc, reg, cb) catc_ctrl_async(catc, USB_DIR_IN, GetReg, 0, reg, NULL, 1, cb)
-+#define catc_write_mem_async(catc, addr, buf, size) catc_ctrl_async(catc, USB_DIR_OUT, WriteMem, 0, addr, buf, size, NULL)
-+
-+/*
-+ * Receive routines.
-+ */
-+
-+static void catc_rx_done(struct urb *urb)
-+{
-+ struct catc *catc = urb->context;
-+ u8 *pkt_start = urb->transfer_buffer;
-+ struct sk_buff *skb;
-+ int pkt_len, pkt_offset = 0;
-+ int status = urb->status;
-+
-+ if (!catc->is_f5u011) {
-+ clear_bit(RX_RUNNING, &catc->flags);
-+ pkt_offset = 2;
-+ }
-+
-+ if (status) {
-+ dev_dbg(&urb->dev->dev, "rx_done, status %d, length %d\n",
-+ status, urb->actual_length);
-+ return;
-+ }
-+
-+ do {
-+ if(!catc->is_f5u011) {
-+ pkt_len = le16_to_cpup((__le16*)pkt_start);
-+ if (pkt_len > urb->actual_length) {
-+ catc->netdev->stats.rx_length_errors++;
-+ catc->netdev->stats.rx_errors++;
-+ break;
-+ }
-+ } else {
-+ pkt_len = urb->actual_length;
-+ }
-+
-+ if (!(skb = dev_alloc_skb(pkt_len)))
-+ return;
-+
-+ skb_copy_to_linear_data(skb, pkt_start + pkt_offset, pkt_len);
-+ skb_put(skb, pkt_len);
-+
-+ skb->protocol = eth_type_trans(skb, catc->netdev);
-+ netif_rx(skb);
-+
-+ catc->netdev->stats.rx_packets++;
-+ catc->netdev->stats.rx_bytes += pkt_len;
-+
-+ /* F5U011 only does one packet per RX */
-+ if (catc->is_f5u011)
-+ break;
-+ pkt_start += (((pkt_len + 1) >> 6) + 1) << 6;
-+
-+ } while (pkt_start - (u8 *) urb->transfer_buffer < urb->actual_length);
-+
-+ if (catc->is_f5u011) {
-+ if (atomic_read(&catc->recq_sz)) {
-+ int state;
-+ atomic_dec(&catc->recq_sz);
-+ netdev_dbg(catc->netdev, "getting extra packet\n");
-+ urb->dev = catc->usbdev;
-+ if ((state = usb_submit_urb(urb, GFP_ATOMIC)) < 0) {
-+ netdev_dbg(catc->netdev,
-+ "submit(rx_urb) status %d\n", state);
-+ }
-+ } else {
-+ clear_bit(RX_RUNNING, &catc->flags);
-+ }
-+ }
-+}
-+
-+static void catc_irq_done(struct urb *urb)
-+{
-+ struct catc *catc = urb->context;
-+ u8 *data = urb->transfer_buffer;
-+ int status = urb->status;
-+ unsigned int hasdata = 0, linksts = LinkNoChange;
-+ int res;
-+
-+ if (!catc->is_f5u011) {
-+ hasdata = data[1] & 0x80;
-+ if (data[1] & 0x40)
-+ linksts = LinkGood;
-+ else if (data[1] & 0x20)
-+ linksts = LinkBad;
-+ } else {
-+ hasdata = (unsigned int)(be16_to_cpup((__be16*)data) & 0x0fff);
-+ if (data[0] == 0x90)
-+ linksts = LinkGood;
-+ else if (data[0] == 0xA0)
-+ linksts = LinkBad;
-+ }
-+
-+ switch (status) {
-+ case 0: /* success */
-+ break;
-+ case -ECONNRESET: /* unlink */
-+ case -ENOENT:
-+ case -ESHUTDOWN:
-+ return;
-+ /* -EPIPE: should clear the halt */
-+ default: /* error */
-+ dev_dbg(&urb->dev->dev,
-+ "irq_done, status %d, data %02x %02x.\n",
-+ status, data[0], data[1]);
-+ goto resubmit;
-+ }
-+
-+ if (linksts == LinkGood) {
-+ netif_carrier_on(catc->netdev);
-+ netdev_dbg(catc->netdev, "link ok\n");
-+ }
-+
-+ if (linksts == LinkBad) {
-+ netif_carrier_off(catc->netdev);
-+ netdev_dbg(catc->netdev, "link bad\n");
-+ }
-+
-+ if (hasdata) {
-+ if (test_and_set_bit(RX_RUNNING, &catc->flags)) {
-+ if (catc->is_f5u011)
-+ atomic_inc(&catc->recq_sz);
-+ } else {
-+ catc->rx_urb->dev = catc->usbdev;
-+ if ((res = usb_submit_urb(catc->rx_urb, GFP_ATOMIC)) < 0) {
-+ dev_err(&catc->usbdev->dev,
-+ "submit(rx_urb) status %d\n", res);
-+ }
-+ }
-+ }
-+resubmit:
-+ res = usb_submit_urb (urb, GFP_ATOMIC);
-+ if (res)
-+ dev_err(&catc->usbdev->dev,
-+ "can't resubmit intr, %s-%s, status %d\n",
-+ catc->usbdev->bus->bus_name,
-+ catc->usbdev->devpath, res);
-+}
-+
-+/*
-+ * Transmit routines.
-+ */
-+
-+static int catc_tx_run(struct catc *catc)
-+{
-+ int status;
-+
-+ if (catc->is_f5u011)
-+ catc->tx_ptr = (catc->tx_ptr + 63) & ~63;
-+
-+ catc->tx_urb->transfer_buffer_length = catc->tx_ptr;
-+ catc->tx_urb->transfer_buffer = catc->tx_buf[catc->tx_idx];
-+ catc->tx_urb->dev = catc->usbdev;
-+
-+ if ((status = usb_submit_urb(catc->tx_urb, GFP_ATOMIC)) < 0)
-+ dev_err(&catc->usbdev->dev, "submit(tx_urb), status %d\n",
-+ status);
-+
-+ catc->tx_idx = !catc->tx_idx;
-+ catc->tx_ptr = 0;
-+
-+ catc->netdev->trans_start = jiffies;
-+ return status;
-+}
-+
-+static void catc_tx_done(struct urb *urb)
-+{
-+ struct catc *catc = urb->context;
-+ unsigned long flags;
-+ int r, status = urb->status;
-+
-+ if (status == -ECONNRESET) {
-+ dev_dbg(&urb->dev->dev, "Tx Reset.\n");
-+ urb->status = 0;
-+ catc->netdev->trans_start = jiffies;
-+ catc->netdev->stats.tx_errors++;
-+ clear_bit(TX_RUNNING, &catc->flags);
-+ netif_wake_queue(catc->netdev);
-+ return;
-+ }
-+
-+ if (status) {
-+ dev_dbg(&urb->dev->dev, "tx_done, status %d, length %d\n",
-+ status, urb->actual_length);
-+ return;
-+ }
-+
-+ spin_lock_irqsave(&catc->tx_lock, flags);
-+
-+ if (catc->tx_ptr) {
-+ r = catc_tx_run(catc);
-+ if (unlikely(r < 0))
-+ clear_bit(TX_RUNNING, &catc->flags);
-+ } else {
-+ clear_bit(TX_RUNNING, &catc->flags);
-+ }
-+
-+ netif_wake_queue(catc->netdev);
-+
-+ spin_unlock_irqrestore(&catc->tx_lock, flags);
-+}
-+
-+static netdev_tx_t catc_start_xmit(struct sk_buff *skb,
-+ struct net_device *netdev)
-+{
-+ struct catc *catc = netdev_priv(netdev);
-+ unsigned long flags;
-+ int r = 0;
-+ char *tx_buf;
-+
-+ spin_lock_irqsave(&catc->tx_lock, flags);
-+
-+ catc->tx_ptr = (((catc->tx_ptr - 1) >> 6) + 1) << 6;
-+ tx_buf = catc->tx_buf[catc->tx_idx] + catc->tx_ptr;
-+ if (catc->is_f5u011)
-+ *(__be16 *)tx_buf = cpu_to_be16(skb->len);
-+ else
-+ *(__le16 *)tx_buf = cpu_to_le16(skb->len);
-+ skb_copy_from_linear_data(skb, tx_buf + 2, skb->len);
-+ catc->tx_ptr += skb->len + 2;
-+
-+ if (!test_and_set_bit(TX_RUNNING, &catc->flags)) {
-+ r = catc_tx_run(catc);
-+ if (r < 0)
-+ clear_bit(TX_RUNNING, &catc->flags);
-+ }
-+
-+ if ((catc->is_f5u011 && catc->tx_ptr) ||
-+ (catc->tx_ptr >= ((TX_MAX_BURST - 1) * (PKT_SZ + 2))))
-+ netif_stop_queue(netdev);
-+
-+ spin_unlock_irqrestore(&catc->tx_lock, flags);
-+
-+ if (r >= 0) {
-+ catc->netdev->stats.tx_bytes += skb->len;
-+ catc->netdev->stats.tx_packets++;
-+ }
-+
-+ dev_kfree_skb(skb);
-+
-+ return NETDEV_TX_OK;
-+}
-+
-+static void catc_tx_timeout(struct net_device *netdev)
-+{
-+ struct catc *catc = netdev_priv(netdev);
-+
-+ dev_warn(&netdev->dev, "Transmit timed out.\n");
-+ usb_unlink_urb(catc->tx_urb);
-+}
-+
-+/*
-+ * Control messages.
-+ */
-+
-+static int catc_ctrl_msg(struct catc *catc, u8 dir, u8 request, u16 value, u16 index, void *buf, int len)
-+{
-+ int retval = usb_control_msg(catc->usbdev,
-+ dir ? usb_rcvctrlpipe(catc->usbdev, 0) : usb_sndctrlpipe(catc->usbdev, 0),
-+ request, 0x40 | dir, value, index, buf, len, 1000);
-+ return retval < 0 ? retval : 0;
-+}
-+
-+static void catc_ctrl_run(struct catc *catc)
-+{
-+ struct ctrl_queue *q = catc->ctrl_queue + catc->ctrl_tail;
-+ struct usb_device *usbdev = catc->usbdev;
-+ struct urb *urb = catc->ctrl_urb;
-+ struct usb_ctrlrequest *dr = &catc->ctrl_dr;
-+ int status;
-+
-+ dr->bRequest = q->request;
-+ dr->bRequestType = 0x40 | q->dir;
-+ dr->wValue = cpu_to_le16(q->value);
-+ dr->wIndex = cpu_to_le16(q->index);
-+ dr->wLength = cpu_to_le16(q->len);
-+
-+ urb->pipe = q->dir ? usb_rcvctrlpipe(usbdev, 0) : usb_sndctrlpipe(usbdev, 0);
-+ urb->transfer_buffer_length = q->len;
-+ urb->transfer_buffer = catc->ctrl_buf;
-+ urb->setup_packet = (void *) dr;
-+ urb->dev = usbdev;
-+
-+ if (!q->dir && q->buf && q->len)
-+ memcpy(catc->ctrl_buf, q->buf, q->len);
-+
-+ if ((status = usb_submit_urb(catc->ctrl_urb, GFP_ATOMIC)))
-+ dev_err(&catc->usbdev->dev, "submit(ctrl_urb) status %d\n",
-+ status);
-+}
-+
-+static void catc_ctrl_done(struct urb *urb)
-+{
-+ struct catc *catc = urb->context;
-+ struct ctrl_queue *q;
-+ unsigned long flags;
-+ int status = urb->status;
-+
-+ if (status)
-+ dev_dbg(&urb->dev->dev, "ctrl_done, status %d, len %d.\n",
-+ status, urb->actual_length);
-+
-+ spin_lock_irqsave(&catc->ctrl_lock, flags);
-+
-+ q = catc->ctrl_queue + catc->ctrl_tail;
-+
-+ if (q->dir) {
-+ if (q->buf && q->len)
-+ memcpy(q->buf, catc->ctrl_buf, q->len);
-+ else
-+ q->buf = catc->ctrl_buf;
-+ }
-+
-+ if (q->callback)
-+ q->callback(catc, q);
-+
-+ catc->ctrl_tail = (catc->ctrl_tail + 1) & (CTRL_QUEUE - 1);
-+
-+ if (catc->ctrl_head != catc->ctrl_tail)
-+ catc_ctrl_run(catc);
-+ else
-+ clear_bit(CTRL_RUNNING, &catc->flags);
-+
-+ spin_unlock_irqrestore(&catc->ctrl_lock, flags);
-+}
-+
-+static int catc_ctrl_async(struct catc *catc, u8 dir, u8 request, u16 value,
-+ u16 index, void *buf, int len, void (*callback)(struct catc *catc, struct ctrl_queue *q))
-+{
-+ struct ctrl_queue *q;
-+ int retval = 0;
-+ unsigned long flags;
-+
-+ spin_lock_irqsave(&catc->ctrl_lock, flags);
-+
-+ q = catc->ctrl_queue + catc->ctrl_head;
-+
-+ q->dir = dir;
-+ q->request = request;
-+ q->value = value;
-+ q->index = index;
-+ q->buf = buf;
-+ q->len = len;
-+ q->callback = callback;
-+
-+ catc->ctrl_head = (catc->ctrl_head + 1) & (CTRL_QUEUE - 1);
-+
-+ if (catc->ctrl_head == catc->ctrl_tail) {
-+ dev_err(&catc->usbdev->dev, "ctrl queue full\n");
-+ catc->ctrl_tail = (catc->ctrl_tail + 1) & (CTRL_QUEUE - 1);
-+ retval = -1;
-+ }
-+
-+ if (!test_and_set_bit(CTRL_RUNNING, &catc->flags))
-+ catc_ctrl_run(catc);
-+
-+ spin_unlock_irqrestore(&catc->ctrl_lock, flags);
-+
-+ return retval;
-+}
-+
-+/*
-+ * Statistics.
-+ */
-+
-+static void catc_stats_done(struct catc *catc, struct ctrl_queue *q)
-+{
-+ int index = q->index - EthStats;
-+ u16 data, last;
-+
-+ catc->stats_buf[index] = *((char *)q->buf);
-+
-+ if (index & 1)
-+ return;
-+
-+ data = ((u16)catc->stats_buf[index] << 8) | catc->stats_buf[index + 1];
-+ last = catc->stats_vals[index >> 1];
-+
-+ switch (index) {
-+ case TxSingleColl:
-+ case TxMultiColl:
-+ catc->netdev->stats.collisions += data - last;
-+ break;
-+ case TxExcessColl:
-+ catc->netdev->stats.tx_aborted_errors += data - last;
-+ catc->netdev->stats.tx_errors += data - last;
-+ break;
-+ case RxFramErr:
-+ catc->netdev->stats.rx_frame_errors += data - last;
-+ catc->netdev->stats.rx_errors += data - last;
-+ break;
-+ }
-+
-+ catc->stats_vals[index >> 1] = data;
-+}
-+
-+static void catc_stats_timer(unsigned long data)
-+{
-+ struct catc *catc = (void *) data;
-+ int i;
-+
-+ for (i = 0; i < 8; i++)
-+ catc_get_reg_async(catc, EthStats + 7 - i, catc_stats_done);
-+
-+ mod_timer(&catc->timer, jiffies + STATS_UPDATE);
-+}
-+
-+/*
-+ * Receive modes. Broadcast, Multicast, Promisc.
-+ */
-+
-+static void catc_multicast(unsigned char *addr, u8 *multicast)
-+{
-+ u32 crc;
-+
-+ crc = ether_crc_le(6, addr);
-+ multicast[(crc >> 3) & 0x3f] |= 1 << (crc & 7);
-+}
-+
-+static void catc_set_multicast_list(struct net_device *netdev)
-+{
-+ struct catc *catc = netdev_priv(netdev);
-+ struct netdev_hw_addr *ha;
-+ u8 broadcast[ETH_ALEN];
-+ u8 rx = RxEnable | RxPolarity | RxMultiCast;
-+
-+ memset(broadcast, 0xff, ETH_ALEN);
-+ memset(catc->multicast, 0, 64);
-+
-+ catc_multicast(broadcast, catc->multicast);
-+ catc_multicast(netdev->dev_addr, catc->multicast);
-+
-+ if (netdev->flags & IFF_PROMISC) {
-+ memset(catc->multicast, 0xff, 64);
-+ rx |= (!catc->is_f5u011) ? RxPromisc : AltRxPromisc;
-+ }
-+
-+ if (netdev->flags & IFF_ALLMULTI) {
-+ memset(catc->multicast, 0xff, 64);
-+ } else {
-+ netdev_for_each_mc_addr(ha, netdev) {
-+ u32 crc = ether_crc_le(6, ha->addr);
-+ if (!catc->is_f5u011) {
-+ catc->multicast[(crc >> 3) & 0x3f] |= 1 << (crc & 7);
-+ } else {
-+ catc->multicast[7-(crc >> 29)] |= 1 << ((crc >> 26) & 7);
-+ }
-+ }
-+ }
-+ if (!catc->is_f5u011) {
-+ catc_set_reg_async(catc, RxUnit, rx);
-+ catc_write_mem_async(catc, 0xfa80, catc->multicast, 64);
-+ } else {
-+ f5u011_mchash_async(catc, catc->multicast);
-+ if (catc->rxmode[0] != rx) {
-+ catc->rxmode[0] = rx;
-+ netdev_dbg(catc->netdev,
-+ "Setting RX mode to %2.2X %2.2X\n",
-+ catc->rxmode[0], catc->rxmode[1]);
-+ f5u011_rxmode_async(catc, catc->rxmode);
-+ }
-+ }
-+}
-+
-+static void catc_get_drvinfo(struct net_device *dev,
-+ struct ethtool_drvinfo *info)
-+{
-+ struct catc *catc = netdev_priv(dev);
-+ strlcpy(info->driver, driver_name, sizeof(info->driver));
-+ strlcpy(info->version, DRIVER_VERSION, sizeof(info->version));
-+ usb_make_path(catc->usbdev, info->bus_info, sizeof(info->bus_info));
-+}
-+
-+static int catc_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
-+{
-+ struct catc *catc = netdev_priv(dev);
-+ if (!catc->is_f5u011)
-+ return -EOPNOTSUPP;
-+
-+ cmd->supported = SUPPORTED_10baseT_Half | SUPPORTED_TP;
-+ cmd->advertising = ADVERTISED_10baseT_Half | ADVERTISED_TP;
-+ ethtool_cmd_speed_set(cmd, SPEED_10);
-+ cmd->duplex = DUPLEX_HALF;
-+ cmd->port = PORT_TP;
-+ cmd->phy_address = 0;
-+ cmd->transceiver = XCVR_INTERNAL;
-+ cmd->autoneg = AUTONEG_DISABLE;
-+ cmd->maxtxpkt = 1;
-+ cmd->maxrxpkt = 1;
-+ return 0;
-+}
-+
-+static const struct ethtool_ops ops = {
-+ .get_drvinfo = catc_get_drvinfo,
-+ .get_settings = catc_get_settings,
-+ .get_link = ethtool_op_get_link
-+};
-+
-+/*
-+ * Open, close.
-+ */
-+
-+static int catc_open(struct net_device *netdev)
-+{
-+ struct catc *catc = netdev_priv(netdev);
-+ int status;
-+
-+ catc->irq_urb->dev = catc->usbdev;
-+ if ((status = usb_submit_urb(catc->irq_urb, GFP_KERNEL)) < 0) {
-+ dev_err(&catc->usbdev->dev, "submit(irq_urb) status %d\n",
-+ status);
-+ return -1;
-+ }
-+
-+ netif_start_queue(netdev);
-+
-+ if (!catc->is_f5u011)
-+ mod_timer(&catc->timer, jiffies + STATS_UPDATE);
-+
-+ return 0;
-+}
-+
-+static int catc_stop(struct net_device *netdev)
-+{
-+ struct catc *catc = netdev_priv(netdev);
-+
-+ netif_stop_queue(netdev);
-+
-+ if (!catc->is_f5u011)
-+ del_timer_sync(&catc->timer);
-+
-+ usb_kill_urb(catc->rx_urb);
-+ usb_kill_urb(catc->tx_urb);
-+ usb_kill_urb(catc->irq_urb);
-+ usb_kill_urb(catc->ctrl_urb);
-+
-+ return 0;
-+}
-+
-+static const struct net_device_ops catc_netdev_ops = {
-+ .ndo_open = catc_open,
-+ .ndo_stop = catc_stop,
-+ .ndo_start_xmit = catc_start_xmit,
-+
-+ .ndo_tx_timeout = catc_tx_timeout,
-+ .ndo_set_rx_mode = catc_set_multicast_list,
-+ .ndo_change_mtu = eth_change_mtu,
-+ .ndo_set_mac_address = eth_mac_addr,
-+ .ndo_validate_addr = eth_validate_addr,
-+};
-+
-+/*
-+ * USB probe, disconnect.
-+ */
-+
-+static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id)
-+{
-+ struct device *dev = &intf->dev;
-+ struct usb_device *usbdev = interface_to_usbdev(intf);
-+ struct net_device *netdev;
-+ struct catc *catc;
-+ u8 broadcast[ETH_ALEN];
-+ int i, pktsz;
-+
-+ if (usb_set_interface(usbdev,
-+ intf->altsetting->desc.bInterfaceNumber, 1)) {
-+ dev_err(dev, "Can't set altsetting 1.\n");
-+ return -EIO;
-+ }
-+
-+ netdev = alloc_etherdev(sizeof(struct catc));
-+ if (!netdev)
-+ return -ENOMEM;
-+
-+ catc = netdev_priv(netdev);
-+
-+ netdev->netdev_ops = &catc_netdev_ops;
-+ netdev->watchdog_timeo = TX_TIMEOUT;
-+ netdev->ethtool_ops = &ops;
-+
-+ catc->usbdev = usbdev;
-+ catc->netdev = netdev;
-+
-+ spin_lock_init(&catc->tx_lock);
-+ spin_lock_init(&catc->ctrl_lock);
-+
-+ init_timer(&catc->timer);
-+ catc->timer.data = (long) catc;
-+ catc->timer.function = catc_stats_timer;
-+
-+ catc->ctrl_urb = usb_alloc_urb(0, GFP_KERNEL);
-+ catc->tx_urb = usb_alloc_urb(0, GFP_KERNEL);
-+ catc->rx_urb = usb_alloc_urb(0, GFP_KERNEL);
-+ catc->irq_urb = usb_alloc_urb(0, GFP_KERNEL);
-+ if ((!catc->ctrl_urb) || (!catc->tx_urb) ||
-+ (!catc->rx_urb) || (!catc->irq_urb)) {
-+ dev_err(&intf->dev, "No free urbs available.\n");
-+ usb_free_urb(catc->ctrl_urb);
-+ usb_free_urb(catc->tx_urb);
-+ usb_free_urb(catc->rx_urb);
-+ usb_free_urb(catc->irq_urb);
-+ free_netdev(netdev);
-+ return -ENOMEM;
-+ }
-+
-+ /* The F5U011 has the same vendor/product as the netmate but a device version of 0x130 */
-+ if (le16_to_cpu(usbdev->descriptor.idVendor) == 0x0423 &&
-+ le16_to_cpu(usbdev->descriptor.idProduct) == 0xa &&
-+ le16_to_cpu(catc->usbdev->descriptor.bcdDevice) == 0x0130) {
-+ dev_dbg(dev, "Testing for f5u011\n");
-+ catc->is_f5u011 = 1;
-+ atomic_set(&catc->recq_sz, 0);
-+ pktsz = RX_PKT_SZ;
-+ } else {
-+ pktsz = RX_MAX_BURST * (PKT_SZ + 2);
-+ }
-+
-+ usb_fill_control_urb(catc->ctrl_urb, usbdev, usb_sndctrlpipe(usbdev, 0),
-+ NULL, NULL, 0, catc_ctrl_done, catc);
-+
-+ usb_fill_bulk_urb(catc->tx_urb, usbdev, usb_sndbulkpipe(usbdev, 1),
-+ NULL, 0, catc_tx_done, catc);
-+
-+ usb_fill_bulk_urb(catc->rx_urb, usbdev, usb_rcvbulkpipe(usbdev, 1),
-+ catc->rx_buf, pktsz, catc_rx_done, catc);
-+
-+ usb_fill_int_urb(catc->irq_urb, usbdev, usb_rcvintpipe(usbdev, 2),
-+ catc->irq_buf, 2, catc_irq_done, catc, 1);
-+
-+ if (!catc->is_f5u011) {
-+ dev_dbg(dev, "Checking memory size\n");
-+
-+ i = 0x12345678;
-+ catc_write_mem(catc, 0x7a80, &i, 4);
-+ i = 0x87654321;
-+ catc_write_mem(catc, 0xfa80, &i, 4);
-+ catc_read_mem(catc, 0x7a80, &i, 4);
-+
-+ switch (i) {
-+ case 0x12345678:
-+ catc_set_reg(catc, TxBufCount, 8);
-+ catc_set_reg(catc, RxBufCount, 32);
-+ dev_dbg(dev, "64k Memory\n");
-+ break;
-+ default:
-+ dev_warn(&intf->dev,
-+ "Couldn't detect memory size, assuming 32k\n");
-+ case 0x87654321:
-+ catc_set_reg(catc, TxBufCount, 4);
-+ catc_set_reg(catc, RxBufCount, 16);
-+ dev_dbg(dev, "32k Memory\n");
-+ break;
-+ }
-+
-+ dev_dbg(dev, "Getting MAC from SEEROM.\n");
-+
-+ catc_get_mac(catc, netdev->dev_addr);
-+
-+ dev_dbg(dev, "Setting MAC into registers.\n");
-+
-+ for (i = 0; i < 6; i++)
-+ catc_set_reg(catc, StationAddr0 - i, netdev->dev_addr[i]);
-+
-+ dev_dbg(dev, "Filling the multicast list.\n");
-+
-+ memset(broadcast, 0xff, ETH_ALEN);
-+ catc_multicast(broadcast, catc->multicast);
-+ catc_multicast(netdev->dev_addr, catc->multicast);
-+ catc_write_mem(catc, 0xfa80, catc->multicast, 64);
-+
-+ dev_dbg(dev, "Clearing error counters.\n");
-+
-+ for (i = 0; i < 8; i++)
-+ catc_set_reg(catc, EthStats + i, 0);
-+ catc->last_stats = jiffies;
-+
-+ dev_dbg(dev, "Enabling.\n");
-+
-+ catc_set_reg(catc, MaxBurst, RX_MAX_BURST);
-+ catc_set_reg(catc, OpModes, OpTxMerge | OpRxMerge | OpLenInclude | Op3MemWaits);
-+ catc_set_reg(catc, LEDCtrl, LEDLink);
-+ catc_set_reg(catc, RxUnit, RxEnable | RxPolarity | RxMultiCast);
-+ } else {
-+ dev_dbg(dev, "Performing reset\n");
-+ catc_reset(catc);
-+ catc_get_mac(catc, netdev->dev_addr);
-+
-+ dev_dbg(dev, "Setting RX Mode\n");
-+ catc->rxmode[0] = RxEnable | RxPolarity | RxMultiCast;
-+ catc->rxmode[1] = 0;
-+ f5u011_rxmode(catc, catc->rxmode);
-+ }
-+ dev_dbg(dev, "Init done.\n");
-+ printk(KERN_INFO "%s: %s USB Ethernet at usb-%s-%s, %pM.\n",
-+ netdev->name, (catc->is_f5u011) ? "Belkin F5U011" : "CATC EL1210A NetMate",
-+ usbdev->bus->bus_name, usbdev->devpath, netdev->dev_addr);
-+ usb_set_intfdata(intf, catc);
-+
-+ SET_NETDEV_DEV(netdev, &intf->dev);
-+ if (register_netdev(netdev) != 0) {
-+ usb_set_intfdata(intf, NULL);
-+ usb_free_urb(catc->ctrl_urb);
-+ usb_free_urb(catc->tx_urb);
-+ usb_free_urb(catc->rx_urb);
-+ usb_free_urb(catc->irq_urb);
-+ free_netdev(netdev);
-+ return -EIO;
-+ }
-+ return 0;
-+}
-+
-+static void catc_disconnect(struct usb_interface *intf)
-+{
-+ struct catc *catc = usb_get_intfdata(intf);
-+
-+ usb_set_intfdata(intf, NULL);
-+ if (catc) {
-+ unregister_netdev(catc->netdev);
-+ usb_free_urb(catc->ctrl_urb);
-+ usb_free_urb(catc->tx_urb);
-+ usb_free_urb(catc->rx_urb);
-+ usb_free_urb(catc->irq_urb);
-+ free_netdev(catc->netdev);
-+ }
-+}
-+
-+/*
-+ * Module functions and tables.
-+ */
-+
-+static struct usb_device_id catc_id_table [] = {
-+ { USB_DEVICE(0x0423, 0xa) }, /* CATC Netmate, Belkin F5U011 */
-+ { USB_DEVICE(0x0423, 0xc) }, /* CATC Netmate II, Belkin F5U111 */
-+ { USB_DEVICE(0x08d1, 0x1) }, /* smartBridges smartNIC */
-+ { }
-+};
-+
-+MODULE_DEVICE_TABLE(usb, catc_id_table);
-+
-+static struct usb_driver catc_driver = {
-+ .name = driver_name,
-+ .probe = catc_probe,
-+ .disconnect = catc_disconnect,
-+ .id_table = catc_id_table,
-+ .disable_hub_initiated_lpm = 1,
-+};
-+
-+module_usb_driver(catc_driver);
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/cdc_eem.c backports-3.18.1-1/drivers/net/usb/cdc_eem.c
---- backports-3.18.1-1.org/drivers/net/usb/cdc_eem.c 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/cdc_eem.c 2014-12-16 18:39:45.000000000 +0100
-@@ -0,0 +1,381 @@
-+/*
-+ * USB CDC EEM network interface driver
-+ * Copyright (C) 2009 Oberthur Technologies
-+ * by Omar Laazimani, Olivier Condemine
-+ *
-+ * 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, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/ctype.h>
-+#include <linux/ethtool.h>
-+#include <linux/workqueue.h>
-+#include <linux/mii.h>
-+#include <linux/usb.h>
-+#include <linux/crc32.h>
-+#include <linux/usb/cdc.h>
-+#include <linux/usb/usbnet.h>
-+#include <linux/gfp.h>
-+#include <linux/if_vlan.h>
-+
-+
-+/*
-+ * This driver is an implementation of the CDC "Ethernet Emulation
-+ * Model" (EEM) specification, which encapsulates Ethernet frames
-+ * for transport over USB using a simpler USB device model than the
-+ * previous CDC "Ethernet Control Model" (ECM, or "CDC Ethernet").
-+ *
-+ * For details, see www.usb.org/developers/devclass_docs/CDC_EEM10.pdf
-+ *
-+ * This version has been tested with GIGAntIC WuaoW SIM Smart Card on 2.6.24,
-+ * 2.6.27 and 2.6.30rc2 kernel.
-+ * It has also been validated on Openmoko Om 2008.12 (based on 2.6.24 kernel).
-+ * build on 23-April-2009
-+ */
-+
-+#define EEM_HEAD 2 /* 2 byte header */
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static void eem_linkcmd_complete(struct urb *urb)
-+{
-+ dev_kfree_skb(urb->context);
-+ usb_free_urb(urb);
-+}
-+
-+static void eem_linkcmd(struct usbnet *dev, struct sk_buff *skb)
-+{
-+ struct urb *urb;
-+ int status;
-+
-+ urb = usb_alloc_urb(0, GFP_ATOMIC);
-+ if (!urb)
-+ goto fail;
-+
-+ usb_fill_bulk_urb(urb, dev->udev, dev->out,
-+ skb->data, skb->len, eem_linkcmd_complete, skb);
-+
-+ status = usb_submit_urb(urb, GFP_ATOMIC);
-+ if (status) {
-+ usb_free_urb(urb);
-+fail:
-+ dev_kfree_skb(skb);
-+ netdev_warn(dev->net, "link cmd failure\n");
-+ return;
-+ }
-+}
-+
-+static int eem_bind(struct usbnet *dev, struct usb_interface *intf)
-+{
-+ int status = 0;
-+
-+ status = usbnet_get_endpoints(dev, intf);
-+ if (status < 0) {
-+ usb_set_intfdata(intf, NULL);
-+ usb_driver_release_interface(driver_of(intf), intf);
-+ return status;
-+ }
-+
-+ /* no jumbogram (16K) support for now */
-+
-+ dev->net->hard_header_len += EEM_HEAD + ETH_FCS_LEN + VLAN_HLEN;
-+ dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len;
-+
-+ return 0;
-+}
-+
-+/*
-+ * EEM permits packing multiple Ethernet frames into USB transfers
-+ * (a "bundle"), but for TX we don't try to do that.
-+ */
-+static struct sk_buff *eem_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
-+ gfp_t flags)
-+{
-+ struct sk_buff *skb2 = NULL;
-+ u16 len = skb->len;
-+ u32 crc = 0;
-+ int padlen = 0;
-+
-+ /* When ((len + EEM_HEAD + ETH_FCS_LEN) % dev->maxpacket) is
-+ * zero, stick two bytes of zero length EEM packet on the end.
-+ * Else the framework would add invalid single byte padding,
-+ * since it can't know whether ZLPs will be handled right by
-+ * all the relevant hardware and software.
-+ */
-+ if (!((len + EEM_HEAD + ETH_FCS_LEN) % dev->maxpacket))
-+ padlen += 2;
-+
-+ if (!skb_cloned(skb)) {
-+ int headroom = skb_headroom(skb);
-+ int tailroom = skb_tailroom(skb);
-+
-+ if ((tailroom >= ETH_FCS_LEN + padlen) &&
-+ (headroom >= EEM_HEAD))
-+ goto done;
-+
-+ if ((headroom + tailroom)
-+ > (EEM_HEAD + ETH_FCS_LEN + padlen)) {
-+ skb->data = memmove(skb->head +
-+ EEM_HEAD,
-+ skb->data,
-+ skb->len);
-+ skb_set_tail_pointer(skb, len);
-+ goto done;
-+ }
-+ }
-+
-+ skb2 = skb_copy_expand(skb, EEM_HEAD, ETH_FCS_LEN + padlen, flags);
-+ if (!skb2)
-+ return NULL;
-+
-+ dev_kfree_skb_any(skb);
-+ skb = skb2;
-+
-+done:
-+ /* we don't use the "no Ethernet CRC" option */
-+ crc = crc32_le(~0, skb->data, skb->len);
-+ crc = ~crc;
-+
-+ put_unaligned_le32(crc, skb_put(skb, 4));
-+
-+ /* EEM packet header format:
-+ * b0..13: length of ethernet frame
-+ * b14: bmCRC (1 == valid Ethernet CRC)
-+ * b15: bmType (0 == data)
-+ */
-+ len = skb->len;
-+ put_unaligned_le16(BIT(14) | len, skb_push(skb, 2));
-+
-+ /* Bundle a zero length EEM packet if needed */
-+ if (padlen)
-+ put_unaligned_le16(0, skb_put(skb, 2));
-+
-+ return skb;
-+}
-+
-+static int eem_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
-+{
-+ /*
-+ * Our task here is to strip off framing, leaving skb with one
-+ * data frame for the usbnet framework code to process. But we
-+ * may have received multiple EEM payloads, or command payloads.
-+ * So we must process _everything_ as if it's a header, except
-+ * maybe the last data payload
-+ *
-+ * REVISIT the framework needs updating so that when we consume
-+ * all payloads (the last or only message was a command, or a
-+ * zero length EEM packet) that is not accounted as an rx_error.
-+ */
-+ do {
-+ struct sk_buff *skb2 = NULL;
-+ u16 header;
-+ u16 len = 0;
-+
-+ /* incomplete EEM header? */
-+ if (skb->len < EEM_HEAD)
-+ return 0;
-+
-+ /*
-+ * EEM packet header format:
-+ * b0..14: EEM type dependent (Data or Command)
-+ * b15: bmType
-+ */
-+ header = get_unaligned_le16(skb->data);
-+ skb_pull(skb, EEM_HEAD);
-+
-+ /*
-+ * The bmType bit helps to denote when EEM
-+ * packet is data or command :
-+ * bmType = 0 : EEM data payload
-+ * bmType = 1 : EEM (link) command
-+ */
-+ if (header & BIT(15)) {
-+ u16 bmEEMCmd;
-+
-+ /*
-+ * EEM (link) command packet:
-+ * b0..10: bmEEMCmdParam
-+ * b11..13: bmEEMCmd
-+ * b14: bmReserved (must be 0)
-+ * b15: 1 (EEM command)
-+ */
-+ if (header & BIT(14)) {
-+ netdev_dbg(dev->net, "reserved command %04x\n",
-+ header);
-+ continue;
-+ }
-+
-+ bmEEMCmd = (header >> 11) & 0x7;
-+ switch (bmEEMCmd) {
-+
-+ /* Responding to echo requests is mandatory. */
-+ case 0: /* Echo command */
-+ len = header & 0x7FF;
-+
-+ /* bogus command? */
-+ if (skb->len < len)
-+ return 0;
-+
-+ skb2 = skb_clone(skb, GFP_ATOMIC);
-+ if (unlikely(!skb2))
-+ goto next;
-+ skb_trim(skb2, len);
-+ put_unaligned_le16(BIT(15) | (1 << 11) | len,
-+ skb_push(skb2, 2));
-+ eem_linkcmd(dev, skb2);
-+ break;
-+
-+ /*
-+ * Host may choose to ignore hints.
-+ * - suspend: peripheral ready to suspend
-+ * - response: suggest N millisec polling
-+ * - response complete: suggest N sec polling
-+ *
-+ * Suspend is reported and maybe heeded.
-+ */
-+ case 2: /* Suspend hint */
-+ usbnet_device_suggests_idle(dev);
-+ continue;
-+ case 3: /* Response hint */
-+ case 4: /* Response complete hint */
-+ continue;
-+
-+ /*
-+ * Hosts should never receive host-to-peripheral
-+ * or reserved command codes; or responses to an
-+ * echo command we didn't send.
-+ */
-+ case 1: /* Echo response */
-+ case 5: /* Tickle */
-+ default: /* reserved */
-+ netdev_warn(dev->net,
-+ "unexpected link command %d\n",
-+ bmEEMCmd);
-+ continue;
-+ }
-+
-+ } else {
-+ u32 crc, crc2;
-+ int is_last;
-+
-+ /* zero length EEM packet? */
-+ if (header == 0)
-+ continue;
-+
-+ /*
-+ * EEM data packet header :
-+ * b0..13: length of ethernet frame
-+ * b14: bmCRC
-+ * b15: 0 (EEM data)
-+ */
-+ len = header & 0x3FFF;
-+
-+ /* bogus EEM payload? */
-+ if (skb->len < len)
-+ return 0;
-+
-+ /* bogus ethernet frame? */
-+ if (len < (ETH_HLEN + ETH_FCS_LEN))
-+ goto next;
-+
-+ /*
-+ * Treat the last payload differently: framework
-+ * code expects our "fixup" to have stripped off
-+ * headers, so "skb" is a data packet (or error).
-+ * Else if it's not the last payload, keep "skb"
-+ * for further processing.
-+ */
-+ is_last = (len == skb->len);
-+ if (is_last)
-+ skb2 = skb;
-+ else {
-+ skb2 = skb_clone(skb, GFP_ATOMIC);
-+ if (unlikely(!skb2))
-+ return 0;
-+ }
-+
-+ /*
-+ * The bmCRC helps to denote when the CRC field in
-+ * the Ethernet frame contains a calculated CRC:
-+ * bmCRC = 1 : CRC is calculated
-+ * bmCRC = 0 : CRC = 0xDEADBEEF
-+ */
-+ if (header & BIT(14)) {
-+ crc = get_unaligned_le32(skb2->data
-+ + len - ETH_FCS_LEN);
-+ crc2 = ~crc32_le(~0, skb2->data, skb2->len
-+ - ETH_FCS_LEN);
-+ } else {
-+ crc = get_unaligned_be32(skb2->data
-+ + len - ETH_FCS_LEN);
-+ crc2 = 0xdeadbeef;
-+ }
-+ skb_trim(skb2, len - ETH_FCS_LEN);
-+
-+ if (is_last)
-+ return crc == crc2;
-+
-+ if (unlikely(crc != crc2)) {
-+ dev->net->stats.rx_errors++;
-+ dev_kfree_skb_any(skb2);
-+ } else
-+ usbnet_skb_return(dev, skb2);
-+ }
-+
-+next:
-+ skb_pull(skb, len);
-+ } while (skb->len);
-+
-+ return 1;
-+}
-+
-+static const struct driver_info eem_info = {
-+ .description = "CDC EEM Device",
-+ .flags = FLAG_ETHER | FLAG_POINTTOPOINT,
-+ .bind = eem_bind,
-+ .rx_fixup = eem_rx_fixup,
-+ .tx_fixup = eem_tx_fixup,
-+};
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static const struct usb_device_id products[] = {
-+{
-+ USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_EEM,
-+ USB_CDC_PROTO_EEM),
-+ .driver_info = (unsigned long) &eem_info,
-+},
-+{
-+ /* EMPTY == end of list */
-+},
-+};
-+MODULE_DEVICE_TABLE(usb, products);
-+
-+static struct usb_driver eem_driver = {
-+ .name = "cdc_eem",
-+ .id_table = products,
-+ .probe = usbnet_probe,
-+ .disconnect = usbnet_disconnect,
-+ .suspend = usbnet_suspend,
-+ .resume = usbnet_resume,
-+ .disable_hub_initiated_lpm = 1,
-+};
-+
-+module_usb_driver(eem_driver);
-+
-+MODULE_AUTHOR("Omar Laazimani <omar.oberthur(a)gmail.com>");
-+MODULE_DESCRIPTION("USB CDC EEM");
-+MODULE_LICENSE("GPL");
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/cdc-phonet.c backports-3.18.1-1/drivers/net/usb/cdc-phonet.c
---- backports-3.18.1-1.org/drivers/net/usb/cdc-phonet.c 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/cdc-phonet.c 2014-12-16 18:39:45.000000000 +0100
-@@ -0,0 +1,466 @@
-+/*
-+ * phonet.c -- USB CDC Phonet host driver
-+ *
-+ * Copyright (C) 2008-2009 Nokia Corporation. All rights reserved.
-+ *
-+ * Author: Rémi Denis-Courmont
-+ *
-+ * 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 published by the Free Software Foundation.
-+ *
-+ * 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., 51 Franklin St, Fifth Floor, Boston, MA
-+ * 02110-1301 USA
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/mm.h>
-+#include <linux/module.h>
-+#include <linux/gfp.h>
-+#include <linux/usb.h>
-+#include <linux/usb/cdc.h>
-+#include <linux/netdevice.h>
-+#include <linux/if_arp.h>
-+#include <linux/if_phonet.h>
-+#include <linux/phonet.h>
-+
-+#define PN_MEDIA_USB 0x1B
-+
-+static const unsigned rxq_size = 17;
-+
-+struct usbpn_dev {
-+ struct net_device *dev;
-+
-+ struct usb_interface *intf, *data_intf;
-+ struct usb_device *usb;
-+ unsigned int tx_pipe, rx_pipe;
-+ u8 active_setting;
-+ u8 disconnected;
-+
-+ unsigned tx_queue;
-+ spinlock_t tx_lock;
-+
-+ spinlock_t rx_lock;
-+ struct sk_buff *rx_skb;
-+ struct urb *urbs[0];
-+};
-+
-+static void tx_complete(struct urb *req);
-+static void rx_complete(struct urb *req);
-+
-+/*
-+ * Network device callbacks
-+ */
-+static netdev_tx_t usbpn_xmit(struct sk_buff *skb, struct net_device *dev)
-+{
-+ struct usbpn_dev *pnd = netdev_priv(dev);
-+ struct urb *req = NULL;
-+ unsigned long flags;
-+ int err;
-+
-+ if (skb->protocol != htons(ETH_P_PHONET))
-+ goto drop;
-+
-+ req = usb_alloc_urb(0, GFP_ATOMIC);
-+ if (!req)
-+ goto drop;
-+ usb_fill_bulk_urb(req, pnd->usb, pnd->tx_pipe, skb->data, skb->len,
-+ tx_complete, skb);
-+ req->transfer_flags = URB_ZERO_PACKET;
-+ err = usb_submit_urb(req, GFP_ATOMIC);
-+ if (err) {
-+ usb_free_urb(req);
-+ goto drop;
-+ }
-+
-+ spin_lock_irqsave(&pnd->tx_lock, flags);
-+ pnd->tx_queue++;
-+ if (pnd->tx_queue >= dev->tx_queue_len)
-+ netif_stop_queue(dev);
-+ spin_unlock_irqrestore(&pnd->tx_lock, flags);
-+ return NETDEV_TX_OK;
-+
-+drop:
-+ dev_kfree_skb(skb);
-+ dev->stats.tx_dropped++;
-+ return NETDEV_TX_OK;
-+}
-+
-+static void tx_complete(struct urb *req)
-+{
-+ struct sk_buff *skb = req->context;
-+ struct net_device *dev = skb->dev;
-+ struct usbpn_dev *pnd = netdev_priv(dev);
-+ int status = req->status;
-+
-+ switch (status) {
-+ case 0:
-+ dev->stats.tx_bytes += skb->len;
-+ break;
-+
-+ case -ENOENT:
-+ case -ECONNRESET:
-+ case -ESHUTDOWN:
-+ dev->stats.tx_aborted_errors++;
-+ default:
-+ dev->stats.tx_errors++;
-+ dev_dbg(&dev->dev, "TX error (%d)\n", status);
-+ }
-+ dev->stats.tx_packets++;
-+
-+ spin_lock(&pnd->tx_lock);
-+ pnd->tx_queue--;
-+ netif_wake_queue(dev);
-+ spin_unlock(&pnd->tx_lock);
-+
-+ dev_kfree_skb_any(skb);
-+ usb_free_urb(req);
-+}
-+
-+static int rx_submit(struct usbpn_dev *pnd, struct urb *req, gfp_t gfp_flags)
-+{
-+ struct net_device *dev = pnd->dev;
-+ struct page *page;
-+ int err;
-+
-+ page = __skb_alloc_page(gfp_flags | __GFP_NOMEMALLOC, NULL);
-+ if (!page)
-+ return -ENOMEM;
-+
-+ usb_fill_bulk_urb(req, pnd->usb, pnd->rx_pipe, page_address(page),
-+ PAGE_SIZE, rx_complete, dev);
-+ req->transfer_flags = 0;
-+ err = usb_submit_urb(req, gfp_flags);
-+ if (unlikely(err)) {
-+ dev_dbg(&dev->dev, "RX submit error (%d)\n", err);
-+ put_page(page);
-+ }
-+ return err;
-+}
-+
-+static void rx_complete(struct urb *req)
-+{
-+ struct net_device *dev = req->context;
-+ struct usbpn_dev *pnd = netdev_priv(dev);
-+ struct page *page = virt_to_page(req->transfer_buffer);
-+ struct sk_buff *skb;
-+ unsigned long flags;
-+ int status = req->status;
-+
-+ switch (status) {
-+ case 0:
-+ spin_lock_irqsave(&pnd->rx_lock, flags);
-+ skb = pnd->rx_skb;
-+ if (!skb) {
-+ skb = pnd->rx_skb = netdev_alloc_skb(dev, 12);
-+ if (likely(skb)) {
-+ /* Can't use pskb_pull() on page in IRQ */
-+ memcpy(skb_put(skb, 1), page_address(page), 1);
-+ skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags,
-+ page, 1, req->actual_length,
-+ PAGE_SIZE);
-+ page = NULL;
-+ }
-+ } else {
-+ skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags,
-+ page, 0, req->actual_length,
-+ PAGE_SIZE);
-+ page = NULL;
-+ }
-+ if (req->actual_length < PAGE_SIZE)
-+ pnd->rx_skb = NULL; /* Last fragment */
-+ else
-+ skb = NULL;
-+ spin_unlock_irqrestore(&pnd->rx_lock, flags);
-+ if (skb) {
-+ skb->protocol = htons(ETH_P_PHONET);
-+ skb_reset_mac_header(skb);
-+ __skb_pull(skb, 1);
-+ skb->dev = dev;
-+ dev->stats.rx_packets++;
-+ dev->stats.rx_bytes += skb->len;
-+
-+ netif_rx(skb);
-+ }
-+ goto resubmit;
-+
-+ case -ENOENT:
-+ case -ECONNRESET:
-+ case -ESHUTDOWN:
-+ req = NULL;
-+ break;
-+
-+ case -EOVERFLOW:
-+ dev->stats.rx_over_errors++;
-+ dev_dbg(&dev->dev, "RX overflow\n");
-+ break;
-+
-+ case -EILSEQ:
-+ dev->stats.rx_crc_errors++;
-+ break;
-+ }
-+
-+ dev->stats.rx_errors++;
-+resubmit:
-+ if (page)
-+ put_page(page);
-+ if (req)
-+ rx_submit(pnd, req, GFP_ATOMIC | __GFP_COLD);
-+}
-+
-+static int usbpn_close(struct net_device *dev);
-+
-+static int usbpn_open(struct net_device *dev)
-+{
-+ struct usbpn_dev *pnd = netdev_priv(dev);
-+ int err;
-+ unsigned i;
-+ unsigned num = pnd->data_intf->cur_altsetting->desc.bInterfaceNumber;
-+
-+ err = usb_set_interface(pnd->usb, num, pnd->active_setting);
-+ if (err)
-+ return err;
-+
-+ for (i = 0; i < rxq_size; i++) {
-+ struct urb *req = usb_alloc_urb(0, GFP_KERNEL);
-+
-+ if (!req || rx_submit(pnd, req, GFP_KERNEL | __GFP_COLD)) {
-+ usb_free_urb(req);
-+ usbpn_close(dev);
-+ return -ENOMEM;
-+ }
-+ pnd->urbs[i] = req;
-+ }
-+
-+ netif_wake_queue(dev);
-+ return 0;
-+}
-+
-+static int usbpn_close(struct net_device *dev)
-+{
-+ struct usbpn_dev *pnd = netdev_priv(dev);
-+ unsigned i;
-+ unsigned num = pnd->data_intf->cur_altsetting->desc.bInterfaceNumber;
-+
-+ netif_stop_queue(dev);
-+
-+ for (i = 0; i < rxq_size; i++) {
-+ struct urb *req = pnd->urbs[i];
-+
-+ if (!req)
-+ continue;
-+ usb_kill_urb(req);
-+ usb_free_urb(req);
-+ pnd->urbs[i] = NULL;
-+ }
-+
-+ return usb_set_interface(pnd->usb, num, !pnd->active_setting);
-+}
-+
-+static int usbpn_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
-+{
-+ struct if_phonet_req *req = (struct if_phonet_req *)ifr;
-+
-+ switch (cmd) {
-+ case SIOCPNGAUTOCONF:
-+ req->ifr_phonet_autoconf.device = PN_DEV_PC;
-+ return 0;
-+ }
-+ return -ENOIOCTLCMD;
-+}
-+
-+static int usbpn_set_mtu(struct net_device *dev, int new_mtu)
-+{
-+ if ((new_mtu < PHONET_MIN_MTU) || (new_mtu > PHONET_MAX_MTU))
-+ return -EINVAL;
-+
-+ dev->mtu = new_mtu;
-+ return 0;
-+}
-+
-+static const struct net_device_ops usbpn_ops = {
-+ .ndo_open = usbpn_open,
-+ .ndo_stop = usbpn_close,
-+ .ndo_start_xmit = usbpn_xmit,
-+ .ndo_do_ioctl = usbpn_ioctl,
-+ .ndo_change_mtu = usbpn_set_mtu,
-+};
-+
-+static void usbpn_setup(struct net_device *dev)
-+{
-+ dev->features = 0;
-+ dev->netdev_ops = &usbpn_ops,
-+ dev->header_ops = &phonet_header_ops;
-+ dev->type = ARPHRD_PHONET;
-+ dev->flags = IFF_POINTOPOINT | IFF_NOARP;
-+ dev->mtu = PHONET_MAX_MTU;
-+ dev->hard_header_len = 1;
-+ dev->dev_addr[0] = PN_MEDIA_USB;
-+ dev->addr_len = 1;
-+ dev->tx_queue_len = 3;
-+
-+ dev->destructor = free_netdev;
-+}
-+
-+/*
-+ * USB driver callbacks
-+ */
-+static struct usb_device_id usbpn_ids[] = {
-+ {
-+ .match_flags = USB_DEVICE_ID_MATCH_VENDOR
-+ | USB_DEVICE_ID_MATCH_INT_CLASS
-+ | USB_DEVICE_ID_MATCH_INT_SUBCLASS,
-+ .idVendor = 0x0421, /* Nokia */
-+ .bInterfaceClass = USB_CLASS_COMM,
-+ .bInterfaceSubClass = 0xFE,
-+ },
-+ { },
-+};
-+
-+MODULE_DEVICE_TABLE(usb, usbpn_ids);
-+
-+static struct usb_driver usbpn_driver;
-+
-+static int usbpn_probe(struct usb_interface *intf, const struct usb_device_id *id)
-+{
-+ static const char ifname[] = "usbpn%d";
-+ const struct usb_cdc_union_desc *union_header = NULL;
-+ const struct usb_host_interface *data_desc;
-+ struct usb_interface *data_intf;
-+ struct usb_device *usbdev = interface_to_usbdev(intf);
-+ struct net_device *dev;
-+ struct usbpn_dev *pnd;
-+ u8 *data;
-+ int phonet = 0;
-+ int len, err;
-+
-+ data = intf->altsetting->extra;
-+ len = intf->altsetting->extralen;
-+ while (len >= 3) {
-+ u8 dlen = data[0];
-+ if (dlen < 3)
-+ return -EINVAL;
-+
-+ /* bDescriptorType */
-+ if (data[1] == USB_DT_CS_INTERFACE) {
-+ /* bDescriptorSubType */
-+ switch (data[2]) {
-+ case USB_CDC_UNION_TYPE:
-+ if (union_header || dlen < 5)
-+ break;
-+ union_header =
-+ (struct usb_cdc_union_desc *)data;
-+ break;
-+ case 0xAB:
-+ phonet = 1;
-+ break;
-+ }
-+ }
-+ data += dlen;
-+ len -= dlen;
-+ }
-+
-+ if (!union_header || !phonet)
-+ return -EINVAL;
-+
-+ data_intf = usb_ifnum_to_if(usbdev, union_header->bSlaveInterface0);
-+ if (data_intf == NULL)
-+ return -ENODEV;
-+ /* Data interface has one inactive and one active setting */
-+ if (data_intf->num_altsetting != 2)
-+ return -EINVAL;
-+ if (data_intf->altsetting[0].desc.bNumEndpoints == 0 &&
-+ data_intf->altsetting[1].desc.bNumEndpoints == 2)
-+ data_desc = data_intf->altsetting + 1;
-+ else
-+ if (data_intf->altsetting[0].desc.bNumEndpoints == 2 &&
-+ data_intf->altsetting[1].desc.bNumEndpoints == 0)
-+ data_desc = data_intf->altsetting;
-+ else
-+ return -EINVAL;
-+
-+ dev = alloc_netdev(sizeof(*pnd) + sizeof(pnd->urbs[0]) * rxq_size,
-+ ifname, NET_NAME_UNKNOWN, usbpn_setup);
-+ if (!dev)
-+ return -ENOMEM;
-+
-+ pnd = netdev_priv(dev);
-+ SET_NETDEV_DEV(dev, &intf->dev);
-+
-+ pnd->dev = dev;
-+ pnd->usb = usbdev;
-+ pnd->intf = intf;
-+ pnd->data_intf = data_intf;
-+ spin_lock_init(&pnd->tx_lock);
-+ spin_lock_init(&pnd->rx_lock);
-+ /* Endpoints */
-+ if (usb_pipein(data_desc->endpoint[0].desc.bEndpointAddress)) {
-+ pnd->rx_pipe = usb_rcvbulkpipe(usbdev,
-+ data_desc->endpoint[0].desc.bEndpointAddress);
-+ pnd->tx_pipe = usb_sndbulkpipe(usbdev,
-+ data_desc->endpoint[1].desc.bEndpointAddress);
-+ } else {
-+ pnd->rx_pipe = usb_rcvbulkpipe(usbdev,
-+ data_desc->endpoint[1].desc.bEndpointAddress);
-+ pnd->tx_pipe = usb_sndbulkpipe(usbdev,
-+ data_desc->endpoint[0].desc.bEndpointAddress);
-+ }
-+ pnd->active_setting = data_desc - data_intf->altsetting;
-+
-+ err = usb_driver_claim_interface(&usbpn_driver, data_intf, pnd);
-+ if (err)
-+ goto out;
-+
-+ /* Force inactive mode until the network device is brought UP */
-+ usb_set_interface(usbdev, union_header->bSlaveInterface0,
-+ !pnd->active_setting);
-+ usb_set_intfdata(intf, pnd);
-+
-+ err = register_netdev(dev);
-+ if (err) {
-+ usb_driver_release_interface(&usbpn_driver, data_intf);
-+ goto out;
-+ }
-+
-+ dev_dbg(&dev->dev, "USB CDC Phonet device found\n");
-+ return 0;
-+
-+out:
-+ usb_set_intfdata(intf, NULL);
-+ free_netdev(dev);
-+ return err;
-+}
-+
-+static void usbpn_disconnect(struct usb_interface *intf)
-+{
-+ struct usbpn_dev *pnd = usb_get_intfdata(intf);
-+
-+ if (pnd->disconnected)
-+ return;
-+
-+ pnd->disconnected = 1;
-+ usb_driver_release_interface(&usbpn_driver,
-+ (pnd->intf == intf) ? pnd->data_intf : pnd->intf);
-+ unregister_netdev(pnd->dev);
-+}
-+
-+static struct usb_driver usbpn_driver = {
-+ .name = "cdc_phonet",
-+ .probe = usbpn_probe,
-+ .disconnect = usbpn_disconnect,
-+ .id_table = usbpn_ids,
-+ .disable_hub_initiated_lpm = 1,
-+};
-+
-+module_usb_driver(usbpn_driver);
-+
-+MODULE_AUTHOR("Remi Denis-Courmont");
-+MODULE_DESCRIPTION("USB CDC Phonet host interface");
-+MODULE_LICENSE("GPL");
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/cdc_subset.c backports-3.18.1-1/drivers/net/usb/cdc_subset.c
---- backports-3.18.1-1.org/drivers/net/usb/cdc_subset.c 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/cdc_subset.c 2014-12-16 18:39:45.000000000 +0100
-@@ -0,0 +1,369 @@
-+/*
-+ * Simple "CDC Subset" USB Networking Links
-+ * Copyright (C) 2000-2005 by David Brownell
-+ *
-+ * 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, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kmod.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/ethtool.h>
-+#include <linux/workqueue.h>
-+#include <linux/mii.h>
-+#include <linux/usb.h>
-+#include <linux/usb/usbnet.h>
-+
-+
-+/*
-+ * This supports simple USB network links that don't require any special
-+ * framing or hardware control operations. The protocol used here is a
-+ * strict subset of CDC Ethernet, with three basic differences reflecting
-+ * the goal that almost any hardware should run it:
-+ *
-+ * - Minimal runtime control: one interface, no altsettings, and
-+ * no vendor or class specific control requests. If a device is
-+ * configured, it is allowed to exchange packets with the host.
-+ * Fancier models would mean not working on some hardware.
-+ *
-+ * - Minimal manufacturing control: no IEEE "Organizationally
-+ * Unique ID" required, or an EEPROMs to store one. Each host uses
-+ * one random "locally assigned" Ethernet address instead, which can
-+ * of course be overridden using standard tools like "ifconfig".
-+ * (With 2^46 such addresses, same-net collisions are quite rare.)
-+ *
-+ * - There is no additional framing data for USB. Packets are written
-+ * exactly as in CDC Ethernet, starting with an Ethernet header and
-+ * terminated by a short packet. However, the host will never send a
-+ * zero length packet; some systems can't handle those robustly.
-+ *
-+ * Anything that can transmit and receive USB bulk packets can implement
-+ * this protocol. That includes both smart peripherals and quite a lot
-+ * of "host-to-host" USB cables (which embed two devices back-to-back).
-+ *
-+ * Note that although Linux may use many of those host-to-host links
-+ * with this "cdc_subset" framing, that doesn't mean there may not be a
-+ * better approach. Handling the "other end unplugs/replugs" scenario
-+ * well tends to require chip-specific vendor requests. Also, Windows
-+ * peers at the other end of host-to-host cables may expect their own
-+ * framing to be used rather than this "cdc_subset" model.
-+ */
-+
-+#if defined(CONFIG_USB_EPSON2888) || defined(CONFIG_USB_ARMLINUX)
-+/* PDA style devices are always connected if present */
-+static int always_connected (struct usbnet *dev)
-+{
-+ return 0;
-+}
-+#endif
-+
-+#ifdef CONFIG_USB_ALI_M5632
-+#define HAVE_HARDWARE
-+
-+/*-------------------------------------------------------------------------
-+ *
-+ * ALi M5632 driver ... does high speed
-+ *
-+ * NOTE that the MS-Windows drivers for this chip use some funky and
-+ * (naturally) undocumented 7-byte prefix to each packet, so this is a
-+ * case where we don't currently interoperate. Also, once you unplug
-+ * one end of the cable, you need to replug the other end too ... since
-+ * chip docs are unavailable, there's no way to reset the relevant state
-+ * short of a power cycle.
-+ *
-+ *-------------------------------------------------------------------------*/
-+
-+static void m5632_recover(struct usbnet *dev)
-+{
-+ struct usb_device *udev = dev->udev;
-+ struct usb_interface *intf = dev->intf;
-+ int r;
-+
-+ r = usb_lock_device_for_reset(udev, intf);
-+ if (r < 0)
-+ return;
-+
-+ usb_reset_device(udev);
-+ usb_unlock_device(udev);
-+}
-+
-+static const struct driver_info ali_m5632_info = {
-+ .description = "ALi M5632",
-+ .flags = FLAG_POINTTOPOINT,
-+ .recover = m5632_recover,
-+};
-+
-+#endif
-+
-+#ifdef CONFIG_USB_AN2720
-+#define HAVE_HARDWARE
-+
-+/*-------------------------------------------------------------------------
-+ *
-+ * AnchorChips 2720 driver ... http://www.cypress.com
-+ *
-+ * This doesn't seem to have a way to detect whether the peer is
-+ * connected, or need any reset handshaking. It's got pretty big
-+ * internal buffers (handles most of a frame's worth of data).
-+ * Chip data sheets don't describe any vendor control messages.
-+ *
-+ *-------------------------------------------------------------------------*/
-+
-+static const struct driver_info an2720_info = {
-+ .description = "AnchorChips/Cypress 2720",
-+ .flags = FLAG_POINTTOPOINT,
-+ // no reset available!
-+ // no check_connect available!
-+
-+ .in = 2, .out = 2, // direction distinguishes these
-+};
-+
-+#endif /* CONFIG_USB_AN2720 */
-+
-+
-+#ifdef CONFIG_USB_BELKIN
-+#define HAVE_HARDWARE
-+
-+/*-------------------------------------------------------------------------
-+ *
-+ * Belkin F5U104 ... two NetChip 2280 devices + Atmel AVR microcontroller
-+ *
-+ * ... also two eTEK designs, including one sold as "Advance USBNET"
-+ *
-+ *-------------------------------------------------------------------------*/
-+
-+static const struct driver_info belkin_info = {
-+ .description = "Belkin, eTEK, or compatible",
-+ .flags = FLAG_POINTTOPOINT,
-+};
-+
-+#endif /* CONFIG_USB_BELKIN */
-+
-+
-+
-+#ifdef CONFIG_USB_EPSON2888
-+#define HAVE_HARDWARE
-+
-+/*-------------------------------------------------------------------------
-+ *
-+ * EPSON USB clients
-+ *
-+ * This is the same idea as Linux PDAs (below) except the firmware in the
-+ * device might not be Tux-powered. Epson provides reference firmware that
-+ * implements this interface. Product developers can reuse or modify that
-+ * code, such as by using their own product and vendor codes.
-+ *
-+ * Support was from Juro Bystricky <bystricky.juro(a)erd.epson.com>
-+ *
-+ *-------------------------------------------------------------------------*/
-+
-+static const struct driver_info epson2888_info = {
-+ .description = "Epson USB Device",
-+ .check_connect = always_connected,
-+ .flags = FLAG_POINTTOPOINT,
-+
-+ .in = 4, .out = 3,
-+};
-+
-+#endif /* CONFIG_USB_EPSON2888 */
-+
-+
-+/*-------------------------------------------------------------------------
-+ *
-+ * info from Jonathan McDowell <noodles(a)earth.li>
-+ *
-+ *-------------------------------------------------------------------------*/
-+#ifdef CONFIG_USB_KC2190
-+#define HAVE_HARDWARE
-+static const struct driver_info kc2190_info = {
-+ .description = "KC Technology KC-190",
-+ .flags = FLAG_POINTTOPOINT,
-+};
-+#endif /* CONFIG_USB_KC2190 */
-+
-+
-+#ifdef CONFIG_USB_ARMLINUX
-+#define HAVE_HARDWARE
-+
-+/*-------------------------------------------------------------------------
-+ *
-+ * Intel's SA-1100 chip integrates basic USB support, and is used
-+ * in PDAs like some iPaqs, the Yopy, some Zaurus models, and more.
-+ * When they run Linux, arch/arm/mach-sa1100/usb-eth.c may be used to
-+ * network using minimal USB framing data.
-+ *
-+ * This describes the driver currently in standard ARM Linux kernels.
-+ * The Zaurus uses a different driver (see later).
-+ *
-+ * PXA25x and PXA210 use XScale cores (ARM v5TE) with better USB support
-+ * and different USB endpoint numbering than the SA1100 devices. The
-+ * mach-pxa/usb-eth.c driver re-uses the device ids from mach-sa1100
-+ * so we rely on the endpoint descriptors.
-+ *
-+ *-------------------------------------------------------------------------*/
-+
-+static const struct driver_info linuxdev_info = {
-+ .description = "Linux Device",
-+ .check_connect = always_connected,
-+ .flags = FLAG_POINTTOPOINT,
-+};
-+
-+static const struct driver_info yopy_info = {
-+ .description = "Yopy",
-+ .check_connect = always_connected,
-+ .flags = FLAG_POINTTOPOINT,
-+};
-+
-+static const struct driver_info blob_info = {
-+ .description = "Boot Loader OBject",
-+ .check_connect = always_connected,
-+ .flags = FLAG_POINTTOPOINT,
-+};
-+
-+#endif /* CONFIG_USB_ARMLINUX */
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+#ifndef HAVE_HARDWARE
-+#warning You need to configure some hardware for this driver
-+#endif
-+
-+/*
-+ * chip vendor names won't normally be on the cables, and
-+ * may not be on the device.
-+ */
-+
-+static const struct usb_device_id products [] = {
-+
-+#ifdef CONFIG_USB_ALI_M5632
-+{
-+ USB_DEVICE (0x0402, 0x5632), // ALi defaults
-+ .driver_info = (unsigned long) &ali_m5632_info,
-+},
-+{
-+ USB_DEVICE (0x182d,0x207c), // SiteCom CN-124
-+ .driver_info = (unsigned long) &ali_m5632_info,
-+},
-+#endif
-+
-+#ifdef CONFIG_USB_AN2720
-+{
-+ USB_DEVICE (0x0547, 0x2720), // AnchorChips defaults
-+ .driver_info = (unsigned long) &an2720_info,
-+}, {
-+ USB_DEVICE (0x0547, 0x2727), // Xircom PGUNET
-+ .driver_info = (unsigned long) &an2720_info,
-+},
-+#endif
-+
-+#ifdef CONFIG_USB_BELKIN
-+{
-+ USB_DEVICE (0x050d, 0x0004), // Belkin
-+ .driver_info = (unsigned long) &belkin_info,
-+}, {
-+ USB_DEVICE (0x056c, 0x8100), // eTEK
-+ .driver_info = (unsigned long) &belkin_info,
-+}, {
-+ USB_DEVICE (0x0525, 0x9901), // Advance USBNET (eTEK)
-+ .driver_info = (unsigned long) &belkin_info,
-+},
-+#endif
-+
-+#ifdef CONFIG_USB_EPSON2888
-+{
-+ USB_DEVICE (0x0525, 0x2888), // EPSON USB client
-+ .driver_info = (unsigned long) &epson2888_info,
-+},
-+#endif
-+
-+#ifdef CONFIG_USB_KC2190
-+{
-+ USB_DEVICE (0x050f, 0x0190), // KC-190
-+ .driver_info = (unsigned long) &kc2190_info,
-+},
-+#endif
-+
-+#ifdef CONFIG_USB_ARMLINUX
-+/*
-+ * SA-1100 using standard ARM Linux kernels, or compatible.
-+ * Often used when talking to Linux PDAs (iPaq, Yopy, etc).
-+ * The sa-1100 "usb-eth" driver handles the basic framing.
-+ *
-+ * PXA25x or PXA210 ... these use a "usb-eth" driver much like
-+ * the sa1100 one, but hardware uses different endpoint numbers.
-+ *
-+ * Or the Linux "Ethernet" gadget on hardware that can't talk
-+ * CDC Ethernet (e.g., no altsettings), in either of two modes:
-+ * - acting just like the old "usb-eth" firmware, though
-+ * the implementation is different
-+ * - supporting RNDIS as the first/default configuration for
-+ * MS-Windows interop; Linux needs to use the other config
-+ */
-+{
-+ // 1183 = 0x049F, both used as hex values?
-+ // Compaq "Itsy" vendor/product id
-+ USB_DEVICE (0x049F, 0x505A), // usb-eth, or compatible
-+ .driver_info = (unsigned long) &linuxdev_info,
-+}, {
-+ USB_DEVICE (0x0E7E, 0x1001), // G.Mate "Yopy"
-+ .driver_info = (unsigned long) &yopy_info,
-+}, {
-+ USB_DEVICE (0x8086, 0x07d3), // "blob" bootloader
-+ .driver_info = (unsigned long) &blob_info,
-+}, {
-+ USB_DEVICE (0x1286, 0x8001), // "blob" bootloader
-+ .driver_info = (unsigned long) &blob_info,
-+}, {
-+ // Linux Ethernet/RNDIS gadget, mostly on PXA, second config
-+ // e.g. Gumstix, current OpenZaurus, ... or anything else
-+ // that just enables this gadget option.
-+ USB_DEVICE (0x0525, 0xa4a2),
-+ .driver_info = (unsigned long) &linuxdev_info,
-+},
-+#endif
-+
-+ { }, // END
-+};
-+MODULE_DEVICE_TABLE(usb, products);
-+
-+/*-------------------------------------------------------------------------*/
-+static int dummy_prereset(struct usb_interface *intf)
-+{
-+ return 0;
-+}
-+
-+static int dummy_postreset(struct usb_interface *intf)
-+{
-+ return 0;
-+}
-+
-+static struct usb_driver cdc_subset_driver = {
-+ .name = "cdc_subset",
-+ .probe = usbnet_probe,
-+ .suspend = usbnet_suspend,
-+ .resume = usbnet_resume,
-+ .pre_reset = dummy_prereset,
-+ .post_reset = dummy_postreset,
-+ .disconnect = usbnet_disconnect,
-+ .id_table = products,
-+ .disable_hub_initiated_lpm = 1,
-+};
-+
-+module_usb_driver(cdc_subset_driver);
-+
-+MODULE_AUTHOR("David Brownell");
-+MODULE_DESCRIPTION("Simple 'CDC Subset' USB networking links");
-+MODULE_LICENSE("GPL");
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/cx82310_eth.c backports-3.18.1-1/drivers/net/usb/cx82310_eth.c
---- backports-3.18.1-1.org/drivers/net/usb/cx82310_eth.c 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/cx82310_eth.c 2014-12-16 18:39:45.000000000 +0100
-@@ -0,0 +1,326 @@
-+/*
-+ * Driver for USB ethernet port of Conexant CX82310-based ADSL routers
-+ * Copyright (C) 2010 by Ondrej Zary
-+ * some parts inspired by the cxacru driver
-+ *
-+ * 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, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/ethtool.h>
-+#include <linux/workqueue.h>
-+#include <linux/mii.h>
-+#include <linux/usb.h>
-+#include <linux/usb/usbnet.h>
-+
-+enum cx82310_cmd {
-+ CMD_START = 0x84, /* no effect? */
-+ CMD_STOP = 0x85, /* no effect? */
-+ CMD_GET_STATUS = 0x90, /* returns nothing? */
-+ CMD_GET_MAC_ADDR = 0x91, /* read MAC address */
-+ CMD_GET_LINK_STATUS = 0x92, /* not useful, link is always up */
-+ CMD_ETHERNET_MODE = 0x99, /* unknown, needed during init */
-+};
-+
-+enum cx82310_status {
-+ STATUS_UNDEFINED,
-+ STATUS_SUCCESS,
-+ STATUS_ERROR,
-+ STATUS_UNSUPPORTED,
-+ STATUS_UNIMPLEMENTED,
-+ STATUS_PARAMETER_ERROR,
-+ STATUS_DBG_LOOPBACK,
-+};
-+
-+#define CMD_PACKET_SIZE 64
-+/* first command after power on can take around 8 seconds */
-+#define CMD_TIMEOUT 15000
-+#define CMD_REPLY_RETRY 5
-+
-+#define CX82310_MTU 1514
-+#define CMD_EP 0x01
-+
-+/*
-+ * execute control command
-+ * - optionally send some data (command parameters)
-+ * - optionally wait for the reply
-+ * - optionally read some data from the reply
-+ */
-+static int cx82310_cmd(struct usbnet *dev, enum cx82310_cmd cmd, bool reply,
-+ u8 *wdata, int wlen, u8 *rdata, int rlen)
-+{
-+ int actual_len, retries, ret;
-+ struct usb_device *udev = dev->udev;
-+ u8 *buf = kzalloc(CMD_PACKET_SIZE, GFP_KERNEL);
-+
-+ if (!buf)
-+ return -ENOMEM;
-+
-+ /* create command packet */
-+ buf[0] = cmd;
-+ if (wdata)
-+ memcpy(buf + 4, wdata, min_t(int, wlen, CMD_PACKET_SIZE - 4));
-+
-+ /* send command packet */
-+ ret = usb_bulk_msg(udev, usb_sndbulkpipe(udev, CMD_EP), buf,
-+ CMD_PACKET_SIZE, &actual_len, CMD_TIMEOUT);
-+ if (ret < 0) {
-+ dev_err(&dev->udev->dev, "send command %#x: error %d\n",
-+ cmd, ret);
-+ goto end;
-+ }
-+
-+ if (reply) {
-+ /* wait for reply, retry if it's empty */
-+ for (retries = 0; retries < CMD_REPLY_RETRY; retries++) {
-+ ret = usb_bulk_msg(udev, usb_rcvbulkpipe(udev, CMD_EP),
-+ buf, CMD_PACKET_SIZE, &actual_len,
-+ CMD_TIMEOUT);
-+ if (ret < 0) {
-+ dev_err(&dev->udev->dev,
-+ "reply receive error %d\n", ret);
-+ goto end;
-+ }
-+ if (actual_len > 0)
-+ break;
-+ }
-+ if (actual_len == 0) {
-+ dev_err(&dev->udev->dev, "no reply to command %#x\n",
-+ cmd);
-+ ret = -EIO;
-+ goto end;
-+ }
-+ if (buf[0] != cmd) {
-+ dev_err(&dev->udev->dev,
-+ "got reply to command %#x, expected: %#x\n",
-+ buf[0], cmd);
-+ ret = -EIO;
-+ goto end;
-+ }
-+ if (buf[1] != STATUS_SUCCESS) {
-+ dev_err(&dev->udev->dev, "command %#x failed: %#x\n",
-+ cmd, buf[1]);
-+ ret = -EIO;
-+ goto end;
-+ }
-+ if (rdata)
-+ memcpy(rdata, buf + 4,
-+ min_t(int, rlen, CMD_PACKET_SIZE - 4));
-+ }
-+end:
-+ kfree(buf);
-+ return ret;
-+}
-+
-+#define partial_len data[0] /* length of partial packet data */
-+#define partial_rem data[1] /* remaining (missing) data length */
-+#define partial_data data[2] /* partial packet data */
-+
-+static int cx82310_bind(struct usbnet *dev, struct usb_interface *intf)
-+{
-+ int ret;
-+ char buf[15];
-+ struct usb_device *udev = dev->udev;
-+
-+ /* avoid ADSL modems - continue only if iProduct is "USB NET CARD" */
-+ if (usb_string(udev, udev->descriptor.iProduct, buf, sizeof(buf)) > 0
-+ && strcmp(buf, "USB NET CARD")) {
-+ dev_info(&udev->dev, "ignoring: probably an ADSL modem\n");
-+ return -ENODEV;
-+ }
-+
-+ ret = usbnet_get_endpoints(dev, intf);
-+ if (ret)
-+ return ret;
-+
-+ /*
-+ * this must not include ethernet header as the device can send partial
-+ * packets with no header (and sometimes even empty URBs)
-+ */
-+ dev->net->hard_header_len = 0;
-+ /* we can send at most 1514 bytes of data (+ 2-byte header) per URB */
-+ dev->hard_mtu = CX82310_MTU + 2;
-+ /* we can receive URBs up to 4KB from the device */
-+ dev->rx_urb_size = 4096;
-+
-+ dev->partial_data = (unsigned long) kmalloc(dev->hard_mtu, GFP_KERNEL);
-+ if (!dev->partial_data)
-+ return -ENOMEM;
-+
-+ /* enable ethernet mode (?) */
-+ ret = cx82310_cmd(dev, CMD_ETHERNET_MODE, true, "\x01", 1, NULL, 0);
-+ if (ret) {
-+ dev_err(&udev->dev, "unable to enable ethernet mode: %d\n",
-+ ret);
-+ goto err;
-+ }
-+
-+ /* get the MAC address */
-+ ret = cx82310_cmd(dev, CMD_GET_MAC_ADDR, true, NULL, 0,
-+ dev->net->dev_addr, ETH_ALEN);
-+ if (ret) {
-+ dev_err(&udev->dev, "unable to read MAC address: %d\n", ret);
-+ goto err;
-+ }
-+
-+ /* start (does not seem to have any effect?) */
-+ ret = cx82310_cmd(dev, CMD_START, false, NULL, 0, NULL, 0);
-+ if (ret)
-+ goto err;
-+
-+ return 0;
-+err:
-+ kfree((void *)dev->partial_data);
-+ return ret;
-+}
-+
-+static void cx82310_unbind(struct usbnet *dev, struct usb_interface *intf)
-+{
-+ kfree((void *)dev->partial_data);
-+}
-+
-+/*
-+ * RX is NOT easy - we can receive multiple packets per skb, each having 2-byte
-+ * packet length at the beginning.
-+ * The last packet might be incomplete (when it crosses the 4KB URB size),
-+ * continuing in the next skb (without any headers).
-+ * If a packet has odd length, there is one extra byte at the end (before next
-+ * packet or at the end of the URB).
-+ */
-+static int cx82310_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
-+{
-+ int len;
-+ struct sk_buff *skb2;
-+
-+ /*
-+ * If the last skb ended with an incomplete packet, this skb contains
-+ * end of that packet at the beginning.
-+ */
-+ if (dev->partial_rem) {
-+ len = dev->partial_len + dev->partial_rem;
-+ skb2 = alloc_skb(len, GFP_ATOMIC);
-+ if (!skb2)
-+ return 0;
-+ skb_put(skb2, len);
-+ memcpy(skb2->data, (void *)dev->partial_data,
-+ dev->partial_len);
-+ memcpy(skb2->data + dev->partial_len, skb->data,
-+ dev->partial_rem);
-+ usbnet_skb_return(dev, skb2);
-+ skb_pull(skb, (dev->partial_rem + 1) & ~1);
-+ dev->partial_rem = 0;
-+ if (skb->len < 2)
-+ return 1;
-+ }
-+
-+ /* a skb can contain multiple packets */
-+ while (skb->len > 1) {
-+ /* first two bytes are packet length */
-+ len = skb->data[0] | (skb->data[1] << 8);
-+ skb_pull(skb, 2);
-+
-+ /* if last packet in the skb, let usbnet to process it */
-+ if (len == skb->len || len + 1 == skb->len) {
-+ skb_trim(skb, len);
-+ break;
-+ }
-+
-+ if (len > CX82310_MTU) {
-+ dev_err(&dev->udev->dev, "RX packet too long: %d B\n",
-+ len);
-+ return 0;
-+ }
-+
-+ /* incomplete packet, save it for the next skb */
-+ if (len > skb->len) {
-+ dev->partial_len = skb->len;
-+ dev->partial_rem = len - skb->len;
-+ memcpy((void *)dev->partial_data, skb->data,
-+ dev->partial_len);
-+ skb_pull(skb, skb->len);
-+ break;
-+ }
-+
-+ skb2 = alloc_skb(len, GFP_ATOMIC);
-+ if (!skb2)
-+ return 0;
-+ skb_put(skb2, len);
-+ memcpy(skb2->data, skb->data, len);
-+ /* process the packet */
-+ usbnet_skb_return(dev, skb2);
-+
-+ skb_pull(skb, (len + 1) & ~1);
-+ }
-+
-+ /* let usbnet process the last packet */
-+ return 1;
-+}
-+
-+/* TX is easy, just add 2 bytes of length at the beginning */
-+static struct sk_buff *cx82310_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
-+ gfp_t flags)
-+{
-+ int len = skb->len;
-+
-+ if (skb_headroom(skb) < 2) {
-+ struct sk_buff *skb2 = skb_copy_expand(skb, 2, 0, flags);
-+ dev_kfree_skb_any(skb);
-+ skb = skb2;
-+ if (!skb)
-+ return NULL;
-+ }
-+ skb_push(skb, 2);
-+
-+ skb->data[0] = len;
-+ skb->data[1] = len >> 8;
-+
-+ return skb;
-+}
-+
-+
-+static const struct driver_info cx82310_info = {
-+ .description = "Conexant CX82310 USB ethernet",
-+ .flags = FLAG_ETHER,
-+ .bind = cx82310_bind,
-+ .unbind = cx82310_unbind,
-+ .rx_fixup = cx82310_rx_fixup,
-+ .tx_fixup = cx82310_tx_fixup,
-+};
-+
-+static const struct usb_device_id products[] = {
-+ {
-+ USB_DEVICE_AND_INTERFACE_INFO(0x0572, 0xcb01, 0xff, 0, 0),
-+ .driver_info = (unsigned long) &cx82310_info
-+ },
-+ { },
-+};
-+MODULE_DEVICE_TABLE(usb, products);
-+
-+static struct usb_driver cx82310_driver = {
-+ .name = "cx82310_eth",
-+ .id_table = products,
-+ .probe = usbnet_probe,
-+ .disconnect = usbnet_disconnect,
-+ .suspend = usbnet_suspend,
-+ .resume = usbnet_resume,
-+ .disable_hub_initiated_lpm = 1,
-+};
-+
-+module_usb_driver(cx82310_driver);
-+
-+MODULE_AUTHOR("Ondrej Zary");
-+MODULE_DESCRIPTION("Conexant CX82310-based ADSL router USB ethernet driver");
-+MODULE_LICENSE("GPL");
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/dm9601.c backports-3.18.1-1/drivers/net/usb/dm9601.c
---- backports-3.18.1-1.org/drivers/net/usb/dm9601.c 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/dm9601.c 2014-12-16 18:39:45.000000000 +0100
-@@ -0,0 +1,647 @@
-+/*
-+ * Davicom DM96xx USB 10/100Mbps ethernet devices
-+ *
-+ * Peter Korsgaard <jacmet(a)sunsite.dk>
-+ *
-+ * This file is licensed under the terms of the GNU General Public License
-+ * version 2. This program is licensed "as is" without any warranty of any
-+ * kind, whether express or implied.
-+ */
-+
-+//#define DEBUG
-+
-+#include <linux/module.h>
-+#include <linux/sched.h>
-+#include <linux/stddef.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/ethtool.h>
-+#include <linux/mii.h>
-+#include <linux/usb.h>
-+#include <linux/crc32.h>
-+#include <linux/usb/usbnet.h>
-+#include <linux/slab.h>
-+
-+/* datasheet:
-+ http://ptm2.cc.utu.fi/ftp/network/cards/DM9601/From_NET/DM9601-DS-P01-93091…
-+*/
-+
-+/* control requests */
-+#define DM_READ_REGS 0x00
-+#define DM_WRITE_REGS 0x01
-+#define DM_READ_MEMS 0x02
-+#define DM_WRITE_REG 0x03
-+#define DM_WRITE_MEMS 0x05
-+#define DM_WRITE_MEM 0x07
-+
-+/* registers */
-+#define DM_NET_CTRL 0x00
-+#define DM_RX_CTRL 0x05
-+#define DM_SHARED_CTRL 0x0b
-+#define DM_SHARED_ADDR 0x0c
-+#define DM_SHARED_DATA 0x0d /* low + high */
-+#define DM_PHY_ADDR 0x10 /* 6 bytes */
-+#define DM_MCAST_ADDR 0x16 /* 8 bytes */
-+#define DM_GPR_CTRL 0x1e
-+#define DM_GPR_DATA 0x1f
-+#define DM_CHIP_ID 0x2c
-+#define DM_MODE_CTRL 0x91 /* only on dm9620 */
-+
-+/* chip id values */
-+#define ID_DM9601 0
-+#define ID_DM9620 1
-+
-+#define DM_MAX_MCAST 64
-+#define DM_MCAST_SIZE 8
-+#define DM_EEPROM_LEN 256
-+#define DM_TX_OVERHEAD 2 /* 2 byte header */
-+#define DM_RX_OVERHEAD 7 /* 3 byte header + 4 byte crc tail */
-+#define DM_TIMEOUT 1000
-+
-+static int dm_read(struct usbnet *dev, u8 reg, u16 length, void *data)
-+{
-+ int err;
-+ err = usbnet_read_cmd(dev, DM_READ_REGS,
-+ USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-+ 0, reg, data, length);
-+ if(err != length && err >= 0)
-+ err = -EINVAL;
-+ return err;
-+}
-+
-+static int dm_read_reg(struct usbnet *dev, u8 reg, u8 *value)
-+{
-+ return dm_read(dev, reg, 1, value);
-+}
-+
-+static int dm_write(struct usbnet *dev, u8 reg, u16 length, void *data)
-+{
-+ int err;
-+ err = usbnet_write_cmd(dev, DM_WRITE_REGS,
-+ USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-+ 0, reg, data, length);
-+
-+ if (err >= 0 && err < length)
-+ err = -EINVAL;
-+ return err;
-+}
-+
-+static int dm_write_reg(struct usbnet *dev, u8 reg, u8 value)
-+{
-+ return usbnet_write_cmd(dev, DM_WRITE_REG,
-+ USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-+ value, reg, NULL, 0);
-+}
-+
-+static void dm_write_async(struct usbnet *dev, u8 reg, u16 length, void *data)
-+{
-+ usbnet_write_cmd_async(dev, DM_WRITE_REGS,
-+ USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-+ 0, reg, data, length);
-+}
-+
-+static void dm_write_reg_async(struct usbnet *dev, u8 reg, u8 value)
-+{
-+ usbnet_write_cmd_async(dev, DM_WRITE_REG,
-+ USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-+ value, reg, NULL, 0);
-+}
-+
-+static int dm_read_shared_word(struct usbnet *dev, int phy, u8 reg, __le16 *value)
-+{
-+ int ret, i;
-+
-+ mutex_lock(&dev->phy_mutex);
-+
-+ dm_write_reg(dev, DM_SHARED_ADDR, phy ? (reg | 0x40) : reg);
-+ dm_write_reg(dev, DM_SHARED_CTRL, phy ? 0xc : 0x4);
-+
-+ for (i = 0; i < DM_TIMEOUT; i++) {
-+ u8 tmp = 0;
-+
-+ udelay(1);
-+ ret = dm_read_reg(dev, DM_SHARED_CTRL, &tmp);
-+ if (ret < 0)
-+ goto out;
-+
-+ /* ready */
-+ if ((tmp & 1) == 0)
-+ break;
-+ }
-+
-+ if (i == DM_TIMEOUT) {
-+ netdev_err(dev->net, "%s read timed out!\n", phy ? "phy" : "eeprom");
-+ ret = -EIO;
-+ goto out;
-+ }
-+
-+ dm_write_reg(dev, DM_SHARED_CTRL, 0x0);
-+ ret = dm_read(dev, DM_SHARED_DATA, 2, value);
-+
-+ netdev_dbg(dev->net, "read shared %d 0x%02x returned 0x%04x, %d\n",
-+ phy, reg, *value, ret);
-+
-+ out:
-+ mutex_unlock(&dev->phy_mutex);
-+ return ret;
-+}
-+
-+static int dm_write_shared_word(struct usbnet *dev, int phy, u8 reg, __le16 value)
-+{
-+ int ret, i;
-+
-+ mutex_lock(&dev->phy_mutex);
-+
-+ ret = dm_write(dev, DM_SHARED_DATA, 2, &value);
-+ if (ret < 0)
-+ goto out;
-+
-+ dm_write_reg(dev, DM_SHARED_ADDR, phy ? (reg | 0x40) : reg);
-+ dm_write_reg(dev, DM_SHARED_CTRL, phy ? 0x1a : 0x12);
-+
-+ for (i = 0; i < DM_TIMEOUT; i++) {
-+ u8 tmp = 0;
-+
-+ udelay(1);
-+ ret = dm_read_reg(dev, DM_SHARED_CTRL, &tmp);
-+ if (ret < 0)
-+ goto out;
-+
-+ /* ready */
-+ if ((tmp & 1) == 0)
-+ break;
-+ }
-+
-+ if (i == DM_TIMEOUT) {
-+ netdev_err(dev->net, "%s write timed out!\n", phy ? "phy" : "eeprom");
-+ ret = -EIO;
-+ goto out;
-+ }
-+
-+ dm_write_reg(dev, DM_SHARED_CTRL, 0x0);
-+
-+out:
-+ mutex_unlock(&dev->phy_mutex);
-+ return ret;
-+}
-+
-+static int dm_read_eeprom_word(struct usbnet *dev, u8 offset, void *value)
-+{
-+ return dm_read_shared_word(dev, 0, offset, value);
-+}
-+
-+
-+
-+static int dm9601_get_eeprom_len(struct net_device *dev)
-+{
-+ return DM_EEPROM_LEN;
-+}
-+
-+static int dm9601_get_eeprom(struct net_device *net,
-+ struct ethtool_eeprom *eeprom, u8 * data)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+ __le16 *ebuf = (__le16 *) data;
-+ int i;
-+
-+ /* access is 16bit */
-+ if ((eeprom->offset % 2) || (eeprom->len % 2))
-+ return -EINVAL;
-+
-+ for (i = 0; i < eeprom->len / 2; i++) {
-+ if (dm_read_eeprom_word(dev, eeprom->offset / 2 + i,
-+ &ebuf[i]) < 0)
-+ return -EINVAL;
-+ }
-+ return 0;
-+}
-+
-+static int dm9601_mdio_read(struct net_device *netdev, int phy_id, int loc)
-+{
-+ struct usbnet *dev = netdev_priv(netdev);
-+
-+ __le16 res;
-+
-+ if (phy_id) {
-+ netdev_dbg(dev->net, "Only internal phy supported\n");
-+ return 0;
-+ }
-+
-+ dm_read_shared_word(dev, 1, loc, &res);
-+
-+ netdev_dbg(dev->net,
-+ "dm9601_mdio_read() phy_id=0x%02x, loc=0x%02x, returns=0x%04x\n",
-+ phy_id, loc, le16_to_cpu(res));
-+
-+ return le16_to_cpu(res);
-+}
-+
-+static void dm9601_mdio_write(struct net_device *netdev, int phy_id, int loc,
-+ int val)
-+{
-+ struct usbnet *dev = netdev_priv(netdev);
-+ __le16 res = cpu_to_le16(val);
-+
-+ if (phy_id) {
-+ netdev_dbg(dev->net, "Only internal phy supported\n");
-+ return;
-+ }
-+
-+ netdev_dbg(dev->net, "dm9601_mdio_write() phy_id=0x%02x, loc=0x%02x, val=0x%04x\n",
-+ phy_id, loc, val);
-+
-+ dm_write_shared_word(dev, 1, loc, res);
-+}
-+
-+static void dm9601_get_drvinfo(struct net_device *net,
-+ struct ethtool_drvinfo *info)
-+{
-+ /* Inherit standard device info */
-+ usbnet_get_drvinfo(net, info);
-+ info->eedump_len = DM_EEPROM_LEN;
-+}
-+
-+static u32 dm9601_get_link(struct net_device *net)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+
-+ return mii_link_ok(&dev->mii);
-+}
-+
-+static int dm9601_ioctl(struct net_device *net, struct ifreq *rq, int cmd)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+
-+ return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
-+}
-+
-+static const struct ethtool_ops dm9601_ethtool_ops = {
-+ .get_drvinfo = dm9601_get_drvinfo,
-+ .get_link = dm9601_get_link,
-+ .get_msglevel = usbnet_get_msglevel,
-+ .set_msglevel = usbnet_set_msglevel,
-+ .get_eeprom_len = dm9601_get_eeprom_len,
-+ .get_eeprom = dm9601_get_eeprom,
-+ .get_settings = usbnet_get_settings,
-+ .set_settings = usbnet_set_settings,
-+ .nway_reset = usbnet_nway_reset,
-+};
-+
-+static void dm9601_set_multicast(struct net_device *net)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+ /* We use the 20 byte dev->data for our 8 byte filter buffer
-+ * to avoid allocating memory that is tricky to free later */
-+ u8 *hashes = (u8 *) & dev->data;
-+ u8 rx_ctl = 0x31;
-+
-+ memset(hashes, 0x00, DM_MCAST_SIZE);
-+ hashes[DM_MCAST_SIZE - 1] |= 0x80; /* broadcast address */
-+
-+ if (net->flags & IFF_PROMISC) {
-+ rx_ctl |= 0x02;
-+ } else if (net->flags & IFF_ALLMULTI ||
-+ netdev_mc_count(net) > DM_MAX_MCAST) {
-+ rx_ctl |= 0x08;
-+ } else if (!netdev_mc_empty(net)) {
-+ struct netdev_hw_addr *ha;
-+
-+ netdev_for_each_mc_addr(ha, net) {
-+ u32 crc = ether_crc(ETH_ALEN, ha->addr) >> 26;
-+ hashes[crc >> 3] |= 1 << (crc & 0x7);
-+ }
-+ }
-+
-+ dm_write_async(dev, DM_MCAST_ADDR, DM_MCAST_SIZE, hashes);
-+ dm_write_reg_async(dev, DM_RX_CTRL, rx_ctl);
-+}
-+
-+static void __dm9601_set_mac_address(struct usbnet *dev)
-+{
-+ dm_write_async(dev, DM_PHY_ADDR, ETH_ALEN, dev->net->dev_addr);
-+}
-+
-+static int dm9601_set_mac_address(struct net_device *net, void *p)
-+{
-+ struct sockaddr *addr = p;
-+ struct usbnet *dev = netdev_priv(net);
-+
-+ if (!is_valid_ether_addr(addr->sa_data)) {
-+ dev_err(&net->dev, "not setting invalid mac address %pM\n",
-+ addr->sa_data);
-+ return -EINVAL;
-+ }
-+
-+ memcpy(net->dev_addr, addr->sa_data, net->addr_len);
-+ __dm9601_set_mac_address(dev);
-+
-+ return 0;
-+}
-+
-+static const struct net_device_ops dm9601_netdev_ops = {
-+ .ndo_open = usbnet_open,
-+ .ndo_stop = usbnet_stop,
-+ .ndo_start_xmit = usbnet_start_xmit,
-+ .ndo_tx_timeout = usbnet_tx_timeout,
-+ .ndo_change_mtu = usbnet_change_mtu,
-+ .ndo_validate_addr = eth_validate_addr,
-+ .ndo_do_ioctl = dm9601_ioctl,
-+ .ndo_set_rx_mode = dm9601_set_multicast,
-+ .ndo_set_mac_address = dm9601_set_mac_address,
-+};
-+
-+static int dm9601_bind(struct usbnet *dev, struct usb_interface *intf)
-+{
-+ int ret;
-+ u8 mac[ETH_ALEN], id;
-+
-+ ret = usbnet_get_endpoints(dev, intf);
-+ if (ret)
-+ goto out;
-+
-+ dev->net->netdev_ops = &dm9601_netdev_ops;
-+ dev->net->ethtool_ops = &dm9601_ethtool_ops;
-+ dev->net->hard_header_len += DM_TX_OVERHEAD;
-+ dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len;
-+
-+ /* dm9620/21a require room for 4 byte padding, even in dm9601
-+ * mode, so we need +1 to be able to receive full size
-+ * ethernet frames.
-+ */
-+ dev->rx_urb_size = dev->net->mtu + ETH_HLEN + DM_RX_OVERHEAD + 1;
-+
-+ dev->mii.dev = dev->net;
-+ dev->mii.mdio_read = dm9601_mdio_read;
-+ dev->mii.mdio_write = dm9601_mdio_write;
-+ dev->mii.phy_id_mask = 0x1f;
-+ dev->mii.reg_num_mask = 0x1f;
-+
-+ /* reset */
-+ dm_write_reg(dev, DM_NET_CTRL, 1);
-+ udelay(20);
-+
-+ /* read MAC */
-+ if (dm_read(dev, DM_PHY_ADDR, ETH_ALEN, mac) < 0) {
-+ printk(KERN_ERR "Error reading MAC address\n");
-+ ret = -ENODEV;
-+ goto out;
-+ }
-+
-+ /*
-+ * Overwrite the auto-generated address only with good ones.
-+ */
-+ if (is_valid_ether_addr(mac))
-+ memcpy(dev->net->dev_addr, mac, ETH_ALEN);
-+ else {
-+ printk(KERN_WARNING
-+ "dm9601: No valid MAC address in EEPROM, using %pM\n",
-+ dev->net->dev_addr);
-+ __dm9601_set_mac_address(dev);
-+ }
-+
-+ if (dm_read_reg(dev, DM_CHIP_ID, &id) < 0) {
-+ netdev_err(dev->net, "Error reading chip ID\n");
-+ ret = -ENODEV;
-+ goto out;
-+ }
-+
-+ /* put dm9620 devices in dm9601 mode */
-+ if (id == ID_DM9620) {
-+ u8 mode;
-+
-+ if (dm_read_reg(dev, DM_MODE_CTRL, &mode) < 0) {
-+ netdev_err(dev->net, "Error reading MODE_CTRL\n");
-+ ret = -ENODEV;
-+ goto out;
-+ }
-+ dm_write_reg(dev, DM_MODE_CTRL, mode & 0x7f);
-+ }
-+
-+ /* power up phy */
-+ dm_write_reg(dev, DM_GPR_CTRL, 1);
-+ dm_write_reg(dev, DM_GPR_DATA, 0);
-+
-+ /* receive broadcast packets */
-+ dm9601_set_multicast(dev->net);
-+
-+ dm9601_mdio_write(dev->net, dev->mii.phy_id, MII_BMCR, BMCR_RESET);
-+ dm9601_mdio_write(dev->net, dev->mii.phy_id, MII_ADVERTISE,
-+ ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP);
-+ mii_nway_restart(&dev->mii);
-+
-+out:
-+ return ret;
-+}
-+
-+static int dm9601_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
-+{
-+ u8 status;
-+ int len;
-+
-+ /* format:
-+ b1: rx status
-+ b2: packet length (incl crc) low
-+ b3: packet length (incl crc) high
-+ b4..n-4: packet data
-+ bn-3..bn: ethernet crc
-+ */
-+
-+ if (unlikely(skb->len < DM_RX_OVERHEAD)) {
-+ dev_err(&dev->udev->dev, "unexpected tiny rx frame\n");
-+ return 0;
-+ }
-+
-+ status = skb->data[0];
-+ len = (skb->data[1] | (skb->data[2] << 8)) - 4;
-+
-+ if (unlikely(status & 0xbf)) {
-+ if (status & 0x01) dev->net->stats.rx_fifo_errors++;
-+ if (status & 0x02) dev->net->stats.rx_crc_errors++;
-+ if (status & 0x04) dev->net->stats.rx_frame_errors++;
-+ if (status & 0x20) dev->net->stats.rx_missed_errors++;
-+ if (status & 0x90) dev->net->stats.rx_length_errors++;
-+ return 0;
-+ }
-+
-+ skb_pull(skb, 3);
-+ skb_trim(skb, len);
-+
-+ return 1;
-+}
-+
-+static struct sk_buff *dm9601_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
-+ gfp_t flags)
-+{
-+ int len, pad;
-+
-+ /* format:
-+ b1: packet length low
-+ b2: packet length high
-+ b3..n: packet data
-+ */
-+
-+ len = skb->len + DM_TX_OVERHEAD;
-+
-+ /* workaround for dm962x errata with tx fifo getting out of
-+ * sync if a USB bulk transfer retry happens right after a
-+ * packet with odd / maxpacket length by adding up to 3 bytes
-+ * padding.
-+ */
-+ while ((len & 1) || !(len % dev->maxpacket))
-+ len++;
-+
-+ len -= DM_TX_OVERHEAD; /* hw header doesn't count as part of length */
-+ pad = len - skb->len;
-+
-+ if (skb_headroom(skb) < DM_TX_OVERHEAD || skb_tailroom(skb) < pad) {
-+ struct sk_buff *skb2;
-+
-+ skb2 = skb_copy_expand(skb, DM_TX_OVERHEAD, pad, flags);
-+ dev_kfree_skb_any(skb);
-+ skb = skb2;
-+ if (!skb)
-+ return NULL;
-+ }
-+
-+ __skb_push(skb, DM_TX_OVERHEAD);
-+
-+ if (pad) {
-+ memset(skb->data + skb->len, 0, pad);
-+ __skb_put(skb, pad);
-+ }
-+
-+ skb->data[0] = len;
-+ skb->data[1] = len >> 8;
-+
-+ return skb;
-+}
-+
-+static void dm9601_status(struct usbnet *dev, struct urb *urb)
-+{
-+ int link;
-+ u8 *buf;
-+
-+ /* format:
-+ b0: net status
-+ b1: tx status 1
-+ b2: tx status 2
-+ b3: rx status
-+ b4: rx overflow
-+ b5: rx count
-+ b6: tx count
-+ b7: gpr
-+ */
-+
-+ if (urb->actual_length < 8)
-+ return;
-+
-+ buf = urb->transfer_buffer;
-+
-+ link = !!(buf[0] & 0x40);
-+ if (netif_carrier_ok(dev->net) != link) {
-+ usbnet_link_change(dev, link, 1);
-+ netdev_dbg(dev->net, "Link Status is: %d\n", link);
-+ }
-+}
-+
-+static int dm9601_link_reset(struct usbnet *dev)
-+{
-+ struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET };
-+
-+ mii_check_media(&dev->mii, 1, 1);
-+ mii_ethtool_gset(&dev->mii, &ecmd);
-+
-+ netdev_dbg(dev->net, "link_reset() speed: %u duplex: %d\n",
-+ ethtool_cmd_speed(&ecmd), ecmd.duplex);
-+
-+ return 0;
-+}
-+
-+static const struct driver_info dm9601_info = {
-+ .description = "Davicom DM96xx USB 10/100 Ethernet",
-+ .flags = FLAG_ETHER | FLAG_LINK_INTR,
-+ .bind = dm9601_bind,
-+ .rx_fixup = dm9601_rx_fixup,
-+ .tx_fixup = dm9601_tx_fixup,
-+ .status = dm9601_status,
-+ .link_reset = dm9601_link_reset,
-+ .reset = dm9601_link_reset,
-+};
-+
-+static const struct usb_device_id products[] = {
-+ {
-+ USB_DEVICE(0x07aa, 0x9601), /* Corega FEther USB-TXC */
-+ .driver_info = (unsigned long)&dm9601_info,
-+ },
-+ {
-+ USB_DEVICE(0x0a46, 0x9601), /* Davicom USB-100 */
-+ .driver_info = (unsigned long)&dm9601_info,
-+ },
-+ {
-+ USB_DEVICE(0x0a46, 0x6688), /* ZT6688 USB NIC */
-+ .driver_info = (unsigned long)&dm9601_info,
-+ },
-+ {
-+ USB_DEVICE(0x0a46, 0x0268), /* ShanTou ST268 USB NIC */
-+ .driver_info = (unsigned long)&dm9601_info,
-+ },
-+ {
-+ USB_DEVICE(0x0a46, 0x8515), /* ADMtek ADM8515 USB NIC */
-+ .driver_info = (unsigned long)&dm9601_info,
-+ },
-+ {
-+ USB_DEVICE(0x0a47, 0x9601), /* Hirose USB-100 */
-+ .driver_info = (unsigned long)&dm9601_info,
-+ },
-+ {
-+ USB_DEVICE(0x0fe6, 0x8101), /* DM9601 USB to Fast Ethernet Adapter */
-+ .driver_info = (unsigned long)&dm9601_info,
-+ },
-+ {
-+ USB_DEVICE(0x0fe6, 0x9700), /* DM9601 USB to Fast Ethernet Adapter */
-+ .driver_info = (unsigned long)&dm9601_info,
-+ },
-+ {
-+ USB_DEVICE(0x0a46, 0x9000), /* DM9000E */
-+ .driver_info = (unsigned long)&dm9601_info,
-+ },
-+ {
-+ USB_DEVICE(0x0a46, 0x9620), /* DM9620 USB to Fast Ethernet Adapter */
-+ .driver_info = (unsigned long)&dm9601_info,
-+ },
-+ {
-+ USB_DEVICE(0x0a46, 0x9621), /* DM9621A USB to Fast Ethernet Adapter */
-+ .driver_info = (unsigned long)&dm9601_info,
-+ },
-+ {
-+ USB_DEVICE(0x0a46, 0x9622), /* DM9622 USB to Fast Ethernet Adapter */
-+ .driver_info = (unsigned long)&dm9601_info,
-+ },
-+ {
-+ USB_DEVICE(0x0a46, 0x0269), /* DM962OA USB to Fast Ethernet Adapter */
-+ .driver_info = (unsigned long)&dm9601_info,
-+ },
-+ {
-+ USB_DEVICE(0x0a46, 0x1269), /* DM9621A USB to Fast Ethernet Adapter */
-+ .driver_info = (unsigned long)&dm9601_info,
-+ },
-+ {}, // END
-+};
-+
-+MODULE_DEVICE_TABLE(usb, products);
-+
-+static struct usb_driver dm9601_driver = {
-+ .name = "dm9601",
-+ .id_table = products,
-+ .probe = usbnet_probe,
-+ .disconnect = usbnet_disconnect,
-+ .suspend = usbnet_suspend,
-+ .resume = usbnet_resume,
-+ .disable_hub_initiated_lpm = 1,
-+};
-+
-+module_usb_driver(dm9601_driver);
-+
-+MODULE_AUTHOR("Peter Korsgaard <jacmet(a)sunsite.dk>");
-+MODULE_DESCRIPTION("Davicom DM96xx USB 10/100 ethernet devices");
-+MODULE_LICENSE("GPL");
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/gl620a.c backports-3.18.1-1/drivers/net/usb/gl620a.c
---- backports-3.18.1-1.org/drivers/net/usb/gl620a.c 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/gl620a.c 2014-12-16 18:39:45.000000000 +0100
-@@ -0,0 +1,242 @@
-+/*
-+ * GeneSys GL620USB-A based links
-+ * Copyright (C) 2001 by Jiun-Jie Huang <huangjj(a)genesyslogic.com.tw>
-+ * Copyright (C) 2001 by Stanislav Brabec <utx(a)penguin.cz>
-+ *
-+ * 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, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+// #define DEBUG // error path messages, extra info
-+// #define VERBOSE // more; success messages
-+
-+#include <linux/module.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/ethtool.h>
-+#include <linux/workqueue.h>
-+#include <linux/mii.h>
-+#include <linux/usb.h>
-+#include <linux/usb/usbnet.h>
-+#include <linux/gfp.h>
-+
-+
-+/*
-+ * GeneSys GL620USB-A (www.genesyslogic.com.tw)
-+ *
-+ * ... should partially interop with the Win32 driver for this hardware.
-+ * The GeneSys docs imply there's some NDIS issue motivating this framing.
-+ *
-+ * Some info from GeneSys:
-+ * - GL620USB-A is full duplex; GL620USB is only half duplex for bulk.
-+ * (Some cables, like the BAFO-100c, use the half duplex version.)
-+ * - For the full duplex model, the low bit of the version code says
-+ * which side is which ("left/right").
-+ * - For the half duplex type, a control/interrupt handshake settles
-+ * the transfer direction. (That's disabled here, partially coded.)
-+ * A control URB would block until other side writes an interrupt.
-+ *
-+ * Original code from Jiun-Jie Huang <huangjj(a)genesyslogic.com.tw>
-+ * and merged into "usbnet" by Stanislav Brabec <utx(a)penguin.cz>.
-+ */
-+
-+// control msg write command
-+#define GENELINK_CONNECT_WRITE 0xF0
-+// interrupt pipe index
-+#define GENELINK_INTERRUPT_PIPE 0x03
-+// interrupt read buffer size
-+#define INTERRUPT_BUFSIZE 0x08
-+// interrupt pipe interval value
-+#define GENELINK_INTERRUPT_INTERVAL 0x10
-+// max transmit packet number per transmit
-+#define GL_MAX_TRANSMIT_PACKETS 32
-+// max packet length
-+#define GL_MAX_PACKET_LEN 1514
-+// max receive buffer size
-+#define GL_RCV_BUF_SIZE \
-+ (((GL_MAX_PACKET_LEN + 4) * GL_MAX_TRANSMIT_PACKETS) + 4)
-+
-+struct gl_packet {
-+ __le32 packet_length;
-+ char packet_data [1];
-+};
-+
-+struct gl_header {
-+ __le32 packet_count;
-+ struct gl_packet packets;
-+};
-+
-+static int genelink_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
-+{
-+ struct gl_header *header;
-+ struct gl_packet *packet;
-+ struct sk_buff *gl_skb;
-+ u32 size;
-+ u32 count;
-+
-+ /* This check is no longer done by usbnet */
-+ if (skb->len < dev->net->hard_header_len)
-+ return 0;
-+
-+ header = (struct gl_header *) skb->data;
-+
-+ // get the packet count of the received skb
-+ count = le32_to_cpu(header->packet_count);
-+ if (count > GL_MAX_TRANSMIT_PACKETS) {
-+ netdev_dbg(dev->net,
-+ "genelink: invalid received packet count %u\n",
-+ count);
-+ return 0;
-+ }
-+
-+ // set the current packet pointer to the first packet
-+ packet = &header->packets;
-+
-+ // decrement the length for the packet count size 4 bytes
-+ skb_pull(skb, 4);
-+
-+ while (count > 1) {
-+ // get the packet length
-+ size = le32_to_cpu(packet->packet_length);
-+
-+ // this may be a broken packet
-+ if (size > GL_MAX_PACKET_LEN) {
-+ netdev_dbg(dev->net, "genelink: invalid rx length %d\n",
-+ size);
-+ return 0;
-+ }
-+
-+ // allocate the skb for the individual packet
-+ gl_skb = alloc_skb(size, GFP_ATOMIC);
-+ if (gl_skb) {
-+
-+ // copy the packet data to the new skb
-+ memcpy(skb_put(gl_skb, size),
-+ packet->packet_data, size);
-+ usbnet_skb_return(dev, gl_skb);
-+ }
-+
-+ // advance to the next packet
-+ packet = (struct gl_packet *)&packet->packet_data[size];
-+ count--;
-+
-+ // shift the data pointer to the next gl_packet
-+ skb_pull(skb, size + 4);
-+ }
-+
-+ // skip the packet length field 4 bytes
-+ skb_pull(skb, 4);
-+
-+ if (skb->len > GL_MAX_PACKET_LEN) {
-+ netdev_dbg(dev->net, "genelink: invalid rx length %d\n",
-+ skb->len);
-+ return 0;
-+ }
-+ return 1;
-+}
-+
-+static struct sk_buff *
-+genelink_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
-+{
-+ int padlen;
-+ int length = skb->len;
-+ int headroom = skb_headroom(skb);
-+ int tailroom = skb_tailroom(skb);
-+ __le32 *packet_count;
-+ __le32 *packet_len;
-+
-+ // FIXME: magic numbers, bleech
-+ padlen = ((skb->len + (4 + 4*1)) % 64) ? 0 : 1;
-+
-+ if ((!skb_cloned(skb))
-+ && ((headroom + tailroom) >= (padlen + (4 + 4*1)))) {
-+ if ((headroom < (4 + 4*1)) || (tailroom < padlen)) {
-+ skb->data = memmove(skb->head + (4 + 4*1),
-+ skb->data, skb->len);
-+ skb_set_tail_pointer(skb, skb->len);
-+ }
-+ } else {
-+ struct sk_buff *skb2;
-+ skb2 = skb_copy_expand(skb, (4 + 4*1) , padlen, flags);
-+ dev_kfree_skb_any(skb);
-+ skb = skb2;
-+ if (!skb)
-+ return NULL;
-+ }
-+
-+ // attach the packet count to the header
-+ packet_count = (__le32 *) skb_push(skb, (4 + 4*1));
-+ packet_len = packet_count + 1;
-+
-+ *packet_count = cpu_to_le32(1);
-+ *packet_len = cpu_to_le32(length);
-+
-+ // add padding byte
-+ if ((skb->len % dev->maxpacket) == 0)
-+ skb_put(skb, 1);
-+
-+ return skb;
-+}
-+
-+static int genelink_bind(struct usbnet *dev, struct usb_interface *intf)
-+{
-+ dev->hard_mtu = GL_RCV_BUF_SIZE;
-+ dev->net->hard_header_len += 4;
-+ dev->in = usb_rcvbulkpipe(dev->udev, dev->driver_info->in);
-+ dev->out = usb_sndbulkpipe(dev->udev, dev->driver_info->out);
-+ return 0;
-+}
-+
-+static const struct driver_info genelink_info = {
-+ .description = "Genesys GeneLink",
-+ .flags = FLAG_POINTTOPOINT | FLAG_FRAMING_GL | FLAG_NO_SETINT,
-+ .bind = genelink_bind,
-+ .rx_fixup = genelink_rx_fixup,
-+ .tx_fixup = genelink_tx_fixup,
-+
-+ .in = 1, .out = 2,
-+
-+#ifdef GENELINK_ACK
-+ .check_connect =genelink_check_connect,
-+#endif
-+};
-+
-+static const struct usb_device_id products [] = {
-+
-+{
-+ USB_DEVICE(0x05e3, 0x0502), // GL620USB-A
-+ .driver_info = (unsigned long) &genelink_info,
-+},
-+ /* NOT: USB_DEVICE(0x05e3, 0x0501), // GL620USB
-+ * that's half duplex, not currently supported
-+ */
-+ { }, // END
-+};
-+MODULE_DEVICE_TABLE(usb, products);
-+
-+static struct usb_driver gl620a_driver = {
-+ .name = "gl620a",
-+ .id_table = products,
-+ .probe = usbnet_probe,
-+ .disconnect = usbnet_disconnect,
-+ .suspend = usbnet_suspend,
-+ .resume = usbnet_resume,
-+ .disable_hub_initiated_lpm = 1,
-+};
-+
-+module_usb_driver(gl620a_driver);
-+
-+MODULE_AUTHOR("Jiun-Jie Huang");
-+MODULE_DESCRIPTION("GL620-USB-A Host-to-Host Link cables");
-+MODULE_LICENSE("GPL");
-+
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/hso.c backports-3.18.1-1/drivers/net/usb/hso.c
---- backports-3.18.1-1.org/drivers/net/usb/hso.c 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/hso.c 2015-01-03 13:42:25.000000000 +0100
-@@ -0,0 +1,3326 @@
-+/******************************************************************************
-+ *
-+ * Driver for Option High Speed Mobile Devices.
-+ *
-+ * Copyright (C) 2008 Option International
-+ * Filip Aben <f.aben(a)option.com>
-+ * Denis Joseph Barrow <d.barow(a)option.com>
-+ * Jan Dumon <j.dumon(a)option.com>
-+ * Copyright (C) 2007 Andrew Bird (Sphere Systems Ltd)
-+ * <ajb(a)spheresystems.co.uk>
-+ * Copyright (C) 2008 Greg Kroah-Hartman <gregkh(a)suse.de>
-+ * Copyright (C) 2008 Novell, Inc.
-+ *
-+ * 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
-+ * published by the Free Software Foundation.
-+ *
-+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-+ * USA
-+ *
-+ *
-+ *****************************************************************************/
-+
-+/******************************************************************************
-+ *
-+ * Description of the device:
-+ *
-+ * Interface 0: Contains the IP network interface on the bulk end points.
-+ * The multiplexed serial ports are using the interrupt and
-+ * control endpoints.
-+ * Interrupt contains a bitmap telling which multiplexed
-+ * serialport needs servicing.
-+ *
-+ * Interface 1: Diagnostics port, uses bulk only, do not submit urbs until the
-+ * port is opened, as this have a huge impact on the network port
-+ * throughput.
-+ *
-+ * Interface 2: Standard modem interface - circuit switched interface, this
-+ * can be used to make a standard ppp connection however it
-+ * should not be used in conjunction with the IP network interface
-+ * enabled for USB performance reasons i.e. if using this set
-+ * ideally disable_net=1.
-+ *
-+ *****************************************************************************/
-+
-+#include <linux/sched.h>
-+#include <linux/slab.h>
-+#include <linux/init.h>
-+#include <linux/delay.h>
-+#include <linux/netdevice.h>
-+#include <linux/module.h>
-+#include <linux/ethtool.h>
-+#include <linux/usb.h>
-+#include <linux/timer.h>
-+#include <linux/tty.h>
-+#include <linux/tty_driver.h>
-+#include <linux/tty_flip.h>
-+#include <linux/kmod.h>
-+#include <linux/rfkill.h>
-+#include <linux/ip.h>
-+#include <linux/uaccess.h>
-+#include <linux/usb/cdc.h>
-+#include <net/arp.h>
-+#include <asm/byteorder.h>
-+#include <linux/serial_core.h>
-+#include <linux/serial.h>
-+#include <asm/local.h>
-+
-+#define MOD_AUTHOR "Option Wireless"
-+#define MOD_DESCRIPTION "USB High Speed Option driver"
-+#define MOD_LICENSE "GPL"
-+
-+#define HSO_MAX_NET_DEVICES 10
-+#define HSO__MAX_MTU 2048
-+#define DEFAULT_MTU 1500
-+#define DEFAULT_MRU 1500
-+
-+#define CTRL_URB_RX_SIZE 1024
-+#define CTRL_URB_TX_SIZE 64
-+
-+#define BULK_URB_RX_SIZE 4096
-+#define BULK_URB_TX_SIZE 8192
-+
-+#define MUX_BULK_RX_BUF_SIZE HSO__MAX_MTU
-+#define MUX_BULK_TX_BUF_SIZE HSO__MAX_MTU
-+#define MUX_BULK_RX_BUF_COUNT 4
-+#define USB_TYPE_OPTION_VENDOR 0x20
-+
-+/* These definitions are used with the struct hso_net flags element */
-+/* - use *_bit operations on it. (bit indices not values.) */
-+#define HSO_NET_RUNNING 0
-+
-+#define HSO_NET_TX_TIMEOUT (HZ*10)
-+
-+#define HSO_SERIAL_MAGIC 0x48534f31
-+
-+/* Number of ttys to handle */
-+#define HSO_SERIAL_TTY_MINORS 256
-+
-+#define MAX_RX_URBS 2
-+
-+/*****************************************************************************/
-+/* Debugging functions */
-+/*****************************************************************************/
-+#define D__(lvl_, fmt, arg...) \
-+ do { \
-+ printk(lvl_ "[%d:%s]: " fmt "\n", \
-+ __LINE__, __func__, ## arg); \
-+ } while (0)
-+
-+#define D_(lvl, args...) \
-+ do { \
-+ if (lvl & debug) \
-+ D__(KERN_INFO, args); \
-+ } while (0)
-+
-+#define D1(args...) D_(0x01, ##args)
-+#define D2(args...) D_(0x02, ##args)
-+#define D3(args...) D_(0x04, ##args)
-+#define D4(args...) D_(0x08, ##args)
-+#define D5(args...) D_(0x10, ##args)
-+
-+/*****************************************************************************/
-+/* Enumerators */
-+/*****************************************************************************/
-+enum pkt_parse_state {
-+ WAIT_IP,
-+ WAIT_DATA,
-+ WAIT_SYNC
-+};
-+
-+/*****************************************************************************/
-+/* Structs */
-+/*****************************************************************************/
-+
-+struct hso_shared_int {
-+ struct usb_endpoint_descriptor *intr_endp;
-+ void *shared_intr_buf;
-+ struct urb *shared_intr_urb;
-+ struct usb_device *usb;
-+ int use_count;
-+ int ref_count;
-+ struct mutex shared_int_lock;
-+};
-+
-+struct hso_net {
-+ struct hso_device *parent;
-+ struct net_device *net;
-+ struct rfkill *rfkill;
-+
-+ struct usb_endpoint_descriptor *in_endp;
-+ struct usb_endpoint_descriptor *out_endp;
-+
-+ struct urb *mux_bulk_rx_urb_pool[MUX_BULK_RX_BUF_COUNT];
-+ struct urb *mux_bulk_tx_urb;
-+ void *mux_bulk_rx_buf_pool[MUX_BULK_RX_BUF_COUNT];
-+ void *mux_bulk_tx_buf;
-+
-+ struct sk_buff *skb_rx_buf;
-+ struct sk_buff *skb_tx_buf;
-+
-+ enum pkt_parse_state rx_parse_state;
-+ spinlock_t net_lock;
-+
-+ unsigned short rx_buf_size;
-+ unsigned short rx_buf_missing;
-+ struct iphdr rx_ip_hdr;
-+
-+ unsigned long flags;
-+};
-+
-+enum rx_ctrl_state{
-+ RX_IDLE,
-+ RX_SENT,
-+ RX_PENDING
-+};
-+
-+#define BM_REQUEST_TYPE (0xa1)
-+#define B_NOTIFICATION (0x20)
-+#define W_VALUE (0x0)
-+#define W_LENGTH (0x2)
-+
-+#define B_OVERRUN (0x1<<6)
-+#define B_PARITY (0x1<<5)
-+#define B_FRAMING (0x1<<4)
-+#define B_RING_SIGNAL (0x1<<3)
-+#define B_BREAK (0x1<<2)
-+#define B_TX_CARRIER (0x1<<1)
-+#define B_RX_CARRIER (0x1<<0)
-+
-+struct hso_serial_state_notification {
-+ u8 bmRequestType;
-+ u8 bNotification;
-+ u16 wValue;
-+ u16 wIndex;
-+ u16 wLength;
-+ u16 UART_state_bitmap;
-+} __packed;
-+
-+struct hso_tiocmget {
-+ struct mutex mutex;
-+ wait_queue_head_t waitq;
-+ int intr_completed;
-+ struct usb_endpoint_descriptor *endp;
-+ struct urb *urb;
-+ struct hso_serial_state_notification serial_state_notification;
-+ u16 prev_UART_state_bitmap;
-+ struct uart_icount icount;
-+};
-+
-+
-+struct hso_serial {
-+ struct hso_device *parent;
-+ int magic;
-+ u8 minor;
-+
-+ struct hso_shared_int *shared_int;
-+
-+ /* rx/tx urb could be either a bulk urb or a control urb depending
-+ on which serial port it is used on. */
-+ struct urb *rx_urb[MAX_RX_URBS];
-+ u8 num_rx_urbs;
-+ u8 *rx_data[MAX_RX_URBS];
-+ u16 rx_data_length; /* should contain allocated length */
-+
-+ struct urb *tx_urb;
-+ u8 *tx_data;
-+ u8 *tx_buffer;
-+ u16 tx_data_length; /* should contain allocated length */
-+ u16 tx_data_count;
-+ u16 tx_buffer_count;
-+ struct usb_ctrlrequest ctrl_req_tx;
-+ struct usb_ctrlrequest ctrl_req_rx;
-+
-+ struct usb_endpoint_descriptor *in_endp;
-+ struct usb_endpoint_descriptor *out_endp;
-+
-+ enum rx_ctrl_state rx_state;
-+ u8 rts_state;
-+ u8 dtr_state;
-+ unsigned tx_urb_used:1;
-+
-+ struct tty_port port;
-+ /* from usb_serial_port */
-+ spinlock_t serial_lock;
-+
-+ int (*write_data) (struct hso_serial *serial);
-+ struct hso_tiocmget *tiocmget;
-+ /* Hacks required to get flow control
-+ * working on the serial receive buffers
-+ * so as not to drop characters on the floor.
-+ */
-+ int curr_rx_urb_idx;
-+ u8 rx_urb_filled[MAX_RX_URBS];
-+ struct tasklet_struct unthrottle_tasklet;
-+};
-+
-+struct hso_device {
-+ union {
-+ struct hso_serial *dev_serial;
-+ struct hso_net *dev_net;
-+ } port_data;
-+
-+ u32 port_spec;
-+
-+ u8 is_active;
-+ u8 usb_gone;
-+ struct work_struct async_get_intf;
-+ struct work_struct async_put_intf;
-+ struct work_struct reset_device;
-+
-+ struct usb_device *usb;
-+ struct usb_interface *interface;
-+
-+ struct device *dev;
-+ struct kref ref;
-+ struct mutex mutex;
-+};
-+
-+/* Type of interface */
-+#define HSO_INTF_MASK 0xFF00
-+#define HSO_INTF_MUX 0x0100
-+#define HSO_INTF_BULK 0x0200
-+
-+/* Type of port */
-+#define HSO_PORT_MASK 0xFF
-+#define HSO_PORT_NO_PORT 0x0
-+#define HSO_PORT_CONTROL 0x1
-+#define HSO_PORT_APP 0x2
-+#define HSO_PORT_GPS 0x3
-+#define HSO_PORT_PCSC 0x4
-+#define HSO_PORT_APP2 0x5
-+#define HSO_PORT_GPS_CONTROL 0x6
-+#define HSO_PORT_MSD 0x7
-+#define HSO_PORT_VOICE 0x8
-+#define HSO_PORT_DIAG2 0x9
-+#define HSO_PORT_DIAG 0x10
-+#define HSO_PORT_MODEM 0x11
-+#define HSO_PORT_NETWORK 0x12
-+
-+/* Additional device info */
-+#define HSO_INFO_MASK 0xFF000000
-+#define HSO_INFO_CRC_BUG 0x01000000
-+
-+/*****************************************************************************/
-+/* Prototypes */
-+/*****************************************************************************/
-+/* Serial driver functions */
-+static int hso_serial_tiocmset(struct tty_struct *tty,
-+ unsigned int set, unsigned int clear);
-+static void ctrl_callback(struct urb *urb);
-+static int put_rxbuf_data(struct urb *urb, struct hso_serial *serial);
-+static void hso_kick_transmit(struct hso_serial *serial);
-+/* Helper functions */
-+static int hso_mux_submit_intr_urb(struct hso_shared_int *mux_int,
-+ struct usb_device *usb, gfp_t gfp);
-+static void handle_usb_error(int status, const char *function,
-+ struct hso_device *hso_dev);
-+static struct usb_endpoint_descriptor *hso_get_ep(struct usb_interface *intf,
-+ int type, int dir);
-+static int hso_get_mux_ports(struct usb_interface *intf, unsigned char *ports);
-+static void hso_free_interface(struct usb_interface *intf);
-+static int hso_start_serial_device(struct hso_device *hso_dev, gfp_t flags);
-+static int hso_stop_serial_device(struct hso_device *hso_dev);
-+static int hso_start_net_device(struct hso_device *hso_dev);
-+static void hso_free_shared_int(struct hso_shared_int *shared_int);
-+static int hso_stop_net_device(struct hso_device *hso_dev);
-+static void hso_serial_ref_free(struct kref *ref);
-+static void hso_std_serial_read_bulk_callback(struct urb *urb);
-+static int hso_mux_serial_read(struct hso_serial *serial);
-+static void async_get_intf(struct work_struct *data);
-+static void async_put_intf(struct work_struct *data);
-+static int hso_put_activity(struct hso_device *hso_dev);
-+static int hso_get_activity(struct hso_device *hso_dev);
-+static void tiocmget_intr_callback(struct urb *urb);
-+static void reset_device(struct work_struct *data);
-+/*****************************************************************************/
-+/* Helping functions */
-+/*****************************************************************************/
-+
-+/* #define DEBUG */
-+
-+static inline struct hso_net *dev2net(struct hso_device *hso_dev)
-+{
-+ return hso_dev->port_data.dev_net;
-+}
-+
-+static inline struct hso_serial *dev2ser(struct hso_device *hso_dev)
-+{
-+ return hso_dev->port_data.dev_serial;
-+}
-+
-+/* Debugging functions */
-+#ifdef DEBUG
-+static void dbg_dump(int line_count, const char *func_name, unsigned char *buf,
-+ unsigned int len)
-+{
-+ static char name[255];
-+
-+ sprintf(name, "hso[%d:%s]", line_count, func_name);
-+ print_hex_dump_bytes(name, DUMP_PREFIX_NONE, buf, len);
-+}
-+
-+#define DUMP(buf_, len_) \
-+ dbg_dump(__LINE__, __func__, (unsigned char *)buf_, len_)
-+
-+#define DUMP1(buf_, len_) \
-+ do { \
-+ if (0x01 & debug) \
-+ DUMP(buf_, len_); \
-+ } while (0)
-+#else
-+#define DUMP(buf_, len_)
-+#define DUMP1(buf_, len_)
-+#endif
-+
-+/* module parameters */
-+static int debug;
-+static int tty_major;
-+static int disable_net;
-+
-+/* driver info */
-+static const char driver_name[] = "hso";
-+static const char tty_filename[] = "ttyHS";
-+static const char *version = __FILE__ ": " MOD_AUTHOR;
-+/* the usb driver itself (registered in hso_init) */
-+static struct usb_driver hso_driver;
-+/* serial structures */
-+static struct tty_driver *tty_drv;
-+static struct hso_device *serial_table[HSO_SERIAL_TTY_MINORS];
-+static struct hso_device *network_table[HSO_MAX_NET_DEVICES];
-+static spinlock_t serial_table_lock;
-+
-+static const s32 default_port_spec[] = {
-+ HSO_INTF_MUX | HSO_PORT_NETWORK,
-+ HSO_INTF_BULK | HSO_PORT_DIAG,
-+ HSO_INTF_BULK | HSO_PORT_MODEM,
-+ 0
-+};
-+
-+static const s32 icon321_port_spec[] = {
-+ HSO_INTF_MUX | HSO_PORT_NETWORK,
-+ HSO_INTF_BULK | HSO_PORT_DIAG2,
-+ HSO_INTF_BULK | HSO_PORT_MODEM,
-+ HSO_INTF_BULK | HSO_PORT_DIAG,
-+ 0
-+};
-+
-+#define default_port_device(vendor, product) \
-+ USB_DEVICE(vendor, product), \
-+ .driver_info = (kernel_ulong_t)default_port_spec
-+
-+#define icon321_port_device(vendor, product) \
-+ USB_DEVICE(vendor, product), \
-+ .driver_info = (kernel_ulong_t)icon321_port_spec
-+
-+/* list of devices we support */
-+static const struct usb_device_id hso_ids[] = {
-+ {default_port_device(0x0af0, 0x6711)},
-+ {default_port_device(0x0af0, 0x6731)},
-+ {default_port_device(0x0af0, 0x6751)},
-+ {default_port_device(0x0af0, 0x6771)},
-+ {default_port_device(0x0af0, 0x6791)},
-+ {default_port_device(0x0af0, 0x6811)},
-+ {default_port_device(0x0af0, 0x6911)},
-+ {default_port_device(0x0af0, 0x6951)},
-+ {default_port_device(0x0af0, 0x6971)},
-+ {default_port_device(0x0af0, 0x7011)},
-+ {default_port_device(0x0af0, 0x7031)},
-+ {default_port_device(0x0af0, 0x7051)},
-+ {default_port_device(0x0af0, 0x7071)},
-+ {default_port_device(0x0af0, 0x7111)},
-+ {default_port_device(0x0af0, 0x7211)},
-+ {default_port_device(0x0af0, 0x7251)},
-+ {default_port_device(0x0af0, 0x7271)},
-+ {default_port_device(0x0af0, 0x7311)},
-+ {default_port_device(0x0af0, 0xc031)}, /* Icon-Edge */
-+ {icon321_port_device(0x0af0, 0xd013)}, /* Module HSxPA */
-+ {icon321_port_device(0x0af0, 0xd031)}, /* Icon-321 */
-+ {icon321_port_device(0x0af0, 0xd033)}, /* Icon-322 */
-+ {USB_DEVICE(0x0af0, 0x7301)}, /* GE40x */
-+ {USB_DEVICE(0x0af0, 0x7361)}, /* GE40x */
-+ {USB_DEVICE(0x0af0, 0x7381)}, /* GE40x */
-+ {USB_DEVICE(0x0af0, 0x7401)}, /* GI 0401 */
-+ {USB_DEVICE(0x0af0, 0x7501)}, /* GTM 382 */
-+ {USB_DEVICE(0x0af0, 0x7601)}, /* GE40x */
-+ {USB_DEVICE(0x0af0, 0x7701)},
-+ {USB_DEVICE(0x0af0, 0x7706)},
-+ {USB_DEVICE(0x0af0, 0x7801)},
-+ {USB_DEVICE(0x0af0, 0x7901)},
-+ {USB_DEVICE(0x0af0, 0x7A01)},
-+ {USB_DEVICE(0x0af0, 0x7A05)},
-+ {USB_DEVICE(0x0af0, 0x8200)},
-+ {USB_DEVICE(0x0af0, 0x8201)},
-+ {USB_DEVICE(0x0af0, 0x8300)},
-+ {USB_DEVICE(0x0af0, 0x8302)},
-+ {USB_DEVICE(0x0af0, 0x8304)},
-+ {USB_DEVICE(0x0af0, 0x8400)},
-+ {USB_DEVICE(0x0af0, 0x8600)},
-+ {USB_DEVICE(0x0af0, 0x8800)},
-+ {USB_DEVICE(0x0af0, 0x8900)},
-+ {USB_DEVICE(0x0af0, 0x9000)},
-+ {USB_DEVICE(0x0af0, 0x9200)}, /* Option GTM671WFS */
-+ {USB_DEVICE(0x0af0, 0xd035)},
-+ {USB_DEVICE(0x0af0, 0xd055)},
-+ {USB_DEVICE(0x0af0, 0xd155)},
-+ {USB_DEVICE(0x0af0, 0xd255)},
-+ {USB_DEVICE(0x0af0, 0xd057)},
-+ {USB_DEVICE(0x0af0, 0xd157)},
-+ {USB_DEVICE(0x0af0, 0xd257)},
-+ {USB_DEVICE(0x0af0, 0xd357)},
-+ {USB_DEVICE(0x0af0, 0xd058)},
-+ {USB_DEVICE(0x0af0, 0xc100)},
-+ {}
-+};
-+MODULE_DEVICE_TABLE(usb, hso_ids);
-+
-+/* Sysfs attribute */
-+static ssize_t hso_sysfs_show_porttype(struct device *dev,
-+ struct device_attribute *attr,
-+ char *buf)
-+{
-+ struct hso_device *hso_dev = dev_get_drvdata(dev);
-+ char *port_name;
-+
-+ if (!hso_dev)
-+ return 0;
-+
-+ switch (hso_dev->port_spec & HSO_PORT_MASK) {
-+ case HSO_PORT_CONTROL:
-+ port_name = "Control";
-+ break;
-+ case HSO_PORT_APP:
-+ port_name = "Application";
-+ break;
-+ case HSO_PORT_APP2:
-+ port_name = "Application2";
-+ break;
-+ case HSO_PORT_GPS:
-+ port_name = "GPS";
-+ break;
-+ case HSO_PORT_GPS_CONTROL:
-+ port_name = "GPS Control";
-+ break;
-+ case HSO_PORT_PCSC:
-+ port_name = "PCSC";
-+ break;
-+ case HSO_PORT_DIAG:
-+ port_name = "Diagnostic";
-+ break;
-+ case HSO_PORT_DIAG2:
-+ port_name = "Diagnostic2";
-+ break;
-+ case HSO_PORT_MODEM:
-+ port_name = "Modem";
-+ break;
-+ case HSO_PORT_NETWORK:
-+ port_name = "Network";
-+ break;
-+ default:
-+ port_name = "Unknown";
-+ break;
-+ }
-+
-+ return sprintf(buf, "%s\n", port_name);
-+}
-+static DEVICE_ATTR(hsotype, S_IRUGO, hso_sysfs_show_porttype, NULL);
-+
-+static int hso_urb_to_index(struct hso_serial *serial, struct urb *urb)
-+{
-+ int idx;
-+
-+ for (idx = 0; idx < serial->num_rx_urbs; idx++)
-+ if (serial->rx_urb[idx] == urb)
-+ return idx;
-+ dev_err(serial->parent->dev, "hso_urb_to_index failed\n");
-+ return -1;
-+}
-+
-+/* converts mux value to a port spec value */
-+static u32 hso_mux_to_port(int mux)
-+{
-+ u32 result;
-+
-+ switch (mux) {
-+ case 0x1:
-+ result = HSO_PORT_CONTROL;
-+ break;
-+ case 0x2:
-+ result = HSO_PORT_APP;
-+ break;
-+ case 0x4:
-+ result = HSO_PORT_PCSC;
-+ break;
-+ case 0x8:
-+ result = HSO_PORT_GPS;
-+ break;
-+ case 0x10:
-+ result = HSO_PORT_APP2;
-+ break;
-+ default:
-+ result = HSO_PORT_NO_PORT;
-+ }
-+ return result;
-+}
-+
-+/* converts port spec value to a mux value */
-+static u32 hso_port_to_mux(int port)
-+{
-+ u32 result;
-+
-+ switch (port & HSO_PORT_MASK) {
-+ case HSO_PORT_CONTROL:
-+ result = 0x0;
-+ break;
-+ case HSO_PORT_APP:
-+ result = 0x1;
-+ break;
-+ case HSO_PORT_PCSC:
-+ result = 0x2;
-+ break;
-+ case HSO_PORT_GPS:
-+ result = 0x3;
-+ break;
-+ case HSO_PORT_APP2:
-+ result = 0x4;
-+ break;
-+ default:
-+ result = 0x0;
-+ }
-+ return result;
-+}
-+
-+static struct hso_serial *get_serial_by_shared_int_and_type(
-+ struct hso_shared_int *shared_int,
-+ int mux)
-+{
-+ int i, port;
-+
-+ port = hso_mux_to_port(mux);
-+
-+ for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
-+ if (serial_table[i] &&
-+ (dev2ser(serial_table[i])->shared_int == shared_int) &&
-+ ((serial_table[i]->port_spec & HSO_PORT_MASK) == port)) {
-+ return dev2ser(serial_table[i]);
-+ }
-+ }
-+
-+ return NULL;
-+}
-+
-+static struct hso_serial *get_serial_by_index(unsigned index)
-+{
-+ struct hso_serial *serial = NULL;
-+ unsigned long flags;
-+
-+ spin_lock_irqsave(&serial_table_lock, flags);
-+ if (serial_table[index])
-+ serial = dev2ser(serial_table[index]);
-+ spin_unlock_irqrestore(&serial_table_lock, flags);
-+
-+ return serial;
-+}
-+
-+static int get_free_serial_index(void)
-+{
-+ int index;
-+ unsigned long flags;
-+
-+ spin_lock_irqsave(&serial_table_lock, flags);
-+ for (index = 0; index < HSO_SERIAL_TTY_MINORS; index++) {
-+ if (serial_table[index] == NULL) {
-+ spin_unlock_irqrestore(&serial_table_lock, flags);
-+ return index;
-+ }
-+ }
-+ spin_unlock_irqrestore(&serial_table_lock, flags);
-+
-+ printk(KERN_ERR "%s: no free serial devices in table\n", __func__);
-+ return -1;
-+}
-+
-+static void set_serial_by_index(unsigned index, struct hso_serial *serial)
-+{
-+ unsigned long flags;
-+
-+ spin_lock_irqsave(&serial_table_lock, flags);
-+ if (serial)
-+ serial_table[index] = serial->parent;
-+ else
-+ serial_table[index] = NULL;
-+ spin_unlock_irqrestore(&serial_table_lock, flags);
-+}
-+
-+static void handle_usb_error(int status, const char *function,
-+ struct hso_device *hso_dev)
-+{
-+ char *explanation;
-+
-+ switch (status) {
-+ case -ENODEV:
-+ explanation = "no device";
-+ break;
-+ case -ENOENT:
-+ explanation = "endpoint not enabled";
-+ break;
-+ case -EPIPE:
-+ explanation = "endpoint stalled";
-+ break;
-+ case -ENOSPC:
-+ explanation = "not enough bandwidth";
-+ break;
-+ case -ESHUTDOWN:
-+ explanation = "device disabled";
-+ break;
-+ case -EHOSTUNREACH:
-+ explanation = "device suspended";
-+ break;
-+ case -EINVAL:
-+ case -EAGAIN:
-+ case -EFBIG:
-+ case -EMSGSIZE:
-+ explanation = "internal error";
-+ break;
-+ case -EILSEQ:
-+ case -EPROTO:
-+ case -ETIME:
-+ case -ETIMEDOUT:
-+ explanation = "protocol error";
-+ if (hso_dev)
-+ schedule_work(&hso_dev->reset_device);
-+ break;
-+ default:
-+ explanation = "unknown status";
-+ break;
-+ }
-+
-+ /* log a meaningful explanation of an USB status */
-+ D1("%s: received USB status - %s (%d)", function, explanation, status);
-+}
-+
-+/* Network interface functions */
-+
-+/* called when net interface is brought up by ifconfig */
-+static int hso_net_open(struct net_device *net)
-+{
-+ struct hso_net *odev = netdev_priv(net);
-+ unsigned long flags = 0;
-+
-+ if (!odev) {
-+ dev_err(&net->dev, "No net device !\n");
-+ return -ENODEV;
-+ }
-+
-+ odev->skb_tx_buf = NULL;
-+
-+ /* setup environment */
-+ spin_lock_irqsave(&odev->net_lock, flags);
-+ odev->rx_parse_state = WAIT_IP;
-+ odev->rx_buf_size = 0;
-+ odev->rx_buf_missing = sizeof(struct iphdr);
-+ spin_unlock_irqrestore(&odev->net_lock, flags);
-+
-+ /* We are up and running. */
-+ set_bit(HSO_NET_RUNNING, &odev->flags);
-+ hso_start_net_device(odev->parent);
-+
-+ /* Tell the kernel we are ready to start receiving from it */
-+ netif_start_queue(net);
-+
-+ return 0;
-+}
-+
-+/* called when interface is brought down by ifconfig */
-+static int hso_net_close(struct net_device *net)
-+{
-+ struct hso_net *odev = netdev_priv(net);
-+
-+ /* we don't need the queue anymore */
-+ netif_stop_queue(net);
-+ /* no longer running */
-+ clear_bit(HSO_NET_RUNNING, &odev->flags);
-+
-+ hso_stop_net_device(odev->parent);
-+
-+ /* done */
-+ return 0;
-+}
-+
-+/* USB tells is xmit done, we should start the netqueue again */
-+static void write_bulk_callback(struct urb *urb)
-+{
-+ struct hso_net *odev = urb->context;
-+ int status = urb->status;
-+
-+ /* Sanity check */
-+ if (!odev || !test_bit(HSO_NET_RUNNING, &odev->flags)) {
-+ dev_err(&urb->dev->dev, "%s: device not running\n", __func__);
-+ return;
-+ }
-+
-+ /* Do we still have a valid kernel network device? */
-+ if (!netif_device_present(odev->net)) {
-+ dev_err(&urb->dev->dev, "%s: net device not present\n",
-+ __func__);
-+ return;
-+ }
-+
-+ /* log status, but don't act on it, we don't need to resubmit anything
-+ * anyhow */
-+ if (status)
-+ handle_usb_error(status, __func__, odev->parent);
-+
-+ hso_put_activity(odev->parent);
-+
-+ /* Tell the network interface we are ready for another frame */
-+ netif_wake_queue(odev->net);
-+}
-+
-+/* called by kernel when we need to transmit a packet */
-+static netdev_tx_t hso_net_start_xmit(struct sk_buff *skb,
-+ struct net_device *net)
-+{
-+ struct hso_net *odev = netdev_priv(net);
-+ int result;
-+
-+ /* Tell the kernel, "No more frames 'til we are done with this one." */
-+ netif_stop_queue(net);
-+ if (hso_get_activity(odev->parent) == -EAGAIN) {
-+ odev->skb_tx_buf = skb;
-+ return NETDEV_TX_OK;
-+ }
-+
-+ /* log if asked */
-+ DUMP1(skb->data, skb->len);
-+ /* Copy it from kernel memory to OUR memory */
-+ memcpy(odev->mux_bulk_tx_buf, skb->data, skb->len);
-+ D1("len: %d/%d", skb->len, MUX_BULK_TX_BUF_SIZE);
-+
-+ /* Fill in the URB for shipping it out. */
-+ usb_fill_bulk_urb(odev->mux_bulk_tx_urb,
-+ odev->parent->usb,
-+ usb_sndbulkpipe(odev->parent->usb,
-+ odev->out_endp->
-+ bEndpointAddress & 0x7F),
-+ odev->mux_bulk_tx_buf, skb->len, write_bulk_callback,
-+ odev);
-+
-+ /* Deal with the Zero Length packet problem, I hope */
-+ odev->mux_bulk_tx_urb->transfer_flags |= URB_ZERO_PACKET;
-+
-+ /* Send the URB on its merry way. */
-+ result = usb_submit_urb(odev->mux_bulk_tx_urb, GFP_ATOMIC);
-+ if (result) {
-+ dev_warn(&odev->parent->interface->dev,
-+ "failed mux_bulk_tx_urb %d\n", result);
-+ net->stats.tx_errors++;
-+ netif_start_queue(net);
-+ } else {
-+ net->stats.tx_packets++;
-+ net->stats.tx_bytes += skb->len;
-+ }
-+ dev_kfree_skb(skb);
-+ /* we're done */
-+ return NETDEV_TX_OK;
-+}
-+
-+static const struct ethtool_ops ops = {
-+ .get_link = ethtool_op_get_link
-+};
-+
-+/* called when a packet did not ack after watchdogtimeout */
-+static void hso_net_tx_timeout(struct net_device *net)
-+{
-+ struct hso_net *odev = netdev_priv(net);
-+
-+ if (!odev)
-+ return;
-+
-+ /* Tell syslog we are hosed. */
-+ dev_warn(&net->dev, "Tx timed out.\n");
-+
-+ /* Tear the waiting frame off the list */
-+ if (odev->mux_bulk_tx_urb &&
-+ (odev->mux_bulk_tx_urb->status == -EINPROGRESS))
-+ usb_unlink_urb(odev->mux_bulk_tx_urb);
-+
-+ /* Update statistics */
-+ net->stats.tx_errors++;
-+}
-+
-+/* make a real packet from the received USB buffer */
-+static void packetizeRx(struct hso_net *odev, unsigned char *ip_pkt,
-+ unsigned int count, unsigned char is_eop)
-+{
-+ unsigned short temp_bytes;
-+ unsigned short buffer_offset = 0;
-+ unsigned short frame_len;
-+ unsigned char *tmp_rx_buf;
-+
-+ /* log if needed */
-+ D1("Rx %d bytes", count);
-+ DUMP(ip_pkt, min(128, (int)count));
-+
-+ while (count) {
-+ switch (odev->rx_parse_state) {
-+ case WAIT_IP:
-+ /* waiting for IP header. */
-+ /* wanted bytes - size of ip header */
-+ temp_bytes =
-+ (count <
-+ odev->rx_buf_missing) ? count : odev->
-+ rx_buf_missing;
-+
-+ memcpy(((unsigned char *)(&odev->rx_ip_hdr)) +
-+ odev->rx_buf_size, ip_pkt + buffer_offset,
-+ temp_bytes);
-+
-+ odev->rx_buf_size += temp_bytes;
-+ buffer_offset += temp_bytes;
-+ odev->rx_buf_missing -= temp_bytes;
-+ count -= temp_bytes;
-+
-+ if (!odev->rx_buf_missing) {
-+ /* header is complete allocate an sk_buffer and
-+ * continue to WAIT_DATA */
-+ frame_len = ntohs(odev->rx_ip_hdr.tot_len);
-+
-+ if ((frame_len > DEFAULT_MRU) ||
-+ (frame_len < sizeof(struct iphdr))) {
-+ dev_err(&odev->net->dev,
-+ "Invalid frame (%d) length\n",
-+ frame_len);
-+ odev->rx_parse_state = WAIT_SYNC;
-+ continue;
-+ }
-+ /* Allocate an sk_buff */
-+ odev->skb_rx_buf = netdev_alloc_skb(odev->net,
-+ frame_len);
-+ if (!odev->skb_rx_buf) {
-+ /* We got no receive buffer. */
-+ D1("could not allocate memory");
-+ odev->rx_parse_state = WAIT_SYNC;
-+ return;
-+ }
-+
-+ /* Copy what we got so far. make room for iphdr
-+ * after tail. */
-+ tmp_rx_buf =
-+ skb_put(odev->skb_rx_buf,
-+ sizeof(struct iphdr));
-+ memcpy(tmp_rx_buf, (char *)&(odev->rx_ip_hdr),
-+ sizeof(struct iphdr));
-+
-+ /* ETH_HLEN */
-+ odev->rx_buf_size = sizeof(struct iphdr);
-+
-+ /* Filip actually use .tot_len */
-+ odev->rx_buf_missing =
-+ frame_len - sizeof(struct iphdr);
-+ odev->rx_parse_state = WAIT_DATA;
-+ }
-+ break;
-+
-+ case WAIT_DATA:
-+ temp_bytes = (count < odev->rx_buf_missing)
-+ ? count : odev->rx_buf_missing;
-+
-+ /* Copy the rest of the bytes that are left in the
-+ * buffer into the waiting sk_buf. */
-+ /* Make room for temp_bytes after tail. */
-+ tmp_rx_buf = skb_put(odev->skb_rx_buf, temp_bytes);
-+ memcpy(tmp_rx_buf, ip_pkt + buffer_offset, temp_bytes);
-+
-+ odev->rx_buf_missing -= temp_bytes;
-+ count -= temp_bytes;
-+ buffer_offset += temp_bytes;
-+ odev->rx_buf_size += temp_bytes;
-+ if (!odev->rx_buf_missing) {
-+ /* Packet is complete. Inject into stack. */
-+ /* We have IP packet here */
-+ odev->skb_rx_buf->protocol = cpu_to_be16(ETH_P_IP);
-+ skb_reset_mac_header(odev->skb_rx_buf);
-+
-+ /* Ship it off to the kernel */
-+ netif_rx(odev->skb_rx_buf);
-+ /* No longer our buffer. */
-+ odev->skb_rx_buf = NULL;
-+
-+ /* update out statistics */
-+ odev->net->stats.rx_packets++;
-+
-+ odev->net->stats.rx_bytes += odev->rx_buf_size;
-+
-+ odev->rx_buf_size = 0;
-+ odev->rx_buf_missing = sizeof(struct iphdr);
-+ odev->rx_parse_state = WAIT_IP;
-+ }
-+ break;
-+
-+ case WAIT_SYNC:
-+ D1(" W_S");
-+ count = 0;
-+ break;
-+ default:
-+ D1(" ");
-+ count--;
-+ break;
-+ }
-+ }
-+
-+ /* Recovery mechanism for WAIT_SYNC state. */
-+ if (is_eop) {
-+ if (odev->rx_parse_state == WAIT_SYNC) {
-+ odev->rx_parse_state = WAIT_IP;
-+ odev->rx_buf_size = 0;
-+ odev->rx_buf_missing = sizeof(struct iphdr);
-+ }
-+ }
-+}
-+
-+static void fix_crc_bug(struct urb *urb, __le16 max_packet_size)
-+{
-+ static const u8 crc_check[4] = { 0xDE, 0xAD, 0xBE, 0xEF };
-+ u32 rest = urb->actual_length % le16_to_cpu(max_packet_size);
-+
-+ if (((rest == 5) || (rest == 6)) &&
-+ !memcmp(((u8 *)urb->transfer_buffer) + urb->actual_length - 4,
-+ crc_check, 4)) {
-+ urb->actual_length -= 4;
-+ }
-+}
-+
-+/* Moving data from usb to kernel (in interrupt state) */
-+static void read_bulk_callback(struct urb *urb)
-+{
-+ struct hso_net *odev = urb->context;
-+ struct net_device *net;
-+ int result;
-+ int status = urb->status;
-+
-+ /* is al ok? (Filip: Who's Al ?) */
-+ if (status) {
-+ handle_usb_error(status, __func__, odev->parent);
-+ return;
-+ }
-+
-+ /* Sanity check */
-+ if (!odev || !test_bit(HSO_NET_RUNNING, &odev->flags)) {
-+ D1("BULK IN callback but driver is not active!");
-+ return;
-+ }
-+ usb_mark_last_busy(urb->dev);
-+
-+ net = odev->net;
-+
-+ if (!netif_device_present(net)) {
-+ /* Somebody killed our network interface... */
-+ return;
-+ }
-+
-+ if (odev->parent->port_spec & HSO_INFO_CRC_BUG)
-+ fix_crc_bug(urb, odev->in_endp->wMaxPacketSize);
-+
-+ /* do we even have a packet? */
-+ if (urb->actual_length) {
-+ /* Handle the IP stream, add header and push it onto network
-+ * stack if the packet is complete. */
-+ spin_lock(&odev->net_lock);
-+ packetizeRx(odev, urb->transfer_buffer, urb->actual_length,
-+ (urb->transfer_buffer_length >
-+ urb->actual_length) ? 1 : 0);
-+ spin_unlock(&odev->net_lock);
-+ }
-+
-+ /* We are done with this URB, resubmit it. Prep the USB to wait for
-+ * another frame. Reuse same as received. */
-+ usb_fill_bulk_urb(urb,
-+ odev->parent->usb,
-+ usb_rcvbulkpipe(odev->parent->usb,
-+ odev->in_endp->
-+ bEndpointAddress & 0x7F),
-+ urb->transfer_buffer, MUX_BULK_RX_BUF_SIZE,
-+ read_bulk_callback, odev);
-+
-+ /* Give this to the USB subsystem so it can tell us when more data
-+ * arrives. */
-+ result = usb_submit_urb(urb, GFP_ATOMIC);
-+ if (result)
-+ dev_warn(&odev->parent->interface->dev,
-+ "%s failed submit mux_bulk_rx_urb %d\n", __func__,
-+ result);
-+}
-+
-+/* Serial driver functions */
-+
-+static void hso_init_termios(struct ktermios *termios)
-+{
-+ /*
-+ * The default requirements for this device are:
-+ */
-+ termios->c_iflag &=
-+ ~(IGNBRK /* disable ignore break */
-+ | BRKINT /* disable break causes interrupt */
-+ | PARMRK /* disable mark parity errors */
-+ | ISTRIP /* disable clear high bit of input characters */
-+ | INLCR /* disable translate NL to CR */
-+ | IGNCR /* disable ignore CR */
-+ | ICRNL /* disable translate CR to NL */
-+ | IXON); /* disable enable XON/XOFF flow control */
-+
-+ /* disable postprocess output characters */
-+ termios->c_oflag &= ~OPOST;
-+
-+ termios->c_lflag &=
-+ ~(ECHO /* disable echo input characters */
-+ | ECHONL /* disable echo new line */
-+ | ICANON /* disable erase, kill, werase, and rprnt
-+ special characters */
-+ | ISIG /* disable interrupt, quit, and suspend special
-+ characters */
-+ | IEXTEN); /* disable non-POSIX special characters */
-+
-+ termios->c_cflag &=
-+ ~(CSIZE /* no size */
-+ | PARENB /* disable parity bit */
-+ | CBAUD /* clear current baud rate */
-+ | CBAUDEX); /* clear current buad rate */
-+
-+ termios->c_cflag |= CS8; /* character size 8 bits */
-+
-+ /* baud rate 115200 */
-+ tty_termios_encode_baud_rate(termios, 115200, 115200);
-+}
-+
-+static void _hso_serial_set_termios(struct tty_struct *tty,
-+ struct ktermios *old)
-+{
-+ struct hso_serial *serial = tty->driver_data;
-+
-+ if (!serial) {
-+ printk(KERN_ERR "%s: no tty structures", __func__);
-+ return;
-+ }
-+
-+ D4("port %d", serial->minor);
-+
-+ /*
-+ * Fix up unsupported bits
-+ */
-+ tty->termios.c_iflag &= ~IXON; /* disable enable XON/XOFF flow control */
-+
-+ tty->termios.c_cflag &=
-+ ~(CSIZE /* no size */
-+ | PARENB /* disable parity bit */
-+ | CBAUD /* clear current baud rate */
-+ | CBAUDEX); /* clear current buad rate */
-+
-+ tty->termios.c_cflag |= CS8; /* character size 8 bits */
-+
-+ /* baud rate 115200 */
-+ tty_encode_baud_rate(tty, 115200, 115200);
-+}
-+
-+static void hso_resubmit_rx_bulk_urb(struct hso_serial *serial, struct urb *urb)
-+{
-+ int result;
-+ /* We are done with this URB, resubmit it. Prep the USB to wait for
-+ * another frame */
-+ usb_fill_bulk_urb(urb, serial->parent->usb,
-+ usb_rcvbulkpipe(serial->parent->usb,
-+ serial->in_endp->
-+ bEndpointAddress & 0x7F),
-+ urb->transfer_buffer, serial->rx_data_length,
-+ hso_std_serial_read_bulk_callback, serial);
-+ /* Give this to the USB subsystem so it can tell us when more data
-+ * arrives. */
-+ result = usb_submit_urb(urb, GFP_ATOMIC);
-+ if (result) {
-+ dev_err(&urb->dev->dev, "%s failed submit serial rx_urb %d\n",
-+ __func__, result);
-+ }
-+}
-+
-+
-+
-+
-+static void put_rxbuf_data_and_resubmit_bulk_urb(struct hso_serial *serial)
-+{
-+ int count;
-+ struct urb *curr_urb;
-+
-+ while (serial->rx_urb_filled[serial->curr_rx_urb_idx]) {
-+ curr_urb = serial->rx_urb[serial->curr_rx_urb_idx];
-+ count = put_rxbuf_data(curr_urb, serial);
-+ if (count == -1)
-+ return;
-+ if (count == 0) {
-+ serial->curr_rx_urb_idx++;
-+ if (serial->curr_rx_urb_idx >= serial->num_rx_urbs)
-+ serial->curr_rx_urb_idx = 0;
-+ hso_resubmit_rx_bulk_urb(serial, curr_urb);
-+ }
-+ }
-+}
-+
-+static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
-+{
-+ int count = 0;
-+ struct urb *urb;
-+
-+ urb = serial->rx_urb[0];
-+ if (atomic_read(&serial->port.count) > 0) {
-+ count = put_rxbuf_data(urb, serial);
-+ if (count == -1)
-+ return;
-+ }
-+ /* Re issue a read as long as we receive data. */
-+
-+ if (count == 0 && ((urb->actual_length != 0) ||
-+ (serial->rx_state == RX_PENDING))) {
-+ serial->rx_state = RX_SENT;
-+ hso_mux_serial_read(serial);
-+ } else
-+ serial->rx_state = RX_IDLE;
-+}
-+
-+
-+/* read callback for Diag and CS port */
-+static void hso_std_serial_read_bulk_callback(struct urb *urb)
-+{
-+ struct hso_serial *serial = urb->context;
-+ int status = urb->status;
-+
-+ D4("\n--- Got serial_read_bulk callback %02x ---", status);
-+
-+ /* sanity check */
-+ if (!serial) {
-+ D1("serial == NULL");
-+ return;
-+ }
-+ if (status) {
-+ handle_usb_error(status, __func__, serial->parent);
-+ return;
-+ }
-+
-+ D1("Actual length = %d\n", urb->actual_length);
-+ DUMP1(urb->transfer_buffer, urb->actual_length);
-+
-+ /* Anyone listening? */
-+ if (atomic_read(&serial->port.count) == 0)
-+ return;
-+
-+ if (serial->parent->port_spec & HSO_INFO_CRC_BUG)
-+ fix_crc_bug(urb, serial->in_endp->wMaxPacketSize);
-+ /* Valid data, handle RX data */
-+ spin_lock(&serial->serial_lock);
-+ serial->rx_urb_filled[hso_urb_to_index(serial, urb)] = 1;
-+ put_rxbuf_data_and_resubmit_bulk_urb(serial);
-+ spin_unlock(&serial->serial_lock);
-+}
-+
-+/*
-+ * This needs to be a tasklet otherwise we will
-+ * end up recursively calling this function.
-+ */
-+static void hso_unthrottle_tasklet(struct hso_serial *serial)
-+{
-+ unsigned long flags;
-+
-+ spin_lock_irqsave(&serial->serial_lock, flags);
-+ if ((serial->parent->port_spec & HSO_INTF_MUX))
-+ put_rxbuf_data_and_resubmit_ctrl_urb(serial);
-+ else
-+ put_rxbuf_data_and_resubmit_bulk_urb(serial);
-+ spin_unlock_irqrestore(&serial->serial_lock, flags);
-+}
-+
-+static void hso_unthrottle(struct tty_struct *tty)
-+{
-+ struct hso_serial *serial = tty->driver_data;
-+
-+ tasklet_hi_schedule(&serial->unthrottle_tasklet);
-+}
-+
-+/* open the requested serial port */
-+static int hso_serial_open(struct tty_struct *tty, struct file *filp)
-+{
-+ struct hso_serial *serial = get_serial_by_index(tty->index);
-+ int result;
-+
-+ /* sanity check */
-+ if (serial == NULL || serial->magic != HSO_SERIAL_MAGIC) {
-+ WARN_ON(1);
-+ tty->driver_data = NULL;
-+ D1("Failed to open port");
-+ return -ENODEV;
-+ }
-+
-+ mutex_lock(&serial->parent->mutex);
-+ result = usb_autopm_get_interface(serial->parent->interface);
-+ if (result < 0)
-+ goto err_out;
-+
-+ D1("Opening %d", serial->minor);
-+ kref_get(&serial->parent->ref);
-+
-+ /* setup */
-+ tty->driver_data = serial;
-+ tty_port_tty_set(&serial->port, tty);
-+
-+ /* check for port already opened, if not set the termios */
-+ if (atomic_inc_return(&serial->port.count) == 1) {
-+ serial->rx_state = RX_IDLE;
-+ /* Force default termio settings */
-+ _hso_serial_set_termios(tty, NULL);
-+ tasklet_init(&serial->unthrottle_tasklet,
-+ (void (*)(unsigned long))hso_unthrottle_tasklet,
-+ (unsigned long)serial);
-+ result = hso_start_serial_device(serial->parent, GFP_KERNEL);
-+ if (result) {
-+ hso_stop_serial_device(serial->parent);
-+ atomic_dec(&serial->port.count);
-+ kref_put(&serial->parent->ref, hso_serial_ref_free);
-+ }
-+ } else {
-+ D1("Port was already open");
-+ }
-+
-+ usb_autopm_put_interface(serial->parent->interface);
-+
-+ /* done */
-+ if (result)
-+ hso_serial_tiocmset(tty, TIOCM_RTS | TIOCM_DTR, 0);
-+err_out:
-+ mutex_unlock(&serial->parent->mutex);
-+ return result;
-+}
-+
-+/* close the requested serial port */
-+static void hso_serial_close(struct tty_struct *tty, struct file *filp)
-+{
-+ struct hso_serial *serial = tty->driver_data;
-+ u8 usb_gone;
-+
-+ D1("Closing serial port");
-+
-+ /* Open failed, no close cleanup required */
-+ if (serial == NULL)
-+ return;
-+
-+ mutex_lock(&serial->parent->mutex);
-+ usb_gone = serial->parent->usb_gone;
-+
-+ if (!usb_gone)
-+ usb_autopm_get_interface(serial->parent->interface);
-+
-+ /* reset the rts and dtr */
-+ /* do the actual close */
-+ atomic_dec(&serial->port.count);
-+
-+ if (atomic_read(&serial->port.count) <= 0) {
-+ atomic_set(&serial->port.count, 0);
-+ tty_port_tty_set(&serial->port, NULL);
-+ if (!usb_gone)
-+ hso_stop_serial_device(serial->parent);
-+ tasklet_kill(&serial->unthrottle_tasklet);
-+ }
-+
-+ if (!usb_gone)
-+ usb_autopm_put_interface(serial->parent->interface);
-+
-+ mutex_unlock(&serial->parent->mutex);
-+
-+ kref_put(&serial->parent->ref, hso_serial_ref_free);
-+}
-+
-+/* close the requested serial port */
-+static int hso_serial_write(struct tty_struct *tty, const unsigned char *buf,
-+ int count)
-+{
-+ struct hso_serial *serial = tty->driver_data;
-+ int space, tx_bytes;
-+ unsigned long flags;
-+
-+ /* sanity check */
-+ if (serial == NULL) {
-+ printk(KERN_ERR "%s: serial is NULL\n", __func__);
-+ return -ENODEV;
-+ }
-+
-+ spin_lock_irqsave(&serial->serial_lock, flags);
-+
-+ space = serial->tx_data_length - serial->tx_buffer_count;
-+ tx_bytes = (count < space) ? count : space;
-+
-+ if (!tx_bytes)
-+ goto out;
-+
-+ memcpy(serial->tx_buffer + serial->tx_buffer_count, buf, tx_bytes);
-+ serial->tx_buffer_count += tx_bytes;
-+
-+out:
-+ spin_unlock_irqrestore(&serial->serial_lock, flags);
-+
-+ hso_kick_transmit(serial);
-+ /* done */
-+ return tx_bytes;
-+}
-+
-+/* how much room is there for writing */
-+static int hso_serial_write_room(struct tty_struct *tty)
-+{
-+ struct hso_serial *serial = tty->driver_data;
-+ int room;
-+ unsigned long flags;
-+
-+ spin_lock_irqsave(&serial->serial_lock, flags);
-+ room = serial->tx_data_length - serial->tx_buffer_count;
-+ spin_unlock_irqrestore(&serial->serial_lock, flags);
-+
-+ /* return free room */
-+ return room;
-+}
-+
-+/* setup the term */
-+static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
-+{
-+ struct hso_serial *serial = tty->driver_data;
-+ unsigned long flags;
-+
-+ if (old)
-+ D5("Termios called with: cflags new[%d] - old[%d]",
-+ tty->termios.c_cflag, old->c_cflag);
-+
-+ /* the actual setup */
-+ spin_lock_irqsave(&serial->serial_lock, flags);
-+ if (atomic_read(&serial->port.count))
-+ _hso_serial_set_termios(tty, old);
-+ else
-+ tty->termios = *old;
-+ spin_unlock_irqrestore(&serial->serial_lock, flags);
-+
-+ /* done */
-+}
-+
-+/* how many characters in the buffer */
-+static int hso_serial_chars_in_buffer(struct tty_struct *tty)
-+{
-+ struct hso_serial *serial = tty->driver_data;
-+ int chars;
-+ unsigned long flags;
-+
-+ /* sanity check */
-+ if (serial == NULL)
-+ return 0;
-+
-+ spin_lock_irqsave(&serial->serial_lock, flags);
-+ chars = serial->tx_buffer_count;
-+ spin_unlock_irqrestore(&serial->serial_lock, flags);
-+
-+ return chars;
-+}
-+static int tiocmget_submit_urb(struct hso_serial *serial,
-+ struct hso_tiocmget *tiocmget,
-+ struct usb_device *usb)
-+{
-+ int result;
-+
-+ if (serial->parent->usb_gone)
-+ return -ENODEV;
-+ usb_fill_int_urb(tiocmget->urb, usb,
-+ usb_rcvintpipe(usb,
-+ tiocmget->endp->
-+ bEndpointAddress & 0x7F),
-+ &tiocmget->serial_state_notification,
-+ sizeof(struct hso_serial_state_notification),
-+ tiocmget_intr_callback, serial,
-+ tiocmget->endp->bInterval);
-+ result = usb_submit_urb(tiocmget->urb, GFP_ATOMIC);
-+ if (result) {
-+ dev_warn(&usb->dev, "%s usb_submit_urb failed %d\n", __func__,
-+ result);
-+ }
-+ return result;
-+
-+}
-+
-+static void tiocmget_intr_callback(struct urb *urb)
-+{
-+ struct hso_serial *serial = urb->context;
-+ struct hso_tiocmget *tiocmget;
-+ int status = urb->status;
-+ u16 UART_state_bitmap, prev_UART_state_bitmap;
-+ struct uart_icount *icount;
-+ struct hso_serial_state_notification *serial_state_notification;
-+ struct usb_device *usb;
-+ int if_num;
-+
-+ /* Sanity checks */
-+ if (!serial)
-+ return;
-+ if (status) {
-+ handle_usb_error(status, __func__, serial->parent);
-+ return;
-+ }
-+
-+ /* tiocmget is only supported on HSO_PORT_MODEM */
-+ tiocmget = serial->tiocmget;
-+ if (!tiocmget)
-+ return;
-+ BUG_ON((serial->parent->port_spec & HSO_PORT_MASK) != HSO_PORT_MODEM);
-+
-+ usb = serial->parent->usb;
-+ if_num = serial->parent->interface->altsetting->desc.bInterfaceNumber;
-+
-+ /* wIndex should be the USB interface number of the port to which the
-+ * notification applies, which should always be the Modem port.
-+ */
-+ serial_state_notification = &tiocmget->serial_state_notification;
-+ if (serial_state_notification->bmRequestType != BM_REQUEST_TYPE ||
-+ serial_state_notification->bNotification != B_NOTIFICATION ||
-+ le16_to_cpu(serial_state_notification->wValue) != W_VALUE ||
-+ le16_to_cpu(serial_state_notification->wIndex) != if_num ||
-+ le16_to_cpu(serial_state_notification->wLength) != W_LENGTH) {
-+ dev_warn(&usb->dev,
-+ "hso received invalid serial state notification\n");
-+ DUMP(serial_state_notification,
-+ sizeof(struct hso_serial_state_notification));
-+ } else {
-+
-+ UART_state_bitmap = le16_to_cpu(serial_state_notification->
-+ UART_state_bitmap);
-+ prev_UART_state_bitmap = tiocmget->prev_UART_state_bitmap;
-+ icount = &tiocmget->icount;
-+ spin_lock(&serial->serial_lock);
-+ if ((UART_state_bitmap & B_OVERRUN) !=
-+ (prev_UART_state_bitmap & B_OVERRUN))
-+ icount->parity++;
-+ if ((UART_state_bitmap & B_PARITY) !=
-+ (prev_UART_state_bitmap & B_PARITY))
-+ icount->parity++;
-+ if ((UART_state_bitmap & B_FRAMING) !=
-+ (prev_UART_state_bitmap & B_FRAMING))
-+ icount->frame++;
-+ if ((UART_state_bitmap & B_RING_SIGNAL) &&
-+ !(prev_UART_state_bitmap & B_RING_SIGNAL))
-+ icount->rng++;
-+ if ((UART_state_bitmap & B_BREAK) !=
-+ (prev_UART_state_bitmap & B_BREAK))
-+ icount->brk++;
-+ if ((UART_state_bitmap & B_TX_CARRIER) !=
-+ (prev_UART_state_bitmap & B_TX_CARRIER))
-+ icount->dsr++;
-+ if ((UART_state_bitmap & B_RX_CARRIER) !=
-+ (prev_UART_state_bitmap & B_RX_CARRIER))
-+ icount->dcd++;
-+ tiocmget->prev_UART_state_bitmap = UART_state_bitmap;
-+ spin_unlock(&serial->serial_lock);
-+ tiocmget->intr_completed = 1;
-+ wake_up_interruptible(&tiocmget->waitq);
-+ }
-+ memset(serial_state_notification, 0,
-+ sizeof(struct hso_serial_state_notification));
-+ tiocmget_submit_urb(serial,
-+ tiocmget,
-+ serial->parent->usb);
-+}
-+
-+/*
-+ * next few functions largely stolen from drivers/serial/serial_core.c
-+ */
-+/* Wait for any of the 4 modem inputs (DCD,RI,DSR,CTS) to change
-+ * - mask passed in arg for lines of interest
-+ * (use |'ed TIOCM_RNG/DSR/CD/CTS for masking)
-+ * Caller should use TIOCGICOUNT to see which one it was
-+ */
-+static int
-+hso_wait_modem_status(struct hso_serial *serial, unsigned long arg)
-+{
-+ DECLARE_WAITQUEUE(wait, current);
-+ struct uart_icount cprev, cnow;
-+ struct hso_tiocmget *tiocmget;
-+ int ret;
-+
-+ tiocmget = serial->tiocmget;
-+ if (!tiocmget)
-+ return -ENOENT;
-+ /*
-+ * note the counters on entry
-+ */
-+ spin_lock_irq(&serial->serial_lock);
-+ memcpy(&cprev, &tiocmget->icount, sizeof(struct uart_icount));
-+ spin_unlock_irq(&serial->serial_lock);
-+ add_wait_queue(&tiocmget->waitq, &wait);
-+ for (;;) {
-+ spin_lock_irq(&serial->serial_lock);
-+ memcpy(&cnow, &tiocmget->icount, sizeof(struct uart_icount));
-+ spin_unlock_irq(&serial->serial_lock);
-+ set_current_state(TASK_INTERRUPTIBLE);
-+ if (((arg & TIOCM_RNG) && (cnow.rng != cprev.rng)) ||
-+ ((arg & TIOCM_DSR) && (cnow.dsr != cprev.dsr)) ||
-+ ((arg & TIOCM_CD) && (cnow.dcd != cprev.dcd))) {
-+ ret = 0;
-+ break;
-+ }
-+ schedule();
-+ /* see if a signal did it */
-+ if (signal_pending(current)) {
-+ ret = -ERESTARTSYS;
-+ break;
-+ }
-+ cprev = cnow;
-+ }
-+ current->state = TASK_RUNNING;
-+ remove_wait_queue(&tiocmget->waitq, &wait);
-+
-+ return ret;
-+}
-+
-+/*
-+ * Get counter of input serial line interrupts (DCD,RI,DSR,CTS)
-+ * Return: write counters to the user passed counter struct
-+ * NB: both 1->0 and 0->1 transitions are counted except for
-+ * RI where only 0->1 is counted.
-+ */
-+static int hso_get_count(struct tty_struct *tty,
-+ struct serial_icounter_struct *icount)
-+{
-+ struct uart_icount cnow;
-+ struct hso_serial *serial = tty->driver_data;
-+ struct hso_tiocmget *tiocmget = serial->tiocmget;
-+
-+ memset(icount, 0, sizeof(struct serial_icounter_struct));
-+
-+ if (!tiocmget)
-+ return -ENOENT;
-+ spin_lock_irq(&serial->serial_lock);
-+ memcpy(&cnow, &tiocmget->icount, sizeof(struct uart_icount));
-+ spin_unlock_irq(&serial->serial_lock);
-+
-+ icount->cts = cnow.cts;
-+ icount->dsr = cnow.dsr;
-+ icount->rng = cnow.rng;
-+ icount->dcd = cnow.dcd;
-+ icount->rx = cnow.rx;
-+ icount->tx = cnow.tx;
-+ icount->frame = cnow.frame;
-+ icount->overrun = cnow.overrun;
-+ icount->parity = cnow.parity;
-+ icount->brk = cnow.brk;
-+ icount->buf_overrun = cnow.buf_overrun;
-+
-+ return 0;
-+}
-+
-+
-+static int hso_serial_tiocmget(struct tty_struct *tty)
-+{
-+ int retval;
-+ struct hso_serial *serial = tty->driver_data;
-+ struct hso_tiocmget *tiocmget;
-+ u16 UART_state_bitmap;
-+
-+ /* sanity check */
-+ if (!serial) {
-+ D1("no tty structures");
-+ return -EINVAL;
-+ }
-+ spin_lock_irq(&serial->serial_lock);
-+ retval = ((serial->rts_state) ? TIOCM_RTS : 0) |
-+ ((serial->dtr_state) ? TIOCM_DTR : 0);
-+ tiocmget = serial->tiocmget;
-+ if (tiocmget) {
-+
-+ UART_state_bitmap = le16_to_cpu(
-+ tiocmget->prev_UART_state_bitmap);
-+ if (UART_state_bitmap & B_RING_SIGNAL)
-+ retval |= TIOCM_RNG;
-+ if (UART_state_bitmap & B_RX_CARRIER)
-+ retval |= TIOCM_CD;
-+ if (UART_state_bitmap & B_TX_CARRIER)
-+ retval |= TIOCM_DSR;
-+ }
-+ spin_unlock_irq(&serial->serial_lock);
-+ return retval;
-+}
-+
-+static int hso_serial_tiocmset(struct tty_struct *tty,
-+ unsigned int set, unsigned int clear)
-+{
-+ int val = 0;
-+ unsigned long flags;
-+ int if_num;
-+ struct hso_serial *serial = tty->driver_data;
-+
-+ /* sanity check */
-+ if (!serial) {
-+ D1("no tty structures");
-+ return -EINVAL;
-+ }
-+
-+ if ((serial->parent->port_spec & HSO_PORT_MASK) != HSO_PORT_MODEM)
-+ return -EINVAL;
-+
-+ if_num = serial->parent->interface->altsetting->desc.bInterfaceNumber;
-+
-+ spin_lock_irqsave(&serial->serial_lock, flags);
-+ if (set & TIOCM_RTS)
-+ serial->rts_state = 1;
-+ if (set & TIOCM_DTR)
-+ serial->dtr_state = 1;
-+
-+ if (clear & TIOCM_RTS)
-+ serial->rts_state = 0;
-+ if (clear & TIOCM_DTR)
-+ serial->dtr_state = 0;
-+
-+ if (serial->dtr_state)
-+ val |= 0x01;
-+ if (serial->rts_state)
-+ val |= 0x02;
-+
-+ spin_unlock_irqrestore(&serial->serial_lock, flags);
-+
-+ return usb_control_msg(serial->parent->usb,
-+ usb_rcvctrlpipe(serial->parent->usb, 0), 0x22,
-+ 0x21, val, if_num, NULL, 0,
-+ USB_CTRL_SET_TIMEOUT);
-+}
-+
-+static int hso_serial_ioctl(struct tty_struct *tty,
-+ unsigned int cmd, unsigned long arg)
-+{
-+ struct hso_serial *serial = tty->driver_data;
-+ int ret = 0;
-+ D4("IOCTL cmd: %d, arg: %ld", cmd, arg);
-+
-+ if (!serial)
-+ return -ENODEV;
-+ switch (cmd) {
-+ case TIOCMIWAIT:
-+ ret = hso_wait_modem_status(serial, arg);
-+ break;
-+ default:
-+ ret = -ENOIOCTLCMD;
-+ break;
-+ }
-+ return ret;
-+}
-+
-+
-+/* starts a transmit */
-+static void hso_kick_transmit(struct hso_serial *serial)
-+{
-+ u8 *temp;
-+ unsigned long flags;
-+ int res;
-+
-+ spin_lock_irqsave(&serial->serial_lock, flags);
-+ if (!serial->tx_buffer_count)
-+ goto out;
-+
-+ if (serial->tx_urb_used)
-+ goto out;
-+
-+ /* Wakeup USB interface if necessary */
-+ if (hso_get_activity(serial->parent) == -EAGAIN)
-+ goto out;
-+
-+ /* Switch pointers around to avoid memcpy */
-+ temp = serial->tx_buffer;
-+ serial->tx_buffer = serial->tx_data;
-+ serial->tx_data = temp;
-+ serial->tx_data_count = serial->tx_buffer_count;
-+ serial->tx_buffer_count = 0;
-+
-+ /* If temp is set, it means we switched buffers */
-+ if (temp && serial->write_data) {
-+ res = serial->write_data(serial);
-+ if (res >= 0)
-+ serial->tx_urb_used = 1;
-+ }
-+out:
-+ spin_unlock_irqrestore(&serial->serial_lock, flags);
-+}
-+
-+/* make a request (for reading and writing data to muxed serial port) */
-+static int mux_device_request(struct hso_serial *serial, u8 type, u16 port,
-+ struct urb *ctrl_urb,
-+ struct usb_ctrlrequest *ctrl_req,
-+ u8 *ctrl_urb_data, u32 size)
-+{
-+ int result;
-+ int pipe;
-+
-+ /* Sanity check */
-+ if (!serial || !ctrl_urb || !ctrl_req) {
-+ printk(KERN_ERR "%s: Wrong arguments\n", __func__);
-+ return -EINVAL;
-+ }
-+
-+ /* initialize */
-+ ctrl_req->wValue = 0;
-+ ctrl_req->wIndex = cpu_to_le16(hso_port_to_mux(port));
-+ ctrl_req->wLength = cpu_to_le16(size);
-+
-+ if (type == USB_CDC_GET_ENCAPSULATED_RESPONSE) {
-+ /* Reading command */
-+ ctrl_req->bRequestType = USB_DIR_IN |
-+ USB_TYPE_OPTION_VENDOR |
-+ USB_RECIP_INTERFACE;
-+ ctrl_req->bRequest = USB_CDC_GET_ENCAPSULATED_RESPONSE;
-+ pipe = usb_rcvctrlpipe(serial->parent->usb, 0);
-+ } else {
-+ /* Writing command */
-+ ctrl_req->bRequestType = USB_DIR_OUT |
-+ USB_TYPE_OPTION_VENDOR |
-+ USB_RECIP_INTERFACE;
-+ ctrl_req->bRequest = USB_CDC_SEND_ENCAPSULATED_COMMAND;
-+ pipe = usb_sndctrlpipe(serial->parent->usb, 0);
-+ }
-+ /* syslog */
-+ D2("%s command (%02x) len: %d, port: %d",
-+ type == USB_CDC_GET_ENCAPSULATED_RESPONSE ? "Read" : "Write",
-+ ctrl_req->bRequestType, ctrl_req->wLength, port);
-+
-+ /* Load ctrl urb */
-+ ctrl_urb->transfer_flags = 0;
-+ usb_fill_control_urb(ctrl_urb,
-+ serial->parent->usb,
-+ pipe,
-+ (u8 *) ctrl_req,
-+ ctrl_urb_data, size, ctrl_callback, serial);
-+ /* Send it on merry way */
-+ result = usb_submit_urb(ctrl_urb, GFP_ATOMIC);
-+ if (result) {
-+ dev_err(&ctrl_urb->dev->dev,
-+ "%s failed submit ctrl_urb %d type %d\n", __func__,
-+ result, type);
-+ return result;
-+ }
-+
-+ /* done */
-+ return size;
-+}
-+
-+/* called by intr_callback when read occurs */
-+static int hso_mux_serial_read(struct hso_serial *serial)
-+{
-+ if (!serial)
-+ return -EINVAL;
-+
-+ /* clean data */
-+ memset(serial->rx_data[0], 0, CTRL_URB_RX_SIZE);
-+ /* make the request */
-+
-+ if (serial->num_rx_urbs != 1) {
-+ dev_err(&serial->parent->interface->dev,
-+ "ERROR: mux'd reads with multiple buffers "
-+ "not possible\n");
-+ return 0;
-+ }
-+ return mux_device_request(serial,
-+ USB_CDC_GET_ENCAPSULATED_RESPONSE,
-+ serial->parent->port_spec & HSO_PORT_MASK,
-+ serial->rx_urb[0],
-+ &serial->ctrl_req_rx,
-+ serial->rx_data[0], serial->rx_data_length);
-+}
-+
-+/* used for muxed serial port callback (muxed serial read) */
-+static void intr_callback(struct urb *urb)
-+{
-+ struct hso_shared_int *shared_int = urb->context;
-+ struct hso_serial *serial;
-+ unsigned char *port_req;
-+ int status = urb->status;
-+ int i;
-+
-+ usb_mark_last_busy(urb->dev);
-+
-+ /* sanity check */
-+ if (!shared_int)
-+ return;
-+
-+ /* status check */
-+ if (status) {
-+ handle_usb_error(status, __func__, NULL);
-+ return;
-+ }
-+ D4("\n--- Got intr callback 0x%02X ---", status);
-+
-+ /* what request? */
-+ port_req = urb->transfer_buffer;
-+ D4(" port_req = 0x%.2X\n", *port_req);
-+ /* loop over all muxed ports to find the one sending this */
-+ for (i = 0; i < 8; i++) {
-+ /* max 8 channels on MUX */
-+ if (*port_req & (1 << i)) {
-+ serial = get_serial_by_shared_int_and_type(shared_int,
-+ (1 << i));
-+ if (serial != NULL) {
-+ D1("Pending read interrupt on port %d\n", i);
-+ spin_lock(&serial->serial_lock);
-+ if (serial->rx_state == RX_IDLE &&
-+ atomic_read(&serial->port.count) > 0) {
-+ /* Setup and send a ctrl req read on
-+ * port i */
-+ if (!serial->rx_urb_filled[0]) {
-+ serial->rx_state = RX_SENT;
-+ hso_mux_serial_read(serial);
-+ } else
-+ serial->rx_state = RX_PENDING;
-+ } else {
-+ D1("Already a read pending on "
-+ "port %d or port not open\n", i);
-+ }
-+ spin_unlock(&serial->serial_lock);
-+ }
-+ }
-+ }
-+ /* Resubmit interrupt urb */
-+ hso_mux_submit_intr_urb(shared_int, urb->dev, GFP_ATOMIC);
-+}
-+
-+/* called for writing to muxed serial port */
-+static int hso_mux_serial_write_data(struct hso_serial *serial)
-+{
-+ if (NULL == serial)
-+ return -EINVAL;
-+
-+ return mux_device_request(serial,
-+ USB_CDC_SEND_ENCAPSULATED_COMMAND,
-+ serial->parent->port_spec & HSO_PORT_MASK,
-+ serial->tx_urb,
-+ &serial->ctrl_req_tx,
-+ serial->tx_data, serial->tx_data_count);
-+}
-+
-+/* write callback for Diag and CS port */
-+static void hso_std_serial_write_bulk_callback(struct urb *urb)
-+{
-+ struct hso_serial *serial = urb->context;
-+ int status = urb->status;
-+
-+ /* sanity check */
-+ if (!serial) {
-+ D1("serial == NULL");
-+ return;
-+ }
-+
-+ spin_lock(&serial->serial_lock);
-+ serial->tx_urb_used = 0;
-+ spin_unlock(&serial->serial_lock);
-+ if (status) {
-+ handle_usb_error(status, __func__, serial->parent);
-+ return;
-+ }
-+ hso_put_activity(serial->parent);
-+ tty_port_tty_wakeup(&serial->port);
-+ hso_kick_transmit(serial);
-+
-+ D1(" ");
-+}
-+
-+/* called for writing diag or CS serial port */
-+static int hso_std_serial_write_data(struct hso_serial *serial)
-+{
-+ int count = serial->tx_data_count;
-+ int result;
-+
-+ usb_fill_bulk_urb(serial->tx_urb,
-+ serial->parent->usb,
-+ usb_sndbulkpipe(serial->parent->usb,
-+ serial->out_endp->
-+ bEndpointAddress & 0x7F),
-+ serial->tx_data, serial->tx_data_count,
-+ hso_std_serial_write_bulk_callback, serial);
-+
-+ result = usb_submit_urb(serial->tx_urb, GFP_ATOMIC);
-+ if (result) {
-+ dev_warn(&serial->parent->usb->dev,
-+ "Failed to submit urb - res %d\n", result);
-+ return result;
-+ }
-+
-+ return count;
-+}
-+
-+/* callback after read or write on muxed serial port */
-+static void ctrl_callback(struct urb *urb)
-+{
-+ struct hso_serial *serial = urb->context;
-+ struct usb_ctrlrequest *req;
-+ int status = urb->status;
-+
-+ /* sanity check */
-+ if (!serial)
-+ return;
-+
-+ spin_lock(&serial->serial_lock);
-+ serial->tx_urb_used = 0;
-+ spin_unlock(&serial->serial_lock);
-+ if (status) {
-+ handle_usb_error(status, __func__, serial->parent);
-+ return;
-+ }
-+
-+ /* what request? */
-+ req = (struct usb_ctrlrequest *)(urb->setup_packet);
-+ D4("\n--- Got muxed ctrl callback 0x%02X ---", status);
-+ D4("Actual length of urb = %d\n", urb->actual_length);
-+ DUMP1(urb->transfer_buffer, urb->actual_length);
-+
-+ if (req->bRequestType ==
-+ (USB_DIR_IN | USB_TYPE_OPTION_VENDOR | USB_RECIP_INTERFACE)) {
-+ /* response to a read command */
-+ serial->rx_urb_filled[0] = 1;
-+ spin_lock(&serial->serial_lock);
-+ put_rxbuf_data_and_resubmit_ctrl_urb(serial);
-+ spin_unlock(&serial->serial_lock);
-+ } else {
-+ hso_put_activity(serial->parent);
-+ tty_port_tty_wakeup(&serial->port);
-+ /* response to a write command */
-+ hso_kick_transmit(serial);
-+ }
-+}
-+
-+/* handle RX data for serial port */
-+static int put_rxbuf_data(struct urb *urb, struct hso_serial *serial)
-+{
-+ struct tty_struct *tty;
-+ int count;
-+
-+ /* Sanity check */
-+ if (urb == NULL || serial == NULL) {
-+ D1("serial = NULL");
-+ return -2;
-+ }
-+
-+ tty = tty_port_tty_get(&serial->port);
-+
-+ if (tty && test_bit(TTY_THROTTLED, &tty->flags)) {
-+ tty_kref_put(tty);
-+ return -1;
-+ }
-+
-+ /* Push data to tty */
-+ D1("data to push to tty");
-+ count = tty_buffer_request_room(&serial->port, urb->actual_length);
-+ if (count >= urb->actual_length) {
-+ tty_insert_flip_string(&serial->port, urb->transfer_buffer,
-+ urb->actual_length);
-+ tty_flip_buffer_push(&serial->port);
-+ } else {
-+ dev_warn(&serial->parent->usb->dev,
-+ "dropping data, %d bytes lost\n", urb->actual_length);
-+ }
-+
-+ tty_kref_put(tty);
-+
-+ serial->rx_urb_filled[hso_urb_to_index(serial, urb)] = 0;
-+
-+ return 0;
-+}
-+
-+
-+/* Base driver functions */
-+
-+static void hso_log_port(struct hso_device *hso_dev)
-+{
-+ char *port_type;
-+ char port_dev[20];
-+
-+ switch (hso_dev->port_spec & HSO_PORT_MASK) {
-+ case HSO_PORT_CONTROL:
-+ port_type = "Control";
-+ break;
-+ case HSO_PORT_APP:
-+ port_type = "Application";
-+ break;
-+ case HSO_PORT_GPS:
-+ port_type = "GPS";
-+ break;
-+ case HSO_PORT_GPS_CONTROL:
-+ port_type = "GPS control";
-+ break;
-+ case HSO_PORT_APP2:
-+ port_type = "Application2";
-+ break;
-+ case HSO_PORT_PCSC:
-+ port_type = "PCSC";
-+ break;
-+ case HSO_PORT_DIAG:
-+ port_type = "Diagnostic";
-+ break;
-+ case HSO_PORT_DIAG2:
-+ port_type = "Diagnostic2";
-+ break;
-+ case HSO_PORT_MODEM:
-+ port_type = "Modem";
-+ break;
-+ case HSO_PORT_NETWORK:
-+ port_type = "Network";
-+ break;
-+ default:
-+ port_type = "Unknown";
-+ break;
-+ }
-+ if ((hso_dev->port_spec & HSO_PORT_MASK) == HSO_PORT_NETWORK) {
-+ sprintf(port_dev, "%s", dev2net(hso_dev)->net->name);
-+ } else
-+ sprintf(port_dev, "/dev/%s%d", tty_filename,
-+ dev2ser(hso_dev)->minor);
-+
-+ dev_dbg(&hso_dev->interface->dev, "HSO: Found %s port %s\n",
-+ port_type, port_dev);
-+}
-+
-+static int hso_start_net_device(struct hso_device *hso_dev)
-+{
-+ int i, result = 0;
-+ struct hso_net *hso_net = dev2net(hso_dev);
-+
-+ if (!hso_net)
-+ return -ENODEV;
-+
-+ /* send URBs for all read buffers */
-+ for (i = 0; i < MUX_BULK_RX_BUF_COUNT; i++) {
-+
-+ /* Prep a receive URB */
-+ usb_fill_bulk_urb(hso_net->mux_bulk_rx_urb_pool[i],
-+ hso_dev->usb,
-+ usb_rcvbulkpipe(hso_dev->usb,
-+ hso_net->in_endp->
-+ bEndpointAddress & 0x7F),
-+ hso_net->mux_bulk_rx_buf_pool[i],
-+ MUX_BULK_RX_BUF_SIZE, read_bulk_callback,
-+ hso_net);
-+
-+ /* Put it out there so the device can send us stuff */
-+ result = usb_submit_urb(hso_net->mux_bulk_rx_urb_pool[i],
-+ GFP_NOIO);
-+ if (result)
-+ dev_warn(&hso_dev->usb->dev,
-+ "%s failed mux_bulk_rx_urb[%d] %d\n", __func__,
-+ i, result);
-+ }
-+
-+ return result;
-+}
-+
-+static int hso_stop_net_device(struct hso_device *hso_dev)
-+{
-+ int i;
-+ struct hso_net *hso_net = dev2net(hso_dev);
-+
-+ if (!hso_net)
-+ return -ENODEV;
-+
-+ for (i = 0; i < MUX_BULK_RX_BUF_COUNT; i++) {
-+ if (hso_net->mux_bulk_rx_urb_pool[i])
-+ usb_kill_urb(hso_net->mux_bulk_rx_urb_pool[i]);
-+
-+ }
-+ if (hso_net->mux_bulk_tx_urb)
-+ usb_kill_urb(hso_net->mux_bulk_tx_urb);
-+
-+ return 0;
-+}
-+
-+static int hso_start_serial_device(struct hso_device *hso_dev, gfp_t flags)
-+{
-+ int i, result = 0;
-+ struct hso_serial *serial = dev2ser(hso_dev);
-+
-+ if (!serial)
-+ return -ENODEV;
-+
-+ /* If it is not the MUX port fill in and submit a bulk urb (already
-+ * allocated in hso_serial_start) */
-+ if (!(serial->parent->port_spec & HSO_INTF_MUX)) {
-+ for (i = 0; i < serial->num_rx_urbs; i++) {
-+ usb_fill_bulk_urb(serial->rx_urb[i],
-+ serial->parent->usb,
-+ usb_rcvbulkpipe(serial->parent->usb,
-+ serial->in_endp->
-+ bEndpointAddress &
-+ 0x7F),
-+ serial->rx_data[i],
-+ serial->rx_data_length,
-+ hso_std_serial_read_bulk_callback,
-+ serial);
-+ result = usb_submit_urb(serial->rx_urb[i], flags);
-+ if (result) {
-+ dev_warn(&serial->parent->usb->dev,
-+ "Failed to submit urb - res %d\n",
-+ result);
-+ break;
-+ }
-+ }
-+ } else {
-+ mutex_lock(&serial->shared_int->shared_int_lock);
-+ if (!serial->shared_int->use_count) {
-+ result =
-+ hso_mux_submit_intr_urb(serial->shared_int,
-+ hso_dev->usb, flags);
-+ }
-+ serial->shared_int->use_count++;
-+ mutex_unlock(&serial->shared_int->shared_int_lock);
-+ }
-+ if (serial->tiocmget)
-+ tiocmget_submit_urb(serial,
-+ serial->tiocmget,
-+ serial->parent->usb);
-+ return result;
-+}
-+
-+static int hso_stop_serial_device(struct hso_device *hso_dev)
-+{
-+ int i;
-+ struct hso_serial *serial = dev2ser(hso_dev);
-+ struct hso_tiocmget *tiocmget;
-+
-+ if (!serial)
-+ return -ENODEV;
-+
-+ for (i = 0; i < serial->num_rx_urbs; i++) {
-+ if (serial->rx_urb[i]) {
-+ usb_kill_urb(serial->rx_urb[i]);
-+ serial->rx_urb_filled[i] = 0;
-+ }
-+ }
-+ serial->curr_rx_urb_idx = 0;
-+
-+ if (serial->tx_urb)
-+ usb_kill_urb(serial->tx_urb);
-+
-+ if (serial->shared_int) {
-+ mutex_lock(&serial->shared_int->shared_int_lock);
-+ if (serial->shared_int->use_count &&
-+ (--serial->shared_int->use_count == 0)) {
-+ struct urb *urb;
-+
-+ urb = serial->shared_int->shared_intr_urb;
-+ if (urb)
-+ usb_kill_urb(urb);
-+ }
-+ mutex_unlock(&serial->shared_int->shared_int_lock);
-+ }
-+ tiocmget = serial->tiocmget;
-+ if (tiocmget) {
-+ wake_up_interruptible(&tiocmget->waitq);
-+ usb_kill_urb(tiocmget->urb);
-+ }
-+
-+ return 0;
-+}
-+
-+static void hso_serial_common_free(struct hso_serial *serial)
-+{
-+ int i;
-+
-+ if (serial->parent->dev)
-+ device_remove_file(serial->parent->dev, &dev_attr_hsotype);
-+
-+ tty_unregister_device(tty_drv, serial->minor);
-+
-+ for (i = 0; i < serial->num_rx_urbs; i++) {
-+ /* unlink and free RX URB */
-+ usb_free_urb(serial->rx_urb[i]);
-+ /* free the RX buffer */
-+ kfree(serial->rx_data[i]);
-+ }
-+
-+ /* unlink and free TX URB */
-+ usb_free_urb(serial->tx_urb);
-+ kfree(serial->tx_data);
-+ tty_port_destroy(&serial->port);
-+}
-+
-+static int hso_serial_common_create(struct hso_serial *serial, int num_urbs,
-+ int rx_size, int tx_size)
-+{
-+ struct device *dev;
-+ int minor;
-+ int i;
-+
-+ tty_port_init(&serial->port);
-+
-+ minor = get_free_serial_index();
-+ if (minor < 0)
-+ goto exit;
-+
-+ /* register our minor number */
-+ serial->parent->dev = tty_port_register_device(&serial->port, tty_drv,
-+ minor, &serial->parent->interface->dev);
-+ dev = serial->parent->dev;
-+ dev_set_drvdata(dev, serial->parent);
-+ i = device_create_file(dev, &dev_attr_hsotype);
-+
-+ /* fill in specific data for later use */
-+ serial->minor = minor;
-+ serial->magic = HSO_SERIAL_MAGIC;
-+ spin_lock_init(&serial->serial_lock);
-+ serial->num_rx_urbs = num_urbs;
-+
-+ /* RX, allocate urb and initialize */
-+
-+ /* prepare our RX buffer */
-+ serial->rx_data_length = rx_size;
-+ for (i = 0; i < serial->num_rx_urbs; i++) {
-+ serial->rx_urb[i] = usb_alloc_urb(0, GFP_KERNEL);
-+ if (!serial->rx_urb[i]) {
-+ dev_err(dev, "Could not allocate urb?\n");
-+ goto exit;
-+ }
-+ serial->rx_urb[i]->transfer_buffer = NULL;
-+ serial->rx_urb[i]->transfer_buffer_length = 0;
-+ serial->rx_data[i] = kzalloc(serial->rx_data_length,
-+ GFP_KERNEL);
-+ if (!serial->rx_data[i])
-+ goto exit;
-+ }
-+
-+ /* TX, allocate urb and initialize */
-+ serial->tx_urb = usb_alloc_urb(0, GFP_KERNEL);
-+ if (!serial->tx_urb) {
-+ dev_err(dev, "Could not allocate urb?\n");
-+ goto exit;
-+ }
-+ serial->tx_urb->transfer_buffer = NULL;
-+ serial->tx_urb->transfer_buffer_length = 0;
-+ /* prepare our TX buffer */
-+ serial->tx_data_count = 0;
-+ serial->tx_buffer_count = 0;
-+ serial->tx_data_length = tx_size;
-+ serial->tx_data = kzalloc(serial->tx_data_length, GFP_KERNEL);
-+ if (!serial->tx_data)
-+ goto exit;
-+
-+ serial->tx_buffer = kzalloc(serial->tx_data_length, GFP_KERNEL);
-+ if (!serial->tx_buffer)
-+ goto exit;
-+
-+ return 0;
-+exit:
-+ hso_serial_common_free(serial);
-+ return -1;
-+}
-+
-+/* Creates a general hso device */
-+static struct hso_device *hso_create_device(struct usb_interface *intf,
-+ int port_spec)
-+{
-+ struct hso_device *hso_dev;
-+
-+ hso_dev = kzalloc(sizeof(*hso_dev), GFP_ATOMIC);
-+ if (!hso_dev)
-+ return NULL;
-+
-+ hso_dev->port_spec = port_spec;
-+ hso_dev->usb = interface_to_usbdev(intf);
-+ hso_dev->interface = intf;
-+ kref_init(&hso_dev->ref);
-+ mutex_init(&hso_dev->mutex);
-+
-+ INIT_WORK(&hso_dev->async_get_intf, async_get_intf);
-+ INIT_WORK(&hso_dev->async_put_intf, async_put_intf);
-+ INIT_WORK(&hso_dev->reset_device, reset_device);
-+
-+ return hso_dev;
-+}
-+
-+/* Removes a network device in the network device table */
-+static int remove_net_device(struct hso_device *hso_dev)
-+{
-+ int i;
-+
-+ for (i = 0; i < HSO_MAX_NET_DEVICES; i++) {
-+ if (network_table[i] == hso_dev) {
-+ network_table[i] = NULL;
-+ break;
-+ }
-+ }
-+ if (i == HSO_MAX_NET_DEVICES)
-+ return -1;
-+ return 0;
-+}
-+
-+/* Frees our network device */
-+static void hso_free_net_device(struct hso_device *hso_dev)
-+{
-+ int i;
-+ struct hso_net *hso_net = dev2net(hso_dev);
-+
-+ if (!hso_net)
-+ return;
-+
-+ remove_net_device(hso_net->parent);
-+
-+ if (hso_net->net)
-+ unregister_netdev(hso_net->net);
-+
-+ /* start freeing */
-+ for (i = 0; i < MUX_BULK_RX_BUF_COUNT; i++) {
-+ usb_free_urb(hso_net->mux_bulk_rx_urb_pool[i]);
-+ kfree(hso_net->mux_bulk_rx_buf_pool[i]);
-+ hso_net->mux_bulk_rx_buf_pool[i] = NULL;
-+ }
-+ usb_free_urb(hso_net->mux_bulk_tx_urb);
-+ kfree(hso_net->mux_bulk_tx_buf);
-+ hso_net->mux_bulk_tx_buf = NULL;
-+
-+ if (hso_net->net)
-+ free_netdev(hso_net->net);
-+
-+ kfree(hso_dev);
-+}
-+
-+static const struct net_device_ops hso_netdev_ops = {
-+ .ndo_open = hso_net_open,
-+ .ndo_stop = hso_net_close,
-+ .ndo_start_xmit = hso_net_start_xmit,
-+ .ndo_tx_timeout = hso_net_tx_timeout,
-+};
-+
-+/* initialize the network interface */
-+static void hso_net_init(struct net_device *net)
-+{
-+ struct hso_net *hso_net = netdev_priv(net);
-+
-+ D1("sizeof hso_net is %d", (int)sizeof(*hso_net));
-+
-+ /* fill in the other fields */
-+ net->netdev_ops = &hso_netdev_ops;
-+ net->watchdog_timeo = HSO_NET_TX_TIMEOUT;
-+ net->flags = IFF_POINTOPOINT | IFF_NOARP | IFF_MULTICAST;
-+ net->type = ARPHRD_NONE;
-+ net->mtu = DEFAULT_MTU - 14;
-+ net->tx_queue_len = 10;
-+ net->ethtool_ops = &ops;
-+
-+ /* and initialize the semaphore */
-+ spin_lock_init(&hso_net->net_lock);
-+}
-+
-+/* Adds a network device in the network device table */
-+static int add_net_device(struct hso_device *hso_dev)
-+{
-+ int i;
-+
-+ for (i = 0; i < HSO_MAX_NET_DEVICES; i++) {
-+ if (network_table[i] == NULL) {
-+ network_table[i] = hso_dev;
-+ break;
-+ }
-+ }
-+ if (i == HSO_MAX_NET_DEVICES)
-+ return -1;
-+ return 0;
-+}
-+
-+static int hso_rfkill_set_block(void *data, bool blocked)
-+{
-+ struct hso_device *hso_dev = data;
-+ int enabled = !blocked;
-+ int rv;
-+
-+ mutex_lock(&hso_dev->mutex);
-+ if (hso_dev->usb_gone)
-+ rv = 0;
-+ else
-+ rv = usb_control_msg(hso_dev->usb, usb_rcvctrlpipe(hso_dev->usb, 0),
-+ enabled ? 0x82 : 0x81, 0x40, 0, 0, NULL, 0,
-+ USB_CTRL_SET_TIMEOUT);
-+ mutex_unlock(&hso_dev->mutex);
-+ return rv;
-+}
-+
-+static const struct rfkill_ops hso_rfkill_ops = {
-+ .set_block = hso_rfkill_set_block,
-+};
-+
-+/* Creates and sets up everything for rfkill */
-+static void hso_create_rfkill(struct hso_device *hso_dev,
-+ struct usb_interface *interface)
-+{
-+ struct hso_net *hso_net = dev2net(hso_dev);
-+ struct device *dev = &hso_net->net->dev;
-+ char *rfkn;
-+
-+ rfkn = kzalloc(20, GFP_KERNEL);
-+ if (!rfkn)
-+ dev_err(dev, "%s - Out of memory\n", __func__);
-+
-+ snprintf(rfkn, 20, "hso-%d",
-+ interface->altsetting->desc.bInterfaceNumber);
-+
-+ hso_net->rfkill = rfkill_alloc(rfkn,
-+ &interface_to_usbdev(interface)->dev,
-+ RFKILL_TYPE_WWAN,
-+ &hso_rfkill_ops, hso_dev);
-+ if (!hso_net->rfkill) {
-+ dev_err(dev, "%s - Out of memory\n", __func__);
-+ kfree(rfkn);
-+ return;
-+ }
-+ if (rfkill_register(hso_net->rfkill) < 0) {
-+ rfkill_destroy(hso_net->rfkill);
-+ kfree(rfkn);
-+ hso_net->rfkill = NULL;
-+ dev_err(dev, "%s - Failed to register rfkill\n", __func__);
-+ return;
-+ }
-+}
-+
-+static struct device_type hso_type = {
-+ .name = "wwan",
-+};
-+
-+/* Creates our network device */
-+static struct hso_device *hso_create_net_device(struct usb_interface *interface,
-+ int port_spec)
-+{
-+ int result, i;
-+ struct net_device *net;
-+ struct hso_net *hso_net;
-+ struct hso_device *hso_dev;
-+
-+ hso_dev = hso_create_device(interface, port_spec);
-+ if (!hso_dev)
-+ return NULL;
-+
-+ /* allocate our network device, then we can put in our private data */
-+ /* call hso_net_init to do the basic initialization */
-+ net = alloc_netdev(sizeof(struct hso_net), "hso%d", NET_NAME_UNKNOWN,
-+ hso_net_init);
-+ if (!net) {
-+ dev_err(&interface->dev, "Unable to create ethernet device\n");
-+ goto exit;
-+ }
-+
-+ hso_net = netdev_priv(net);
-+
-+ hso_dev->port_data.dev_net = hso_net;
-+ hso_net->net = net;
-+ hso_net->parent = hso_dev;
-+
-+ hso_net->in_endp = hso_get_ep(interface, USB_ENDPOINT_XFER_BULK,
-+ USB_DIR_IN);
-+ if (!hso_net->in_endp) {
-+ dev_err(&interface->dev, "Can't find BULK IN endpoint\n");
-+ goto exit;
-+ }
-+ hso_net->out_endp = hso_get_ep(interface, USB_ENDPOINT_XFER_BULK,
-+ USB_DIR_OUT);
-+ if (!hso_net->out_endp) {
-+ dev_err(&interface->dev, "Can't find BULK OUT endpoint\n");
-+ goto exit;
-+ }
-+ SET_NETDEV_DEV(net, &interface->dev);
-+ SET_NETDEV_DEVTYPE(net, &hso_type);
-+
-+ /* registering our net device */
-+ result = register_netdev(net);
-+ if (result) {
-+ dev_err(&interface->dev, "Failed to register device\n");
-+ goto exit;
-+ }
-+
-+ /* start allocating */
-+ for (i = 0; i < MUX_BULK_RX_BUF_COUNT; i++) {
-+ hso_net->mux_bulk_rx_urb_pool[i] = usb_alloc_urb(0, GFP_KERNEL);
-+ if (!hso_net->mux_bulk_rx_urb_pool[i]) {
-+ dev_err(&interface->dev, "Could not allocate rx urb\n");
-+ goto exit;
-+ }
-+ hso_net->mux_bulk_rx_buf_pool[i] = kzalloc(MUX_BULK_RX_BUF_SIZE,
-+ GFP_KERNEL);
-+ if (!hso_net->mux_bulk_rx_buf_pool[i])
-+ goto exit;
-+ }
-+ hso_net->mux_bulk_tx_urb = usb_alloc_urb(0, GFP_KERNEL);
-+ if (!hso_net->mux_bulk_tx_urb) {
-+ dev_err(&interface->dev, "Could not allocate tx urb\n");
-+ goto exit;
-+ }
-+ hso_net->mux_bulk_tx_buf = kzalloc(MUX_BULK_TX_BUF_SIZE, GFP_KERNEL);
-+ if (!hso_net->mux_bulk_tx_buf)
-+ goto exit;
-+
-+ add_net_device(hso_dev);
-+
-+ hso_log_port(hso_dev);
-+
-+ hso_create_rfkill(hso_dev, interface);
-+
-+ return hso_dev;
-+exit:
-+ hso_free_net_device(hso_dev);
-+ return NULL;
-+}
-+
-+static void hso_free_tiomget(struct hso_serial *serial)
-+{
-+ struct hso_tiocmget *tiocmget;
-+ if (!serial)
-+ return;
-+ tiocmget = serial->tiocmget;
-+ if (tiocmget) {
-+ usb_free_urb(tiocmget->urb);
-+ tiocmget->urb = NULL;
-+ serial->tiocmget = NULL;
-+ kfree(tiocmget);
-+ }
-+}
-+
-+/* Frees an AT channel ( goes for both mux and non-mux ) */
-+static void hso_free_serial_device(struct hso_device *hso_dev)
-+{
-+ struct hso_serial *serial = dev2ser(hso_dev);
-+
-+ if (!serial)
-+ return;
-+ set_serial_by_index(serial->minor, NULL);
-+
-+ hso_serial_common_free(serial);
-+
-+ if (serial->shared_int) {
-+ mutex_lock(&serial->shared_int->shared_int_lock);
-+ if (--serial->shared_int->ref_count == 0)
-+ hso_free_shared_int(serial->shared_int);
-+ else
-+ mutex_unlock(&serial->shared_int->shared_int_lock);
-+ }
-+ hso_free_tiomget(serial);
-+ kfree(serial);
-+ kfree(hso_dev);
-+}
-+
-+/* Creates a bulk AT channel */
-+static struct hso_device *hso_create_bulk_serial_device(
-+ struct usb_interface *interface, int port)
-+{
-+ struct hso_device *hso_dev;
-+ struct hso_serial *serial;
-+ int num_urbs;
-+ struct hso_tiocmget *tiocmget;
-+
-+ hso_dev = hso_create_device(interface, port);
-+ if (!hso_dev)
-+ return NULL;
-+
-+ serial = kzalloc(sizeof(*serial), GFP_KERNEL);
-+ if (!serial)
-+ goto exit;
-+
-+ serial->parent = hso_dev;
-+ hso_dev->port_data.dev_serial = serial;
-+
-+ if ((port & HSO_PORT_MASK) == HSO_PORT_MODEM) {
-+ num_urbs = 2;
-+ serial->tiocmget = kzalloc(sizeof(struct hso_tiocmget),
-+ GFP_KERNEL);
-+ /* it isn't going to break our heart if serial->tiocmget
-+ * allocation fails don't bother checking this.
-+ */
-+ if (serial->tiocmget) {
-+ tiocmget = serial->tiocmget;
-+ tiocmget->urb = usb_alloc_urb(0, GFP_KERNEL);
-+ if (tiocmget->urb) {
-+ mutex_init(&tiocmget->mutex);
-+ init_waitqueue_head(&tiocmget->waitq);
-+ tiocmget->endp = hso_get_ep(
-+ interface,
-+ USB_ENDPOINT_XFER_INT,
-+ USB_DIR_IN);
-+ } else
-+ hso_free_tiomget(serial);
-+ }
-+ }
-+ else
-+ num_urbs = 1;
-+
-+ if (hso_serial_common_create(serial, num_urbs, BULK_URB_RX_SIZE,
-+ BULK_URB_TX_SIZE))
-+ goto exit;
-+
-+ serial->in_endp = hso_get_ep(interface, USB_ENDPOINT_XFER_BULK,
-+ USB_DIR_IN);
-+ if (!serial->in_endp) {
-+ dev_err(&interface->dev, "Failed to find BULK IN ep\n");
-+ goto exit2;
-+ }
-+
-+ if (!
-+ (serial->out_endp =
-+ hso_get_ep(interface, USB_ENDPOINT_XFER_BULK, USB_DIR_OUT))) {
-+ dev_err(&interface->dev, "Failed to find BULK IN ep\n");
-+ goto exit2;
-+ }
-+
-+ serial->write_data = hso_std_serial_write_data;
-+
-+ /* and record this serial */
-+ set_serial_by_index(serial->minor, serial);
-+
-+ /* setup the proc dirs and files if needed */
-+ hso_log_port(hso_dev);
-+
-+ /* done, return it */
-+ return hso_dev;
-+
-+exit2:
-+ hso_serial_common_free(serial);
-+exit:
-+ hso_free_tiomget(serial);
-+ kfree(serial);
-+ kfree(hso_dev);
-+ return NULL;
-+}
-+
-+/* Creates a multiplexed AT channel */
-+static
-+struct hso_device *hso_create_mux_serial_device(struct usb_interface *interface,
-+ int port,
-+ struct hso_shared_int *mux)
-+{
-+ struct hso_device *hso_dev;
-+ struct hso_serial *serial;
-+ int port_spec;
-+
-+ port_spec = HSO_INTF_MUX;
-+ port_spec &= ~HSO_PORT_MASK;
-+
-+ port_spec |= hso_mux_to_port(port);
-+ if ((port_spec & HSO_PORT_MASK) == HSO_PORT_NO_PORT)
-+ return NULL;
-+
-+ hso_dev = hso_create_device(interface, port_spec);
-+ if (!hso_dev)
-+ return NULL;
-+
-+ serial = kzalloc(sizeof(*serial), GFP_KERNEL);
-+ if (!serial)
-+ goto exit;
-+
-+ hso_dev->port_data.dev_serial = serial;
-+ serial->parent = hso_dev;
-+
-+ if (hso_serial_common_create
-+ (serial, 1, CTRL_URB_RX_SIZE, CTRL_URB_TX_SIZE))
-+ goto exit;
-+
-+ serial->tx_data_length--;
-+ serial->write_data = hso_mux_serial_write_data;
-+
-+ serial->shared_int = mux;
-+ mutex_lock(&serial->shared_int->shared_int_lock);
-+ serial->shared_int->ref_count++;
-+ mutex_unlock(&serial->shared_int->shared_int_lock);
-+
-+ /* and record this serial */
-+ set_serial_by_index(serial->minor, serial);
-+
-+ /* setup the proc dirs and files if needed */
-+ hso_log_port(hso_dev);
-+
-+ /* done, return it */
-+ return hso_dev;
-+
-+exit:
-+ if (serial) {
-+ tty_unregister_device(tty_drv, serial->minor);
-+ kfree(serial);
-+ }
-+ if (hso_dev)
-+ kfree(hso_dev);
-+ return NULL;
-+
-+}
-+
-+static void hso_free_shared_int(struct hso_shared_int *mux)
-+{
-+ usb_free_urb(mux->shared_intr_urb);
-+ kfree(mux->shared_intr_buf);
-+ mutex_unlock(&mux->shared_int_lock);
-+ kfree(mux);
-+}
-+
-+static
-+struct hso_shared_int *hso_create_shared_int(struct usb_interface *interface)
-+{
-+ struct hso_shared_int *mux = kzalloc(sizeof(*mux), GFP_KERNEL);
-+
-+ if (!mux)
-+ return NULL;
-+
-+ mux->intr_endp = hso_get_ep(interface, USB_ENDPOINT_XFER_INT,
-+ USB_DIR_IN);
-+ if (!mux->intr_endp) {
-+ dev_err(&interface->dev, "Can't find INT IN endpoint\n");
-+ goto exit;
-+ }
-+
-+ mux->shared_intr_urb = usb_alloc_urb(0, GFP_KERNEL);
-+ if (!mux->shared_intr_urb) {
-+ dev_err(&interface->dev, "Could not allocate intr urb?\n");
-+ goto exit;
-+ }
-+ mux->shared_intr_buf =
-+ kzalloc(le16_to_cpu(mux->intr_endp->wMaxPacketSize),
-+ GFP_KERNEL);
-+ if (!mux->shared_intr_buf)
-+ goto exit;
-+
-+ mutex_init(&mux->shared_int_lock);
-+
-+ return mux;
-+
-+exit:
-+ kfree(mux->shared_intr_buf);
-+ usb_free_urb(mux->shared_intr_urb);
-+ kfree(mux);
-+ return NULL;
-+}
-+
-+/* Gets the port spec for a certain interface */
-+static int hso_get_config_data(struct usb_interface *interface)
-+{
-+ struct usb_device *usbdev = interface_to_usbdev(interface);
-+ u8 *config_data = kmalloc(17, GFP_KERNEL);
-+ u32 if_num = interface->altsetting->desc.bInterfaceNumber;
-+ s32 result;
-+
-+ if (!config_data)
-+ return -ENOMEM;
-+ if (usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0),
-+ 0x86, 0xC0, 0, 0, config_data, 17,
-+ USB_CTRL_SET_TIMEOUT) != 0x11) {
-+ kfree(config_data);
-+ return -EIO;
-+ }
-+
-+ switch (config_data[if_num]) {
-+ case 0x0:
-+ result = 0;
-+ break;
-+ case 0x1:
-+ result = HSO_PORT_DIAG;
-+ break;
-+ case 0x2:
-+ result = HSO_PORT_GPS;
-+ break;
-+ case 0x3:
-+ result = HSO_PORT_GPS_CONTROL;
-+ break;
-+ case 0x4:
-+ result = HSO_PORT_APP;
-+ break;
-+ case 0x5:
-+ result = HSO_PORT_APP2;
-+ break;
-+ case 0x6:
-+ result = HSO_PORT_CONTROL;
-+ break;
-+ case 0x7:
-+ result = HSO_PORT_NETWORK;
-+ break;
-+ case 0x8:
-+ result = HSO_PORT_MODEM;
-+ break;
-+ case 0x9:
-+ result = HSO_PORT_MSD;
-+ break;
-+ case 0xa:
-+ result = HSO_PORT_PCSC;
-+ break;
-+ case 0xb:
-+ result = HSO_PORT_VOICE;
-+ break;
-+ default:
-+ result = 0;
-+ }
-+
-+ if (result)
-+ result |= HSO_INTF_BULK;
-+
-+ if (config_data[16] & 0x1)
-+ result |= HSO_INFO_CRC_BUG;
-+
-+ kfree(config_data);
-+ return result;
-+}
-+
-+/* called once for each interface upon device insertion */
-+static int hso_probe(struct usb_interface *interface,
-+ const struct usb_device_id *id)
-+{
-+ int mux, i, if_num, port_spec;
-+ unsigned char port_mask;
-+ struct hso_device *hso_dev = NULL;
-+ struct hso_shared_int *shared_int;
-+ struct hso_device *tmp_dev = NULL;
-+
-+ if (interface->cur_altsetting->desc.bInterfaceClass != 0xFF) {
-+ dev_err(&interface->dev, "Not our interface\n");
-+ return -ENODEV;
-+ }
-+
-+ if_num = interface->altsetting->desc.bInterfaceNumber;
-+
-+ /* Get the interface/port specification from either driver_info or from
-+ * the device itself */
-+ if (id->driver_info)
-+ port_spec = ((u32 *)(id->driver_info))[if_num];
-+ else
-+ port_spec = hso_get_config_data(interface);
-+
-+ /* Check if we need to switch to alt interfaces prior to port
-+ * configuration */
-+ if (interface->num_altsetting > 1)
-+ usb_set_interface(interface_to_usbdev(interface), if_num, 1);
-+ interface->needs_remote_wakeup = 1;
-+
-+ /* Allocate new hso device(s) */
-+ switch (port_spec & HSO_INTF_MASK) {
-+ case HSO_INTF_MUX:
-+ if ((port_spec & HSO_PORT_MASK) == HSO_PORT_NETWORK) {
-+ /* Create the network device */
-+ if (!disable_net) {
-+ hso_dev = hso_create_net_device(interface,
-+ port_spec);
-+ if (!hso_dev)
-+ goto exit;
-+ tmp_dev = hso_dev;
-+ }
-+ }
-+
-+ if (hso_get_mux_ports(interface, &port_mask))
-+ /* TODO: de-allocate everything */
-+ goto exit;
-+
-+ shared_int = hso_create_shared_int(interface);
-+ if (!shared_int)
-+ goto exit;
-+
-+ for (i = 1, mux = 0; i < 0x100; i = i << 1, mux++) {
-+ if (port_mask & i) {
-+ hso_dev = hso_create_mux_serial_device(
-+ interface, i, shared_int);
-+ if (!hso_dev)
-+ goto exit;
-+ }
-+ }
-+
-+ if (tmp_dev)
-+ hso_dev = tmp_dev;
-+ break;
-+
-+ case HSO_INTF_BULK:
-+ /* It's a regular bulk interface */
-+ if ((port_spec & HSO_PORT_MASK) == HSO_PORT_NETWORK) {
-+ if (!disable_net)
-+ hso_dev =
-+ hso_create_net_device(interface, port_spec);
-+ } else {
-+ hso_dev =
-+ hso_create_bulk_serial_device(interface, port_spec);
-+ }
-+ if (!hso_dev)
-+ goto exit;
-+ break;
-+ default:
-+ goto exit;
-+ }
-+
-+ /* save our data pointer in this device */
-+ usb_set_intfdata(interface, hso_dev);
-+
-+ /* done */
-+ return 0;
-+exit:
-+ hso_free_interface(interface);
-+ return -ENODEV;
-+}
-+
-+/* device removed, cleaning up */
-+static void hso_disconnect(struct usb_interface *interface)
-+{
-+ hso_free_interface(interface);
-+
-+ /* remove reference of our private data */
-+ usb_set_intfdata(interface, NULL);
-+}
-+
-+static void async_get_intf(struct work_struct *data)
-+{
-+ struct hso_device *hso_dev =
-+ container_of(data, struct hso_device, async_get_intf);
-+ usb_autopm_get_interface(hso_dev->interface);
-+}
-+
-+static void async_put_intf(struct work_struct *data)
-+{
-+ struct hso_device *hso_dev =
-+ container_of(data, struct hso_device, async_put_intf);
-+ usb_autopm_put_interface(hso_dev->interface);
-+}
-+
-+static int hso_get_activity(struct hso_device *hso_dev)
-+{
-+ if (hso_dev->usb->state == USB_STATE_SUSPENDED) {
-+ if (!hso_dev->is_active) {
-+ hso_dev->is_active = 1;
-+ schedule_work(&hso_dev->async_get_intf);
-+ }
-+ }
-+
-+ if (hso_dev->usb->state != USB_STATE_CONFIGURED)
-+ return -EAGAIN;
-+
-+ usb_mark_last_busy(hso_dev->usb);
-+
-+ return 0;
-+}
-+
-+static int hso_put_activity(struct hso_device *hso_dev)
-+{
-+ if (hso_dev->usb->state != USB_STATE_SUSPENDED) {
-+ if (hso_dev->is_active) {
-+ hso_dev->is_active = 0;
-+ schedule_work(&hso_dev->async_put_intf);
-+ return -EAGAIN;
-+ }
-+ }
-+ hso_dev->is_active = 0;
-+ return 0;
-+}
-+
-+/* called by kernel when we need to suspend device */
-+static int hso_suspend(struct usb_interface *iface, pm_message_t message)
-+{
-+ int i, result;
-+
-+ /* Stop all serial ports */
-+ for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
-+ if (serial_table[i] && (serial_table[i]->interface == iface)) {
-+ result = hso_stop_serial_device(serial_table[i]);
-+ if (result)
-+ goto out;
-+ }
-+ }
-+
-+ /* Stop all network ports */
-+ for (i = 0; i < HSO_MAX_NET_DEVICES; i++) {
-+ if (network_table[i] &&
-+ (network_table[i]->interface == iface)) {
-+ result = hso_stop_net_device(network_table[i]);
-+ if (result)
-+ goto out;
-+ }
-+ }
-+
-+out:
-+ return 0;
-+}
-+
-+/* called by kernel when we need to resume device */
-+static int hso_resume(struct usb_interface *iface)
-+{
-+ int i, result = 0;
-+ struct hso_net *hso_net;
-+
-+ /* Start all serial ports */
-+ for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
-+ if (serial_table[i] && (serial_table[i]->interface == iface)) {
-+ if (atomic_read(&dev2ser(serial_table[i])->port.count)) {
-+ result =
-+ hso_start_serial_device(serial_table[i], GFP_NOIO);
-+ hso_kick_transmit(dev2ser(serial_table[i]));
-+ if (result)
-+ goto out;
-+ }
-+ }
-+ }
-+
-+ /* Start all network ports */
-+ for (i = 0; i < HSO_MAX_NET_DEVICES; i++) {
-+ if (network_table[i] &&
-+ (network_table[i]->interface == iface)) {
-+ hso_net = dev2net(network_table[i]);
-+ if (hso_net->flags & IFF_UP) {
-+ /* First transmit any lingering data,
-+ then restart the device. */
-+ if (hso_net->skb_tx_buf) {
-+ dev_dbg(&iface->dev,
-+ "Transmitting"
-+ " lingering data\n");
-+ hso_net_start_xmit(hso_net->skb_tx_buf,
-+ hso_net->net);
-+ hso_net->skb_tx_buf = NULL;
-+ }
-+ result = hso_start_net_device(network_table[i]);
-+ if (result)
-+ goto out;
-+ }
-+ }
-+ }
-+
-+out:
-+ return result;
-+}
-+
-+static void reset_device(struct work_struct *data)
-+{
-+ struct hso_device *hso_dev =
-+ container_of(data, struct hso_device, reset_device);
-+ struct usb_device *usb = hso_dev->usb;
-+ int result;
-+
-+ if (hso_dev->usb_gone) {
-+ D1("No reset during disconnect\n");
-+ } else {
-+ result = usb_lock_device_for_reset(usb, hso_dev->interface);
-+ if (result < 0)
-+ D1("unable to lock device for reset: %d\n", result);
-+ else {
-+ usb_reset_device(usb);
-+ usb_unlock_device(usb);
-+ }
-+ }
-+}
-+
-+static void hso_serial_ref_free(struct kref *ref)
-+{
-+ struct hso_device *hso_dev = container_of(ref, struct hso_device, ref);
-+
-+ hso_free_serial_device(hso_dev);
-+}
-+
-+static void hso_free_interface(struct usb_interface *interface)
-+{
-+ struct hso_serial *hso_dev;
-+ int i;
-+
-+ for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
-+ if (serial_table[i] &&
-+ (serial_table[i]->interface == interface)) {
-+ hso_dev = dev2ser(serial_table[i]);
-+ tty_port_tty_hangup(&hso_dev->port, false);
-+ mutex_lock(&hso_dev->parent->mutex);
-+ hso_dev->parent->usb_gone = 1;
-+ mutex_unlock(&hso_dev->parent->mutex);
-+ kref_put(&serial_table[i]->ref, hso_serial_ref_free);
-+ }
-+ }
-+
-+ for (i = 0; i < HSO_MAX_NET_DEVICES; i++) {
-+ if (network_table[i] &&
-+ (network_table[i]->interface == interface)) {
-+ struct rfkill *rfk = dev2net(network_table[i])->rfkill;
-+ /* hso_stop_net_device doesn't stop the net queue since
-+ * traffic needs to start it again when suspended */
-+ netif_stop_queue(dev2net(network_table[i])->net);
-+ hso_stop_net_device(network_table[i]);
-+ cancel_work_sync(&network_table[i]->async_put_intf);
-+ cancel_work_sync(&network_table[i]->async_get_intf);
-+ if (rfk) {
-+ rfkill_unregister(rfk);
-+ rfkill_destroy(rfk);
-+ }
-+ hso_free_net_device(network_table[i]);
-+ }
-+ }
-+}
-+
-+/* Helper functions */
-+
-+/* Get the endpoint ! */
-+static struct usb_endpoint_descriptor *hso_get_ep(struct usb_interface *intf,
-+ int type, int dir)
-+{
-+ int i;
-+ struct usb_host_interface *iface = intf->cur_altsetting;
-+ struct usb_endpoint_descriptor *endp;
-+
-+ for (i = 0; i < iface->desc.bNumEndpoints; i++) {
-+ endp = &iface->endpoint[i].desc;
-+ if (((endp->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == dir) &&
-+ (usb_endpoint_type(endp) == type))
-+ return endp;
-+ }
-+
-+ return NULL;
-+}
-+
-+/* Get the byte that describes which ports are enabled */
-+static int hso_get_mux_ports(struct usb_interface *intf, unsigned char *ports)
-+{
-+ int i;
-+ struct usb_host_interface *iface = intf->cur_altsetting;
-+
-+ if (iface->extralen == 3) {
-+ *ports = iface->extra[2];
-+ return 0;
-+ }
-+
-+ for (i = 0; i < iface->desc.bNumEndpoints; i++) {
-+ if (iface->endpoint[i].extralen == 3) {
-+ *ports = iface->endpoint[i].extra[2];
-+ return 0;
-+ }
-+ }
-+
-+ return -1;
-+}
-+
-+/* interrupt urb needs to be submitted, used for serial read of muxed port */
-+static int hso_mux_submit_intr_urb(struct hso_shared_int *shared_int,
-+ struct usb_device *usb, gfp_t gfp)
-+{
-+ int result;
-+
-+ usb_fill_int_urb(shared_int->shared_intr_urb, usb,
-+ usb_rcvintpipe(usb,
-+ shared_int->intr_endp->bEndpointAddress & 0x7F),
-+ shared_int->shared_intr_buf,
-+ 1,
-+ intr_callback, shared_int,
-+ shared_int->intr_endp->bInterval);
-+
-+ result = usb_submit_urb(shared_int->shared_intr_urb, gfp);
-+ if (result)
-+ dev_warn(&usb->dev, "%s failed mux_intr_urb %d\n", __func__,
-+ result);
-+
-+ return result;
-+}
-+
-+/* operations setup of the serial interface */
-+static const struct tty_operations hso_serial_ops = {
-+ .open = hso_serial_open,
-+ .close = hso_serial_close,
-+ .write = hso_serial_write,
-+ .write_room = hso_serial_write_room,
-+ .ioctl = hso_serial_ioctl,
-+ .set_termios = hso_serial_set_termios,
-+ .chars_in_buffer = hso_serial_chars_in_buffer,
-+ .tiocmget = hso_serial_tiocmget,
-+ .tiocmset = hso_serial_tiocmset,
-+ .get_icount = hso_get_count,
-+ .unthrottle = hso_unthrottle
-+};
-+
-+static struct usb_driver hso_driver = {
-+ .name = driver_name,
-+ .probe = hso_probe,
-+ .disconnect = hso_disconnect,
-+ .id_table = hso_ids,
-+ .suspend = hso_suspend,
-+ .resume = hso_resume,
-+ .reset_resume = hso_resume,
-+ .supports_autosuspend = 1,
-+ .disable_hub_initiated_lpm = 1,
-+};
-+
-+static int __init hso_init(void)
-+{
-+ int i;
-+ int result;
-+
-+ /* put it in the log */
-+ printk(KERN_INFO "hso: %s\n", version);
-+
-+ /* Initialise the serial table semaphore and table */
-+ spin_lock_init(&serial_table_lock);
-+ for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++)
-+ serial_table[i] = NULL;
-+
-+ /* allocate our driver using the proper amount of supported minors */
-+ tty_drv = alloc_tty_driver(HSO_SERIAL_TTY_MINORS);
-+ if (!tty_drv)
-+ return -ENOMEM;
-+
-+ /* fill in all needed values */
-+ tty_drv->driver_name = driver_name;
-+ tty_drv->name = tty_filename;
-+
-+ /* if major number is provided as parameter, use that one */
-+ if (tty_major)
-+ tty_drv->major = tty_major;
-+
-+ tty_drv->minor_start = 0;
-+ tty_drv->type = TTY_DRIVER_TYPE_SERIAL;
-+ tty_drv->subtype = SERIAL_TYPE_NORMAL;
-+ tty_drv->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
-+ tty_drv->init_termios = tty_std_termios;
-+ hso_init_termios(&tty_drv->init_termios);
-+ tty_set_operations(tty_drv, &hso_serial_ops);
-+
-+ /* register the tty driver */
-+ result = tty_register_driver(tty_drv);
-+ if (result) {
-+ printk(KERN_ERR "%s - tty_register_driver failed(%d)\n",
-+ __func__, result);
-+ goto err_free_tty;
-+ }
-+
-+ /* register this module as an usb driver */
-+ result = usb_register(&hso_driver);
-+ if (result) {
-+ printk(KERN_ERR "Could not register hso driver? error: %d\n",
-+ result);
-+ goto err_unreg_tty;
-+ }
-+
-+ /* done */
-+ return 0;
-+err_unreg_tty:
-+ tty_unregister_driver(tty_drv);
-+err_free_tty:
-+ put_tty_driver(tty_drv);
-+ return result;
-+}
-+
-+static void __exit hso_exit(void)
-+{
-+ printk(KERN_INFO "hso: unloaded\n");
-+
-+ tty_unregister_driver(tty_drv);
-+ put_tty_driver(tty_drv);
-+ /* deregister the usb driver */
-+ usb_deregister(&hso_driver);
-+}
-+
-+/* Module definitions */
-+module_init(hso_init);
-+module_exit(hso_exit);
-+
-+MODULE_AUTHOR(MOD_AUTHOR);
-+MODULE_DESCRIPTION(MOD_DESCRIPTION);
-+MODULE_LICENSE(MOD_LICENSE);
-+
-+/* change the debug level (eg: insmod hso.ko debug=0x04) */
-+MODULE_PARM_DESC(debug, "Level of debug [0x01 | 0x02 | 0x04 | 0x08 | 0x10]");
-+module_param(debug, int, S_IRUGO | S_IWUSR);
-+
-+/* set the major tty number (eg: insmod hso.ko tty_major=245) */
-+MODULE_PARM_DESC(tty_major, "Set the major tty number");
-+module_param(tty_major, int, S_IRUGO | S_IWUSR);
-+
-+/* disable network interface (eg: insmod hso.ko disable_net=1) */
-+MODULE_PARM_DESC(disable_net, "Disable the network interface");
-+module_param(disable_net, int, S_IRUGO | S_IWUSR);
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/huawei_cdc_ncm.c backports-3.18.1-1/drivers/net/usb/huawei_cdc_ncm.c
---- backports-3.18.1-1.org/drivers/net/usb/huawei_cdc_ncm.c 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/huawei_cdc_ncm.c 2014-12-16 18:39:45.000000000 +0100
-@@ -0,0 +1,221 @@
-+/* huawei_cdc_ncm.c - handles Huawei devices using the CDC NCM protocol as
-+ * transport layer.
-+ * Copyright (C) 2013 Enrico Mioso <mrkiko.rs(a)gmail.com>
-+ *
-+ *
-+ * ABSTRACT:
-+ * This driver handles devices resembling the CDC NCM standard, but
-+ * encapsulating another protocol inside it. An example are some Huawei 3G
-+ * devices, exposing an embedded AT channel where you can set up the NCM
-+ * connection.
-+ * This code has been heavily inspired by the cdc_mbim.c driver, which is
-+ * Copyright (c) 2012 Smith Micro Software, Inc.
-+ * Copyright (c) 2012 Bjørn Mork <bjorn(a)mork.no>
-+ *
-+ * 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 published by the Free Software Foundation.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/netdevice.h>
-+#include <linux/ethtool.h>
-+#include <linux/if_vlan.h>
-+#include <linux/ip.h>
-+#include <linux/mii.h>
-+#include <linux/usb.h>
-+#include <linux/usb/cdc.h>
-+#include <linux/usb/usbnet.h>
-+#include <linux/usb/cdc-wdm.h>
-+#include <linux/usb/cdc_ncm.h>
-+
-+/* Driver data */
-+struct huawei_cdc_ncm_state {
-+ struct cdc_ncm_ctx *ctx;
-+ atomic_t pmcount;
-+ struct usb_driver *subdriver;
-+ struct usb_interface *control;
-+ struct usb_interface *data;
-+};
-+
-+static int huawei_cdc_ncm_manage_power(struct usbnet *usbnet_dev, int on)
-+{
-+ struct huawei_cdc_ncm_state *drvstate = (void *)&usbnet_dev->data;
-+ int rv;
-+
-+ if ((on && atomic_add_return(1, &drvstate->pmcount) == 1) ||
-+ (!on && atomic_dec_and_test(&drvstate->pmcount))) {
-+ rv = usb_autopm_get_interface(usbnet_dev->intf);
-+ usbnet_dev->intf->needs_remote_wakeup = on;
-+ if (!rv)
-+ usb_autopm_put_interface(usbnet_dev->intf);
-+ }
-+ return 0;
-+}
-+
-+static int huawei_cdc_ncm_wdm_manage_power(struct usb_interface *intf,
-+ int status)
-+{
-+ struct usbnet *usbnet_dev = usb_get_intfdata(intf);
-+
-+ /* can be called while disconnecting */
-+ if (!usbnet_dev)
-+ return 0;
-+
-+ return huawei_cdc_ncm_manage_power(usbnet_dev, status);
-+}
-+
-+
-+static int huawei_cdc_ncm_bind(struct usbnet *usbnet_dev,
-+ struct usb_interface *intf)
-+{
-+ struct cdc_ncm_ctx *ctx;
-+ struct usb_driver *subdriver = ERR_PTR(-ENODEV);
-+ int ret = -ENODEV;
-+ struct huawei_cdc_ncm_state *drvstate = (void *)&usbnet_dev->data;
-+
-+ /* altsetting should always be 1 for NCM devices - so we hard-coded
-+ * it here
-+ */
-+ ret = cdc_ncm_bind_common(usbnet_dev, intf, 1);
-+ if (ret)
-+ goto err;
-+
-+ ctx = drvstate->ctx;
-+
-+ if (usbnet_dev->status)
-+ /* The wMaxCommand buffer must be big enough to hold
-+ * any message from the modem. Experience has shown
-+ * that some replies are more than 256 bytes long
-+ */
-+ subdriver = usb_cdc_wdm_register(ctx->control,
-+ &usbnet_dev->status->desc,
-+ 1024, /* wMaxCommand */
-+ huawei_cdc_ncm_wdm_manage_power);
-+ if (IS_ERR(subdriver)) {
-+ ret = PTR_ERR(subdriver);
-+ cdc_ncm_unbind(usbnet_dev, intf);
-+ goto err;
-+ }
-+
-+ /* Prevent usbnet from using the status descriptor */
-+ usbnet_dev->status = NULL;
-+
-+ drvstate->subdriver = subdriver;
-+
-+err:
-+ return ret;
-+}
-+
-+static void huawei_cdc_ncm_unbind(struct usbnet *usbnet_dev,
-+ struct usb_interface *intf)
-+{
-+ struct huawei_cdc_ncm_state *drvstate = (void *)&usbnet_dev->data;
-+ struct cdc_ncm_ctx *ctx = drvstate->ctx;
-+
-+ if (drvstate->subdriver && drvstate->subdriver->disconnect)
-+ drvstate->subdriver->disconnect(ctx->control);
-+ drvstate->subdriver = NULL;
-+
-+ cdc_ncm_unbind(usbnet_dev, intf);
-+}
-+
-+static int huawei_cdc_ncm_suspend(struct usb_interface *intf,
-+ pm_message_t message)
-+{
-+ int ret = 0;
-+ struct usbnet *usbnet_dev = usb_get_intfdata(intf);
-+ struct huawei_cdc_ncm_state *drvstate = (void *)&usbnet_dev->data;
-+ struct cdc_ncm_ctx *ctx = drvstate->ctx;
-+
-+ if (ctx == NULL) {
-+ ret = -ENODEV;
-+ goto error;
-+ }
-+
-+ ret = usbnet_suspend(intf, message);
-+ if (ret < 0)
-+ goto error;
-+
-+ if (intf == ctx->control &&
-+ drvstate->subdriver &&
-+ drvstate->subdriver->suspend)
-+ ret = drvstate->subdriver->suspend(intf, message);
-+ if (ret < 0)
-+ usbnet_resume(intf);
-+
-+error:
-+ return ret;
-+}
-+
-+static int huawei_cdc_ncm_resume(struct usb_interface *intf)
-+{
-+ int ret = 0;
-+ struct usbnet *usbnet_dev = usb_get_intfdata(intf);
-+ struct huawei_cdc_ncm_state *drvstate = (void *)&usbnet_dev->data;
-+ bool callsub;
-+ struct cdc_ncm_ctx *ctx = drvstate->ctx;
-+
-+ /* should we call subdriver's resume function? */
-+ callsub =
-+ (intf == ctx->control &&
-+ drvstate->subdriver &&
-+ drvstate->subdriver->resume);
-+
-+ if (callsub)
-+ ret = drvstate->subdriver->resume(intf);
-+ if (ret < 0)
-+ goto err;
-+ ret = usbnet_resume(intf);
-+ if (ret < 0 && callsub)
-+ drvstate->subdriver->suspend(intf, PMSG_SUSPEND);
-+err:
-+ return ret;
-+}
-+
-+static const struct driver_info huawei_cdc_ncm_info = {
-+ .description = "Huawei CDC NCM device",
-+ .flags = FLAG_NO_SETINT | FLAG_MULTI_PACKET | FLAG_WWAN,
-+ .bind = huawei_cdc_ncm_bind,
-+ .unbind = huawei_cdc_ncm_unbind,
-+ .manage_power = huawei_cdc_ncm_manage_power,
-+ .rx_fixup = cdc_ncm_rx_fixup,
-+ .tx_fixup = cdc_ncm_tx_fixup,
-+};
-+
-+static const struct usb_device_id huawei_cdc_ncm_devs[] = {
-+ /* Huawei NCM devices disguised as vendor specific */
-+ { USB_VENDOR_AND_INTERFACE_INFO(0x12d1, 0xff, 0x02, 0x16),
-+ .driver_info = (unsigned long)&huawei_cdc_ncm_info,
-+ },
-+ { USB_VENDOR_AND_INTERFACE_INFO(0x12d1, 0xff, 0x02, 0x46),
-+ .driver_info = (unsigned long)&huawei_cdc_ncm_info,
-+ },
-+ { USB_VENDOR_AND_INTERFACE_INFO(0x12d1, 0xff, 0x02, 0x76),
-+ .driver_info = (unsigned long)&huawei_cdc_ncm_info,
-+ },
-+ { USB_VENDOR_AND_INTERFACE_INFO(0x12d1, 0xff, 0x03, 0x16),
-+ .driver_info = (unsigned long)&huawei_cdc_ncm_info,
-+ },
-+
-+ /* Terminating entry */
-+ {
-+ },
-+};
-+MODULE_DEVICE_TABLE(usb, huawei_cdc_ncm_devs);
-+
-+static struct usb_driver huawei_cdc_ncm_driver = {
-+ .name = "huawei_cdc_ncm",
-+ .id_table = huawei_cdc_ncm_devs,
-+ .probe = usbnet_probe,
-+ .disconnect = usbnet_disconnect,
-+ .suspend = huawei_cdc_ncm_suspend,
-+ .resume = huawei_cdc_ncm_resume,
-+ .reset_resume = huawei_cdc_ncm_resume,
-+ .supports_autosuspend = 1,
-+ .disable_hub_initiated_lpm = 1,
-+};
-+module_usb_driver(huawei_cdc_ncm_driver);
-+MODULE_AUTHOR("Enrico Mioso <mrkiko.rs(a)gmail.com>");
-+MODULE_DESCRIPTION("USB CDC NCM host driver with encapsulated protocol support");
-+MODULE_LICENSE("GPL");
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/int51x1.c backports-3.18.1-1/drivers/net/usb/int51x1.c
---- backports-3.18.1-1.org/drivers/net/usb/int51x1.c 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/int51x1.c 2014-12-16 18:39:45.000000000 +0100
-@@ -0,0 +1,199 @@
-+/*
-+ * Copyright (c) 2009 Peter Holik
-+ *
-+ * Intellon usb PLC (Powerline Communications) usb net driver
-+ *
-+ * http://www.tandel.be/downloads/INT51X1_Datasheet.pdf
-+ *
-+ * Based on the work of Jan 'RedBully' Seiffert
-+ */
-+
-+/*
-+ * 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, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/ctype.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/ethtool.h>
-+#include <linux/slab.h>
-+#include <linux/mii.h>
-+#include <linux/usb.h>
-+#include <linux/usb/usbnet.h>
-+
-+#define INT51X1_VENDOR_ID 0x09e1
-+#define INT51X1_PRODUCT_ID 0x5121
-+
-+#define INT51X1_HEADER_SIZE 2 /* 2 byte header */
-+
-+#define PACKET_TYPE_PROMISCUOUS (1 << 0)
-+#define PACKET_TYPE_ALL_MULTICAST (1 << 1) /* no filter */
-+#define PACKET_TYPE_DIRECTED (1 << 2)
-+#define PACKET_TYPE_BROADCAST (1 << 3)
-+#define PACKET_TYPE_MULTICAST (1 << 4) /* filtered */
-+
-+#define SET_ETHERNET_PACKET_FILTER 0x43
-+
-+static int int51x1_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
-+{
-+ int len;
-+
-+ if (!(pskb_may_pull(skb, INT51X1_HEADER_SIZE))) {
-+ netdev_err(dev->net, "unexpected tiny rx frame\n");
-+ return 0;
-+ }
-+
-+ len = le16_to_cpu(*(__le16 *)&skb->data[skb->len - 2]);
-+
-+ skb_trim(skb, len);
-+
-+ return 1;
-+}
-+
-+static struct sk_buff *int51x1_tx_fixup(struct usbnet *dev,
-+ struct sk_buff *skb, gfp_t flags)
-+{
-+ int pack_len = skb->len;
-+ int pack_with_header_len = pack_len + INT51X1_HEADER_SIZE;
-+ int headroom = skb_headroom(skb);
-+ int tailroom = skb_tailroom(skb);
-+ int need_tail = 0;
-+ __le16 *len;
-+
-+ /* if packet and our header is smaler than 64 pad to 64 (+ ZLP) */
-+ if ((pack_with_header_len) < dev->maxpacket)
-+ need_tail = dev->maxpacket - pack_with_header_len + 1;
-+ /*
-+ * usbnet would send a ZLP if packetlength mod urbsize == 0 for us,
-+ * but we need to know ourself, because this would add to the length
-+ * we send down to the device...
-+ */
-+ else if (!(pack_with_header_len % dev->maxpacket))
-+ need_tail = 1;
-+
-+ if (!skb_cloned(skb) &&
-+ (headroom + tailroom >= need_tail + INT51X1_HEADER_SIZE)) {
-+ if (headroom < INT51X1_HEADER_SIZE || tailroom < need_tail) {
-+ skb->data = memmove(skb->head + INT51X1_HEADER_SIZE,
-+ skb->data, skb->len);
-+ skb_set_tail_pointer(skb, skb->len);
-+ }
-+ } else {
-+ struct sk_buff *skb2;
-+
-+ skb2 = skb_copy_expand(skb,
-+ INT51X1_HEADER_SIZE,
-+ need_tail,
-+ flags);
-+ dev_kfree_skb_any(skb);
-+ if (!skb2)
-+ return NULL;
-+ skb = skb2;
-+ }
-+
-+ pack_len += need_tail;
-+ pack_len &= 0x07ff;
-+
-+ len = (__le16 *) __skb_push(skb, INT51X1_HEADER_SIZE);
-+ *len = cpu_to_le16(pack_len);
-+
-+ if(need_tail)
-+ memset(__skb_put(skb, need_tail), 0, need_tail);
-+
-+ return skb;
-+}
-+
-+static void int51x1_set_multicast(struct net_device *netdev)
-+{
-+ struct usbnet *dev = netdev_priv(netdev);
-+ u16 filter = PACKET_TYPE_DIRECTED | PACKET_TYPE_BROADCAST;
-+
-+ if (netdev->flags & IFF_PROMISC) {
-+ /* do not expect to see traffic of other PLCs */
-+ filter |= PACKET_TYPE_PROMISCUOUS;
-+ netdev_info(dev->net, "promiscuous mode enabled\n");
-+ } else if (!netdev_mc_empty(netdev) ||
-+ (netdev->flags & IFF_ALLMULTI)) {
-+ filter |= PACKET_TYPE_ALL_MULTICAST;
-+ netdev_dbg(dev->net, "receive all multicast enabled\n");
-+ } else {
-+ /* ~PROMISCUOUS, ~MULTICAST */
-+ netdev_dbg(dev->net, "receive own packets only\n");
-+ }
-+
-+ usbnet_write_cmd_async(dev, SET_ETHERNET_PACKET_FILTER,
-+ USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
-+ filter, 0, NULL, 0);
-+}
-+
-+static const struct net_device_ops int51x1_netdev_ops = {
-+ .ndo_open = usbnet_open,
-+ .ndo_stop = usbnet_stop,
-+ .ndo_start_xmit = usbnet_start_xmit,
-+ .ndo_tx_timeout = usbnet_tx_timeout,
-+ .ndo_change_mtu = usbnet_change_mtu,
-+ .ndo_set_mac_address = eth_mac_addr,
-+ .ndo_validate_addr = eth_validate_addr,
-+ .ndo_set_rx_mode = int51x1_set_multicast,
-+};
-+
-+static int int51x1_bind(struct usbnet *dev, struct usb_interface *intf)
-+{
-+ int status = usbnet_get_ethernet_addr(dev, 3);
-+
-+ if (status)
-+ return status;
-+
-+ dev->net->hard_header_len += INT51X1_HEADER_SIZE;
-+ dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len;
-+ dev->net->netdev_ops = &int51x1_netdev_ops;
-+
-+ return usbnet_get_endpoints(dev, intf);
-+}
-+
-+static const struct driver_info int51x1_info = {
-+ .description = "Intellon usb powerline adapter",
-+ .bind = int51x1_bind,
-+ .rx_fixup = int51x1_rx_fixup,
-+ .tx_fixup = int51x1_tx_fixup,
-+ .in = 1,
-+ .out = 2,
-+ .flags = FLAG_ETHER,
-+};
-+
-+static const struct usb_device_id products[] = {
-+ {
-+ USB_DEVICE(INT51X1_VENDOR_ID, INT51X1_PRODUCT_ID),
-+ .driver_info = (unsigned long) &int51x1_info,
-+ },
-+ {},
-+};
-+MODULE_DEVICE_TABLE(usb, products);
-+
-+static struct usb_driver int51x1_driver = {
-+ .name = "int51x1",
-+ .id_table = products,
-+ .probe = usbnet_probe,
-+ .disconnect = usbnet_disconnect,
-+ .suspend = usbnet_suspend,
-+ .resume = usbnet_resume,
-+ .disable_hub_initiated_lpm = 1,
-+};
-+
-+module_usb_driver(int51x1_driver);
-+
-+MODULE_AUTHOR("Peter Holik");
-+MODULE_DESCRIPTION("Intellon usb powerline adapter");
-+MODULE_LICENSE("GPL");
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/ipheth.c backports-3.18.1-1/drivers/net/usb/ipheth.c
---- backports-3.18.1-1.org/drivers/net/usb/ipheth.c 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/ipheth.c 2014-12-16 18:39:45.000000000 +0100
-@@ -0,0 +1,588 @@
-+/*
-+ * ipheth.c - Apple iPhone USB Ethernet driver
-+ *
-+ * Copyright (c) 2009 Diego Giagio <diego(a)giagio.com>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. Neither the name of GIAGIO.COM nor the names of its contributors
-+ * may be used to endorse or promote products derived from this software
-+ * without specific prior written permission.
-+ *
-+ * Alternatively, provided that this notice is retained in full, this
-+ * software may be distributed under the terms of the GNU General
-+ * Public License ("GPL") version 2, in which case the provisions of the
-+ * GPL apply INSTEAD OF those given above.
-+ *
-+ * The provided data structures and external interfaces from this code
-+ * are not restricted to be used by modules with a GPL compatible license.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ *
-+ *
-+ * Attention: iPhone device must be paired, otherwise it won't respond to our
-+ * driver. For more info: http://giagio.com/wiki/moin.cgi/iPhoneEthernetDriver
-+ *
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/errno.h>
-+#include <linux/slab.h>
-+#include <linux/module.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/ethtool.h>
-+#include <linux/usb.h>
-+#include <linux/workqueue.h>
-+
-+#define USB_VENDOR_APPLE 0x05ac
-+#define USB_PRODUCT_IPHONE 0x1290
-+#define USB_PRODUCT_IPHONE_3G 0x1292
-+#define USB_PRODUCT_IPHONE_3GS 0x1294
-+#define USB_PRODUCT_IPHONE_4 0x1297
-+#define USB_PRODUCT_IPAD 0x129a
-+#define USB_PRODUCT_IPAD_2 0x12a2
-+#define USB_PRODUCT_IPAD_3 0x12a6
-+#define USB_PRODUCT_IPAD_MINI 0x12ab
-+#define USB_PRODUCT_IPHONE_4_VZW 0x129c
-+#define USB_PRODUCT_IPHONE_4S 0x12a0
-+#define USB_PRODUCT_IPHONE_5 0x12a8
-+
-+#define IPHETH_USBINTF_CLASS 255
-+#define IPHETH_USBINTF_SUBCLASS 253
-+#define IPHETH_USBINTF_PROTO 1
-+
-+#define IPHETH_BUF_SIZE 1516
-+#define IPHETH_IP_ALIGN 2 /* padding at front of URB */
-+#define IPHETH_TX_TIMEOUT (5 * HZ)
-+
-+#define IPHETH_INTFNUM 2
-+#define IPHETH_ALT_INTFNUM 1
-+
-+#define IPHETH_CTRL_ENDP 0x00
-+#define IPHETH_CTRL_BUF_SIZE 0x40
-+#define IPHETH_CTRL_TIMEOUT (5 * HZ)
-+
-+#define IPHETH_CMD_GET_MACADDR 0x00
-+#define IPHETH_CMD_CARRIER_CHECK 0x45
-+
-+#define IPHETH_CARRIER_CHECK_TIMEOUT round_jiffies_relative(1 * HZ)
-+#define IPHETH_CARRIER_ON 0x04
-+
-+static struct usb_device_id ipheth_table[] = {
-+ { USB_DEVICE_AND_INTERFACE_INFO(
-+ USB_VENDOR_APPLE, USB_PRODUCT_IPHONE,
-+ IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
-+ IPHETH_USBINTF_PROTO) },
-+ { USB_DEVICE_AND_INTERFACE_INFO(
-+ USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_3G,
-+ IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
-+ IPHETH_USBINTF_PROTO) },
-+ { USB_DEVICE_AND_INTERFACE_INFO(
-+ USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_3GS,
-+ IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
-+ IPHETH_USBINTF_PROTO) },
-+ { USB_DEVICE_AND_INTERFACE_INFO(
-+ USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_4,
-+ IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
-+ IPHETH_USBINTF_PROTO) },
-+ { USB_DEVICE_AND_INTERFACE_INFO(
-+ USB_VENDOR_APPLE, USB_PRODUCT_IPAD,
-+ IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
-+ IPHETH_USBINTF_PROTO) },
-+ { USB_DEVICE_AND_INTERFACE_INFO(
-+ USB_VENDOR_APPLE, USB_PRODUCT_IPAD_2,
-+ IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
-+ IPHETH_USBINTF_PROTO) },
-+ { USB_DEVICE_AND_INTERFACE_INFO(
-+ USB_VENDOR_APPLE, USB_PRODUCT_IPAD_3,
-+ IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
-+ IPHETH_USBINTF_PROTO) },
-+ { USB_DEVICE_AND_INTERFACE_INFO(
-+ USB_VENDOR_APPLE, USB_PRODUCT_IPAD_MINI,
-+ IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
-+ IPHETH_USBINTF_PROTO) },
-+ { USB_DEVICE_AND_INTERFACE_INFO(
-+ USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_4_VZW,
-+ IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
-+ IPHETH_USBINTF_PROTO) },
-+ { USB_DEVICE_AND_INTERFACE_INFO(
-+ USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_4S,
-+ IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
-+ IPHETH_USBINTF_PROTO) },
-+ { USB_DEVICE_AND_INTERFACE_INFO(
-+ USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_5,
-+ IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
-+ IPHETH_USBINTF_PROTO) },
-+ { }
-+};
-+MODULE_DEVICE_TABLE(usb, ipheth_table);
-+
-+struct ipheth_device {
-+ struct usb_device *udev;
-+ struct usb_interface *intf;
-+ struct net_device *net;
-+ struct sk_buff *tx_skb;
-+ struct urb *tx_urb;
-+ struct urb *rx_urb;
-+ unsigned char *tx_buf;
-+ unsigned char *rx_buf;
-+ unsigned char *ctrl_buf;
-+ u8 bulk_in;
-+ u8 bulk_out;
-+ struct delayed_work carrier_work;
-+};
-+
-+static int ipheth_rx_submit(struct ipheth_device *dev, gfp_t mem_flags);
-+
-+static int ipheth_alloc_urbs(struct ipheth_device *iphone)
-+{
-+ struct urb *tx_urb = NULL;
-+ struct urb *rx_urb = NULL;
-+ u8 *tx_buf = NULL;
-+ u8 *rx_buf = NULL;
-+
-+ tx_urb = usb_alloc_urb(0, GFP_KERNEL);
-+ if (tx_urb == NULL)
-+ goto error_nomem;
-+
-+ rx_urb = usb_alloc_urb(0, GFP_KERNEL);
-+ if (rx_urb == NULL)
-+ goto free_tx_urb;
-+
-+ tx_buf = usb_alloc_coherent(iphone->udev, IPHETH_BUF_SIZE,
-+ GFP_KERNEL, &tx_urb->transfer_dma);
-+ if (tx_buf == NULL)
-+ goto free_rx_urb;
-+
-+ rx_buf = usb_alloc_coherent(iphone->udev, IPHETH_BUF_SIZE,
-+ GFP_KERNEL, &rx_urb->transfer_dma);
-+ if (rx_buf == NULL)
-+ goto free_tx_buf;
-+
-+
-+ iphone->tx_urb = tx_urb;
-+ iphone->rx_urb = rx_urb;
-+ iphone->tx_buf = tx_buf;
-+ iphone->rx_buf = rx_buf;
-+ return 0;
-+
-+free_tx_buf:
-+ usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE, tx_buf,
-+ tx_urb->transfer_dma);
-+free_rx_urb:
-+ usb_free_urb(rx_urb);
-+free_tx_urb:
-+ usb_free_urb(tx_urb);
-+error_nomem:
-+ return -ENOMEM;
-+}
-+
-+static void ipheth_free_urbs(struct ipheth_device *iphone)
-+{
-+ usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE, iphone->rx_buf,
-+ iphone->rx_urb->transfer_dma);
-+ usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE, iphone->tx_buf,
-+ iphone->tx_urb->transfer_dma);
-+ usb_free_urb(iphone->rx_urb);
-+ usb_free_urb(iphone->tx_urb);
-+}
-+
-+static void ipheth_kill_urbs(struct ipheth_device *dev)
-+{
-+ usb_kill_urb(dev->tx_urb);
-+ usb_kill_urb(dev->rx_urb);
-+}
-+
-+static void ipheth_rcvbulk_callback(struct urb *urb)
-+{
-+ struct ipheth_device *dev;
-+ struct sk_buff *skb;
-+ int status;
-+ char *buf;
-+ int len;
-+
-+ dev = urb->context;
-+ if (dev == NULL)
-+ return;
-+
-+ status = urb->status;
-+ switch (status) {
-+ case -ENOENT:
-+ case -ECONNRESET:
-+ case -ESHUTDOWN:
-+ return;
-+ case 0:
-+ break;
-+ default:
-+ dev_err(&dev->intf->dev, "%s: urb status: %d\n",
-+ __func__, status);
-+ return;
-+ }
-+
-+ if (urb->actual_length <= IPHETH_IP_ALIGN) {
-+ dev->net->stats.rx_length_errors++;
-+ return;
-+ }
-+ len = urb->actual_length - IPHETH_IP_ALIGN;
-+ buf = urb->transfer_buffer + IPHETH_IP_ALIGN;
-+
-+ skb = dev_alloc_skb(len);
-+ if (!skb) {
-+ dev_err(&dev->intf->dev, "%s: dev_alloc_skb: -ENOMEM\n",
-+ __func__);
-+ dev->net->stats.rx_dropped++;
-+ return;
-+ }
-+
-+ memcpy(skb_put(skb, len), buf, len);
-+ skb->dev = dev->net;
-+ skb->protocol = eth_type_trans(skb, dev->net);
-+
-+ dev->net->stats.rx_packets++;
-+ dev->net->stats.rx_bytes += len;
-+
-+ netif_rx(skb);
-+ ipheth_rx_submit(dev, GFP_ATOMIC);
-+}
-+
-+static void ipheth_sndbulk_callback(struct urb *urb)
-+{
-+ struct ipheth_device *dev;
-+ int status = urb->status;
-+
-+ dev = urb->context;
-+ if (dev == NULL)
-+ return;
-+
-+ if (status != 0 &&
-+ status != -ENOENT &&
-+ status != -ECONNRESET &&
-+ status != -ESHUTDOWN)
-+ dev_err(&dev->intf->dev, "%s: urb status: %d\n",
-+ __func__, status);
-+
-+ dev_kfree_skb_irq(dev->tx_skb);
-+ netif_wake_queue(dev->net);
-+}
-+
-+static int ipheth_carrier_set(struct ipheth_device *dev)
-+{
-+ struct usb_device *udev = dev->udev;
-+ int retval;
-+
-+ retval = usb_control_msg(udev,
-+ usb_rcvctrlpipe(udev, IPHETH_CTRL_ENDP),
-+ IPHETH_CMD_CARRIER_CHECK, /* request */
-+ 0xc0, /* request type */
-+ 0x00, /* value */
-+ 0x02, /* index */
-+ dev->ctrl_buf, IPHETH_CTRL_BUF_SIZE,
-+ IPHETH_CTRL_TIMEOUT);
-+ if (retval < 0) {
-+ dev_err(&dev->intf->dev, "%s: usb_control_msg: %d\n",
-+ __func__, retval);
-+ return retval;
-+ }
-+
-+ if (dev->ctrl_buf[0] == IPHETH_CARRIER_ON)
-+ netif_carrier_on(dev->net);
-+ else
-+ netif_carrier_off(dev->net);
-+
-+ return 0;
-+}
-+
-+static void ipheth_carrier_check_work(struct work_struct *work)
-+{
-+ struct ipheth_device *dev = container_of(work, struct ipheth_device,
-+ carrier_work.work);
-+
-+ ipheth_carrier_set(dev);
-+ schedule_delayed_work(&dev->carrier_work, IPHETH_CARRIER_CHECK_TIMEOUT);
-+}
-+
-+static int ipheth_get_macaddr(struct ipheth_device *dev)
-+{
-+ struct usb_device *udev = dev->udev;
-+ struct net_device *net = dev->net;
-+ int retval;
-+
-+ retval = usb_control_msg(udev,
-+ usb_rcvctrlpipe(udev, IPHETH_CTRL_ENDP),
-+ IPHETH_CMD_GET_MACADDR, /* request */
-+ 0xc0, /* request type */
-+ 0x00, /* value */
-+ 0x02, /* index */
-+ dev->ctrl_buf,
-+ IPHETH_CTRL_BUF_SIZE,
-+ IPHETH_CTRL_TIMEOUT);
-+ if (retval < 0) {
-+ dev_err(&dev->intf->dev, "%s: usb_control_msg: %d\n",
-+ __func__, retval);
-+ } else if (retval < ETH_ALEN) {
-+ dev_err(&dev->intf->dev,
-+ "%s: usb_control_msg: short packet: %d bytes\n",
-+ __func__, retval);
-+ retval = -EINVAL;
-+ } else {
-+ memcpy(net->dev_addr, dev->ctrl_buf, ETH_ALEN);
-+ retval = 0;
-+ }
-+
-+ return retval;
-+}
-+
-+static int ipheth_rx_submit(struct ipheth_device *dev, gfp_t mem_flags)
-+{
-+ struct usb_device *udev = dev->udev;
-+ int retval;
-+
-+ usb_fill_bulk_urb(dev->rx_urb, udev,
-+ usb_rcvbulkpipe(udev, dev->bulk_in),
-+ dev->rx_buf, IPHETH_BUF_SIZE,
-+ ipheth_rcvbulk_callback,
-+ dev);
-+ dev->rx_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
-+
-+ retval = usb_submit_urb(dev->rx_urb, mem_flags);
-+ if (retval)
-+ dev_err(&dev->intf->dev, "%s: usb_submit_urb: %d\n",
-+ __func__, retval);
-+ return retval;
-+}
-+
-+static int ipheth_open(struct net_device *net)
-+{
-+ struct ipheth_device *dev = netdev_priv(net);
-+ struct usb_device *udev = dev->udev;
-+ int retval = 0;
-+
-+ usb_set_interface(udev, IPHETH_INTFNUM, IPHETH_ALT_INTFNUM);
-+
-+ retval = ipheth_carrier_set(dev);
-+ if (retval)
-+ return retval;
-+
-+ retval = ipheth_rx_submit(dev, GFP_KERNEL);
-+ if (retval)
-+ return retval;
-+
-+ schedule_delayed_work(&dev->carrier_work, IPHETH_CARRIER_CHECK_TIMEOUT);
-+ netif_start_queue(net);
-+ return retval;
-+}
-+
-+static int ipheth_close(struct net_device *net)
-+{
-+ struct ipheth_device *dev = netdev_priv(net);
-+
-+ cancel_delayed_work_sync(&dev->carrier_work);
-+ netif_stop_queue(net);
-+ return 0;
-+}
-+
-+static int ipheth_tx(struct sk_buff *skb, struct net_device *net)
-+{
-+ struct ipheth_device *dev = netdev_priv(net);
-+ struct usb_device *udev = dev->udev;
-+ int retval;
-+
-+ /* Paranoid */
-+ if (skb->len > IPHETH_BUF_SIZE) {
-+ WARN(1, "%s: skb too large: %d bytes\n", __func__, skb->len);
-+ dev->net->stats.tx_dropped++;
-+ dev_kfree_skb_irq(skb);
-+ return NETDEV_TX_OK;
-+ }
-+
-+ memcpy(dev->tx_buf, skb->data, skb->len);
-+ if (skb->len < IPHETH_BUF_SIZE)
-+ memset(dev->tx_buf + skb->len, 0, IPHETH_BUF_SIZE - skb->len);
-+
-+ usb_fill_bulk_urb(dev->tx_urb, udev,
-+ usb_sndbulkpipe(udev, dev->bulk_out),
-+ dev->tx_buf, IPHETH_BUF_SIZE,
-+ ipheth_sndbulk_callback,
-+ dev);
-+ dev->tx_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
-+
-+ retval = usb_submit_urb(dev->tx_urb, GFP_ATOMIC);
-+ if (retval) {
-+ dev_err(&dev->intf->dev, "%s: usb_submit_urb: %d\n",
-+ __func__, retval);
-+ dev->net->stats.tx_errors++;
-+ dev_kfree_skb_irq(skb);
-+ } else {
-+ dev->tx_skb = skb;
-+
-+ dev->net->stats.tx_packets++;
-+ dev->net->stats.tx_bytes += skb->len;
-+ netif_stop_queue(net);
-+ }
-+
-+ return NETDEV_TX_OK;
-+}
-+
-+static void ipheth_tx_timeout(struct net_device *net)
-+{
-+ struct ipheth_device *dev = netdev_priv(net);
-+
-+ dev_err(&dev->intf->dev, "%s: TX timeout\n", __func__);
-+ dev->net->stats.tx_errors++;
-+ usb_unlink_urb(dev->tx_urb);
-+}
-+
-+static u32 ipheth_ethtool_op_get_link(struct net_device *net)
-+{
-+ struct ipheth_device *dev = netdev_priv(net);
-+ return netif_carrier_ok(dev->net);
-+}
-+
-+static const struct ethtool_ops ops = {
-+ .get_link = ipheth_ethtool_op_get_link
-+};
-+
-+static const struct net_device_ops ipheth_netdev_ops = {
-+ .ndo_open = ipheth_open,
-+ .ndo_stop = ipheth_close,
-+ .ndo_start_xmit = ipheth_tx,
-+ .ndo_tx_timeout = ipheth_tx_timeout,
-+};
-+
-+static int ipheth_probe(struct usb_interface *intf,
-+ const struct usb_device_id *id)
-+{
-+ struct usb_device *udev = interface_to_usbdev(intf);
-+ struct usb_host_interface *hintf;
-+ struct usb_endpoint_descriptor *endp;
-+ struct ipheth_device *dev;
-+ struct net_device *netdev;
-+ int i;
-+ int retval;
-+
-+ netdev = alloc_etherdev(sizeof(struct ipheth_device));
-+ if (!netdev)
-+ return -ENOMEM;
-+
-+ netdev->netdev_ops = &ipheth_netdev_ops;
-+ netdev->watchdog_timeo = IPHETH_TX_TIMEOUT;
-+ strcpy(netdev->name, "eth%d");
-+
-+ dev = netdev_priv(netdev);
-+ dev->udev = udev;
-+ dev->net = netdev;
-+ dev->intf = intf;
-+
-+ /* Set up endpoints */
-+ hintf = usb_altnum_to_altsetting(intf, IPHETH_ALT_INTFNUM);
-+ if (hintf == NULL) {
-+ retval = -ENODEV;
-+ dev_err(&intf->dev, "Unable to find alternate settings interface\n");
-+ goto err_endpoints;
-+ }
-+
-+ for (i = 0; i < hintf->desc.bNumEndpoints; i++) {
-+ endp = &hintf->endpoint[i].desc;
-+ if (usb_endpoint_is_bulk_in(endp))
-+ dev->bulk_in = endp->bEndpointAddress;
-+ else if (usb_endpoint_is_bulk_out(endp))
-+ dev->bulk_out = endp->bEndpointAddress;
-+ }
-+ if (!(dev->bulk_in && dev->bulk_out)) {
-+ retval = -ENODEV;
-+ dev_err(&intf->dev, "Unable to find endpoints\n");
-+ goto err_endpoints;
-+ }
-+
-+ dev->ctrl_buf = kmalloc(IPHETH_CTRL_BUF_SIZE, GFP_KERNEL);
-+ if (dev->ctrl_buf == NULL) {
-+ retval = -ENOMEM;
-+ goto err_alloc_ctrl_buf;
-+ }
-+
-+ retval = ipheth_get_macaddr(dev);
-+ if (retval)
-+ goto err_get_macaddr;
-+
-+ INIT_DELAYED_WORK(&dev->carrier_work, ipheth_carrier_check_work);
-+
-+ retval = ipheth_alloc_urbs(dev);
-+ if (retval) {
-+ dev_err(&intf->dev, "error allocating urbs: %d\n", retval);
-+ goto err_alloc_urbs;
-+ }
-+
-+ usb_set_intfdata(intf, dev);
-+
-+ SET_NETDEV_DEV(netdev, &intf->dev);
-+ netdev->ethtool_ops = &ops;
-+
-+ retval = register_netdev(netdev);
-+ if (retval) {
-+ dev_err(&intf->dev, "error registering netdev: %d\n", retval);
-+ retval = -EIO;
-+ goto err_register_netdev;
-+ }
-+
-+ dev_info(&intf->dev, "Apple iPhone USB Ethernet device attached\n");
-+ return 0;
-+
-+err_register_netdev:
-+ ipheth_free_urbs(dev);
-+err_alloc_urbs:
-+err_get_macaddr:
-+err_alloc_ctrl_buf:
-+ kfree(dev->ctrl_buf);
-+err_endpoints:
-+ free_netdev(netdev);
-+ return retval;
-+}
-+
-+static void ipheth_disconnect(struct usb_interface *intf)
-+{
-+ struct ipheth_device *dev;
-+
-+ dev = usb_get_intfdata(intf);
-+ if (dev != NULL) {
-+ unregister_netdev(dev->net);
-+ ipheth_kill_urbs(dev);
-+ ipheth_free_urbs(dev);
-+ kfree(dev->ctrl_buf);
-+ free_netdev(dev->net);
-+ }
-+ usb_set_intfdata(intf, NULL);
-+ dev_info(&intf->dev, "Apple iPhone USB Ethernet now disconnected\n");
-+}
-+
-+static struct usb_driver ipheth_driver = {
-+ .name = "ipheth",
-+ .probe = ipheth_probe,
-+ .disconnect = ipheth_disconnect,
-+ .id_table = ipheth_table,
-+ .disable_hub_initiated_lpm = 1,
-+};
-+
-+module_usb_driver(ipheth_driver);
-+
-+MODULE_AUTHOR("Diego Giagio <diego(a)giagio.com>");
-+MODULE_DESCRIPTION("Apple iPhone USB Ethernet driver");
-+MODULE_LICENSE("Dual BSD/GPL");
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/kalmia.c backports-3.18.1-1/drivers/net/usb/kalmia.c
---- backports-3.18.1-1.org/drivers/net/usb/kalmia.c 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/kalmia.c 2014-12-16 18:39:45.000000000 +0100
-@@ -0,0 +1,366 @@
-+/*
-+ * USB network interface driver for Samsung Kalmia based LTE USB modem like the
-+ * Samsung GT-B3730 and GT-B3710.
-+ *
-+ * Copyright (C) 2011 Marius Bjoernstad Kotsbak <marius(a)kotsbak.com>
-+ *
-+ * Sponsored by Quicklink Video Distribution Services Ltd.
-+ *
-+ * Based on the cdc_eem module.
-+ *
-+ * 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.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/ctype.h>
-+#include <linux/ethtool.h>
-+#include <linux/workqueue.h>
-+#include <linux/mii.h>
-+#include <linux/usb.h>
-+#include <linux/crc32.h>
-+#include <linux/usb/cdc.h>
-+#include <linux/usb/usbnet.h>
-+#include <linux/gfp.h>
-+
-+/*
-+ * The Samsung Kalmia based LTE USB modems have a CDC ACM port for modem control
-+ * handled by the "option" module and an ethernet data port handled by this
-+ * module.
-+ *
-+ * The stick must first be switched into modem mode by usb_modeswitch
-+ * or similar tool. Then the modem gets sent two initialization packets by
-+ * this module, which gives the MAC address of the device. User space can then
-+ * connect the modem using AT commands through the ACM port and then use
-+ * DHCP on the network interface exposed by this module. Network packets are
-+ * sent to and from the modem in a proprietary format discovered after watching
-+ * the behavior of the windows driver for the modem.
-+ *
-+ * More information about the use of the modem is available in usb_modeswitch
-+ * forum and the project page:
-+ *
-+ * http://www.draisberghof.de/usb_modeswitch/bb/viewtopic.php?t=465
-+ * https://github.com/mkotsbak/Samsung-GT-B3730-linux-driver
-+ */
-+
-+/* #define DEBUG */
-+/* #define VERBOSE */
-+
-+#define KALMIA_HEADER_LENGTH 6
-+#define KALMIA_ALIGN_SIZE 4
-+#define KALMIA_USB_TIMEOUT 10000
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static int
-+kalmia_send_init_packet(struct usbnet *dev, u8 *init_msg, u8 init_msg_len,
-+ u8 *buffer, u8 expected_len)
-+{
-+ int act_len;
-+ int status;
-+
-+ netdev_dbg(dev->net, "Sending init packet");
-+
-+ status = usb_bulk_msg(dev->udev, usb_sndbulkpipe(dev->udev, 0x02),
-+ init_msg, init_msg_len, &act_len, KALMIA_USB_TIMEOUT);
-+ if (status != 0) {
-+ netdev_err(dev->net,
-+ "Error sending init packet. Status %i, length %i\n",
-+ status, act_len);
-+ return status;
-+ }
-+ else if (act_len != init_msg_len) {
-+ netdev_err(dev->net,
-+ "Did not send all of init packet. Bytes sent: %i",
-+ act_len);
-+ }
-+ else {
-+ netdev_dbg(dev->net, "Successfully sent init packet.");
-+ }
-+
-+ status = usb_bulk_msg(dev->udev, usb_rcvbulkpipe(dev->udev, 0x81),
-+ buffer, expected_len, &act_len, KALMIA_USB_TIMEOUT);
-+
-+ if (status != 0)
-+ netdev_err(dev->net,
-+ "Error receiving init result. Status %i, length %i\n",
-+ status, act_len);
-+ else if (act_len != expected_len)
-+ netdev_err(dev->net, "Unexpected init result length: %i\n",
-+ act_len);
-+
-+ return status;
-+}
-+
-+static int
-+kalmia_init_and_get_ethernet_addr(struct usbnet *dev, u8 *ethernet_addr)
-+{
-+ static const char init_msg_1[] =
-+ { 0x57, 0x50, 0x04, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00,
-+ 0x00, 0x00 };
-+ static const char init_msg_2[] =
-+ { 0x57, 0x50, 0x04, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0xf4,
-+ 0x00, 0x00 };
-+ static const int buflen = 28;
-+ char *usb_buf;
-+ int status;
-+
-+ usb_buf = kmalloc(buflen, GFP_DMA | GFP_KERNEL);
-+ if (!usb_buf)
-+ return -ENOMEM;
-+
-+ memcpy(usb_buf, init_msg_1, 12);
-+ status = kalmia_send_init_packet(dev, usb_buf, sizeof(init_msg_1)
-+ / sizeof(init_msg_1[0]), usb_buf, 24);
-+ if (status != 0)
-+ return status;
-+
-+ memcpy(usb_buf, init_msg_2, 12);
-+ status = kalmia_send_init_packet(dev, usb_buf, sizeof(init_msg_2)
-+ / sizeof(init_msg_2[0]), usb_buf, 28);
-+ if (status != 0)
-+ return status;
-+
-+ memcpy(ethernet_addr, usb_buf + 10, ETH_ALEN);
-+
-+ kfree(usb_buf);
-+ return status;
-+}
-+
-+static int
-+kalmia_bind(struct usbnet *dev, struct usb_interface *intf)
-+{
-+ int status;
-+ u8 ethernet_addr[ETH_ALEN];
-+
-+ /* Don't bind to AT command interface */
-+ if (intf->cur_altsetting->desc.bInterfaceClass != USB_CLASS_VENDOR_SPEC)
-+ return -EINVAL;
-+
-+ dev->in = usb_rcvbulkpipe(dev->udev, 0x81 & USB_ENDPOINT_NUMBER_MASK);
-+ dev->out = usb_sndbulkpipe(dev->udev, 0x02 & USB_ENDPOINT_NUMBER_MASK);
-+ dev->status = NULL;
-+
-+ dev->net->hard_header_len += KALMIA_HEADER_LENGTH;
-+ dev->hard_mtu = 1400;
-+ dev->rx_urb_size = dev->hard_mtu * 10; // Found as optimal after testing
-+
-+ status = kalmia_init_and_get_ethernet_addr(dev, ethernet_addr);
-+
-+ if (status < 0) {
-+ usb_set_intfdata(intf, NULL);
-+ usb_driver_release_interface(driver_of(intf), intf);
-+ return status;
-+ }
-+
-+ memcpy(dev->net->dev_addr, ethernet_addr, ETH_ALEN);
-+
-+ return status;
-+}
-+
-+static struct sk_buff *
-+kalmia_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
-+{
-+ struct sk_buff *skb2 = NULL;
-+ u16 content_len;
-+ unsigned char *header_start;
-+ unsigned char ether_type_1, ether_type_2;
-+ u8 remainder, padlen = 0;
-+
-+ if (!skb_cloned(skb)) {
-+ int headroom = skb_headroom(skb);
-+ int tailroom = skb_tailroom(skb);
-+
-+ if ((tailroom >= KALMIA_ALIGN_SIZE) && (headroom
-+ >= KALMIA_HEADER_LENGTH))
-+ goto done;
-+
-+ if ((headroom + tailroom) > (KALMIA_HEADER_LENGTH
-+ + KALMIA_ALIGN_SIZE)) {
-+ skb->data = memmove(skb->head + KALMIA_HEADER_LENGTH,
-+ skb->data, skb->len);
-+ skb_set_tail_pointer(skb, skb->len);
-+ goto done;
-+ }
-+ }
-+
-+ skb2 = skb_copy_expand(skb, KALMIA_HEADER_LENGTH,
-+ KALMIA_ALIGN_SIZE, flags);
-+ if (!skb2)
-+ return NULL;
-+
-+ dev_kfree_skb_any(skb);
-+ skb = skb2;
-+
-+done:
-+ header_start = skb_push(skb, KALMIA_HEADER_LENGTH);
-+ ether_type_1 = header_start[KALMIA_HEADER_LENGTH + 12];
-+ ether_type_2 = header_start[KALMIA_HEADER_LENGTH + 13];
-+
-+ netdev_dbg(dev->net, "Sending etherType: %02x%02x", ether_type_1,
-+ ether_type_2);
-+
-+ /* According to empiric data for data packages */
-+ header_start[0] = 0x57;
-+ header_start[1] = 0x44;
-+ content_len = skb->len - KALMIA_HEADER_LENGTH;
-+
-+ put_unaligned_le16(content_len, &header_start[2]);
-+ header_start[4] = ether_type_1;
-+ header_start[5] = ether_type_2;
-+
-+ /* Align to 4 bytes by padding with zeros */
-+ remainder = skb->len % KALMIA_ALIGN_SIZE;
-+ if (remainder > 0) {
-+ padlen = KALMIA_ALIGN_SIZE - remainder;
-+ memset(skb_put(skb, padlen), 0, padlen);
-+ }
-+
-+ netdev_dbg(dev->net,
-+ "Sending package with length %i and padding %i. Header: %6phC.",
-+ content_len, padlen, header_start);
-+
-+ return skb;
-+}
-+
-+static int
-+kalmia_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
-+{
-+ /*
-+ * Our task here is to strip off framing, leaving skb with one
-+ * data frame for the usbnet framework code to process.
-+ */
-+ static const u8 HEADER_END_OF_USB_PACKET[] =
-+ { 0x57, 0x5a, 0x00, 0x00, 0x08, 0x00 };
-+ static const u8 EXPECTED_UNKNOWN_HEADER_1[] =
-+ { 0x57, 0x43, 0x1e, 0x00, 0x15, 0x02 };
-+ static const u8 EXPECTED_UNKNOWN_HEADER_2[] =
-+ { 0x57, 0x50, 0x0e, 0x00, 0x00, 0x00 };
-+ int i = 0;
-+
-+ /* incomplete header? */
-+ if (skb->len < KALMIA_HEADER_LENGTH)
-+ return 0;
-+
-+ do {
-+ struct sk_buff *skb2 = NULL;
-+ u8 *header_start;
-+ u16 usb_packet_length, ether_packet_length;
-+ int is_last;
-+
-+ header_start = skb->data;
-+
-+ if (unlikely(header_start[0] != 0x57 || header_start[1] != 0x44)) {
-+ if (!memcmp(header_start, EXPECTED_UNKNOWN_HEADER_1,
-+ sizeof(EXPECTED_UNKNOWN_HEADER_1)) || !memcmp(
-+ header_start, EXPECTED_UNKNOWN_HEADER_2,
-+ sizeof(EXPECTED_UNKNOWN_HEADER_2))) {
-+ netdev_dbg(dev->net,
-+ "Received expected unknown frame header: %6phC. Package length: %i\n",
-+ header_start,
-+ skb->len - KALMIA_HEADER_LENGTH);
-+ }
-+ else {
-+ netdev_err(dev->net,
-+ "Received unknown frame header: %6phC. Package length: %i\n",
-+ header_start,
-+ skb->len - KALMIA_HEADER_LENGTH);
-+ return 0;
-+ }
-+ }
-+ else
-+ netdev_dbg(dev->net,
-+ "Received header: %6phC. Package length: %i\n",
-+ header_start, skb->len - KALMIA_HEADER_LENGTH);
-+
-+ /* subtract start header and end header */
-+ usb_packet_length = skb->len - (2 * KALMIA_HEADER_LENGTH);
-+ ether_packet_length = get_unaligned_le16(&header_start[2]);
-+ skb_pull(skb, KALMIA_HEADER_LENGTH);
-+
-+ /* Some small packets misses end marker */
-+ if (usb_packet_length < ether_packet_length) {
-+ ether_packet_length = usb_packet_length
-+ + KALMIA_HEADER_LENGTH;
-+ is_last = true;
-+ }
-+ else {
-+ netdev_dbg(dev->net, "Correct package length #%i", i
-+ + 1);
-+
-+ is_last = (memcmp(skb->data + ether_packet_length,
-+ HEADER_END_OF_USB_PACKET,
-+ sizeof(HEADER_END_OF_USB_PACKET)) == 0);
-+ if (!is_last) {
-+ header_start = skb->data + ether_packet_length;
-+ netdev_dbg(dev->net,
-+ "End header: %6phC. Package length: %i\n",
-+ header_start,
-+ skb->len - KALMIA_HEADER_LENGTH);
-+ }
-+ }
-+
-+ if (is_last) {
-+ skb2 = skb;
-+ }
-+ else {
-+ skb2 = skb_clone(skb, GFP_ATOMIC);
-+ if (unlikely(!skb2))
-+ return 0;
-+ }
-+
-+ skb_trim(skb2, ether_packet_length);
-+
-+ if (is_last) {
-+ return 1;
-+ }
-+ else {
-+ usbnet_skb_return(dev, skb2);
-+ skb_pull(skb, ether_packet_length);
-+ }
-+
-+ i++;
-+ }
-+ while (skb->len);
-+
-+ return 1;
-+}
-+
-+static const struct driver_info kalmia_info = {
-+ .description = "Samsung Kalmia LTE USB dongle",
-+ .flags = FLAG_WWAN,
-+ .bind = kalmia_bind,
-+ .rx_fixup = kalmia_rx_fixup,
-+ .tx_fixup = kalmia_tx_fixup
-+};
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static const struct usb_device_id products[] = {
-+ /* The unswitched USB ID, to get the module auto loaded: */
-+ { USB_DEVICE(0x04e8, 0x689a) },
-+ /* The stick swithed into modem (by e.g. usb_modeswitch): */
-+ { USB_DEVICE(0x04e8, 0x6889),
-+ .driver_info = (unsigned long) &kalmia_info, },
-+ { /* EMPTY == end of list */} };
-+MODULE_DEVICE_TABLE( usb, products);
-+
-+static struct usb_driver kalmia_driver = {
-+ .name = "kalmia",
-+ .id_table = products,
-+ .probe = usbnet_probe,
-+ .disconnect = usbnet_disconnect,
-+ .suspend = usbnet_suspend,
-+ .resume = usbnet_resume,
-+ .disable_hub_initiated_lpm = 1,
-+};
-+
-+module_usb_driver(kalmia_driver);
-+
-+MODULE_AUTHOR("Marius Bjoernstad Kotsbak <marius(a)kotsbak.com>");
-+MODULE_DESCRIPTION("Samsung Kalmia USB network driver");
-+MODULE_LICENSE("GPL");
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/kaweth.c backports-3.18.1-1/drivers/net/usb/kaweth.c
---- backports-3.18.1-1.org/drivers/net/usb/kaweth.c 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/kaweth.c 2014-12-16 18:39:45.000000000 +0100
-@@ -0,0 +1,1331 @@
-+/****************************************************************
-+ *
-+ * kaweth.c - driver for KL5KUSB101 based USB->Ethernet
-+ *
-+ * (c) 2000 Interlan Communications
-+ * (c) 2000 Stephane Alnet
-+ * (C) 2001 Brad Hards
-+ * (C) 2002 Oliver Neukum
-+ *
-+ * Original author: The Zapman <zapman(a)interlan.net>
-+ * Inspired by, and much credit goes to Michael Rothwell
-+ * <rothwell(a)interlan.net> for the test equipment, help, and patience
-+ * Based off of (and with thanks to) Petko Manolov's pegaus.c driver.
-+ * Also many thanks to Joel Silverman and Ed Surprenant at Kawasaki
-+ * for providing the firmware and driver resources.
-+ *
-+ * 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, 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, see <http://www.gnu.org/licenses/>.
-+ *
-+ ****************************************************************/
-+
-+/* TODO:
-+ * Develop test procedures for USB net interfaces
-+ * Run test procedures
-+ * Fix bugs from previous two steps
-+ * Snoop other OSs for any tricks we're not doing
-+ * Reduce arbitrary timeouts
-+ * Smart multicast support
-+ * Temporary MAC change support
-+ * Tunable SOFs parameter - ioctl()?
-+ * Ethernet stats collection
-+ * Code formatting improvements
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/slab.h>
-+#include <linux/string.h>
-+#include <linux/delay.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/usb.h>
-+#include <linux/types.h>
-+#include <linux/ethtool.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/wait.h>
-+#include <linux/firmware.h>
-+#include <asm/uaccess.h>
-+#include <asm/byteorder.h>
-+
-+#undef DEBUG
-+
-+#define KAWETH_MTU 1514
-+#define KAWETH_BUF_SIZE 1664
-+#define KAWETH_TX_TIMEOUT (5 * HZ)
-+#define KAWETH_SCRATCH_SIZE 32
-+#define KAWETH_FIRMWARE_BUF_SIZE 4096
-+#define KAWETH_CONTROL_TIMEOUT (30000)
-+
-+#define KAWETH_STATUS_BROKEN 0x0000001
-+#define KAWETH_STATUS_CLOSING 0x0000002
-+#define KAWETH_STATUS_SUSPENDING 0x0000004
-+
-+#define KAWETH_STATUS_BLOCKED (KAWETH_STATUS_CLOSING | KAWETH_STATUS_SUSPENDING)
-+
-+#define KAWETH_PACKET_FILTER_PROMISCUOUS 0x01
-+#define KAWETH_PACKET_FILTER_ALL_MULTICAST 0x02
-+#define KAWETH_PACKET_FILTER_DIRECTED 0x04
-+#define KAWETH_PACKET_FILTER_BROADCAST 0x08
-+#define KAWETH_PACKET_FILTER_MULTICAST 0x10
-+
-+/* Table 7 */
-+#define KAWETH_COMMAND_GET_ETHERNET_DESC 0x00
-+#define KAWETH_COMMAND_MULTICAST_FILTERS 0x01
-+#define KAWETH_COMMAND_SET_PACKET_FILTER 0x02
-+#define KAWETH_COMMAND_STATISTICS 0x03
-+#define KAWETH_COMMAND_SET_TEMP_MAC 0x06
-+#define KAWETH_COMMAND_GET_TEMP_MAC 0x07
-+#define KAWETH_COMMAND_SET_URB_SIZE 0x08
-+#define KAWETH_COMMAND_SET_SOFS_WAIT 0x09
-+#define KAWETH_COMMAND_SCAN 0xFF
-+
-+#define KAWETH_SOFS_TO_WAIT 0x05
-+
-+#define INTBUFFERSIZE 4
-+
-+#define STATE_OFFSET 0
-+#define STATE_MASK 0x40
-+#define STATE_SHIFT 5
-+
-+#define IS_BLOCKED(s) (s & KAWETH_STATUS_BLOCKED)
-+
-+
-+MODULE_AUTHOR("Michael Zappe <zapman(a)interlan.net>, Stephane Alnet <stephane(a)u-picardie.fr>, Brad Hards <bhards(a)bigpond.net.au> and Oliver Neukum <oliver(a)neukum.org>");
-+MODULE_DESCRIPTION("KL5USB101 USB Ethernet driver");
-+MODULE_LICENSE("GPL");
-+MODULE_FIRMWARE("kaweth/new_code.bin");
-+MODULE_FIRMWARE("kaweth/new_code_fix.bin");
-+MODULE_FIRMWARE("kaweth/trigger_code.bin");
-+MODULE_FIRMWARE("kaweth/trigger_code_fix.bin");
-+
-+static const char driver_name[] = "kaweth";
-+
-+static int kaweth_probe(
-+ struct usb_interface *intf,
-+ const struct usb_device_id *id /* from id_table */
-+ );
-+static void kaweth_disconnect(struct usb_interface *intf);
-+static int kaweth_internal_control_msg(struct usb_device *usb_dev,
-+ unsigned int pipe,
-+ struct usb_ctrlrequest *cmd, void *data,
-+ int len, int timeout);
-+static int kaweth_suspend(struct usb_interface *intf, pm_message_t message);
-+static int kaweth_resume(struct usb_interface *intf);
-+
-+/****************************************************************
-+ * usb_device_id
-+ ****************************************************************/
-+static struct usb_device_id usb_klsi_table[] = {
-+ { USB_DEVICE(0x03e8, 0x0008) }, /* AOX Endpoints USB Ethernet */
-+ { USB_DEVICE(0x04bb, 0x0901) }, /* I-O DATA USB-ET/T */
-+ { USB_DEVICE(0x0506, 0x03e8) }, /* 3Com 3C19250 */
-+ { USB_DEVICE(0x0506, 0x11f8) }, /* 3Com 3C460 */
-+ { USB_DEVICE(0x0557, 0x2002) }, /* ATEN USB Ethernet */
-+ { USB_DEVICE(0x0557, 0x4000) }, /* D-Link DSB-650C */
-+ { USB_DEVICE(0x0565, 0x0002) }, /* Peracom Enet */
-+ { USB_DEVICE(0x0565, 0x0003) }, /* Optus@Home UEP1045A */
-+ { USB_DEVICE(0x0565, 0x0005) }, /* Peracom Enet2 */
-+ { USB_DEVICE(0x05e9, 0x0008) }, /* KLSI KL5KUSB101B */
-+ { USB_DEVICE(0x05e9, 0x0009) }, /* KLSI KL5KUSB101B (Board change) */
-+ { USB_DEVICE(0x066b, 0x2202) }, /* Linksys USB10T */
-+ { USB_DEVICE(0x06e1, 0x0008) }, /* ADS USB-10BT */
-+ { USB_DEVICE(0x06e1, 0x0009) }, /* ADS USB-10BT */
-+ { USB_DEVICE(0x0707, 0x0100) }, /* SMC 2202USB */
-+ { USB_DEVICE(0x07aa, 0x0001) }, /* Correga K.K. */
-+ { USB_DEVICE(0x07b8, 0x4000) }, /* D-Link DU-E10 */
-+ { USB_DEVICE(0x07c9, 0xb010) }, /* Allied Telesyn AT-USB10 USB Ethernet Adapter */
-+ { USB_DEVICE(0x0846, 0x1001) }, /* NetGear EA-101 */
-+ { USB_DEVICE(0x0846, 0x1002) }, /* NetGear EA-101 */
-+ { USB_DEVICE(0x085a, 0x0008) }, /* PortGear Ethernet Adapter */
-+ { USB_DEVICE(0x085a, 0x0009) }, /* PortGear Ethernet Adapter */
-+ { USB_DEVICE(0x087d, 0x5704) }, /* Jaton USB Ethernet Device Adapter */
-+ { USB_DEVICE(0x0951, 0x0008) }, /* Kingston Technology USB Ethernet Adapter */
-+ { USB_DEVICE(0x095a, 0x3003) }, /* Portsmith Express Ethernet Adapter */
-+ { USB_DEVICE(0x10bd, 0x1427) }, /* ASANTE USB To Ethernet Adapter */
-+ { USB_DEVICE(0x1342, 0x0204) }, /* Mobility USB-Ethernet Adapter */
-+ { USB_DEVICE(0x13d2, 0x0400) }, /* Shark Pocket Adapter */
-+ { USB_DEVICE(0x1485, 0x0001) }, /* Silicom U2E */
-+ { USB_DEVICE(0x1485, 0x0002) }, /* Psion Dacom Gold Port Ethernet */
-+ { USB_DEVICE(0x1645, 0x0005) }, /* Entrega E45 */
-+ { USB_DEVICE(0x1645, 0x0008) }, /* Entrega USB Ethernet Adapter */
-+ { USB_DEVICE(0x1645, 0x8005) }, /* PortGear Ethernet Adapter */
-+ { USB_DEVICE(0x1668, 0x0323) }, /* Actiontec USB Ethernet */
-+ { USB_DEVICE(0x2001, 0x4000) }, /* D-link DSB-650C */
-+ {} /* Null terminator */
-+};
-+
-+MODULE_DEVICE_TABLE (usb, usb_klsi_table);
-+
-+/****************************************************************
-+ * kaweth_driver
-+ ****************************************************************/
-+static struct usb_driver kaweth_driver = {
-+ .name = driver_name,
-+ .probe = kaweth_probe,
-+ .disconnect = kaweth_disconnect,
-+ .suspend = kaweth_suspend,
-+ .resume = kaweth_resume,
-+ .id_table = usb_klsi_table,
-+ .supports_autosuspend = 1,
-+ .disable_hub_initiated_lpm = 1,
-+};
-+
-+typedef __u8 eth_addr_t[6];
-+
-+/****************************************************************
-+ * usb_eth_dev
-+ ****************************************************************/
-+struct usb_eth_dev {
-+ char *name;
-+ __u16 vendor;
-+ __u16 device;
-+ void *pdata;
-+};
-+
-+/****************************************************************
-+ * kaweth_ethernet_configuration
-+ * Refer Table 8
-+ ****************************************************************/
-+struct kaweth_ethernet_configuration
-+{
-+ __u8 size;
-+ __u8 reserved1;
-+ __u8 reserved2;
-+ eth_addr_t hw_addr;
-+ __u32 statistics_mask;
-+ __le16 segment_size;
-+ __u16 max_multicast_filters;
-+ __u8 reserved3;
-+} __packed;
-+
-+/****************************************************************
-+ * kaweth_device
-+ ****************************************************************/
-+struct kaweth_device
-+{
-+ spinlock_t device_lock;
-+
-+ __u32 status;
-+ int end;
-+ int suspend_lowmem_rx;
-+ int suspend_lowmem_ctrl;
-+ int linkstate;
-+ int opened;
-+ struct delayed_work lowmem_work;
-+
-+ struct usb_device *dev;
-+ struct usb_interface *intf;
-+ struct net_device *net;
-+ wait_queue_head_t term_wait;
-+
-+ struct urb *rx_urb;
-+ struct urb *tx_urb;
-+ struct urb *irq_urb;
-+
-+ dma_addr_t intbufferhandle;
-+ __u8 *intbuffer;
-+ dma_addr_t rxbufferhandle;
-+ __u8 *rx_buf;
-+
-+
-+ struct sk_buff *tx_skb;
-+
-+ __u8 *firmware_buf;
-+ __u8 scratch[KAWETH_SCRATCH_SIZE];
-+ __u16 packet_filter_bitmap;
-+
-+ struct kaweth_ethernet_configuration configuration;
-+
-+ struct net_device_stats stats;
-+};
-+
-+/****************************************************************
-+ * kaweth_control
-+ ****************************************************************/
-+static int kaweth_control(struct kaweth_device *kaweth,
-+ unsigned int pipe,
-+ __u8 request,
-+ __u8 requesttype,
-+ __u16 value,
-+ __u16 index,
-+ void *data,
-+ __u16 size,
-+ int timeout)
-+{
-+ struct usb_ctrlrequest *dr;
-+ int retval;
-+
-+ netdev_dbg(kaweth->net, "kaweth_control()\n");
-+
-+ if(in_interrupt()) {
-+ netdev_dbg(kaweth->net, "in_interrupt()\n");
-+ return -EBUSY;
-+ }
-+
-+ dr = kmalloc(sizeof(struct usb_ctrlrequest), GFP_ATOMIC);
-+ if (!dr)
-+ return -ENOMEM;
-+
-+ dr->bRequestType = requesttype;
-+ dr->bRequest = request;
-+ dr->wValue = cpu_to_le16(value);
-+ dr->wIndex = cpu_to_le16(index);
-+ dr->wLength = cpu_to_le16(size);
-+
-+ retval = kaweth_internal_control_msg(kaweth->dev,
-+ pipe,
-+ dr,
-+ data,
-+ size,
-+ timeout);
-+
-+ kfree(dr);
-+ return retval;
-+}
-+
-+/****************************************************************
-+ * kaweth_read_configuration
-+ ****************************************************************/
-+static int kaweth_read_configuration(struct kaweth_device *kaweth)
-+{
-+ int retval;
-+
-+ netdev_dbg(kaweth->net, "Reading kaweth configuration\n");
-+
-+ retval = kaweth_control(kaweth,
-+ usb_rcvctrlpipe(kaweth->dev, 0),
-+ KAWETH_COMMAND_GET_ETHERNET_DESC,
-+ USB_TYPE_VENDOR | USB_DIR_IN | USB_RECIP_DEVICE,
-+ 0,
-+ 0,
-+ (void *)&kaweth->configuration,
-+ sizeof(kaweth->configuration),
-+ KAWETH_CONTROL_TIMEOUT);
-+
-+ return retval;
-+}
-+
-+/****************************************************************
-+ * kaweth_set_urb_size
-+ ****************************************************************/
-+static int kaweth_set_urb_size(struct kaweth_device *kaweth, __u16 urb_size)
-+{
-+ int retval;
-+
-+ netdev_dbg(kaweth->net, "Setting URB size to %d\n", (unsigned)urb_size);
-+
-+ retval = kaweth_control(kaweth,
-+ usb_sndctrlpipe(kaweth->dev, 0),
-+ KAWETH_COMMAND_SET_URB_SIZE,
-+ USB_TYPE_VENDOR | USB_DIR_OUT | USB_RECIP_DEVICE,
-+ urb_size,
-+ 0,
-+ (void *)&kaweth->scratch,
-+ 0,
-+ KAWETH_CONTROL_TIMEOUT);
-+
-+ return retval;
-+}
-+
-+/****************************************************************
-+ * kaweth_set_sofs_wait
-+ ****************************************************************/
-+static int kaweth_set_sofs_wait(struct kaweth_device *kaweth, __u16 sofs_wait)
-+{
-+ int retval;
-+
-+ netdev_dbg(kaweth->net, "Set SOFS wait to %d\n", (unsigned)sofs_wait);
-+
-+ retval = kaweth_control(kaweth,
-+ usb_sndctrlpipe(kaweth->dev, 0),
-+ KAWETH_COMMAND_SET_SOFS_WAIT,
-+ USB_TYPE_VENDOR | USB_DIR_OUT | USB_RECIP_DEVICE,
-+ sofs_wait,
-+ 0,
-+ (void *)&kaweth->scratch,
-+ 0,
-+ KAWETH_CONTROL_TIMEOUT);
-+
-+ return retval;
-+}
-+
-+/****************************************************************
-+ * kaweth_set_receive_filter
-+ ****************************************************************/
-+static int kaweth_set_receive_filter(struct kaweth_device *kaweth,
-+ __u16 receive_filter)
-+{
-+ int retval;
-+
-+ netdev_dbg(kaweth->net, "Set receive filter to %d\n",
-+ (unsigned)receive_filter);
-+
-+ retval = kaweth_control(kaweth,
-+ usb_sndctrlpipe(kaweth->dev, 0),
-+ KAWETH_COMMAND_SET_PACKET_FILTER,
-+ USB_TYPE_VENDOR | USB_DIR_OUT | USB_RECIP_DEVICE,
-+ receive_filter,
-+ 0,
-+ (void *)&kaweth->scratch,
-+ 0,
-+ KAWETH_CONTROL_TIMEOUT);
-+
-+ return retval;
-+}
-+
-+/****************************************************************
-+ * kaweth_download_firmware
-+ ****************************************************************/
-+static int kaweth_download_firmware(struct kaweth_device *kaweth,
-+ const char *fwname,
-+ __u8 interrupt,
-+ __u8 type)
-+{
-+ const struct firmware *fw;
-+ int data_len;
-+ int ret;
-+
-+ ret = request_firmware(&fw, fwname, &kaweth->dev->dev);
-+ if (ret) {
-+ dev_err(&kaweth->intf->dev, "Firmware request failed\n");
-+ return ret;
-+ }
-+
-+ if (fw->size > KAWETH_FIRMWARE_BUF_SIZE) {
-+ dev_err(&kaweth->intf->dev, "Firmware too big: %zu\n",
-+ fw->size);
-+ release_firmware(fw);
-+ return -ENOSPC;
-+ }
-+ data_len = fw->size;
-+ memcpy(kaweth->firmware_buf, fw->data, fw->size);
-+
-+ release_firmware(fw);
-+
-+ kaweth->firmware_buf[2] = (data_len & 0xFF) - 7;
-+ kaweth->firmware_buf[3] = data_len >> 8;
-+ kaweth->firmware_buf[4] = type;
-+ kaweth->firmware_buf[5] = interrupt;
-+
-+ netdev_dbg(kaweth->net, "High: %i, Low:%i\n", kaweth->firmware_buf[3],
-+ kaweth->firmware_buf[2]);
-+
-+ netdev_dbg(kaweth->net,
-+ "Downloading firmware at %p to kaweth device at %p\n",
-+ kaweth->firmware_buf, kaweth);
-+ netdev_dbg(kaweth->net, "Firmware length: %d\n", data_len);
-+
-+ return kaweth_control(kaweth,
-+ usb_sndctrlpipe(kaweth->dev, 0),
-+ KAWETH_COMMAND_SCAN,
-+ USB_TYPE_VENDOR | USB_DIR_OUT | USB_RECIP_DEVICE,
-+ 0,
-+ 0,
-+ (void *)kaweth->firmware_buf,
-+ data_len,
-+ KAWETH_CONTROL_TIMEOUT);
-+}
-+
-+/****************************************************************
-+ * kaweth_trigger_firmware
-+ ****************************************************************/
-+static int kaweth_trigger_firmware(struct kaweth_device *kaweth,
-+ __u8 interrupt)
-+{
-+ kaweth->firmware_buf[0] = 0xB6;
-+ kaweth->firmware_buf[1] = 0xC3;
-+ kaweth->firmware_buf[2] = 0x01;
-+ kaweth->firmware_buf[3] = 0x00;
-+ kaweth->firmware_buf[4] = 0x06;
-+ kaweth->firmware_buf[5] = interrupt;
-+ kaweth->firmware_buf[6] = 0x00;
-+ kaweth->firmware_buf[7] = 0x00;
-+
-+ netdev_dbg(kaweth->net, "Triggering firmware\n");
-+
-+ return kaweth_control(kaweth,
-+ usb_sndctrlpipe(kaweth->dev, 0),
-+ KAWETH_COMMAND_SCAN,
-+ USB_TYPE_VENDOR | USB_DIR_OUT | USB_RECIP_DEVICE,
-+ 0,
-+ 0,
-+ (void *)kaweth->firmware_buf,
-+ 8,
-+ KAWETH_CONTROL_TIMEOUT);
-+}
-+
-+/****************************************************************
-+ * kaweth_reset
-+ ****************************************************************/
-+static int kaweth_reset(struct kaweth_device *kaweth)
-+{
-+ int result;
-+
-+ netdev_dbg(kaweth->net, "kaweth_reset(%p)\n", kaweth);
-+ result = usb_reset_configuration(kaweth->dev);
-+ mdelay(10);
-+
-+ netdev_dbg(kaweth->net, "kaweth_reset() returns %d.\n", result);
-+
-+ return result;
-+}
-+
-+static void kaweth_usb_receive(struct urb *);
-+static int kaweth_resubmit_rx_urb(struct kaweth_device *, gfp_t);
-+
-+/****************************************************************
-+ int_callback
-+*****************************************************************/
-+
-+static void kaweth_resubmit_int_urb(struct kaweth_device *kaweth, gfp_t mf)
-+{
-+ int status;
-+
-+ status = usb_submit_urb (kaweth->irq_urb, mf);
-+ if (unlikely(status == -ENOMEM)) {
-+ kaweth->suspend_lowmem_ctrl = 1;
-+ schedule_delayed_work(&kaweth->lowmem_work, HZ/4);
-+ } else {
-+ kaweth->suspend_lowmem_ctrl = 0;
-+ }
-+
-+ if (status)
-+ dev_err(&kaweth->intf->dev,
-+ "can't resubmit intr, %s-%s, status %d\n",
-+ kaweth->dev->bus->bus_name,
-+ kaweth->dev->devpath, status);
-+}
-+
-+static void int_callback(struct urb *u)
-+{
-+ struct kaweth_device *kaweth = u->context;
-+ int act_state;
-+ int status = u->status;
-+
-+ switch (status) {
-+ case 0: /* success */
-+ break;
-+ case -ECONNRESET: /* unlink */
-+ case -ENOENT:
-+ case -ESHUTDOWN:
-+ return;
-+ /* -EPIPE: should clear the halt */
-+ default: /* error */
-+ goto resubmit;
-+ }
-+
-+ /* we check the link state to report changes */
-+ if (kaweth->linkstate != (act_state = ( kaweth->intbuffer[STATE_OFFSET] | STATE_MASK) >> STATE_SHIFT)) {
-+ if (act_state)
-+ netif_carrier_on(kaweth->net);
-+ else
-+ netif_carrier_off(kaweth->net);
-+
-+ kaweth->linkstate = act_state;
-+ }
-+resubmit:
-+ kaweth_resubmit_int_urb(kaweth, GFP_ATOMIC);
-+}
-+
-+static void kaweth_resubmit_tl(struct work_struct *work)
-+{
-+ struct kaweth_device *kaweth =
-+ container_of(work, struct kaweth_device, lowmem_work.work);
-+
-+ if (IS_BLOCKED(kaweth->status))
-+ return;
-+
-+ if (kaweth->suspend_lowmem_rx)
-+ kaweth_resubmit_rx_urb(kaweth, GFP_NOIO);
-+
-+ if (kaweth->suspend_lowmem_ctrl)
-+ kaweth_resubmit_int_urb(kaweth, GFP_NOIO);
-+}
-+
-+
-+/****************************************************************
-+ * kaweth_resubmit_rx_urb
-+ ****************************************************************/
-+static int kaweth_resubmit_rx_urb(struct kaweth_device *kaweth,
-+ gfp_t mem_flags)
-+{
-+ int result;
-+
-+ usb_fill_bulk_urb(kaweth->rx_urb,
-+ kaweth->dev,
-+ usb_rcvbulkpipe(kaweth->dev, 1),
-+ kaweth->rx_buf,
-+ KAWETH_BUF_SIZE,
-+ kaweth_usb_receive,
-+ kaweth);
-+ kaweth->rx_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
-+ kaweth->rx_urb->transfer_dma = kaweth->rxbufferhandle;
-+
-+ if((result = usb_submit_urb(kaweth->rx_urb, mem_flags))) {
-+ if (result == -ENOMEM) {
-+ kaweth->suspend_lowmem_rx = 1;
-+ schedule_delayed_work(&kaweth->lowmem_work, HZ/4);
-+ }
-+ dev_err(&kaweth->intf->dev, "resubmitting rx_urb %d failed\n",
-+ result);
-+ } else {
-+ kaweth->suspend_lowmem_rx = 0;
-+ }
-+
-+ return result;
-+}
-+
-+static void kaweth_async_set_rx_mode(struct kaweth_device *kaweth);
-+
-+/****************************************************************
-+ * kaweth_usb_receive
-+ ****************************************************************/
-+static void kaweth_usb_receive(struct urb *urb)
-+{
-+ struct device *dev = &urb->dev->dev;
-+ struct kaweth_device *kaweth = urb->context;
-+ struct net_device *net = kaweth->net;
-+ int status = urb->status;
-+
-+ int count = urb->actual_length;
-+ int count2 = urb->transfer_buffer_length;
-+
-+ __u16 pkt_len = le16_to_cpup((__le16 *)kaweth->rx_buf);
-+
-+ struct sk_buff *skb;
-+
-+ if (unlikely(status == -EPIPE)) {
-+ kaweth->stats.rx_errors++;
-+ kaweth->end = 1;
-+ wake_up(&kaweth->term_wait);
-+ dev_dbg(dev, "Status was -EPIPE.\n");
-+ return;
-+ }
-+ if (unlikely(status == -ECONNRESET || status == -ESHUTDOWN)) {
-+ /* we are killed - set a flag and wake the disconnect handler */
-+ kaweth->end = 1;
-+ wake_up(&kaweth->term_wait);
-+ dev_dbg(dev, "Status was -ECONNRESET or -ESHUTDOWN.\n");
-+ return;
-+ }
-+ if (unlikely(status == -EPROTO || status == -ETIME ||
-+ status == -EILSEQ)) {
-+ kaweth->stats.rx_errors++;
-+ dev_dbg(dev, "Status was -EPROTO, -ETIME, or -EILSEQ.\n");
-+ return;
-+ }
-+ if (unlikely(status == -EOVERFLOW)) {
-+ kaweth->stats.rx_errors++;
-+ dev_dbg(dev, "Status was -EOVERFLOW.\n");
-+ }
-+ spin_lock(&kaweth->device_lock);
-+ if (IS_BLOCKED(kaweth->status)) {
-+ spin_unlock(&kaweth->device_lock);
-+ return;
-+ }
-+ spin_unlock(&kaweth->device_lock);
-+
-+ if(status && status != -EREMOTEIO && count != 1) {
-+ dev_err(&kaweth->intf->dev,
-+ "%s RX status: %d count: %d packet_len: %d\n",
-+ net->name, status, count, (int)pkt_len);
-+ kaweth_resubmit_rx_urb(kaweth, GFP_ATOMIC);
-+ return;
-+ }
-+
-+ if(kaweth->net && (count > 2)) {
-+ if(pkt_len > (count - 2)) {
-+ dev_err(&kaweth->intf->dev,
-+ "Packet length too long for USB frame (pkt_len: %x, count: %x)\n",
-+ pkt_len, count);
-+ dev_err(&kaweth->intf->dev, "Packet len & 2047: %x\n",
-+ pkt_len & 2047);
-+ dev_err(&kaweth->intf->dev, "Count 2: %x\n", count2);
-+ kaweth_resubmit_rx_urb(kaweth, GFP_ATOMIC);
-+ return;
-+ }
-+
-+ if(!(skb = dev_alloc_skb(pkt_len+2))) {
-+ kaweth_resubmit_rx_urb(kaweth, GFP_ATOMIC);
-+ return;
-+ }
-+
-+ skb_reserve(skb, 2); /* Align IP on 16 byte boundaries */
-+
-+ skb_copy_to_linear_data(skb, kaweth->rx_buf + 2, pkt_len);
-+
-+ skb_put(skb, pkt_len);
-+
-+ skb->protocol = eth_type_trans(skb, net);
-+
-+ netif_rx(skb);
-+
-+ kaweth->stats.rx_packets++;
-+ kaweth->stats.rx_bytes += pkt_len;
-+ }
-+
-+ kaweth_resubmit_rx_urb(kaweth, GFP_ATOMIC);
-+}
-+
-+/****************************************************************
-+ * kaweth_open
-+ ****************************************************************/
-+static int kaweth_open(struct net_device *net)
-+{
-+ struct kaweth_device *kaweth = netdev_priv(net);
-+ int res;
-+
-+ netdev_dbg(kaweth->net, "Opening network device.\n");
-+
-+ res = usb_autopm_get_interface(kaweth->intf);
-+ if (res) {
-+ dev_err(&kaweth->intf->dev, "Interface cannot be resumed.\n");
-+ return -EIO;
-+ }
-+ res = kaweth_resubmit_rx_urb(kaweth, GFP_KERNEL);
-+ if (res)
-+ goto err_out;
-+
-+ usb_fill_int_urb(
-+ kaweth->irq_urb,
-+ kaweth->dev,
-+ usb_rcvintpipe(kaweth->dev, 3),
-+ kaweth->intbuffer,
-+ INTBUFFERSIZE,
-+ int_callback,
-+ kaweth,
-+ 250); /* overriding the descriptor */
-+ kaweth->irq_urb->transfer_dma = kaweth->intbufferhandle;
-+ kaweth->irq_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
-+
-+ res = usb_submit_urb(kaweth->irq_urb, GFP_KERNEL);
-+ if (res) {
-+ usb_kill_urb(kaweth->rx_urb);
-+ goto err_out;
-+ }
-+ kaweth->opened = 1;
-+
-+ netif_start_queue(net);
-+
-+ kaweth_async_set_rx_mode(kaweth);
-+ return 0;
-+
-+err_out:
-+ usb_autopm_put_interface(kaweth->intf);
-+ return -EIO;
-+}
-+
-+/****************************************************************
-+ * kaweth_kill_urbs
-+ ****************************************************************/
-+static void kaweth_kill_urbs(struct kaweth_device *kaweth)
-+{
-+ usb_kill_urb(kaweth->irq_urb);
-+ usb_kill_urb(kaweth->rx_urb);
-+ usb_kill_urb(kaweth->tx_urb);
-+
-+ cancel_delayed_work_sync(&kaweth->lowmem_work);
-+
-+ /* a scheduled work may have resubmitted,
-+ we hit them again */
-+ usb_kill_urb(kaweth->irq_urb);
-+ usb_kill_urb(kaweth->rx_urb);
-+}
-+
-+/****************************************************************
-+ * kaweth_close
-+ ****************************************************************/
-+static int kaweth_close(struct net_device *net)
-+{
-+ struct kaweth_device *kaweth = netdev_priv(net);
-+
-+ netif_stop_queue(net);
-+ kaweth->opened = 0;
-+
-+ kaweth->status |= KAWETH_STATUS_CLOSING;
-+
-+ kaweth_kill_urbs(kaweth);
-+
-+ kaweth->status &= ~KAWETH_STATUS_CLOSING;
-+
-+ usb_autopm_put_interface(kaweth->intf);
-+
-+ return 0;
-+}
-+
-+static u32 kaweth_get_link(struct net_device *dev)
-+{
-+ struct kaweth_device *kaweth = netdev_priv(dev);
-+
-+ return kaweth->linkstate;
-+}
-+
-+static const struct ethtool_ops ops = {
-+ .get_link = kaweth_get_link
-+};
-+
-+/****************************************************************
-+ * kaweth_usb_transmit_complete
-+ ****************************************************************/
-+static void kaweth_usb_transmit_complete(struct urb *urb)
-+{
-+ struct kaweth_device *kaweth = urb->context;
-+ struct sk_buff *skb = kaweth->tx_skb;
-+ int status = urb->status;
-+
-+ if (unlikely(status != 0))
-+ if (status != -ENOENT)
-+ dev_dbg(&urb->dev->dev, "%s: TX status %d.\n",
-+ kaweth->net->name, status);
-+
-+ netif_wake_queue(kaweth->net);
-+ dev_kfree_skb_irq(skb);
-+}
-+
-+/****************************************************************
-+ * kaweth_start_xmit
-+ ****************************************************************/
-+static netdev_tx_t kaweth_start_xmit(struct sk_buff *skb,
-+ struct net_device *net)
-+{
-+ struct kaweth_device *kaweth = netdev_priv(net);
-+ __le16 *private_header;
-+
-+ int res;
-+
-+ spin_lock_irq(&kaweth->device_lock);
-+
-+ kaweth_async_set_rx_mode(kaweth);
-+ netif_stop_queue(net);
-+ if (IS_BLOCKED(kaweth->status)) {
-+ goto skip;
-+ }
-+
-+ /* We now decide whether we can put our special header into the sk_buff */
-+ if (skb_cloned(skb) || skb_headroom(skb) < 2) {
-+ /* no such luck - we make our own */
-+ struct sk_buff *copied_skb;
-+ copied_skb = skb_copy_expand(skb, 2, 0, GFP_ATOMIC);
-+ dev_kfree_skb_irq(skb);
-+ skb = copied_skb;
-+ if (!copied_skb) {
-+ kaweth->stats.tx_errors++;
-+ netif_start_queue(net);
-+ spin_unlock_irq(&kaweth->device_lock);
-+ return NETDEV_TX_OK;
-+ }
-+ }
-+
-+ private_header = (__le16 *)__skb_push(skb, 2);
-+ *private_header = cpu_to_le16(skb->len-2);
-+ kaweth->tx_skb = skb;
-+
-+ usb_fill_bulk_urb(kaweth->tx_urb,
-+ kaweth->dev,
-+ usb_sndbulkpipe(kaweth->dev, 2),
-+ private_header,
-+ skb->len,
-+ kaweth_usb_transmit_complete,
-+ kaweth);
-+ kaweth->end = 0;
-+
-+ if((res = usb_submit_urb(kaweth->tx_urb, GFP_ATOMIC)))
-+ {
-+ dev_warn(&net->dev, "kaweth failed tx_urb %d\n", res);
-+skip:
-+ kaweth->stats.tx_errors++;
-+
-+ netif_start_queue(net);
-+ dev_kfree_skb_irq(skb);
-+ }
-+ else
-+ {
-+ kaweth->stats.tx_packets++;
-+ kaweth->stats.tx_bytes += skb->len;
-+ }
-+
-+ spin_unlock_irq(&kaweth->device_lock);
-+
-+ return NETDEV_TX_OK;
-+}
-+
-+/****************************************************************
-+ * kaweth_set_rx_mode
-+ ****************************************************************/
-+static void kaweth_set_rx_mode(struct net_device *net)
-+{
-+ struct kaweth_device *kaweth = netdev_priv(net);
-+
-+ __u16 packet_filter_bitmap = KAWETH_PACKET_FILTER_DIRECTED |
-+ KAWETH_PACKET_FILTER_BROADCAST |
-+ KAWETH_PACKET_FILTER_MULTICAST;
-+
-+ netdev_dbg(net, "Setting Rx mode to %d\n", packet_filter_bitmap);
-+
-+ netif_stop_queue(net);
-+
-+ if (net->flags & IFF_PROMISC) {
-+ packet_filter_bitmap |= KAWETH_PACKET_FILTER_PROMISCUOUS;
-+ }
-+ else if (!netdev_mc_empty(net) || (net->flags & IFF_ALLMULTI)) {
-+ packet_filter_bitmap |= KAWETH_PACKET_FILTER_ALL_MULTICAST;
-+ }
-+
-+ kaweth->packet_filter_bitmap = packet_filter_bitmap;
-+ netif_wake_queue(net);
-+}
-+
-+/****************************************************************
-+ * kaweth_async_set_rx_mode
-+ ****************************************************************/
-+static void kaweth_async_set_rx_mode(struct kaweth_device *kaweth)
-+{
-+ int result;
-+ __u16 packet_filter_bitmap = kaweth->packet_filter_bitmap;
-+
-+ kaweth->packet_filter_bitmap = 0;
-+ if (packet_filter_bitmap == 0)
-+ return;
-+
-+ if (in_interrupt())
-+ return;
-+
-+ result = kaweth_control(kaweth,
-+ usb_sndctrlpipe(kaweth->dev, 0),
-+ KAWETH_COMMAND_SET_PACKET_FILTER,
-+ USB_TYPE_VENDOR | USB_DIR_OUT | USB_RECIP_DEVICE,
-+ packet_filter_bitmap,
-+ 0,
-+ (void *)&kaweth->scratch,
-+ 0,
-+ KAWETH_CONTROL_TIMEOUT);
-+
-+ if(result < 0) {
-+ dev_err(&kaweth->intf->dev, "Failed to set Rx mode: %d\n",
-+ result);
-+ }
-+ else {
-+ netdev_dbg(kaweth->net, "Set Rx mode to %d\n",
-+ packet_filter_bitmap);
-+ }
-+}
-+
-+/****************************************************************
-+ * kaweth_netdev_stats
-+ ****************************************************************/
-+static struct net_device_stats *kaweth_netdev_stats(struct net_device *dev)
-+{
-+ struct kaweth_device *kaweth = netdev_priv(dev);
-+ return &kaweth->stats;
-+}
-+
-+/****************************************************************
-+ * kaweth_tx_timeout
-+ ****************************************************************/
-+static void kaweth_tx_timeout(struct net_device *net)
-+{
-+ struct kaweth_device *kaweth = netdev_priv(net);
-+
-+ dev_warn(&net->dev, "%s: Tx timed out. Resetting.\n", net->name);
-+ kaweth->stats.tx_errors++;
-+ net->trans_start = jiffies;
-+
-+ usb_unlink_urb(kaweth->tx_urb);
-+}
-+
-+/****************************************************************
-+ * kaweth_suspend
-+ ****************************************************************/
-+static int kaweth_suspend(struct usb_interface *intf, pm_message_t message)
-+{
-+ struct kaweth_device *kaweth = usb_get_intfdata(intf);
-+ unsigned long flags;
-+
-+ dev_dbg(&intf->dev, "Suspending device\n");
-+ spin_lock_irqsave(&kaweth->device_lock, flags);
-+ kaweth->status |= KAWETH_STATUS_SUSPENDING;
-+ spin_unlock_irqrestore(&kaweth->device_lock, flags);
-+
-+ kaweth_kill_urbs(kaweth);
-+ return 0;
-+}
-+
-+/****************************************************************
-+ * kaweth_resume
-+ ****************************************************************/
-+static int kaweth_resume(struct usb_interface *intf)
-+{
-+ struct kaweth_device *kaweth = usb_get_intfdata(intf);
-+ unsigned long flags;
-+
-+ dev_dbg(&intf->dev, "Resuming device\n");
-+ spin_lock_irqsave(&kaweth->device_lock, flags);
-+ kaweth->status &= ~KAWETH_STATUS_SUSPENDING;
-+ spin_unlock_irqrestore(&kaweth->device_lock, flags);
-+
-+ if (!kaweth->opened)
-+ return 0;
-+ kaweth_resubmit_rx_urb(kaweth, GFP_NOIO);
-+ kaweth_resubmit_int_urb(kaweth, GFP_NOIO);
-+
-+ return 0;
-+}
-+
-+/****************************************************************
-+ * kaweth_probe
-+ ****************************************************************/
-+
-+
-+static const struct net_device_ops kaweth_netdev_ops = {
-+ .ndo_open = kaweth_open,
-+ .ndo_stop = kaweth_close,
-+ .ndo_start_xmit = kaweth_start_xmit,
-+ .ndo_tx_timeout = kaweth_tx_timeout,
-+ .ndo_set_rx_mode = kaweth_set_rx_mode,
-+ .ndo_get_stats = kaweth_netdev_stats,
-+ .ndo_change_mtu = eth_change_mtu,
-+ .ndo_set_mac_address = eth_mac_addr,
-+ .ndo_validate_addr = eth_validate_addr,
-+};
-+
-+static int kaweth_probe(
-+ struct usb_interface *intf,
-+ const struct usb_device_id *id /* from id_table */
-+ )
-+{
-+ struct device *dev = &intf->dev;
-+ struct usb_device *udev = interface_to_usbdev(intf);
-+ struct kaweth_device *kaweth;
-+ struct net_device *netdev;
-+ const eth_addr_t bcast_addr = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
-+ int result = 0;
-+
-+ dev_dbg(dev,
-+ "Kawasaki Device Probe (Device number:%d): 0x%4.4x:0x%4.4x:0x%4.4x\n",
-+ udev->devnum, le16_to_cpu(udev->descriptor.idVendor),
-+ le16_to_cpu(udev->descriptor.idProduct),
-+ le16_to_cpu(udev->descriptor.bcdDevice));
-+
-+ dev_dbg(dev, "Device at %p\n", udev);
-+
-+ dev_dbg(dev, "Descriptor length: %x type: %x\n",
-+ (int)udev->descriptor.bLength,
-+ (int)udev->descriptor.bDescriptorType);
-+
-+ netdev = alloc_etherdev(sizeof(*kaweth));
-+ if (!netdev)
-+ return -ENOMEM;
-+
-+ kaweth = netdev_priv(netdev);
-+ kaweth->dev = udev;
-+ kaweth->net = netdev;
-+
-+ spin_lock_init(&kaweth->device_lock);
-+ init_waitqueue_head(&kaweth->term_wait);
-+
-+ dev_dbg(dev, "Resetting.\n");
-+
-+ kaweth_reset(kaweth);
-+
-+ /*
-+ * If high byte of bcdDevice is nonzero, firmware is already
-+ * downloaded. Don't try to do it again, or we'll hang the device.
-+ */
-+
-+ if (le16_to_cpu(udev->descriptor.bcdDevice) >> 8) {
-+ dev_info(dev, "Firmware present in device.\n");
-+ } else {
-+ /* Download the firmware */
-+ dev_info(dev, "Downloading firmware...\n");
-+ kaweth->firmware_buf = (__u8 *)__get_free_page(GFP_KERNEL);
-+ if ((result = kaweth_download_firmware(kaweth,
-+ "kaweth/new_code.bin",
-+ 100,
-+ 2)) < 0) {
-+ dev_err(dev, "Error downloading firmware (%d)\n",
-+ result);
-+ goto err_fw;
-+ }
-+
-+ if ((result = kaweth_download_firmware(kaweth,
-+ "kaweth/new_code_fix.bin",
-+ 100,
-+ 3)) < 0) {
-+ dev_err(dev, "Error downloading firmware fix (%d)\n",
-+ result);
-+ goto err_fw;
-+ }
-+
-+ if ((result = kaweth_download_firmware(kaweth,
-+ "kaweth/trigger_code.bin",
-+ 126,
-+ 2)) < 0) {
-+ dev_err(dev, "Error downloading trigger code (%d)\n",
-+ result);
-+ goto err_fw;
-+
-+ }
-+
-+ if ((result = kaweth_download_firmware(kaweth,
-+ "kaweth/trigger_code_fix.bin",
-+ 126,
-+ 3)) < 0) {
-+ dev_err(dev, "Error downloading trigger code fix (%d)\n", result);
-+ goto err_fw;
-+ }
-+
-+
-+ if ((result = kaweth_trigger_firmware(kaweth, 126)) < 0) {
-+ dev_err(dev, "Error triggering firmware (%d)\n", result);
-+ goto err_fw;
-+ }
-+
-+ /* Device will now disappear for a moment... */
-+ dev_info(dev, "Firmware loaded. I'll be back...\n");
-+err_fw:
-+ free_page((unsigned long)kaweth->firmware_buf);
-+ free_netdev(netdev);
-+ return -EIO;
-+ }
-+
-+ result = kaweth_read_configuration(kaweth);
-+
-+ if(result < 0) {
-+ dev_err(dev, "Error reading configuration (%d), no net device created\n", result);
-+ goto err_free_netdev;
-+ }
-+
-+ dev_info(dev, "Statistics collection: %x\n", kaweth->configuration.statistics_mask);
-+ dev_info(dev, "Multicast filter limit: %x\n", kaweth->configuration.max_multicast_filters & ((1 << 15) - 1));
-+ dev_info(dev, "MTU: %d\n", le16_to_cpu(kaweth->configuration.segment_size));
-+ dev_info(dev, "Read MAC address %pM\n", kaweth->configuration.hw_addr);
-+
-+ if(!memcmp(&kaweth->configuration.hw_addr,
-+ &bcast_addr,
-+ sizeof(bcast_addr))) {
-+ dev_err(dev, "Firmware not functioning properly, no net device created\n");
-+ goto err_free_netdev;
-+ }
-+
-+ if(kaweth_set_urb_size(kaweth, KAWETH_BUF_SIZE) < 0) {
-+ dev_dbg(dev, "Error setting URB size\n");
-+ goto err_free_netdev;
-+ }
-+
-+ if(kaweth_set_sofs_wait(kaweth, KAWETH_SOFS_TO_WAIT) < 0) {
-+ dev_err(dev, "Error setting SOFS wait\n");
-+ goto err_free_netdev;
-+ }
-+
-+ result = kaweth_set_receive_filter(kaweth,
-+ KAWETH_PACKET_FILTER_DIRECTED |
-+ KAWETH_PACKET_FILTER_BROADCAST |
-+ KAWETH_PACKET_FILTER_MULTICAST);
-+
-+ if(result < 0) {
-+ dev_err(dev, "Error setting receive filter\n");
-+ goto err_free_netdev;
-+ }
-+
-+ dev_dbg(dev, "Initializing net device.\n");
-+
-+ kaweth->intf = intf;
-+
-+ kaweth->tx_urb = usb_alloc_urb(0, GFP_KERNEL);
-+ if (!kaweth->tx_urb)
-+ goto err_free_netdev;
-+ kaweth->rx_urb = usb_alloc_urb(0, GFP_KERNEL);
-+ if (!kaweth->rx_urb)
-+ goto err_only_tx;
-+ kaweth->irq_urb = usb_alloc_urb(0, GFP_KERNEL);
-+ if (!kaweth->irq_urb)
-+ goto err_tx_and_rx;
-+
-+ kaweth->intbuffer = usb_alloc_coherent( kaweth->dev,
-+ INTBUFFERSIZE,
-+ GFP_KERNEL,
-+ &kaweth->intbufferhandle);
-+ if (!kaweth->intbuffer)
-+ goto err_tx_and_rx_and_irq;
-+ kaweth->rx_buf = usb_alloc_coherent( kaweth->dev,
-+ KAWETH_BUF_SIZE,
-+ GFP_KERNEL,
-+ &kaweth->rxbufferhandle);
-+ if (!kaweth->rx_buf)
-+ goto err_all_but_rxbuf;
-+
-+ memcpy(netdev->broadcast, &bcast_addr, sizeof(bcast_addr));
-+ memcpy(netdev->dev_addr, &kaweth->configuration.hw_addr,
-+ sizeof(kaweth->configuration.hw_addr));
-+
-+ netdev->netdev_ops = &kaweth_netdev_ops;
-+ netdev->watchdog_timeo = KAWETH_TX_TIMEOUT;
-+ netdev->mtu = le16_to_cpu(kaweth->configuration.segment_size);
-+ netdev->ethtool_ops = &ops;
-+
-+ /* kaweth is zeroed as part of alloc_netdev */
-+ INIT_DELAYED_WORK(&kaweth->lowmem_work, kaweth_resubmit_tl);
-+ usb_set_intfdata(intf, kaweth);
-+
-+#if 0
-+// dma_supported() is deeply broken on almost all architectures
-+ if (dma_supported (dev, 0xffffffffffffffffULL))
-+ kaweth->net->features |= NETIF_F_HIGHDMA;
-+#endif
-+
-+ SET_NETDEV_DEV(netdev, dev);
-+ if (register_netdev(netdev) != 0) {
-+ dev_err(dev, "Error registering netdev.\n");
-+ goto err_intfdata;
-+ }
-+
-+ dev_info(dev, "kaweth interface created at %s\n",
-+ kaweth->net->name);
-+
-+ dev_dbg(dev, "Kaweth probe returning.\n");
-+
-+ return 0;
-+
-+err_intfdata:
-+ usb_set_intfdata(intf, NULL);
-+ usb_free_coherent(kaweth->dev, KAWETH_BUF_SIZE, (void *)kaweth->rx_buf, kaweth->rxbufferhandle);
-+err_all_but_rxbuf:
-+ usb_free_coherent(kaweth->dev, INTBUFFERSIZE, (void *)kaweth->intbuffer, kaweth->intbufferhandle);
-+err_tx_and_rx_and_irq:
-+ usb_free_urb(kaweth->irq_urb);
-+err_tx_and_rx:
-+ usb_free_urb(kaweth->rx_urb);
-+err_only_tx:
-+ usb_free_urb(kaweth->tx_urb);
-+err_free_netdev:
-+ free_netdev(netdev);
-+
-+ return -EIO;
-+}
-+
-+/****************************************************************
-+ * kaweth_disconnect
-+ ****************************************************************/
-+static void kaweth_disconnect(struct usb_interface *intf)
-+{
-+ struct kaweth_device *kaweth = usb_get_intfdata(intf);
-+ struct net_device *netdev;
-+
-+ dev_info(&intf->dev, "Unregistering\n");
-+
-+ usb_set_intfdata(intf, NULL);
-+ if (!kaweth) {
-+ dev_warn(&intf->dev, "unregistering non-existent device\n");
-+ return;
-+ }
-+ netdev = kaweth->net;
-+
-+ netdev_dbg(kaweth->net, "Unregistering net device\n");
-+ unregister_netdev(netdev);
-+
-+ usb_free_urb(kaweth->rx_urb);
-+ usb_free_urb(kaweth->tx_urb);
-+ usb_free_urb(kaweth->irq_urb);
-+
-+ usb_free_coherent(kaweth->dev, KAWETH_BUF_SIZE, (void *)kaweth->rx_buf, kaweth->rxbufferhandle);
-+ usb_free_coherent(kaweth->dev, INTBUFFERSIZE, (void *)kaweth->intbuffer, kaweth->intbufferhandle);
-+
-+ free_netdev(netdev);
-+}
-+
-+
-+// FIXME this completion stuff is a modified clone of
-+// an OLD version of some stuff in usb.c ...
-+struct usb_api_data {
-+ wait_queue_head_t wqh;
-+ int done;
-+};
-+
-+/*-------------------------------------------------------------------*
-+ * completion handler for compatibility wrappers (sync control/bulk) *
-+ *-------------------------------------------------------------------*/
-+static void usb_api_blocking_completion(struct urb *urb)
-+{
-+ struct usb_api_data *awd = (struct usb_api_data *)urb->context;
-+
-+ awd->done=1;
-+ wake_up(&awd->wqh);
-+}
-+
-+/*-------------------------------------------------------------------*
-+ * COMPATIBILITY STUFF *
-+ *-------------------------------------------------------------------*/
-+
-+// Starts urb and waits for completion or timeout
-+static int usb_start_wait_urb(struct urb *urb, int timeout, int* actual_length)
-+{
-+ struct usb_api_data awd;
-+ int status;
-+
-+ init_waitqueue_head(&awd.wqh);
-+ awd.done = 0;
-+
-+ urb->context = &awd;
-+ status = usb_submit_urb(urb, GFP_NOIO);
-+ if (status) {
-+ // something went wrong
-+ usb_free_urb(urb);
-+ return status;
-+ }
-+
-+ if (!wait_event_timeout(awd.wqh, awd.done, timeout)) {
-+ // timeout
-+ dev_warn(&urb->dev->dev, "usb_control/bulk_msg: timeout\n");
-+ usb_kill_urb(urb); // remove urb safely
-+ status = -ETIMEDOUT;
-+ }
-+ else {
-+ status = urb->status;
-+ }
-+
-+ if (actual_length) {
-+ *actual_length = urb->actual_length;
-+ }
-+
-+ usb_free_urb(urb);
-+ return status;
-+}
-+
-+/*-------------------------------------------------------------------*/
-+// returns status (negative) or length (positive)
-+static int kaweth_internal_control_msg(struct usb_device *usb_dev,
-+ unsigned int pipe,
-+ struct usb_ctrlrequest *cmd, void *data,
-+ int len, int timeout)
-+{
-+ struct urb *urb;
-+ int retv;
-+ int length = 0; /* shut up GCC */
-+
-+ urb = usb_alloc_urb(0, GFP_ATOMIC);
-+ if (!urb)
-+ return -ENOMEM;
-+
-+ usb_fill_control_urb(urb, usb_dev, pipe, (unsigned char*)cmd, data,
-+ len, usb_api_blocking_completion, NULL);
-+
-+ retv = usb_start_wait_urb(urb, timeout, &length);
-+ if (retv < 0) {
-+ return retv;
-+ }
-+ else {
-+ return length;
-+ }
-+}
-+
-+module_usb_driver(kaweth_driver);
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/Kconfig backports-3.18.1-1/drivers/net/usb/Kconfig
---- backports-3.18.1-1.org/drivers/net/usb/Kconfig 2014-12-21 22:37:15.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/Kconfig 2015-01-03 15:19:02.310281530 +0100
-@@ -13,7 +13,6 @@
- if USB_NET_DRIVERS
-
- config USB_CATC
-- depends on n
- tristate "USB CATC NetMate-based Ethernet device support"
- depends on m
- depends on CRC32
-@@ -34,7 +33,6 @@
- module will be called catc.
-
- config USB_KAWETH
-- depends on n
- tristate "USB KLSI KL5USB101-based ethernet device support"
- depends on m
- ---help---
-@@ -75,7 +73,6 @@
- module will be called kaweth.
-
- config USB_PEGASUS
-- depends on n
- tristate "USB Pegasus/Pegasus-II based ethernet device support"
- depends on m
- select BACKPORT_MII
-@@ -92,7 +89,6 @@
- module will be called pegasus.
-
- config USB_RTL8150
-- depends on n
- tristate "USB RTL8150 based ethernet device support"
- depends on m
- select BACKPORT_MII
-@@ -105,7 +101,6 @@
- module will be called rtl8150.
-
- config USB_RTL8152
-- depends on n
- tristate "Realtek RTL8152/RTL8153 Based USB Ethernet Adapters"
- depends on m
- select BACKPORT_MII
-@@ -153,7 +148,6 @@
- module will be called usbnet.
-
- config USB_NET_AX8817X
-- depends on n
- tristate "ASIX AX88xxx Based USB 2.0 Ethernet Adapters"
- depends on m
- depends on USB_USBNET
-@@ -183,7 +177,6 @@
- what other networking devices you have in use.
-
- config USB_NET_AX88179_178A
-- depends on n
- tristate "ASIX AX88179/178A USB 3.0/2.0 to Gigabit Ethernet"
- depends on m
- depends on USB_USBNET
-@@ -232,7 +225,6 @@
- name is used instead.
-
- config USB_NET_CDC_EEM
-- depends on n
- tristate "CDC EEM support"
- depends on m
- depends on USB_USBNET
-@@ -268,7 +260,6 @@
- * Ericsson F5521gw Mobile Broadband Module
-
- config USB_NET_HUAWEI_CDC_NCM
-- depends on n
- tristate "Huawei NCM embedded AT channel support"
- depends on m
- depends on USB_USBNET
-@@ -304,7 +295,6 @@
- module will be called cdc_mbim.
-
- config USB_NET_DM9601
-- depends on n
- tristate "Davicom DM96xx based USB 10/100 ethernet devices"
- depends on m
- depends on USB_USBNET
-@@ -314,7 +304,6 @@
- based USB 10/100 Ethernet adapters.
-
- config USB_NET_SR9700
-- depends on n
- tristate "CoreChip-sz SR9700 based USB 1.1 10/100 ethernet devices"
- depends on m
- depends on USB_USBNET
-@@ -324,7 +313,6 @@
- 10/100 Ethernet adapters.
-
- config USB_NET_SR9800
-- depends on n
- tristate "CoreChip-sz SR9800 based USB 2.0 10/100 ethernet devices"
- depends on m
- depends on USB_USBNET
-@@ -341,7 +329,6 @@
- module will be called sr9800.
-
- config USB_NET_SMSC75XX
-- depends on n
- tristate "SMSC LAN75XX based USB 2.0 gigabit ethernet devices"
- depends on m
- depends on USB_USBNET
-@@ -353,7 +340,6 @@
- Gigabit Ethernet adapters.
-
- config USB_NET_SMSC95XX
-- depends on n
- tristate "SMSC LAN95XX based USB 2.0 10/100 ethernet devices"
- depends on m
- depends on USB_USBNET
-@@ -365,7 +351,6 @@
- 10/100 Ethernet adapters.
-
- config USB_NET_GL620A
-- depends on n
- tristate "GeneSys GL620USB-A based cables"
- depends on m
- depends on USB_USBNET
-@@ -376,7 +361,6 @@
- Note that the half-duplex "GL620USB" is not supported.
-
- config USB_NET_NET1080
-- depends on n
- tristate "NetChip 1080 based cables (Laplink, ...)"
- depends on m
- default y
-@@ -387,7 +371,6 @@
- optionally with LEDs that indicate traffic
-
- config USB_NET_PLUSB
-- depends on n
- tristate "Prolific PL-2301/2302/25A1 based cables"
- depends on m
- # if the handshake/init/reset problems, from original 'plusb',
-@@ -398,7 +381,6 @@
- with one of these chips.
-
- config USB_NET_MCS7830
-- depends on n
- tristate "MosChip MCS7830 based Ethernet adapters"
- depends on m
- depends on USB_USBNET
-@@ -424,7 +406,6 @@
- (and for) Microsoft; it isn't an "Open" ecosystem or market.
-
- config USB_NET_CDC_SUBSET
-- depends on n
- tristate "Simple USB Network Links (CDC Ethernet subset)"
- depends on m
- depends on USB_USBNET
-@@ -496,7 +477,6 @@
- with one of these chips.
-
- config USB_NET_ZAURUS
-- depends on n
- tristate "Sharp Zaurus (stock ROMs) and compatible"
- depends on m
- depends on USB_USBNET
-@@ -516,7 +496,6 @@
- some cases CDC MDLM) protocol, not "g_ether".
-
- config USB_NET_CX82310_ETH
-- depends on n
- tristate "Conexant CX82310 USB ethernet port"
- depends on m
- depends on USB_USBNET
-@@ -526,7 +505,6 @@
- it will not work with ADSL modems (use cxacru driver instead).
-
- config USB_NET_KALMIA
-- depends on n
- tristate "Samsung Kalmia based LTE USB modem"
- depends on m
- depends on USB_USBNET
-@@ -561,7 +539,6 @@
- module will be called qmi_wwan.
-
- config USB_HSO
-- depends on n
- tristate "Option USB High Speed Mobile Devices"
- depends on m
- depends on USB && RFKILL && TTY
-@@ -574,7 +551,6 @@
- module will be called hso.
-
- config USB_NET_INT51X1
-- depends on n
- tristate "Intellon PLC based usb adapter"
- depends on m
- depends on USB_USBNET
-@@ -584,7 +560,6 @@
- INT51x1/INT5200 chip, like the "devolo dLan duo".
-
- config USB_CDC_PHONET
-- depends on n
- tristate "CDC Phonet support"
- depends on m
- depends on PHONET
-@@ -594,7 +569,6 @@
- "PC suite" USB profile.
-
- config USB_IPHETH
-- depends on n
- tristate "Apple iPhone USB Ethernet driver"
- depends on m
- default n
-@@ -618,11 +592,10 @@
- module will be called sierra_net.
-
- config USB_VL600
-- depends on n
- tristate "LG VL600 modem dongle"
- depends on m
- depends on USB_NET_CDCETHER && TTY
-- select USB_ACM
-+# depends on USB_ACM
- help
- Select this if you want to use an LG Electronics 4G/LTE usb modem
- called VL600. This driver only handles the ethernet
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/lg-vl600.c backports-3.18.1-1/drivers/net/usb/lg-vl600.c
---- backports-3.18.1-1.org/drivers/net/usb/lg-vl600.c 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/lg-vl600.c 2014-12-16 18:39:45.000000000 +0100
-@@ -0,0 +1,353 @@
-+/*
-+ * Ethernet interface part of the LG VL600 LTE modem (4G dongle)
-+ *
-+ * Copyright (C) 2011 Intel Corporation
-+ * Author: Andrzej Zaborowski <balrogg(a)gmail.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, see <http://www.gnu.org/licenses/>.
-+ */
-+#include <linux/etherdevice.h>
-+#include <linux/ethtool.h>
-+#include <linux/mii.h>
-+#include <linux/usb.h>
-+#include <linux/usb/cdc.h>
-+#include <linux/usb/usbnet.h>
-+#include <linux/if_ether.h>
-+#include <linux/if_arp.h>
-+#include <linux/inetdevice.h>
-+#include <linux/module.h>
-+
-+/*
-+ * The device has a CDC ACM port for modem control (it claims to be
-+ * CDC ACM anyway) and a CDC Ethernet port for actual network data.
-+ * It will however ignore data on both ports that is not encapsulated
-+ * in a specific way, any data returned is also encapsulated the same
-+ * way. The headers don't seem to follow any popular standard.
-+ *
-+ * This driver adds and strips these headers from the ethernet frames
-+ * sent/received from the CDC Ethernet port. The proprietary header
-+ * replaces the standard ethernet header in a packet so only actual
-+ * ethernet frames are allowed. The headers allow some form of
-+ * multiplexing by using non standard values of the .h_proto field.
-+ * Windows/Mac drivers do send a couple of such frames to the device
-+ * during initialisation, with protocol set to 0x0906 or 0x0b06 and (what
-+ * seems to be) a flag in the .dummy_flags. This doesn't seem necessary
-+ * for modem operation but can possibly be used for GPS or other funcitons.
-+ */
-+
-+struct vl600_frame_hdr {
-+ __le32 len;
-+ __le32 serial;
-+ __le32 pkt_cnt;
-+ __le32 dummy_flags;
-+ __le32 dummy;
-+ __le32 magic;
-+} __attribute__((packed));
-+
-+struct vl600_pkt_hdr {
-+ __le32 dummy[2];
-+ __le32 len;
-+ __be16 h_proto;
-+} __attribute__((packed));
-+
-+struct vl600_state {
-+ struct sk_buff *current_rx_buf;
-+};
-+
-+static int vl600_bind(struct usbnet *dev, struct usb_interface *intf)
-+{
-+ int ret;
-+ struct vl600_state *s = kzalloc(sizeof(struct vl600_state), GFP_KERNEL);
-+
-+ if (!s)
-+ return -ENOMEM;
-+
-+ ret = usbnet_cdc_bind(dev, intf);
-+ if (ret) {
-+ kfree(s);
-+ return ret;
-+ }
-+
-+ dev->driver_priv = s;
-+
-+ /* ARP packets don't go through, but they're also of no use. The
-+ * subnet has only two hosts anyway: us and the gateway / DHCP
-+ * server (probably simulated by modem firmware or network operator)
-+ * whose address changes everytime we connect to the intarwebz and
-+ * who doesn't bother answering ARP requests either. So hardware
-+ * addresses have no meaning, the destination and the source of every
-+ * packet depend only on whether it is on the IN or OUT endpoint. */
-+ dev->net->flags |= IFF_NOARP;
-+ /* IPv6 NDP relies on multicast. Enable it by default. */
-+ dev->net->flags |= IFF_MULTICAST;
-+
-+ return ret;
-+}
-+
-+static void vl600_unbind(struct usbnet *dev, struct usb_interface *intf)
-+{
-+ struct vl600_state *s = dev->driver_priv;
-+
-+ if (s->current_rx_buf)
-+ dev_kfree_skb(s->current_rx_buf);
-+
-+ kfree(s);
-+
-+ return usbnet_cdc_unbind(dev, intf);
-+}
-+
-+static int vl600_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
-+{
-+ struct vl600_frame_hdr *frame;
-+ struct vl600_pkt_hdr *packet;
-+ struct ethhdr *ethhdr;
-+ int packet_len, count;
-+ struct sk_buff *buf = skb;
-+ struct sk_buff *clone;
-+ struct vl600_state *s = dev->driver_priv;
-+
-+ /* Frame lengths are generally 4B multiplies but every couple of
-+ * hours there's an odd number of bytes sized yet correct frame,
-+ * so don't require this. */
-+
-+ /* Allow a packet (or multiple packets batched together) to be
-+ * split across many frames. We don't allow a new batch to
-+ * begin in the same frame another one is ending however, and no
-+ * leading or trailing pad bytes. */
-+ if (s->current_rx_buf) {
-+ frame = (struct vl600_frame_hdr *) s->current_rx_buf->data;
-+ if (skb->len + s->current_rx_buf->len >
-+ le32_to_cpup(&frame->len)) {
-+ netif_err(dev, ifup, dev->net, "Fragment too long\n");
-+ dev->net->stats.rx_length_errors++;
-+ goto error;
-+ }
-+
-+ buf = s->current_rx_buf;
-+ memcpy(skb_put(buf, skb->len), skb->data, skb->len);
-+ } else if (skb->len < 4) {
-+ netif_err(dev, ifup, dev->net, "Frame too short\n");
-+ dev->net->stats.rx_length_errors++;
-+ goto error;
-+ }
-+
-+ frame = (struct vl600_frame_hdr *) buf->data;
-+ /* Yes, check that frame->magic == 0x53544448 (or 0x44544d48),
-+ * otherwise we may run out of memory w/a bad packet */
-+ if (ntohl(frame->magic) != 0x53544448 &&
-+ ntohl(frame->magic) != 0x44544d48)
-+ goto error;
-+
-+ if (buf->len < sizeof(*frame) ||
-+ buf->len != le32_to_cpup(&frame->len)) {
-+ /* Save this fragment for later assembly */
-+ if (s->current_rx_buf)
-+ return 0;
-+
-+ s->current_rx_buf = skb_copy_expand(skb, 0,
-+ le32_to_cpup(&frame->len), GFP_ATOMIC);
-+ if (!s->current_rx_buf) {
-+ netif_err(dev, ifup, dev->net, "Reserving %i bytes "
-+ "for packet assembly failed.\n",
-+ le32_to_cpup(&frame->len));
-+ dev->net->stats.rx_errors++;
-+ }
-+
-+ return 0;
-+ }
-+
-+ count = le32_to_cpup(&frame->pkt_cnt);
-+
-+ skb_pull(buf, sizeof(*frame));
-+
-+ while (count--) {
-+ if (buf->len < sizeof(*packet)) {
-+ netif_err(dev, ifup, dev->net, "Packet too short\n");
-+ goto error;
-+ }
-+
-+ packet = (struct vl600_pkt_hdr *) buf->data;
-+ packet_len = sizeof(*packet) + le32_to_cpup(&packet->len);
-+ if (packet_len > buf->len) {
-+ netif_err(dev, ifup, dev->net,
-+ "Bad packet length stored in header\n");
-+ goto error;
-+ }
-+
-+ /* Packet header is same size as the ethernet header
-+ * (sizeof(*packet) == sizeof(*ethhdr)), additionally
-+ * the h_proto field is in the same place so we just leave it
-+ * alone and fill in the remaining fields.
-+ */
-+ ethhdr = (struct ethhdr *) skb->data;
-+ if (be16_to_cpup(ðhdr->h_proto) == ETH_P_ARP &&
-+ buf->len > 0x26) {
-+ /* Copy the addresses from packet contents */
-+ memcpy(ethhdr->h_source,
-+ &buf->data[sizeof(*ethhdr) + 0x8],
-+ ETH_ALEN);
-+ memcpy(ethhdr->h_dest,
-+ &buf->data[sizeof(*ethhdr) + 0x12],
-+ ETH_ALEN);
-+ } else {
-+ memset(ethhdr->h_source, 0, ETH_ALEN);
-+ memcpy(ethhdr->h_dest, dev->net->dev_addr, ETH_ALEN);
-+
-+ /* Inbound IPv6 packets have an IPv4 ethertype (0x800)
-+ * for some reason. Peek at the L3 header to check
-+ * for IPv6 packets, and set the ethertype to IPv6
-+ * (0x86dd) so Linux can understand it.
-+ */
-+ if ((buf->data[sizeof(*ethhdr)] & 0xf0) == 0x60)
-+ ethhdr->h_proto = htons(ETH_P_IPV6);
-+ }
-+
-+ if (count) {
-+ /* Not the last packet in this batch */
-+ clone = skb_clone(buf, GFP_ATOMIC);
-+ if (!clone)
-+ goto error;
-+
-+ skb_trim(clone, packet_len);
-+ usbnet_skb_return(dev, clone);
-+
-+ skb_pull(buf, (packet_len + 3) & ~3);
-+ } else {
-+ skb_trim(buf, packet_len);
-+
-+ if (s->current_rx_buf) {
-+ usbnet_skb_return(dev, buf);
-+ s->current_rx_buf = NULL;
-+ return 0;
-+ }
-+
-+ return 1;
-+ }
-+ }
-+
-+error:
-+ if (s->current_rx_buf) {
-+ dev_kfree_skb_any(s->current_rx_buf);
-+ s->current_rx_buf = NULL;
-+ }
-+ dev->net->stats.rx_errors++;
-+ return 0;
-+}
-+
-+static struct sk_buff *vl600_tx_fixup(struct usbnet *dev,
-+ struct sk_buff *skb, gfp_t flags)
-+{
-+ struct sk_buff *ret;
-+ struct vl600_frame_hdr *frame;
-+ struct vl600_pkt_hdr *packet;
-+ static uint32_t serial = 1;
-+ int orig_len = skb->len - sizeof(struct ethhdr);
-+ int full_len = (skb->len + sizeof(struct vl600_frame_hdr) + 3) & ~3;
-+
-+ frame = (struct vl600_frame_hdr *) skb->data;
-+ if (skb->len > sizeof(*frame) && skb->len == le32_to_cpup(&frame->len))
-+ return skb; /* Already encapsulated? */
-+
-+ if (skb->len < sizeof(struct ethhdr))
-+ /* Drop, device can only deal with ethernet packets */
-+ return NULL;
-+
-+ if (!skb_cloned(skb)) {
-+ int headroom = skb_headroom(skb);
-+ int tailroom = skb_tailroom(skb);
-+
-+ if (tailroom >= full_len - skb->len - sizeof(*frame) &&
-+ headroom >= sizeof(*frame))
-+ /* There's enough head and tail room */
-+ goto encapsulate;
-+
-+ if (headroom + tailroom + skb->len >= full_len) {
-+ /* There's enough total room, just readjust */
-+ skb->data = memmove(skb->head + sizeof(*frame),
-+ skb->data, skb->len);
-+ skb_set_tail_pointer(skb, skb->len);
-+ goto encapsulate;
-+ }
-+ }
-+
-+ /* Alloc a new skb with the required size */
-+ ret = skb_copy_expand(skb, sizeof(struct vl600_frame_hdr), full_len -
-+ skb->len - sizeof(struct vl600_frame_hdr), flags);
-+ dev_kfree_skb_any(skb);
-+ if (!ret)
-+ return ret;
-+ skb = ret;
-+
-+encapsulate:
-+ /* Packet header is same size as ethernet packet header
-+ * (sizeof(*packet) == sizeof(struct ethhdr)), additionally the
-+ * h_proto field is in the same place so we just leave it alone and
-+ * overwrite the remaining fields.
-+ */
-+ packet = (struct vl600_pkt_hdr *) skb->data;
-+ /* The VL600 wants IPv6 packets to have an IPv4 ethertype
-+ * Since this modem only supports IPv4 and IPv6, just set all
-+ * frames to 0x0800 (ETH_P_IP)
-+ */
-+ packet->h_proto = htons(ETH_P_IP);
-+ memset(&packet->dummy, 0, sizeof(packet->dummy));
-+ packet->len = cpu_to_le32(orig_len);
-+
-+ frame = (struct vl600_frame_hdr *) skb_push(skb, sizeof(*frame));
-+ memset(frame, 0, sizeof(*frame));
-+ frame->len = cpu_to_le32(full_len);
-+ frame->serial = cpu_to_le32(serial++);
-+ frame->pkt_cnt = cpu_to_le32(1);
-+
-+ if (skb->len < full_len) /* Pad */
-+ skb_put(skb, full_len - skb->len);
-+
-+ return skb;
-+}
-+
-+static const struct driver_info vl600_info = {
-+ .description = "LG VL600 modem",
-+ .flags = FLAG_RX_ASSEMBLE | FLAG_WWAN,
-+ .bind = vl600_bind,
-+ .unbind = vl600_unbind,
-+ .status = usbnet_cdc_status,
-+ .rx_fixup = vl600_rx_fixup,
-+ .tx_fixup = vl600_tx_fixup,
-+};
-+
-+static const struct usb_device_id products[] = {
-+ {
-+ USB_DEVICE_AND_INTERFACE_INFO(0x1004, 0x61aa, USB_CLASS_COMM,
-+ USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
-+ .driver_info = (unsigned long) &vl600_info,
-+ },
-+ {}, /* End */
-+};
-+MODULE_DEVICE_TABLE(usb, products);
-+
-+static struct usb_driver lg_vl600_driver = {
-+ .name = "lg-vl600",
-+ .id_table = products,
-+ .probe = usbnet_probe,
-+ .disconnect = usbnet_disconnect,
-+ .suspend = usbnet_suspend,
-+ .resume = usbnet_resume,
-+ .disable_hub_initiated_lpm = 1,
-+};
-+
-+module_usb_driver(lg_vl600_driver);
-+
-+MODULE_AUTHOR("Anrzej Zaborowski");
-+MODULE_DESCRIPTION("LG-VL600 modem's ethernet link");
-+MODULE_LICENSE("GPL");
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/Makefile backports-3.18.1-1/drivers/net/usb/Makefile
---- backports-3.18.1-1.org/drivers/net/usb/Makefile 2014-12-21 22:37:15.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/Makefile 2015-01-03 13:49:51.269970813 +0100
-@@ -1,39 +1,35 @@
--#
--# Makefile for USB Network drivers
--#
--#
--#obj-$(CPTCFG_USB_CATC) += catc.o
--#obj-$(CPTCFG_USB_KAWETH) += kaweth.o
--#obj-$(CPTCFG_USB_PEGASUS) += pegasus.o
--#obj-$(CPTCFG_USB_RTL8150) += rtl8150.o
--#obj-$(CPTCFG_USB_RTL8152) += r8152.o
--#obj-$(CPTCFG_USB_HSO) += hso.o
--#obj-$(CPTCFG_USB_NET_AX8817X) += asix.o
--#obj-$(CPTCFG_USB_NET_AX88179_178A) += ax88179_178a.o
-+obj-$(CPTCFG_USB_CATC) += catc.o
-+obj-$(CPTCFG_USB_KAWETH) += kaweth.o
-+obj-$(CPTCFG_USB_PEGASUS) += pegasus.o
-+obj-$(CPTCFG_USB_RTL8150) += rtl8150.o
-+obj-$(CPTCFG_USB_RTL8152) += r8152.o
-+obj-$(CPTCFG_USB_HSO) += hso.o
-+obj-$(CPTCFG_USB_NET_AX8817X) += asix.o
-+asix-y := asix_devices.o asix_common.o ax88172a.o
-+obj-$(CPTCFG_USB_NET_AX88179_178A) += ax88179_178a.o
- obj-$(CPTCFG_USB_NET_CDCETHER) += cdc_ether.o
--#obj-$(CPTCFG_USB_NET_CDC_EEM) += cdc_eem.o
--#obj-$(CPTCFG_USB_NET_DM9601) += dm9601.o
--#obj-$(CPTCFG_USB_NET_SR9700) += sr9700.o
--#obj-$(CPTCFG_USB_NET_SR9800) += sr9800.o
--#obj-$(CPTCFG_USB_NET_SMSC75XX) += smsc75xx.o
--#obj-$(CPTCFG_USB_NET_SMSC95XX) += smsc95xx.o
--#obj-$(CPTCFG_USB_NET_GL620A) += gl620a.o
--#obj-$(CPTCFG_USB_NET_NET1080) += net1080.o
--#obj-$(CPTCFG_USB_NET_PLUSB) += plusb.o
-+obj-$(CPTCFG_USB_NET_CDC_EEM) += cdc_eem.o
-+obj-$(CPTCFG_USB_NET_DM9601) += dm9601.o
-+obj-$(CPTCFG_USB_NET_SR9700) += sr9700.o
-+obj-$(CPTCFG_USB_NET_SR9800) += sr9800.o
-+obj-$(CPTCFG_USB_NET_SMSC75XX) += smsc75xx.o
-+obj-$(CPTCFG_USB_NET_SMSC95XX) += smsc95xx.o
-+obj-$(CPTCFG_USB_NET_GL620A) += gl620a.o
-+obj-$(CPTCFG_USB_NET_NET1080) += net1080.o
-+obj-$(CPTCFG_USB_NET_PLUSB) += plusb.o
- obj-$(CPTCFG_USB_NET_RNDIS_HOST) += rndis_host.o
--#obj-$(CPTCFG_USB_NET_CDC_SUBSET) += cdc_subset.o
--#obj-$(CPTCFG_USB_NET_ZAURUS) += zaurus.o
--#obj-$(CPTCFG_USB_NET_MCS7830) += mcs7830.o
-+obj-$(CPTCFG_USB_NET_CDC_SUBSET) += cdc_subset.o
-+obj-$(CPTCFG_USB_NET_ZAURUS) += zaurus.o
-+obj-$(CPTCFG_USB_NET_MCS7830) += mcs7830.o
- obj-$(CPTCFG_USB_USBNET) += usbnet.o
--#obj-$(CPTCFG_USB_NET_INT51X1) += int51x1.o
--#obj-$(CPTCFG_USB_CDC_PHONET) += cdc-phonet.o
--#obj-$(CPTCFG_USB_NET_KALMIA) += kalmia.o
--#obj-$(CPTCFG_USB_IPHETH) += ipheth.o
-+obj-$(CPTCFG_USB_NET_INT51X1) += int51x1.o
-+obj-$(CPTCFG_USB_CDC_PHONET) += cdc-phonet.o
-+obj-$(CPTCFG_USB_NET_KALMIA) += kalmia.o
-+obj-$(CPTCFG_USB_IPHETH) += ipheth.o
- obj-$(CPTCFG_USB_SIERRA_NET) += sierra_net.o
--#obj-$(CPTCFG_USB_NET_CX82310_ETH) += cx82310_eth.o
-+obj-$(CPTCFG_USB_NET_CX82310_ETH) += cx82310_eth.o
- obj-$(CPTCFG_USB_NET_CDC_NCM) += cdc_ncm.o
--#obj-$(CPTCFG_USB_NET_HUAWEI_CDC_NCM) += huawei_cdc_ncm.o
--#obj-$(CPTCFG_USB_VL600) += lg-vl600.o
-+obj-$(CPTCFG_USB_NET_HUAWEI_CDC_NCM) += huawei_cdc_ncm.o
-+obj-$(CPTCFG_USB_VL600) += lg-vl600.o
- obj-$(CPTCFG_USB_NET_QMI_WWAN) += qmi_wwan.o
- obj-$(CPTCFG_USB_NET_CDC_MBIM) += cdc_mbim.o
--
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/mcs7830.c backports-3.18.1-1/drivers/net/usb/mcs7830.c
---- backports-3.18.1-1.org/drivers/net/usb/mcs7830.c 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/mcs7830.c 2014-12-16 18:39:45.000000000 +0100
-@@ -0,0 +1,643 @@
-+/*
-+ * MOSCHIP MCS7830 based (7730/7830/7832) USB 2.0 Ethernet Devices
-+ *
-+ * based on usbnet.c, asix.c and the vendor provided mcs7830 driver
-+ *
-+ * Copyright (C) 2010 Andreas Mohr <andi(a)lisas.de>
-+ * Copyright (C) 2006 Arnd Bergmann <arnd(a)arndb.de>
-+ * Copyright (C) 2003-2005 David Hollis <dhollis(a)davehollis.com>
-+ * Copyright (C) 2005 Phil Chang <pchang23(a)sbcglobal.net>
-+ * Copyright (c) 2002-2003 TiVo Inc.
-+ *
-+ * Definitions gathered from MOSCHIP, Data Sheet_7830DA.pdf (thanks!).
-+ *
-+ * 2010-12-19: add 7832 USB PID ("functionality same as MCS7830"),
-+ * per active notification by manufacturer
-+ *
-+ * TODO:
-+ * - support HIF_REG_CONFIG_SLEEPMODE/HIF_REG_CONFIG_TXENABLE (via autopm?)
-+ * - implement ethtool_ops get_pauseparam/set_pauseparam
-+ * via HIF_REG_PAUSE_THRESHOLD (>= revision C only!)
-+ * - implement get_eeprom/[set_eeprom]
-+ * - switch PHY on/off on ifup/ifdown (perhaps in usbnet.c, via MII)
-+ * - mcs7830_get_regs() handling is weird: for rev 2 we return 32 regs,
-+ * can access only ~ 24, remaining user buffer is uninitialized garbage
-+ * - anything else?
-+ *
-+ *
-+ * 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, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include <linux/crc32.h>
-+#include <linux/etherdevice.h>
-+#include <linux/ethtool.h>
-+#include <linux/mii.h>
-+#include <linux/module.h>
-+#include <linux/netdevice.h>
-+#include <linux/slab.h>
-+#include <linux/usb.h>
-+#include <linux/usb/usbnet.h>
-+
-+/* requests */
-+#define MCS7830_RD_BMREQ (USB_DIR_IN | USB_TYPE_VENDOR | \
-+ USB_RECIP_DEVICE)
-+#define MCS7830_WR_BMREQ (USB_DIR_OUT | USB_TYPE_VENDOR | \
-+ USB_RECIP_DEVICE)
-+#define MCS7830_RD_BREQ 0x0E
-+#define MCS7830_WR_BREQ 0x0D
-+
-+#define MCS7830_CTRL_TIMEOUT 1000
-+#define MCS7830_MAX_MCAST 64
-+
-+#define MCS7830_VENDOR_ID 0x9710
-+#define MCS7832_PRODUCT_ID 0x7832
-+#define MCS7830_PRODUCT_ID 0x7830
-+#define MCS7730_PRODUCT_ID 0x7730
-+
-+#define SITECOM_VENDOR_ID 0x0DF6
-+#define LN_030_PRODUCT_ID 0x0021
-+
-+#define MCS7830_MII_ADVERTISE (ADVERTISE_PAUSE_CAP | ADVERTISE_100FULL | \
-+ ADVERTISE_100HALF | ADVERTISE_10FULL | \
-+ ADVERTISE_10HALF | ADVERTISE_CSMA)
-+
-+/* HIF_REG_XX corresponding index value */
-+enum {
-+ HIF_REG_MULTICAST_HASH = 0x00,
-+ HIF_REG_PACKET_GAP1 = 0x08,
-+ HIF_REG_PACKET_GAP2 = 0x09,
-+ HIF_REG_PHY_DATA = 0x0a,
-+ HIF_REG_PHY_CMD1 = 0x0c,
-+ HIF_REG_PHY_CMD1_READ = 0x40,
-+ HIF_REG_PHY_CMD1_WRITE = 0x20,
-+ HIF_REG_PHY_CMD1_PHYADDR = 0x01,
-+ HIF_REG_PHY_CMD2 = 0x0d,
-+ HIF_REG_PHY_CMD2_PEND_FLAG_BIT = 0x80,
-+ HIF_REG_PHY_CMD2_READY_FLAG_BIT = 0x40,
-+ HIF_REG_CONFIG = 0x0e,
-+ /* hmm, spec sez: "R/W", "Except bit 3" (likely TXENABLE). */
-+ HIF_REG_CONFIG_CFG = 0x80,
-+ HIF_REG_CONFIG_SPEED100 = 0x40,
-+ HIF_REG_CONFIG_FULLDUPLEX_ENABLE = 0x20,
-+ HIF_REG_CONFIG_RXENABLE = 0x10,
-+ HIF_REG_CONFIG_TXENABLE = 0x08,
-+ HIF_REG_CONFIG_SLEEPMODE = 0x04,
-+ HIF_REG_CONFIG_ALLMULTICAST = 0x02,
-+ HIF_REG_CONFIG_PROMISCUOUS = 0x01,
-+ HIF_REG_ETHERNET_ADDR = 0x0f,
-+ HIF_REG_FRAME_DROP_COUNTER = 0x15, /* 0..ff; reset: 0 */
-+ HIF_REG_PAUSE_THRESHOLD = 0x16,
-+ HIF_REG_PAUSE_THRESHOLD_DEFAULT = 0,
-+};
-+
-+/* Trailing status byte in Ethernet Rx frame */
-+enum {
-+ MCS7830_RX_SHORT_FRAME = 0x01, /* < 64 bytes */
-+ MCS7830_RX_LENGTH_ERROR = 0x02, /* framelen != Ethernet length field */
-+ MCS7830_RX_ALIGNMENT_ERROR = 0x04, /* non-even number of nibbles */
-+ MCS7830_RX_CRC_ERROR = 0x08,
-+ MCS7830_RX_LARGE_FRAME = 0x10, /* > 1518 bytes */
-+ MCS7830_RX_FRAME_CORRECT = 0x20, /* frame is correct */
-+ /* [7:6] reserved */
-+};
-+
-+struct mcs7830_data {
-+ u8 multi_filter[8];
-+ u8 config;
-+};
-+
-+static const char driver_name[] = "MOSCHIP usb-ethernet driver";
-+
-+static int mcs7830_get_reg(struct usbnet *dev, u16 index, u16 size, void *data)
-+{
-+ return usbnet_read_cmd(dev, MCS7830_RD_BREQ, MCS7830_RD_BMREQ,
-+ 0x0000, index, data, size);
-+}
-+
-+static int mcs7830_set_reg(struct usbnet *dev, u16 index, u16 size, const void *data)
-+{
-+ return usbnet_write_cmd(dev, MCS7830_WR_BREQ, MCS7830_WR_BMREQ,
-+ 0x0000, index, data, size);
-+}
-+
-+static void mcs7830_set_reg_async(struct usbnet *dev, u16 index, u16 size, void *data)
-+{
-+ usbnet_write_cmd_async(dev, MCS7830_WR_BREQ, MCS7830_WR_BMREQ,
-+ 0x0000, index, data, size);
-+}
-+
-+static int mcs7830_hif_get_mac_address(struct usbnet *dev, unsigned char *addr)
-+{
-+ int ret = mcs7830_get_reg(dev, HIF_REG_ETHERNET_ADDR, ETH_ALEN, addr);
-+ if (ret < 0)
-+ return ret;
-+ return 0;
-+}
-+
-+static int mcs7830_hif_set_mac_address(struct usbnet *dev, unsigned char *addr)
-+{
-+ int ret = mcs7830_set_reg(dev, HIF_REG_ETHERNET_ADDR, ETH_ALEN, addr);
-+
-+ if (ret < 0)
-+ return ret;
-+ return 0;
-+}
-+
-+static int mcs7830_set_mac_address(struct net_device *netdev, void *p)
-+{
-+ int ret;
-+ struct usbnet *dev = netdev_priv(netdev);
-+ struct sockaddr *addr = p;
-+
-+ if (netif_running(netdev))
-+ return -EBUSY;
-+
-+ if (!is_valid_ether_addr(addr->sa_data))
-+ return -EADDRNOTAVAIL;
-+
-+ ret = mcs7830_hif_set_mac_address(dev, addr->sa_data);
-+
-+ if (ret < 0)
-+ return ret;
-+
-+ /* it worked --> adopt it on netdev side */
-+ memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
-+
-+ return 0;
-+}
-+
-+static int mcs7830_read_phy(struct usbnet *dev, u8 index)
-+{
-+ int ret;
-+ int i;
-+ __le16 val;
-+
-+ u8 cmd[2] = {
-+ HIF_REG_PHY_CMD1_READ | HIF_REG_PHY_CMD1_PHYADDR,
-+ HIF_REG_PHY_CMD2_PEND_FLAG_BIT | index,
-+ };
-+
-+ mutex_lock(&dev->phy_mutex);
-+ /* write the MII command */
-+ ret = mcs7830_set_reg(dev, HIF_REG_PHY_CMD1, 2, cmd);
-+ if (ret < 0)
-+ goto out;
-+
-+ /* wait for the data to become valid, should be within < 1ms */
-+ for (i = 0; i < 10; i++) {
-+ ret = mcs7830_get_reg(dev, HIF_REG_PHY_CMD1, 2, cmd);
-+ if ((ret < 0) || (cmd[1] & HIF_REG_PHY_CMD2_READY_FLAG_BIT))
-+ break;
-+ ret = -EIO;
-+ msleep(1);
-+ }
-+ if (ret < 0)
-+ goto out;
-+
-+ /* read actual register contents */
-+ ret = mcs7830_get_reg(dev, HIF_REG_PHY_DATA, 2, &val);
-+ if (ret < 0)
-+ goto out;
-+ ret = le16_to_cpu(val);
-+ dev_dbg(&dev->udev->dev, "read PHY reg %02x: %04x (%d tries)\n",
-+ index, val, i);
-+out:
-+ mutex_unlock(&dev->phy_mutex);
-+ return ret;
-+}
-+
-+static int mcs7830_write_phy(struct usbnet *dev, u8 index, u16 val)
-+{
-+ int ret;
-+ int i;
-+ __le16 le_val;
-+
-+ u8 cmd[2] = {
-+ HIF_REG_PHY_CMD1_WRITE | HIF_REG_PHY_CMD1_PHYADDR,
-+ HIF_REG_PHY_CMD2_PEND_FLAG_BIT | (index & 0x1F),
-+ };
-+
-+ mutex_lock(&dev->phy_mutex);
-+
-+ /* write the new register contents */
-+ le_val = cpu_to_le16(val);
-+ ret = mcs7830_set_reg(dev, HIF_REG_PHY_DATA, 2, &le_val);
-+ if (ret < 0)
-+ goto out;
-+
-+ /* write the MII command */
-+ ret = mcs7830_set_reg(dev, HIF_REG_PHY_CMD1, 2, cmd);
-+ if (ret < 0)
-+ goto out;
-+
-+ /* wait for the command to be accepted by the PHY */
-+ for (i = 0; i < 10; i++) {
-+ ret = mcs7830_get_reg(dev, HIF_REG_PHY_CMD1, 2, cmd);
-+ if ((ret < 0) || (cmd[1] & HIF_REG_PHY_CMD2_READY_FLAG_BIT))
-+ break;
-+ ret = -EIO;
-+ msleep(1);
-+ }
-+ if (ret < 0)
-+ goto out;
-+
-+ ret = 0;
-+ dev_dbg(&dev->udev->dev, "write PHY reg %02x: %04x (%d tries)\n",
-+ index, val, i);
-+out:
-+ mutex_unlock(&dev->phy_mutex);
-+ return ret;
-+}
-+
-+/*
-+ * This algorithm comes from the original mcs7830 version 1.4 driver,
-+ * not sure if it is needed.
-+ */
-+static int mcs7830_set_autoneg(struct usbnet *dev, int ptrUserPhyMode)
-+{
-+ int ret;
-+ /* Enable all media types */
-+ ret = mcs7830_write_phy(dev, MII_ADVERTISE, MCS7830_MII_ADVERTISE);
-+
-+ /* First reset BMCR */
-+ if (!ret)
-+ ret = mcs7830_write_phy(dev, MII_BMCR, 0x0000);
-+ /* Enable Auto Neg */
-+ if (!ret)
-+ ret = mcs7830_write_phy(dev, MII_BMCR, BMCR_ANENABLE);
-+ /* Restart Auto Neg (Keep the Enable Auto Neg Bit Set) */
-+ if (!ret)
-+ ret = mcs7830_write_phy(dev, MII_BMCR,
-+ BMCR_ANENABLE | BMCR_ANRESTART );
-+ return ret;
-+}
-+
-+
-+/*
-+ * if we can read register 22, the chip revision is C or higher
-+ */
-+static int mcs7830_get_rev(struct usbnet *dev)
-+{
-+ u8 dummy[2];
-+ int ret;
-+ ret = mcs7830_get_reg(dev, HIF_REG_FRAME_DROP_COUNTER, 2, dummy);
-+ if (ret > 0)
-+ return 2; /* Rev C or later */
-+ return 1; /* earlier revision */
-+}
-+
-+/*
-+ * On rev. C we need to set the pause threshold
-+ */
-+static void mcs7830_rev_C_fixup(struct usbnet *dev)
-+{
-+ u8 pause_threshold = HIF_REG_PAUSE_THRESHOLD_DEFAULT;
-+ int retry;
-+
-+ for (retry = 0; retry < 2; retry++) {
-+ if (mcs7830_get_rev(dev) == 2) {
-+ dev_info(&dev->udev->dev, "applying rev.C fixup\n");
-+ mcs7830_set_reg(dev, HIF_REG_PAUSE_THRESHOLD,
-+ 1, &pause_threshold);
-+ }
-+ msleep(1);
-+ }
-+}
-+
-+static int mcs7830_mdio_read(struct net_device *netdev, int phy_id,
-+ int location)
-+{
-+ struct usbnet *dev = netdev_priv(netdev);
-+ return mcs7830_read_phy(dev, location);
-+}
-+
-+static void mcs7830_mdio_write(struct net_device *netdev, int phy_id,
-+ int location, int val)
-+{
-+ struct usbnet *dev = netdev_priv(netdev);
-+ mcs7830_write_phy(dev, location, val);
-+}
-+
-+static int mcs7830_ioctl(struct net_device *net, struct ifreq *rq, int cmd)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+ return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
-+}
-+
-+static inline struct mcs7830_data *mcs7830_get_data(struct usbnet *dev)
-+{
-+ return (struct mcs7830_data *)&dev->data;
-+}
-+
-+static void mcs7830_hif_update_multicast_hash(struct usbnet *dev)
-+{
-+ struct mcs7830_data *data = mcs7830_get_data(dev);
-+ mcs7830_set_reg_async(dev, HIF_REG_MULTICAST_HASH,
-+ sizeof data->multi_filter,
-+ data->multi_filter);
-+}
-+
-+static void mcs7830_hif_update_config(struct usbnet *dev)
-+{
-+ /* implementation specific to data->config
-+ (argument needs to be heap-based anyway - USB DMA!) */
-+ struct mcs7830_data *data = mcs7830_get_data(dev);
-+ mcs7830_set_reg_async(dev, HIF_REG_CONFIG, 1, &data->config);
-+}
-+
-+static void mcs7830_data_set_multicast(struct net_device *net)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+ struct mcs7830_data *data = mcs7830_get_data(dev);
-+
-+ memset(data->multi_filter, 0, sizeof data->multi_filter);
-+
-+ data->config = HIF_REG_CONFIG_TXENABLE;
-+
-+ /* this should not be needed, but it doesn't work otherwise */
-+ data->config |= HIF_REG_CONFIG_ALLMULTICAST;
-+
-+ if (net->flags & IFF_PROMISC) {
-+ data->config |= HIF_REG_CONFIG_PROMISCUOUS;
-+ } else if (net->flags & IFF_ALLMULTI ||
-+ netdev_mc_count(net) > MCS7830_MAX_MCAST) {
-+ data->config |= HIF_REG_CONFIG_ALLMULTICAST;
-+ } else if (netdev_mc_empty(net)) {
-+ /* just broadcast and directed */
-+ } else {
-+ /* We use the 20 byte dev->data
-+ * for our 8 byte filter buffer
-+ * to avoid allocating memory that
-+ * is tricky to free later */
-+ struct netdev_hw_addr *ha;
-+ u32 crc_bits;
-+
-+ /* Build the multicast hash filter. */
-+ netdev_for_each_mc_addr(ha, net) {
-+ crc_bits = ether_crc(ETH_ALEN, ha->addr) >> 26;
-+ data->multi_filter[crc_bits >> 3] |= 1 << (crc_bits & 7);
-+ }
-+ }
-+}
-+
-+static int mcs7830_apply_base_config(struct usbnet *dev)
-+{
-+ int ret;
-+
-+ /* re-configure known MAC (suspend case etc.) */
-+ ret = mcs7830_hif_set_mac_address(dev, dev->net->dev_addr);
-+ if (ret) {
-+ dev_info(&dev->udev->dev, "Cannot set MAC address\n");
-+ goto out;
-+ }
-+
-+ /* Set up PHY */
-+ ret = mcs7830_set_autoneg(dev, 0);
-+ if (ret) {
-+ dev_info(&dev->udev->dev, "Cannot set autoneg\n");
-+ goto out;
-+ }
-+
-+ mcs7830_hif_update_multicast_hash(dev);
-+ mcs7830_hif_update_config(dev);
-+
-+ mcs7830_rev_C_fixup(dev);
-+ ret = 0;
-+out:
-+ return ret;
-+}
-+
-+/* credits go to asix_set_multicast */
-+static void mcs7830_set_multicast(struct net_device *net)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+
-+ mcs7830_data_set_multicast(net);
-+
-+ mcs7830_hif_update_multicast_hash(dev);
-+ mcs7830_hif_update_config(dev);
-+}
-+
-+static int mcs7830_get_regs_len(struct net_device *net)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+
-+ switch (mcs7830_get_rev(dev)) {
-+ case 1:
-+ return 21;
-+ case 2:
-+ return 32;
-+ }
-+ return 0;
-+}
-+
-+static void mcs7830_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *drvinfo)
-+{
-+ usbnet_get_drvinfo(net, drvinfo);
-+ drvinfo->regdump_len = mcs7830_get_regs_len(net);
-+}
-+
-+static void mcs7830_get_regs(struct net_device *net, struct ethtool_regs *regs, void *data)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+
-+ regs->version = mcs7830_get_rev(dev);
-+ mcs7830_get_reg(dev, 0, regs->len, data);
-+}
-+
-+static const struct ethtool_ops mcs7830_ethtool_ops = {
-+ .get_drvinfo = mcs7830_get_drvinfo,
-+ .get_regs_len = mcs7830_get_regs_len,
-+ .get_regs = mcs7830_get_regs,
-+
-+ /* common usbnet calls */
-+ .get_link = usbnet_get_link,
-+ .get_msglevel = usbnet_get_msglevel,
-+ .set_msglevel = usbnet_set_msglevel,
-+ .get_settings = usbnet_get_settings,
-+ .set_settings = usbnet_set_settings,
-+ .nway_reset = usbnet_nway_reset,
-+};
-+
-+static const struct net_device_ops mcs7830_netdev_ops = {
-+ .ndo_open = usbnet_open,
-+ .ndo_stop = usbnet_stop,
-+ .ndo_start_xmit = usbnet_start_xmit,
-+ .ndo_tx_timeout = usbnet_tx_timeout,
-+ .ndo_change_mtu = usbnet_change_mtu,
-+ .ndo_validate_addr = eth_validate_addr,
-+ .ndo_do_ioctl = mcs7830_ioctl,
-+ .ndo_set_rx_mode = mcs7830_set_multicast,
-+ .ndo_set_mac_address = mcs7830_set_mac_address,
-+};
-+
-+static int mcs7830_bind(struct usbnet *dev, struct usb_interface *udev)
-+{
-+ struct net_device *net = dev->net;
-+ int ret;
-+ int retry;
-+
-+ /* Initial startup: Gather MAC address setting from EEPROM */
-+ ret = -EINVAL;
-+ for (retry = 0; retry < 5 && ret; retry++)
-+ ret = mcs7830_hif_get_mac_address(dev, net->dev_addr);
-+ if (ret) {
-+ dev_warn(&dev->udev->dev, "Cannot read MAC address\n");
-+ goto out;
-+ }
-+
-+ mcs7830_data_set_multicast(net);
-+
-+ ret = mcs7830_apply_base_config(dev);
-+ if (ret)
-+ goto out;
-+
-+ net->ethtool_ops = &mcs7830_ethtool_ops;
-+ net->netdev_ops = &mcs7830_netdev_ops;
-+
-+ /* reserve space for the status byte on rx */
-+ dev->rx_urb_size = ETH_FRAME_LEN + 1;
-+
-+ dev->mii.mdio_read = mcs7830_mdio_read;
-+ dev->mii.mdio_write = mcs7830_mdio_write;
-+ dev->mii.dev = net;
-+ dev->mii.phy_id_mask = 0x3f;
-+ dev->mii.reg_num_mask = 0x1f;
-+ dev->mii.phy_id = *((u8 *) net->dev_addr + 1);
-+
-+ ret = usbnet_get_endpoints(dev, udev);
-+out:
-+ return ret;
-+}
-+
-+/* The chip always appends a status byte that we need to strip */
-+static int mcs7830_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
-+{
-+ u8 status;
-+
-+ /* This check is no longer done by usbnet */
-+ if (skb->len < dev->net->hard_header_len) {
-+ dev_err(&dev->udev->dev, "unexpected tiny rx frame\n");
-+ return 0;
-+ }
-+
-+ skb_trim(skb, skb->len - 1);
-+ status = skb->data[skb->len];
-+
-+ if (status != MCS7830_RX_FRAME_CORRECT) {
-+ dev_dbg(&dev->udev->dev, "rx fixup status %x\n", status);
-+
-+ /* hmm, perhaps usbnet.c already sees a globally visible
-+ frame error and increments rx_errors on its own already? */
-+ dev->net->stats.rx_errors++;
-+
-+ if (status & (MCS7830_RX_SHORT_FRAME
-+ |MCS7830_RX_LENGTH_ERROR
-+ |MCS7830_RX_LARGE_FRAME))
-+ dev->net->stats.rx_length_errors++;
-+ if (status & MCS7830_RX_ALIGNMENT_ERROR)
-+ dev->net->stats.rx_frame_errors++;
-+ if (status & MCS7830_RX_CRC_ERROR)
-+ dev->net->stats.rx_crc_errors++;
-+ }
-+
-+ return skb->len > 0;
-+}
-+
-+static void mcs7830_status(struct usbnet *dev, struct urb *urb)
-+{
-+ u8 *buf = urb->transfer_buffer;
-+ bool link, link_changed;
-+
-+ if (urb->actual_length < 16)
-+ return;
-+
-+ link = !(buf[1] == 0x20);
-+ link_changed = netif_carrier_ok(dev->net) != link;
-+ if (link_changed) {
-+ usbnet_link_change(dev, link, 0);
-+ netdev_dbg(dev->net, "Link Status is: %d\n", link);
-+ }
-+}
-+
-+static const struct driver_info moschip_info = {
-+ .description = "MOSCHIP 7830/7832/7730 usb-NET adapter",
-+ .bind = mcs7830_bind,
-+ .rx_fixup = mcs7830_rx_fixup,
-+ .flags = FLAG_ETHER | FLAG_LINK_INTR,
-+ .status = mcs7830_status,
-+ .in = 1,
-+ .out = 2,
-+};
-+
-+static const struct driver_info sitecom_info = {
-+ .description = "Sitecom LN-30 usb-NET adapter",
-+ .bind = mcs7830_bind,
-+ .rx_fixup = mcs7830_rx_fixup,
-+ .flags = FLAG_ETHER | FLAG_LINK_INTR,
-+ .status = mcs7830_status,
-+ .in = 1,
-+ .out = 2,
-+};
-+
-+static const struct usb_device_id products[] = {
-+ {
-+ USB_DEVICE(MCS7830_VENDOR_ID, MCS7832_PRODUCT_ID),
-+ .driver_info = (unsigned long) &moschip_info,
-+ },
-+ {
-+ USB_DEVICE(MCS7830_VENDOR_ID, MCS7830_PRODUCT_ID),
-+ .driver_info = (unsigned long) &moschip_info,
-+ },
-+ {
-+ USB_DEVICE(MCS7830_VENDOR_ID, MCS7730_PRODUCT_ID),
-+ .driver_info = (unsigned long) &moschip_info,
-+ },
-+ {
-+ USB_DEVICE(SITECOM_VENDOR_ID, LN_030_PRODUCT_ID),
-+ .driver_info = (unsigned long) &sitecom_info,
-+ },
-+ {},
-+};
-+MODULE_DEVICE_TABLE(usb, products);
-+
-+static int mcs7830_reset_resume (struct usb_interface *intf)
-+{
-+ /* YES, this function is successful enough that ethtool -d
-+ does show same output pre-/post-suspend */
-+
-+ struct usbnet *dev = usb_get_intfdata(intf);
-+
-+ mcs7830_apply_base_config(dev);
-+
-+ usbnet_resume(intf);
-+
-+ return 0;
-+}
-+
-+static struct usb_driver mcs7830_driver = {
-+ .name = driver_name,
-+ .id_table = products,
-+ .probe = usbnet_probe,
-+ .disconnect = usbnet_disconnect,
-+ .suspend = usbnet_suspend,
-+ .resume = usbnet_resume,
-+ .reset_resume = mcs7830_reset_resume,
-+ .disable_hub_initiated_lpm = 1,
-+};
-+
-+module_usb_driver(mcs7830_driver);
-+
-+MODULE_DESCRIPTION("USB to network adapter MCS7830)");
-+MODULE_LICENSE("GPL");
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/net1080.c backports-3.18.1-1/drivers/net/usb/net1080.c
---- backports-3.18.1-1.org/drivers/net/usb/net1080.c 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/net1080.c 2014-12-16 18:39:45.000000000 +0100
-@@ -0,0 +1,544 @@
-+/*
-+ * Net1080 based USB host-to-host cables
-+ * Copyright (C) 2000-2005 by David Brownell
-+ *
-+ * 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, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+// #define DEBUG // error path messages, extra info
-+// #define VERBOSE // more; success messages
-+
-+#include <linux/module.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/ethtool.h>
-+#include <linux/workqueue.h>
-+#include <linux/mii.h>
-+#include <linux/usb.h>
-+#include <linux/usb/usbnet.h>
-+#include <linux/slab.h>
-+
-+#include <asm/unaligned.h>
-+
-+
-+/*
-+ * Netchip 1080 driver ... http://www.netchip.com
-+ * (Sept 2004: End-of-life announcement has been sent.)
-+ * Used in (some) LapLink cables
-+ */
-+
-+#define frame_errors data[1]
-+
-+/*
-+ * NetChip framing of ethernet packets, supporting additional error
-+ * checks for links that may drop bulk packets from inside messages.
-+ * Odd USB length == always short read for last usb packet.
-+ * - nc_header
-+ * - Ethernet header (14 bytes)
-+ * - payload
-+ * - (optional padding byte, if needed so length becomes odd)
-+ * - nc_trailer
-+ *
-+ * This framing is to be avoided for non-NetChip devices.
-+ */
-+
-+struct nc_header { // packed:
-+ __le16 hdr_len; // sizeof nc_header (LE, all)
-+ __le16 packet_len; // payload size (including ethhdr)
-+ __le16 packet_id; // detects dropped packets
-+#define MIN_HEADER 6
-+
-+ // all else is optional, and must start with:
-+ // __le16 vendorId; // from usb-if
-+ // __le16 productId;
-+} __packed;
-+
-+#define PAD_BYTE ((unsigned char)0xAC)
-+
-+struct nc_trailer {
-+ __le16 packet_id;
-+} __packed;
-+
-+// packets may use FLAG_FRAMING_NC and optional pad
-+#define FRAMED_SIZE(mtu) (sizeof (struct nc_header) \
-+ + sizeof (struct ethhdr) \
-+ + (mtu) \
-+ + 1 \
-+ + sizeof (struct nc_trailer))
-+
-+#define MIN_FRAMED FRAMED_SIZE(0)
-+
-+/* packets _could_ be up to 64KB... */
-+#define NC_MAX_PACKET 32767
-+
-+
-+/*
-+ * Zero means no timeout; else, how long a 64 byte bulk packet may be queued
-+ * before the hardware drops it. If that's done, the driver will need to
-+ * frame network packets to guard against the dropped USB packets. The win32
-+ * driver sets this for both sides of the link.
-+ */
-+#define NC_READ_TTL_MS ((u8)255) // ms
-+
-+/*
-+ * We ignore most registers and EEPROM contents.
-+ */
-+#define REG_USBCTL ((u8)0x04)
-+#define REG_TTL ((u8)0x10)
-+#define REG_STATUS ((u8)0x11)
-+
-+/*
-+ * Vendor specific requests to read/write data
-+ */
-+#define REQUEST_REGISTER ((u8)0x10)
-+#define REQUEST_EEPROM ((u8)0x11)
-+
-+static int
-+nc_vendor_read(struct usbnet *dev, u8 req, u8 regnum, u16 *retval_ptr)
-+{
-+ int status = usbnet_read_cmd(dev, req,
-+ USB_DIR_IN | USB_TYPE_VENDOR |
-+ USB_RECIP_DEVICE,
-+ 0, regnum, retval_ptr,
-+ sizeof *retval_ptr);
-+ if (status > 0)
-+ status = 0;
-+ if (!status)
-+ le16_to_cpus(retval_ptr);
-+ return status;
-+}
-+
-+static inline int
-+nc_register_read(struct usbnet *dev, u8 regnum, u16 *retval_ptr)
-+{
-+ return nc_vendor_read(dev, REQUEST_REGISTER, regnum, retval_ptr);
-+}
-+
-+// no retval ... can become async, usable in_interrupt()
-+static void
-+nc_vendor_write(struct usbnet *dev, u8 req, u8 regnum, u16 value)
-+{
-+ usbnet_write_cmd(dev, req,
-+ USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-+ value, regnum, NULL, 0);
-+}
-+
-+static inline void
-+nc_register_write(struct usbnet *dev, u8 regnum, u16 value)
-+{
-+ nc_vendor_write(dev, REQUEST_REGISTER, regnum, value);
-+}
-+
-+
-+#if 0
-+static void nc_dump_registers(struct usbnet *dev)
-+{
-+ u8 reg;
-+ u16 *vp = kmalloc(sizeof (u16));
-+
-+ if (!vp)
-+ return;
-+
-+ netdev_dbg(dev->net, "registers:\n");
-+ for (reg = 0; reg < 0x20; reg++) {
-+ int retval;
-+
-+ // reading some registers is trouble
-+ if (reg >= 0x08 && reg <= 0xf)
-+ continue;
-+ if (reg >= 0x12 && reg <= 0x1e)
-+ continue;
-+
-+ retval = nc_register_read(dev, reg, vp);
-+ if (retval < 0)
-+ netdev_dbg(dev->net, "reg [0x%x] ==> error %d\n",
-+ reg, retval);
-+ else
-+ netdev_dbg(dev->net, "reg [0x%x] = 0x%x\n", reg, *vp);
-+ }
-+ kfree(vp);
-+}
-+#endif
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/*
-+ * Control register
-+ */
-+
-+#define USBCTL_WRITABLE_MASK 0x1f0f
-+// bits 15-13 reserved, r/o
-+#define USBCTL_ENABLE_LANG (1 << 12)
-+#define USBCTL_ENABLE_MFGR (1 << 11)
-+#define USBCTL_ENABLE_PROD (1 << 10)
-+#define USBCTL_ENABLE_SERIAL (1 << 9)
-+#define USBCTL_ENABLE_DEFAULTS (1 << 8)
-+// bits 7-4 reserved, r/o
-+#define USBCTL_FLUSH_OTHER (1 << 3)
-+#define USBCTL_FLUSH_THIS (1 << 2)
-+#define USBCTL_DISCONN_OTHER (1 << 1)
-+#define USBCTL_DISCONN_THIS (1 << 0)
-+
-+static inline void nc_dump_usbctl(struct usbnet *dev, u16 usbctl)
-+{
-+ netif_dbg(dev, link, dev->net,
-+ "net1080 %s-%s usbctl 0x%x:%s%s%s%s%s; this%s%s; other%s%s; r/o 0x%x\n",
-+ dev->udev->bus->bus_name, dev->udev->devpath,
-+ usbctl,
-+ (usbctl & USBCTL_ENABLE_LANG) ? " lang" : "",
-+ (usbctl & USBCTL_ENABLE_MFGR) ? " mfgr" : "",
-+ (usbctl & USBCTL_ENABLE_PROD) ? " prod" : "",
-+ (usbctl & USBCTL_ENABLE_SERIAL) ? " serial" : "",
-+ (usbctl & USBCTL_ENABLE_DEFAULTS) ? " defaults" : "",
-+
-+ (usbctl & USBCTL_FLUSH_THIS) ? " FLUSH" : "",
-+ (usbctl & USBCTL_DISCONN_THIS) ? " DIS" : "",
-+
-+ (usbctl & USBCTL_FLUSH_OTHER) ? " FLUSH" : "",
-+ (usbctl & USBCTL_DISCONN_OTHER) ? " DIS" : "",
-+
-+ usbctl & ~USBCTL_WRITABLE_MASK);
-+}
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/*
-+ * Status register
-+ */
-+
-+#define STATUS_PORT_A (1 << 15)
-+
-+#define STATUS_CONN_OTHER (1 << 14)
-+#define STATUS_SUSPEND_OTHER (1 << 13)
-+#define STATUS_MAILBOX_OTHER (1 << 12)
-+#define STATUS_PACKETS_OTHER(n) (((n) >> 8) & 0x03)
-+
-+#define STATUS_CONN_THIS (1 << 6)
-+#define STATUS_SUSPEND_THIS (1 << 5)
-+#define STATUS_MAILBOX_THIS (1 << 4)
-+#define STATUS_PACKETS_THIS(n) (((n) >> 0) & 0x03)
-+
-+#define STATUS_UNSPEC_MASK 0x0c8c
-+#define STATUS_NOISE_MASK ((u16)~(0x0303|STATUS_UNSPEC_MASK))
-+
-+
-+static inline void nc_dump_status(struct usbnet *dev, u16 status)
-+{
-+ netif_dbg(dev, link, dev->net,
-+ "net1080 %s-%s status 0x%x: this (%c) PKT=%d%s%s%s; other PKT=%d%s%s%s; unspec 0x%x\n",
-+ dev->udev->bus->bus_name, dev->udev->devpath,
-+ status,
-+
-+ // XXX the packet counts don't seem right
-+ // (1 at reset, not 0); maybe UNSPEC too
-+
-+ (status & STATUS_PORT_A) ? 'A' : 'B',
-+ STATUS_PACKETS_THIS(status),
-+ (status & STATUS_CONN_THIS) ? " CON" : "",
-+ (status & STATUS_SUSPEND_THIS) ? " SUS" : "",
-+ (status & STATUS_MAILBOX_THIS) ? " MBOX" : "",
-+
-+ STATUS_PACKETS_OTHER(status),
-+ (status & STATUS_CONN_OTHER) ? " CON" : "",
-+ (status & STATUS_SUSPEND_OTHER) ? " SUS" : "",
-+ (status & STATUS_MAILBOX_OTHER) ? " MBOX" : "",
-+
-+ status & STATUS_UNSPEC_MASK);
-+}
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/*
-+ * TTL register
-+ */
-+
-+#define TTL_THIS(ttl) (0x00ff & ttl)
-+#define TTL_OTHER(ttl) (0x00ff & (ttl >> 8))
-+#define MK_TTL(this,other) ((u16)(((other)<<8)|(0x00ff&(this))))
-+
-+static inline void nc_dump_ttl(struct usbnet *dev, u16 ttl)
-+{
-+ netif_dbg(dev, link, dev->net, "net1080 %s-%s ttl 0x%x this = %d, other = %d\n",
-+ dev->udev->bus->bus_name, dev->udev->devpath,
-+ ttl, TTL_THIS(ttl), TTL_OTHER(ttl));
-+}
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static int net1080_reset(struct usbnet *dev)
-+{
-+ u16 usbctl, status, ttl;
-+ u16 vp;
-+ int retval;
-+
-+ // nc_dump_registers(dev);
-+
-+ if ((retval = nc_register_read(dev, REG_STATUS, &vp)) < 0) {
-+ netdev_dbg(dev->net, "can't read %s-%s status: %d\n",
-+ dev->udev->bus->bus_name, dev->udev->devpath, retval);
-+ goto done;
-+ }
-+ status = vp;
-+ nc_dump_status(dev, status);
-+
-+ if ((retval = nc_register_read(dev, REG_USBCTL, &vp)) < 0) {
-+ netdev_dbg(dev->net, "can't read USBCTL, %d\n", retval);
-+ goto done;
-+ }
-+ usbctl = vp;
-+ nc_dump_usbctl(dev, usbctl);
-+
-+ nc_register_write(dev, REG_USBCTL,
-+ USBCTL_FLUSH_THIS | USBCTL_FLUSH_OTHER);
-+
-+ if ((retval = nc_register_read(dev, REG_TTL, &vp)) < 0) {
-+ netdev_dbg(dev->net, "can't read TTL, %d\n", retval);
-+ goto done;
-+ }
-+ ttl = vp;
-+ // nc_dump_ttl(dev, ttl);
-+
-+ nc_register_write(dev, REG_TTL,
-+ MK_TTL(NC_READ_TTL_MS, TTL_OTHER(ttl)) );
-+ netdev_dbg(dev->net, "assigned TTL, %d ms\n", NC_READ_TTL_MS);
-+
-+ netif_info(dev, link, dev->net, "port %c, peer %sconnected\n",
-+ (status & STATUS_PORT_A) ? 'A' : 'B',
-+ (status & STATUS_CONN_OTHER) ? "" : "dis");
-+ retval = 0;
-+
-+done:
-+ return retval;
-+}
-+
-+static int net1080_check_connect(struct usbnet *dev)
-+{
-+ int retval;
-+ u16 status;
-+ u16 vp;
-+
-+ retval = nc_register_read(dev, REG_STATUS, &vp);
-+ status = vp;
-+ if (retval != 0) {
-+ netdev_dbg(dev->net, "net1080_check_conn read - %d\n", retval);
-+ return retval;
-+ }
-+ if ((status & STATUS_CONN_OTHER) != STATUS_CONN_OTHER)
-+ return -ENOLINK;
-+ return 0;
-+}
-+
-+static void nc_ensure_sync(struct usbnet *dev)
-+{
-+ if (++dev->frame_errors <= 5)
-+ return;
-+
-+ if (usbnet_write_cmd_async(dev, REQUEST_REGISTER,
-+ USB_DIR_OUT | USB_TYPE_VENDOR |
-+ USB_RECIP_DEVICE,
-+ USBCTL_FLUSH_THIS |
-+ USBCTL_FLUSH_OTHER,
-+ REG_USBCTL, NULL, 0))
-+ return;
-+
-+ netif_dbg(dev, rx_err, dev->net,
-+ "flush net1080; too many framing errors\n");
-+ dev->frame_errors = 0;
-+}
-+
-+static int net1080_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
-+{
-+ struct nc_header *header;
-+ struct nc_trailer *trailer;
-+ u16 hdr_len, packet_len;
-+
-+ /* This check is no longer done by usbnet */
-+ if (skb->len < dev->net->hard_header_len)
-+ return 0;
-+
-+ if (!(skb->len & 0x01)) {
-+ netdev_dbg(dev->net, "rx framesize %d range %d..%d mtu %d\n",
-+ skb->len, dev->net->hard_header_len, dev->hard_mtu,
-+ dev->net->mtu);
-+ dev->net->stats.rx_frame_errors++;
-+ nc_ensure_sync(dev);
-+ return 0;
-+ }
-+
-+ header = (struct nc_header *) skb->data;
-+ hdr_len = le16_to_cpup(&header->hdr_len);
-+ packet_len = le16_to_cpup(&header->packet_len);
-+ if (FRAMED_SIZE(packet_len) > NC_MAX_PACKET) {
-+ dev->net->stats.rx_frame_errors++;
-+ netdev_dbg(dev->net, "packet too big, %d\n", packet_len);
-+ nc_ensure_sync(dev);
-+ return 0;
-+ } else if (hdr_len < MIN_HEADER) {
-+ dev->net->stats.rx_frame_errors++;
-+ netdev_dbg(dev->net, "header too short, %d\n", hdr_len);
-+ nc_ensure_sync(dev);
-+ return 0;
-+ } else if (hdr_len > MIN_HEADER) {
-+ // out of band data for us?
-+ netdev_dbg(dev->net, "header OOB, %d bytes\n", hdr_len - MIN_HEADER);
-+ nc_ensure_sync(dev);
-+ // switch (vendor/product ids) { ... }
-+ }
-+ skb_pull(skb, hdr_len);
-+
-+ trailer = (struct nc_trailer *)
-+ (skb->data + skb->len - sizeof *trailer);
-+ skb_trim(skb, skb->len - sizeof *trailer);
-+
-+ if ((packet_len & 0x01) == 0) {
-+ if (skb->data [packet_len] != PAD_BYTE) {
-+ dev->net->stats.rx_frame_errors++;
-+ netdev_dbg(dev->net, "bad pad\n");
-+ return 0;
-+ }
-+ skb_trim(skb, skb->len - 1);
-+ }
-+ if (skb->len != packet_len) {
-+ dev->net->stats.rx_frame_errors++;
-+ netdev_dbg(dev->net, "bad packet len %d (expected %d)\n",
-+ skb->len, packet_len);
-+ nc_ensure_sync(dev);
-+ return 0;
-+ }
-+ if (header->packet_id != get_unaligned(&trailer->packet_id)) {
-+ dev->net->stats.rx_fifo_errors++;
-+ netdev_dbg(dev->net, "(2+ dropped) rx packet_id mismatch 0x%x 0x%x\n",
-+ le16_to_cpu(header->packet_id),
-+ le16_to_cpu(trailer->packet_id));
-+ return 0;
-+ }
-+#if 0
-+ netdev_dbg(dev->net, "frame <rx h %d p %d id %d\n", header->hdr_len,
-+ header->packet_len, header->packet_id);
-+#endif
-+ dev->frame_errors = 0;
-+ return 1;
-+}
-+
-+static struct sk_buff *
-+net1080_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
-+{
-+ struct sk_buff *skb2;
-+ struct nc_header *header = NULL;
-+ struct nc_trailer *trailer = NULL;
-+ int padlen = sizeof (struct nc_trailer);
-+ int len = skb->len;
-+
-+ if (!((len + padlen + sizeof (struct nc_header)) & 0x01))
-+ padlen++;
-+ if (!skb_cloned(skb)) {
-+ int headroom = skb_headroom(skb);
-+ int tailroom = skb_tailroom(skb);
-+
-+ if (padlen <= tailroom &&
-+ sizeof(struct nc_header) <= headroom)
-+ /* There's enough head and tail room */
-+ goto encapsulate;
-+
-+ if ((sizeof (struct nc_header) + padlen) <
-+ (headroom + tailroom)) {
-+ /* There's enough total room, so just readjust */
-+ skb->data = memmove(skb->head
-+ + sizeof (struct nc_header),
-+ skb->data, skb->len);
-+ skb_set_tail_pointer(skb, len);
-+ goto encapsulate;
-+ }
-+ }
-+
-+ /* Create a new skb to use with the correct size */
-+ skb2 = skb_copy_expand(skb,
-+ sizeof (struct nc_header),
-+ padlen,
-+ flags);
-+ dev_kfree_skb_any(skb);
-+ if (!skb2)
-+ return skb2;
-+ skb = skb2;
-+
-+encapsulate:
-+ /* header first */
-+ header = (struct nc_header *) skb_push(skb, sizeof *header);
-+ header->hdr_len = cpu_to_le16(sizeof (*header));
-+ header->packet_len = cpu_to_le16(len);
-+ header->packet_id = cpu_to_le16((u16)dev->xid++);
-+
-+ /* maybe pad; then trailer */
-+ if (!((skb->len + sizeof *trailer) & 0x01))
-+ *skb_put(skb, 1) = PAD_BYTE;
-+ trailer = (struct nc_trailer *) skb_put(skb, sizeof *trailer);
-+ put_unaligned(header->packet_id, &trailer->packet_id);
-+#if 0
-+ netdev_dbg(dev->net, "frame >tx h %d p %d id %d\n",
-+ header->hdr_len, header->packet_len,
-+ header->packet_id);
-+#endif
-+ return skb;
-+}
-+
-+static int net1080_bind(struct usbnet *dev, struct usb_interface *intf)
-+{
-+ unsigned extra = sizeof (struct nc_header)
-+ + 1
-+ + sizeof (struct nc_trailer);
-+
-+ dev->net->hard_header_len += extra;
-+ dev->rx_urb_size = dev->net->hard_header_len + dev->net->mtu;
-+ dev->hard_mtu = NC_MAX_PACKET;
-+ return usbnet_get_endpoints (dev, intf);
-+}
-+
-+static const struct driver_info net1080_info = {
-+ .description = "NetChip TurboCONNECT",
-+ .flags = FLAG_POINTTOPOINT | FLAG_FRAMING_NC,
-+ .bind = net1080_bind,
-+ .reset = net1080_reset,
-+ .check_connect = net1080_check_connect,
-+ .rx_fixup = net1080_rx_fixup,
-+ .tx_fixup = net1080_tx_fixup,
-+};
-+
-+static const struct usb_device_id products [] = {
-+{
-+ USB_DEVICE(0x0525, 0x1080), // NetChip ref design
-+ .driver_info = (unsigned long) &net1080_info,
-+}, {
-+ USB_DEVICE(0x06D0, 0x0622), // Laplink Gold
-+ .driver_info = (unsigned long) &net1080_info,
-+},
-+ { }, // END
-+};
-+MODULE_DEVICE_TABLE(usb, products);
-+
-+static struct usb_driver net1080_driver = {
-+ .name = "net1080",
-+ .id_table = products,
-+ .probe = usbnet_probe,
-+ .disconnect = usbnet_disconnect,
-+ .suspend = usbnet_suspend,
-+ .resume = usbnet_resume,
-+ .disable_hub_initiated_lpm = 1,
-+};
-+
-+module_usb_driver(net1080_driver);
-+
-+MODULE_AUTHOR("David Brownell");
-+MODULE_DESCRIPTION("NetChip 1080 based USB Host-to-Host Links");
-+MODULE_LICENSE("GPL");
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/pegasus.c backports-3.18.1-1/drivers/net/usb/pegasus.c
---- backports-3.18.1-1.org/drivers/net/usb/pegasus.c 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/pegasus.c 2014-12-16 18:39:45.000000000 +0100
-@@ -0,0 +1,1335 @@
-+/*
-+ * Copyright (c) 1999-2013 Petko Manolov (petkan(a)nucleusys.com)
-+ *
-+ * 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
-+ * published by the Free Software Foundation.
-+ *
-+ * ChangeLog:
-+ * .... Most of the time spent on reading sources & docs.
-+ * v0.2.x First official release for the Linux kernel.
-+ * v0.3.0 Beutified and structured, some bugs fixed.
-+ * v0.3.x URBifying bulk requests and bugfixing. First relatively
-+ * stable release. Still can touch device's registers only
-+ * from top-halves.
-+ * v0.4.0 Control messages remained unurbified are now URBs.
-+ * Now we can touch the HW at any time.
-+ * v0.4.9 Control urbs again use process context to wait. Argh...
-+ * Some long standing bugs (enable_net_traffic) fixed.
-+ * Also nasty trick about resubmiting control urb from
-+ * interrupt context used. Please let me know how it
-+ * behaves. Pegasus II support added since this version.
-+ * TODO: suppressing HCD warnings spewage on disconnect.
-+ * v0.4.13 Ethernet address is now set at probe(), not at open()
-+ * time as this seems to break dhcpd.
-+ * v0.5.0 branch to 2.5.x kernels
-+ * v0.5.1 ethtool support added
-+ * v0.5.5 rx socket buffers are in a pool and the their allocation
-+ * is out of the interrupt routine.
-+ * ...
-+ * v0.9.3 simplified [get|set]_register(s), async update registers
-+ * logic revisited, receive skb_pool removed.
-+ */
-+
-+#include <linux/sched.h>
-+#include <linux/slab.h>
-+#include <linux/init.h>
-+#include <linux/delay.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/ethtool.h>
-+#include <linux/mii.h>
-+#include <linux/usb.h>
-+#include <linux/module.h>
-+#include <asm/byteorder.h>
-+#include <asm/uaccess.h>
-+#include "pegasus.h"
-+
-+/*
-+ * Version Information
-+ */
-+#define DRIVER_VERSION "v0.9.3 (2013/04/25)"
-+#define DRIVER_AUTHOR "Petko Manolov <petkan(a)nucleusys.com>"
-+#define DRIVER_DESC "Pegasus/Pegasus II USB Ethernet driver"
-+
-+static const char driver_name[] = "pegasus";
-+
-+#undef PEGASUS_WRITE_EEPROM
-+#define BMSR_MEDIA (BMSR_10HALF | BMSR_10FULL | BMSR_100HALF | \
-+ BMSR_100FULL | BMSR_ANEGCAPABLE)
-+
-+static bool loopback;
-+static bool mii_mode;
-+static char *devid;
-+
-+static struct usb_eth_dev usb_dev_id[] = {
-+#define PEGASUS_DEV(pn, vid, pid, flags) \
-+ {.name = pn, .vendor = vid, .device = pid, .private = flags},
-+#define PEGASUS_DEV_CLASS(pn, vid, pid, dclass, flags) \
-+ PEGASUS_DEV(pn, vid, pid, flags)
-+#include "pegasus.h"
-+#undef PEGASUS_DEV
-+#undef PEGASUS_DEV_CLASS
-+ {NULL, 0, 0, 0},
-+ {NULL, 0, 0, 0}
-+};
-+
-+static struct usb_device_id pegasus_ids[] = {
-+#define PEGASUS_DEV(pn, vid, pid, flags) \
-+ {.match_flags = USB_DEVICE_ID_MATCH_DEVICE, .idVendor = vid, .idProduct = pid},
-+/*
-+ * The Belkin F8T012xx1 bluetooth adaptor has the same vendor and product
-+ * IDs as the Belkin F5D5050, so we need to teach the pegasus driver to
-+ * ignore adaptors belonging to the "Wireless" class 0xE0. For this one
-+ * case anyway, seeing as the pegasus is for "Wired" adaptors.
-+ */
-+#define PEGASUS_DEV_CLASS(pn, vid, pid, dclass, flags) \
-+ {.match_flags = (USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_DEV_CLASS), \
-+ .idVendor = vid, .idProduct = pid, .bDeviceClass = dclass},
-+#include "pegasus.h"
-+#undef PEGASUS_DEV
-+#undef PEGASUS_DEV_CLASS
-+ {},
-+ {}
-+};
-+
-+MODULE_AUTHOR(DRIVER_AUTHOR);
-+MODULE_DESCRIPTION(DRIVER_DESC);
-+MODULE_LICENSE("GPL");
-+module_param(loopback, bool, 0);
-+module_param(mii_mode, bool, 0);
-+module_param(devid, charp, 0);
-+MODULE_PARM_DESC(loopback, "Enable MAC loopback mode (bit 0)");
-+MODULE_PARM_DESC(mii_mode, "Enable HomePNA mode (bit 0),default=MII mode = 0");
-+MODULE_PARM_DESC(devid, "The format is: 'DEV_name:VendorID:DeviceID:Flags'");
-+
-+/* use ethtool to change the level for any given device */
-+static int msg_level = -1;
-+module_param(msg_level, int, 0);
-+MODULE_PARM_DESC(msg_level, "Override default message level");
-+
-+MODULE_DEVICE_TABLE(usb, pegasus_ids);
-+static const struct net_device_ops pegasus_netdev_ops;
-+
-+/*****/
-+
-+static void async_ctrl_callback(struct urb *urb)
-+{
-+ struct usb_ctrlrequest *req = (struct usb_ctrlrequest *)urb->context;
-+ int status = urb->status;
-+
-+ if (status < 0)
-+ dev_dbg(&urb->dev->dev, "%s failed with %d", __func__, status);
-+ kfree(req);
-+ usb_free_urb(urb);
-+}
-+
-+static int get_registers(pegasus_t *pegasus, __u16 indx, __u16 size, void *data)
-+{
-+ int ret;
-+
-+ ret = usb_control_msg(pegasus->usb, usb_rcvctrlpipe(pegasus->usb, 0),
-+ PEGASUS_REQ_GET_REGS, PEGASUS_REQT_READ, 0,
-+ indx, data, size, 1000);
-+ if (ret < 0)
-+ netif_dbg(pegasus, drv, pegasus->net,
-+ "%s returned %d\n", __func__, ret);
-+ return ret;
-+}
-+
-+static int set_registers(pegasus_t *pegasus, __u16 indx, __u16 size, void *data)
-+{
-+ int ret;
-+
-+ ret = usb_control_msg(pegasus->usb, usb_sndctrlpipe(pegasus->usb, 0),
-+ PEGASUS_REQ_SET_REGS, PEGASUS_REQT_WRITE, 0,
-+ indx, data, size, 100);
-+ if (ret < 0)
-+ netif_dbg(pegasus, drv, pegasus->net,
-+ "%s returned %d\n", __func__, ret);
-+ return ret;
-+}
-+
-+static int set_register(pegasus_t *pegasus, __u16 indx, __u8 data)
-+{
-+ int ret;
-+
-+ ret = usb_control_msg(pegasus->usb, usb_sndctrlpipe(pegasus->usb, 0),
-+ PEGASUS_REQ_SET_REG, PEGASUS_REQT_WRITE, data,
-+ indx, &data, 1, 1000);
-+ if (ret < 0)
-+ netif_dbg(pegasus, drv, pegasus->net,
-+ "%s returned %d\n", __func__, ret);
-+ return ret;
-+}
-+
-+static int update_eth_regs_async(pegasus_t *pegasus)
-+{
-+ int ret = -ENOMEM;
-+ struct urb *async_urb;
-+ struct usb_ctrlrequest *req;
-+
-+ req = kmalloc(sizeof(struct usb_ctrlrequest), GFP_ATOMIC);
-+ if (req == NULL)
-+ return ret;
-+
-+ async_urb = usb_alloc_urb(0, GFP_ATOMIC);
-+ if (async_urb == NULL) {
-+ kfree(req);
-+ return ret;
-+ }
-+ req->bRequestType = PEGASUS_REQT_WRITE;
-+ req->bRequest = PEGASUS_REQ_SET_REGS;
-+ req->wValue = cpu_to_le16(0);
-+ req->wIndex = cpu_to_le16(EthCtrl0);
-+ req->wLength = cpu_to_le16(3);
-+
-+ usb_fill_control_urb(async_urb, pegasus->usb,
-+ usb_sndctrlpipe(pegasus->usb, 0), (void *)req,
-+ pegasus->eth_regs, 3, async_ctrl_callback, req);
-+
-+ ret = usb_submit_urb(async_urb, GFP_ATOMIC);
-+ if (ret) {
-+ if (ret == -ENODEV)
-+ netif_device_detach(pegasus->net);
-+ netif_err(pegasus, drv, pegasus->net,
-+ "%s returned %d\n", __func__, ret);
-+ }
-+ return ret;
-+}
-+
-+static int __mii_op(pegasus_t *p, __u8 phy, __u8 indx, __u16 *regd, __u8 cmd)
-+{
-+ int i;
-+ __u8 data[4] = { phy, 0, 0, indx };
-+ __le16 regdi;
-+ int ret = -ETIMEDOUT;
-+
-+ if (cmd & PHY_WRITE) {
-+ __le16 *t = (__le16 *) & data[1];
-+ *t = cpu_to_le16(*regd);
-+ }
-+ set_register(p, PhyCtrl, 0);
-+ set_registers(p, PhyAddr, sizeof(data), data);
-+ set_register(p, PhyCtrl, (indx | cmd));
-+ for (i = 0; i < REG_TIMEOUT; i++) {
-+ ret = get_registers(p, PhyCtrl, 1, data);
-+ if (ret < 0)
-+ goto fail;
-+ if (data[0] & PHY_DONE)
-+ break;
-+ }
-+ if (i >= REG_TIMEOUT)
-+ goto fail;
-+ if (cmd & PHY_READ) {
-+ ret = get_registers(p, PhyData, 2, ®di);
-+ *regd = le16_to_cpu(regdi);
-+ return ret;
-+ }
-+ return 0;
-+fail:
-+ netif_dbg(p, drv, p->net, "%s failed\n", __func__);
-+ return ret;
-+}
-+
-+/* Returns non-negative int on success, error on failure */
-+static int read_mii_word(pegasus_t *pegasus, __u8 phy, __u8 indx, __u16 *regd)
-+{
-+ return __mii_op(pegasus, phy, indx, regd, PHY_READ);
-+}
-+
-+/* Returns zero on success, error on failure */
-+static int write_mii_word(pegasus_t *pegasus, __u8 phy, __u8 indx, __u16 *regd)
-+{
-+ return __mii_op(pegasus, phy, indx, regd, PHY_WRITE);
-+}
-+
-+static int mdio_read(struct net_device *dev, int phy_id, int loc)
-+{
-+ pegasus_t *pegasus = netdev_priv(dev);
-+ u16 res;
-+
-+ read_mii_word(pegasus, phy_id, loc, &res);
-+ return (int)res;
-+}
-+
-+static void mdio_write(struct net_device *dev, int phy_id, int loc, int val)
-+{
-+ pegasus_t *pegasus = netdev_priv(dev);
-+ u16 data = val;
-+
-+ write_mii_word(pegasus, phy_id, loc, &data);
-+}
-+
-+static int read_eprom_word(pegasus_t *pegasus, __u8 index, __u16 *retdata)
-+{
-+ int i;
-+ __u8 tmp;
-+ __le16 retdatai;
-+ int ret;
-+
-+ set_register(pegasus, EpromCtrl, 0);
-+ set_register(pegasus, EpromOffset, index);
-+ set_register(pegasus, EpromCtrl, EPROM_READ);
-+
-+ for (i = 0; i < REG_TIMEOUT; i++) {
-+ ret = get_registers(pegasus, EpromCtrl, 1, &tmp);
-+ if (tmp & EPROM_DONE)
-+ break;
-+ if (ret == -ESHUTDOWN)
-+ goto fail;
-+ }
-+ if (i >= REG_TIMEOUT)
-+ goto fail;
-+
-+ ret = get_registers(pegasus, EpromData, 2, &retdatai);
-+ *retdata = le16_to_cpu(retdatai);
-+ return ret;
-+
-+fail:
-+ netif_warn(pegasus, drv, pegasus->net, "%s failed\n", __func__);
-+ return -ETIMEDOUT;
-+}
-+
-+#ifdef PEGASUS_WRITE_EEPROM
-+static inline void enable_eprom_write(pegasus_t *pegasus)
-+{
-+ __u8 tmp;
-+
-+ get_registers(pegasus, EthCtrl2, 1, &tmp);
-+ set_register(pegasus, EthCtrl2, tmp | EPROM_WR_ENABLE);
-+}
-+
-+static inline void disable_eprom_write(pegasus_t *pegasus)
-+{
-+ __u8 tmp;
-+
-+ get_registers(pegasus, EthCtrl2, 1, &tmp);
-+ set_register(pegasus, EpromCtrl, 0);
-+ set_register(pegasus, EthCtrl2, tmp & ~EPROM_WR_ENABLE);
-+}
-+
-+static int write_eprom_word(pegasus_t *pegasus, __u8 index, __u16 data)
-+{
-+ int i;
-+ __u8 tmp, d[4] = { 0x3f, 0, 0, EPROM_WRITE };
-+ int ret;
-+ __le16 le_data = cpu_to_le16(data);
-+
-+ set_registers(pegasus, EpromOffset, 4, d);
-+ enable_eprom_write(pegasus);
-+ set_register(pegasus, EpromOffset, index);
-+ set_registers(pegasus, EpromData, 2, &le_data);
-+ set_register(pegasus, EpromCtrl, EPROM_WRITE);
-+
-+ for (i = 0; i < REG_TIMEOUT; i++) {
-+ ret = get_registers(pegasus, EpromCtrl, 1, &tmp);
-+ if (ret == -ESHUTDOWN)
-+ goto fail;
-+ if (tmp & EPROM_DONE)
-+ break;
-+ }
-+ disable_eprom_write(pegasus);
-+ if (i >= REG_TIMEOUT)
-+ goto fail;
-+
-+ return ret;
-+
-+fail:
-+ netif_warn(pegasus, drv, pegasus->net, "%s failed\n", __func__);
-+ return -ETIMEDOUT;
-+}
-+#endif /* PEGASUS_WRITE_EEPROM */
-+
-+static inline void get_node_id(pegasus_t *pegasus, __u8 *id)
-+{
-+ int i;
-+ __u16 w16;
-+
-+ for (i = 0; i < 3; i++) {
-+ read_eprom_word(pegasus, i, &w16);
-+ ((__le16 *) id)[i] = cpu_to_le16(w16);
-+ }
-+}
-+
-+static void set_ethernet_addr(pegasus_t *pegasus)
-+{
-+ __u8 node_id[6];
-+
-+ if (pegasus->features & PEGASUS_II) {
-+ get_registers(pegasus, 0x10, sizeof(node_id), node_id);
-+ } else {
-+ get_node_id(pegasus, node_id);
-+ set_registers(pegasus, EthID, sizeof(node_id), node_id);
-+ }
-+ memcpy(pegasus->net->dev_addr, node_id, sizeof(node_id));
-+}
-+
-+static inline int reset_mac(pegasus_t *pegasus)
-+{
-+ __u8 data = 0x8;
-+ int i;
-+
-+ set_register(pegasus, EthCtrl1, data);
-+ for (i = 0; i < REG_TIMEOUT; i++) {
-+ get_registers(pegasus, EthCtrl1, 1, &data);
-+ if (~data & 0x08) {
-+ if (loopback)
-+ break;
-+ if (mii_mode && (pegasus->features & HAS_HOME_PNA))
-+ set_register(pegasus, Gpio1, 0x34);
-+ else
-+ set_register(pegasus, Gpio1, 0x26);
-+ set_register(pegasus, Gpio0, pegasus->features);
-+ set_register(pegasus, Gpio0, DEFAULT_GPIO_SET);
-+ break;
-+ }
-+ }
-+ if (i == REG_TIMEOUT)
-+ return -ETIMEDOUT;
-+
-+ if (usb_dev_id[pegasus->dev_index].vendor == VENDOR_LINKSYS ||
-+ usb_dev_id[pegasus->dev_index].vendor == VENDOR_DLINK) {
-+ set_register(pegasus, Gpio0, 0x24);
-+ set_register(pegasus, Gpio0, 0x26);
-+ }
-+ if (usb_dev_id[pegasus->dev_index].vendor == VENDOR_ELCON) {
-+ __u16 auxmode;
-+ read_mii_word(pegasus, 3, 0x1b, &auxmode);
-+ auxmode |= 4;
-+ write_mii_word(pegasus, 3, 0x1b, &auxmode);
-+ }
-+
-+ return 0;
-+}
-+
-+static int enable_net_traffic(struct net_device *dev, struct usb_device *usb)
-+{
-+ __u16 linkpart;
-+ __u8 data[4];
-+ pegasus_t *pegasus = netdev_priv(dev);
-+ int ret;
-+
-+ read_mii_word(pegasus, pegasus->phy, MII_LPA, &linkpart);
-+ data[0] = 0xc9;
-+ data[1] = 0;
-+ if (linkpart & (ADVERTISE_100FULL | ADVERTISE_10FULL))
-+ data[1] |= 0x20; /* set full duplex */
-+ if (linkpart & (ADVERTISE_100FULL | ADVERTISE_100HALF))
-+ data[1] |= 0x10; /* set 100 Mbps */
-+ if (mii_mode)
-+ data[1] = 0;
-+ data[2] = loopback ? 0x09 : 0x01;
-+
-+ memcpy(pegasus->eth_regs, data, sizeof(data));
-+ ret = set_registers(pegasus, EthCtrl0, 3, data);
-+
-+ if (usb_dev_id[pegasus->dev_index].vendor == VENDOR_LINKSYS ||
-+ usb_dev_id[pegasus->dev_index].vendor == VENDOR_LINKSYS2 ||
-+ usb_dev_id[pegasus->dev_index].vendor == VENDOR_DLINK) {
-+ u16 auxmode;
-+ read_mii_word(pegasus, 0, 0x1b, &auxmode);
-+ auxmode |= 4;
-+ write_mii_word(pegasus, 0, 0x1b, &auxmode);
-+ }
-+
-+ return ret;
-+}
-+
-+static void read_bulk_callback(struct urb *urb)
-+{
-+ pegasus_t *pegasus = urb->context;
-+ struct net_device *net;
-+ int rx_status, count = urb->actual_length;
-+ int status = urb->status;
-+ u8 *buf = urb->transfer_buffer;
-+ __u16 pkt_len;
-+
-+ if (!pegasus)
-+ return;
-+
-+ net = pegasus->net;
-+ if (!netif_device_present(net) || !netif_running(net))
-+ return;
-+
-+ switch (status) {
-+ case 0:
-+ break;
-+ case -ETIME:
-+ netif_dbg(pegasus, rx_err, net, "reset MAC\n");
-+ pegasus->flags &= ~PEGASUS_RX_BUSY;
-+ break;
-+ case -EPIPE: /* stall, or disconnect from TT */
-+ /* FIXME schedule work to clear the halt */
-+ netif_warn(pegasus, rx_err, net, "no rx stall recovery\n");
-+ return;
-+ case -ENOENT:
-+ case -ECONNRESET:
-+ case -ESHUTDOWN:
-+ netif_dbg(pegasus, ifdown, net, "rx unlink, %d\n", status);
-+ return;
-+ default:
-+ netif_dbg(pegasus, rx_err, net, "RX status %d\n", status);
-+ goto goon;
-+ }
-+
-+ if (!count || count < 4)
-+ goto goon;
-+
-+ rx_status = buf[count - 2];
-+ if (rx_status & 0x1e) {
-+ netif_dbg(pegasus, rx_err, net,
-+ "RX packet error %x\n", rx_status);
-+ pegasus->stats.rx_errors++;
-+ if (rx_status & 0x06) /* long or runt */
-+ pegasus->stats.rx_length_errors++;
-+ if (rx_status & 0x08)
-+ pegasus->stats.rx_crc_errors++;
-+ if (rx_status & 0x10) /* extra bits */
-+ pegasus->stats.rx_frame_errors++;
-+ goto goon;
-+ }
-+ if (pegasus->chip == 0x8513) {
-+ pkt_len = le32_to_cpu(*(__le32 *)urb->transfer_buffer);
-+ pkt_len &= 0x0fff;
-+ pegasus->rx_skb->data += 2;
-+ } else {
-+ pkt_len = buf[count - 3] << 8;
-+ pkt_len += buf[count - 4];
-+ pkt_len &= 0xfff;
-+ pkt_len -= 8;
-+ }
-+
-+ /*
-+ * If the packet is unreasonably long, quietly drop it rather than
-+ * kernel panicing by calling skb_put.
-+ */
-+ if (pkt_len > PEGASUS_MTU)
-+ goto goon;
-+
-+ /*
-+ * at this point we are sure pegasus->rx_skb != NULL
-+ * so we go ahead and pass up the packet.
-+ */
-+ skb_put(pegasus->rx_skb, pkt_len);
-+ pegasus->rx_skb->protocol = eth_type_trans(pegasus->rx_skb, net);
-+ netif_rx(pegasus->rx_skb);
-+ pegasus->stats.rx_packets++;
-+ pegasus->stats.rx_bytes += pkt_len;
-+
-+ if (pegasus->flags & PEGASUS_UNPLUG)
-+ return;
-+
-+ pegasus->rx_skb = __netdev_alloc_skb_ip_align(pegasus->net, PEGASUS_MTU,
-+ GFP_ATOMIC);
-+
-+ if (pegasus->rx_skb == NULL)
-+ goto tl_sched;
-+goon:
-+ usb_fill_bulk_urb(pegasus->rx_urb, pegasus->usb,
-+ usb_rcvbulkpipe(pegasus->usb, 1),
-+ pegasus->rx_skb->data, PEGASUS_MTU + 8,
-+ read_bulk_callback, pegasus);
-+ rx_status = usb_submit_urb(pegasus->rx_urb, GFP_ATOMIC);
-+ if (rx_status == -ENODEV)
-+ netif_device_detach(pegasus->net);
-+ else if (rx_status) {
-+ pegasus->flags |= PEGASUS_RX_URB_FAIL;
-+ goto tl_sched;
-+ } else {
-+ pegasus->flags &= ~PEGASUS_RX_URB_FAIL;
-+ }
-+
-+ return;
-+
-+tl_sched:
-+ tasklet_schedule(&pegasus->rx_tl);
-+}
-+
-+static void rx_fixup(unsigned long data)
-+{
-+ pegasus_t *pegasus;
-+ int status;
-+
-+ pegasus = (pegasus_t *) data;
-+ if (pegasus->flags & PEGASUS_UNPLUG)
-+ return;
-+
-+ if (pegasus->flags & PEGASUS_RX_URB_FAIL)
-+ if (pegasus->rx_skb)
-+ goto try_again;
-+ if (pegasus->rx_skb == NULL)
-+ pegasus->rx_skb = __netdev_alloc_skb_ip_align(pegasus->net,
-+ PEGASUS_MTU,
-+ GFP_ATOMIC);
-+ if (pegasus->rx_skb == NULL) {
-+ netif_warn(pegasus, rx_err, pegasus->net, "low on memory\n");
-+ tasklet_schedule(&pegasus->rx_tl);
-+ return;
-+ }
-+ usb_fill_bulk_urb(pegasus->rx_urb, pegasus->usb,
-+ usb_rcvbulkpipe(pegasus->usb, 1),
-+ pegasus->rx_skb->data, PEGASUS_MTU + 8,
-+ read_bulk_callback, pegasus);
-+try_again:
-+ status = usb_submit_urb(pegasus->rx_urb, GFP_ATOMIC);
-+ if (status == -ENODEV)
-+ netif_device_detach(pegasus->net);
-+ else if (status) {
-+ pegasus->flags |= PEGASUS_RX_URB_FAIL;
-+ tasklet_schedule(&pegasus->rx_tl);
-+ } else {
-+ pegasus->flags &= ~PEGASUS_RX_URB_FAIL;
-+ }
-+}
-+
-+static void write_bulk_callback(struct urb *urb)
-+{
-+ pegasus_t *pegasus = urb->context;
-+ struct net_device *net;
-+ int status = urb->status;
-+
-+ if (!pegasus)
-+ return;
-+
-+ net = pegasus->net;
-+
-+ if (!netif_device_present(net) || !netif_running(net))
-+ return;
-+
-+ switch (status) {
-+ case -EPIPE:
-+ /* FIXME schedule_work() to clear the tx halt */
-+ netif_stop_queue(net);
-+ netif_warn(pegasus, tx_err, net, "no tx stall recovery\n");
-+ return;
-+ case -ENOENT:
-+ case -ECONNRESET:
-+ case -ESHUTDOWN:
-+ netif_dbg(pegasus, ifdown, net, "tx unlink, %d\n", status);
-+ return;
-+ default:
-+ netif_info(pegasus, tx_err, net, "TX status %d\n", status);
-+ /* FALL THROUGH */
-+ case 0:
-+ break;
-+ }
-+
-+ net->trans_start = jiffies; /* prevent tx timeout */
-+ netif_wake_queue(net);
-+}
-+
-+static void intr_callback(struct urb *urb)
-+{
-+ pegasus_t *pegasus = urb->context;
-+ struct net_device *net;
-+ int res, status = urb->status;
-+
-+ if (!pegasus)
-+ return;
-+ net = pegasus->net;
-+
-+ switch (status) {
-+ case 0:
-+ break;
-+ case -ECONNRESET: /* unlink */
-+ case -ENOENT:
-+ case -ESHUTDOWN:
-+ return;
-+ default:
-+ /* some Pegasus-I products report LOTS of data
-+ * toggle errors... avoid log spamming
-+ */
-+ netif_dbg(pegasus, timer, net, "intr status %d\n", status);
-+ }
-+
-+ if (urb->actual_length >= 6) {
-+ u8 *d = urb->transfer_buffer;
-+
-+ /* byte 0 == tx_status1, reg 2B */
-+ if (d[0] & (TX_UNDERRUN|EXCESSIVE_COL
-+ |LATE_COL|JABBER_TIMEOUT)) {
-+ pegasus->stats.tx_errors++;
-+ if (d[0] & TX_UNDERRUN)
-+ pegasus->stats.tx_fifo_errors++;
-+ if (d[0] & (EXCESSIVE_COL | JABBER_TIMEOUT))
-+ pegasus->stats.tx_aborted_errors++;
-+ if (d[0] & LATE_COL)
-+ pegasus->stats.tx_window_errors++;
-+ }
-+
-+ /* d[5].LINK_STATUS lies on some adapters.
-+ * d[0].NO_CARRIER kicks in only with failed TX.
-+ * ... so monitoring with MII may be safest.
-+ */
-+
-+ /* bytes 3-4 == rx_lostpkt, reg 2E/2F */
-+ pegasus->stats.rx_missed_errors += ((d[3] & 0x7f) << 8) | d[4];
-+ }
-+
-+ res = usb_submit_urb(urb, GFP_ATOMIC);
-+ if (res == -ENODEV)
-+ netif_device_detach(pegasus->net);
-+ if (res)
-+ netif_err(pegasus, timer, net,
-+ "can't resubmit interrupt urb, %d\n", res);
-+}
-+
-+static void pegasus_tx_timeout(struct net_device *net)
-+{
-+ pegasus_t *pegasus = netdev_priv(net);
-+ netif_warn(pegasus, timer, net, "tx timeout\n");
-+ usb_unlink_urb(pegasus->tx_urb);
-+ pegasus->stats.tx_errors++;
-+}
-+
-+static netdev_tx_t pegasus_start_xmit(struct sk_buff *skb,
-+ struct net_device *net)
-+{
-+ pegasus_t *pegasus = netdev_priv(net);
-+ int count = ((skb->len + 2) & 0x3f) ? skb->len + 2 : skb->len + 3;
-+ int res;
-+ __u16 l16 = skb->len;
-+
-+ netif_stop_queue(net);
-+
-+ ((__le16 *) pegasus->tx_buff)[0] = cpu_to_le16(l16);
-+ skb_copy_from_linear_data(skb, pegasus->tx_buff + 2, skb->len);
-+ usb_fill_bulk_urb(pegasus->tx_urb, pegasus->usb,
-+ usb_sndbulkpipe(pegasus->usb, 2),
-+ pegasus->tx_buff, count,
-+ write_bulk_callback, pegasus);
-+ if ((res = usb_submit_urb(pegasus->tx_urb, GFP_ATOMIC))) {
-+ netif_warn(pegasus, tx_err, net, "fail tx, %d\n", res);
-+ switch (res) {
-+ case -EPIPE: /* stall, or disconnect from TT */
-+ /* cleanup should already have been scheduled */
-+ break;
-+ case -ENODEV: /* disconnect() upcoming */
-+ case -EPERM:
-+ netif_device_detach(pegasus->net);
-+ break;
-+ default:
-+ pegasus->stats.tx_errors++;
-+ netif_start_queue(net);
-+ }
-+ } else {
-+ pegasus->stats.tx_packets++;
-+ pegasus->stats.tx_bytes += skb->len;
-+ }
-+ dev_kfree_skb(skb);
-+
-+ return NETDEV_TX_OK;
-+}
-+
-+static struct net_device_stats *pegasus_netdev_stats(struct net_device *dev)
-+{
-+ return &((pegasus_t *) netdev_priv(dev))->stats;
-+}
-+
-+static inline void disable_net_traffic(pegasus_t *pegasus)
-+{
-+ __le16 tmp = cpu_to_le16(0);
-+
-+ set_registers(pegasus, EthCtrl0, sizeof(tmp), &tmp);
-+}
-+
-+static inline void get_interrupt_interval(pegasus_t *pegasus)
-+{
-+ u16 data;
-+ u8 interval;
-+
-+ read_eprom_word(pegasus, 4, &data);
-+ interval = data >> 8;
-+ if (pegasus->usb->speed != USB_SPEED_HIGH) {
-+ if (interval < 0x80) {
-+ netif_info(pegasus, timer, pegasus->net,
-+ "intr interval changed from %ums to %ums\n",
-+ interval, 0x80);
-+ interval = 0x80;
-+ data = (data & 0x00FF) | ((u16)interval << 8);
-+#ifdef PEGASUS_WRITE_EEPROM
-+ write_eprom_word(pegasus, 4, data);
-+#endif
-+ }
-+ }
-+ pegasus->intr_interval = interval;
-+}
-+
-+static void set_carrier(struct net_device *net)
-+{
-+ pegasus_t *pegasus = netdev_priv(net);
-+ u16 tmp;
-+
-+ if (read_mii_word(pegasus, pegasus->phy, MII_BMSR, &tmp))
-+ return;
-+
-+ if (tmp & BMSR_LSTATUS)
-+ netif_carrier_on(net);
-+ else
-+ netif_carrier_off(net);
-+}
-+
-+static void free_all_urbs(pegasus_t *pegasus)
-+{
-+ usb_free_urb(pegasus->intr_urb);
-+ usb_free_urb(pegasus->tx_urb);
-+ usb_free_urb(pegasus->rx_urb);
-+}
-+
-+static void unlink_all_urbs(pegasus_t *pegasus)
-+{
-+ usb_kill_urb(pegasus->intr_urb);
-+ usb_kill_urb(pegasus->tx_urb);
-+ usb_kill_urb(pegasus->rx_urb);
-+}
-+
-+static int alloc_urbs(pegasus_t *pegasus)
-+{
-+ int res = -ENOMEM;
-+
-+ pegasus->rx_urb = usb_alloc_urb(0, GFP_KERNEL);
-+ if (!pegasus->rx_urb) {
-+ return res;
-+ }
-+ pegasus->tx_urb = usb_alloc_urb(0, GFP_KERNEL);
-+ if (!pegasus->tx_urb) {
-+ usb_free_urb(pegasus->rx_urb);
-+ return res;
-+ }
-+ pegasus->intr_urb = usb_alloc_urb(0, GFP_KERNEL);
-+ if (!pegasus->intr_urb) {
-+ usb_free_urb(pegasus->tx_urb);
-+ usb_free_urb(pegasus->rx_urb);
-+ return res;
-+ }
-+
-+ return 0;
-+}
-+
-+static int pegasus_open(struct net_device *net)
-+{
-+ pegasus_t *pegasus = netdev_priv(net);
-+ int res=-ENOMEM;
-+
-+ if (pegasus->rx_skb == NULL)
-+ pegasus->rx_skb = __netdev_alloc_skb_ip_align(pegasus->net,
-+ PEGASUS_MTU,
-+ GFP_KERNEL);
-+ if (!pegasus->rx_skb)
-+ goto exit;
-+
-+ res = set_registers(pegasus, EthID, 6, net->dev_addr);
-+
-+ usb_fill_bulk_urb(pegasus->rx_urb, pegasus->usb,
-+ usb_rcvbulkpipe(pegasus->usb, 1),
-+ pegasus->rx_skb->data, PEGASUS_MTU + 8,
-+ read_bulk_callback, pegasus);
-+ if ((res = usb_submit_urb(pegasus->rx_urb, GFP_KERNEL))) {
-+ if (res == -ENODEV)
-+ netif_device_detach(pegasus->net);
-+ netif_dbg(pegasus, ifup, net, "failed rx_urb, %d\n", res);
-+ goto exit;
-+ }
-+
-+ usb_fill_int_urb(pegasus->intr_urb, pegasus->usb,
-+ usb_rcvintpipe(pegasus->usb, 3),
-+ pegasus->intr_buff, sizeof(pegasus->intr_buff),
-+ intr_callback, pegasus, pegasus->intr_interval);
-+ if ((res = usb_submit_urb(pegasus->intr_urb, GFP_KERNEL))) {
-+ if (res == -ENODEV)
-+ netif_device_detach(pegasus->net);
-+ netif_dbg(pegasus, ifup, net, "failed intr_urb, %d\n", res);
-+ usb_kill_urb(pegasus->rx_urb);
-+ goto exit;
-+ }
-+ res = enable_net_traffic(net, pegasus->usb);
-+ if (res < 0) {
-+ netif_dbg(pegasus, ifup, net,
-+ "can't enable_net_traffic() - %d\n", res);
-+ res = -EIO;
-+ usb_kill_urb(pegasus->rx_urb);
-+ usb_kill_urb(pegasus->intr_urb);
-+ goto exit;
-+ }
-+ set_carrier(net);
-+ netif_start_queue(net);
-+ netif_dbg(pegasus, ifup, net, "open\n");
-+ res = 0;
-+exit:
-+ return res;
-+}
-+
-+static int pegasus_close(struct net_device *net)
-+{
-+ pegasus_t *pegasus = netdev_priv(net);
-+
-+ netif_stop_queue(net);
-+ if (!(pegasus->flags & PEGASUS_UNPLUG))
-+ disable_net_traffic(pegasus);
-+ tasklet_kill(&pegasus->rx_tl);
-+ unlink_all_urbs(pegasus);
-+
-+ return 0;
-+}
-+
-+static void pegasus_get_drvinfo(struct net_device *dev,
-+ struct ethtool_drvinfo *info)
-+{
-+ pegasus_t *pegasus = netdev_priv(dev);
-+
-+ strlcpy(info->driver, driver_name, sizeof(info->driver));
-+ strlcpy(info->version, DRIVER_VERSION, sizeof(info->version));
-+ usb_make_path(pegasus->usb, info->bus_info, sizeof(info->bus_info));
-+}
-+
-+/* also handles three patterns of some kind in hardware */
-+#define WOL_SUPPORTED (WAKE_MAGIC|WAKE_PHY)
-+
-+static void
-+pegasus_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
-+{
-+ pegasus_t *pegasus = netdev_priv(dev);
-+
-+ wol->supported = WAKE_MAGIC | WAKE_PHY;
-+ wol->wolopts = pegasus->wolopts;
-+}
-+
-+static int
-+pegasus_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
-+{
-+ pegasus_t *pegasus = netdev_priv(dev);
-+ u8 reg78 = 0x04;
-+ int ret;
-+
-+ if (wol->wolopts & ~WOL_SUPPORTED)
-+ return -EINVAL;
-+
-+ if (wol->wolopts & WAKE_MAGIC)
-+ reg78 |= 0x80;
-+ if (wol->wolopts & WAKE_PHY)
-+ reg78 |= 0x40;
-+ /* FIXME this 0x10 bit still needs to get set in the chip... */
-+ if (wol->wolopts)
-+ pegasus->eth_regs[0] |= 0x10;
-+ else
-+ pegasus->eth_regs[0] &= ~0x10;
-+ pegasus->wolopts = wol->wolopts;
-+
-+ ret = set_register(pegasus, WakeupControl, reg78);
-+ if (!ret)
-+ ret = device_set_wakeup_enable(&pegasus->usb->dev,
-+ wol->wolopts);
-+ return ret;
-+}
-+
-+static inline void pegasus_reset_wol(struct net_device *dev)
-+{
-+ struct ethtool_wolinfo wol;
-+
-+ memset(&wol, 0, sizeof wol);
-+ (void) pegasus_set_wol(dev, &wol);
-+}
-+
-+static int
-+pegasus_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
-+{
-+ pegasus_t *pegasus;
-+
-+ pegasus = netdev_priv(dev);
-+ mii_ethtool_gset(&pegasus->mii, ecmd);
-+ return 0;
-+}
-+
-+static int
-+pegasus_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
-+{
-+ pegasus_t *pegasus = netdev_priv(dev);
-+ return mii_ethtool_sset(&pegasus->mii, ecmd);
-+}
-+
-+static int pegasus_nway_reset(struct net_device *dev)
-+{
-+ pegasus_t *pegasus = netdev_priv(dev);
-+ return mii_nway_restart(&pegasus->mii);
-+}
-+
-+static u32 pegasus_get_link(struct net_device *dev)
-+{
-+ pegasus_t *pegasus = netdev_priv(dev);
-+ return mii_link_ok(&pegasus->mii);
-+}
-+
-+static u32 pegasus_get_msglevel(struct net_device *dev)
-+{
-+ pegasus_t *pegasus = netdev_priv(dev);
-+ return pegasus->msg_enable;
-+}
-+
-+static void pegasus_set_msglevel(struct net_device *dev, u32 v)
-+{
-+ pegasus_t *pegasus = netdev_priv(dev);
-+ pegasus->msg_enable = v;
-+}
-+
-+static const struct ethtool_ops ops = {
-+ .get_drvinfo = pegasus_get_drvinfo,
-+ .get_settings = pegasus_get_settings,
-+ .set_settings = pegasus_set_settings,
-+ .nway_reset = pegasus_nway_reset,
-+ .get_link = pegasus_get_link,
-+ .get_msglevel = pegasus_get_msglevel,
-+ .set_msglevel = pegasus_set_msglevel,
-+ .get_wol = pegasus_get_wol,
-+ .set_wol = pegasus_set_wol,
-+};
-+
-+static int pegasus_ioctl(struct net_device *net, struct ifreq *rq, int cmd)
-+{
-+ __u16 *data = (__u16 *) &rq->ifr_ifru;
-+ pegasus_t *pegasus = netdev_priv(net);
-+ int res;
-+
-+ switch (cmd) {
-+ case SIOCDEVPRIVATE:
-+ data[0] = pegasus->phy;
-+ case SIOCDEVPRIVATE + 1:
-+ read_mii_word(pegasus, data[0], data[1] & 0x1f, &data[3]);
-+ res = 0;
-+ break;
-+ case SIOCDEVPRIVATE + 2:
-+ if (!capable(CAP_NET_ADMIN))
-+ return -EPERM;
-+ write_mii_word(pegasus, pegasus->phy, data[1] & 0x1f, &data[2]);
-+ res = 0;
-+ break;
-+ default:
-+ res = -EOPNOTSUPP;
-+ }
-+ return res;
-+}
-+
-+static void pegasus_set_multicast(struct net_device *net)
-+{
-+ pegasus_t *pegasus = netdev_priv(net);
-+
-+ if (net->flags & IFF_PROMISC) {
-+ pegasus->eth_regs[EthCtrl2] |= RX_PROMISCUOUS;
-+ netif_info(pegasus, link, net, "Promiscuous mode enabled\n");
-+ } else if (!netdev_mc_empty(net) || (net->flags & IFF_ALLMULTI)) {
-+ pegasus->eth_regs[EthCtrl0] |= RX_MULTICAST;
-+ pegasus->eth_regs[EthCtrl2] &= ~RX_PROMISCUOUS;
-+ netif_dbg(pegasus, link, net, "set allmulti\n");
-+ } else {
-+ pegasus->eth_regs[EthCtrl0] &= ~RX_MULTICAST;
-+ pegasus->eth_regs[EthCtrl2] &= ~RX_PROMISCUOUS;
-+ }
-+ update_eth_regs_async(pegasus);
-+}
-+
-+static __u8 mii_phy_probe(pegasus_t *pegasus)
-+{
-+ int i;
-+ __u16 tmp;
-+
-+ for (i = 0; i < 32; i++) {
-+ read_mii_word(pegasus, i, MII_BMSR, &tmp);
-+ if (tmp == 0 || tmp == 0xffff || (tmp & BMSR_MEDIA) == 0)
-+ continue;
-+ else
-+ return i;
-+ }
-+
-+ return 0xff;
-+}
-+
-+static inline void setup_pegasus_II(pegasus_t *pegasus)
-+{
-+ __u8 data = 0xa5;
-+
-+ set_register(pegasus, Reg1d, 0);
-+ set_register(pegasus, Reg7b, 1);
-+ mdelay(100);
-+ if ((pegasus->features & HAS_HOME_PNA) && mii_mode)
-+ set_register(pegasus, Reg7b, 0);
-+ else
-+ set_register(pegasus, Reg7b, 2);
-+
-+ set_register(pegasus, 0x83, data);
-+ get_registers(pegasus, 0x83, 1, &data);
-+
-+ if (data == 0xa5)
-+ pegasus->chip = 0x8513;
-+ else
-+ pegasus->chip = 0;
-+
-+ set_register(pegasus, 0x80, 0xc0);
-+ set_register(pegasus, 0x83, 0xff);
-+ set_register(pegasus, 0x84, 0x01);
-+
-+ if (pegasus->features & HAS_HOME_PNA && mii_mode)
-+ set_register(pegasus, Reg81, 6);
-+ else
-+ set_register(pegasus, Reg81, 2);
-+}
-+
-+
-+static int pegasus_count;
-+static struct workqueue_struct *pegasus_workqueue;
-+#define CARRIER_CHECK_DELAY (2 * HZ)
-+
-+static void check_carrier(struct work_struct *work)
-+{
-+ pegasus_t *pegasus = container_of(work, pegasus_t, carrier_check.work);
-+ set_carrier(pegasus->net);
-+ if (!(pegasus->flags & PEGASUS_UNPLUG)) {
-+ queue_delayed_work(pegasus_workqueue, &pegasus->carrier_check,
-+ CARRIER_CHECK_DELAY);
-+ }
-+}
-+
-+static int pegasus_blacklisted(struct usb_device *udev)
-+{
-+ struct usb_device_descriptor *udd = &udev->descriptor;
-+
-+ /* Special quirk to keep the driver from handling the Belkin Bluetooth
-+ * dongle which happens to have the same ID.
-+ */
-+ if ((udd->idVendor == cpu_to_le16(VENDOR_BELKIN)) &&
-+ (udd->idProduct == cpu_to_le16(0x0121)) &&
-+ (udd->bDeviceClass == USB_CLASS_WIRELESS_CONTROLLER) &&
-+ (udd->bDeviceProtocol == 1))
-+ return 1;
-+
-+ return 0;
-+}
-+
-+/* we rely on probe() and remove() being serialized so we
-+ * don't need extra locking on pegasus_count.
-+ */
-+static void pegasus_dec_workqueue(void)
-+{
-+ pegasus_count--;
-+ if (pegasus_count == 0) {
-+ destroy_workqueue(pegasus_workqueue);
-+ pegasus_workqueue = NULL;
-+ }
-+}
-+
-+static int pegasus_probe(struct usb_interface *intf,
-+ const struct usb_device_id *id)
-+{
-+ struct usb_device *dev = interface_to_usbdev(intf);
-+ struct net_device *net;
-+ pegasus_t *pegasus;
-+ int dev_index = id - pegasus_ids;
-+ int res = -ENOMEM;
-+
-+ if (pegasus_blacklisted(dev))
-+ return -ENODEV;
-+
-+ if (pegasus_count == 0) {
-+ pegasus_workqueue = create_singlethread_workqueue("pegasus");
-+ if (!pegasus_workqueue)
-+ return -ENOMEM;
-+ }
-+ pegasus_count++;
-+
-+ net = alloc_etherdev(sizeof(struct pegasus));
-+ if (!net)
-+ goto out;
-+
-+ pegasus = netdev_priv(net);
-+ pegasus->dev_index = dev_index;
-+
-+ res = alloc_urbs(pegasus);
-+ if (res < 0) {
-+ dev_err(&intf->dev, "can't allocate %s\n", "urbs");
-+ goto out1;
-+ }
-+
-+ tasklet_init(&pegasus->rx_tl, rx_fixup, (unsigned long) pegasus);
-+
-+ INIT_DELAYED_WORK(&pegasus->carrier_check, check_carrier);
-+
-+ pegasus->intf = intf;
-+ pegasus->usb = dev;
-+ pegasus->net = net;
-+
-+
-+ net->watchdog_timeo = PEGASUS_TX_TIMEOUT;
-+ net->netdev_ops = &pegasus_netdev_ops;
-+ net->ethtool_ops = &ops;
-+ pegasus->mii.dev = net;
-+ pegasus->mii.mdio_read = mdio_read;
-+ pegasus->mii.mdio_write = mdio_write;
-+ pegasus->mii.phy_id_mask = 0x1f;
-+ pegasus->mii.reg_num_mask = 0x1f;
-+ pegasus->msg_enable = netif_msg_init(msg_level, NETIF_MSG_DRV
-+ | NETIF_MSG_PROBE | NETIF_MSG_LINK);
-+
-+ pegasus->features = usb_dev_id[dev_index].private;
-+ get_interrupt_interval(pegasus);
-+ if (reset_mac(pegasus)) {
-+ dev_err(&intf->dev, "can't reset MAC\n");
-+ res = -EIO;
-+ goto out2;
-+ }
-+ set_ethernet_addr(pegasus);
-+ if (pegasus->features & PEGASUS_II) {
-+ dev_info(&intf->dev, "setup Pegasus II specific registers\n");
-+ setup_pegasus_II(pegasus);
-+ }
-+ pegasus->phy = mii_phy_probe(pegasus);
-+ if (pegasus->phy == 0xff) {
-+ dev_warn(&intf->dev, "can't locate MII phy, using default\n");
-+ pegasus->phy = 1;
-+ }
-+ pegasus->mii.phy_id = pegasus->phy;
-+ usb_set_intfdata(intf, pegasus);
-+ SET_NETDEV_DEV(net, &intf->dev);
-+ pegasus_reset_wol(net);
-+ res = register_netdev(net);
-+ if (res)
-+ goto out3;
-+ queue_delayed_work(pegasus_workqueue, &pegasus->carrier_check,
-+ CARRIER_CHECK_DELAY);
-+ dev_info(&intf->dev, "%s, %s, %pM\n", net->name,
-+ usb_dev_id[dev_index].name, net->dev_addr);
-+ return 0;
-+
-+out3:
-+ usb_set_intfdata(intf, NULL);
-+out2:
-+ free_all_urbs(pegasus);
-+out1:
-+ free_netdev(net);
-+out:
-+ pegasus_dec_workqueue();
-+ return res;
-+}
-+
-+static void pegasus_disconnect(struct usb_interface *intf)
-+{
-+ struct pegasus *pegasus = usb_get_intfdata(intf);
-+
-+ usb_set_intfdata(intf, NULL);
-+ if (!pegasus) {
-+ dev_dbg(&intf->dev, "unregistering non-bound device?\n");
-+ return;
-+ }
-+
-+ pegasus->flags |= PEGASUS_UNPLUG;
-+ cancel_delayed_work(&pegasus->carrier_check);
-+ unregister_netdev(pegasus->net);
-+ unlink_all_urbs(pegasus);
-+ free_all_urbs(pegasus);
-+ if (pegasus->rx_skb != NULL) {
-+ dev_kfree_skb(pegasus->rx_skb);
-+ pegasus->rx_skb = NULL;
-+ }
-+ free_netdev(pegasus->net);
-+ pegasus_dec_workqueue();
-+}
-+
-+static int pegasus_suspend(struct usb_interface *intf, pm_message_t message)
-+{
-+ struct pegasus *pegasus = usb_get_intfdata(intf);
-+
-+ netif_device_detach(pegasus->net);
-+ cancel_delayed_work(&pegasus->carrier_check);
-+ if (netif_running(pegasus->net)) {
-+ usb_kill_urb(pegasus->rx_urb);
-+ usb_kill_urb(pegasus->intr_urb);
-+ }
-+ return 0;
-+}
-+
-+static int pegasus_resume(struct usb_interface *intf)
-+{
-+ struct pegasus *pegasus = usb_get_intfdata(intf);
-+
-+ netif_device_attach(pegasus->net);
-+ if (netif_running(pegasus->net)) {
-+ pegasus->rx_urb->status = 0;
-+ pegasus->rx_urb->actual_length = 0;
-+ read_bulk_callback(pegasus->rx_urb);
-+
-+ pegasus->intr_urb->status = 0;
-+ pegasus->intr_urb->actual_length = 0;
-+ intr_callback(pegasus->intr_urb);
-+ }
-+ queue_delayed_work(pegasus_workqueue, &pegasus->carrier_check,
-+ CARRIER_CHECK_DELAY);
-+ return 0;
-+}
-+
-+static const struct net_device_ops pegasus_netdev_ops = {
-+ .ndo_open = pegasus_open,
-+ .ndo_stop = pegasus_close,
-+ .ndo_do_ioctl = pegasus_ioctl,
-+ .ndo_start_xmit = pegasus_start_xmit,
-+ .ndo_set_rx_mode = pegasus_set_multicast,
-+ .ndo_get_stats = pegasus_netdev_stats,
-+ .ndo_tx_timeout = pegasus_tx_timeout,
-+ .ndo_change_mtu = eth_change_mtu,
-+ .ndo_set_mac_address = eth_mac_addr,
-+ .ndo_validate_addr = eth_validate_addr,
-+};
-+
-+static struct usb_driver pegasus_driver = {
-+ .name = driver_name,
-+ .probe = pegasus_probe,
-+ .disconnect = pegasus_disconnect,
-+ .id_table = pegasus_ids,
-+ .suspend = pegasus_suspend,
-+ .resume = pegasus_resume,
-+ .disable_hub_initiated_lpm = 1,
-+};
-+
-+static void __init parse_id(char *id)
-+{
-+ unsigned int vendor_id = 0, device_id = 0, flags = 0, i = 0;
-+ char *token, *name = NULL;
-+
-+ if ((token = strsep(&id, ":")) != NULL)
-+ name = token;
-+ /* name now points to a null terminated string*/
-+ if ((token = strsep(&id, ":")) != NULL)
-+ vendor_id = simple_strtoul(token, NULL, 16);
-+ if ((token = strsep(&id, ":")) != NULL)
-+ device_id = simple_strtoul(token, NULL, 16);
-+ flags = simple_strtoul(id, NULL, 16);
-+ pr_info("%s: new device %s, vendor ID 0x%04x, device ID 0x%04x, flags: 0x%x\n",
-+ driver_name, name, vendor_id, device_id, flags);
-+
-+ if (vendor_id > 0x10000 || vendor_id == 0)
-+ return;
-+ if (device_id > 0x10000 || device_id == 0)
-+ return;
-+
-+ for (i = 0; usb_dev_id[i].name; i++);
-+ usb_dev_id[i].name = name;
-+ usb_dev_id[i].vendor = vendor_id;
-+ usb_dev_id[i].device = device_id;
-+ usb_dev_id[i].private = flags;
-+ pegasus_ids[i].match_flags = USB_DEVICE_ID_MATCH_DEVICE;
-+ pegasus_ids[i].idVendor = vendor_id;
-+ pegasus_ids[i].idProduct = device_id;
-+}
-+
-+static int __init pegasus_init(void)
-+{
-+ pr_info("%s: %s, " DRIVER_DESC "\n", driver_name, DRIVER_VERSION);
-+ if (devid)
-+ parse_id(devid);
-+ return usb_register(&pegasus_driver);
-+}
-+
-+static void __exit pegasus_exit(void)
-+{
-+ usb_deregister(&pegasus_driver);
-+}
-+
-+module_init(pegasus_init);
-+module_exit(pegasus_exit);
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/pegasus.h backports-3.18.1-1/drivers/net/usb/pegasus.h
---- backports-3.18.1-1.org/drivers/net/usb/pegasus.h 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/pegasus.h 2014-12-16 18:39:45.000000000 +0100
-@@ -0,0 +1,308 @@
-+/*
-+ * Copyright (c) 1999-2013 Petko Manolov (petkan(a)nucleusys.com)
-+ *
-+ * 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 published
-+ * by the Free Software Foundation.
-+ */
-+
-+
-+#ifndef PEGASUS_DEV
-+
-+#define PEGASUS_II 0x80000000
-+#define HAS_HOME_PNA 0x40000000
-+
-+#define PEGASUS_MTU 1536
-+
-+#define EPROM_WRITE 0x01
-+#define EPROM_READ 0x02
-+#define EPROM_DONE 0x04
-+#define EPROM_WR_ENABLE 0x10
-+#define EPROM_LOAD 0x20
-+
-+#define PHY_DONE 0x80
-+#define PHY_READ 0x40
-+#define PHY_WRITE 0x20
-+#define DEFAULT_GPIO_RESET 0x24
-+#define DEFAULT_GPIO_SET 0x26
-+
-+#define PEGASUS_PRESENT 0x00000001
-+#define PEGASUS_TX_BUSY 0x00000004
-+#define PEGASUS_RX_BUSY 0x00000008
-+#define CTRL_URB_RUNNING 0x00000010
-+#define CTRL_URB_SLEEP 0x00000020
-+#define PEGASUS_UNPLUG 0x00000040
-+#define PEGASUS_RX_URB_FAIL 0x00000080
-+
-+#define RX_MULTICAST 2
-+#define RX_PROMISCUOUS 4
-+
-+#define REG_TIMEOUT (HZ)
-+#define PEGASUS_TX_TIMEOUT (HZ*10)
-+
-+#define TX_UNDERRUN 0x80
-+#define EXCESSIVE_COL 0x40
-+#define LATE_COL 0x20
-+#define NO_CARRIER 0x10
-+#define LOSS_CARRIER 0x08
-+#define JABBER_TIMEOUT 0x04
-+
-+#define LINK_STATUS 0x01
-+
-+#define PEGASUS_REQT_READ 0xc0
-+#define PEGASUS_REQT_WRITE 0x40
-+#define PEGASUS_REQ_GET_REGS 0xf0
-+#define PEGASUS_REQ_SET_REGS 0xf1
-+#define PEGASUS_REQ_SET_REG PEGASUS_REQ_SET_REGS
-+
-+enum pegasus_registers {
-+ EthCtrl0 = 0,
-+ EthCtrl1 = 1,
-+ EthCtrl2 = 2,
-+ EthID = 0x10,
-+ Reg1d = 0x1d,
-+ EpromOffset = 0x20,
-+ EpromData = 0x21, /* 0x21 low, 0x22 high byte */
-+ EpromCtrl = 0x23,
-+ PhyAddr = 0x25,
-+ PhyData = 0x26, /* 0x26 low, 0x27 high byte */
-+ PhyCtrl = 0x28,
-+ UsbStst = 0x2a,
-+ EthTxStat0 = 0x2b,
-+ EthTxStat1 = 0x2c,
-+ EthRxStat = 0x2d,
-+ WakeupControl = 0x78,
-+ Reg7b = 0x7b,
-+ Gpio0 = 0x7e,
-+ Gpio1 = 0x7f,
-+ Reg81 = 0x81,
-+};
-+
-+
-+typedef struct pegasus {
-+ struct usb_device *usb;
-+ struct usb_interface *intf;
-+ struct net_device *net;
-+ struct net_device_stats stats;
-+ struct mii_if_info mii;
-+ unsigned flags;
-+ unsigned features;
-+ u32 msg_enable;
-+ u32 wolopts;
-+ int dev_index;
-+ int intr_interval;
-+ struct tasklet_struct rx_tl;
-+ struct delayed_work carrier_check;
-+ struct urb *rx_urb, *tx_urb, *intr_urb;
-+ struct sk_buff *rx_skb;
-+ int chip;
-+ unsigned char intr_buff[8];
-+ __u8 tx_buff[PEGASUS_MTU];
-+ __u8 eth_regs[4];
-+ __u8 phy;
-+ __u8 gpio_res;
-+} pegasus_t;
-+
-+
-+struct usb_eth_dev {
-+ char *name;
-+ __u16 vendor;
-+ __u16 device;
-+ __u32 private; /* LSB is gpio reset value */
-+};
-+
-+#define VENDOR_3COM 0x0506
-+#define VENDOR_ABOCOM 0x07b8
-+#define VENDOR_ACCTON 0x083a
-+#define VENDOR_ADMTEK 0x07a6
-+#define VENDOR_AEILAB 0x3334
-+#define VENDOR_ALLIEDTEL 0x07c9
-+#define VENDOR_ATEN 0x0557
-+#define VENDOR_BELKIN 0x050d
-+#define VENDOR_BILLIONTON 0x08dd
-+#define VENDOR_COMPAQ 0x049f
-+#define VENDOR_COREGA 0x07aa
-+#define VENDOR_DLINK 0x2001
-+#define VENDOR_ELCON 0x0db7
-+#define VENDOR_ELECOM 0x056e
-+#define VENDOR_ELSA 0x05cc
-+#define VENDOR_GIGABYTE 0x1044
-+#define VENDOR_HAWKING 0x0e66
-+#define VENDOR_HP 0x03f0
-+#define VENDOR_IODATA 0x04bb
-+#define VENDOR_KINGSTON 0x0951
-+#define VENDOR_LANEED 0x056e
-+#define VENDOR_LINKSYS 0x066b
-+#define VENDOR_LINKSYS2 0x077b
-+#define VENDOR_MELCO 0x0411
-+#define VENDOR_MICROSOFT 0x045e
-+#define VENDOR_MOBILITY 0x1342
-+#define VENDOR_NETGEAR 0x0846
-+#define VENDOR_OCT 0x0b39
-+#define VENDOR_SMARTBRIDGES 0x08d1
-+#define VENDOR_SMC 0x0707
-+#define VENDOR_SOHOWARE 0x15e8
-+#define VENDOR_SIEMENS 0x067c
-+
-+
-+#else /* PEGASUS_DEV */
-+
-+PEGASUS_DEV("3Com USB Ethernet 3C460B", VENDOR_3COM, 0x4601,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("ATEN USB Ethernet UC-110T", VENDOR_ATEN, 0x2007,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("USB HPNA/Ethernet", VENDOR_ABOCOM, 0x110c,
-+ DEFAULT_GPIO_RESET | PEGASUS_II | HAS_HOME_PNA)
-+PEGASUS_DEV("USB HPNA/Ethernet", VENDOR_ABOCOM, 0x4104,
-+ DEFAULT_GPIO_RESET | HAS_HOME_PNA)
-+PEGASUS_DEV("USB HPNA/Ethernet", VENDOR_ABOCOM, 0x4004,
-+ DEFAULT_GPIO_RESET | HAS_HOME_PNA)
-+PEGASUS_DEV("USB HPNA/Ethernet", VENDOR_ABOCOM, 0x4007,
-+ DEFAULT_GPIO_RESET | HAS_HOME_PNA)
-+PEGASUS_DEV("USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0x4102,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0x4002,
-+ DEFAULT_GPIO_RESET)
-+PEGASUS_DEV("USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0x400b,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0x400c,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0xabc1,
-+ DEFAULT_GPIO_RESET)
-+PEGASUS_DEV("USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0x200c,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("Accton USB 10/100 Ethernet Adapter", VENDOR_ACCTON, 0x1046,
-+ DEFAULT_GPIO_RESET)
-+PEGASUS_DEV("SpeedStream USB 10/100 Ethernet", VENDOR_ACCTON, 0x5046,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("Philips USB 10/100 Ethernet", VENDOR_ACCTON, 0xb004,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("ADMtek ADM8511 \"Pegasus II\" USB Ethernet",
-+ VENDOR_ADMTEK, 0x8511,
-+ DEFAULT_GPIO_RESET | PEGASUS_II | HAS_HOME_PNA)
-+PEGASUS_DEV("ADMtek ADM8513 \"Pegasus II\" USB Ethernet",
-+ VENDOR_ADMTEK, 0x8513,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("ADMtek ADM8515 \"Pegasus II\" USB-2.0 Ethernet",
-+ VENDOR_ADMTEK, 0x8515,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("ADMtek AN986 \"Pegasus\" USB Ethernet (evaluation board)",
-+ VENDOR_ADMTEK, 0x0986,
-+ DEFAULT_GPIO_RESET | HAS_HOME_PNA)
-+PEGASUS_DEV("AN986A USB MAC", VENDOR_ADMTEK, 1986,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("AEI USB Fast Ethernet Adapter", VENDOR_AEILAB, 0x1701,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("Allied Telesyn Int. AT-USB100", VENDOR_ALLIEDTEL, 0xb100,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+/*
-+ * Distinguish between this Belkin adaptor and the Belkin bluetooth adaptors
-+ * with the same product IDs by checking the device class too.
-+ */
-+PEGASUS_DEV_CLASS("Belkin F5D5050 USB Ethernet", VENDOR_BELKIN, 0x0121, 0x00,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("Belkin F5U122 10/100 USB Ethernet", VENDOR_BELKIN, 0x0122,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("Billionton USB-100", VENDOR_BILLIONTON, 0x0986,
-+ DEFAULT_GPIO_RESET)
-+PEGASUS_DEV("Billionton USBLP-100", VENDOR_BILLIONTON, 0x0987,
-+ DEFAULT_GPIO_RESET | HAS_HOME_PNA)
-+PEGASUS_DEV("iPAQ Networking 10/100 USB", VENDOR_COMPAQ, 0x8511,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("Billionton USBEL-100", VENDOR_BILLIONTON, 0x0988,
-+ DEFAULT_GPIO_RESET)
-+PEGASUS_DEV("Billionton USBE-100", VENDOR_BILLIONTON, 0x8511,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("Corega FEther USB-TX", VENDOR_COREGA, 0x0004,
-+ DEFAULT_GPIO_RESET)
-+PEGASUS_DEV("Corega FEther USB-TXS", VENDOR_COREGA, 0x000d,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("D-Link DSB-650TX", VENDOR_DLINK, 0x4001,
-+ DEFAULT_GPIO_RESET)
-+PEGASUS_DEV("D-Link DSB-650TX", VENDOR_DLINK, 0x4002,
-+ DEFAULT_GPIO_RESET)
-+PEGASUS_DEV("D-Link DSB-650TX", VENDOR_DLINK, 0x4102,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("D-Link DSB-650TX", VENDOR_DLINK, 0x400b,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("D-Link DSB-650TX", VENDOR_DLINK, 0x200c,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("D-Link DSB-650TX(PNA)", VENDOR_DLINK, 0x4003,
-+ DEFAULT_GPIO_RESET | HAS_HOME_PNA)
-+PEGASUS_DEV("D-Link DSB-650", VENDOR_DLINK, 0xabc1,
-+ DEFAULT_GPIO_RESET)
-+PEGASUS_DEV("GOLDPFEIL USB Adapter", VENDOR_ELCON, 0x0002,
-+ DEFAULT_GPIO_RESET | PEGASUS_II | HAS_HOME_PNA)
-+PEGASUS_DEV("ELECOM USB Ethernet LD-USB20", VENDOR_ELECOM, 0x4010,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("EasiDock Ethernet", VENDOR_MOBILITY, 0x0304,
-+ DEFAULT_GPIO_RESET)
-+PEGASUS_DEV("Elsa Micolink USB2Ethernet", VENDOR_ELSA, 0x3000,
-+ DEFAULT_GPIO_RESET)
-+PEGASUS_DEV("GIGABYTE GN-BR402W Wireless Router", VENDOR_GIGABYTE, 0x8002,
-+ DEFAULT_GPIO_RESET)
-+PEGASUS_DEV("Hawking UF100 10/100 Ethernet", VENDOR_HAWKING, 0x400c,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("HP hn210c Ethernet USB", VENDOR_HP, 0x811c,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("IO DATA USB ET/TX", VENDOR_IODATA, 0x0904,
-+ DEFAULT_GPIO_RESET)
-+PEGASUS_DEV("IO DATA USB ET/TX-S", VENDOR_IODATA, 0x0913,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("IO DATA USB ETX-US2", VENDOR_IODATA, 0x093a,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("Kingston KNU101TX Ethernet", VENDOR_KINGSTON, 0x000a,
-+ DEFAULT_GPIO_RESET)
-+PEGASUS_DEV("LANEED USB Ethernet LD-USB/TX", VENDOR_LANEED, 0x4002,
-+ DEFAULT_GPIO_RESET)
-+PEGASUS_DEV("LANEED USB Ethernet LD-USBL/TX", VENDOR_LANEED, 0x4005,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("LANEED USB Ethernet LD-USB/TX", VENDOR_LANEED, 0x400b,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("LANEED USB Ethernet LD-USB/T", VENDOR_LANEED, 0xabc1,
-+ DEFAULT_GPIO_RESET)
-+PEGASUS_DEV("LANEED USB Ethernet LD-USB/TX", VENDOR_LANEED, 0x200c,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("Linksys USB10TX", VENDOR_LINKSYS, 0x2202,
-+ DEFAULT_GPIO_RESET)
-+PEGASUS_DEV("Linksys USB100TX", VENDOR_LINKSYS, 0x2203,
-+ DEFAULT_GPIO_RESET)
-+PEGASUS_DEV("Linksys USB100TX", VENDOR_LINKSYS, 0x2204,
-+ DEFAULT_GPIO_RESET | HAS_HOME_PNA)
-+PEGASUS_DEV("Linksys USB10T Ethernet Adapter", VENDOR_LINKSYS, 0x2206,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("Linksys USBVPN1", VENDOR_LINKSYS2, 0x08b4,
-+ DEFAULT_GPIO_RESET)
-+PEGASUS_DEV("Linksys USB USB100TX", VENDOR_LINKSYS, 0x400b,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("Linksys USB10TX", VENDOR_LINKSYS, 0x200c,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("MELCO/BUFFALO LUA-TX", VENDOR_MELCO, 0x0001,
-+ DEFAULT_GPIO_RESET)
-+PEGASUS_DEV("MELCO/BUFFALO LUA-TX", VENDOR_MELCO, 0x0005,
-+ DEFAULT_GPIO_RESET)
-+PEGASUS_DEV("MELCO/BUFFALO LUA2-TX", VENDOR_MELCO, 0x0009,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("Microsoft MN-110", VENDOR_MICROSOFT, 0x007a,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("NETGEAR FA101", VENDOR_NETGEAR, 0x1020,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("OCT Inc.", VENDOR_OCT, 0x0109,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("OCT USB TO Ethernet", VENDOR_OCT, 0x0901,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("smartNIC 2 PnP Adapter", VENDOR_SMARTBRIDGES, 0x0003,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("SMC 202 USB Ethernet", VENDOR_SMC, 0x0200,
-+ DEFAULT_GPIO_RESET)
-+PEGASUS_DEV("SMC 2206 USB Ethernet", VENDOR_SMC, 0x0201,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("SOHOware NUB100 Ethernet", VENDOR_SOHOWARE, 0x9100,
-+ DEFAULT_GPIO_RESET)
-+PEGASUS_DEV("SOHOware NUB110 Ethernet", VENDOR_SOHOWARE, 0x9110,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+PEGASUS_DEV("SpeedStream USB 10/100 Ethernet", VENDOR_SIEMENS, 0x1001,
-+ DEFAULT_GPIO_RESET | PEGASUS_II)
-+
-+
-+#endif /* PEGASUS_DEV */
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/plusb.c backports-3.18.1-1/drivers/net/usb/plusb.c
---- backports-3.18.1-1.org/drivers/net/usb/plusb.c 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/plusb.c 2014-12-16 18:39:45.000000000 +0100
-@@ -0,0 +1,157 @@
-+/*
-+ * PL-2301/2302 USB host-to-host link cables
-+ * Copyright (C) 2000-2005 by David Brownell
-+ *
-+ * 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, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+// #define DEBUG // error path messages, extra info
-+// #define VERBOSE // more; success messages
-+
-+#include <linux/module.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/ethtool.h>
-+#include <linux/workqueue.h>
-+#include <linux/mii.h>
-+#include <linux/usb.h>
-+#include <linux/usb/usbnet.h>
-+
-+
-+/*
-+ * Prolific PL-2301/PL-2302 driver ... http://www.prolific.com.tw/
-+ *
-+ * The protocol and handshaking used here should be bug-compatible
-+ * with the Linux 2.2 "plusb" driver, by Deti Fliegl.
-+ *
-+ * HEADS UP: this handshaking isn't all that robust. This driver
-+ * gets confused easily if you unplug one end of the cable then
-+ * try to connect it again; you'll need to restart both ends. The
-+ * "naplink" software (used by some PlayStation/2 deveopers) does
-+ * the handshaking much better! Also, sometimes this hardware
-+ * seems to get wedged under load. Prolific docs are weak, and
-+ * don't identify differences between PL2301 and PL2302, much less
-+ * anything to explain the different PL2302 versions observed.
-+ *
-+ * NOTE: pl2501 has several modes, including pl2301 and pl2302
-+ * compatibility. Some docs suggest the difference between 2301
-+ * and 2302 is only to make MS-Windows use a different driver...
-+ *
-+ * pl25a1 glue based on patch from Tony Gibbs. Prolific "docs" on
-+ * this chip are as usual incomplete about what control messages
-+ * are supported.
-+ */
-+
-+/*
-+ * Bits 0-4 can be used for software handshaking; they're set from
-+ * one end, cleared from the other, "read" with the interrupt byte.
-+ */
-+#define PL_S_EN (1<<7) /* (feature only) suspend enable */
-+/* reserved bit -- rx ready (6) ? */
-+#define PL_TX_READY (1<<5) /* (interrupt only) transmit ready */
-+#define PL_RESET_OUT (1<<4) /* reset output pipe */
-+#define PL_RESET_IN (1<<3) /* reset input pipe */
-+#define PL_TX_C (1<<2) /* transmission complete */
-+#define PL_TX_REQ (1<<1) /* transmission received */
-+#define PL_PEER_E (1<<0) /* peer exists */
-+
-+static inline int
-+pl_vendor_req(struct usbnet *dev, u8 req, u8 val, u8 index)
-+{
-+ return usbnet_read_cmd(dev, req,
-+ USB_DIR_IN | USB_TYPE_VENDOR |
-+ USB_RECIP_DEVICE,
-+ val, index, NULL, 0);
-+}
-+
-+static inline int
-+pl_clear_QuickLink_features(struct usbnet *dev, int val)
-+{
-+ return pl_vendor_req(dev, 1, (u8) val, 0);
-+}
-+
-+static inline int
-+pl_set_QuickLink_features(struct usbnet *dev, int val)
-+{
-+ return pl_vendor_req(dev, 3, (u8) val, 0);
-+}
-+
-+static int pl_reset(struct usbnet *dev)
-+{
-+ int status;
-+
-+ /* some units seem to need this reset, others reject it utterly.
-+ * FIXME be more like "naplink" or windows drivers.
-+ */
-+ status = pl_set_QuickLink_features(dev,
-+ PL_S_EN|PL_RESET_OUT|PL_RESET_IN|PL_PEER_E);
-+ if (status != 0 && netif_msg_probe(dev))
-+ netif_dbg(dev, link, dev->net, "pl_reset --> %d\n", status);
-+ return 0;
-+}
-+
-+static const struct driver_info prolific_info = {
-+ .description = "Prolific PL-2301/PL-2302/PL-25A1",
-+ .flags = FLAG_POINTTOPOINT | FLAG_NO_SETINT,
-+ /* some PL-2302 versions seem to fail usb_set_interface() */
-+ .reset = pl_reset,
-+};
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/*
-+ * Proilific's name won't normally be on the cables, and
-+ * may not be on the device.
-+ */
-+
-+static const struct usb_device_id products [] = {
-+
-+/* full speed cables */
-+{
-+ USB_DEVICE(0x067b, 0x0000), // PL-2301
-+ .driver_info = (unsigned long) &prolific_info,
-+}, {
-+ USB_DEVICE(0x067b, 0x0001), // PL-2302
-+ .driver_info = (unsigned long) &prolific_info,
-+},
-+
-+/* high speed cables */
-+{
-+ USB_DEVICE(0x067b, 0x25a1), /* PL-25A1, no eeprom */
-+ .driver_info = (unsigned long) &prolific_info,
-+}, {
-+ USB_DEVICE(0x050d, 0x258a), /* Belkin F5U258/F5U279 (PL-25A1) */
-+ .driver_info = (unsigned long) &prolific_info,
-+},
-+
-+ { }, // END
-+};
-+MODULE_DEVICE_TABLE(usb, products);
-+
-+static struct usb_driver plusb_driver = {
-+ .name = "plusb",
-+ .id_table = products,
-+ .probe = usbnet_probe,
-+ .disconnect = usbnet_disconnect,
-+ .suspend = usbnet_suspend,
-+ .resume = usbnet_resume,
-+ .disable_hub_initiated_lpm = 1,
-+};
-+
-+module_usb_driver(plusb_driver);
-+
-+MODULE_AUTHOR("David Brownell");
-+MODULE_DESCRIPTION("Prolific PL-2301/2302/25A1 USB Host to Host Link Driver");
-+MODULE_LICENSE("GPL");
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/r8152.c backports-3.18.1-1/drivers/net/usb/r8152.c
---- backports-3.18.1-1.org/drivers/net/usb/r8152.c 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/r8152.c 2015-01-03 13:42:25.000000000 +0100
-@@ -0,0 +1,3913 @@
-+/*
-+ * Copyright (c) 2014 Realtek Semiconductor Corp. All rights reserved.
-+ *
-+ * 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 published by the Free Software Foundation.
-+ *
-+ */
-+
-+#include <linux/signal.h>
-+#include <linux/slab.h>
-+#include <linux/module.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/mii.h>
-+#include <linux/ethtool.h>
-+#include <linux/usb.h>
-+#include <linux/crc32.h>
-+#include <linux/if_vlan.h>
-+#include <linux/uaccess.h>
-+#include <linux/list.h>
-+#include <linux/ip.h>
-+#include <linux/ipv6.h>
-+#include <net/ip6_checksum.h>
-+#include <uapi/linux/mdio.h>
-+#include <linux/mdio.h>
-+
-+/* Version Information */
-+#define DRIVER_VERSION "v1.07.0 (2014/10/09)"
-+#define DRIVER_AUTHOR "Realtek linux nic maintainers <nic_swsd(a)realtek.com>"
-+#define DRIVER_DESC "Realtek RTL8152/RTL8153 Based USB Ethernet Adapters"
-+#define MODULENAME "r8152"
-+
-+#define R8152_PHY_ID 32
-+
-+#define PLA_IDR 0xc000
-+#define PLA_RCR 0xc010
-+#define PLA_RMS 0xc016
-+#define PLA_RXFIFO_CTRL0 0xc0a0
-+#define PLA_RXFIFO_CTRL1 0xc0a4
-+#define PLA_RXFIFO_CTRL2 0xc0a8
-+#define PLA_FMC 0xc0b4
-+#define PLA_CFG_WOL 0xc0b6
-+#define PLA_TEREDO_CFG 0xc0bc
-+#define PLA_MAR 0xcd00
-+#define PLA_BACKUP 0xd000
-+#define PAL_BDC_CR 0xd1a0
-+#define PLA_TEREDO_TIMER 0xd2cc
-+#define PLA_REALWOW_TIMER 0xd2e8
-+#define PLA_LEDSEL 0xdd90
-+#define PLA_LED_FEATURE 0xdd92
-+#define PLA_PHYAR 0xde00
-+#define PLA_BOOT_CTRL 0xe004
-+#define PLA_GPHY_INTR_IMR 0xe022
-+#define PLA_EEE_CR 0xe040
-+#define PLA_EEEP_CR 0xe080
-+#define PLA_MAC_PWR_CTRL 0xe0c0
-+#define PLA_MAC_PWR_CTRL2 0xe0ca
-+#define PLA_MAC_PWR_CTRL3 0xe0cc
-+#define PLA_MAC_PWR_CTRL4 0xe0ce
-+#define PLA_WDT6_CTRL 0xe428
-+#define PLA_TCR0 0xe610
-+#define PLA_TCR1 0xe612
-+#define PLA_MTPS 0xe615
-+#define PLA_TXFIFO_CTRL 0xe618
-+#define PLA_RSTTALLY 0xe800
-+#define PLA_CR 0xe813
-+#define PLA_CRWECR 0xe81c
-+#define PLA_CONFIG12 0xe81e /* CONFIG1, CONFIG2 */
-+#define PLA_CONFIG34 0xe820 /* CONFIG3, CONFIG4 */
-+#define PLA_CONFIG5 0xe822
-+#define PLA_PHY_PWR 0xe84c
-+#define PLA_OOB_CTRL 0xe84f
-+#define PLA_CPCR 0xe854
-+#define PLA_MISC_0 0xe858
-+#define PLA_MISC_1 0xe85a
-+#define PLA_OCP_GPHY_BASE 0xe86c
-+#define PLA_TALLYCNT 0xe890
-+#define PLA_SFF_STS_7 0xe8de
-+#define PLA_PHYSTATUS 0xe908
-+#define PLA_BP_BA 0xfc26
-+#define PLA_BP_0 0xfc28
-+#define PLA_BP_1 0xfc2a
-+#define PLA_BP_2 0xfc2c
-+#define PLA_BP_3 0xfc2e
-+#define PLA_BP_4 0xfc30
-+#define PLA_BP_5 0xfc32
-+#define PLA_BP_6 0xfc34
-+#define PLA_BP_7 0xfc36
-+#define PLA_BP_EN 0xfc38
-+
-+#define USB_U2P3_CTRL 0xb460
-+#define USB_DEV_STAT 0xb808
-+#define USB_USB_CTRL 0xd406
-+#define USB_PHY_CTRL 0xd408
-+#define USB_TX_AGG 0xd40a
-+#define USB_RX_BUF_TH 0xd40c
-+#define USB_USB_TIMER 0xd428
-+#define USB_RX_EARLY_AGG 0xd42c
-+#define USB_PM_CTRL_STATUS 0xd432
-+#define USB_TX_DMA 0xd434
-+#define USB_TOLERANCE 0xd490
-+#define USB_LPM_CTRL 0xd41a
-+#define USB_UPS_CTRL 0xd800
-+#define USB_MISC_0 0xd81a
-+#define USB_POWER_CUT 0xd80a
-+#define USB_AFE_CTRL2 0xd824
-+#define USB_WDT11_CTRL 0xe43c
-+#define USB_BP_BA 0xfc26
-+#define USB_BP_0 0xfc28
-+#define USB_BP_1 0xfc2a
-+#define USB_BP_2 0xfc2c
-+#define USB_BP_3 0xfc2e
-+#define USB_BP_4 0xfc30
-+#define USB_BP_5 0xfc32
-+#define USB_BP_6 0xfc34
-+#define USB_BP_7 0xfc36
-+#define USB_BP_EN 0xfc38
-+
-+/* OCP Registers */
-+#define OCP_ALDPS_CONFIG 0x2010
-+#define OCP_EEE_CONFIG1 0x2080
-+#define OCP_EEE_CONFIG2 0x2092
-+#define OCP_EEE_CONFIG3 0x2094
-+#define OCP_BASE_MII 0xa400
-+#define OCP_EEE_AR 0xa41a
-+#define OCP_EEE_DATA 0xa41c
-+#define OCP_PHY_STATUS 0xa420
-+#define OCP_POWER_CFG 0xa430
-+#define OCP_EEE_CFG 0xa432
-+#define OCP_SRAM_ADDR 0xa436
-+#define OCP_SRAM_DATA 0xa438
-+#define OCP_DOWN_SPEED 0xa442
-+#define OCP_EEE_ABLE 0xa5c4
-+#define OCP_EEE_ADV 0xa5d0
-+#define OCP_EEE_LPABLE 0xa5d2
-+#define OCP_ADC_CFG 0xbc06
-+
-+/* SRAM Register */
-+#define SRAM_LPF_CFG 0x8012
-+#define SRAM_10M_AMP1 0x8080
-+#define SRAM_10M_AMP2 0x8082
-+#define SRAM_IMPEDANCE 0x8084
-+
-+/* PLA_RCR */
-+#define RCR_AAP 0x00000001
-+#define RCR_APM 0x00000002
-+#define RCR_AM 0x00000004
-+#define RCR_AB 0x00000008
-+#define RCR_ACPT_ALL (RCR_AAP | RCR_APM | RCR_AM | RCR_AB)
-+
-+/* PLA_RXFIFO_CTRL0 */
-+#define RXFIFO_THR1_NORMAL 0x00080002
-+#define RXFIFO_THR1_OOB 0x01800003
-+
-+/* PLA_RXFIFO_CTRL1 */
-+#define RXFIFO_THR2_FULL 0x00000060
-+#define RXFIFO_THR2_HIGH 0x00000038
-+#define RXFIFO_THR2_OOB 0x0000004a
-+#define RXFIFO_THR2_NORMAL 0x00a0
-+
-+/* PLA_RXFIFO_CTRL2 */
-+#define RXFIFO_THR3_FULL 0x00000078
-+#define RXFIFO_THR3_HIGH 0x00000048
-+#define RXFIFO_THR3_OOB 0x0000005a
-+#define RXFIFO_THR3_NORMAL 0x0110
-+
-+/* PLA_TXFIFO_CTRL */
-+#define TXFIFO_THR_NORMAL 0x00400008
-+#define TXFIFO_THR_NORMAL2 0x01000008
-+
-+/* PLA_FMC */
-+#define FMC_FCR_MCU_EN 0x0001
-+
-+/* PLA_EEEP_CR */
-+#define EEEP_CR_EEEP_TX 0x0002
-+
-+/* PLA_WDT6_CTRL */
-+#define WDT6_SET_MODE 0x0010
-+
-+/* PLA_TCR0 */
-+#define TCR0_TX_EMPTY 0x0800
-+#define TCR0_AUTO_FIFO 0x0080
-+
-+/* PLA_TCR1 */
-+#define VERSION_MASK 0x7cf0
-+
-+/* PLA_MTPS */
-+#define MTPS_JUMBO (12 * 1024 / 64)
-+#define MTPS_DEFAULT (6 * 1024 / 64)
-+
-+/* PLA_RSTTALLY */
-+#define TALLY_RESET 0x0001
-+
-+/* PLA_CR */
-+#define CR_RST 0x10
-+#define CR_RE 0x08
-+#define CR_TE 0x04
-+
-+/* PLA_CRWECR */
-+#define CRWECR_NORAML 0x00
-+#define CRWECR_CONFIG 0xc0
-+
-+/* PLA_OOB_CTRL */
-+#define NOW_IS_OOB 0x80
-+#define TXFIFO_EMPTY 0x20
-+#define RXFIFO_EMPTY 0x10
-+#define LINK_LIST_READY 0x02
-+#define DIS_MCU_CLROOB 0x01
-+#define FIFO_EMPTY (TXFIFO_EMPTY | RXFIFO_EMPTY)
-+
-+/* PLA_MISC_1 */
-+#define RXDY_GATED_EN 0x0008
-+
-+/* PLA_SFF_STS_7 */
-+#define RE_INIT_LL 0x8000
-+#define MCU_BORW_EN 0x4000
-+
-+/* PLA_CPCR */
-+#define CPCR_RX_VLAN 0x0040
-+
-+/* PLA_CFG_WOL */
-+#define MAGIC_EN 0x0001
-+
-+/* PLA_TEREDO_CFG */
-+#define TEREDO_SEL 0x8000
-+#define TEREDO_WAKE_MASK 0x7f00
-+#define TEREDO_RS_EVENT_MASK 0x00fe
-+#define OOB_TEREDO_EN 0x0001
-+
-+/* PAL_BDC_CR */
-+#define ALDPS_PROXY_MODE 0x0001
-+
-+/* PLA_CONFIG34 */
-+#define LINK_ON_WAKE_EN 0x0010
-+#define LINK_OFF_WAKE_EN 0x0008
-+
-+/* PLA_CONFIG5 */
-+#define BWF_EN 0x0040
-+#define MWF_EN 0x0020
-+#define UWF_EN 0x0010
-+#define LAN_WAKE_EN 0x0002
-+
-+/* PLA_LED_FEATURE */
-+#define LED_MODE_MASK 0x0700
-+
-+/* PLA_PHY_PWR */
-+#define TX_10M_IDLE_EN 0x0080
-+#define PFM_PWM_SWITCH 0x0040
-+
-+/* PLA_MAC_PWR_CTRL */
-+#define D3_CLK_GATED_EN 0x00004000
-+#define MCU_CLK_RATIO 0x07010f07
-+#define MCU_CLK_RATIO_MASK 0x0f0f0f0f
-+#define ALDPS_SPDWN_RATIO 0x0f87
-+
-+/* PLA_MAC_PWR_CTRL2 */
-+#define EEE_SPDWN_RATIO 0x8007
-+
-+/* PLA_MAC_PWR_CTRL3 */
-+#define PKT_AVAIL_SPDWN_EN 0x0100
-+#define SUSPEND_SPDWN_EN 0x0004
-+#define U1U2_SPDWN_EN 0x0002
-+#define L1_SPDWN_EN 0x0001
-+
-+/* PLA_MAC_PWR_CTRL4 */
-+#define PWRSAVE_SPDWN_EN 0x1000
-+#define RXDV_SPDWN_EN 0x0800
-+#define TX10MIDLE_EN 0x0100
-+#define TP100_SPDWN_EN 0x0020
-+#define TP500_SPDWN_EN 0x0010
-+#define TP1000_SPDWN_EN 0x0008
-+#define EEE_SPDWN_EN 0x0001
-+
-+/* PLA_GPHY_INTR_IMR */
-+#define GPHY_STS_MSK 0x0001
-+#define SPEED_DOWN_MSK 0x0002
-+#define SPDWN_RXDV_MSK 0x0004
-+#define SPDWN_LINKCHG_MSK 0x0008
-+
-+/* PLA_PHYAR */
-+#define PHYAR_FLAG 0x80000000
-+
-+/* PLA_EEE_CR */
-+#define EEE_RX_EN 0x0001
-+#define EEE_TX_EN 0x0002
-+
-+/* PLA_BOOT_CTRL */
-+#define AUTOLOAD_DONE 0x0002
-+
-+/* USB_DEV_STAT */
-+#define STAT_SPEED_MASK 0x0006
-+#define STAT_SPEED_HIGH 0x0000
-+#define STAT_SPEED_FULL 0x0002
-+
-+/* USB_TX_AGG */
-+#define TX_AGG_MAX_THRESHOLD 0x03
-+
-+/* USB_RX_BUF_TH */
-+#define RX_THR_SUPPER 0x0c350180
-+#define RX_THR_HIGH 0x7a120180
-+#define RX_THR_SLOW 0xffff0180
-+
-+/* USB_TX_DMA */
-+#define TEST_MODE_DISABLE 0x00000001
-+#define TX_SIZE_ADJUST1 0x00000100
-+
-+/* USB_UPS_CTRL */
-+#define POWER_CUT 0x0100
-+
-+/* USB_PM_CTRL_STATUS */
-+#define RESUME_INDICATE 0x0001
-+
-+/* USB_USB_CTRL */
-+#define RX_AGG_DISABLE 0x0010
-+
-+/* USB_U2P3_CTRL */
-+#define U2P3_ENABLE 0x0001
-+
-+/* USB_POWER_CUT */
-+#define PWR_EN 0x0001
-+#define PHASE2_EN 0x0008
-+
-+/* USB_MISC_0 */
-+#define PCUT_STATUS 0x0001
-+
-+/* USB_RX_EARLY_AGG */
-+#define EARLY_AGG_SUPPER 0x0e832981
-+#define EARLY_AGG_HIGH 0x0e837a12
-+#define EARLY_AGG_SLOW 0x0e83ffff
-+
-+/* USB_WDT11_CTRL */
-+#define TIMER11_EN 0x0001
-+
-+/* USB_LPM_CTRL */
-+#define LPM_TIMER_MASK 0x0c
-+#define LPM_TIMER_500MS 0x04 /* 500 ms */
-+#define LPM_TIMER_500US 0x0c /* 500 us */
-+
-+/* USB_AFE_CTRL2 */
-+#define SEN_VAL_MASK 0xf800
-+#define SEN_VAL_NORMAL 0xa000
-+#define SEL_RXIDLE 0x0100
-+
-+/* OCP_ALDPS_CONFIG */
-+#define ENPWRSAVE 0x8000
-+#define ENPDNPS 0x0200
-+#define LINKENA 0x0100
-+#define DIS_SDSAVE 0x0010
-+
-+/* OCP_PHY_STATUS */
-+#define PHY_STAT_MASK 0x0007
-+#define PHY_STAT_LAN_ON 3
-+#define PHY_STAT_PWRDN 5
-+
-+/* OCP_POWER_CFG */
-+#define EEE_CLKDIV_EN 0x8000
-+#define EN_ALDPS 0x0004
-+#define EN_10M_PLLOFF 0x0001
-+
-+/* OCP_EEE_CONFIG1 */
-+#define RG_TXLPI_MSK_HFDUP 0x8000
-+#define RG_MATCLR_EN 0x4000
-+#define EEE_10_CAP 0x2000
-+#define EEE_NWAY_EN 0x1000
-+#define TX_QUIET_EN 0x0200
-+#define RX_QUIET_EN 0x0100
-+#define sd_rise_time_mask 0x0070
-+#define sd_rise_time(x) (min(x, 7) << 4) /* bit 4 ~ 6 */
-+#define RG_RXLPI_MSK_HFDUP 0x0008
-+#define SDFALLTIME 0x0007 /* bit 0 ~ 2 */
-+
-+/* OCP_EEE_CONFIG2 */
-+#define RG_LPIHYS_NUM 0x7000 /* bit 12 ~ 15 */
-+#define RG_DACQUIET_EN 0x0400
-+#define RG_LDVQUIET_EN 0x0200
-+#define RG_CKRSEL 0x0020
-+#define RG_EEEPRG_EN 0x0010
-+
-+/* OCP_EEE_CONFIG3 */
-+#define fast_snr_mask 0xff80
-+#define fast_snr(x) (min(x, 0x1ff) << 7) /* bit 7 ~ 15 */
-+#define RG_LFS_SEL 0x0060 /* bit 6 ~ 5 */
-+#define MSK_PH 0x0006 /* bit 0 ~ 3 */
-+
-+/* OCP_EEE_AR */
-+/* bit[15:14] function */
-+#define FUN_ADDR 0x0000
-+#define FUN_DATA 0x4000
-+/* bit[4:0] device addr */
-+
-+/* OCP_EEE_CFG */
-+#define CTAP_SHORT_EN 0x0040
-+#define EEE10_EN 0x0010
-+
-+/* OCP_DOWN_SPEED */
-+#define EN_10M_BGOFF 0x0080
-+
-+/* OCP_ADC_CFG */
-+#define CKADSEL_L 0x0100
-+#define ADC_EN 0x0080
-+#define EN_EMI_L 0x0040
-+
-+/* SRAM_LPF_CFG */
-+#define LPF_AUTO_TUNE 0x8000
-+
-+/* SRAM_10M_AMP1 */
-+#define GDAC_IB_UPALL 0x0008
-+
-+/* SRAM_10M_AMP2 */
-+#define AMP_DN 0x0200
-+
-+/* SRAM_IMPEDANCE */
-+#define RX_DRIVING_MASK 0x6000
-+
-+enum rtl_register_content {
-+ _1000bps = 0x10,
-+ _100bps = 0x08,
-+ _10bps = 0x04,
-+ LINK_STATUS = 0x02,
-+ FULL_DUP = 0x01,
-+};
-+
-+#define RTL8152_MAX_TX 4
-+#define RTL8152_MAX_RX 10
-+#define INTBUFSIZE 2
-+#define CRC_SIZE 4
-+#define TX_ALIGN 4
-+#define RX_ALIGN 8
-+
-+#define INTR_LINK 0x0004
-+
-+#define RTL8152_REQT_READ 0xc0
-+#define RTL8152_REQT_WRITE 0x40
-+#define RTL8152_REQ_GET_REGS 0x05
-+#define RTL8152_REQ_SET_REGS 0x05
-+
-+#define BYTE_EN_DWORD 0xff
-+#define BYTE_EN_WORD 0x33
-+#define BYTE_EN_BYTE 0x11
-+#define BYTE_EN_SIX_BYTES 0x3f
-+#define BYTE_EN_START_MASK 0x0f
-+#define BYTE_EN_END_MASK 0xf0
-+
-+#define RTL8153_MAX_PACKET 9216 /* 9K */
-+#define RTL8153_MAX_MTU (RTL8153_MAX_PACKET - VLAN_ETH_HLEN - VLAN_HLEN)
-+#define RTL8152_RMS (VLAN_ETH_FRAME_LEN + VLAN_HLEN)
-+#define RTL8153_RMS RTL8153_MAX_PACKET
-+#define RTL8152_TX_TIMEOUT (5 * HZ)
-+
-+/* rtl8152 flags */
-+enum rtl8152_flags {
-+ RTL8152_UNPLUG = 0,
-+ RTL8152_SET_RX_MODE,
-+ WORK_ENABLE,
-+ RTL8152_LINK_CHG,
-+ SELECTIVE_SUSPEND,
-+ PHY_RESET,
-+ SCHEDULE_TASKLET,
-+};
-+
-+/* Define these values to match your device */
-+#define VENDOR_ID_REALTEK 0x0bda
-+#define PRODUCT_ID_RTL8152 0x8152
-+#define PRODUCT_ID_RTL8153 0x8153
-+
-+#define VENDOR_ID_SAMSUNG 0x04e8
-+#define PRODUCT_ID_SAMSUNG 0xa101
-+
-+#define MCU_TYPE_PLA 0x0100
-+#define MCU_TYPE_USB 0x0000
-+
-+#define REALTEK_USB_DEVICE(vend, prod) \
-+ USB_DEVICE_INTERFACE_CLASS(vend, prod, USB_CLASS_VENDOR_SPEC)
-+
-+struct tally_counter {
-+ __le64 tx_packets;
-+ __le64 rx_packets;
-+ __le64 tx_errors;
-+ __le32 rx_errors;
-+ __le16 rx_missed;
-+ __le16 align_errors;
-+ __le32 tx_one_collision;
-+ __le32 tx_multi_collision;
-+ __le64 rx_unicast;
-+ __le64 rx_broadcast;
-+ __le32 rx_multicast;
-+ __le16 tx_aborted;
-+ __le16 tx_underun;
-+};
-+
-+struct rx_desc {
-+ __le32 opts1;
-+#define RX_LEN_MASK 0x7fff
-+
-+ __le32 opts2;
-+#define RD_UDP_CS (1 << 23)
-+#define RD_TCP_CS (1 << 22)
-+#define RD_IPV6_CS (1 << 20)
-+#define RD_IPV4_CS (1 << 19)
-+
-+ __le32 opts3;
-+#define IPF (1 << 23) /* IP checksum fail */
-+#define UDPF (1 << 22) /* UDP checksum fail */
-+#define TCPF (1 << 21) /* TCP checksum fail */
-+#define RX_VLAN_TAG (1 << 16)
-+
-+ __le32 opts4;
-+ __le32 opts5;
-+ __le32 opts6;
-+};
-+
-+struct tx_desc {
-+ __le32 opts1;
-+#define TX_FS (1 << 31) /* First segment of a packet */
-+#define TX_LS (1 << 30) /* Final segment of a packet */
-+#define GTSENDV4 (1 << 28)
-+#define GTSENDV6 (1 << 27)
-+#define GTTCPHO_SHIFT 18
-+#define GTTCPHO_MAX 0x7fU
-+#define TX_LEN_MAX 0x3ffffU
-+
-+ __le32 opts2;
-+#define UDP_CS (1 << 31) /* Calculate UDP/IP checksum */
-+#define TCP_CS (1 << 30) /* Calculate TCP/IP checksum */
-+#define IPV4_CS (1 << 29) /* Calculate IPv4 checksum */
-+#define IPV6_CS (1 << 28) /* Calculate IPv6 checksum */
-+#define MSS_SHIFT 17
-+#define MSS_MAX 0x7ffU
-+#define TCPHO_SHIFT 17
-+#define TCPHO_MAX 0x7ffU
-+#define TX_VLAN_TAG (1 << 16)
-+};
-+
-+struct r8152;
-+
-+struct rx_agg {
-+ struct list_head list;
-+ struct urb *urb;
-+ struct r8152 *context;
-+ void *buffer;
-+ void *head;
-+};
-+
-+struct tx_agg {
-+ struct list_head list;
-+ struct urb *urb;
-+ struct r8152 *context;
-+ void *buffer;
-+ void *head;
-+ u32 skb_num;
-+ u32 skb_len;
-+};
-+
-+struct r8152 {
-+ unsigned long flags;
-+ struct usb_device *udev;
-+ struct tasklet_struct tl;
-+ struct usb_interface *intf;
-+ struct net_device *netdev;
-+ struct urb *intr_urb;
-+ struct tx_agg tx_info[RTL8152_MAX_TX];
-+ struct rx_agg rx_info[RTL8152_MAX_RX];
-+ struct list_head rx_done, tx_free;
-+ struct sk_buff_head tx_queue;
-+ spinlock_t rx_lock, tx_lock;
-+ struct delayed_work schedule;
-+ struct mii_if_info mii;
-+ struct mutex control; /* use for hw setting */
-+
-+ struct rtl_ops {
-+ void (*init)(struct r8152 *);
-+ int (*enable)(struct r8152 *);
-+ void (*disable)(struct r8152 *);
-+ void (*up)(struct r8152 *);
-+ void (*down)(struct r8152 *);
-+ void (*unload)(struct r8152 *);
-+ int (*eee_get)(struct r8152 *, struct ethtool_eee *);
-+ int (*eee_set)(struct r8152 *, struct ethtool_eee *);
-+ } __no_const rtl_ops;
-+
-+ int intr_interval;
-+ u32 saved_wolopts;
-+ u32 msg_enable;
-+ u32 tx_qlen;
-+ u16 ocp_base;
-+ u8 *intr_buff;
-+ u8 version;
-+ u8 speed;
-+};
-+
-+enum rtl_version {
-+ RTL_VER_UNKNOWN = 0,
-+ RTL_VER_01,
-+ RTL_VER_02,
-+ RTL_VER_03,
-+ RTL_VER_04,
-+ RTL_VER_05,
-+ RTL_VER_MAX
-+};
-+
-+enum tx_csum_stat {
-+ TX_CSUM_SUCCESS = 0,
-+ TX_CSUM_TSO,
-+ TX_CSUM_NONE
-+};
-+
-+/* Maximum number of multicast addresses to filter (vs. Rx-all-multicast).
-+ * The RTL chips use a 64 element hash table based on the Ethernet CRC.
-+ */
-+static const int multicast_filter_limit = 32;
-+static unsigned int agg_buf_sz = 16384;
-+
-+#define RTL_LIMITED_TSO_SIZE (agg_buf_sz - sizeof(struct tx_desc) - \
-+ VLAN_ETH_HLEN - VLAN_HLEN)
-+
-+static
-+int get_registers(struct r8152 *tp, u16 value, u16 index, u16 size, void *data)
-+{
-+ int ret;
-+ void *tmp;
-+
-+ tmp = kmalloc(size, GFP_KERNEL);
-+ if (!tmp)
-+ return -ENOMEM;
-+
-+ ret = usb_control_msg(tp->udev, usb_rcvctrlpipe(tp->udev, 0),
-+ RTL8152_REQ_GET_REGS, RTL8152_REQT_READ,
-+ value, index, tmp, size, 500);
-+
-+ memcpy(data, tmp, size);
-+ kfree(tmp);
-+
-+ return ret;
-+}
-+
-+static
-+int set_registers(struct r8152 *tp, u16 value, u16 index, u16 size, void *data)
-+{
-+ int ret;
-+ void *tmp;
-+
-+ tmp = kmemdup(data, size, GFP_KERNEL);
-+ if (!tmp)
-+ return -ENOMEM;
-+
-+ ret = usb_control_msg(tp->udev, usb_sndctrlpipe(tp->udev, 0),
-+ RTL8152_REQ_SET_REGS, RTL8152_REQT_WRITE,
-+ value, index, tmp, size, 500);
-+
-+ kfree(tmp);
-+
-+ return ret;
-+}
-+
-+static int generic_ocp_read(struct r8152 *tp, u16 index, u16 size,
-+ void *data, u16 type)
-+{
-+ u16 limit = 64;
-+ int ret = 0;
-+
-+ if (test_bit(RTL8152_UNPLUG, &tp->flags))
-+ return -ENODEV;
-+
-+ /* both size and indix must be 4 bytes align */
-+ if ((size & 3) || !size || (index & 3) || !data)
-+ return -EPERM;
-+
-+ if ((u32)index + (u32)size > 0xffff)
-+ return -EPERM;
-+
-+ while (size) {
-+ if (size > limit) {
-+ ret = get_registers(tp, index, type, limit, data);
-+ if (ret < 0)
-+ break;
-+
-+ index += limit;
-+ data += limit;
-+ size -= limit;
-+ } else {
-+ ret = get_registers(tp, index, type, size, data);
-+ if (ret < 0)
-+ break;
-+
-+ index += size;
-+ data += size;
-+ size = 0;
-+ break;
-+ }
-+ }
-+
-+ return ret;
-+}
-+
-+static int generic_ocp_write(struct r8152 *tp, u16 index, u16 byteen,
-+ u16 size, void *data, u16 type)
-+{
-+ int ret;
-+ u16 byteen_start, byteen_end, byen;
-+ u16 limit = 512;
-+
-+ if (test_bit(RTL8152_UNPLUG, &tp->flags))
-+ return -ENODEV;
-+
-+ /* both size and indix must be 4 bytes align */
-+ if ((size & 3) || !size || (index & 3) || !data)
-+ return -EPERM;
-+
-+ if ((u32)index + (u32)size > 0xffff)
-+ return -EPERM;
-+
-+ byteen_start = byteen & BYTE_EN_START_MASK;
-+ byteen_end = byteen & BYTE_EN_END_MASK;
-+
-+ byen = byteen_start | (byteen_start << 4);
-+ ret = set_registers(tp, index, type | byen, 4, data);
-+ if (ret < 0)
-+ goto error1;
-+
-+ index += 4;
-+ data += 4;
-+ size -= 4;
-+
-+ if (size) {
-+ size -= 4;
-+
-+ while (size) {
-+ if (size > limit) {
-+ ret = set_registers(tp, index,
-+ type | BYTE_EN_DWORD,
-+ limit, data);
-+ if (ret < 0)
-+ goto error1;
-+
-+ index += limit;
-+ data += limit;
-+ size -= limit;
-+ } else {
-+ ret = set_registers(tp, index,
-+ type | BYTE_EN_DWORD,
-+ size, data);
-+ if (ret < 0)
-+ goto error1;
-+
-+ index += size;
-+ data += size;
-+ size = 0;
-+ break;
-+ }
-+ }
-+
-+ byen = byteen_end | (byteen_end >> 4);
-+ ret = set_registers(tp, index, type | byen, 4, data);
-+ if (ret < 0)
-+ goto error1;
-+ }
-+
-+error1:
-+ return ret;
-+}
-+
-+static inline
-+int pla_ocp_read(struct r8152 *tp, u16 index, u16 size, void *data)
-+{
-+ return generic_ocp_read(tp, index, size, data, MCU_TYPE_PLA);
-+}
-+
-+static inline
-+int pla_ocp_write(struct r8152 *tp, u16 index, u16 byteen, u16 size, void *data)
-+{
-+ return generic_ocp_write(tp, index, byteen, size, data, MCU_TYPE_PLA);
-+}
-+
-+static inline
-+int usb_ocp_read(struct r8152 *tp, u16 index, u16 size, void *data)
-+{
-+ return generic_ocp_read(tp, index, size, data, MCU_TYPE_USB);
-+}
-+
-+static inline
-+int usb_ocp_write(struct r8152 *tp, u16 index, u16 byteen, u16 size, void *data)
-+{
-+ return generic_ocp_write(tp, index, byteen, size, data, MCU_TYPE_USB);
-+}
-+
-+static u32 ocp_read_dword(struct r8152 *tp, u16 type, u16 index)
-+{
-+ __le32 data;
-+
-+ generic_ocp_read(tp, index, sizeof(data), &data, type);
-+
-+ return __le32_to_cpu(data);
-+}
-+
-+static void ocp_write_dword(struct r8152 *tp, u16 type, u16 index, u32 data)
-+{
-+ __le32 tmp = __cpu_to_le32(data);
-+
-+ generic_ocp_write(tp, index, BYTE_EN_DWORD, sizeof(tmp), &tmp, type);
-+}
-+
-+static u16 ocp_read_word(struct r8152 *tp, u16 type, u16 index)
-+{
-+ u32 data;
-+ __le32 tmp;
-+ u8 shift = index & 2;
-+
-+ index &= ~3;
-+
-+ generic_ocp_read(tp, index, sizeof(tmp), &tmp, type);
-+
-+ data = __le32_to_cpu(tmp);
-+ data >>= (shift * 8);
-+ data &= 0xffff;
-+
-+ return (u16)data;
-+}
-+
-+static void ocp_write_word(struct r8152 *tp, u16 type, u16 index, u32 data)
-+{
-+ u32 mask = 0xffff;
-+ __le32 tmp;
-+ u16 byen = BYTE_EN_WORD;
-+ u8 shift = index & 2;
-+
-+ data &= mask;
-+
-+ if (index & 2) {
-+ byen <<= shift;
-+ mask <<= (shift * 8);
-+ data <<= (shift * 8);
-+ index &= ~3;
-+ }
-+
-+ generic_ocp_read(tp, index, sizeof(tmp), &tmp, type);
-+
-+ data |= __le32_to_cpu(tmp) & ~mask;
-+ tmp = __cpu_to_le32(data);
-+
-+ generic_ocp_write(tp, index, byen, sizeof(tmp), &tmp, type);
-+}
-+
-+static u8 ocp_read_byte(struct r8152 *tp, u16 type, u16 index)
-+{
-+ u32 data;
-+ __le32 tmp;
-+ u8 shift = index & 3;
-+
-+ index &= ~3;
-+
-+ generic_ocp_read(tp, index, sizeof(tmp), &tmp, type);
-+
-+ data = __le32_to_cpu(tmp);
-+ data >>= (shift * 8);
-+ data &= 0xff;
-+
-+ return (u8)data;
-+}
-+
-+static void ocp_write_byte(struct r8152 *tp, u16 type, u16 index, u32 data)
-+{
-+ u32 mask = 0xff;
-+ __le32 tmp;
-+ u16 byen = BYTE_EN_BYTE;
-+ u8 shift = index & 3;
-+
-+ data &= mask;
-+
-+ if (index & 3) {
-+ byen <<= shift;
-+ mask <<= (shift * 8);
-+ data <<= (shift * 8);
-+ index &= ~3;
-+ }
-+
-+ generic_ocp_read(tp, index, sizeof(tmp), &tmp, type);
-+
-+ data |= __le32_to_cpu(tmp) & ~mask;
-+ tmp = __cpu_to_le32(data);
-+
-+ generic_ocp_write(tp, index, byen, sizeof(tmp), &tmp, type);
-+}
-+
-+static u16 ocp_reg_read(struct r8152 *tp, u16 addr)
-+{
-+ u16 ocp_base, ocp_index;
-+
-+ ocp_base = addr & 0xf000;
-+ if (ocp_base != tp->ocp_base) {
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_OCP_GPHY_BASE, ocp_base);
-+ tp->ocp_base = ocp_base;
-+ }
-+
-+ ocp_index = (addr & 0x0fff) | 0xb000;
-+ return ocp_read_word(tp, MCU_TYPE_PLA, ocp_index);
-+}
-+
-+static void ocp_reg_write(struct r8152 *tp, u16 addr, u16 data)
-+{
-+ u16 ocp_base, ocp_index;
-+
-+ ocp_base = addr & 0xf000;
-+ if (ocp_base != tp->ocp_base) {
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_OCP_GPHY_BASE, ocp_base);
-+ tp->ocp_base = ocp_base;
-+ }
-+
-+ ocp_index = (addr & 0x0fff) | 0xb000;
-+ ocp_write_word(tp, MCU_TYPE_PLA, ocp_index, data);
-+}
-+
-+static inline void r8152_mdio_write(struct r8152 *tp, u32 reg_addr, u32 value)
-+{
-+ ocp_reg_write(tp, OCP_BASE_MII + reg_addr * 2, value);
-+}
-+
-+static inline int r8152_mdio_read(struct r8152 *tp, u32 reg_addr)
-+{
-+ return ocp_reg_read(tp, OCP_BASE_MII + reg_addr * 2);
-+}
-+
-+static void sram_write(struct r8152 *tp, u16 addr, u16 data)
-+{
-+ ocp_reg_write(tp, OCP_SRAM_ADDR, addr);
-+ ocp_reg_write(tp, OCP_SRAM_DATA, data);
-+}
-+
-+static u16 sram_read(struct r8152 *tp, u16 addr)
-+{
-+ ocp_reg_write(tp, OCP_SRAM_ADDR, addr);
-+ return ocp_reg_read(tp, OCP_SRAM_DATA);
-+}
-+
-+static int read_mii_word(struct net_device *netdev, int phy_id, int reg)
-+{
-+ struct r8152 *tp = netdev_priv(netdev);
-+ int ret;
-+
-+ if (test_bit(RTL8152_UNPLUG, &tp->flags))
-+ return -ENODEV;
-+
-+ if (phy_id != R8152_PHY_ID)
-+ return -EINVAL;
-+
-+ ret = r8152_mdio_read(tp, reg);
-+
-+ return ret;
-+}
-+
-+static
-+void write_mii_word(struct net_device *netdev, int phy_id, int reg, int val)
-+{
-+ struct r8152 *tp = netdev_priv(netdev);
-+
-+ if (test_bit(RTL8152_UNPLUG, &tp->flags))
-+ return;
-+
-+ if (phy_id != R8152_PHY_ID)
-+ return;
-+
-+ r8152_mdio_write(tp, reg, val);
-+}
-+
-+static int
-+r8152_submit_rx(struct r8152 *tp, struct rx_agg *agg, gfp_t mem_flags);
-+
-+static int rtl8152_set_mac_address(struct net_device *netdev, void *p)
-+{
-+ struct r8152 *tp = netdev_priv(netdev);
-+ struct sockaddr *addr = p;
-+ int ret = -EADDRNOTAVAIL;
-+
-+ if (!is_valid_ether_addr(addr->sa_data))
-+ goto out1;
-+
-+ ret = usb_autopm_get_interface(tp->intf);
-+ if (ret < 0)
-+ goto out1;
-+
-+ mutex_lock(&tp->control);
-+
-+ memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
-+
-+ ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_CONFIG);
-+ pla_ocp_write(tp, PLA_IDR, BYTE_EN_SIX_BYTES, 8, addr->sa_data);
-+ ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_NORAML);
-+
-+ mutex_unlock(&tp->control);
-+
-+ usb_autopm_put_interface(tp->intf);
-+out1:
-+ return ret;
-+}
-+
-+static int set_ethernet_addr(struct r8152 *tp)
-+{
-+ struct net_device *dev = tp->netdev;
-+ struct sockaddr sa;
-+ int ret;
-+
-+ if (tp->version == RTL_VER_01)
-+ ret = pla_ocp_read(tp, PLA_IDR, 8, sa.sa_data);
-+ else
-+ ret = pla_ocp_read(tp, PLA_BACKUP, 8, sa.sa_data);
-+
-+ if (ret < 0) {
-+ netif_err(tp, probe, dev, "Get ether addr fail\n");
-+ } else if (!is_valid_ether_addr(sa.sa_data)) {
-+ netif_err(tp, probe, dev, "Invalid ether addr %pM\n",
-+ sa.sa_data);
-+ eth_hw_addr_random(dev);
-+ ether_addr_copy(sa.sa_data, dev->dev_addr);
-+ ret = rtl8152_set_mac_address(dev, &sa);
-+ netif_info(tp, probe, dev, "Random ether addr %pM\n",
-+ sa.sa_data);
-+ } else {
-+ if (tp->version == RTL_VER_01)
-+ ether_addr_copy(dev->dev_addr, sa.sa_data);
-+ else
-+ ret = rtl8152_set_mac_address(dev, &sa);
-+ }
-+
-+ return ret;
-+}
-+
-+static void read_bulk_callback(struct urb *urb)
-+{
-+ struct net_device *netdev;
-+ int status = urb->status;
-+ struct rx_agg *agg;
-+ struct r8152 *tp;
-+ int result;
-+
-+ agg = urb->context;
-+ if (!agg)
-+ return;
-+
-+ tp = agg->context;
-+ if (!tp)
-+ return;
-+
-+ if (test_bit(RTL8152_UNPLUG, &tp->flags))
-+ return;
-+
-+ if (!test_bit(WORK_ENABLE, &tp->flags))
-+ return;
-+
-+ netdev = tp->netdev;
-+
-+ /* When link down, the driver would cancel all bulks. */
-+ /* This avoid the re-submitting bulk */
-+ if (!netif_carrier_ok(netdev))
-+ return;
-+
-+ usb_mark_last_busy(tp->udev);
-+
-+ switch (status) {
-+ case 0:
-+ if (urb->actual_length < ETH_ZLEN)
-+ break;
-+
-+ spin_lock(&tp->rx_lock);
-+ list_add_tail(&agg->list, &tp->rx_done);
-+ spin_unlock(&tp->rx_lock);
-+ tasklet_schedule(&tp->tl);
-+ return;
-+ case -ESHUTDOWN:
-+ set_bit(RTL8152_UNPLUG, &tp->flags);
-+ netif_device_detach(tp->netdev);
-+ return;
-+ case -ENOENT:
-+ return; /* the urb is in unlink state */
-+ case -ETIME:
-+ if (net_ratelimit())
-+ netdev_warn(netdev, "maybe reset is needed?\n");
-+ break;
-+ default:
-+ if (net_ratelimit())
-+ netdev_warn(netdev, "Rx status %d\n", status);
-+ break;
-+ }
-+
-+ result = r8152_submit_rx(tp, agg, GFP_ATOMIC);
-+ if (result == -ENODEV) {
-+ netif_device_detach(tp->netdev);
-+ } else if (result) {
-+ spin_lock(&tp->rx_lock);
-+ list_add_tail(&agg->list, &tp->rx_done);
-+ spin_unlock(&tp->rx_lock);
-+ tasklet_schedule(&tp->tl);
-+ }
-+}
-+
-+static void write_bulk_callback(struct urb *urb)
-+{
-+ struct net_device_stats *stats;
-+ struct net_device *netdev;
-+ struct tx_agg *agg;
-+ struct r8152 *tp;
-+ int status = urb->status;
-+
-+ agg = urb->context;
-+ if (!agg)
-+ return;
-+
-+ tp = agg->context;
-+ if (!tp)
-+ return;
-+
-+ netdev = tp->netdev;
-+ stats = &netdev->stats;
-+ if (status) {
-+ if (net_ratelimit())
-+ netdev_warn(netdev, "Tx status %d\n", status);
-+ stats->tx_errors += agg->skb_num;
-+ } else {
-+ stats->tx_packets += agg->skb_num;
-+ stats->tx_bytes += agg->skb_len;
-+ }
-+
-+ spin_lock(&tp->tx_lock);
-+ list_add_tail(&agg->list, &tp->tx_free);
-+ spin_unlock(&tp->tx_lock);
-+
-+ usb_autopm_put_interface_async(tp->intf);
-+
-+ if (!netif_carrier_ok(netdev))
-+ return;
-+
-+ if (!test_bit(WORK_ENABLE, &tp->flags))
-+ return;
-+
-+ if (test_bit(RTL8152_UNPLUG, &tp->flags))
-+ return;
-+
-+ if (!skb_queue_empty(&tp->tx_queue))
-+ tasklet_schedule(&tp->tl);
-+}
-+
-+static void intr_callback(struct urb *urb)
-+{
-+ struct r8152 *tp;
-+ __le16 *d;
-+ int status = urb->status;
-+ int res;
-+
-+ tp = urb->context;
-+ if (!tp)
-+ return;
-+
-+ if (!test_bit(WORK_ENABLE, &tp->flags))
-+ return;
-+
-+ if (test_bit(RTL8152_UNPLUG, &tp->flags))
-+ return;
-+
-+ switch (status) {
-+ case 0: /* success */
-+ break;
-+ case -ECONNRESET: /* unlink */
-+ case -ESHUTDOWN:
-+ netif_device_detach(tp->netdev);
-+ case -ENOENT:
-+ case -EPROTO:
-+ netif_info(tp, intr, tp->netdev,
-+ "Stop submitting intr, status %d\n", status);
-+ return;
-+ case -EOVERFLOW:
-+ netif_info(tp, intr, tp->netdev, "intr status -EOVERFLOW\n");
-+ goto resubmit;
-+ /* -EPIPE: should clear the halt */
-+ default:
-+ netif_info(tp, intr, tp->netdev, "intr status %d\n", status);
-+ goto resubmit;
-+ }
-+
-+ d = urb->transfer_buffer;
-+ if (INTR_LINK & __le16_to_cpu(d[0])) {
-+ if (!(tp->speed & LINK_STATUS)) {
-+ set_bit(RTL8152_LINK_CHG, &tp->flags);
-+ schedule_delayed_work(&tp->schedule, 0);
-+ }
-+ } else {
-+ if (tp->speed & LINK_STATUS) {
-+ set_bit(RTL8152_LINK_CHG, &tp->flags);
-+ schedule_delayed_work(&tp->schedule, 0);
-+ }
-+ }
-+
-+resubmit:
-+ res = usb_submit_urb(urb, GFP_ATOMIC);
-+ if (res == -ENODEV)
-+ netif_device_detach(tp->netdev);
-+ else if (res)
-+ netif_err(tp, intr, tp->netdev,
-+ "can't resubmit intr, status %d\n", res);
-+}
-+
-+static inline void *rx_agg_align(void *data)
-+{
-+ return (void *)ALIGN((uintptr_t)data, RX_ALIGN);
-+}
-+
-+static inline void *tx_agg_align(void *data)
-+{
-+ return (void *)ALIGN((uintptr_t)data, TX_ALIGN);
-+}
-+
-+static void free_all_mem(struct r8152 *tp)
-+{
-+ int i;
-+
-+ for (i = 0; i < RTL8152_MAX_RX; i++) {
-+ usb_free_urb(tp->rx_info[i].urb);
-+ tp->rx_info[i].urb = NULL;
-+
-+ kfree(tp->rx_info[i].buffer);
-+ tp->rx_info[i].buffer = NULL;
-+ tp->rx_info[i].head = NULL;
-+ }
-+
-+ for (i = 0; i < RTL8152_MAX_TX; i++) {
-+ usb_free_urb(tp->tx_info[i].urb);
-+ tp->tx_info[i].urb = NULL;
-+
-+ kfree(tp->tx_info[i].buffer);
-+ tp->tx_info[i].buffer = NULL;
-+ tp->tx_info[i].head = NULL;
-+ }
-+
-+ usb_free_urb(tp->intr_urb);
-+ tp->intr_urb = NULL;
-+
-+ kfree(tp->intr_buff);
-+ tp->intr_buff = NULL;
-+}
-+
-+static int alloc_all_mem(struct r8152 *tp)
-+{
-+ struct net_device *netdev = tp->netdev;
-+ struct usb_interface *intf = tp->intf;
-+ struct usb_host_interface *alt = intf->cur_altsetting;
-+ struct usb_host_endpoint *ep_intr = alt->endpoint + 2;
-+ struct urb *urb;
-+ int node, i;
-+ u8 *buf;
-+
-+ node = netdev->dev.parent ? dev_to_node(netdev->dev.parent) : -1;
-+
-+ spin_lock_init(&tp->rx_lock);
-+ spin_lock_init(&tp->tx_lock);
-+ INIT_LIST_HEAD(&tp->rx_done);
-+ INIT_LIST_HEAD(&tp->tx_free);
-+ skb_queue_head_init(&tp->tx_queue);
-+
-+ for (i = 0; i < RTL8152_MAX_RX; i++) {
-+ buf = kmalloc_node(agg_buf_sz, GFP_KERNEL, node);
-+ if (!buf)
-+ goto err1;
-+
-+ if (buf != rx_agg_align(buf)) {
-+ kfree(buf);
-+ buf = kmalloc_node(agg_buf_sz + RX_ALIGN, GFP_KERNEL,
-+ node);
-+ if (!buf)
-+ goto err1;
-+ }
-+
-+ urb = usb_alloc_urb(0, GFP_KERNEL);
-+ if (!urb) {
-+ kfree(buf);
-+ goto err1;
-+ }
-+
-+ INIT_LIST_HEAD(&tp->rx_info[i].list);
-+ tp->rx_info[i].context = tp;
-+ tp->rx_info[i].urb = urb;
-+ tp->rx_info[i].buffer = buf;
-+ tp->rx_info[i].head = rx_agg_align(buf);
-+ }
-+
-+ for (i = 0; i < RTL8152_MAX_TX; i++) {
-+ buf = kmalloc_node(agg_buf_sz, GFP_KERNEL, node);
-+ if (!buf)
-+ goto err1;
-+
-+ if (buf != tx_agg_align(buf)) {
-+ kfree(buf);
-+ buf = kmalloc_node(agg_buf_sz + TX_ALIGN, GFP_KERNEL,
-+ node);
-+ if (!buf)
-+ goto err1;
-+ }
-+
-+ urb = usb_alloc_urb(0, GFP_KERNEL);
-+ if (!urb) {
-+ kfree(buf);
-+ goto err1;
-+ }
-+
-+ INIT_LIST_HEAD(&tp->tx_info[i].list);
-+ tp->tx_info[i].context = tp;
-+ tp->tx_info[i].urb = urb;
-+ tp->tx_info[i].buffer = buf;
-+ tp->tx_info[i].head = tx_agg_align(buf);
-+
-+ list_add_tail(&tp->tx_info[i].list, &tp->tx_free);
-+ }
-+
-+ tp->intr_urb = usb_alloc_urb(0, GFP_KERNEL);
-+ if (!tp->intr_urb)
-+ goto err1;
-+
-+ tp->intr_buff = kmalloc(INTBUFSIZE, GFP_KERNEL);
-+ if (!tp->intr_buff)
-+ goto err1;
-+
-+ tp->intr_interval = (int)ep_intr->desc.bInterval;
-+ usb_fill_int_urb(tp->intr_urb, tp->udev, usb_rcvintpipe(tp->udev, 3),
-+ tp->intr_buff, INTBUFSIZE, intr_callback,
-+ tp, tp->intr_interval);
-+
-+ return 0;
-+
-+err1:
-+ free_all_mem(tp);
-+ return -ENOMEM;
-+}
-+
-+static struct tx_agg *r8152_get_tx_agg(struct r8152 *tp)
-+{
-+ struct tx_agg *agg = NULL;
-+ unsigned long flags;
-+
-+ if (list_empty(&tp->tx_free))
-+ return NULL;
-+
-+ spin_lock_irqsave(&tp->tx_lock, flags);
-+ if (!list_empty(&tp->tx_free)) {
-+ struct list_head *cursor;
-+
-+ cursor = tp->tx_free.next;
-+ list_del_init(cursor);
-+ agg = list_entry(cursor, struct tx_agg, list);
-+ }
-+ spin_unlock_irqrestore(&tp->tx_lock, flags);
-+
-+ return agg;
-+}
-+
-+static inline __be16 get_protocol(struct sk_buff *skb)
-+{
-+ __be16 protocol;
-+
-+ if (skb->protocol == htons(ETH_P_8021Q))
-+ protocol = vlan_eth_hdr(skb)->h_vlan_encapsulated_proto;
-+ else
-+ protocol = skb->protocol;
-+
-+ return protocol;
-+}
-+
-+/* r8152_csum_workaround()
-+ * The hw limites the value the transport offset. When the offset is out of the
-+ * range, calculate the checksum by sw.
-+ */
-+static void r8152_csum_workaround(struct r8152 *tp, struct sk_buff *skb,
-+ struct sk_buff_head *list)
-+{
-+ if (skb_shinfo(skb)->gso_size) {
-+ netdev_features_t features = tp->netdev->features;
-+ struct sk_buff_head seg_list;
-+ struct sk_buff *segs, *nskb;
-+
-+ features &= ~(NETIF_F_SG | NETIF_F_IPV6_CSUM | NETIF_F_TSO6);
-+ segs = skb_gso_segment(skb, features);
-+ if (IS_ERR(segs) || !segs)
-+ goto drop;
-+
-+ __skb_queue_head_init(&seg_list);
-+
-+ do {
-+ nskb = segs;
-+ segs = segs->next;
-+ nskb->next = NULL;
-+ __skb_queue_tail(&seg_list, nskb);
-+ } while (segs);
-+
-+ skb_queue_splice(&seg_list, list);
-+ dev_kfree_skb(skb);
-+ } else if (skb->ip_summed == CHECKSUM_PARTIAL) {
-+ if (skb_checksum_help(skb) < 0)
-+ goto drop;
-+
-+ __skb_queue_head(list, skb);
-+ } else {
-+ struct net_device_stats *stats;
-+
-+drop:
-+ stats = &tp->netdev->stats;
-+ stats->tx_dropped++;
-+ dev_kfree_skb(skb);
-+ }
-+}
-+
-+/* msdn_giant_send_check()
-+ * According to the document of microsoft, the TCP Pseudo Header excludes the
-+ * packet length for IPv6 TCP large packets.
-+ */
-+static int msdn_giant_send_check(struct sk_buff *skb)
-+{
-+ const struct ipv6hdr *ipv6h;
-+ struct tcphdr *th;
-+ int ret;
-+
-+ ret = skb_cow_head(skb, 0);
-+ if (ret)
-+ return ret;
-+
-+ ipv6h = ipv6_hdr(skb);
-+ th = tcp_hdr(skb);
-+
-+ th->check = 0;
-+ th->check = ~tcp_v6_check(0, &ipv6h->saddr, &ipv6h->daddr, 0);
-+
-+ return ret;
-+}
-+
-+static inline void rtl_tx_vlan_tag(struct tx_desc *desc, struct sk_buff *skb)
-+{
-+ if (vlan_tx_tag_present(skb)) {
-+ u32 opts2;
-+
-+ opts2 = TX_VLAN_TAG | swab16(vlan_tx_tag_get(skb));
-+ desc->opts2 |= cpu_to_le32(opts2);
-+ }
-+}
-+
-+static inline void rtl_rx_vlan_tag(struct rx_desc *desc, struct sk_buff *skb)
-+{
-+ u32 opts2 = le32_to_cpu(desc->opts2);
-+
-+ if (opts2 & RX_VLAN_TAG)
-+ __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),
-+ swab16(opts2 & 0xffff));
-+}
-+
-+static int r8152_tx_csum(struct r8152 *tp, struct tx_desc *desc,
-+ struct sk_buff *skb, u32 len, u32 transport_offset)
-+{
-+ u32 mss = skb_shinfo(skb)->gso_size;
-+ u32 opts1, opts2 = 0;
-+ int ret = TX_CSUM_SUCCESS;
-+
-+ WARN_ON_ONCE(len > TX_LEN_MAX);
-+
-+ opts1 = len | TX_FS | TX_LS;
-+
-+ if (mss) {
-+ if (transport_offset > GTTCPHO_MAX) {
-+ netif_warn(tp, tx_err, tp->netdev,
-+ "Invalid transport offset 0x%x for TSO\n",
-+ transport_offset);
-+ ret = TX_CSUM_TSO;
-+ goto unavailable;
-+ }
-+
-+ switch (get_protocol(skb)) {
-+ case htons(ETH_P_IP):
-+ opts1 |= GTSENDV4;
-+ break;
-+
-+ case htons(ETH_P_IPV6):
-+ if (msdn_giant_send_check(skb)) {
-+ ret = TX_CSUM_TSO;
-+ goto unavailable;
-+ }
-+ opts1 |= GTSENDV6;
-+ break;
-+
-+ default:
-+ WARN_ON_ONCE(1);
-+ break;
-+ }
-+
-+ opts1 |= transport_offset << GTTCPHO_SHIFT;
-+ opts2 |= min(mss, MSS_MAX) << MSS_SHIFT;
-+ } else if (skb->ip_summed == CHECKSUM_PARTIAL) {
-+ u8 ip_protocol;
-+
-+ if (transport_offset > TCPHO_MAX) {
-+ netif_warn(tp, tx_err, tp->netdev,
-+ "Invalid transport offset 0x%x\n",
-+ transport_offset);
-+ ret = TX_CSUM_NONE;
-+ goto unavailable;
-+ }
-+
-+ switch (get_protocol(skb)) {
-+ case htons(ETH_P_IP):
-+ opts2 |= IPV4_CS;
-+ ip_protocol = ip_hdr(skb)->protocol;
-+ break;
-+
-+ case htons(ETH_P_IPV6):
-+ opts2 |= IPV6_CS;
-+ ip_protocol = ipv6_hdr(skb)->nexthdr;
-+ break;
-+
-+ default:
-+ ip_protocol = IPPROTO_RAW;
-+ break;
-+ }
-+
-+ if (ip_protocol == IPPROTO_TCP)
-+ opts2 |= TCP_CS;
-+ else if (ip_protocol == IPPROTO_UDP)
-+ opts2 |= UDP_CS;
-+ else
-+ WARN_ON_ONCE(1);
-+
-+ opts2 |= transport_offset << TCPHO_SHIFT;
-+ }
-+
-+ desc->opts2 = cpu_to_le32(opts2);
-+ desc->opts1 = cpu_to_le32(opts1);
-+
-+unavailable:
-+ return ret;
-+}
-+
-+static int r8152_tx_agg_fill(struct r8152 *tp, struct tx_agg *agg)
-+{
-+ struct sk_buff_head skb_head, *tx_queue = &tp->tx_queue;
-+ int remain, ret;
-+ u8 *tx_data;
-+
-+ __skb_queue_head_init(&skb_head);
-+ spin_lock(&tx_queue->lock);
-+ skb_queue_splice_init(tx_queue, &skb_head);
-+ spin_unlock(&tx_queue->lock);
-+
-+ tx_data = agg->head;
-+ agg->skb_num = 0;
-+ agg->skb_len = 0;
-+ remain = agg_buf_sz;
-+
-+ while (remain >= ETH_ZLEN + sizeof(struct tx_desc)) {
-+ struct tx_desc *tx_desc;
-+ struct sk_buff *skb;
-+ unsigned int len;
-+ u32 offset;
-+
-+ skb = __skb_dequeue(&skb_head);
-+ if (!skb)
-+ break;
-+
-+ len = skb->len + sizeof(*tx_desc);
-+
-+ if (len > remain) {
-+ __skb_queue_head(&skb_head, skb);
-+ break;
-+ }
-+
-+ tx_data = tx_agg_align(tx_data);
-+ tx_desc = (struct tx_desc *)tx_data;
-+
-+ offset = (u32)skb_transport_offset(skb);
-+
-+ if (r8152_tx_csum(tp, tx_desc, skb, skb->len, offset)) {
-+ r8152_csum_workaround(tp, skb, &skb_head);
-+ continue;
-+ }
-+
-+ rtl_tx_vlan_tag(tx_desc, skb);
-+
-+ tx_data += sizeof(*tx_desc);
-+
-+ len = skb->len;
-+ if (skb_copy_bits(skb, 0, tx_data, len) < 0) {
-+ struct net_device_stats *stats = &tp->netdev->stats;
-+
-+ stats->tx_dropped++;
-+ dev_kfree_skb_any(skb);
-+ tx_data -= sizeof(*tx_desc);
-+ continue;
-+ }
-+
-+ tx_data += len;
-+ agg->skb_len += len;
-+ agg->skb_num++;
-+
-+ dev_kfree_skb_any(skb);
-+
-+ remain = agg_buf_sz - (int)(tx_agg_align(tx_data) - agg->head);
-+ }
-+
-+ if (!skb_queue_empty(&skb_head)) {
-+ spin_lock(&tx_queue->lock);
-+ skb_queue_splice(&skb_head, tx_queue);
-+ spin_unlock(&tx_queue->lock);
-+ }
-+
-+ netif_tx_lock(tp->netdev);
-+
-+ if (netif_queue_stopped(tp->netdev) &&
-+ skb_queue_len(&tp->tx_queue) < tp->tx_qlen)
-+ netif_wake_queue(tp->netdev);
-+
-+ netif_tx_unlock(tp->netdev);
-+
-+ ret = usb_autopm_get_interface_async(tp->intf);
-+ if (ret < 0)
-+ goto out_tx_fill;
-+
-+ usb_fill_bulk_urb(agg->urb, tp->udev, usb_sndbulkpipe(tp->udev, 2),
-+ agg->head, (int)(tx_data - (u8 *)agg->head),
-+ (usb_complete_t)write_bulk_callback, agg);
-+
-+ ret = usb_submit_urb(agg->urb, GFP_ATOMIC);
-+ if (ret < 0)
-+ usb_autopm_put_interface_async(tp->intf);
-+
-+out_tx_fill:
-+ return ret;
-+}
-+
-+static u8 r8152_rx_csum(struct r8152 *tp, struct rx_desc *rx_desc)
-+{
-+ u8 checksum = CHECKSUM_NONE;
-+ u32 opts2, opts3;
-+
-+ if (tp->version == RTL_VER_01)
-+ goto return_result;
-+
-+ opts2 = le32_to_cpu(rx_desc->opts2);
-+ opts3 = le32_to_cpu(rx_desc->opts3);
-+
-+ if (opts2 & RD_IPV4_CS) {
-+ if (opts3 & IPF)
-+ checksum = CHECKSUM_NONE;
-+ else if ((opts2 & RD_UDP_CS) && (opts3 & UDPF))
-+ checksum = CHECKSUM_NONE;
-+ else if ((opts2 & RD_TCP_CS) && (opts3 & TCPF))
-+ checksum = CHECKSUM_NONE;
-+ else
-+ checksum = CHECKSUM_UNNECESSARY;
-+ } else if (RD_IPV6_CS) {
-+ if ((opts2 & RD_UDP_CS) && !(opts3 & UDPF))
-+ checksum = CHECKSUM_UNNECESSARY;
-+ else if ((opts2 & RD_TCP_CS) && !(opts3 & TCPF))
-+ checksum = CHECKSUM_UNNECESSARY;
-+ }
-+
-+return_result:
-+ return checksum;
-+}
-+
-+static void rx_bottom(struct r8152 *tp)
-+{
-+ unsigned long flags;
-+ struct list_head *cursor, *next, rx_queue;
-+
-+ if (list_empty(&tp->rx_done))
-+ return;
-+
-+ INIT_LIST_HEAD(&rx_queue);
-+ spin_lock_irqsave(&tp->rx_lock, flags);
-+ list_splice_init(&tp->rx_done, &rx_queue);
-+ spin_unlock_irqrestore(&tp->rx_lock, flags);
-+
-+ list_for_each_safe(cursor, next, &rx_queue) {
-+ struct rx_desc *rx_desc;
-+ struct rx_agg *agg;
-+ int len_used = 0;
-+ struct urb *urb;
-+ u8 *rx_data;
-+ int ret;
-+
-+ list_del_init(cursor);
-+
-+ agg = list_entry(cursor, struct rx_agg, list);
-+ urb = agg->urb;
-+ if (urb->actual_length < ETH_ZLEN)
-+ goto submit;
-+
-+ rx_desc = agg->head;
-+ rx_data = agg->head;
-+ len_used += sizeof(struct rx_desc);
-+
-+ while (urb->actual_length > len_used) {
-+ struct net_device *netdev = tp->netdev;
-+ struct net_device_stats *stats = &netdev->stats;
-+ unsigned int pkt_len;
-+ struct sk_buff *skb;
-+
-+ pkt_len = le32_to_cpu(rx_desc->opts1) & RX_LEN_MASK;
-+ if (pkt_len < ETH_ZLEN)
-+ break;
-+
-+ len_used += pkt_len;
-+ if (urb->actual_length < len_used)
-+ break;
-+
-+ pkt_len -= CRC_SIZE;
-+ rx_data += sizeof(struct rx_desc);
-+
-+ skb = netdev_alloc_skb_ip_align(netdev, pkt_len);
-+ if (!skb) {
-+ stats->rx_dropped++;
-+ goto find_next_rx;
-+ }
-+
-+ skb->ip_summed = r8152_rx_csum(tp, rx_desc);
-+ memcpy(skb->data, rx_data, pkt_len);
-+ skb_put(skb, pkt_len);
-+ skb->protocol = eth_type_trans(skb, netdev);
-+ rtl_rx_vlan_tag(rx_desc, skb);
-+ netif_receive_skb(skb);
-+ stats->rx_packets++;
-+ stats->rx_bytes += pkt_len;
-+
-+find_next_rx:
-+ rx_data = rx_agg_align(rx_data + pkt_len + CRC_SIZE);
-+ rx_desc = (struct rx_desc *)rx_data;
-+ len_used = (int)(rx_data - (u8 *)agg->head);
-+ len_used += sizeof(struct rx_desc);
-+ }
-+
-+submit:
-+ ret = r8152_submit_rx(tp, agg, GFP_ATOMIC);
-+ if (ret && ret != -ENODEV) {
-+ spin_lock_irqsave(&tp->rx_lock, flags);
-+ list_add_tail(&agg->list, &tp->rx_done);
-+ spin_unlock_irqrestore(&tp->rx_lock, flags);
-+ tasklet_schedule(&tp->tl);
-+ }
-+ }
-+}
-+
-+static void tx_bottom(struct r8152 *tp)
-+{
-+ int res;
-+
-+ do {
-+ struct tx_agg *agg;
-+
-+ if (skb_queue_empty(&tp->tx_queue))
-+ break;
-+
-+ agg = r8152_get_tx_agg(tp);
-+ if (!agg)
-+ break;
-+
-+ res = r8152_tx_agg_fill(tp, agg);
-+ if (res) {
-+ struct net_device *netdev = tp->netdev;
-+
-+ if (res == -ENODEV) {
-+ netif_device_detach(netdev);
-+ } else {
-+ struct net_device_stats *stats = &netdev->stats;
-+ unsigned long flags;
-+
-+ netif_warn(tp, tx_err, netdev,
-+ "failed tx_urb %d\n", res);
-+ stats->tx_dropped += agg->skb_num;
-+
-+ spin_lock_irqsave(&tp->tx_lock, flags);
-+ list_add_tail(&agg->list, &tp->tx_free);
-+ spin_unlock_irqrestore(&tp->tx_lock, flags);
-+ }
-+ }
-+ } while (res == 0);
-+}
-+
-+static void bottom_half(unsigned long data)
-+{
-+ struct r8152 *tp;
-+
-+ tp = (struct r8152 *)data;
-+
-+ if (test_bit(RTL8152_UNPLUG, &tp->flags))
-+ return;
-+
-+ if (!test_bit(WORK_ENABLE, &tp->flags))
-+ return;
-+
-+ /* When link down, the driver would cancel all bulks. */
-+ /* This avoid the re-submitting bulk */
-+ if (!netif_carrier_ok(tp->netdev))
-+ return;
-+
-+ rx_bottom(tp);
-+ tx_bottom(tp);
-+}
-+
-+static
-+int r8152_submit_rx(struct r8152 *tp, struct rx_agg *agg, gfp_t mem_flags)
-+{
-+ usb_fill_bulk_urb(agg->urb, tp->udev, usb_rcvbulkpipe(tp->udev, 1),
-+ agg->head, agg_buf_sz,
-+ (usb_complete_t)read_bulk_callback, agg);
-+
-+ return usb_submit_urb(agg->urb, mem_flags);
-+}
-+
-+static void rtl_drop_queued_tx(struct r8152 *tp)
-+{
-+ struct net_device_stats *stats = &tp->netdev->stats;
-+ struct sk_buff_head skb_head, *tx_queue = &tp->tx_queue;
-+ struct sk_buff *skb;
-+
-+ if (skb_queue_empty(tx_queue))
-+ return;
-+
-+ __skb_queue_head_init(&skb_head);
-+ spin_lock_bh(&tx_queue->lock);
-+ skb_queue_splice_init(tx_queue, &skb_head);
-+ spin_unlock_bh(&tx_queue->lock);
-+
-+ while ((skb = __skb_dequeue(&skb_head))) {
-+ dev_kfree_skb(skb);
-+ stats->tx_dropped++;
-+ }
-+}
-+
-+static void rtl8152_tx_timeout(struct net_device *netdev)
-+{
-+ struct r8152 *tp = netdev_priv(netdev);
-+ int i;
-+
-+ netif_warn(tp, tx_err, netdev, "Tx timeout\n");
-+ for (i = 0; i < RTL8152_MAX_TX; i++)
-+ usb_unlink_urb(tp->tx_info[i].urb);
-+}
-+
-+static void rtl8152_set_rx_mode(struct net_device *netdev)
-+{
-+ struct r8152 *tp = netdev_priv(netdev);
-+
-+ if (tp->speed & LINK_STATUS) {
-+ set_bit(RTL8152_SET_RX_MODE, &tp->flags);
-+ schedule_delayed_work(&tp->schedule, 0);
-+ }
-+}
-+
-+static void _rtl8152_set_rx_mode(struct net_device *netdev)
-+{
-+ struct r8152 *tp = netdev_priv(netdev);
-+ u32 mc_filter[2]; /* Multicast hash filter */
-+ __le32 tmp[2];
-+ u32 ocp_data;
-+
-+ clear_bit(RTL8152_SET_RX_MODE, &tp->flags);
-+ netif_stop_queue(netdev);
-+ ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_RCR);
-+ ocp_data &= ~RCR_ACPT_ALL;
-+ ocp_data |= RCR_AB | RCR_APM;
-+
-+ if (netdev->flags & IFF_PROMISC) {
-+ /* Unconditionally log net taps. */
-+ netif_notice(tp, link, netdev, "Promiscuous mode enabled\n");
-+ ocp_data |= RCR_AM | RCR_AAP;
-+ mc_filter[1] = 0xffffffff;
-+ mc_filter[0] = 0xffffffff;
-+ } else if ((netdev_mc_count(netdev) > multicast_filter_limit) ||
-+ (netdev->flags & IFF_ALLMULTI)) {
-+ /* Too many to filter perfectly -- accept all multicasts. */
-+ ocp_data |= RCR_AM;
-+ mc_filter[1] = 0xffffffff;
-+ mc_filter[0] = 0xffffffff;
-+ } else {
-+ struct netdev_hw_addr *ha;
-+
-+ mc_filter[1] = 0;
-+ mc_filter[0] = 0;
-+ netdev_for_each_mc_addr(ha, netdev) {
-+ int bit_nr = ether_crc(ETH_ALEN, ha->addr) >> 26;
-+
-+ mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31);
-+ ocp_data |= RCR_AM;
-+ }
-+ }
-+
-+ tmp[0] = __cpu_to_le32(swab32(mc_filter[1]));
-+ tmp[1] = __cpu_to_le32(swab32(mc_filter[0]));
-+
-+ pla_ocp_write(tp, PLA_MAR, BYTE_EN_DWORD, sizeof(tmp), tmp);
-+ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, ocp_data);
-+ netif_wake_queue(netdev);
-+}
-+
-+static netdev_tx_t rtl8152_start_xmit(struct sk_buff *skb,
-+ struct net_device *netdev)
-+{
-+ struct r8152 *tp = netdev_priv(netdev);
-+
-+ skb_tx_timestamp(skb);
-+
-+ skb_queue_tail(&tp->tx_queue, skb);
-+
-+ if (!list_empty(&tp->tx_free)) {
-+ if (test_bit(SELECTIVE_SUSPEND, &tp->flags)) {
-+ set_bit(SCHEDULE_TASKLET, &tp->flags);
-+ schedule_delayed_work(&tp->schedule, 0);
-+ } else {
-+ usb_mark_last_busy(tp->udev);
-+ tasklet_schedule(&tp->tl);
-+ }
-+ } else if (skb_queue_len(&tp->tx_queue) > tp->tx_qlen) {
-+ netif_stop_queue(netdev);
-+ }
-+
-+ return NETDEV_TX_OK;
-+}
-+
-+static void r8152b_reset_packet_filter(struct r8152 *tp)
-+{
-+ u32 ocp_data;
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_FMC);
-+ ocp_data &= ~FMC_FCR_MCU_EN;
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_FMC, ocp_data);
-+ ocp_data |= FMC_FCR_MCU_EN;
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_FMC, ocp_data);
-+}
-+
-+static void rtl8152_nic_reset(struct r8152 *tp)
-+{
-+ int i;
-+
-+ ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CR, CR_RST);
-+
-+ for (i = 0; i < 1000; i++) {
-+ if (!(ocp_read_byte(tp, MCU_TYPE_PLA, PLA_CR) & CR_RST))
-+ break;
-+ usleep_range(100, 400);
-+ }
-+}
-+
-+static void set_tx_qlen(struct r8152 *tp)
-+{
-+ struct net_device *netdev = tp->netdev;
-+
-+ tp->tx_qlen = agg_buf_sz / (netdev->mtu + VLAN_ETH_HLEN + VLAN_HLEN +
-+ sizeof(struct tx_desc));
-+}
-+
-+static inline u8 rtl8152_get_speed(struct r8152 *tp)
-+{
-+ return ocp_read_byte(tp, MCU_TYPE_PLA, PLA_PHYSTATUS);
-+}
-+
-+static void rtl_set_eee_plus(struct r8152 *tp)
-+{
-+ u32 ocp_data;
-+ u8 speed;
-+
-+ speed = rtl8152_get_speed(tp);
-+ if (speed & _10bps) {
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EEEP_CR);
-+ ocp_data |= EEEP_CR_EEEP_TX;
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_EEEP_CR, ocp_data);
-+ } else {
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EEEP_CR);
-+ ocp_data &= ~EEEP_CR_EEEP_TX;
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_EEEP_CR, ocp_data);
-+ }
-+}
-+
-+static void rxdy_gated_en(struct r8152 *tp, bool enable)
-+{
-+ u32 ocp_data;
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_MISC_1);
-+ if (enable)
-+ ocp_data |= RXDY_GATED_EN;
-+ else
-+ ocp_data &= ~RXDY_GATED_EN;
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_MISC_1, ocp_data);
-+}
-+
-+static int rtl_start_rx(struct r8152 *tp)
-+{
-+ int i, ret = 0;
-+
-+ INIT_LIST_HEAD(&tp->rx_done);
-+ for (i = 0; i < RTL8152_MAX_RX; i++) {
-+ INIT_LIST_HEAD(&tp->rx_info[i].list);
-+ ret = r8152_submit_rx(tp, &tp->rx_info[i], GFP_KERNEL);
-+ if (ret)
-+ break;
-+ }
-+
-+ return ret;
-+}
-+
-+static int rtl_stop_rx(struct r8152 *tp)
-+{
-+ int i;
-+
-+ for (i = 0; i < RTL8152_MAX_RX; i++)
-+ usb_kill_urb(tp->rx_info[i].urb);
-+
-+ return 0;
-+}
-+
-+static int rtl_enable(struct r8152 *tp)
-+{
-+ u32 ocp_data;
-+
-+ r8152b_reset_packet_filter(tp);
-+
-+ ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_CR);
-+ ocp_data |= CR_RE | CR_TE;
-+ ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CR, ocp_data);
-+
-+ rxdy_gated_en(tp, false);
-+
-+ return rtl_start_rx(tp);
-+}
-+
-+static int rtl8152_enable(struct r8152 *tp)
-+{
-+ if (test_bit(RTL8152_UNPLUG, &tp->flags))
-+ return -ENODEV;
-+
-+ set_tx_qlen(tp);
-+ rtl_set_eee_plus(tp);
-+
-+ return rtl_enable(tp);
-+}
-+
-+static void r8153_set_rx_agg(struct r8152 *tp)
-+{
-+ u8 speed;
-+
-+ speed = rtl8152_get_speed(tp);
-+ if (speed & _1000bps) {
-+ if (tp->udev->speed == USB_SPEED_SUPER) {
-+ ocp_write_dword(tp, MCU_TYPE_USB, USB_RX_BUF_TH,
-+ RX_THR_SUPPER);
-+ ocp_write_dword(tp, MCU_TYPE_USB, USB_RX_EARLY_AGG,
-+ EARLY_AGG_SUPPER);
-+ } else {
-+ ocp_write_dword(tp, MCU_TYPE_USB, USB_RX_BUF_TH,
-+ RX_THR_HIGH);
-+ ocp_write_dword(tp, MCU_TYPE_USB, USB_RX_EARLY_AGG,
-+ EARLY_AGG_HIGH);
-+ }
-+ } else {
-+ ocp_write_dword(tp, MCU_TYPE_USB, USB_RX_BUF_TH, RX_THR_SLOW);
-+ ocp_write_dword(tp, MCU_TYPE_USB, USB_RX_EARLY_AGG,
-+ EARLY_AGG_SLOW);
-+ }
-+}
-+
-+static int rtl8153_enable(struct r8152 *tp)
-+{
-+ if (test_bit(RTL8152_UNPLUG, &tp->flags))
-+ return -ENODEV;
-+
-+ set_tx_qlen(tp);
-+ rtl_set_eee_plus(tp);
-+ r8153_set_rx_agg(tp);
-+
-+ return rtl_enable(tp);
-+}
-+
-+static void rtl_disable(struct r8152 *tp)
-+{
-+ u32 ocp_data;
-+ int i;
-+
-+ if (test_bit(RTL8152_UNPLUG, &tp->flags)) {
-+ rtl_drop_queued_tx(tp);
-+ return;
-+ }
-+
-+ ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_RCR);
-+ ocp_data &= ~RCR_ACPT_ALL;
-+ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, ocp_data);
-+
-+ rtl_drop_queued_tx(tp);
-+
-+ for (i = 0; i < RTL8152_MAX_TX; i++)
-+ usb_kill_urb(tp->tx_info[i].urb);
-+
-+ rxdy_gated_en(tp, true);
-+
-+ for (i = 0; i < 1000; i++) {
-+ ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
-+ if ((ocp_data & FIFO_EMPTY) == FIFO_EMPTY)
-+ break;
-+ usleep_range(1000, 2000);
-+ }
-+
-+ for (i = 0; i < 1000; i++) {
-+ if (ocp_read_word(tp, MCU_TYPE_PLA, PLA_TCR0) & TCR0_TX_EMPTY)
-+ break;
-+ usleep_range(1000, 2000);
-+ }
-+
-+ rtl_stop_rx(tp);
-+
-+ rtl8152_nic_reset(tp);
-+}
-+
-+static void r8152_power_cut_en(struct r8152 *tp, bool enable)
-+{
-+ u32 ocp_data;
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_UPS_CTRL);
-+ if (enable)
-+ ocp_data |= POWER_CUT;
-+ else
-+ ocp_data &= ~POWER_CUT;
-+ ocp_write_word(tp, MCU_TYPE_USB, USB_UPS_CTRL, ocp_data);
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_PM_CTRL_STATUS);
-+ ocp_data &= ~RESUME_INDICATE;
-+ ocp_write_word(tp, MCU_TYPE_USB, USB_PM_CTRL_STATUS, ocp_data);
-+}
-+
-+static void rtl_rx_vlan_en(struct r8152 *tp, bool enable)
-+{
-+ u32 ocp_data;
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CPCR);
-+ if (enable)
-+ ocp_data |= CPCR_RX_VLAN;
-+ else
-+ ocp_data &= ~CPCR_RX_VLAN;
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_CPCR, ocp_data);
-+}
-+
-+static int rtl8152_set_features(struct net_device *dev,
-+ netdev_features_t features)
-+{
-+ netdev_features_t changed = features ^ dev->features;
-+ struct r8152 *tp = netdev_priv(dev);
-+ int ret;
-+
-+ ret = usb_autopm_get_interface(tp->intf);
-+ if (ret < 0)
-+ goto out;
-+
-+ mutex_lock(&tp->control);
-+
-+ if (changed & NETIF_F_HW_VLAN_CTAG_RX) {
-+ if (features & NETIF_F_HW_VLAN_CTAG_RX)
-+ rtl_rx_vlan_en(tp, true);
-+ else
-+ rtl_rx_vlan_en(tp, false);
-+ }
-+
-+ mutex_unlock(&tp->control);
-+
-+ usb_autopm_put_interface(tp->intf);
-+
-+out:
-+ return ret;
-+}
-+
-+#define WAKE_ANY (WAKE_PHY | WAKE_MAGIC | WAKE_UCAST | WAKE_BCAST | WAKE_MCAST)
-+
-+static u32 __rtl_get_wol(struct r8152 *tp)
-+{
-+ u32 ocp_data;
-+ u32 wolopts = 0;
-+
-+ ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_CONFIG5);
-+ if (!(ocp_data & LAN_WAKE_EN))
-+ return 0;
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CONFIG34);
-+ if (ocp_data & LINK_ON_WAKE_EN)
-+ wolopts |= WAKE_PHY;
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CONFIG5);
-+ if (ocp_data & UWF_EN)
-+ wolopts |= WAKE_UCAST;
-+ if (ocp_data & BWF_EN)
-+ wolopts |= WAKE_BCAST;
-+ if (ocp_data & MWF_EN)
-+ wolopts |= WAKE_MCAST;
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CFG_WOL);
-+ if (ocp_data & MAGIC_EN)
-+ wolopts |= WAKE_MAGIC;
-+
-+ return wolopts;
-+}
-+
-+static void __rtl_set_wol(struct r8152 *tp, u32 wolopts)
-+{
-+ u32 ocp_data;
-+
-+ ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_CONFIG);
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CONFIG34);
-+ ocp_data &= ~LINK_ON_WAKE_EN;
-+ if (wolopts & WAKE_PHY)
-+ ocp_data |= LINK_ON_WAKE_EN;
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_CONFIG34, ocp_data);
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CONFIG5);
-+ ocp_data &= ~(UWF_EN | BWF_EN | MWF_EN | LAN_WAKE_EN);
-+ if (wolopts & WAKE_UCAST)
-+ ocp_data |= UWF_EN;
-+ if (wolopts & WAKE_BCAST)
-+ ocp_data |= BWF_EN;
-+ if (wolopts & WAKE_MCAST)
-+ ocp_data |= MWF_EN;
-+ if (wolopts & WAKE_ANY)
-+ ocp_data |= LAN_WAKE_EN;
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_CONFIG5, ocp_data);
-+
-+ ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_NORAML);
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CFG_WOL);
-+ ocp_data &= ~MAGIC_EN;
-+ if (wolopts & WAKE_MAGIC)
-+ ocp_data |= MAGIC_EN;
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_CFG_WOL, ocp_data);
-+
-+ if (wolopts & WAKE_ANY)
-+ device_set_wakeup_enable(&tp->udev->dev, true);
-+ else
-+ device_set_wakeup_enable(&tp->udev->dev, false);
-+}
-+
-+static void rtl_runtime_suspend_enable(struct r8152 *tp, bool enable)
-+{
-+ if (enable) {
-+ u32 ocp_data;
-+
-+ __rtl_set_wol(tp, WAKE_ANY);
-+
-+ ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_CONFIG);
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CONFIG34);
-+ ocp_data |= LINK_OFF_WAKE_EN;
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_CONFIG34, ocp_data);
-+
-+ ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_NORAML);
-+ } else {
-+ __rtl_set_wol(tp, tp->saved_wolopts);
-+ }
-+}
-+
-+static void rtl_phy_reset(struct r8152 *tp)
-+{
-+ u16 data;
-+ int i;
-+
-+ clear_bit(PHY_RESET, &tp->flags);
-+
-+ data = r8152_mdio_read(tp, MII_BMCR);
-+
-+ /* don't reset again before the previous one complete */
-+ if (data & BMCR_RESET)
-+ return;
-+
-+ data |= BMCR_RESET;
-+ r8152_mdio_write(tp, MII_BMCR, data);
-+
-+ for (i = 0; i < 50; i++) {
-+ msleep(20);
-+ if ((r8152_mdio_read(tp, MII_BMCR) & BMCR_RESET) == 0)
-+ break;
-+ }
-+}
-+
-+static void r8153_teredo_off(struct r8152 *tp)
-+{
-+ u32 ocp_data;
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_TEREDO_CFG);
-+ ocp_data &= ~(TEREDO_SEL | TEREDO_RS_EVENT_MASK | OOB_TEREDO_EN);
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_TEREDO_CFG, ocp_data);
-+
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_WDT6_CTRL, WDT6_SET_MODE);
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_REALWOW_TIMER, 0);
-+ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_TEREDO_TIMER, 0);
-+}
-+
-+static void r8152b_disable_aldps(struct r8152 *tp)
-+{
-+ ocp_reg_write(tp, OCP_ALDPS_CONFIG, ENPDNPS | LINKENA | DIS_SDSAVE);
-+ msleep(20);
-+}
-+
-+static inline void r8152b_enable_aldps(struct r8152 *tp)
-+{
-+ ocp_reg_write(tp, OCP_ALDPS_CONFIG, ENPWRSAVE | ENPDNPS |
-+ LINKENA | DIS_SDSAVE);
-+}
-+
-+static void rtl8152_disable(struct r8152 *tp)
-+{
-+ r8152b_disable_aldps(tp);
-+ rtl_disable(tp);
-+ r8152b_enable_aldps(tp);
-+}
-+
-+static void r8152b_hw_phy_cfg(struct r8152 *tp)
-+{
-+ u16 data;
-+
-+ data = r8152_mdio_read(tp, MII_BMCR);
-+ if (data & BMCR_PDOWN) {
-+ data &= ~BMCR_PDOWN;
-+ r8152_mdio_write(tp, MII_BMCR, data);
-+ }
-+
-+ set_bit(PHY_RESET, &tp->flags);
-+}
-+
-+static void r8152b_exit_oob(struct r8152 *tp)
-+{
-+ u32 ocp_data;
-+ int i;
-+
-+ ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_RCR);
-+ ocp_data &= ~RCR_ACPT_ALL;
-+ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, ocp_data);
-+
-+ rxdy_gated_en(tp, true);
-+ r8153_teredo_off(tp);
-+ r8152b_hw_phy_cfg(tp);
-+
-+ ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_NORAML);
-+ ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CR, 0x00);
-+
-+ ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
-+ ocp_data &= ~NOW_IS_OOB;
-+ ocp_write_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, ocp_data);
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7);
-+ ocp_data &= ~MCU_BORW_EN;
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, ocp_data);
-+
-+ for (i = 0; i < 1000; i++) {
-+ ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
-+ if (ocp_data & LINK_LIST_READY)
-+ break;
-+ usleep_range(1000, 2000);
-+ }
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7);
-+ ocp_data |= RE_INIT_LL;
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, ocp_data);
-+
-+ for (i = 0; i < 1000; i++) {
-+ ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
-+ if (ocp_data & LINK_LIST_READY)
-+ break;
-+ usleep_range(1000, 2000);
-+ }
-+
-+ rtl8152_nic_reset(tp);
-+
-+ /* rx share fifo credit full threshold */
-+ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL0, RXFIFO_THR1_NORMAL);
-+
-+ if (tp->udev->speed == USB_SPEED_FULL ||
-+ tp->udev->speed == USB_SPEED_LOW) {
-+ /* rx share fifo credit near full threshold */
-+ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL1,
-+ RXFIFO_THR2_FULL);
-+ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL2,
-+ RXFIFO_THR3_FULL);
-+ } else {
-+ /* rx share fifo credit near full threshold */
-+ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL1,
-+ RXFIFO_THR2_HIGH);
-+ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL2,
-+ RXFIFO_THR3_HIGH);
-+ }
-+
-+ /* TX share fifo free credit full threshold */
-+ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_TXFIFO_CTRL, TXFIFO_THR_NORMAL);
-+
-+ ocp_write_byte(tp, MCU_TYPE_USB, USB_TX_AGG, TX_AGG_MAX_THRESHOLD);
-+ ocp_write_dword(tp, MCU_TYPE_USB, USB_RX_BUF_TH, RX_THR_HIGH);
-+ ocp_write_dword(tp, MCU_TYPE_USB, USB_TX_DMA,
-+ TEST_MODE_DISABLE | TX_SIZE_ADJUST1);
-+
-+ rtl_rx_vlan_en(tp, tp->netdev->features & NETIF_F_HW_VLAN_CTAG_RX);
-+
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_RMS, RTL8152_RMS);
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_TCR0);
-+ ocp_data |= TCR0_AUTO_FIFO;
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_TCR0, ocp_data);
-+}
-+
-+static void r8152b_enter_oob(struct r8152 *tp)
-+{
-+ u32 ocp_data;
-+ int i;
-+
-+ ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
-+ ocp_data &= ~NOW_IS_OOB;
-+ ocp_write_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, ocp_data);
-+
-+ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL0, RXFIFO_THR1_OOB);
-+ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL1, RXFIFO_THR2_OOB);
-+ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL2, RXFIFO_THR3_OOB);
-+
-+ rtl_disable(tp);
-+
-+ for (i = 0; i < 1000; i++) {
-+ ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
-+ if (ocp_data & LINK_LIST_READY)
-+ break;
-+ usleep_range(1000, 2000);
-+ }
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7);
-+ ocp_data |= RE_INIT_LL;
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, ocp_data);
-+
-+ for (i = 0; i < 1000; i++) {
-+ ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
-+ if (ocp_data & LINK_LIST_READY)
-+ break;
-+ usleep_range(1000, 2000);
-+ }
-+
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_RMS, RTL8152_RMS);
-+
-+ rtl_rx_vlan_en(tp, true);
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PAL_BDC_CR);
-+ ocp_data |= ALDPS_PROXY_MODE;
-+ ocp_write_word(tp, MCU_TYPE_PLA, PAL_BDC_CR, ocp_data);
-+
-+ ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
-+ ocp_data |= NOW_IS_OOB | DIS_MCU_CLROOB;
-+ ocp_write_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, ocp_data);
-+
-+ rxdy_gated_en(tp, false);
-+
-+ ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_RCR);
-+ ocp_data |= RCR_APM | RCR_AM | RCR_AB;
-+ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, ocp_data);
-+}
-+
-+static void r8153_hw_phy_cfg(struct r8152 *tp)
-+{
-+ u32 ocp_data;
-+ u16 data;
-+
-+ ocp_reg_write(tp, OCP_ADC_CFG, CKADSEL_L | ADC_EN | EN_EMI_L);
-+ data = r8152_mdio_read(tp, MII_BMCR);
-+ if (data & BMCR_PDOWN) {
-+ data &= ~BMCR_PDOWN;
-+ r8152_mdio_write(tp, MII_BMCR, data);
-+ }
-+
-+ if (tp->version == RTL_VER_03) {
-+ data = ocp_reg_read(tp, OCP_EEE_CFG);
-+ data &= ~CTAP_SHORT_EN;
-+ ocp_reg_write(tp, OCP_EEE_CFG, data);
-+ }
-+
-+ data = ocp_reg_read(tp, OCP_POWER_CFG);
-+ data |= EEE_CLKDIV_EN;
-+ ocp_reg_write(tp, OCP_POWER_CFG, data);
-+
-+ data = ocp_reg_read(tp, OCP_DOWN_SPEED);
-+ data |= EN_10M_BGOFF;
-+ ocp_reg_write(tp, OCP_DOWN_SPEED, data);
-+ data = ocp_reg_read(tp, OCP_POWER_CFG);
-+ data |= EN_10M_PLLOFF;
-+ ocp_reg_write(tp, OCP_POWER_CFG, data);
-+ data = sram_read(tp, SRAM_IMPEDANCE);
-+ data &= ~RX_DRIVING_MASK;
-+ sram_write(tp, SRAM_IMPEDANCE, data);
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_PHY_PWR);
-+ ocp_data |= PFM_PWM_SWITCH;
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_PHY_PWR, ocp_data);
-+
-+ data = sram_read(tp, SRAM_LPF_CFG);
-+ data |= LPF_AUTO_TUNE;
-+ sram_write(tp, SRAM_LPF_CFG, data);
-+
-+ data = sram_read(tp, SRAM_10M_AMP1);
-+ data |= GDAC_IB_UPALL;
-+ sram_write(tp, SRAM_10M_AMP1, data);
-+ data = sram_read(tp, SRAM_10M_AMP2);
-+ data |= AMP_DN;
-+ sram_write(tp, SRAM_10M_AMP2, data);
-+
-+ set_bit(PHY_RESET, &tp->flags);
-+}
-+
-+static void r8153_u1u2en(struct r8152 *tp, bool enable)
-+{
-+ u8 u1u2[8];
-+
-+ if (enable)
-+ memset(u1u2, 0xff, sizeof(u1u2));
-+ else
-+ memset(u1u2, 0x00, sizeof(u1u2));
-+
-+ usb_ocp_write(tp, USB_TOLERANCE, BYTE_EN_SIX_BYTES, sizeof(u1u2), u1u2);
-+}
-+
-+static void r8153_u2p3en(struct r8152 *tp, bool enable)
-+{
-+ u32 ocp_data;
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_U2P3_CTRL);
-+ if (enable)
-+ ocp_data |= U2P3_ENABLE;
-+ else
-+ ocp_data &= ~U2P3_ENABLE;
-+ ocp_write_word(tp, MCU_TYPE_USB, USB_U2P3_CTRL, ocp_data);
-+}
-+
-+static void r8153_power_cut_en(struct r8152 *tp, bool enable)
-+{
-+ u32 ocp_data;
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_POWER_CUT);
-+ if (enable)
-+ ocp_data |= PWR_EN | PHASE2_EN;
-+ else
-+ ocp_data &= ~(PWR_EN | PHASE2_EN);
-+ ocp_write_word(tp, MCU_TYPE_USB, USB_POWER_CUT, ocp_data);
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_MISC_0);
-+ ocp_data &= ~PCUT_STATUS;
-+ ocp_write_word(tp, MCU_TYPE_USB, USB_MISC_0, ocp_data);
-+}
-+
-+static void r8153_first_init(struct r8152 *tp)
-+{
-+ u32 ocp_data;
-+ int i;
-+
-+ rxdy_gated_en(tp, true);
-+ r8153_teredo_off(tp);
-+
-+ ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_RCR);
-+ ocp_data &= ~RCR_ACPT_ALL;
-+ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, ocp_data);
-+
-+ r8153_hw_phy_cfg(tp);
-+
-+ rtl8152_nic_reset(tp);
-+
-+ ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
-+ ocp_data &= ~NOW_IS_OOB;
-+ ocp_write_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, ocp_data);
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7);
-+ ocp_data &= ~MCU_BORW_EN;
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, ocp_data);
-+
-+ for (i = 0; i < 1000; i++) {
-+ ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
-+ if (ocp_data & LINK_LIST_READY)
-+ break;
-+ usleep_range(1000, 2000);
-+ }
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7);
-+ ocp_data |= RE_INIT_LL;
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, ocp_data);
-+
-+ for (i = 0; i < 1000; i++) {
-+ ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
-+ if (ocp_data & LINK_LIST_READY)
-+ break;
-+ usleep_range(1000, 2000);
-+ }
-+
-+ rtl_rx_vlan_en(tp, tp->netdev->features & NETIF_F_HW_VLAN_CTAG_RX);
-+
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_RMS, RTL8153_RMS);
-+ ocp_write_byte(tp, MCU_TYPE_PLA, PLA_MTPS, MTPS_JUMBO);
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_TCR0);
-+ ocp_data |= TCR0_AUTO_FIFO;
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_TCR0, ocp_data);
-+
-+ rtl8152_nic_reset(tp);
-+
-+ /* rx share fifo credit full threshold */
-+ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL0, RXFIFO_THR1_NORMAL);
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL1, RXFIFO_THR2_NORMAL);
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL2, RXFIFO_THR3_NORMAL);
-+ /* TX share fifo free credit full threshold */
-+ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_TXFIFO_CTRL, TXFIFO_THR_NORMAL2);
-+
-+ /* rx aggregation */
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL);
-+ ocp_data &= ~RX_AGG_DISABLE;
-+ ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data);
-+}
-+
-+static void r8153_enter_oob(struct r8152 *tp)
-+{
-+ u32 ocp_data;
-+ int i;
-+
-+ ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
-+ ocp_data &= ~NOW_IS_OOB;
-+ ocp_write_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, ocp_data);
-+
-+ rtl_disable(tp);
-+
-+ for (i = 0; i < 1000; i++) {
-+ ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
-+ if (ocp_data & LINK_LIST_READY)
-+ break;
-+ usleep_range(1000, 2000);
-+ }
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7);
-+ ocp_data |= RE_INIT_LL;
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, ocp_data);
-+
-+ for (i = 0; i < 1000; i++) {
-+ ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
-+ if (ocp_data & LINK_LIST_READY)
-+ break;
-+ usleep_range(1000, 2000);
-+ }
-+
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_RMS, RTL8153_RMS);
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_TEREDO_CFG);
-+ ocp_data &= ~TEREDO_WAKE_MASK;
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_TEREDO_CFG, ocp_data);
-+
-+ rtl_rx_vlan_en(tp, true);
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PAL_BDC_CR);
-+ ocp_data |= ALDPS_PROXY_MODE;
-+ ocp_write_word(tp, MCU_TYPE_PLA, PAL_BDC_CR, ocp_data);
-+
-+ ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
-+ ocp_data |= NOW_IS_OOB | DIS_MCU_CLROOB;
-+ ocp_write_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, ocp_data);
-+
-+ rxdy_gated_en(tp, false);
-+
-+ ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_RCR);
-+ ocp_data |= RCR_APM | RCR_AM | RCR_AB;
-+ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, ocp_data);
-+}
-+
-+static void r8153_disable_aldps(struct r8152 *tp)
-+{
-+ u16 data;
-+
-+ data = ocp_reg_read(tp, OCP_POWER_CFG);
-+ data &= ~EN_ALDPS;
-+ ocp_reg_write(tp, OCP_POWER_CFG, data);
-+ msleep(20);
-+}
-+
-+static void r8153_enable_aldps(struct r8152 *tp)
-+{
-+ u16 data;
-+
-+ data = ocp_reg_read(tp, OCP_POWER_CFG);
-+ data |= EN_ALDPS;
-+ ocp_reg_write(tp, OCP_POWER_CFG, data);
-+}
-+
-+static void rtl8153_disable(struct r8152 *tp)
-+{
-+ r8153_disable_aldps(tp);
-+ rtl_disable(tp);
-+ r8153_enable_aldps(tp);
-+}
-+
-+static int rtl8152_set_speed(struct r8152 *tp, u8 autoneg, u16 speed, u8 duplex)
-+{
-+ u16 bmcr, anar, gbcr;
-+ int ret = 0;
-+
-+ cancel_delayed_work_sync(&tp->schedule);
-+ anar = r8152_mdio_read(tp, MII_ADVERTISE);
-+ anar &= ~(ADVERTISE_10HALF | ADVERTISE_10FULL |
-+ ADVERTISE_100HALF | ADVERTISE_100FULL);
-+ if (tp->mii.supports_gmii) {
-+ gbcr = r8152_mdio_read(tp, MII_CTRL1000);
-+ gbcr &= ~(ADVERTISE_1000FULL | ADVERTISE_1000HALF);
-+ } else {
-+ gbcr = 0;
-+ }
-+
-+ if (autoneg == AUTONEG_DISABLE) {
-+ if (speed == SPEED_10) {
-+ bmcr = 0;
-+ anar |= ADVERTISE_10HALF | ADVERTISE_10FULL;
-+ } else if (speed == SPEED_100) {
-+ bmcr = BMCR_SPEED100;
-+ anar |= ADVERTISE_100HALF | ADVERTISE_100FULL;
-+ } else if (speed == SPEED_1000 && tp->mii.supports_gmii) {
-+ bmcr = BMCR_SPEED1000;
-+ gbcr |= ADVERTISE_1000FULL | ADVERTISE_1000HALF;
-+ } else {
-+ ret = -EINVAL;
-+ goto out;
-+ }
-+
-+ if (duplex == DUPLEX_FULL)
-+ bmcr |= BMCR_FULLDPLX;
-+ } else {
-+ if (speed == SPEED_10) {
-+ if (duplex == DUPLEX_FULL)
-+ anar |= ADVERTISE_10HALF | ADVERTISE_10FULL;
-+ else
-+ anar |= ADVERTISE_10HALF;
-+ } else if (speed == SPEED_100) {
-+ if (duplex == DUPLEX_FULL) {
-+ anar |= ADVERTISE_10HALF | ADVERTISE_10FULL;
-+ anar |= ADVERTISE_100HALF | ADVERTISE_100FULL;
-+ } else {
-+ anar |= ADVERTISE_10HALF;
-+ anar |= ADVERTISE_100HALF;
-+ }
-+ } else if (speed == SPEED_1000 && tp->mii.supports_gmii) {
-+ if (duplex == DUPLEX_FULL) {
-+ anar |= ADVERTISE_10HALF | ADVERTISE_10FULL;
-+ anar |= ADVERTISE_100HALF | ADVERTISE_100FULL;
-+ gbcr |= ADVERTISE_1000FULL | ADVERTISE_1000HALF;
-+ } else {
-+ anar |= ADVERTISE_10HALF;
-+ anar |= ADVERTISE_100HALF;
-+ gbcr |= ADVERTISE_1000HALF;
-+ }
-+ } else {
-+ ret = -EINVAL;
-+ goto out;
-+ }
-+
-+ bmcr = BMCR_ANENABLE | BMCR_ANRESTART;
-+ }
-+
-+ if (test_bit(PHY_RESET, &tp->flags))
-+ bmcr |= BMCR_RESET;
-+
-+ if (tp->mii.supports_gmii)
-+ r8152_mdio_write(tp, MII_CTRL1000, gbcr);
-+
-+ r8152_mdio_write(tp, MII_ADVERTISE, anar);
-+ r8152_mdio_write(tp, MII_BMCR, bmcr);
-+
-+ if (test_bit(PHY_RESET, &tp->flags)) {
-+ int i;
-+
-+ clear_bit(PHY_RESET, &tp->flags);
-+ for (i = 0; i < 50; i++) {
-+ msleep(20);
-+ if ((r8152_mdio_read(tp, MII_BMCR) & BMCR_RESET) == 0)
-+ break;
-+ }
-+ }
-+
-+out:
-+
-+ return ret;
-+}
-+
-+static void rtl8152_up(struct r8152 *tp)
-+{
-+ if (test_bit(RTL8152_UNPLUG, &tp->flags))
-+ return;
-+
-+ r8152b_disable_aldps(tp);
-+ r8152b_exit_oob(tp);
-+ r8152b_enable_aldps(tp);
-+}
-+
-+static void rtl8152_down(struct r8152 *tp)
-+{
-+ if (test_bit(RTL8152_UNPLUG, &tp->flags)) {
-+ rtl_drop_queued_tx(tp);
-+ return;
-+ }
-+
-+ r8152_power_cut_en(tp, false);
-+ r8152b_disable_aldps(tp);
-+ r8152b_enter_oob(tp);
-+ r8152b_enable_aldps(tp);
-+}
-+
-+static void rtl8153_up(struct r8152 *tp)
-+{
-+ if (test_bit(RTL8152_UNPLUG, &tp->flags))
-+ return;
-+
-+ r8153_disable_aldps(tp);
-+ r8153_first_init(tp);
-+ r8153_enable_aldps(tp);
-+}
-+
-+static void rtl8153_down(struct r8152 *tp)
-+{
-+ if (test_bit(RTL8152_UNPLUG, &tp->flags)) {
-+ rtl_drop_queued_tx(tp);
-+ return;
-+ }
-+
-+ r8153_u1u2en(tp, false);
-+ r8153_power_cut_en(tp, false);
-+ r8153_disable_aldps(tp);
-+ r8153_enter_oob(tp);
-+ r8153_enable_aldps(tp);
-+}
-+
-+static void set_carrier(struct r8152 *tp)
-+{
-+ struct net_device *netdev = tp->netdev;
-+ u8 speed;
-+
-+ clear_bit(RTL8152_LINK_CHG, &tp->flags);
-+ speed = rtl8152_get_speed(tp);
-+
-+ if (speed & LINK_STATUS) {
-+ if (!(tp->speed & LINK_STATUS)) {
-+ tp->rtl_ops.enable(tp);
-+ set_bit(RTL8152_SET_RX_MODE, &tp->flags);
-+ netif_carrier_on(netdev);
-+ }
-+ } else {
-+ if (tp->speed & LINK_STATUS) {
-+ netif_carrier_off(netdev);
-+ tasklet_disable(&tp->tl);
-+ tp->rtl_ops.disable(tp);
-+ tasklet_enable(&tp->tl);
-+ }
-+ }
-+ tp->speed = speed;
-+}
-+
-+static void rtl_work_func_t(struct work_struct *work)
-+{
-+ struct r8152 *tp = container_of(work, struct r8152, schedule.work);
-+
-+ if (usb_autopm_get_interface(tp->intf) < 0)
-+ return;
-+
-+ if (!test_bit(WORK_ENABLE, &tp->flags))
-+ goto out1;
-+
-+ if (test_bit(RTL8152_UNPLUG, &tp->flags))
-+ goto out1;
-+
-+ if (!mutex_trylock(&tp->control)) {
-+ schedule_delayed_work(&tp->schedule, 0);
-+ goto out1;
-+ }
-+
-+ if (test_bit(RTL8152_LINK_CHG, &tp->flags))
-+ set_carrier(tp);
-+
-+ if (test_bit(RTL8152_SET_RX_MODE, &tp->flags))
-+ _rtl8152_set_rx_mode(tp->netdev);
-+
-+ if (test_bit(SCHEDULE_TASKLET, &tp->flags) &&
-+ (tp->speed & LINK_STATUS)) {
-+ clear_bit(SCHEDULE_TASKLET, &tp->flags);
-+ tasklet_schedule(&tp->tl);
-+ }
-+
-+ if (test_bit(PHY_RESET, &tp->flags))
-+ rtl_phy_reset(tp);
-+
-+ mutex_unlock(&tp->control);
-+
-+out1:
-+ usb_autopm_put_interface(tp->intf);
-+}
-+
-+static int rtl8152_open(struct net_device *netdev)
-+{
-+ struct r8152 *tp = netdev_priv(netdev);
-+ int res = 0;
-+
-+ res = alloc_all_mem(tp);
-+ if (res)
-+ goto out;
-+
-+ /* set speed to 0 to avoid autoresume try to submit rx */
-+ tp->speed = 0;
-+
-+ res = usb_autopm_get_interface(tp->intf);
-+ if (res < 0) {
-+ free_all_mem(tp);
-+ goto out;
-+ }
-+
-+ mutex_lock(&tp->control);
-+
-+ /* The WORK_ENABLE may be set when autoresume occurs */
-+ if (test_bit(WORK_ENABLE, &tp->flags)) {
-+ clear_bit(WORK_ENABLE, &tp->flags);
-+ usb_kill_urb(tp->intr_urb);
-+ cancel_delayed_work_sync(&tp->schedule);
-+
-+ /* disable the tx/rx, if the workqueue has enabled them. */
-+ if (tp->speed & LINK_STATUS)
-+ tp->rtl_ops.disable(tp);
-+ }
-+
-+ tp->rtl_ops.up(tp);
-+
-+ rtl8152_set_speed(tp, AUTONEG_ENABLE,
-+ tp->mii.supports_gmii ? SPEED_1000 : SPEED_100,
-+ DUPLEX_FULL);
-+ tp->speed = 0;
-+ netif_carrier_off(netdev);
-+ netif_start_queue(netdev);
-+ set_bit(WORK_ENABLE, &tp->flags);
-+
-+ res = usb_submit_urb(tp->intr_urb, GFP_KERNEL);
-+ if (res) {
-+ if (res == -ENODEV)
-+ netif_device_detach(tp->netdev);
-+ netif_warn(tp, ifup, netdev, "intr_urb submit failed: %d\n",
-+ res);
-+ free_all_mem(tp);
-+ }
-+
-+ mutex_unlock(&tp->control);
-+
-+ usb_autopm_put_interface(tp->intf);
-+
-+out:
-+ return res;
-+}
-+
-+static int rtl8152_close(struct net_device *netdev)
-+{
-+ struct r8152 *tp = netdev_priv(netdev);
-+ int res = 0;
-+
-+ clear_bit(WORK_ENABLE, &tp->flags);
-+ usb_kill_urb(tp->intr_urb);
-+ cancel_delayed_work_sync(&tp->schedule);
-+ netif_stop_queue(netdev);
-+
-+ res = usb_autopm_get_interface(tp->intf);
-+ if (res < 0) {
-+ rtl_drop_queued_tx(tp);
-+ } else {
-+ mutex_lock(&tp->control);
-+
-+ /* The autosuspend may have been enabled and wouldn't
-+ * be disable when autoresume occurs, because the
-+ * netif_running() would be false.
-+ */
-+ rtl_runtime_suspend_enable(tp, false);
-+
-+ tasklet_disable(&tp->tl);
-+ tp->rtl_ops.down(tp);
-+ tasklet_enable(&tp->tl);
-+
-+ mutex_unlock(&tp->control);
-+
-+ usb_autopm_put_interface(tp->intf);
-+ }
-+
-+ free_all_mem(tp);
-+
-+ return res;
-+}
-+
-+static inline void r8152_mmd_indirect(struct r8152 *tp, u16 dev, u16 reg)
-+{
-+ ocp_reg_write(tp, OCP_EEE_AR, FUN_ADDR | dev);
-+ ocp_reg_write(tp, OCP_EEE_DATA, reg);
-+ ocp_reg_write(tp, OCP_EEE_AR, FUN_DATA | dev);
-+}
-+
-+static u16 r8152_mmd_read(struct r8152 *tp, u16 dev, u16 reg)
-+{
-+ u16 data;
-+
-+ r8152_mmd_indirect(tp, dev, reg);
-+ data = ocp_reg_read(tp, OCP_EEE_DATA);
-+ ocp_reg_write(tp, OCP_EEE_AR, 0x0000);
-+
-+ return data;
-+}
-+
-+static void r8152_mmd_write(struct r8152 *tp, u16 dev, u16 reg, u16 data)
-+{
-+ r8152_mmd_indirect(tp, dev, reg);
-+ ocp_reg_write(tp, OCP_EEE_DATA, data);
-+ ocp_reg_write(tp, OCP_EEE_AR, 0x0000);
-+}
-+
-+static void r8152_eee_en(struct r8152 *tp, bool enable)
-+{
-+ u16 config1, config2, config3;
-+ u32 ocp_data;
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EEE_CR);
-+ config1 = ocp_reg_read(tp, OCP_EEE_CONFIG1) & ~sd_rise_time_mask;
-+ config2 = ocp_reg_read(tp, OCP_EEE_CONFIG2);
-+ config3 = ocp_reg_read(tp, OCP_EEE_CONFIG3) & ~fast_snr_mask;
-+
-+ if (enable) {
-+ ocp_data |= EEE_RX_EN | EEE_TX_EN;
-+ config1 |= EEE_10_CAP | EEE_NWAY_EN | TX_QUIET_EN | RX_QUIET_EN;
-+ config1 |= sd_rise_time(1);
-+ config2 |= RG_DACQUIET_EN | RG_LDVQUIET_EN;
-+ config3 |= fast_snr(42);
-+ } else {
-+ ocp_data &= ~(EEE_RX_EN | EEE_TX_EN);
-+ config1 &= ~(EEE_10_CAP | EEE_NWAY_EN | TX_QUIET_EN |
-+ RX_QUIET_EN);
-+ config1 |= sd_rise_time(7);
-+ config2 &= ~(RG_DACQUIET_EN | RG_LDVQUIET_EN);
-+ config3 |= fast_snr(511);
-+ }
-+
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_EEE_CR, ocp_data);
-+ ocp_reg_write(tp, OCP_EEE_CONFIG1, config1);
-+ ocp_reg_write(tp, OCP_EEE_CONFIG2, config2);
-+ ocp_reg_write(tp, OCP_EEE_CONFIG3, config3);
-+}
-+
-+static void r8152b_enable_eee(struct r8152 *tp)
-+{
-+ r8152_eee_en(tp, true);
-+ r8152_mmd_write(tp, MDIO_MMD_AN, MDIO_AN_EEE_ADV, MDIO_EEE_100TX);
-+}
-+
-+static void r8153_eee_en(struct r8152 *tp, bool enable)
-+{
-+ u32 ocp_data;
-+ u16 config;
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EEE_CR);
-+ config = ocp_reg_read(tp, OCP_EEE_CFG);
-+
-+ if (enable) {
-+ ocp_data |= EEE_RX_EN | EEE_TX_EN;
-+ config |= EEE10_EN;
-+ } else {
-+ ocp_data &= ~(EEE_RX_EN | EEE_TX_EN);
-+ config &= ~EEE10_EN;
-+ }
-+
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_EEE_CR, ocp_data);
-+ ocp_reg_write(tp, OCP_EEE_CFG, config);
-+}
-+
-+static void r8153_enable_eee(struct r8152 *tp)
-+{
-+ r8153_eee_en(tp, true);
-+ ocp_reg_write(tp, OCP_EEE_ADV, MDIO_EEE_1000T | MDIO_EEE_100TX);
-+}
-+
-+static void r8152b_enable_fc(struct r8152 *tp)
-+{
-+ u16 anar;
-+
-+ anar = r8152_mdio_read(tp, MII_ADVERTISE);
-+ anar |= ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM;
-+ r8152_mdio_write(tp, MII_ADVERTISE, anar);
-+}
-+
-+static void rtl_tally_reset(struct r8152 *tp)
-+{
-+ u32 ocp_data;
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY);
-+ ocp_data |= TALLY_RESET;
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data);
-+}
-+
-+static void r8152b_init(struct r8152 *tp)
-+{
-+ u32 ocp_data;
-+
-+ if (test_bit(RTL8152_UNPLUG, &tp->flags))
-+ return;
-+
-+ r8152b_disable_aldps(tp);
-+
-+ if (tp->version == RTL_VER_01) {
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_LED_FEATURE);
-+ ocp_data &= ~LED_MODE_MASK;
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_LED_FEATURE, ocp_data);
-+ }
-+
-+ r8152_power_cut_en(tp, false);
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_PHY_PWR);
-+ ocp_data |= TX_10M_IDLE_EN | PFM_PWM_SWITCH;
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_PHY_PWR, ocp_data);
-+ ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL);
-+ ocp_data &= ~MCU_CLK_RATIO_MASK;
-+ ocp_data |= MCU_CLK_RATIO | D3_CLK_GATED_EN;
-+ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL, ocp_data);
-+ ocp_data = GPHY_STS_MSK | SPEED_DOWN_MSK |
-+ SPDWN_RXDV_MSK | SPDWN_LINKCHG_MSK;
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_GPHY_INTR_IMR, ocp_data);
-+
-+ r8152b_enable_eee(tp);
-+ r8152b_enable_aldps(tp);
-+ r8152b_enable_fc(tp);
-+ rtl_tally_reset(tp);
-+
-+ /* enable rx aggregation */
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL);
-+ ocp_data &= ~RX_AGG_DISABLE;
-+ ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data);
-+}
-+
-+static void r8153_init(struct r8152 *tp)
-+{
-+ u32 ocp_data;
-+ int i;
-+
-+ if (test_bit(RTL8152_UNPLUG, &tp->flags))
-+ return;
-+
-+ r8153_disable_aldps(tp);
-+ r8153_u1u2en(tp, false);
-+
-+ for (i = 0; i < 500; i++) {
-+ if (ocp_read_word(tp, MCU_TYPE_PLA, PLA_BOOT_CTRL) &
-+ AUTOLOAD_DONE)
-+ break;
-+ msleep(20);
-+ }
-+
-+ for (i = 0; i < 500; i++) {
-+ ocp_data = ocp_reg_read(tp, OCP_PHY_STATUS) & PHY_STAT_MASK;
-+ if (ocp_data == PHY_STAT_LAN_ON || ocp_data == PHY_STAT_PWRDN)
-+ break;
-+ msleep(20);
-+ }
-+
-+ r8153_u2p3en(tp, false);
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_WDT11_CTRL);
-+ ocp_data &= ~TIMER11_EN;
-+ ocp_write_word(tp, MCU_TYPE_USB, USB_WDT11_CTRL, ocp_data);
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_LED_FEATURE);
-+ ocp_data &= ~LED_MODE_MASK;
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_LED_FEATURE, ocp_data);
-+
-+ ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_LPM_CTRL);
-+ ocp_data &= ~LPM_TIMER_MASK;
-+ if (tp->udev->speed == USB_SPEED_SUPER)
-+ ocp_data |= LPM_TIMER_500US;
-+ else
-+ ocp_data |= LPM_TIMER_500MS;
-+ ocp_write_byte(tp, MCU_TYPE_USB, USB_LPM_CTRL, ocp_data);
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_AFE_CTRL2);
-+ ocp_data &= ~SEN_VAL_MASK;
-+ ocp_data |= SEN_VAL_NORMAL | SEL_RXIDLE;
-+ ocp_write_word(tp, MCU_TYPE_USB, USB_AFE_CTRL2, ocp_data);
-+
-+ r8153_power_cut_en(tp, false);
-+ r8153_u1u2en(tp, true);
-+
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL, ALDPS_SPDWN_RATIO);
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL2, EEE_SPDWN_RATIO);
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL3,
-+ PKT_AVAIL_SPDWN_EN | SUSPEND_SPDWN_EN |
-+ U1U2_SPDWN_EN | L1_SPDWN_EN);
-+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL4,
-+ PWRSAVE_SPDWN_EN | RXDV_SPDWN_EN | TX10MIDLE_EN |
-+ TP100_SPDWN_EN | TP500_SPDWN_EN | TP1000_SPDWN_EN |
-+ EEE_SPDWN_EN);
-+
-+ r8153_enable_eee(tp);
-+ r8153_enable_aldps(tp);
-+ r8152b_enable_fc(tp);
-+ rtl_tally_reset(tp);
-+}
-+
-+static int rtl8152_suspend(struct usb_interface *intf, pm_message_t message)
-+{
-+ struct r8152 *tp = usb_get_intfdata(intf);
-+ struct net_device *netdev = tp->netdev;
-+ int ret = 0;
-+
-+ mutex_lock(&tp->control);
-+
-+ if (PMSG_IS_AUTO(message)) {
-+ if (netif_running(netdev) && work_busy(&tp->schedule.work)) {
-+ ret = -EBUSY;
-+ goto out1;
-+ }
-+
-+ set_bit(SELECTIVE_SUSPEND, &tp->flags);
-+ } else {
-+ netif_device_detach(netdev);
-+ }
-+
-+ if (netif_running(netdev) && test_bit(WORK_ENABLE, &tp->flags)) {
-+ clear_bit(WORK_ENABLE, &tp->flags);
-+ usb_kill_urb(tp->intr_urb);
-+ tasklet_disable(&tp->tl);
-+ if (test_bit(SELECTIVE_SUSPEND, &tp->flags)) {
-+ rtl_stop_rx(tp);
-+ rtl_runtime_suspend_enable(tp, true);
-+ } else {
-+ cancel_delayed_work_sync(&tp->schedule);
-+ tp->rtl_ops.down(tp);
-+ }
-+ tasklet_enable(&tp->tl);
-+ }
-+out1:
-+ mutex_unlock(&tp->control);
-+
-+ return ret;
-+}
-+
-+static int rtl8152_resume(struct usb_interface *intf)
-+{
-+ struct r8152 *tp = usb_get_intfdata(intf);
-+
-+ mutex_lock(&tp->control);
-+
-+ if (!test_bit(SELECTIVE_SUSPEND, &tp->flags)) {
-+ tp->rtl_ops.init(tp);
-+ netif_device_attach(tp->netdev);
-+ }
-+
-+ if (netif_running(tp->netdev)) {
-+ if (test_bit(SELECTIVE_SUSPEND, &tp->flags)) {
-+ rtl_runtime_suspend_enable(tp, false);
-+ clear_bit(SELECTIVE_SUSPEND, &tp->flags);
-+ set_bit(WORK_ENABLE, &tp->flags);
-+ if (tp->speed & LINK_STATUS)
-+ rtl_start_rx(tp);
-+ } else {
-+ tp->rtl_ops.up(tp);
-+ rtl8152_set_speed(tp, AUTONEG_ENABLE,
-+ tp->mii.supports_gmii ?
-+ SPEED_1000 : SPEED_100,
-+ DUPLEX_FULL);
-+ tp->speed = 0;
-+ netif_carrier_off(tp->netdev);
-+ set_bit(WORK_ENABLE, &tp->flags);
-+ }
-+ usb_submit_urb(tp->intr_urb, GFP_KERNEL);
-+ } else if (test_bit(SELECTIVE_SUSPEND, &tp->flags)) {
-+ clear_bit(SELECTIVE_SUSPEND, &tp->flags);
-+ }
-+
-+ mutex_unlock(&tp->control);
-+
-+ return 0;
-+}
-+
-+static void rtl8152_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
-+{
-+ struct r8152 *tp = netdev_priv(dev);
-+
-+ if (usb_autopm_get_interface(tp->intf) < 0)
-+ return;
-+
-+ mutex_lock(&tp->control);
-+
-+ wol->supported = WAKE_ANY;
-+ wol->wolopts = __rtl_get_wol(tp);
-+
-+ mutex_unlock(&tp->control);
-+
-+ usb_autopm_put_interface(tp->intf);
-+}
-+
-+static int rtl8152_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
-+{
-+ struct r8152 *tp = netdev_priv(dev);
-+ int ret;
-+
-+ ret = usb_autopm_get_interface(tp->intf);
-+ if (ret < 0)
-+ goto out_set_wol;
-+
-+ mutex_lock(&tp->control);
-+
-+ __rtl_set_wol(tp, wol->wolopts);
-+ tp->saved_wolopts = wol->wolopts & WAKE_ANY;
-+
-+ mutex_unlock(&tp->control);
-+
-+ usb_autopm_put_interface(tp->intf);
-+
-+out_set_wol:
-+ return ret;
-+}
-+
-+static u32 rtl8152_get_msglevel(struct net_device *dev)
-+{
-+ struct r8152 *tp = netdev_priv(dev);
-+
-+ return tp->msg_enable;
-+}
-+
-+static void rtl8152_set_msglevel(struct net_device *dev, u32 value)
-+{
-+ struct r8152 *tp = netdev_priv(dev);
-+
-+ tp->msg_enable = value;
-+}
-+
-+static void rtl8152_get_drvinfo(struct net_device *netdev,
-+ struct ethtool_drvinfo *info)
-+{
-+ struct r8152 *tp = netdev_priv(netdev);
-+
-+ strlcpy(info->driver, MODULENAME, sizeof(info->driver));
-+ strlcpy(info->version, DRIVER_VERSION, sizeof(info->version));
-+ usb_make_path(tp->udev, info->bus_info, sizeof(info->bus_info));
-+}
-+
-+static
-+int rtl8152_get_settings(struct net_device *netdev, struct ethtool_cmd *cmd)
-+{
-+ struct r8152 *tp = netdev_priv(netdev);
-+ int ret;
-+
-+ if (!tp->mii.mdio_read)
-+ return -EOPNOTSUPP;
-+
-+ ret = usb_autopm_get_interface(tp->intf);
-+ if (ret < 0)
-+ goto out;
-+
-+ mutex_lock(&tp->control);
-+
-+ ret = mii_ethtool_gset(&tp->mii, cmd);
-+
-+ mutex_unlock(&tp->control);
-+
-+ usb_autopm_put_interface(tp->intf);
-+
-+out:
-+ return ret;
-+}
-+
-+static int rtl8152_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
-+{
-+ struct r8152 *tp = netdev_priv(dev);
-+ int ret;
-+
-+ ret = usb_autopm_get_interface(tp->intf);
-+ if (ret < 0)
-+ goto out;
-+
-+ mutex_lock(&tp->control);
-+
-+ ret = rtl8152_set_speed(tp, cmd->autoneg, cmd->speed, cmd->duplex);
-+
-+ mutex_unlock(&tp->control);
-+
-+ usb_autopm_put_interface(tp->intf);
-+
-+out:
-+ return ret;
-+}
-+
-+static const char rtl8152_gstrings[][ETH_GSTRING_LEN] = {
-+ "tx_packets",
-+ "rx_packets",
-+ "tx_errors",
-+ "rx_errors",
-+ "rx_missed",
-+ "align_errors",
-+ "tx_single_collisions",
-+ "tx_multi_collisions",
-+ "rx_unicast",
-+ "rx_broadcast",
-+ "rx_multicast",
-+ "tx_aborted",
-+ "tx_underrun",
-+};
-+
-+static int rtl8152_get_sset_count(struct net_device *dev, int sset)
-+{
-+ switch (sset) {
-+ case ETH_SS_STATS:
-+ return ARRAY_SIZE(rtl8152_gstrings);
-+ default:
-+ return -EOPNOTSUPP;
-+ }
-+}
-+
-+static void rtl8152_get_ethtool_stats(struct net_device *dev,
-+ struct ethtool_stats *stats, u64 *data)
-+{
-+ struct r8152 *tp = netdev_priv(dev);
-+ struct tally_counter tally;
-+
-+ if (usb_autopm_get_interface(tp->intf) < 0)
-+ return;
-+
-+ generic_ocp_read(tp, PLA_TALLYCNT, sizeof(tally), &tally, MCU_TYPE_PLA);
-+
-+ usb_autopm_put_interface(tp->intf);
-+
-+ data[0] = le64_to_cpu(tally.tx_packets);
-+ data[1] = le64_to_cpu(tally.rx_packets);
-+ data[2] = le64_to_cpu(tally.tx_errors);
-+ data[3] = le32_to_cpu(tally.rx_errors);
-+ data[4] = le16_to_cpu(tally.rx_missed);
-+ data[5] = le16_to_cpu(tally.align_errors);
-+ data[6] = le32_to_cpu(tally.tx_one_collision);
-+ data[7] = le32_to_cpu(tally.tx_multi_collision);
-+ data[8] = le64_to_cpu(tally.rx_unicast);
-+ data[9] = le64_to_cpu(tally.rx_broadcast);
-+ data[10] = le32_to_cpu(tally.rx_multicast);
-+ data[11] = le16_to_cpu(tally.tx_aborted);
-+ data[12] = le16_to_cpu(tally.tx_underun);
-+}
-+
-+static void rtl8152_get_strings(struct net_device *dev, u32 stringset, u8 *data)
-+{
-+ switch (stringset) {
-+ case ETH_SS_STATS:
-+ memcpy(data, *rtl8152_gstrings, sizeof(rtl8152_gstrings));
-+ break;
-+ }
-+}
-+
-+static int r8152_get_eee(struct r8152 *tp, struct ethtool_eee *eee)
-+{
-+ u32 ocp_data, lp, adv, supported = 0;
-+ u16 val;
-+
-+ val = r8152_mmd_read(tp, MDIO_MMD_PCS, MDIO_PCS_EEE_ABLE);
-+ supported = mmd_eee_cap_to_ethtool_sup_t(val);
-+
-+ val = r8152_mmd_read(tp, MDIO_MMD_AN, MDIO_AN_EEE_ADV);
-+ adv = mmd_eee_adv_to_ethtool_adv_t(val);
-+
-+ val = r8152_mmd_read(tp, MDIO_MMD_AN, MDIO_AN_EEE_LPABLE);
-+ lp = mmd_eee_adv_to_ethtool_adv_t(val);
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EEE_CR);
-+ ocp_data &= EEE_RX_EN | EEE_TX_EN;
-+
-+ eee->eee_enabled = !!ocp_data;
-+ eee->eee_active = !!(supported & adv & lp);
-+ eee->supported = supported;
-+ eee->advertised = adv;
-+ eee->lp_advertised = lp;
-+
-+ return 0;
-+}
-+
-+static int r8152_set_eee(struct r8152 *tp, struct ethtool_eee *eee)
-+{
-+ u16 val = ethtool_adv_to_mmd_eee_adv_t(eee->advertised);
-+
-+ r8152_eee_en(tp, eee->eee_enabled);
-+
-+ if (!eee->eee_enabled)
-+ val = 0;
-+
-+ r8152_mmd_write(tp, MDIO_MMD_AN, MDIO_AN_EEE_ADV, val);
-+
-+ return 0;
-+}
-+
-+static int r8153_get_eee(struct r8152 *tp, struct ethtool_eee *eee)
-+{
-+ u32 ocp_data, lp, adv, supported = 0;
-+ u16 val;
-+
-+ val = ocp_reg_read(tp, OCP_EEE_ABLE);
-+ supported = mmd_eee_cap_to_ethtool_sup_t(val);
-+
-+ val = ocp_reg_read(tp, OCP_EEE_ADV);
-+ adv = mmd_eee_adv_to_ethtool_adv_t(val);
-+
-+ val = ocp_reg_read(tp, OCP_EEE_LPABLE);
-+ lp = mmd_eee_adv_to_ethtool_adv_t(val);
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EEE_CR);
-+ ocp_data &= EEE_RX_EN | EEE_TX_EN;
-+
-+ eee->eee_enabled = !!ocp_data;
-+ eee->eee_active = !!(supported & adv & lp);
-+ eee->supported = supported;
-+ eee->advertised = adv;
-+ eee->lp_advertised = lp;
-+
-+ return 0;
-+}
-+
-+static int r8153_set_eee(struct r8152 *tp, struct ethtool_eee *eee)
-+{
-+ u16 val = ethtool_adv_to_mmd_eee_adv_t(eee->advertised);
-+
-+ r8153_eee_en(tp, eee->eee_enabled);
-+
-+ if (!eee->eee_enabled)
-+ val = 0;
-+
-+ ocp_reg_write(tp, OCP_EEE_ADV, val);
-+
-+ return 0;
-+}
-+
-+static int
-+rtl_ethtool_get_eee(struct net_device *net, struct ethtool_eee *edata)
-+{
-+ struct r8152 *tp = netdev_priv(net);
-+ int ret;
-+
-+ ret = usb_autopm_get_interface(tp->intf);
-+ if (ret < 0)
-+ goto out;
-+
-+ mutex_lock(&tp->control);
-+
-+ ret = tp->rtl_ops.eee_get(tp, edata);
-+
-+ mutex_unlock(&tp->control);
-+
-+ usb_autopm_put_interface(tp->intf);
-+
-+out:
-+ return ret;
-+}
-+
-+static int
-+rtl_ethtool_set_eee(struct net_device *net, struct ethtool_eee *edata)
-+{
-+ struct r8152 *tp = netdev_priv(net);
-+ int ret;
-+
-+ ret = usb_autopm_get_interface(tp->intf);
-+ if (ret < 0)
-+ goto out;
-+
-+ mutex_lock(&tp->control);
-+
-+ ret = tp->rtl_ops.eee_set(tp, edata);
-+ if (!ret)
-+ ret = mii_nway_restart(&tp->mii);
-+
-+ mutex_unlock(&tp->control);
-+
-+ usb_autopm_put_interface(tp->intf);
-+
-+out:
-+ return ret;
-+}
-+
-+static struct ethtool_ops ops = {
-+ .get_drvinfo = rtl8152_get_drvinfo,
-+ .get_settings = rtl8152_get_settings,
-+ .set_settings = rtl8152_set_settings,
-+ .get_link = ethtool_op_get_link,
-+ .get_msglevel = rtl8152_get_msglevel,
-+ .set_msglevel = rtl8152_set_msglevel,
-+ .get_wol = rtl8152_get_wol,
-+ .set_wol = rtl8152_set_wol,
-+ .get_strings = rtl8152_get_strings,
-+ .get_sset_count = rtl8152_get_sset_count,
-+ .get_ethtool_stats = rtl8152_get_ethtool_stats,
-+ .get_eee = rtl_ethtool_get_eee,
-+ .set_eee = rtl_ethtool_set_eee,
-+};
-+
-+static int rtl8152_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
-+{
-+ struct r8152 *tp = netdev_priv(netdev);
-+ struct mii_ioctl_data *data = if_mii(rq);
-+ int res;
-+
-+ if (test_bit(RTL8152_UNPLUG, &tp->flags))
-+ return -ENODEV;
-+
-+ res = usb_autopm_get_interface(tp->intf);
-+ if (res < 0)
-+ goto out;
-+
-+ switch (cmd) {
-+ case SIOCGMIIPHY:
-+ data->phy_id = R8152_PHY_ID; /* Internal PHY */
-+ break;
-+
-+ case SIOCGMIIREG:
-+ mutex_lock(&tp->control);
-+ data->val_out = r8152_mdio_read(tp, data->reg_num);
-+ mutex_unlock(&tp->control);
-+ break;
-+
-+ case SIOCSMIIREG:
-+ if (!capable(CAP_NET_ADMIN)) {
-+ res = -EPERM;
-+ break;
-+ }
-+ mutex_lock(&tp->control);
-+ r8152_mdio_write(tp, data->reg_num, data->val_in);
-+ mutex_unlock(&tp->control);
-+ break;
-+
-+ default:
-+ res = -EOPNOTSUPP;
-+ }
-+
-+ usb_autopm_put_interface(tp->intf);
-+
-+out:
-+ return res;
-+}
-+
-+static int rtl8152_change_mtu(struct net_device *dev, int new_mtu)
-+{
-+ struct r8152 *tp = netdev_priv(dev);
-+
-+ switch (tp->version) {
-+ case RTL_VER_01:
-+ case RTL_VER_02:
-+ return eth_change_mtu(dev, new_mtu);
-+ default:
-+ break;
-+ }
-+
-+ if (new_mtu < 68 || new_mtu > RTL8153_MAX_MTU)
-+ return -EINVAL;
-+
-+ dev->mtu = new_mtu;
-+
-+ return 0;
-+}
-+
-+static const struct net_device_ops rtl8152_netdev_ops = {
-+ .ndo_open = rtl8152_open,
-+ .ndo_stop = rtl8152_close,
-+ .ndo_do_ioctl = rtl8152_ioctl,
-+ .ndo_start_xmit = rtl8152_start_xmit,
-+ .ndo_tx_timeout = rtl8152_tx_timeout,
-+ .ndo_set_features = rtl8152_set_features,
-+ .ndo_set_rx_mode = rtl8152_set_rx_mode,
-+ .ndo_set_mac_address = rtl8152_set_mac_address,
-+ .ndo_change_mtu = rtl8152_change_mtu,
-+ .ndo_validate_addr = eth_validate_addr,
-+};
-+
-+static void r8152b_get_version(struct r8152 *tp)
-+{
-+ u32 ocp_data;
-+ u16 version;
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_TCR1);
-+ version = (u16)(ocp_data & VERSION_MASK);
-+
-+ switch (version) {
-+ case 0x4c00:
-+ tp->version = RTL_VER_01;
-+ break;
-+ case 0x4c10:
-+ tp->version = RTL_VER_02;
-+ break;
-+ case 0x5c00:
-+ tp->version = RTL_VER_03;
-+ tp->mii.supports_gmii = 1;
-+ break;
-+ case 0x5c10:
-+ tp->version = RTL_VER_04;
-+ tp->mii.supports_gmii = 1;
-+ break;
-+ case 0x5c20:
-+ tp->version = RTL_VER_05;
-+ tp->mii.supports_gmii = 1;
-+ break;
-+ default:
-+ netif_info(tp, probe, tp->netdev,
-+ "Unknown version 0x%04x\n", version);
-+ break;
-+ }
-+}
-+
-+static void rtl8152_unload(struct r8152 *tp)
-+{
-+ if (test_bit(RTL8152_UNPLUG, &tp->flags))
-+ return;
-+
-+ if (tp->version != RTL_VER_01)
-+ r8152_power_cut_en(tp, true);
-+}
-+
-+static void rtl8153_unload(struct r8152 *tp)
-+{
-+ if (test_bit(RTL8152_UNPLUG, &tp->flags))
-+ return;
-+
-+ r8153_power_cut_en(tp, false);
-+}
-+
-+static int rtl_ops_init(struct r8152 *tp, const struct usb_device_id *id)
-+{
-+ struct rtl_ops *ops = &tp->rtl_ops;
-+ int ret = -ENODEV;
-+
-+ switch (id->idVendor) {
-+ case VENDOR_ID_REALTEK:
-+ switch (id->idProduct) {
-+ case PRODUCT_ID_RTL8152:
-+ ops->init = r8152b_init;
-+ ops->enable = rtl8152_enable;
-+ ops->disable = rtl8152_disable;
-+ ops->up = rtl8152_up;
-+ ops->down = rtl8152_down;
-+ ops->unload = rtl8152_unload;
-+ ops->eee_get = r8152_get_eee;
-+ ops->eee_set = r8152_set_eee;
-+ ret = 0;
-+ break;
-+ case PRODUCT_ID_RTL8153:
-+ ops->init = r8153_init;
-+ ops->enable = rtl8153_enable;
-+ ops->disable = rtl8153_disable;
-+ ops->up = rtl8153_up;
-+ ops->down = rtl8153_down;
-+ ops->unload = rtl8153_unload;
-+ ops->eee_get = r8153_get_eee;
-+ ops->eee_set = r8153_set_eee;
-+ ret = 0;
-+ break;
-+ default:
-+ break;
-+ }
-+ break;
-+
-+ case VENDOR_ID_SAMSUNG:
-+ switch (id->idProduct) {
-+ case PRODUCT_ID_SAMSUNG:
-+ ops->init = r8153_init;
-+ ops->enable = rtl8153_enable;
-+ ops->disable = rtl8153_disable;
-+ ops->up = rtl8153_up;
-+ ops->down = rtl8153_down;
-+ ops->unload = rtl8153_unload;
-+ ops->eee_get = r8153_get_eee;
-+ ops->eee_set = r8153_set_eee;
-+ ret = 0;
-+ break;
-+ default:
-+ break;
-+ }
-+ break;
-+
-+ default:
-+ break;
-+ }
-+
-+ if (ret)
-+ netif_err(tp, probe, tp->netdev, "Unknown Device\n");
-+
-+ return ret;
-+}
-+
-+static int rtl8152_probe(struct usb_interface *intf,
-+ const struct usb_device_id *id)
-+{
-+ struct usb_device *udev = interface_to_usbdev(intf);
-+ struct r8152 *tp;
-+ struct net_device *netdev;
-+ int ret;
-+
-+ if (udev->actconfig->desc.bConfigurationValue != 1) {
-+ usb_driver_set_configuration(udev, 1);
-+ return -ENODEV;
-+ }
-+
-+ usb_reset_device(udev);
-+ netdev = alloc_etherdev(sizeof(struct r8152));
-+ if (!netdev) {
-+ dev_err(&intf->dev, "Out of memory\n");
-+ return -ENOMEM;
-+ }
-+
-+ SET_NETDEV_DEV(netdev, &intf->dev);
-+ tp = netdev_priv(netdev);
-+ tp->msg_enable = 0x7FFF;
-+
-+ tp->udev = udev;
-+ tp->netdev = netdev;
-+ tp->intf = intf;
-+
-+ ret = rtl_ops_init(tp, id);
-+ if (ret)
-+ goto out;
-+
-+ tasklet_init(&tp->tl, bottom_half, (unsigned long)tp);
-+ mutex_init(&tp->control);
-+ INIT_DELAYED_WORK(&tp->schedule, rtl_work_func_t);
-+
-+ netdev->netdev_ops = &rtl8152_netdev_ops;
-+ netdev->watchdog_timeo = RTL8152_TX_TIMEOUT;
-+
-+ netdev->features |= NETIF_F_RXCSUM | NETIF_F_IP_CSUM | NETIF_F_SG |
-+ NETIF_F_TSO | NETIF_F_FRAGLIST | NETIF_F_IPV6_CSUM |
-+ NETIF_F_TSO6 | NETIF_F_HW_VLAN_CTAG_RX |
-+ NETIF_F_HW_VLAN_CTAG_TX;
-+ netdev->hw_features = NETIF_F_RXCSUM | NETIF_F_IP_CSUM | NETIF_F_SG |
-+ NETIF_F_TSO | NETIF_F_FRAGLIST |
-+ NETIF_F_IPV6_CSUM | NETIF_F_TSO6 |
-+ NETIF_F_HW_VLAN_CTAG_RX |
-+ NETIF_F_HW_VLAN_CTAG_TX;
-+ netdev->vlan_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO |
-+ NETIF_F_HIGHDMA | NETIF_F_FRAGLIST |
-+ NETIF_F_IPV6_CSUM | NETIF_F_TSO6;
-+
-+ netdev->ethtool_ops = &ops;
-+ netif_set_gso_max_size(netdev, RTL_LIMITED_TSO_SIZE);
-+
-+ tp->mii.dev = netdev;
-+ tp->mii.mdio_read = read_mii_word;
-+ tp->mii.mdio_write = write_mii_word;
-+ tp->mii.phy_id_mask = 0x3f;
-+ tp->mii.reg_num_mask = 0x1f;
-+ tp->mii.phy_id = R8152_PHY_ID;
-+ tp->mii.supports_gmii = 0;
-+
-+ intf->needs_remote_wakeup = 1;
-+
-+ r8152b_get_version(tp);
-+ tp->rtl_ops.init(tp);
-+ set_ethernet_addr(tp);
-+
-+ usb_set_intfdata(intf, tp);
-+
-+ ret = register_netdev(netdev);
-+ if (ret != 0) {
-+ netif_err(tp, probe, netdev, "couldn't register the device\n");
-+ goto out1;
-+ }
-+
-+ tp->saved_wolopts = __rtl_get_wol(tp);
-+ if (tp->saved_wolopts)
-+ device_set_wakeup_enable(&udev->dev, true);
-+ else
-+ device_set_wakeup_enable(&udev->dev, false);
-+
-+ netif_info(tp, probe, netdev, "%s\n", DRIVER_VERSION);
-+
-+ return 0;
-+
-+out1:
-+ usb_set_intfdata(intf, NULL);
-+out:
-+ free_netdev(netdev);
-+ return ret;
-+}
-+
-+static void rtl8152_disconnect(struct usb_interface *intf)
-+{
-+ struct r8152 *tp = usb_get_intfdata(intf);
-+
-+ usb_set_intfdata(intf, NULL);
-+ if (tp) {
-+ struct usb_device *udev = tp->udev;
-+
-+ if (udev->state == USB_STATE_NOTATTACHED)
-+ set_bit(RTL8152_UNPLUG, &tp->flags);
-+
-+ tasklet_kill(&tp->tl);
-+ unregister_netdev(tp->netdev);
-+ tp->rtl_ops.unload(tp);
-+ free_netdev(tp->netdev);
-+ }
-+}
-+
-+/* table of devices that work with this driver */
-+static struct usb_device_id rtl8152_table[] = {
-+ {USB_DEVICE(VENDOR_ID_REALTEK, PRODUCT_ID_RTL8152)},
-+ {USB_DEVICE(VENDOR_ID_REALTEK, PRODUCT_ID_RTL8153)},
-+ {USB_DEVICE(VENDOR_ID_SAMSUNG, PRODUCT_ID_SAMSUNG)},
-+ {}
-+};
-+
-+MODULE_DEVICE_TABLE(usb, rtl8152_table);
-+
-+static struct usb_driver rtl8152_driver = {
-+ .name = MODULENAME,
-+ .id_table = rtl8152_table,
-+ .probe = rtl8152_probe,
-+ .disconnect = rtl8152_disconnect,
-+ .suspend = rtl8152_suspend,
-+ .resume = rtl8152_resume,
-+ .reset_resume = rtl8152_resume,
-+ .supports_autosuspend = 1,
-+ .disable_hub_initiated_lpm = 1,
-+};
-+
-+module_usb_driver(rtl8152_driver);
-+
-+MODULE_AUTHOR(DRIVER_AUTHOR);
-+MODULE_DESCRIPTION(DRIVER_DESC);
-+MODULE_LICENSE("GPL");
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/rtl8150.c backports-3.18.1-1/drivers/net/usb/rtl8150.c
---- backports-3.18.1-1.org/drivers/net/usb/rtl8150.c 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/rtl8150.c 2014-12-16 18:39:45.000000000 +0100
-@@ -0,0 +1,950 @@
-+/*
-+ * Copyright (c) 2002 Petko Manolov (petkan(a)users.sourceforge.net)
-+ *
-+ * 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 published by the Free Software Foundation.
-+ */
-+
-+#include <linux/signal.h>
-+#include <linux/slab.h>
-+#include <linux/module.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/mii.h>
-+#include <linux/ethtool.h>
-+#include <linux/usb.h>
-+#include <asm/uaccess.h>
-+
-+/* Version Information */
-+#define DRIVER_VERSION "v0.6.2 (2004/08/27)"
-+#define DRIVER_AUTHOR "Petko Manolov <petkan(a)users.sourceforge.net>"
-+#define DRIVER_DESC "rtl8150 based usb-ethernet driver"
-+
-+#define IDR 0x0120
-+#define MAR 0x0126
-+#define CR 0x012e
-+#define TCR 0x012f
-+#define RCR 0x0130
-+#define TSR 0x0132
-+#define RSR 0x0133
-+#define CON0 0x0135
-+#define CON1 0x0136
-+#define MSR 0x0137
-+#define PHYADD 0x0138
-+#define PHYDAT 0x0139
-+#define PHYCNT 0x013b
-+#define GPPC 0x013d
-+#define BMCR 0x0140
-+#define BMSR 0x0142
-+#define ANAR 0x0144
-+#define ANLP 0x0146
-+#define AER 0x0148
-+#define CSCR 0x014C /* This one has the link status */
-+#define CSCR_LINK_STATUS (1 << 3)
-+
-+#define IDR_EEPROM 0x1202
-+
-+#define PHY_READ 0
-+#define PHY_WRITE 0x20
-+#define PHY_GO 0x40
-+
-+#define MII_TIMEOUT 10
-+#define INTBUFSIZE 8
-+
-+#define RTL8150_REQT_READ 0xc0
-+#define RTL8150_REQT_WRITE 0x40
-+#define RTL8150_REQ_GET_REGS 0x05
-+#define RTL8150_REQ_SET_REGS 0x05
-+
-+
-+/* Transmit status register errors */
-+#define TSR_ECOL (1<<5)
-+#define TSR_LCOL (1<<4)
-+#define TSR_LOSS_CRS (1<<3)
-+#define TSR_JBR (1<<2)
-+#define TSR_ERRORS (TSR_ECOL | TSR_LCOL | TSR_LOSS_CRS | TSR_JBR)
-+/* Receive status register errors */
-+#define RSR_CRC (1<<2)
-+#define RSR_FAE (1<<1)
-+#define RSR_ERRORS (RSR_CRC | RSR_FAE)
-+
-+/* Media status register definitions */
-+#define MSR_DUPLEX (1<<4)
-+#define MSR_SPEED (1<<3)
-+#define MSR_LINK (1<<2)
-+
-+/* Interrupt pipe data */
-+#define INT_TSR 0x00
-+#define INT_RSR 0x01
-+#define INT_MSR 0x02
-+#define INT_WAKSR 0x03
-+#define INT_TXOK_CNT 0x04
-+#define INT_RXLOST_CNT 0x05
-+#define INT_CRERR_CNT 0x06
-+#define INT_COL_CNT 0x07
-+
-+
-+#define RTL8150_MTU 1540
-+#define RTL8150_TX_TIMEOUT (HZ)
-+#define RX_SKB_POOL_SIZE 4
-+
-+/* rtl8150 flags */
-+#define RTL8150_HW_CRC 0
-+#define RX_REG_SET 1
-+#define RTL8150_UNPLUG 2
-+#define RX_URB_FAIL 3
-+
-+/* Define these values to match your device */
-+#define VENDOR_ID_REALTEK 0x0bda
-+#define VENDOR_ID_MELCO 0x0411
-+#define VENDOR_ID_MICRONET 0x3980
-+#define VENDOR_ID_LONGSHINE 0x07b8
-+#define VENDOR_ID_OQO 0x1557
-+#define VENDOR_ID_ZYXEL 0x0586
-+
-+#define PRODUCT_ID_RTL8150 0x8150
-+#define PRODUCT_ID_LUAKTX 0x0012
-+#define PRODUCT_ID_LCS8138TX 0x401a
-+#define PRODUCT_ID_SP128AR 0x0003
-+#define PRODUCT_ID_PRESTIGE 0x401a
-+
-+#undef EEPROM_WRITE
-+
-+/* table of devices that work with this driver */
-+static struct usb_device_id rtl8150_table[] = {
-+ {USB_DEVICE(VENDOR_ID_REALTEK, PRODUCT_ID_RTL8150)},
-+ {USB_DEVICE(VENDOR_ID_MELCO, PRODUCT_ID_LUAKTX)},
-+ {USB_DEVICE(VENDOR_ID_MICRONET, PRODUCT_ID_SP128AR)},
-+ {USB_DEVICE(VENDOR_ID_LONGSHINE, PRODUCT_ID_LCS8138TX)},
-+ {USB_DEVICE(VENDOR_ID_OQO, PRODUCT_ID_RTL8150)},
-+ {USB_DEVICE(VENDOR_ID_ZYXEL, PRODUCT_ID_PRESTIGE)},
-+ {}
-+};
-+
-+MODULE_DEVICE_TABLE(usb, rtl8150_table);
-+
-+struct rtl8150 {
-+ unsigned long flags;
-+ struct usb_device *udev;
-+ struct tasklet_struct tl;
-+ struct net_device *netdev;
-+ struct urb *rx_urb, *tx_urb, *intr_urb;
-+ struct sk_buff *tx_skb, *rx_skb;
-+ struct sk_buff *rx_skb_pool[RX_SKB_POOL_SIZE];
-+ spinlock_t rx_pool_lock;
-+ struct usb_ctrlrequest dr;
-+ int intr_interval;
-+ u8 *intr_buff;
-+ u8 phy;
-+};
-+
-+typedef struct rtl8150 rtl8150_t;
-+
-+struct async_req {
-+ struct usb_ctrlrequest dr;
-+ u16 rx_creg;
-+};
-+
-+static const char driver_name [] = "rtl8150";
-+
-+/*
-+**
-+** device related part of the code
-+**
-+*/
-+static int get_registers(rtl8150_t * dev, u16 indx, u16 size, void *data)
-+{
-+ return usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev, 0),
-+ RTL8150_REQ_GET_REGS, RTL8150_REQT_READ,
-+ indx, 0, data, size, 500);
-+}
-+
-+static int set_registers(rtl8150_t * dev, u16 indx, u16 size, void *data)
-+{
-+ return usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, 0),
-+ RTL8150_REQ_SET_REGS, RTL8150_REQT_WRITE,
-+ indx, 0, data, size, 500);
-+}
-+
-+static void async_set_reg_cb(struct urb *urb)
-+{
-+ struct async_req *req = (struct async_req *)urb->context;
-+ int status = urb->status;
-+
-+ if (status < 0)
-+ dev_dbg(&urb->dev->dev, "%s failed with %d", __func__, status);
-+ kfree(req);
-+ usb_free_urb(urb);
-+}
-+
-+static int async_set_registers(rtl8150_t *dev, u16 indx, u16 size, u16 reg)
-+{
-+ int res = -ENOMEM;
-+ struct urb *async_urb;
-+ struct async_req *req;
-+
-+ req = kmalloc(sizeof(struct async_req), GFP_ATOMIC);
-+ if (req == NULL)
-+ return res;
-+ async_urb = usb_alloc_urb(0, GFP_ATOMIC);
-+ if (async_urb == NULL) {
-+ kfree(req);
-+ return res;
-+ }
-+ req->rx_creg = cpu_to_le16(reg);
-+ req->dr.bRequestType = RTL8150_REQT_WRITE;
-+ req->dr.bRequest = RTL8150_REQ_SET_REGS;
-+ req->dr.wIndex = 0;
-+ req->dr.wValue = cpu_to_le16(indx);
-+ req->dr.wLength = cpu_to_le16(size);
-+ usb_fill_control_urb(async_urb, dev->udev,
-+ usb_sndctrlpipe(dev->udev, 0), (void *)&req->dr,
-+ &req->rx_creg, size, async_set_reg_cb, req);
-+ res = usb_submit_urb(async_urb, GFP_ATOMIC);
-+ if (res) {
-+ if (res == -ENODEV)
-+ netif_device_detach(dev->netdev);
-+ dev_err(&dev->udev->dev, "%s failed with %d\n", __func__, res);
-+ }
-+ return res;
-+}
-+
-+static int read_mii_word(rtl8150_t * dev, u8 phy, __u8 indx, u16 * reg)
-+{
-+ int i;
-+ u8 data[3], tmp;
-+
-+ data[0] = phy;
-+ data[1] = data[2] = 0;
-+ tmp = indx | PHY_READ | PHY_GO;
-+ i = 0;
-+
-+ set_registers(dev, PHYADD, sizeof(data), data);
-+ set_registers(dev, PHYCNT, 1, &tmp);
-+ do {
-+ get_registers(dev, PHYCNT, 1, data);
-+ } while ((data[0] & PHY_GO) && (i++ < MII_TIMEOUT));
-+
-+ if (i <= MII_TIMEOUT) {
-+ get_registers(dev, PHYDAT, 2, data);
-+ *reg = data[0] | (data[1] << 8);
-+ return 0;
-+ } else
-+ return 1;
-+}
-+
-+static int write_mii_word(rtl8150_t * dev, u8 phy, __u8 indx, u16 reg)
-+{
-+ int i;
-+ u8 data[3], tmp;
-+
-+ data[0] = phy;
-+ data[1] = reg & 0xff;
-+ data[2] = (reg >> 8) & 0xff;
-+ tmp = indx | PHY_WRITE | PHY_GO;
-+ i = 0;
-+
-+ set_registers(dev, PHYADD, sizeof(data), data);
-+ set_registers(dev, PHYCNT, 1, &tmp);
-+ do {
-+ get_registers(dev, PHYCNT, 1, data);
-+ } while ((data[0] & PHY_GO) && (i++ < MII_TIMEOUT));
-+
-+ if (i <= MII_TIMEOUT)
-+ return 0;
-+ else
-+ return 1;
-+}
-+
-+static inline void set_ethernet_addr(rtl8150_t * dev)
-+{
-+ u8 node_id[6];
-+
-+ get_registers(dev, IDR, sizeof(node_id), node_id);
-+ memcpy(dev->netdev->dev_addr, node_id, sizeof(node_id));
-+}
-+
-+static int rtl8150_set_mac_address(struct net_device *netdev, void *p)
-+{
-+ struct sockaddr *addr = p;
-+ rtl8150_t *dev = netdev_priv(netdev);
-+
-+ if (netif_running(netdev))
-+ return -EBUSY;
-+
-+ memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
-+ netdev_dbg(netdev, "Setting MAC address to %pM\n", netdev->dev_addr);
-+ /* Set the IDR registers. */
-+ set_registers(dev, IDR, netdev->addr_len, netdev->dev_addr);
-+#ifdef EEPROM_WRITE
-+ {
-+ int i;
-+ u8 cr;
-+ /* Get the CR contents. */
-+ get_registers(dev, CR, 1, &cr);
-+ /* Set the WEPROM bit (eeprom write enable). */
-+ cr |= 0x20;
-+ set_registers(dev, CR, 1, &cr);
-+ /* Write the MAC address into eeprom. Eeprom writes must be word-sized,
-+ so we need to split them up. */
-+ for (i = 0; i * 2 < netdev->addr_len; i++) {
-+ set_registers(dev, IDR_EEPROM + (i * 2), 2,
-+ netdev->dev_addr + (i * 2));
-+ }
-+ /* Clear the WEPROM bit (preventing accidental eeprom writes). */
-+ cr &= 0xdf;
-+ set_registers(dev, CR, 1, &cr);
-+ }
-+#endif
-+ return 0;
-+}
-+
-+static int rtl8150_reset(rtl8150_t * dev)
-+{
-+ u8 data = 0x10;
-+ int i = HZ;
-+
-+ set_registers(dev, CR, 1, &data);
-+ do {
-+ get_registers(dev, CR, 1, &data);
-+ } while ((data & 0x10) && --i);
-+
-+ return (i > 0) ? 1 : 0;
-+}
-+
-+static int alloc_all_urbs(rtl8150_t * dev)
-+{
-+ dev->rx_urb = usb_alloc_urb(0, GFP_KERNEL);
-+ if (!dev->rx_urb)
-+ return 0;
-+ dev->tx_urb = usb_alloc_urb(0, GFP_KERNEL);
-+ if (!dev->tx_urb) {
-+ usb_free_urb(dev->rx_urb);
-+ return 0;
-+ }
-+ dev->intr_urb = usb_alloc_urb(0, GFP_KERNEL);
-+ if (!dev->intr_urb) {
-+ usb_free_urb(dev->rx_urb);
-+ usb_free_urb(dev->tx_urb);
-+ return 0;
-+ }
-+
-+ return 1;
-+}
-+
-+static void free_all_urbs(rtl8150_t * dev)
-+{
-+ usb_free_urb(dev->rx_urb);
-+ usb_free_urb(dev->tx_urb);
-+ usb_free_urb(dev->intr_urb);
-+}
-+
-+static void unlink_all_urbs(rtl8150_t * dev)
-+{
-+ usb_kill_urb(dev->rx_urb);
-+ usb_kill_urb(dev->tx_urb);
-+ usb_kill_urb(dev->intr_urb);
-+}
-+
-+static inline struct sk_buff *pull_skb(rtl8150_t *dev)
-+{
-+ struct sk_buff *skb;
-+ int i;
-+
-+ for (i = 0; i < RX_SKB_POOL_SIZE; i++) {
-+ if (dev->rx_skb_pool[i]) {
-+ skb = dev->rx_skb_pool[i];
-+ dev->rx_skb_pool[i] = NULL;
-+ return skb;
-+ }
-+ }
-+ return NULL;
-+}
-+
-+static void read_bulk_callback(struct urb *urb)
-+{
-+ rtl8150_t *dev;
-+ unsigned pkt_len, res;
-+ struct sk_buff *skb;
-+ struct net_device *netdev;
-+ u16 rx_stat;
-+ int status = urb->status;
-+ int result;
-+
-+ dev = urb->context;
-+ if (!dev)
-+ return;
-+ if (test_bit(RTL8150_UNPLUG, &dev->flags))
-+ return;
-+ netdev = dev->netdev;
-+ if (!netif_device_present(netdev))
-+ return;
-+
-+ switch (status) {
-+ case 0:
-+ break;
-+ case -ENOENT:
-+ return; /* the urb is in unlink state */
-+ case -ETIME:
-+ if (printk_ratelimit())
-+ dev_warn(&urb->dev->dev, "may be reset is needed?..\n");
-+ goto goon;
-+ default:
-+ if (printk_ratelimit())
-+ dev_warn(&urb->dev->dev, "Rx status %d\n", status);
-+ goto goon;
-+ }
-+
-+ if (!dev->rx_skb)
-+ goto resched;
-+ /* protect against short packets (tell me why we got some?!?) */
-+ if (urb->actual_length < 4)
-+ goto goon;
-+
-+ res = urb->actual_length;
-+ rx_stat = le16_to_cpu(*(__le16 *)(urb->transfer_buffer + res - 4));
-+ pkt_len = res - 4;
-+
-+ skb_put(dev->rx_skb, pkt_len);
-+ dev->rx_skb->protocol = eth_type_trans(dev->rx_skb, netdev);
-+ netif_rx(dev->rx_skb);
-+ netdev->stats.rx_packets++;
-+ netdev->stats.rx_bytes += pkt_len;
-+
-+ spin_lock(&dev->rx_pool_lock);
-+ skb = pull_skb(dev);
-+ spin_unlock(&dev->rx_pool_lock);
-+ if (!skb)
-+ goto resched;
-+
-+ dev->rx_skb = skb;
-+goon:
-+ usb_fill_bulk_urb(dev->rx_urb, dev->udev, usb_rcvbulkpipe(dev->udev, 1),
-+ dev->rx_skb->data, RTL8150_MTU, read_bulk_callback, dev);
-+ result = usb_submit_urb(dev->rx_urb, GFP_ATOMIC);
-+ if (result == -ENODEV)
-+ netif_device_detach(dev->netdev);
-+ else if (result) {
-+ set_bit(RX_URB_FAIL, &dev->flags);
-+ goto resched;
-+ } else {
-+ clear_bit(RX_URB_FAIL, &dev->flags);
-+ }
-+
-+ return;
-+resched:
-+ tasklet_schedule(&dev->tl);
-+}
-+
-+static void write_bulk_callback(struct urb *urb)
-+{
-+ rtl8150_t *dev;
-+ int status = urb->status;
-+
-+ dev = urb->context;
-+ if (!dev)
-+ return;
-+ dev_kfree_skb_irq(dev->tx_skb);
-+ if (!netif_device_present(dev->netdev))
-+ return;
-+ if (status)
-+ dev_info(&urb->dev->dev, "%s: Tx status %d\n",
-+ dev->netdev->name, status);
-+ dev->netdev->trans_start = jiffies;
-+ netif_wake_queue(dev->netdev);
-+}
-+
-+static void intr_callback(struct urb *urb)
-+{
-+ rtl8150_t *dev;
-+ __u8 *d;
-+ int status = urb->status;
-+ int res;
-+
-+ dev = urb->context;
-+ if (!dev)
-+ return;
-+ switch (status) {
-+ case 0: /* success */
-+ break;
-+ case -ECONNRESET: /* unlink */
-+ case -ENOENT:
-+ case -ESHUTDOWN:
-+ return;
-+ /* -EPIPE: should clear the halt */
-+ default:
-+ dev_info(&urb->dev->dev, "%s: intr status %d\n",
-+ dev->netdev->name, status);
-+ goto resubmit;
-+ }
-+
-+ d = urb->transfer_buffer;
-+ if (d[0] & TSR_ERRORS) {
-+ dev->netdev->stats.tx_errors++;
-+ if (d[INT_TSR] & (TSR_ECOL | TSR_JBR))
-+ dev->netdev->stats.tx_aborted_errors++;
-+ if (d[INT_TSR] & TSR_LCOL)
-+ dev->netdev->stats.tx_window_errors++;
-+ if (d[INT_TSR] & TSR_LOSS_CRS)
-+ dev->netdev->stats.tx_carrier_errors++;
-+ }
-+ /* Report link status changes to the network stack */
-+ if ((d[INT_MSR] & MSR_LINK) == 0) {
-+ if (netif_carrier_ok(dev->netdev)) {
-+ netif_carrier_off(dev->netdev);
-+ netdev_dbg(dev->netdev, "%s: LINK LOST\n", __func__);
-+ }
-+ } else {
-+ if (!netif_carrier_ok(dev->netdev)) {
-+ netif_carrier_on(dev->netdev);
-+ netdev_dbg(dev->netdev, "%s: LINK CAME BACK\n", __func__);
-+ }
-+ }
-+
-+resubmit:
-+ res = usb_submit_urb (urb, GFP_ATOMIC);
-+ if (res == -ENODEV)
-+ netif_device_detach(dev->netdev);
-+ else if (res)
-+ dev_err(&dev->udev->dev,
-+ "can't resubmit intr, %s-%s/input0, status %d\n",
-+ dev->udev->bus->bus_name, dev->udev->devpath, res);
-+}
-+
-+static int rtl8150_suspend(struct usb_interface *intf, pm_message_t message)
-+{
-+ rtl8150_t *dev = usb_get_intfdata(intf);
-+
-+ netif_device_detach(dev->netdev);
-+
-+ if (netif_running(dev->netdev)) {
-+ usb_kill_urb(dev->rx_urb);
-+ usb_kill_urb(dev->intr_urb);
-+ }
-+ return 0;
-+}
-+
-+static int rtl8150_resume(struct usb_interface *intf)
-+{
-+ rtl8150_t *dev = usb_get_intfdata(intf);
-+
-+ netif_device_attach(dev->netdev);
-+ if (netif_running(dev->netdev)) {
-+ dev->rx_urb->status = 0;
-+ dev->rx_urb->actual_length = 0;
-+ read_bulk_callback(dev->rx_urb);
-+
-+ dev->intr_urb->status = 0;
-+ dev->intr_urb->actual_length = 0;
-+ intr_callback(dev->intr_urb);
-+ }
-+ return 0;
-+}
-+
-+/*
-+**
-+** network related part of the code
-+**
-+*/
-+
-+static void fill_skb_pool(rtl8150_t *dev)
-+{
-+ struct sk_buff *skb;
-+ int i;
-+
-+ for (i = 0; i < RX_SKB_POOL_SIZE; i++) {
-+ if (dev->rx_skb_pool[i])
-+ continue;
-+ skb = dev_alloc_skb(RTL8150_MTU + 2);
-+ if (!skb) {
-+ return;
-+ }
-+ skb_reserve(skb, 2);
-+ dev->rx_skb_pool[i] = skb;
-+ }
-+}
-+
-+static void free_skb_pool(rtl8150_t *dev)
-+{
-+ int i;
-+
-+ for (i = 0; i < RX_SKB_POOL_SIZE; i++)
-+ if (dev->rx_skb_pool[i])
-+ dev_kfree_skb(dev->rx_skb_pool[i]);
-+}
-+
-+static void rx_fixup(unsigned long data)
-+{
-+ struct rtl8150 *dev = (struct rtl8150 *)data;
-+ struct sk_buff *skb;
-+ int status;
-+
-+ spin_lock_irq(&dev->rx_pool_lock);
-+ fill_skb_pool(dev);
-+ spin_unlock_irq(&dev->rx_pool_lock);
-+ if (test_bit(RX_URB_FAIL, &dev->flags))
-+ if (dev->rx_skb)
-+ goto try_again;
-+ spin_lock_irq(&dev->rx_pool_lock);
-+ skb = pull_skb(dev);
-+ spin_unlock_irq(&dev->rx_pool_lock);
-+ if (skb == NULL)
-+ goto tlsched;
-+ dev->rx_skb = skb;
-+ usb_fill_bulk_urb(dev->rx_urb, dev->udev, usb_rcvbulkpipe(dev->udev, 1),
-+ dev->rx_skb->data, RTL8150_MTU, read_bulk_callback, dev);
-+try_again:
-+ status = usb_submit_urb(dev->rx_urb, GFP_ATOMIC);
-+ if (status == -ENODEV) {
-+ netif_device_detach(dev->netdev);
-+ } else if (status) {
-+ set_bit(RX_URB_FAIL, &dev->flags);
-+ goto tlsched;
-+ } else {
-+ clear_bit(RX_URB_FAIL, &dev->flags);
-+ }
-+
-+ return;
-+tlsched:
-+ tasklet_schedule(&dev->tl);
-+}
-+
-+static int enable_net_traffic(rtl8150_t * dev)
-+{
-+ u8 cr, tcr, rcr, msr;
-+
-+ if (!rtl8150_reset(dev)) {
-+ dev_warn(&dev->udev->dev, "device reset failed\n");
-+ }
-+ /* RCR bit7=1 attach Rx info at the end; =0 HW CRC (which is broken) */
-+ rcr = 0x9e;
-+ tcr = 0xd8;
-+ cr = 0x0c;
-+ if (!(rcr & 0x80))
-+ set_bit(RTL8150_HW_CRC, &dev->flags);
-+ set_registers(dev, RCR, 1, &rcr);
-+ set_registers(dev, TCR, 1, &tcr);
-+ set_registers(dev, CR, 1, &cr);
-+ get_registers(dev, MSR, 1, &msr);
-+
-+ return 0;
-+}
-+
-+static void disable_net_traffic(rtl8150_t * dev)
-+{
-+ u8 cr;
-+
-+ get_registers(dev, CR, 1, &cr);
-+ cr &= 0xf3;
-+ set_registers(dev, CR, 1, &cr);
-+}
-+
-+static void rtl8150_tx_timeout(struct net_device *netdev)
-+{
-+ rtl8150_t *dev = netdev_priv(netdev);
-+ dev_warn(&netdev->dev, "Tx timeout.\n");
-+ usb_unlink_urb(dev->tx_urb);
-+ netdev->stats.tx_errors++;
-+}
-+
-+static void rtl8150_set_multicast(struct net_device *netdev)
-+{
-+ rtl8150_t *dev = netdev_priv(netdev);
-+ u16 rx_creg = 0x9e;
-+
-+ netif_stop_queue(netdev);
-+ if (netdev->flags & IFF_PROMISC) {
-+ rx_creg |= 0x0001;
-+ dev_info(&netdev->dev, "%s: promiscuous mode\n", netdev->name);
-+ } else if (!netdev_mc_empty(netdev) ||
-+ (netdev->flags & IFF_ALLMULTI)) {
-+ rx_creg &= 0xfffe;
-+ rx_creg |= 0x0002;
-+ dev_info(&netdev->dev, "%s: allmulti set\n", netdev->name);
-+ } else {
-+ /* ~RX_MULTICAST, ~RX_PROMISCUOUS */
-+ rx_creg &= 0x00fc;
-+ }
-+ async_set_registers(dev, RCR, sizeof(rx_creg), rx_creg);
-+ netif_wake_queue(netdev);
-+}
-+
-+static netdev_tx_t rtl8150_start_xmit(struct sk_buff *skb,
-+ struct net_device *netdev)
-+{
-+ rtl8150_t *dev = netdev_priv(netdev);
-+ int count, res;
-+
-+ netif_stop_queue(netdev);
-+ count = (skb->len < 60) ? 60 : skb->len;
-+ count = (count & 0x3f) ? count : count + 1;
-+ dev->tx_skb = skb;
-+ usb_fill_bulk_urb(dev->tx_urb, dev->udev, usb_sndbulkpipe(dev->udev, 2),
-+ skb->data, count, write_bulk_callback, dev);
-+ if ((res = usb_submit_urb(dev->tx_urb, GFP_ATOMIC))) {
-+ /* Can we get/handle EPIPE here? */
-+ if (res == -ENODEV)
-+ netif_device_detach(dev->netdev);
-+ else {
-+ dev_warn(&netdev->dev, "failed tx_urb %d\n", res);
-+ netdev->stats.tx_errors++;
-+ netif_start_queue(netdev);
-+ }
-+ } else {
-+ netdev->stats.tx_packets++;
-+ netdev->stats.tx_bytes += skb->len;
-+ netdev->trans_start = jiffies;
-+ }
-+
-+ return NETDEV_TX_OK;
-+}
-+
-+
-+static void set_carrier(struct net_device *netdev)
-+{
-+ rtl8150_t *dev = netdev_priv(netdev);
-+ short tmp;
-+
-+ get_registers(dev, CSCR, 2, &tmp);
-+ if (tmp & CSCR_LINK_STATUS)
-+ netif_carrier_on(netdev);
-+ else
-+ netif_carrier_off(netdev);
-+}
-+
-+static int rtl8150_open(struct net_device *netdev)
-+{
-+ rtl8150_t *dev = netdev_priv(netdev);
-+ int res;
-+
-+ if (dev->rx_skb == NULL)
-+ dev->rx_skb = pull_skb(dev);
-+ if (!dev->rx_skb)
-+ return -ENOMEM;
-+
-+ set_registers(dev, IDR, 6, netdev->dev_addr);
-+
-+ usb_fill_bulk_urb(dev->rx_urb, dev->udev, usb_rcvbulkpipe(dev->udev, 1),
-+ dev->rx_skb->data, RTL8150_MTU, read_bulk_callback, dev);
-+ if ((res = usb_submit_urb(dev->rx_urb, GFP_KERNEL))) {
-+ if (res == -ENODEV)
-+ netif_device_detach(dev->netdev);
-+ dev_warn(&netdev->dev, "rx_urb submit failed: %d\n", res);
-+ return res;
-+ }
-+ usb_fill_int_urb(dev->intr_urb, dev->udev, usb_rcvintpipe(dev->udev, 3),
-+ dev->intr_buff, INTBUFSIZE, intr_callback,
-+ dev, dev->intr_interval);
-+ if ((res = usb_submit_urb(dev->intr_urb, GFP_KERNEL))) {
-+ if (res == -ENODEV)
-+ netif_device_detach(dev->netdev);
-+ dev_warn(&netdev->dev, "intr_urb submit failed: %d\n", res);
-+ usb_kill_urb(dev->rx_urb);
-+ return res;
-+ }
-+ enable_net_traffic(dev);
-+ set_carrier(netdev);
-+ netif_start_queue(netdev);
-+
-+ return res;
-+}
-+
-+static int rtl8150_close(struct net_device *netdev)
-+{
-+ rtl8150_t *dev = netdev_priv(netdev);
-+ int res = 0;
-+
-+ netif_stop_queue(netdev);
-+ if (!test_bit(RTL8150_UNPLUG, &dev->flags))
-+ disable_net_traffic(dev);
-+ unlink_all_urbs(dev);
-+
-+ return res;
-+}
-+
-+static void rtl8150_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *info)
-+{
-+ rtl8150_t *dev = netdev_priv(netdev);
-+
-+ strlcpy(info->driver, driver_name, sizeof(info->driver));
-+ strlcpy(info->version, DRIVER_VERSION, sizeof(info->version));
-+ usb_make_path(dev->udev, info->bus_info, sizeof(info->bus_info));
-+}
-+
-+static int rtl8150_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
-+{
-+ rtl8150_t *dev = netdev_priv(netdev);
-+ short lpa, bmcr;
-+
-+ ecmd->supported = (SUPPORTED_10baseT_Half |
-+ SUPPORTED_10baseT_Full |
-+ SUPPORTED_100baseT_Half |
-+ SUPPORTED_100baseT_Full |
-+ SUPPORTED_Autoneg |
-+ SUPPORTED_TP | SUPPORTED_MII);
-+ ecmd->port = PORT_TP;
-+ ecmd->transceiver = XCVR_INTERNAL;
-+ ecmd->phy_address = dev->phy;
-+ get_registers(dev, BMCR, 2, &bmcr);
-+ get_registers(dev, ANLP, 2, &lpa);
-+ if (bmcr & BMCR_ANENABLE) {
-+ u32 speed = ((lpa & (LPA_100HALF | LPA_100FULL)) ?
-+ SPEED_100 : SPEED_10);
-+ ethtool_cmd_speed_set(ecmd, speed);
-+ ecmd->autoneg = AUTONEG_ENABLE;
-+ if (speed == SPEED_100)
-+ ecmd->duplex = (lpa & LPA_100FULL) ?
-+ DUPLEX_FULL : DUPLEX_HALF;
-+ else
-+ ecmd->duplex = (lpa & LPA_10FULL) ?
-+ DUPLEX_FULL : DUPLEX_HALF;
-+ } else {
-+ ecmd->autoneg = AUTONEG_DISABLE;
-+ ethtool_cmd_speed_set(ecmd, ((bmcr & BMCR_SPEED100) ?
-+ SPEED_100 : SPEED_10));
-+ ecmd->duplex = (bmcr & BMCR_FULLDPLX) ?
-+ DUPLEX_FULL : DUPLEX_HALF;
-+ }
-+ return 0;
-+}
-+
-+static const struct ethtool_ops ops = {
-+ .get_drvinfo = rtl8150_get_drvinfo,
-+ .get_settings = rtl8150_get_settings,
-+ .get_link = ethtool_op_get_link
-+};
-+
-+static int rtl8150_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
-+{
-+ rtl8150_t *dev = netdev_priv(netdev);
-+ u16 *data = (u16 *) & rq->ifr_ifru;
-+ int res = 0;
-+
-+ switch (cmd) {
-+ case SIOCDEVPRIVATE:
-+ data[0] = dev->phy;
-+ case SIOCDEVPRIVATE + 1:
-+ read_mii_word(dev, dev->phy, (data[1] & 0x1f), &data[3]);
-+ break;
-+ case SIOCDEVPRIVATE + 2:
-+ if (!capable(CAP_NET_ADMIN))
-+ return -EPERM;
-+ write_mii_word(dev, dev->phy, (data[1] & 0x1f), data[2]);
-+ break;
-+ default:
-+ res = -EOPNOTSUPP;
-+ }
-+
-+ return res;
-+}
-+
-+static const struct net_device_ops rtl8150_netdev_ops = {
-+ .ndo_open = rtl8150_open,
-+ .ndo_stop = rtl8150_close,
-+ .ndo_do_ioctl = rtl8150_ioctl,
-+ .ndo_start_xmit = rtl8150_start_xmit,
-+ .ndo_tx_timeout = rtl8150_tx_timeout,
-+ .ndo_set_rx_mode = rtl8150_set_multicast,
-+ .ndo_set_mac_address = rtl8150_set_mac_address,
-+
-+ .ndo_change_mtu = eth_change_mtu,
-+ .ndo_validate_addr = eth_validate_addr,
-+};
-+
-+static int rtl8150_probe(struct usb_interface *intf,
-+ const struct usb_device_id *id)
-+{
-+ struct usb_device *udev = interface_to_usbdev(intf);
-+ rtl8150_t *dev;
-+ struct net_device *netdev;
-+
-+ netdev = alloc_etherdev(sizeof(rtl8150_t));
-+ if (!netdev)
-+ return -ENOMEM;
-+
-+ dev = netdev_priv(netdev);
-+
-+ dev->intr_buff = kmalloc(INTBUFSIZE, GFP_KERNEL);
-+ if (!dev->intr_buff) {
-+ free_netdev(netdev);
-+ return -ENOMEM;
-+ }
-+
-+ tasklet_init(&dev->tl, rx_fixup, (unsigned long)dev);
-+ spin_lock_init(&dev->rx_pool_lock);
-+
-+ dev->udev = udev;
-+ dev->netdev = netdev;
-+ netdev->netdev_ops = &rtl8150_netdev_ops;
-+ netdev->watchdog_timeo = RTL8150_TX_TIMEOUT;
-+ netdev->ethtool_ops = &ops;
-+ dev->intr_interval = 100; /* 100ms */
-+
-+ if (!alloc_all_urbs(dev)) {
-+ dev_err(&intf->dev, "out of memory\n");
-+ goto out;
-+ }
-+ if (!rtl8150_reset(dev)) {
-+ dev_err(&intf->dev, "couldn't reset the device\n");
-+ goto out1;
-+ }
-+ fill_skb_pool(dev);
-+ set_ethernet_addr(dev);
-+
-+ usb_set_intfdata(intf, dev);
-+ SET_NETDEV_DEV(netdev, &intf->dev);
-+ if (register_netdev(netdev) != 0) {
-+ dev_err(&intf->dev, "couldn't register the device\n");
-+ goto out2;
-+ }
-+
-+ dev_info(&intf->dev, "%s: rtl8150 is detected\n", netdev->name);
-+
-+ return 0;
-+
-+out2:
-+ usb_set_intfdata(intf, NULL);
-+ free_skb_pool(dev);
-+out1:
-+ free_all_urbs(dev);
-+out:
-+ kfree(dev->intr_buff);
-+ free_netdev(netdev);
-+ return -EIO;
-+}
-+
-+static void rtl8150_disconnect(struct usb_interface *intf)
-+{
-+ rtl8150_t *dev = usb_get_intfdata(intf);
-+
-+ usb_set_intfdata(intf, NULL);
-+ if (dev) {
-+ set_bit(RTL8150_UNPLUG, &dev->flags);
-+ tasklet_kill(&dev->tl);
-+ unregister_netdev(dev->netdev);
-+ unlink_all_urbs(dev);
-+ free_all_urbs(dev);
-+ free_skb_pool(dev);
-+ if (dev->rx_skb)
-+ dev_kfree_skb(dev->rx_skb);
-+ kfree(dev->intr_buff);
-+ free_netdev(dev->netdev);
-+ }
-+}
-+
-+static struct usb_driver rtl8150_driver = {
-+ .name = driver_name,
-+ .probe = rtl8150_probe,
-+ .disconnect = rtl8150_disconnect,
-+ .id_table = rtl8150_table,
-+ .suspend = rtl8150_suspend,
-+ .resume = rtl8150_resume,
-+ .disable_hub_initiated_lpm = 1,
-+};
-+
-+module_usb_driver(rtl8150_driver);
-+
-+MODULE_AUTHOR(DRIVER_AUTHOR);
-+MODULE_DESCRIPTION(DRIVER_DESC);
-+MODULE_LICENSE("GPL");
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/smsc75xx.c backports-3.18.1-1/drivers/net/usb/smsc75xx.c
---- backports-3.18.1-1.org/drivers/net/usb/smsc75xx.c 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/smsc75xx.c 2014-12-16 18:39:45.000000000 +0100
-@@ -0,0 +1,2286 @@
-+ /***************************************************************************
-+ *
-+ * Copyright (C) 2007-2010 SMSC
-+ *
-+ * 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, see <http://www.gnu.org/licenses/>.
-+ *
-+ *****************************************************************************/
-+
-+#include <linux/module.h>
-+#include <linux/kmod.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/ethtool.h>
-+#include <linux/mii.h>
-+#include <linux/usb.h>
-+#include <linux/bitrev.h>
-+#include <linux/crc16.h>
-+#include <linux/crc32.h>
-+#include <linux/usb/usbnet.h>
-+#include <linux/slab.h>
-+#include "smsc75xx.h"
-+
-+#define SMSC_CHIPNAME "smsc75xx"
-+#define SMSC_DRIVER_VERSION "1.0.0"
-+#define HS_USB_PKT_SIZE (512)
-+#define FS_USB_PKT_SIZE (64)
-+#define DEFAULT_HS_BURST_CAP_SIZE (16 * 1024 + 5 * HS_USB_PKT_SIZE)
-+#define DEFAULT_FS_BURST_CAP_SIZE (6 * 1024 + 33 * FS_USB_PKT_SIZE)
-+#define DEFAULT_BULK_IN_DELAY (0x00002000)
-+#define MAX_SINGLE_PACKET_SIZE (9000)
-+#define LAN75XX_EEPROM_MAGIC (0x7500)
-+#define EEPROM_MAC_OFFSET (0x01)
-+#define DEFAULT_TX_CSUM_ENABLE (true)
-+#define DEFAULT_RX_CSUM_ENABLE (true)
-+#define SMSC75XX_INTERNAL_PHY_ID (1)
-+#define SMSC75XX_TX_OVERHEAD (8)
-+#define MAX_RX_FIFO_SIZE (20 * 1024)
-+#define MAX_TX_FIFO_SIZE (12 * 1024)
-+#define USB_VENDOR_ID_SMSC (0x0424)
-+#define USB_PRODUCT_ID_LAN7500 (0x7500)
-+#define USB_PRODUCT_ID_LAN7505 (0x7505)
-+#define RXW_PADDING 2
-+#define SUPPORTED_WAKE (WAKE_PHY | WAKE_UCAST | WAKE_BCAST | \
-+ WAKE_MCAST | WAKE_ARP | WAKE_MAGIC)
-+
-+#define SUSPEND_SUSPEND0 (0x01)
-+#define SUSPEND_SUSPEND1 (0x02)
-+#define SUSPEND_SUSPEND2 (0x04)
-+#define SUSPEND_SUSPEND3 (0x08)
-+#define SUSPEND_ALLMODES (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \
-+ SUSPEND_SUSPEND2 | SUSPEND_SUSPEND3)
-+
-+struct smsc75xx_priv {
-+ struct usbnet *dev;
-+ u32 rfe_ctl;
-+ u32 wolopts;
-+ u32 multicast_hash_table[DP_SEL_VHF_HASH_LEN];
-+ struct mutex dataport_mutex;
-+ spinlock_t rfe_ctl_lock;
-+ struct work_struct set_multicast;
-+ u8 suspend_flags;
-+};
-+
-+struct usb_context {
-+ struct usb_ctrlrequest req;
-+ struct usbnet *dev;
-+};
-+
-+static bool turbo_mode = true;
-+module_param(turbo_mode, bool, 0644);
-+MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction");
-+
-+static int __must_check __smsc75xx_read_reg(struct usbnet *dev, u32 index,
-+ u32 *data, int in_pm)
-+{
-+ u32 buf;
-+ int ret;
-+ int (*fn)(struct usbnet *, u8, u8, u16, u16, void *, u16);
-+
-+ BUG_ON(!dev);
-+
-+ if (!in_pm)
-+ fn = usbnet_read_cmd;
-+ else
-+ fn = usbnet_read_cmd_nopm;
-+
-+ ret = fn(dev, USB_VENDOR_REQUEST_READ_REGISTER, USB_DIR_IN
-+ | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-+ 0, index, &buf, 4);
-+ if (unlikely(ret < 0))
-+ netdev_warn(dev->net, "Failed to read reg index 0x%08x: %d\n",
-+ index, ret);
-+
-+ le32_to_cpus(&buf);
-+ *data = buf;
-+
-+ return ret;
-+}
-+
-+static int __must_check __smsc75xx_write_reg(struct usbnet *dev, u32 index,
-+ u32 data, int in_pm)
-+{
-+ u32 buf;
-+ int ret;
-+ int (*fn)(struct usbnet *, u8, u8, u16, u16, const void *, u16);
-+
-+ BUG_ON(!dev);
-+
-+ if (!in_pm)
-+ fn = usbnet_write_cmd;
-+ else
-+ fn = usbnet_write_cmd_nopm;
-+
-+ buf = data;
-+ cpu_to_le32s(&buf);
-+
-+ ret = fn(dev, USB_VENDOR_REQUEST_WRITE_REGISTER, USB_DIR_OUT
-+ | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-+ 0, index, &buf, 4);
-+ if (unlikely(ret < 0))
-+ netdev_warn(dev->net, "Failed to write reg index 0x%08x: %d\n",
-+ index, ret);
-+
-+ return ret;
-+}
-+
-+static int __must_check smsc75xx_read_reg_nopm(struct usbnet *dev, u32 index,
-+ u32 *data)
-+{
-+ return __smsc75xx_read_reg(dev, index, data, 1);
-+}
-+
-+static int __must_check smsc75xx_write_reg_nopm(struct usbnet *dev, u32 index,
-+ u32 data)
-+{
-+ return __smsc75xx_write_reg(dev, index, data, 1);
-+}
-+
-+static int __must_check smsc75xx_read_reg(struct usbnet *dev, u32 index,
-+ u32 *data)
-+{
-+ return __smsc75xx_read_reg(dev, index, data, 0);
-+}
-+
-+static int __must_check smsc75xx_write_reg(struct usbnet *dev, u32 index,
-+ u32 data)
-+{
-+ return __smsc75xx_write_reg(dev, index, data, 0);
-+}
-+
-+/* Loop until the read is completed with timeout
-+ * called with phy_mutex held */
-+static __must_check int __smsc75xx_phy_wait_not_busy(struct usbnet *dev,
-+ int in_pm)
-+{
-+ unsigned long start_time = jiffies;
-+ u32 val;
-+ int ret;
-+
-+ do {
-+ ret = __smsc75xx_read_reg(dev, MII_ACCESS, &val, in_pm);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error reading MII_ACCESS\n");
-+ return ret;
-+ }
-+
-+ if (!(val & MII_ACCESS_BUSY))
-+ return 0;
-+ } while (!time_after(jiffies, start_time + HZ));
-+
-+ return -EIO;
-+}
-+
-+static int __smsc75xx_mdio_read(struct net_device *netdev, int phy_id, int idx,
-+ int in_pm)
-+{
-+ struct usbnet *dev = netdev_priv(netdev);
-+ u32 val, addr;
-+ int ret;
-+
-+ mutex_lock(&dev->phy_mutex);
-+
-+ /* confirm MII not busy */
-+ ret = __smsc75xx_phy_wait_not_busy(dev, in_pm);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "MII is busy in smsc75xx_mdio_read\n");
-+ goto done;
-+ }
-+
-+ /* set the address, index & direction (read from PHY) */
-+ phy_id &= dev->mii.phy_id_mask;
-+ idx &= dev->mii.reg_num_mask;
-+ addr = ((phy_id << MII_ACCESS_PHY_ADDR_SHIFT) & MII_ACCESS_PHY_ADDR)
-+ | ((idx << MII_ACCESS_REG_ADDR_SHIFT) & MII_ACCESS_REG_ADDR)
-+ | MII_ACCESS_READ | MII_ACCESS_BUSY;
-+ ret = __smsc75xx_write_reg(dev, MII_ACCESS, addr, in_pm);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing MII_ACCESS\n");
-+ goto done;
-+ }
-+
-+ ret = __smsc75xx_phy_wait_not_busy(dev, in_pm);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Timed out reading MII reg %02X\n", idx);
-+ goto done;
-+ }
-+
-+ ret = __smsc75xx_read_reg(dev, MII_DATA, &val, in_pm);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error reading MII_DATA\n");
-+ goto done;
-+ }
-+
-+ ret = (u16)(val & 0xFFFF);
-+
-+done:
-+ mutex_unlock(&dev->phy_mutex);
-+ return ret;
-+}
-+
-+static void __smsc75xx_mdio_write(struct net_device *netdev, int phy_id,
-+ int idx, int regval, int in_pm)
-+{
-+ struct usbnet *dev = netdev_priv(netdev);
-+ u32 val, addr;
-+ int ret;
-+
-+ mutex_lock(&dev->phy_mutex);
-+
-+ /* confirm MII not busy */
-+ ret = __smsc75xx_phy_wait_not_busy(dev, in_pm);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "MII is busy in smsc75xx_mdio_write\n");
-+ goto done;
-+ }
-+
-+ val = regval;
-+ ret = __smsc75xx_write_reg(dev, MII_DATA, val, in_pm);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing MII_DATA\n");
-+ goto done;
-+ }
-+
-+ /* set the address, index & direction (write to PHY) */
-+ phy_id &= dev->mii.phy_id_mask;
-+ idx &= dev->mii.reg_num_mask;
-+ addr = ((phy_id << MII_ACCESS_PHY_ADDR_SHIFT) & MII_ACCESS_PHY_ADDR)
-+ | ((idx << MII_ACCESS_REG_ADDR_SHIFT) & MII_ACCESS_REG_ADDR)
-+ | MII_ACCESS_WRITE | MII_ACCESS_BUSY;
-+ ret = __smsc75xx_write_reg(dev, MII_ACCESS, addr, in_pm);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing MII_ACCESS\n");
-+ goto done;
-+ }
-+
-+ ret = __smsc75xx_phy_wait_not_busy(dev, in_pm);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Timed out writing MII reg %02X\n", idx);
-+ goto done;
-+ }
-+
-+done:
-+ mutex_unlock(&dev->phy_mutex);
-+}
-+
-+static int smsc75xx_mdio_read_nopm(struct net_device *netdev, int phy_id,
-+ int idx)
-+{
-+ return __smsc75xx_mdio_read(netdev, phy_id, idx, 1);
-+}
-+
-+static void smsc75xx_mdio_write_nopm(struct net_device *netdev, int phy_id,
-+ int idx, int regval)
-+{
-+ __smsc75xx_mdio_write(netdev, phy_id, idx, regval, 1);
-+}
-+
-+static int smsc75xx_mdio_read(struct net_device *netdev, int phy_id, int idx)
-+{
-+ return __smsc75xx_mdio_read(netdev, phy_id, idx, 0);
-+}
-+
-+static void smsc75xx_mdio_write(struct net_device *netdev, int phy_id, int idx,
-+ int regval)
-+{
-+ __smsc75xx_mdio_write(netdev, phy_id, idx, regval, 0);
-+}
-+
-+static int smsc75xx_wait_eeprom(struct usbnet *dev)
-+{
-+ unsigned long start_time = jiffies;
-+ u32 val;
-+ int ret;
-+
-+ do {
-+ ret = smsc75xx_read_reg(dev, E2P_CMD, &val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error reading E2P_CMD\n");
-+ return ret;
-+ }
-+
-+ if (!(val & E2P_CMD_BUSY) || (val & E2P_CMD_TIMEOUT))
-+ break;
-+ udelay(40);
-+ } while (!time_after(jiffies, start_time + HZ));
-+
-+ if (val & (E2P_CMD_TIMEOUT | E2P_CMD_BUSY)) {
-+ netdev_warn(dev->net, "EEPROM read operation timeout\n");
-+ return -EIO;
-+ }
-+
-+ return 0;
-+}
-+
-+static int smsc75xx_eeprom_confirm_not_busy(struct usbnet *dev)
-+{
-+ unsigned long start_time = jiffies;
-+ u32 val;
-+ int ret;
-+
-+ do {
-+ ret = smsc75xx_read_reg(dev, E2P_CMD, &val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error reading E2P_CMD\n");
-+ return ret;
-+ }
-+
-+ if (!(val & E2P_CMD_BUSY))
-+ return 0;
-+
-+ udelay(40);
-+ } while (!time_after(jiffies, start_time + HZ));
-+
-+ netdev_warn(dev->net, "EEPROM is busy\n");
-+ return -EIO;
-+}
-+
-+static int smsc75xx_read_eeprom(struct usbnet *dev, u32 offset, u32 length,
-+ u8 *data)
-+{
-+ u32 val;
-+ int i, ret;
-+
-+ BUG_ON(!dev);
-+ BUG_ON(!data);
-+
-+ ret = smsc75xx_eeprom_confirm_not_busy(dev);
-+ if (ret)
-+ return ret;
-+
-+ for (i = 0; i < length; i++) {
-+ val = E2P_CMD_BUSY | E2P_CMD_READ | (offset & E2P_CMD_ADDR);
-+ ret = smsc75xx_write_reg(dev, E2P_CMD, val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing E2P_CMD\n");
-+ return ret;
-+ }
-+
-+ ret = smsc75xx_wait_eeprom(dev);
-+ if (ret < 0)
-+ return ret;
-+
-+ ret = smsc75xx_read_reg(dev, E2P_DATA, &val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error reading E2P_DATA\n");
-+ return ret;
-+ }
-+
-+ data[i] = val & 0xFF;
-+ offset++;
-+ }
-+
-+ return 0;
-+}
-+
-+static int smsc75xx_write_eeprom(struct usbnet *dev, u32 offset, u32 length,
-+ u8 *data)
-+{
-+ u32 val;
-+ int i, ret;
-+
-+ BUG_ON(!dev);
-+ BUG_ON(!data);
-+
-+ ret = smsc75xx_eeprom_confirm_not_busy(dev);
-+ if (ret)
-+ return ret;
-+
-+ /* Issue write/erase enable command */
-+ val = E2P_CMD_BUSY | E2P_CMD_EWEN;
-+ ret = smsc75xx_write_reg(dev, E2P_CMD, val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing E2P_CMD\n");
-+ return ret;
-+ }
-+
-+ ret = smsc75xx_wait_eeprom(dev);
-+ if (ret < 0)
-+ return ret;
-+
-+ for (i = 0; i < length; i++) {
-+
-+ /* Fill data register */
-+ val = data[i];
-+ ret = smsc75xx_write_reg(dev, E2P_DATA, val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing E2P_DATA\n");
-+ return ret;
-+ }
-+
-+ /* Send "write" command */
-+ val = E2P_CMD_BUSY | E2P_CMD_WRITE | (offset & E2P_CMD_ADDR);
-+ ret = smsc75xx_write_reg(dev, E2P_CMD, val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing E2P_CMD\n");
-+ return ret;
-+ }
-+
-+ ret = smsc75xx_wait_eeprom(dev);
-+ if (ret < 0)
-+ return ret;
-+
-+ offset++;
-+ }
-+
-+ return 0;
-+}
-+
-+static int smsc75xx_dataport_wait_not_busy(struct usbnet *dev)
-+{
-+ int i, ret;
-+
-+ for (i = 0; i < 100; i++) {
-+ u32 dp_sel;
-+ ret = smsc75xx_read_reg(dev, DP_SEL, &dp_sel);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error reading DP_SEL\n");
-+ return ret;
-+ }
-+
-+ if (dp_sel & DP_SEL_DPRDY)
-+ return 0;
-+
-+ udelay(40);
-+ }
-+
-+ netdev_warn(dev->net, "smsc75xx_dataport_wait_not_busy timed out\n");
-+
-+ return -EIO;
-+}
-+
-+static int smsc75xx_dataport_write(struct usbnet *dev, u32 ram_select, u32 addr,
-+ u32 length, u32 *buf)
-+{
-+ struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
-+ u32 dp_sel;
-+ int i, ret;
-+
-+ mutex_lock(&pdata->dataport_mutex);
-+
-+ ret = smsc75xx_dataport_wait_not_busy(dev);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "smsc75xx_dataport_write busy on entry\n");
-+ goto done;
-+ }
-+
-+ ret = smsc75xx_read_reg(dev, DP_SEL, &dp_sel);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error reading DP_SEL\n");
-+ goto done;
-+ }
-+
-+ dp_sel &= ~DP_SEL_RSEL;
-+ dp_sel |= ram_select;
-+ ret = smsc75xx_write_reg(dev, DP_SEL, dp_sel);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing DP_SEL\n");
-+ goto done;
-+ }
-+
-+ for (i = 0; i < length; i++) {
-+ ret = smsc75xx_write_reg(dev, DP_ADDR, addr + i);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing DP_ADDR\n");
-+ goto done;
-+ }
-+
-+ ret = smsc75xx_write_reg(dev, DP_DATA, buf[i]);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing DP_DATA\n");
-+ goto done;
-+ }
-+
-+ ret = smsc75xx_write_reg(dev, DP_CMD, DP_CMD_WRITE);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing DP_CMD\n");
-+ goto done;
-+ }
-+
-+ ret = smsc75xx_dataport_wait_not_busy(dev);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "smsc75xx_dataport_write timeout\n");
-+ goto done;
-+ }
-+ }
-+
-+done:
-+ mutex_unlock(&pdata->dataport_mutex);
-+ return ret;
-+}
-+
-+/* returns hash bit number for given MAC address */
-+static u32 smsc75xx_hash(char addr[ETH_ALEN])
-+{
-+ return (ether_crc(ETH_ALEN, addr) >> 23) & 0x1ff;
-+}
-+
-+static void smsc75xx_deferred_multicast_write(struct work_struct *param)
-+{
-+ struct smsc75xx_priv *pdata =
-+ container_of(param, struct smsc75xx_priv, set_multicast);
-+ struct usbnet *dev = pdata->dev;
-+ int ret;
-+
-+ netif_dbg(dev, drv, dev->net, "deferred multicast write 0x%08x\n",
-+ pdata->rfe_ctl);
-+
-+ smsc75xx_dataport_write(dev, DP_SEL_VHF, DP_SEL_VHF_VLAN_LEN,
-+ DP_SEL_VHF_HASH_LEN, pdata->multicast_hash_table);
-+
-+ ret = smsc75xx_write_reg(dev, RFE_CTL, pdata->rfe_ctl);
-+ if (ret < 0)
-+ netdev_warn(dev->net, "Error writing RFE_CRL\n");
-+}
-+
-+static void smsc75xx_set_multicast(struct net_device *netdev)
-+{
-+ struct usbnet *dev = netdev_priv(netdev);
-+ struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
-+ unsigned long flags;
-+ int i;
-+
-+ spin_lock_irqsave(&pdata->rfe_ctl_lock, flags);
-+
-+ pdata->rfe_ctl &=
-+ ~(RFE_CTL_AU | RFE_CTL_AM | RFE_CTL_DPF | RFE_CTL_MHF);
-+ pdata->rfe_ctl |= RFE_CTL_AB;
-+
-+ for (i = 0; i < DP_SEL_VHF_HASH_LEN; i++)
-+ pdata->multicast_hash_table[i] = 0;
-+
-+ if (dev->net->flags & IFF_PROMISC) {
-+ netif_dbg(dev, drv, dev->net, "promiscuous mode enabled\n");
-+ pdata->rfe_ctl |= RFE_CTL_AM | RFE_CTL_AU;
-+ } else if (dev->net->flags & IFF_ALLMULTI) {
-+ netif_dbg(dev, drv, dev->net, "receive all multicast enabled\n");
-+ pdata->rfe_ctl |= RFE_CTL_AM | RFE_CTL_DPF;
-+ } else if (!netdev_mc_empty(dev->net)) {
-+ struct netdev_hw_addr *ha;
-+
-+ netif_dbg(dev, drv, dev->net, "receive multicast hash filter\n");
-+
-+ pdata->rfe_ctl |= RFE_CTL_MHF | RFE_CTL_DPF;
-+
-+ netdev_for_each_mc_addr(ha, netdev) {
-+ u32 bitnum = smsc75xx_hash(ha->addr);
-+ pdata->multicast_hash_table[bitnum / 32] |=
-+ (1 << (bitnum % 32));
-+ }
-+ } else {
-+ netif_dbg(dev, drv, dev->net, "receive own packets only\n");
-+ pdata->rfe_ctl |= RFE_CTL_DPF;
-+ }
-+
-+ spin_unlock_irqrestore(&pdata->rfe_ctl_lock, flags);
-+
-+ /* defer register writes to a sleepable context */
-+ schedule_work(&pdata->set_multicast);
-+}
-+
-+static int smsc75xx_update_flowcontrol(struct usbnet *dev, u8 duplex,
-+ u16 lcladv, u16 rmtadv)
-+{
-+ u32 flow = 0, fct_flow = 0;
-+ int ret;
-+
-+ if (duplex == DUPLEX_FULL) {
-+ u8 cap = mii_resolve_flowctrl_fdx(lcladv, rmtadv);
-+
-+ if (cap & FLOW_CTRL_TX) {
-+ flow = (FLOW_TX_FCEN | 0xFFFF);
-+ /* set fct_flow thresholds to 20% and 80% */
-+ fct_flow = (8 << 8) | 32;
-+ }
-+
-+ if (cap & FLOW_CTRL_RX)
-+ flow |= FLOW_RX_FCEN;
-+
-+ netif_dbg(dev, link, dev->net, "rx pause %s, tx pause %s\n",
-+ (cap & FLOW_CTRL_RX ? "enabled" : "disabled"),
-+ (cap & FLOW_CTRL_TX ? "enabled" : "disabled"));
-+ } else {
-+ netif_dbg(dev, link, dev->net, "half duplex\n");
-+ }
-+
-+ ret = smsc75xx_write_reg(dev, FLOW, flow);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing FLOW\n");
-+ return ret;
-+ }
-+
-+ ret = smsc75xx_write_reg(dev, FCT_FLOW, fct_flow);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing FCT_FLOW\n");
-+ return ret;
-+ }
-+
-+ return 0;
-+}
-+
-+static int smsc75xx_link_reset(struct usbnet *dev)
-+{
-+ struct mii_if_info *mii = &dev->mii;
-+ struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET };
-+ u16 lcladv, rmtadv;
-+ int ret;
-+
-+ /* write to clear phy interrupt status */
-+ smsc75xx_mdio_write(dev->net, mii->phy_id, PHY_INT_SRC,
-+ PHY_INT_SRC_CLEAR_ALL);
-+
-+ ret = smsc75xx_write_reg(dev, INT_STS, INT_STS_CLEAR_ALL);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing INT_STS\n");
-+ return ret;
-+ }
-+
-+ mii_check_media(mii, 1, 1);
-+ mii_ethtool_gset(&dev->mii, &ecmd);
-+ lcladv = smsc75xx_mdio_read(dev->net, mii->phy_id, MII_ADVERTISE);
-+ rmtadv = smsc75xx_mdio_read(dev->net, mii->phy_id, MII_LPA);
-+
-+ netif_dbg(dev, link, dev->net, "speed: %u duplex: %d lcladv: %04x rmtadv: %04x\n",
-+ ethtool_cmd_speed(&ecmd), ecmd.duplex, lcladv, rmtadv);
-+
-+ return smsc75xx_update_flowcontrol(dev, ecmd.duplex, lcladv, rmtadv);
-+}
-+
-+static void smsc75xx_status(struct usbnet *dev, struct urb *urb)
-+{
-+ u32 intdata;
-+
-+ if (urb->actual_length != 4) {
-+ netdev_warn(dev->net, "unexpected urb length %d\n",
-+ urb->actual_length);
-+ return;
-+ }
-+
-+ memcpy(&intdata, urb->transfer_buffer, 4);
-+ le32_to_cpus(&intdata);
-+
-+ netif_dbg(dev, link, dev->net, "intdata: 0x%08X\n", intdata);
-+
-+ if (intdata & INT_ENP_PHY_INT)
-+ usbnet_defer_kevent(dev, EVENT_LINK_RESET);
-+ else
-+ netdev_warn(dev->net, "unexpected interrupt, intdata=0x%08X\n",
-+ intdata);
-+}
-+
-+static int smsc75xx_ethtool_get_eeprom_len(struct net_device *net)
-+{
-+ return MAX_EEPROM_SIZE;
-+}
-+
-+static int smsc75xx_ethtool_get_eeprom(struct net_device *netdev,
-+ struct ethtool_eeprom *ee, u8 *data)
-+{
-+ struct usbnet *dev = netdev_priv(netdev);
-+
-+ ee->magic = LAN75XX_EEPROM_MAGIC;
-+
-+ return smsc75xx_read_eeprom(dev, ee->offset, ee->len, data);
-+}
-+
-+static int smsc75xx_ethtool_set_eeprom(struct net_device *netdev,
-+ struct ethtool_eeprom *ee, u8 *data)
-+{
-+ struct usbnet *dev = netdev_priv(netdev);
-+
-+ if (ee->magic != LAN75XX_EEPROM_MAGIC) {
-+ netdev_warn(dev->net, "EEPROM: magic value mismatch: 0x%x\n",
-+ ee->magic);
-+ return -EINVAL;
-+ }
-+
-+ return smsc75xx_write_eeprom(dev, ee->offset, ee->len, data);
-+}
-+
-+static void smsc75xx_ethtool_get_wol(struct net_device *net,
-+ struct ethtool_wolinfo *wolinfo)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+ struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
-+
-+ wolinfo->supported = SUPPORTED_WAKE;
-+ wolinfo->wolopts = pdata->wolopts;
-+}
-+
-+static int smsc75xx_ethtool_set_wol(struct net_device *net,
-+ struct ethtool_wolinfo *wolinfo)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+ struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
-+ int ret;
-+
-+ pdata->wolopts = wolinfo->wolopts & SUPPORTED_WAKE;
-+
-+ ret = device_set_wakeup_enable(&dev->udev->dev, pdata->wolopts);
-+ if (ret < 0)
-+ netdev_warn(dev->net, "device_set_wakeup_enable error %d\n", ret);
-+
-+ return ret;
-+}
-+
-+static const struct ethtool_ops smsc75xx_ethtool_ops = {
-+ .get_link = usbnet_get_link,
-+ .nway_reset = usbnet_nway_reset,
-+ .get_drvinfo = usbnet_get_drvinfo,
-+ .get_msglevel = usbnet_get_msglevel,
-+ .set_msglevel = usbnet_set_msglevel,
-+ .get_settings = usbnet_get_settings,
-+ .set_settings = usbnet_set_settings,
-+ .get_eeprom_len = smsc75xx_ethtool_get_eeprom_len,
-+ .get_eeprom = smsc75xx_ethtool_get_eeprom,
-+ .set_eeprom = smsc75xx_ethtool_set_eeprom,
-+ .get_wol = smsc75xx_ethtool_get_wol,
-+ .set_wol = smsc75xx_ethtool_set_wol,
-+};
-+
-+static int smsc75xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
-+{
-+ struct usbnet *dev = netdev_priv(netdev);
-+
-+ if (!netif_running(netdev))
-+ return -EINVAL;
-+
-+ return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
-+}
-+
-+static void smsc75xx_init_mac_address(struct usbnet *dev)
-+{
-+ /* try reading mac address from EEPROM */
-+ if (smsc75xx_read_eeprom(dev, EEPROM_MAC_OFFSET, ETH_ALEN,
-+ dev->net->dev_addr) == 0) {
-+ if (is_valid_ether_addr(dev->net->dev_addr)) {
-+ /* eeprom values are valid so use them */
-+ netif_dbg(dev, ifup, dev->net,
-+ "MAC address read from EEPROM\n");
-+ return;
-+ }
-+ }
-+
-+ /* no eeprom, or eeprom values are invalid. generate random MAC */
-+ eth_hw_addr_random(dev->net);
-+ netif_dbg(dev, ifup, dev->net, "MAC address set to eth_random_addr\n");
-+}
-+
-+static int smsc75xx_set_mac_address(struct usbnet *dev)
-+{
-+ u32 addr_lo = dev->net->dev_addr[0] | dev->net->dev_addr[1] << 8 |
-+ dev->net->dev_addr[2] << 16 | dev->net->dev_addr[3] << 24;
-+ u32 addr_hi = dev->net->dev_addr[4] | dev->net->dev_addr[5] << 8;
-+
-+ int ret = smsc75xx_write_reg(dev, RX_ADDRH, addr_hi);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to write RX_ADDRH: %d\n", ret);
-+ return ret;
-+ }
-+
-+ ret = smsc75xx_write_reg(dev, RX_ADDRL, addr_lo);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to write RX_ADDRL: %d\n", ret);
-+ return ret;
-+ }
-+
-+ addr_hi |= ADDR_FILTX_FB_VALID;
-+ ret = smsc75xx_write_reg(dev, ADDR_FILTX, addr_hi);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to write ADDR_FILTX: %d\n", ret);
-+ return ret;
-+ }
-+
-+ ret = smsc75xx_write_reg(dev, ADDR_FILTX + 4, addr_lo);
-+ if (ret < 0)
-+ netdev_warn(dev->net, "Failed to write ADDR_FILTX+4: %d\n", ret);
-+
-+ return ret;
-+}
-+
-+static int smsc75xx_phy_initialize(struct usbnet *dev)
-+{
-+ int bmcr, ret, timeout = 0;
-+
-+ /* Initialize MII structure */
-+ dev->mii.dev = dev->net;
-+ dev->mii.mdio_read = smsc75xx_mdio_read;
-+ dev->mii.mdio_write = smsc75xx_mdio_write;
-+ dev->mii.phy_id_mask = 0x1f;
-+ dev->mii.reg_num_mask = 0x1f;
-+ dev->mii.supports_gmii = 1;
-+ dev->mii.phy_id = SMSC75XX_INTERNAL_PHY_ID;
-+
-+ /* reset phy and wait for reset to complete */
-+ smsc75xx_mdio_write(dev->net, dev->mii.phy_id, MII_BMCR, BMCR_RESET);
-+
-+ do {
-+ msleep(10);
-+ bmcr = smsc75xx_mdio_read(dev->net, dev->mii.phy_id, MII_BMCR);
-+ if (bmcr < 0) {
-+ netdev_warn(dev->net, "Error reading MII_BMCR\n");
-+ return bmcr;
-+ }
-+ timeout++;
-+ } while ((bmcr & BMCR_RESET) && (timeout < 100));
-+
-+ if (timeout >= 100) {
-+ netdev_warn(dev->net, "timeout on PHY Reset\n");
-+ return -EIO;
-+ }
-+
-+ smsc75xx_mdio_write(dev->net, dev->mii.phy_id, MII_ADVERTISE,
-+ ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP |
-+ ADVERTISE_PAUSE_ASYM);
-+ smsc75xx_mdio_write(dev->net, dev->mii.phy_id, MII_CTRL1000,
-+ ADVERTISE_1000FULL);
-+
-+ /* read and write to clear phy interrupt status */
-+ ret = smsc75xx_mdio_read(dev->net, dev->mii.phy_id, PHY_INT_SRC);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error reading PHY_INT_SRC\n");
-+ return ret;
-+ }
-+
-+ smsc75xx_mdio_write(dev->net, dev->mii.phy_id, PHY_INT_SRC, 0xffff);
-+
-+ smsc75xx_mdio_write(dev->net, dev->mii.phy_id, PHY_INT_MASK,
-+ PHY_INT_MASK_DEFAULT);
-+ mii_nway_restart(&dev->mii);
-+
-+ netif_dbg(dev, ifup, dev->net, "phy initialised successfully\n");
-+ return 0;
-+}
-+
-+static int smsc75xx_set_rx_max_frame_length(struct usbnet *dev, int size)
-+{
-+ int ret = 0;
-+ u32 buf;
-+ bool rxenabled;
-+
-+ ret = smsc75xx_read_reg(dev, MAC_RX, &buf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to read MAC_RX: %d\n", ret);
-+ return ret;
-+ }
-+
-+ rxenabled = ((buf & MAC_RX_RXEN) != 0);
-+
-+ if (rxenabled) {
-+ buf &= ~MAC_RX_RXEN;
-+ ret = smsc75xx_write_reg(dev, MAC_RX, buf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to write MAC_RX: %d\n", ret);
-+ return ret;
-+ }
-+ }
-+
-+ /* add 4 to size for FCS */
-+ buf &= ~MAC_RX_MAX_SIZE;
-+ buf |= (((size + 4) << MAC_RX_MAX_SIZE_SHIFT) & MAC_RX_MAX_SIZE);
-+
-+ ret = smsc75xx_write_reg(dev, MAC_RX, buf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to write MAC_RX: %d\n", ret);
-+ return ret;
-+ }
-+
-+ if (rxenabled) {
-+ buf |= MAC_RX_RXEN;
-+ ret = smsc75xx_write_reg(dev, MAC_RX, buf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to write MAC_RX: %d\n", ret);
-+ return ret;
-+ }
-+ }
-+
-+ return 0;
-+}
-+
-+static int smsc75xx_change_mtu(struct net_device *netdev, int new_mtu)
-+{
-+ struct usbnet *dev = netdev_priv(netdev);
-+ int ret;
-+
-+ if (new_mtu > MAX_SINGLE_PACKET_SIZE)
-+ return -EINVAL;
-+
-+ ret = smsc75xx_set_rx_max_frame_length(dev, new_mtu + ETH_HLEN);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to set mac rx frame length\n");
-+ return ret;
-+ }
-+
-+ return usbnet_change_mtu(netdev, new_mtu);
-+}
-+
-+/* Enable or disable Rx checksum offload engine */
-+static int smsc75xx_set_features(struct net_device *netdev,
-+ netdev_features_t features)
-+{
-+ struct usbnet *dev = netdev_priv(netdev);
-+ struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
-+ unsigned long flags;
-+ int ret;
-+
-+ spin_lock_irqsave(&pdata->rfe_ctl_lock, flags);
-+
-+ if (features & NETIF_F_RXCSUM)
-+ pdata->rfe_ctl |= RFE_CTL_TCPUDP_CKM | RFE_CTL_IP_CKM;
-+ else
-+ pdata->rfe_ctl &= ~(RFE_CTL_TCPUDP_CKM | RFE_CTL_IP_CKM);
-+
-+ spin_unlock_irqrestore(&pdata->rfe_ctl_lock, flags);
-+ /* it's racing here! */
-+
-+ ret = smsc75xx_write_reg(dev, RFE_CTL, pdata->rfe_ctl);
-+ if (ret < 0)
-+ netdev_warn(dev->net, "Error writing RFE_CTL\n");
-+
-+ return ret;
-+}
-+
-+static int smsc75xx_wait_ready(struct usbnet *dev, int in_pm)
-+{
-+ int timeout = 0;
-+
-+ do {
-+ u32 buf;
-+ int ret;
-+
-+ ret = __smsc75xx_read_reg(dev, PMT_CTL, &buf, in_pm);
-+
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to read PMT_CTL: %d\n", ret);
-+ return ret;
-+ }
-+
-+ if (buf & PMT_CTL_DEV_RDY)
-+ return 0;
-+
-+ msleep(10);
-+ timeout++;
-+ } while (timeout < 100);
-+
-+ netdev_warn(dev->net, "timeout waiting for device ready\n");
-+ return -EIO;
-+}
-+
-+static int smsc75xx_reset(struct usbnet *dev)
-+{
-+ struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
-+ u32 buf;
-+ int ret = 0, timeout;
-+
-+ netif_dbg(dev, ifup, dev->net, "entering smsc75xx_reset\n");
-+
-+ ret = smsc75xx_wait_ready(dev, 0);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "device not ready in smsc75xx_reset\n");
-+ return ret;
-+ }
-+
-+ ret = smsc75xx_read_reg(dev, HW_CFG, &buf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to read HW_CFG: %d\n", ret);
-+ return ret;
-+ }
-+
-+ buf |= HW_CFG_LRST;
-+
-+ ret = smsc75xx_write_reg(dev, HW_CFG, buf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to write HW_CFG: %d\n", ret);
-+ return ret;
-+ }
-+
-+ timeout = 0;
-+ do {
-+ msleep(10);
-+ ret = smsc75xx_read_reg(dev, HW_CFG, &buf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to read HW_CFG: %d\n", ret);
-+ return ret;
-+ }
-+ timeout++;
-+ } while ((buf & HW_CFG_LRST) && (timeout < 100));
-+
-+ if (timeout >= 100) {
-+ netdev_warn(dev->net, "timeout on completion of Lite Reset\n");
-+ return -EIO;
-+ }
-+
-+ netif_dbg(dev, ifup, dev->net, "Lite reset complete, resetting PHY\n");
-+
-+ ret = smsc75xx_read_reg(dev, PMT_CTL, &buf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to read PMT_CTL: %d\n", ret);
-+ return ret;
-+ }
-+
-+ buf |= PMT_CTL_PHY_RST;
-+
-+ ret = smsc75xx_write_reg(dev, PMT_CTL, buf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to write PMT_CTL: %d\n", ret);
-+ return ret;
-+ }
-+
-+ timeout = 0;
-+ do {
-+ msleep(10);
-+ ret = smsc75xx_read_reg(dev, PMT_CTL, &buf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to read PMT_CTL: %d\n", ret);
-+ return ret;
-+ }
-+ timeout++;
-+ } while ((buf & PMT_CTL_PHY_RST) && (timeout < 100));
-+
-+ if (timeout >= 100) {
-+ netdev_warn(dev->net, "timeout waiting for PHY Reset\n");
-+ return -EIO;
-+ }
-+
-+ netif_dbg(dev, ifup, dev->net, "PHY reset complete\n");
-+
-+ ret = smsc75xx_set_mac_address(dev);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to set mac address\n");
-+ return ret;
-+ }
-+
-+ netif_dbg(dev, ifup, dev->net, "MAC Address: %pM\n",
-+ dev->net->dev_addr);
-+
-+ ret = smsc75xx_read_reg(dev, HW_CFG, &buf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to read HW_CFG: %d\n", ret);
-+ return ret;
-+ }
-+
-+ netif_dbg(dev, ifup, dev->net, "Read Value from HW_CFG : 0x%08x\n",
-+ buf);
-+
-+ buf |= HW_CFG_BIR;
-+
-+ ret = smsc75xx_write_reg(dev, HW_CFG, buf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to write HW_CFG: %d\n", ret);
-+ return ret;
-+ }
-+
-+ ret = smsc75xx_read_reg(dev, HW_CFG, &buf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to read HW_CFG: %d\n", ret);
-+ return ret;
-+ }
-+
-+ netif_dbg(dev, ifup, dev->net, "Read Value from HW_CFG after writing HW_CFG_BIR: 0x%08x\n",
-+ buf);
-+
-+ if (!turbo_mode) {
-+ buf = 0;
-+ dev->rx_urb_size = MAX_SINGLE_PACKET_SIZE;
-+ } else if (dev->udev->speed == USB_SPEED_HIGH) {
-+ buf = DEFAULT_HS_BURST_CAP_SIZE / HS_USB_PKT_SIZE;
-+ dev->rx_urb_size = DEFAULT_HS_BURST_CAP_SIZE;
-+ } else {
-+ buf = DEFAULT_FS_BURST_CAP_SIZE / FS_USB_PKT_SIZE;
-+ dev->rx_urb_size = DEFAULT_FS_BURST_CAP_SIZE;
-+ }
-+
-+ netif_dbg(dev, ifup, dev->net, "rx_urb_size=%ld\n",
-+ (ulong)dev->rx_urb_size);
-+
-+ ret = smsc75xx_write_reg(dev, BURST_CAP, buf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to write BURST_CAP: %d\n", ret);
-+ return ret;
-+ }
-+
-+ ret = smsc75xx_read_reg(dev, BURST_CAP, &buf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to read BURST_CAP: %d\n", ret);
-+ return ret;
-+ }
-+
-+ netif_dbg(dev, ifup, dev->net,
-+ "Read Value from BURST_CAP after writing: 0x%08x\n", buf);
-+
-+ ret = smsc75xx_write_reg(dev, BULK_IN_DLY, DEFAULT_BULK_IN_DELAY);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to write BULK_IN_DLY: %d\n", ret);
-+ return ret;
-+ }
-+
-+ ret = smsc75xx_read_reg(dev, BULK_IN_DLY, &buf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to read BULK_IN_DLY: %d\n", ret);
-+ return ret;
-+ }
-+
-+ netif_dbg(dev, ifup, dev->net,
-+ "Read Value from BULK_IN_DLY after writing: 0x%08x\n", buf);
-+
-+ if (turbo_mode) {
-+ ret = smsc75xx_read_reg(dev, HW_CFG, &buf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to read HW_CFG: %d\n", ret);
-+ return ret;
-+ }
-+
-+ netif_dbg(dev, ifup, dev->net, "HW_CFG: 0x%08x\n", buf);
-+
-+ buf |= (HW_CFG_MEF | HW_CFG_BCE);
-+
-+ ret = smsc75xx_write_reg(dev, HW_CFG, buf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to write HW_CFG: %d\n", ret);
-+ return ret;
-+ }
-+
-+ ret = smsc75xx_read_reg(dev, HW_CFG, &buf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to read HW_CFG: %d\n", ret);
-+ return ret;
-+ }
-+
-+ netif_dbg(dev, ifup, dev->net, "HW_CFG: 0x%08x\n", buf);
-+ }
-+
-+ /* set FIFO sizes */
-+ buf = (MAX_RX_FIFO_SIZE - 512) / 512;
-+ ret = smsc75xx_write_reg(dev, FCT_RX_FIFO_END, buf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to write FCT_RX_FIFO_END: %d\n", ret);
-+ return ret;
-+ }
-+
-+ netif_dbg(dev, ifup, dev->net, "FCT_RX_FIFO_END set to 0x%08x\n", buf);
-+
-+ buf = (MAX_TX_FIFO_SIZE - 512) / 512;
-+ ret = smsc75xx_write_reg(dev, FCT_TX_FIFO_END, buf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to write FCT_TX_FIFO_END: %d\n", ret);
-+ return ret;
-+ }
-+
-+ netif_dbg(dev, ifup, dev->net, "FCT_TX_FIFO_END set to 0x%08x\n", buf);
-+
-+ ret = smsc75xx_write_reg(dev, INT_STS, INT_STS_CLEAR_ALL);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to write INT_STS: %d\n", ret);
-+ return ret;
-+ }
-+
-+ ret = smsc75xx_read_reg(dev, ID_REV, &buf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to read ID_REV: %d\n", ret);
-+ return ret;
-+ }
-+
-+ netif_dbg(dev, ifup, dev->net, "ID_REV = 0x%08x\n", buf);
-+
-+ ret = smsc75xx_read_reg(dev, E2P_CMD, &buf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to read E2P_CMD: %d\n", ret);
-+ return ret;
-+ }
-+
-+ /* only set default GPIO/LED settings if no EEPROM is detected */
-+ if (!(buf & E2P_CMD_LOADED)) {
-+ ret = smsc75xx_read_reg(dev, LED_GPIO_CFG, &buf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to read LED_GPIO_CFG: %d\n", ret);
-+ return ret;
-+ }
-+
-+ buf &= ~(LED_GPIO_CFG_LED2_FUN_SEL | LED_GPIO_CFG_LED10_FUN_SEL);
-+ buf |= LED_GPIO_CFG_LEDGPIO_EN | LED_GPIO_CFG_LED2_FUN_SEL;
-+
-+ ret = smsc75xx_write_reg(dev, LED_GPIO_CFG, buf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to write LED_GPIO_CFG: %d\n", ret);
-+ return ret;
-+ }
-+ }
-+
-+ ret = smsc75xx_write_reg(dev, FLOW, 0);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to write FLOW: %d\n", ret);
-+ return ret;
-+ }
-+
-+ ret = smsc75xx_write_reg(dev, FCT_FLOW, 0);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to write FCT_FLOW: %d\n", ret);
-+ return ret;
-+ }
-+
-+ /* Don't need rfe_ctl_lock during initialisation */
-+ ret = smsc75xx_read_reg(dev, RFE_CTL, &pdata->rfe_ctl);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to read RFE_CTL: %d\n", ret);
-+ return ret;
-+ }
-+
-+ pdata->rfe_ctl |= RFE_CTL_AB | RFE_CTL_DPF;
-+
-+ ret = smsc75xx_write_reg(dev, RFE_CTL, pdata->rfe_ctl);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to write RFE_CTL: %d\n", ret);
-+ return ret;
-+ }
-+
-+ ret = smsc75xx_read_reg(dev, RFE_CTL, &pdata->rfe_ctl);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to read RFE_CTL: %d\n", ret);
-+ return ret;
-+ }
-+
-+ netif_dbg(dev, ifup, dev->net, "RFE_CTL set to 0x%08x\n",
-+ pdata->rfe_ctl);
-+
-+ /* Enable or disable checksum offload engines */
-+ smsc75xx_set_features(dev->net, dev->net->features);
-+
-+ smsc75xx_set_multicast(dev->net);
-+
-+ ret = smsc75xx_phy_initialize(dev);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to initialize PHY: %d\n", ret);
-+ return ret;
-+ }
-+
-+ ret = smsc75xx_read_reg(dev, INT_EP_CTL, &buf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to read INT_EP_CTL: %d\n", ret);
-+ return ret;
-+ }
-+
-+ /* enable PHY interrupts */
-+ buf |= INT_ENP_PHY_INT;
-+
-+ ret = smsc75xx_write_reg(dev, INT_EP_CTL, buf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to write INT_EP_CTL: %d\n", ret);
-+ return ret;
-+ }
-+
-+ /* allow mac to detect speed and duplex from phy */
-+ ret = smsc75xx_read_reg(dev, MAC_CR, &buf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to read MAC_CR: %d\n", ret);
-+ return ret;
-+ }
-+
-+ buf |= (MAC_CR_ADD | MAC_CR_ASD);
-+ ret = smsc75xx_write_reg(dev, MAC_CR, buf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to write MAC_CR: %d\n", ret);
-+ return ret;
-+ }
-+
-+ ret = smsc75xx_read_reg(dev, MAC_TX, &buf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to read MAC_TX: %d\n", ret);
-+ return ret;
-+ }
-+
-+ buf |= MAC_TX_TXEN;
-+
-+ ret = smsc75xx_write_reg(dev, MAC_TX, buf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to write MAC_TX: %d\n", ret);
-+ return ret;
-+ }
-+
-+ netif_dbg(dev, ifup, dev->net, "MAC_TX set to 0x%08x\n", buf);
-+
-+ ret = smsc75xx_read_reg(dev, FCT_TX_CTL, &buf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to read FCT_TX_CTL: %d\n", ret);
-+ return ret;
-+ }
-+
-+ buf |= FCT_TX_CTL_EN;
-+
-+ ret = smsc75xx_write_reg(dev, FCT_TX_CTL, buf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to write FCT_TX_CTL: %d\n", ret);
-+ return ret;
-+ }
-+
-+ netif_dbg(dev, ifup, dev->net, "FCT_TX_CTL set to 0x%08x\n", buf);
-+
-+ ret = smsc75xx_set_rx_max_frame_length(dev, dev->net->mtu + ETH_HLEN);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to set max rx frame length\n");
-+ return ret;
-+ }
-+
-+ ret = smsc75xx_read_reg(dev, MAC_RX, &buf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to read MAC_RX: %d\n", ret);
-+ return ret;
-+ }
-+
-+ buf |= MAC_RX_RXEN;
-+
-+ ret = smsc75xx_write_reg(dev, MAC_RX, buf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to write MAC_RX: %d\n", ret);
-+ return ret;
-+ }
-+
-+ netif_dbg(dev, ifup, dev->net, "MAC_RX set to 0x%08x\n", buf);
-+
-+ ret = smsc75xx_read_reg(dev, FCT_RX_CTL, &buf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to read FCT_RX_CTL: %d\n", ret);
-+ return ret;
-+ }
-+
-+ buf |= FCT_RX_CTL_EN;
-+
-+ ret = smsc75xx_write_reg(dev, FCT_RX_CTL, buf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to write FCT_RX_CTL: %d\n", ret);
-+ return ret;
-+ }
-+
-+ netif_dbg(dev, ifup, dev->net, "FCT_RX_CTL set to 0x%08x\n", buf);
-+
-+ netif_dbg(dev, ifup, dev->net, "smsc75xx_reset, return 0\n");
-+ return 0;
-+}
-+
-+static const struct net_device_ops smsc75xx_netdev_ops = {
-+ .ndo_open = usbnet_open,
-+ .ndo_stop = usbnet_stop,
-+ .ndo_start_xmit = usbnet_start_xmit,
-+ .ndo_tx_timeout = usbnet_tx_timeout,
-+ .ndo_change_mtu = smsc75xx_change_mtu,
-+ .ndo_set_mac_address = eth_mac_addr,
-+ .ndo_validate_addr = eth_validate_addr,
-+ .ndo_do_ioctl = smsc75xx_ioctl,
-+ .ndo_set_rx_mode = smsc75xx_set_multicast,
-+ .ndo_set_features = smsc75xx_set_features,
-+};
-+
-+static int smsc75xx_bind(struct usbnet *dev, struct usb_interface *intf)
-+{
-+ struct smsc75xx_priv *pdata = NULL;
-+ int ret;
-+
-+ printk(KERN_INFO SMSC_CHIPNAME " v" SMSC_DRIVER_VERSION "\n");
-+
-+ ret = usbnet_get_endpoints(dev, intf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "usbnet_get_endpoints failed: %d\n", ret);
-+ return ret;
-+ }
-+
-+ dev->data[0] = (unsigned long)kzalloc(sizeof(struct smsc75xx_priv),
-+ GFP_KERNEL);
-+
-+ pdata = (struct smsc75xx_priv *)(dev->data[0]);
-+ if (!pdata)
-+ return -ENOMEM;
-+
-+ pdata->dev = dev;
-+
-+ spin_lock_init(&pdata->rfe_ctl_lock);
-+ mutex_init(&pdata->dataport_mutex);
-+
-+ INIT_WORK(&pdata->set_multicast, smsc75xx_deferred_multicast_write);
-+
-+ if (DEFAULT_TX_CSUM_ENABLE)
-+ dev->net->features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM;
-+
-+ if (DEFAULT_RX_CSUM_ENABLE)
-+ dev->net->features |= NETIF_F_RXCSUM;
-+
-+ dev->net->hw_features = NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
-+ NETIF_F_RXCSUM;
-+
-+ ret = smsc75xx_wait_ready(dev, 0);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "device not ready in smsc75xx_bind\n");
-+ return ret;
-+ }
-+
-+ smsc75xx_init_mac_address(dev);
-+
-+ /* Init all registers */
-+ ret = smsc75xx_reset(dev);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "smsc75xx_reset error %d\n", ret);
-+ return ret;
-+ }
-+
-+ dev->net->netdev_ops = &smsc75xx_netdev_ops;
-+ dev->net->ethtool_ops = &smsc75xx_ethtool_ops;
-+ dev->net->flags |= IFF_MULTICAST;
-+ dev->net->hard_header_len += SMSC75XX_TX_OVERHEAD;
-+ dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len;
-+ return 0;
-+}
-+
-+static void smsc75xx_unbind(struct usbnet *dev, struct usb_interface *intf)
-+{
-+ struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
-+ if (pdata) {
-+ netif_dbg(dev, ifdown, dev->net, "free pdata\n");
-+ kfree(pdata);
-+ pdata = NULL;
-+ dev->data[0] = 0;
-+ }
-+}
-+
-+static u16 smsc_crc(const u8 *buffer, size_t len)
-+{
-+ return bitrev16(crc16(0xFFFF, buffer, len));
-+}
-+
-+static int smsc75xx_write_wuff(struct usbnet *dev, int filter, u32 wuf_cfg,
-+ u32 wuf_mask1)
-+{
-+ int cfg_base = WUF_CFGX + filter * 4;
-+ int mask_base = WUF_MASKX + filter * 16;
-+ int ret;
-+
-+ ret = smsc75xx_write_reg(dev, cfg_base, wuf_cfg);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing WUF_CFGX\n");
-+ return ret;
-+ }
-+
-+ ret = smsc75xx_write_reg(dev, mask_base, wuf_mask1);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing WUF_MASKX\n");
-+ return ret;
-+ }
-+
-+ ret = smsc75xx_write_reg(dev, mask_base + 4, 0);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing WUF_MASKX\n");
-+ return ret;
-+ }
-+
-+ ret = smsc75xx_write_reg(dev, mask_base + 8, 0);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing WUF_MASKX\n");
-+ return ret;
-+ }
-+
-+ ret = smsc75xx_write_reg(dev, mask_base + 12, 0);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing WUF_MASKX\n");
-+ return ret;
-+ }
-+
-+ return 0;
-+}
-+
-+static int smsc75xx_enter_suspend0(struct usbnet *dev)
-+{
-+ struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
-+ u32 val;
-+ int ret;
-+
-+ ret = smsc75xx_read_reg_nopm(dev, PMT_CTL, &val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error reading PMT_CTL\n");
-+ return ret;
-+ }
-+
-+ val &= (~(PMT_CTL_SUS_MODE | PMT_CTL_PHY_RST));
-+ val |= PMT_CTL_SUS_MODE_0 | PMT_CTL_WOL_EN | PMT_CTL_WUPS;
-+
-+ ret = smsc75xx_write_reg_nopm(dev, PMT_CTL, val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing PMT_CTL\n");
-+ return ret;
-+ }
-+
-+ pdata->suspend_flags |= SUSPEND_SUSPEND0;
-+
-+ return 0;
-+}
-+
-+static int smsc75xx_enter_suspend1(struct usbnet *dev)
-+{
-+ struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
-+ u32 val;
-+ int ret;
-+
-+ ret = smsc75xx_read_reg_nopm(dev, PMT_CTL, &val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error reading PMT_CTL\n");
-+ return ret;
-+ }
-+
-+ val &= ~(PMT_CTL_SUS_MODE | PMT_CTL_WUPS | PMT_CTL_PHY_RST);
-+ val |= PMT_CTL_SUS_MODE_1;
-+
-+ ret = smsc75xx_write_reg_nopm(dev, PMT_CTL, val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing PMT_CTL\n");
-+ return ret;
-+ }
-+
-+ /* clear wol status, enable energy detection */
-+ val &= ~PMT_CTL_WUPS;
-+ val |= (PMT_CTL_WUPS_ED | PMT_CTL_ED_EN);
-+
-+ ret = smsc75xx_write_reg_nopm(dev, PMT_CTL, val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing PMT_CTL\n");
-+ return ret;
-+ }
-+
-+ pdata->suspend_flags |= SUSPEND_SUSPEND1;
-+
-+ return 0;
-+}
-+
-+static int smsc75xx_enter_suspend2(struct usbnet *dev)
-+{
-+ struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
-+ u32 val;
-+ int ret;
-+
-+ ret = smsc75xx_read_reg_nopm(dev, PMT_CTL, &val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error reading PMT_CTL\n");
-+ return ret;
-+ }
-+
-+ val &= ~(PMT_CTL_SUS_MODE | PMT_CTL_WUPS | PMT_CTL_PHY_RST);
-+ val |= PMT_CTL_SUS_MODE_2;
-+
-+ ret = smsc75xx_write_reg_nopm(dev, PMT_CTL, val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing PMT_CTL\n");
-+ return ret;
-+ }
-+
-+ pdata->suspend_flags |= SUSPEND_SUSPEND2;
-+
-+ return 0;
-+}
-+
-+static int smsc75xx_enter_suspend3(struct usbnet *dev)
-+{
-+ struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
-+ u32 val;
-+ int ret;
-+
-+ ret = smsc75xx_read_reg_nopm(dev, FCT_RX_CTL, &val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error reading FCT_RX_CTL\n");
-+ return ret;
-+ }
-+
-+ if (val & FCT_RX_CTL_RXUSED) {
-+ netdev_dbg(dev->net, "rx fifo not empty in autosuspend\n");
-+ return -EBUSY;
-+ }
-+
-+ ret = smsc75xx_read_reg_nopm(dev, PMT_CTL, &val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error reading PMT_CTL\n");
-+ return ret;
-+ }
-+
-+ val &= ~(PMT_CTL_SUS_MODE | PMT_CTL_WUPS | PMT_CTL_PHY_RST);
-+ val |= PMT_CTL_SUS_MODE_3 | PMT_CTL_RES_CLR_WKP_EN;
-+
-+ ret = smsc75xx_write_reg_nopm(dev, PMT_CTL, val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing PMT_CTL\n");
-+ return ret;
-+ }
-+
-+ /* clear wol status */
-+ val &= ~PMT_CTL_WUPS;
-+ val |= PMT_CTL_WUPS_WOL;
-+
-+ ret = smsc75xx_write_reg_nopm(dev, PMT_CTL, val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing PMT_CTL\n");
-+ return ret;
-+ }
-+
-+ pdata->suspend_flags |= SUSPEND_SUSPEND3;
-+
-+ return 0;
-+}
-+
-+static int smsc75xx_enable_phy_wakeup_interrupts(struct usbnet *dev, u16 mask)
-+{
-+ struct mii_if_info *mii = &dev->mii;
-+ int ret;
-+
-+ netdev_dbg(dev->net, "enabling PHY wakeup interrupts\n");
-+
-+ /* read to clear */
-+ ret = smsc75xx_mdio_read_nopm(dev->net, mii->phy_id, PHY_INT_SRC);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error reading PHY_INT_SRC\n");
-+ return ret;
-+ }
-+
-+ /* enable interrupt source */
-+ ret = smsc75xx_mdio_read_nopm(dev->net, mii->phy_id, PHY_INT_MASK);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error reading PHY_INT_MASK\n");
-+ return ret;
-+ }
-+
-+ ret |= mask;
-+
-+ smsc75xx_mdio_write_nopm(dev->net, mii->phy_id, PHY_INT_MASK, ret);
-+
-+ return 0;
-+}
-+
-+static int smsc75xx_link_ok_nopm(struct usbnet *dev)
-+{
-+ struct mii_if_info *mii = &dev->mii;
-+ int ret;
-+
-+ /* first, a dummy read, needed to latch some MII phys */
-+ ret = smsc75xx_mdio_read_nopm(dev->net, mii->phy_id, MII_BMSR);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error reading MII_BMSR\n");
-+ return ret;
-+ }
-+
-+ ret = smsc75xx_mdio_read_nopm(dev->net, mii->phy_id, MII_BMSR);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error reading MII_BMSR\n");
-+ return ret;
-+ }
-+
-+ return !!(ret & BMSR_LSTATUS);
-+}
-+
-+static int smsc75xx_autosuspend(struct usbnet *dev, u32 link_up)
-+{
-+ int ret;
-+
-+ if (!netif_running(dev->net)) {
-+ /* interface is ifconfig down so fully power down hw */
-+ netdev_dbg(dev->net, "autosuspend entering SUSPEND2\n");
-+ return smsc75xx_enter_suspend2(dev);
-+ }
-+
-+ if (!link_up) {
-+ /* link is down so enter EDPD mode */
-+ netdev_dbg(dev->net, "autosuspend entering SUSPEND1\n");
-+
-+ /* enable PHY wakeup events for if cable is attached */
-+ ret = smsc75xx_enable_phy_wakeup_interrupts(dev,
-+ PHY_INT_MASK_ANEG_COMP);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "error enabling PHY wakeup ints\n");
-+ return ret;
-+ }
-+
-+ netdev_info(dev->net, "entering SUSPEND1 mode\n");
-+ return smsc75xx_enter_suspend1(dev);
-+ }
-+
-+ /* enable PHY wakeup events so we remote wakeup if cable is pulled */
-+ ret = smsc75xx_enable_phy_wakeup_interrupts(dev,
-+ PHY_INT_MASK_LINK_DOWN);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "error enabling PHY wakeup ints\n");
-+ return ret;
-+ }
-+
-+ netdev_dbg(dev->net, "autosuspend entering SUSPEND3\n");
-+ return smsc75xx_enter_suspend3(dev);
-+}
-+
-+static int smsc75xx_suspend(struct usb_interface *intf, pm_message_t message)
-+{
-+ struct usbnet *dev = usb_get_intfdata(intf);
-+ struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
-+ u32 val, link_up;
-+ int ret;
-+
-+ ret = usbnet_suspend(intf, message);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "usbnet_suspend error\n");
-+ return ret;
-+ }
-+
-+ if (pdata->suspend_flags) {
-+ netdev_warn(dev->net, "error during last resume\n");
-+ pdata->suspend_flags = 0;
-+ }
-+
-+ /* determine if link is up using only _nopm functions */
-+ link_up = smsc75xx_link_ok_nopm(dev);
-+
-+ if (message.event == PM_EVENT_AUTO_SUSPEND) {
-+ ret = smsc75xx_autosuspend(dev, link_up);
-+ goto done;
-+ }
-+
-+ /* if we get this far we're not autosuspending */
-+ /* if no wol options set, or if link is down and we're not waking on
-+ * PHY activity, enter lowest power SUSPEND2 mode
-+ */
-+ if (!(pdata->wolopts & SUPPORTED_WAKE) ||
-+ !(link_up || (pdata->wolopts & WAKE_PHY))) {
-+ netdev_info(dev->net, "entering SUSPEND2 mode\n");
-+
-+ /* disable energy detect (link up) & wake up events */
-+ ret = smsc75xx_read_reg_nopm(dev, WUCSR, &val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error reading WUCSR\n");
-+ goto done;
-+ }
-+
-+ val &= ~(WUCSR_MPEN | WUCSR_WUEN);
-+
-+ ret = smsc75xx_write_reg_nopm(dev, WUCSR, val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing WUCSR\n");
-+ goto done;
-+ }
-+
-+ ret = smsc75xx_read_reg_nopm(dev, PMT_CTL, &val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error reading PMT_CTL\n");
-+ goto done;
-+ }
-+
-+ val &= ~(PMT_CTL_ED_EN | PMT_CTL_WOL_EN);
-+
-+ ret = smsc75xx_write_reg_nopm(dev, PMT_CTL, val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing PMT_CTL\n");
-+ goto done;
-+ }
-+
-+ ret = smsc75xx_enter_suspend2(dev);
-+ goto done;
-+ }
-+
-+ if (pdata->wolopts & WAKE_PHY) {
-+ ret = smsc75xx_enable_phy_wakeup_interrupts(dev,
-+ (PHY_INT_MASK_ANEG_COMP | PHY_INT_MASK_LINK_DOWN));
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "error enabling PHY wakeup ints\n");
-+ goto done;
-+ }
-+
-+ /* if link is down then configure EDPD and enter SUSPEND1,
-+ * otherwise enter SUSPEND0 below
-+ */
-+ if (!link_up) {
-+ struct mii_if_info *mii = &dev->mii;
-+ netdev_info(dev->net, "entering SUSPEND1 mode\n");
-+
-+ /* enable energy detect power-down mode */
-+ ret = smsc75xx_mdio_read_nopm(dev->net, mii->phy_id,
-+ PHY_MODE_CTRL_STS);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error reading PHY_MODE_CTRL_STS\n");
-+ goto done;
-+ }
-+
-+ ret |= MODE_CTRL_STS_EDPWRDOWN;
-+
-+ smsc75xx_mdio_write_nopm(dev->net, mii->phy_id,
-+ PHY_MODE_CTRL_STS, ret);
-+
-+ /* enter SUSPEND1 mode */
-+ ret = smsc75xx_enter_suspend1(dev);
-+ goto done;
-+ }
-+ }
-+
-+ if (pdata->wolopts & (WAKE_MCAST | WAKE_ARP)) {
-+ int i, filter = 0;
-+
-+ /* disable all filters */
-+ for (i = 0; i < WUF_NUM; i++) {
-+ ret = smsc75xx_write_reg_nopm(dev, WUF_CFGX + i * 4, 0);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing WUF_CFGX\n");
-+ goto done;
-+ }
-+ }
-+
-+ if (pdata->wolopts & WAKE_MCAST) {
-+ const u8 mcast[] = {0x01, 0x00, 0x5E};
-+ netdev_info(dev->net, "enabling multicast detection\n");
-+
-+ val = WUF_CFGX_EN | WUF_CFGX_ATYPE_MULTICAST
-+ | smsc_crc(mcast, 3);
-+ ret = smsc75xx_write_wuff(dev, filter++, val, 0x0007);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing wakeup filter\n");
-+ goto done;
-+ }
-+ }
-+
-+ if (pdata->wolopts & WAKE_ARP) {
-+ const u8 arp[] = {0x08, 0x06};
-+ netdev_info(dev->net, "enabling ARP detection\n");
-+
-+ val = WUF_CFGX_EN | WUF_CFGX_ATYPE_ALL | (0x0C << 16)
-+ | smsc_crc(arp, 2);
-+ ret = smsc75xx_write_wuff(dev, filter++, val, 0x0003);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing wakeup filter\n");
-+ goto done;
-+ }
-+ }
-+
-+ /* clear any pending pattern match packet status */
-+ ret = smsc75xx_read_reg_nopm(dev, WUCSR, &val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error reading WUCSR\n");
-+ goto done;
-+ }
-+
-+ val |= WUCSR_WUFR;
-+
-+ ret = smsc75xx_write_reg_nopm(dev, WUCSR, val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing WUCSR\n");
-+ goto done;
-+ }
-+
-+ netdev_info(dev->net, "enabling packet match detection\n");
-+ ret = smsc75xx_read_reg_nopm(dev, WUCSR, &val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error reading WUCSR\n");
-+ goto done;
-+ }
-+
-+ val |= WUCSR_WUEN;
-+
-+ ret = smsc75xx_write_reg_nopm(dev, WUCSR, val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing WUCSR\n");
-+ goto done;
-+ }
-+ } else {
-+ netdev_info(dev->net, "disabling packet match detection\n");
-+ ret = smsc75xx_read_reg_nopm(dev, WUCSR, &val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error reading WUCSR\n");
-+ goto done;
-+ }
-+
-+ val &= ~WUCSR_WUEN;
-+
-+ ret = smsc75xx_write_reg_nopm(dev, WUCSR, val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing WUCSR\n");
-+ goto done;
-+ }
-+ }
-+
-+ /* disable magic, bcast & unicast wakeup sources */
-+ ret = smsc75xx_read_reg_nopm(dev, WUCSR, &val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error reading WUCSR\n");
-+ goto done;
-+ }
-+
-+ val &= ~(WUCSR_MPEN | WUCSR_BCST_EN | WUCSR_PFDA_EN);
-+
-+ ret = smsc75xx_write_reg_nopm(dev, WUCSR, val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing WUCSR\n");
-+ goto done;
-+ }
-+
-+ if (pdata->wolopts & WAKE_PHY) {
-+ netdev_info(dev->net, "enabling PHY wakeup\n");
-+
-+ ret = smsc75xx_read_reg_nopm(dev, PMT_CTL, &val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error reading PMT_CTL\n");
-+ goto done;
-+ }
-+
-+ /* clear wol status, enable energy detection */
-+ val &= ~PMT_CTL_WUPS;
-+ val |= (PMT_CTL_WUPS_ED | PMT_CTL_ED_EN);
-+
-+ ret = smsc75xx_write_reg_nopm(dev, PMT_CTL, val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing PMT_CTL\n");
-+ goto done;
-+ }
-+ }
-+
-+ if (pdata->wolopts & WAKE_MAGIC) {
-+ netdev_info(dev->net, "enabling magic packet wakeup\n");
-+ ret = smsc75xx_read_reg_nopm(dev, WUCSR, &val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error reading WUCSR\n");
-+ goto done;
-+ }
-+
-+ /* clear any pending magic packet status */
-+ val |= WUCSR_MPR | WUCSR_MPEN;
-+
-+ ret = smsc75xx_write_reg_nopm(dev, WUCSR, val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing WUCSR\n");
-+ goto done;
-+ }
-+ }
-+
-+ if (pdata->wolopts & WAKE_BCAST) {
-+ netdev_info(dev->net, "enabling broadcast detection\n");
-+ ret = smsc75xx_read_reg_nopm(dev, WUCSR, &val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error reading WUCSR\n");
-+ goto done;
-+ }
-+
-+ val |= WUCSR_BCAST_FR | WUCSR_BCST_EN;
-+
-+ ret = smsc75xx_write_reg_nopm(dev, WUCSR, val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing WUCSR\n");
-+ goto done;
-+ }
-+ }
-+
-+ if (pdata->wolopts & WAKE_UCAST) {
-+ netdev_info(dev->net, "enabling unicast detection\n");
-+ ret = smsc75xx_read_reg_nopm(dev, WUCSR, &val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error reading WUCSR\n");
-+ goto done;
-+ }
-+
-+ val |= WUCSR_WUFR | WUCSR_PFDA_EN;
-+
-+ ret = smsc75xx_write_reg_nopm(dev, WUCSR, val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing WUCSR\n");
-+ goto done;
-+ }
-+ }
-+
-+ /* enable receiver to enable frame reception */
-+ ret = smsc75xx_read_reg_nopm(dev, MAC_RX, &val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to read MAC_RX: %d\n", ret);
-+ goto done;
-+ }
-+
-+ val |= MAC_RX_RXEN;
-+
-+ ret = smsc75xx_write_reg_nopm(dev, MAC_RX, val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to write MAC_RX: %d\n", ret);
-+ goto done;
-+ }
-+
-+ /* some wol options are enabled, so enter SUSPEND0 */
-+ netdev_info(dev->net, "entering SUSPEND0 mode\n");
-+ ret = smsc75xx_enter_suspend0(dev);
-+
-+done:
-+ /*
-+ * TODO: resume() might need to handle the suspend failure
-+ * in system sleep
-+ */
-+ if (ret && PMSG_IS_AUTO(message))
-+ usbnet_resume(intf);
-+ return ret;
-+}
-+
-+static int smsc75xx_resume(struct usb_interface *intf)
-+{
-+ struct usbnet *dev = usb_get_intfdata(intf);
-+ struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
-+ u8 suspend_flags = pdata->suspend_flags;
-+ int ret;
-+ u32 val;
-+
-+ netdev_dbg(dev->net, "resume suspend_flags=0x%02x\n", suspend_flags);
-+
-+ /* do this first to ensure it's cleared even in error case */
-+ pdata->suspend_flags = 0;
-+
-+ if (suspend_flags & SUSPEND_ALLMODES) {
-+ /* Disable wakeup sources */
-+ ret = smsc75xx_read_reg_nopm(dev, WUCSR, &val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error reading WUCSR\n");
-+ return ret;
-+ }
-+
-+ val &= ~(WUCSR_WUEN | WUCSR_MPEN | WUCSR_PFDA_EN
-+ | WUCSR_BCST_EN);
-+
-+ ret = smsc75xx_write_reg_nopm(dev, WUCSR, val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing WUCSR\n");
-+ return ret;
-+ }
-+
-+ /* clear wake-up status */
-+ ret = smsc75xx_read_reg_nopm(dev, PMT_CTL, &val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error reading PMT_CTL\n");
-+ return ret;
-+ }
-+
-+ val &= ~PMT_CTL_WOL_EN;
-+ val |= PMT_CTL_WUPS;
-+
-+ ret = smsc75xx_write_reg_nopm(dev, PMT_CTL, val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing PMT_CTL\n");
-+ return ret;
-+ }
-+ }
-+
-+ if (suspend_flags & SUSPEND_SUSPEND2) {
-+ netdev_info(dev->net, "resuming from SUSPEND2\n");
-+
-+ ret = smsc75xx_read_reg_nopm(dev, PMT_CTL, &val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error reading PMT_CTL\n");
-+ return ret;
-+ }
-+
-+ val |= PMT_CTL_PHY_PWRUP;
-+
-+ ret = smsc75xx_write_reg_nopm(dev, PMT_CTL, val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing PMT_CTL\n");
-+ return ret;
-+ }
-+ }
-+
-+ ret = smsc75xx_wait_ready(dev, 1);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "device not ready in smsc75xx_resume\n");
-+ return ret;
-+ }
-+
-+ return usbnet_resume(intf);
-+}
-+
-+static void smsc75xx_rx_csum_offload(struct usbnet *dev, struct sk_buff *skb,
-+ u32 rx_cmd_a, u32 rx_cmd_b)
-+{
-+ if (!(dev->net->features & NETIF_F_RXCSUM) ||
-+ unlikely(rx_cmd_a & RX_CMD_A_LCSM)) {
-+ skb->ip_summed = CHECKSUM_NONE;
-+ } else {
-+ skb->csum = ntohs((u16)(rx_cmd_b >> RX_CMD_B_CSUM_SHIFT));
-+ skb->ip_summed = CHECKSUM_COMPLETE;
-+ }
-+}
-+
-+static int smsc75xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
-+{
-+ /* This check is no longer done by usbnet */
-+ if (skb->len < dev->net->hard_header_len)
-+ return 0;
-+
-+ while (skb->len > 0) {
-+ u32 rx_cmd_a, rx_cmd_b, align_count, size;
-+ struct sk_buff *ax_skb;
-+ unsigned char *packet;
-+
-+ memcpy(&rx_cmd_a, skb->data, sizeof(rx_cmd_a));
-+ le32_to_cpus(&rx_cmd_a);
-+ skb_pull(skb, 4);
-+
-+ memcpy(&rx_cmd_b, skb->data, sizeof(rx_cmd_b));
-+ le32_to_cpus(&rx_cmd_b);
-+ skb_pull(skb, 4 + RXW_PADDING);
-+
-+ packet = skb->data;
-+
-+ /* get the packet length */
-+ size = (rx_cmd_a & RX_CMD_A_LEN) - RXW_PADDING;
-+ align_count = (4 - ((size + RXW_PADDING) % 4)) % 4;
-+
-+ if (unlikely(rx_cmd_a & RX_CMD_A_RED)) {
-+ netif_dbg(dev, rx_err, dev->net,
-+ "Error rx_cmd_a=0x%08x\n", rx_cmd_a);
-+ dev->net->stats.rx_errors++;
-+ dev->net->stats.rx_dropped++;
-+
-+ if (rx_cmd_a & RX_CMD_A_FCS)
-+ dev->net->stats.rx_crc_errors++;
-+ else if (rx_cmd_a & (RX_CMD_A_LONG | RX_CMD_A_RUNT))
-+ dev->net->stats.rx_frame_errors++;
-+ } else {
-+ /* MAX_SINGLE_PACKET_SIZE + 4(CRC) + 2(COE) + 4(Vlan) */
-+ if (unlikely(size > (MAX_SINGLE_PACKET_SIZE + ETH_HLEN + 12))) {
-+ netif_dbg(dev, rx_err, dev->net,
-+ "size err rx_cmd_a=0x%08x\n",
-+ rx_cmd_a);
-+ return 0;
-+ }
-+
-+ /* last frame in this batch */
-+ if (skb->len == size) {
-+ smsc75xx_rx_csum_offload(dev, skb, rx_cmd_a,
-+ rx_cmd_b);
-+
-+ skb_trim(skb, skb->len - 4); /* remove fcs */
-+ skb->truesize = size + sizeof(struct sk_buff);
-+
-+ return 1;
-+ }
-+
-+ ax_skb = skb_clone(skb, GFP_ATOMIC);
-+ if (unlikely(!ax_skb)) {
-+ netdev_warn(dev->net, "Error allocating skb\n");
-+ return 0;
-+ }
-+
-+ ax_skb->len = size;
-+ ax_skb->data = packet;
-+ skb_set_tail_pointer(ax_skb, size);
-+
-+ smsc75xx_rx_csum_offload(dev, ax_skb, rx_cmd_a,
-+ rx_cmd_b);
-+
-+ skb_trim(ax_skb, ax_skb->len - 4); /* remove fcs */
-+ ax_skb->truesize = size + sizeof(struct sk_buff);
-+
-+ usbnet_skb_return(dev, ax_skb);
-+ }
-+
-+ skb_pull(skb, size);
-+
-+ /* padding bytes before the next frame starts */
-+ if (skb->len)
-+ skb_pull(skb, align_count);
-+ }
-+
-+ if (unlikely(skb->len < 0)) {
-+ netdev_warn(dev->net, "invalid rx length<0 %d\n", skb->len);
-+ return 0;
-+ }
-+
-+ return 1;
-+}
-+
-+static struct sk_buff *smsc75xx_tx_fixup(struct usbnet *dev,
-+ struct sk_buff *skb, gfp_t flags)
-+{
-+ u32 tx_cmd_a, tx_cmd_b;
-+
-+ if (skb_headroom(skb) < SMSC75XX_TX_OVERHEAD) {
-+ struct sk_buff *skb2 =
-+ skb_copy_expand(skb, SMSC75XX_TX_OVERHEAD, 0, flags);
-+ dev_kfree_skb_any(skb);
-+ skb = skb2;
-+ if (!skb)
-+ return NULL;
-+ }
-+
-+ tx_cmd_a = (u32)(skb->len & TX_CMD_A_LEN) | TX_CMD_A_FCS;
-+
-+ if (skb->ip_summed == CHECKSUM_PARTIAL)
-+ tx_cmd_a |= TX_CMD_A_IPE | TX_CMD_A_TPE;
-+
-+ if (skb_is_gso(skb)) {
-+ u16 mss = max(skb_shinfo(skb)->gso_size, TX_MSS_MIN);
-+ tx_cmd_b = (mss << TX_CMD_B_MSS_SHIFT) & TX_CMD_B_MSS;
-+
-+ tx_cmd_a |= TX_CMD_A_LSO;
-+ } else {
-+ tx_cmd_b = 0;
-+ }
-+
-+ skb_push(skb, 4);
-+ cpu_to_le32s(&tx_cmd_b);
-+ memcpy(skb->data, &tx_cmd_b, 4);
-+
-+ skb_push(skb, 4);
-+ cpu_to_le32s(&tx_cmd_a);
-+ memcpy(skb->data, &tx_cmd_a, 4);
-+
-+ return skb;
-+}
-+
-+static int smsc75xx_manage_power(struct usbnet *dev, int on)
-+{
-+ dev->intf->needs_remote_wakeup = on;
-+ return 0;
-+}
-+
-+static const struct driver_info smsc75xx_info = {
-+ .description = "smsc75xx USB 2.0 Gigabit Ethernet",
-+ .bind = smsc75xx_bind,
-+ .unbind = smsc75xx_unbind,
-+ .link_reset = smsc75xx_link_reset,
-+ .reset = smsc75xx_reset,
-+ .rx_fixup = smsc75xx_rx_fixup,
-+ .tx_fixup = smsc75xx_tx_fixup,
-+ .status = smsc75xx_status,
-+ .manage_power = smsc75xx_manage_power,
-+ .flags = FLAG_ETHER | FLAG_SEND_ZLP | FLAG_LINK_INTR,
-+};
-+
-+static const struct usb_device_id products[] = {
-+ {
-+ /* SMSC7500 USB Gigabit Ethernet Device */
-+ USB_DEVICE(USB_VENDOR_ID_SMSC, USB_PRODUCT_ID_LAN7500),
-+ .driver_info = (unsigned long) &smsc75xx_info,
-+ },
-+ {
-+ /* SMSC7500 USB Gigabit Ethernet Device */
-+ USB_DEVICE(USB_VENDOR_ID_SMSC, USB_PRODUCT_ID_LAN7505),
-+ .driver_info = (unsigned long) &smsc75xx_info,
-+ },
-+ { }, /* END */
-+};
-+MODULE_DEVICE_TABLE(usb, products);
-+
-+static struct usb_driver smsc75xx_driver = {
-+ .name = SMSC_CHIPNAME,
-+ .id_table = products,
-+ .probe = usbnet_probe,
-+ .suspend = smsc75xx_suspend,
-+ .resume = smsc75xx_resume,
-+ .reset_resume = smsc75xx_resume,
-+ .disconnect = usbnet_disconnect,
-+ .disable_hub_initiated_lpm = 1,
-+ .supports_autosuspend = 1,
-+};
-+
-+module_usb_driver(smsc75xx_driver);
-+
-+MODULE_AUTHOR("Nancy Lin");
-+MODULE_AUTHOR("Steve Glendinning <steve.glendinning(a)shawell.net>");
-+MODULE_DESCRIPTION("SMSC75XX USB 2.0 Gigabit Ethernet Devices");
-+MODULE_LICENSE("GPL");
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/smsc75xx.h backports-3.18.1-1/drivers/net/usb/smsc75xx.h
---- backports-3.18.1-1.org/drivers/net/usb/smsc75xx.h 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/smsc75xx.h 2014-12-16 18:39:45.000000000 +0100
-@@ -0,0 +1,421 @@
-+ /***************************************************************************
-+ *
-+ * Copyright (C) 2007-2010 SMSC
-+ *
-+ * 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, see <http://www.gnu.org/licenses/>.
-+ *
-+ *****************************************************************************/
-+
-+#ifndef _SMSC75XX_H
-+#define _SMSC75XX_H
-+
-+/* Tx command words */
-+#define TX_CMD_A_LSO (0x08000000)
-+#define TX_CMD_A_IPE (0x04000000)
-+#define TX_CMD_A_TPE (0x02000000)
-+#define TX_CMD_A_IVTG (0x01000000)
-+#define TX_CMD_A_RVTG (0x00800000)
-+#define TX_CMD_A_FCS (0x00400000)
-+#define TX_CMD_A_LEN (0x000FFFFF)
-+
-+#define TX_CMD_B_MSS (0x3FFF0000)
-+#define TX_CMD_B_MSS_SHIFT (16)
-+#define TX_MSS_MIN ((u16)8)
-+#define TX_CMD_B_VTAG (0x0000FFFF)
-+
-+/* Rx command words */
-+#define RX_CMD_A_ICE (0x80000000)
-+#define RX_CMD_A_TCE (0x40000000)
-+#define RX_CMD_A_IPV (0x20000000)
-+#define RX_CMD_A_PID (0x18000000)
-+#define RX_CMD_A_PID_NIP (0x00000000)
-+#define RX_CMD_A_PID_TCP (0x08000000)
-+#define RX_CMD_A_PID_UDP (0x10000000)
-+#define RX_CMD_A_PID_PP (0x18000000)
-+#define RX_CMD_A_PFF (0x04000000)
-+#define RX_CMD_A_BAM (0x02000000)
-+#define RX_CMD_A_MAM (0x01000000)
-+#define RX_CMD_A_FVTG (0x00800000)
-+#define RX_CMD_A_RED (0x00400000)
-+#define RX_CMD_A_RWT (0x00200000)
-+#define RX_CMD_A_RUNT (0x00100000)
-+#define RX_CMD_A_LONG (0x00080000)
-+#define RX_CMD_A_RXE (0x00040000)
-+#define RX_CMD_A_DRB (0x00020000)
-+#define RX_CMD_A_FCS (0x00010000)
-+#define RX_CMD_A_UAM (0x00008000)
-+#define RX_CMD_A_LCSM (0x00004000)
-+#define RX_CMD_A_LEN (0x00003FFF)
-+
-+#define RX_CMD_B_CSUM (0xFFFF0000)
-+#define RX_CMD_B_CSUM_SHIFT (16)
-+#define RX_CMD_B_VTAG (0x0000FFFF)
-+
-+/* SCSRs */
-+#define ID_REV (0x0000)
-+
-+#define FPGA_REV (0x0004)
-+
-+#define BOND_CTL (0x0008)
-+
-+#define INT_STS (0x000C)
-+#define INT_STS_RDFO_INT (0x00400000)
-+#define INT_STS_TXE_INT (0x00200000)
-+#define INT_STS_MACRTO_INT (0x00100000)
-+#define INT_STS_TX_DIS_INT (0x00080000)
-+#define INT_STS_RX_DIS_INT (0x00040000)
-+#define INT_STS_PHY_INT_ (0x00020000)
-+#define INT_STS_MAC_ERR_INT (0x00008000)
-+#define INT_STS_TDFU (0x00004000)
-+#define INT_STS_TDFO (0x00002000)
-+#define INT_STS_GPIOS (0x00000FFF)
-+#define INT_STS_CLEAR_ALL (0xFFFFFFFF)
-+
-+#define HW_CFG (0x0010)
-+#define HW_CFG_SMDET_STS (0x00008000)
-+#define HW_CFG_SMDET_EN (0x00004000)
-+#define HW_CFG_EEM (0x00002000)
-+#define HW_CFG_RST_PROTECT (0x00001000)
-+#define HW_CFG_PORT_SWAP (0x00000800)
-+#define HW_CFG_PHY_BOOST (0x00000600)
-+#define HW_CFG_PHY_BOOST_NORMAL (0x00000000)
-+#define HW_CFG_PHY_BOOST_4 (0x00002000)
-+#define HW_CFG_PHY_BOOST_8 (0x00004000)
-+#define HW_CFG_PHY_BOOST_12 (0x00006000)
-+#define HW_CFG_LEDB (0x00000100)
-+#define HW_CFG_BIR (0x00000080)
-+#define HW_CFG_SBP (0x00000040)
-+#define HW_CFG_IME (0x00000020)
-+#define HW_CFG_MEF (0x00000010)
-+#define HW_CFG_ETC (0x00000008)
-+#define HW_CFG_BCE (0x00000004)
-+#define HW_CFG_LRST (0x00000002)
-+#define HW_CFG_SRST (0x00000001)
-+
-+#define PMT_CTL (0x0014)
-+#define PMT_CTL_PHY_PWRUP (0x00000400)
-+#define PMT_CTL_RES_CLR_WKP_EN (0x00000100)
-+#define PMT_CTL_DEV_RDY (0x00000080)
-+#define PMT_CTL_SUS_MODE (0x00000060)
-+#define PMT_CTL_SUS_MODE_0 (0x00000000)
-+#define PMT_CTL_SUS_MODE_1 (0x00000020)
-+#define PMT_CTL_SUS_MODE_2 (0x00000040)
-+#define PMT_CTL_SUS_MODE_3 (0x00000060)
-+#define PMT_CTL_PHY_RST (0x00000010)
-+#define PMT_CTL_WOL_EN (0x00000008)
-+#define PMT_CTL_ED_EN (0x00000004)
-+#define PMT_CTL_WUPS (0x00000003)
-+#define PMT_CTL_WUPS_NO (0x00000000)
-+#define PMT_CTL_WUPS_ED (0x00000001)
-+#define PMT_CTL_WUPS_WOL (0x00000002)
-+#define PMT_CTL_WUPS_MULTI (0x00000003)
-+
-+#define LED_GPIO_CFG (0x0018)
-+#define LED_GPIO_CFG_LED2_FUN_SEL (0x80000000)
-+#define LED_GPIO_CFG_LED10_FUN_SEL (0x40000000)
-+#define LED_GPIO_CFG_LEDGPIO_EN (0x0000F000)
-+#define LED_GPIO_CFG_LEDGPIO_EN_0 (0x00001000)
-+#define LED_GPIO_CFG_LEDGPIO_EN_1 (0x00002000)
-+#define LED_GPIO_CFG_LEDGPIO_EN_2 (0x00004000)
-+#define LED_GPIO_CFG_LEDGPIO_EN_3 (0x00008000)
-+#define LED_GPIO_CFG_GPBUF (0x00000F00)
-+#define LED_GPIO_CFG_GPBUF_0 (0x00000100)
-+#define LED_GPIO_CFG_GPBUF_1 (0x00000200)
-+#define LED_GPIO_CFG_GPBUF_2 (0x00000400)
-+#define LED_GPIO_CFG_GPBUF_3 (0x00000800)
-+#define LED_GPIO_CFG_GPDIR (0x000000F0)
-+#define LED_GPIO_CFG_GPDIR_0 (0x00000010)
-+#define LED_GPIO_CFG_GPDIR_1 (0x00000020)
-+#define LED_GPIO_CFG_GPDIR_2 (0x00000040)
-+#define LED_GPIO_CFG_GPDIR_3 (0x00000080)
-+#define LED_GPIO_CFG_GPDATA (0x0000000F)
-+#define LED_GPIO_CFG_GPDATA_0 (0x00000001)
-+#define LED_GPIO_CFG_GPDATA_1 (0x00000002)
-+#define LED_GPIO_CFG_GPDATA_2 (0x00000004)
-+#define LED_GPIO_CFG_GPDATA_3 (0x00000008)
-+
-+#define GPIO_CFG (0x001C)
-+#define GPIO_CFG_SHIFT (24)
-+#define GPIO_CFG_GPEN (0xFF000000)
-+#define GPIO_CFG_GPBUF (0x00FF0000)
-+#define GPIO_CFG_GPDIR (0x0000FF00)
-+#define GPIO_CFG_GPDATA (0x000000FF)
-+
-+#define GPIO_WAKE (0x0020)
-+#define GPIO_WAKE_PHY_LINKUP_EN (0x80000000)
-+#define GPIO_WAKE_POL (0x0FFF0000)
-+#define GPIO_WAKE_POL_SHIFT (16)
-+#define GPIO_WAKE_WK (0x00000FFF)
-+
-+#define DP_SEL (0x0024)
-+#define DP_SEL_DPRDY (0x80000000)
-+#define DP_SEL_RSEL (0x0000000F)
-+#define DP_SEL_URX (0x00000000)
-+#define DP_SEL_VHF (0x00000001)
-+#define DP_SEL_VHF_HASH_LEN (16)
-+#define DP_SEL_VHF_VLAN_LEN (128)
-+#define DP_SEL_LSO_HEAD (0x00000002)
-+#define DP_SEL_FCT_RX (0x00000003)
-+#define DP_SEL_FCT_TX (0x00000004)
-+#define DP_SEL_DESCRIPTOR (0x00000005)
-+#define DP_SEL_WOL (0x00000006)
-+
-+#define DP_CMD (0x0028)
-+#define DP_CMD_WRITE (0x01)
-+#define DP_CMD_READ (0x00)
-+
-+#define DP_ADDR (0x002C)
-+
-+#define DP_DATA (0x0030)
-+
-+#define BURST_CAP (0x0034)
-+#define BURST_CAP_MASK (0x0000000F)
-+
-+#define INT_EP_CTL (0x0038)
-+#define INT_EP_CTL_INTEP_ON (0x80000000)
-+#define INT_EP_CTL_RDFO_EN (0x00400000)
-+#define INT_EP_CTL_TXE_EN (0x00200000)
-+#define INT_EP_CTL_MACROTO_EN (0x00100000)
-+#define INT_EP_CTL_TX_DIS_EN (0x00080000)
-+#define INT_EP_CTL_RX_DIS_EN (0x00040000)
-+#define INT_EP_CTL_PHY_EN_ (0x00020000)
-+#define INT_EP_CTL_MAC_ERR_EN (0x00008000)
-+#define INT_EP_CTL_TDFU_EN (0x00004000)
-+#define INT_EP_CTL_TDFO_EN (0x00002000)
-+#define INT_EP_CTL_RX_FIFO_EN (0x00001000)
-+#define INT_EP_CTL_GPIOX_EN (0x00000FFF)
-+
-+#define BULK_IN_DLY (0x003C)
-+#define BULK_IN_DLY_MASK (0xFFFF)
-+
-+#define E2P_CMD (0x0040)
-+#define E2P_CMD_BUSY (0x80000000)
-+#define E2P_CMD_MASK (0x70000000)
-+#define E2P_CMD_READ (0x00000000)
-+#define E2P_CMD_EWDS (0x10000000)
-+#define E2P_CMD_EWEN (0x20000000)
-+#define E2P_CMD_WRITE (0x30000000)
-+#define E2P_CMD_WRAL (0x40000000)
-+#define E2P_CMD_ERASE (0x50000000)
-+#define E2P_CMD_ERAL (0x60000000)
-+#define E2P_CMD_RELOAD (0x70000000)
-+#define E2P_CMD_TIMEOUT (0x00000400)
-+#define E2P_CMD_LOADED (0x00000200)
-+#define E2P_CMD_ADDR (0x000001FF)
-+
-+#define MAX_EEPROM_SIZE (512)
-+
-+#define E2P_DATA (0x0044)
-+#define E2P_DATA_MASK_ (0x000000FF)
-+
-+#define RFE_CTL (0x0060)
-+#define RFE_CTL_TCPUDP_CKM (0x00001000)
-+#define RFE_CTL_IP_CKM (0x00000800)
-+#define RFE_CTL_AB (0x00000400)
-+#define RFE_CTL_AM (0x00000200)
-+#define RFE_CTL_AU (0x00000100)
-+#define RFE_CTL_VS (0x00000080)
-+#define RFE_CTL_UF (0x00000040)
-+#define RFE_CTL_VF (0x00000020)
-+#define RFE_CTL_SPF (0x00000010)
-+#define RFE_CTL_MHF (0x00000008)
-+#define RFE_CTL_DHF (0x00000004)
-+#define RFE_CTL_DPF (0x00000002)
-+#define RFE_CTL_RST_RF (0x00000001)
-+
-+#define VLAN_TYPE (0x0064)
-+#define VLAN_TYPE_MASK (0x0000FFFF)
-+
-+#define FCT_RX_CTL (0x0090)
-+#define FCT_RX_CTL_EN (0x80000000)
-+#define FCT_RX_CTL_RST (0x40000000)
-+#define FCT_RX_CTL_SBF (0x02000000)
-+#define FCT_RX_CTL_OVERFLOW (0x01000000)
-+#define FCT_RX_CTL_FRM_DROP (0x00800000)
-+#define FCT_RX_CTL_RX_NOT_EMPTY (0x00400000)
-+#define FCT_RX_CTL_RX_EMPTY (0x00200000)
-+#define FCT_RX_CTL_RX_DISABLED (0x00100000)
-+#define FCT_RX_CTL_RXUSED (0x0000FFFF)
-+
-+#define FCT_TX_CTL (0x0094)
-+#define FCT_TX_CTL_EN (0x80000000)
-+#define FCT_TX_CTL_RST (0x40000000)
-+#define FCT_TX_CTL_TX_NOT_EMPTY (0x00400000)
-+#define FCT_TX_CTL_TX_EMPTY (0x00200000)
-+#define FCT_TX_CTL_TX_DISABLED (0x00100000)
-+#define FCT_TX_CTL_TXUSED (0x0000FFFF)
-+
-+#define FCT_RX_FIFO_END (0x0098)
-+#define FCT_RX_FIFO_END_MASK (0x0000007F)
-+
-+#define FCT_TX_FIFO_END (0x009C)
-+#define FCT_TX_FIFO_END_MASK (0x0000003F)
-+
-+#define FCT_FLOW (0x00A0)
-+#define FCT_FLOW_THRESHOLD_OFF (0x00007F00)
-+#define FCT_FLOW_THRESHOLD_OFF_SHIFT (8)
-+#define FCT_FLOW_THRESHOLD_ON (0x0000007F)
-+
-+/* MAC CSRs */
-+#define MAC_CR (0x100)
-+#define MAC_CR_ADP (0x00002000)
-+#define MAC_CR_ADD (0x00001000)
-+#define MAC_CR_ASD (0x00000800)
-+#define MAC_CR_INT_LOOP (0x00000400)
-+#define MAC_CR_BOLMT (0x000000C0)
-+#define MAC_CR_FDPX (0x00000008)
-+#define MAC_CR_CFG (0x00000006)
-+#define MAC_CR_CFG_10 (0x00000000)
-+#define MAC_CR_CFG_100 (0x00000002)
-+#define MAC_CR_CFG_1000 (0x00000004)
-+#define MAC_CR_RST (0x00000001)
-+
-+#define MAC_RX (0x104)
-+#define MAC_RX_MAX_SIZE (0x3FFF0000)
-+#define MAC_RX_MAX_SIZE_SHIFT (16)
-+#define MAC_RX_FCS_STRIP (0x00000010)
-+#define MAC_RX_FSE (0x00000004)
-+#define MAC_RX_RXD (0x00000002)
-+#define MAC_RX_RXEN (0x00000001)
-+
-+#define MAC_TX (0x108)
-+#define MAC_TX_BFCS (0x00000004)
-+#define MAC_TX_TXD (0x00000002)
-+#define MAC_TX_TXEN (0x00000001)
-+
-+#define FLOW (0x10C)
-+#define FLOW_FORCE_FC (0x80000000)
-+#define FLOW_TX_FCEN (0x40000000)
-+#define FLOW_RX_FCEN (0x20000000)
-+#define FLOW_FPF (0x10000000)
-+#define FLOW_PAUSE_TIME (0x0000FFFF)
-+
-+#define RAND_SEED (0x110)
-+#define RAND_SEED_MASK (0x0000FFFF)
-+
-+#define ERR_STS (0x114)
-+#define ERR_STS_FCS_ERR (0x00000100)
-+#define ERR_STS_LFRM_ERR (0x00000080)
-+#define ERR_STS_RUNT_ERR (0x00000040)
-+#define ERR_STS_COLLISION_ERR (0x00000010)
-+#define ERR_STS_ALIGN_ERR (0x00000008)
-+#define ERR_STS_URUN_ERR (0x00000004)
-+
-+#define RX_ADDRH (0x118)
-+#define RX_ADDRH_MASK (0x0000FFFF)
-+
-+#define RX_ADDRL (0x11C)
-+
-+#define MII_ACCESS (0x120)
-+#define MII_ACCESS_PHY_ADDR (0x0000F800)
-+#define MII_ACCESS_PHY_ADDR_SHIFT (11)
-+#define MII_ACCESS_REG_ADDR (0x000007C0)
-+#define MII_ACCESS_REG_ADDR_SHIFT (6)
-+#define MII_ACCESS_READ (0x00000000)
-+#define MII_ACCESS_WRITE (0x00000002)
-+#define MII_ACCESS_BUSY (0x00000001)
-+
-+#define MII_DATA (0x124)
-+#define MII_DATA_MASK (0x0000FFFF)
-+
-+#define WUCSR (0x140)
-+#define WUCSR_PFDA_FR (0x00000080)
-+#define WUCSR_WUFR (0x00000040)
-+#define WUCSR_MPR (0x00000020)
-+#define WUCSR_BCAST_FR (0x00000010)
-+#define WUCSR_PFDA_EN (0x00000008)
-+#define WUCSR_WUEN (0x00000004)
-+#define WUCSR_MPEN (0x00000002)
-+#define WUCSR_BCST_EN (0x00000001)
-+
-+#define WUF_CFGX (0x144)
-+#define WUF_CFGX_EN (0x80000000)
-+#define WUF_CFGX_ATYPE (0x03000000)
-+#define WUF_CFGX_ATYPE_UNICAST (0x00000000)
-+#define WUF_CFGX_ATYPE_MULTICAST (0x02000000)
-+#define WUF_CFGX_ATYPE_ALL (0x03000000)
-+#define WUF_CFGX_PATTERN_OFFSET (0x007F0000)
-+#define WUF_CFGX_PATTERN_OFFSET_SHIFT (16)
-+#define WUF_CFGX_CRC16 (0x0000FFFF)
-+#define WUF_NUM (8)
-+
-+#define WUF_MASKX (0x170)
-+#define WUF_MASKX_AVALID (0x80000000)
-+#define WUF_MASKX_ATYPE (0x40000000)
-+
-+#define ADDR_FILTX (0x300)
-+#define ADDR_FILTX_FB_VALID (0x80000000)
-+#define ADDR_FILTX_FB_TYPE (0x40000000)
-+#define ADDR_FILTX_FB_ADDRHI (0x0000FFFF)
-+#define ADDR_FILTX_SB_ADDRLO (0xFFFFFFFF)
-+
-+#define WUCSR2 (0x500)
-+#define WUCSR2_NS_RCD (0x00000040)
-+#define WUCSR2_ARP_RCD (0x00000020)
-+#define WUCSR2_TCPSYN_RCD (0x00000010)
-+#define WUCSR2_NS_OFFLOAD (0x00000004)
-+#define WUCSR2_ARP_OFFLOAD (0x00000002)
-+#define WUCSR2_TCPSYN_OFFLOAD (0x00000001)
-+
-+#define WOL_FIFO_STS (0x504)
-+
-+#define IPV6_ADDRX (0x510)
-+
-+#define IPV4_ADDRX (0x590)
-+
-+
-+/* Vendor-specific PHY Definitions */
-+
-+/* Mode Control/Status Register */
-+#define PHY_MODE_CTRL_STS (17)
-+#define MODE_CTRL_STS_EDPWRDOWN ((u16)0x2000)
-+#define MODE_CTRL_STS_ENERGYON ((u16)0x0002)
-+
-+#define PHY_INT_SRC (29)
-+#define PHY_INT_SRC_ENERGY_ON ((u16)0x0080)
-+#define PHY_INT_SRC_ANEG_COMP ((u16)0x0040)
-+#define PHY_INT_SRC_REMOTE_FAULT ((u16)0x0020)
-+#define PHY_INT_SRC_LINK_DOWN ((u16)0x0010)
-+#define PHY_INT_SRC_CLEAR_ALL ((u16)0xffff)
-+
-+#define PHY_INT_MASK (30)
-+#define PHY_INT_MASK_ENERGY_ON ((u16)0x0080)
-+#define PHY_INT_MASK_ANEG_COMP ((u16)0x0040)
-+#define PHY_INT_MASK_REMOTE_FAULT ((u16)0x0020)
-+#define PHY_INT_MASK_LINK_DOWN ((u16)0x0010)
-+#define PHY_INT_MASK_DEFAULT (PHY_INT_MASK_ANEG_COMP | \
-+ PHY_INT_MASK_LINK_DOWN)
-+
-+#define PHY_SPECIAL (31)
-+#define PHY_SPECIAL_SPD ((u16)0x001C)
-+#define PHY_SPECIAL_SPD_10HALF ((u16)0x0004)
-+#define PHY_SPECIAL_SPD_10FULL ((u16)0x0014)
-+#define PHY_SPECIAL_SPD_100HALF ((u16)0x0008)
-+#define PHY_SPECIAL_SPD_100FULL ((u16)0x0018)
-+
-+/* USB Vendor Requests */
-+#define USB_VENDOR_REQUEST_WRITE_REGISTER 0xA0
-+#define USB_VENDOR_REQUEST_READ_REGISTER 0xA1
-+#define USB_VENDOR_REQUEST_GET_STATS 0xA2
-+
-+/* Interrupt Endpoint status word bitfields */
-+#define INT_ENP_RDFO_INT ((u32)BIT(22))
-+#define INT_ENP_TXE_INT ((u32)BIT(21))
-+#define INT_ENP_TX_DIS_INT ((u32)BIT(19))
-+#define INT_ENP_RX_DIS_INT ((u32)BIT(18))
-+#define INT_ENP_PHY_INT ((u32)BIT(17))
-+#define INT_ENP_MAC_ERR_INT ((u32)BIT(15))
-+#define INT_ENP_RX_FIFO_DATA_INT ((u32)BIT(12))
-+
-+#endif /* _SMSC75XX_H */
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/smsc95xx.c backports-3.18.1-1/drivers/net/usb/smsc95xx.c
---- backports-3.18.1-1.org/drivers/net/usb/smsc95xx.c 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/smsc95xx.c 2014-12-16 18:39:45.000000000 +0100
-@@ -0,0 +1,2030 @@
-+ /***************************************************************************
-+ *
-+ * Copyright (C) 2007-2008 SMSC
-+ *
-+ * 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, see <http://www.gnu.org/licenses/>.
-+ *
-+ *****************************************************************************/
-+
-+#include <linux/module.h>
-+#include <linux/kmod.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/ethtool.h>
-+#include <linux/mii.h>
-+#include <linux/usb.h>
-+#include <linux/bitrev.h>
-+#include <linux/crc16.h>
-+#include <linux/crc32.h>
-+#include <linux/usb/usbnet.h>
-+#include <linux/slab.h>
-+#include "smsc95xx.h"
-+
-+#define SMSC_CHIPNAME "smsc95xx"
-+#define SMSC_DRIVER_VERSION "1.0.4"
-+#define HS_USB_PKT_SIZE (512)
-+#define FS_USB_PKT_SIZE (64)
-+#define DEFAULT_HS_BURST_CAP_SIZE (16 * 1024 + 5 * HS_USB_PKT_SIZE)
-+#define DEFAULT_FS_BURST_CAP_SIZE (6 * 1024 + 33 * FS_USB_PKT_SIZE)
-+#define DEFAULT_BULK_IN_DELAY (0x00002000)
-+#define MAX_SINGLE_PACKET_SIZE (2048)
-+#define LAN95XX_EEPROM_MAGIC (0x9500)
-+#define EEPROM_MAC_OFFSET (0x01)
-+#define DEFAULT_TX_CSUM_ENABLE (true)
-+#define DEFAULT_RX_CSUM_ENABLE (true)
-+#define SMSC95XX_INTERNAL_PHY_ID (1)
-+#define SMSC95XX_TX_OVERHEAD (8)
-+#define SMSC95XX_TX_OVERHEAD_CSUM (12)
-+#define SUPPORTED_WAKE (WAKE_PHY | WAKE_UCAST | WAKE_BCAST | \
-+ WAKE_MCAST | WAKE_ARP | WAKE_MAGIC)
-+
-+#define FEATURE_8_WAKEUP_FILTERS (0x01)
-+#define FEATURE_PHY_NLP_CROSSOVER (0x02)
-+#define FEATURE_REMOTE_WAKEUP (0x04)
-+
-+#define SUSPEND_SUSPEND0 (0x01)
-+#define SUSPEND_SUSPEND1 (0x02)
-+#define SUSPEND_SUSPEND2 (0x04)
-+#define SUSPEND_SUSPEND3 (0x08)
-+#define SUSPEND_ALLMODES (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \
-+ SUSPEND_SUSPEND2 | SUSPEND_SUSPEND3)
-+
-+struct smsc95xx_priv {
-+ u32 mac_cr;
-+ u32 hash_hi;
-+ u32 hash_lo;
-+ u32 wolopts;
-+ spinlock_t mac_cr_lock;
-+ u8 features;
-+ u8 suspend_flags;
-+};
-+
-+static bool turbo_mode = true;
-+module_param(turbo_mode, bool, 0644);
-+MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction");
-+
-+static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
-+ u32 *data, int in_pm)
-+{
-+ u32 buf;
-+ int ret;
-+ int (*fn)(struct usbnet *, u8, u8, u16, u16, void *, u16);
-+
-+ BUG_ON(!dev);
-+
-+ if (!in_pm)
-+ fn = usbnet_read_cmd;
-+ else
-+ fn = usbnet_read_cmd_nopm;
-+
-+ ret = fn(dev, USB_VENDOR_REQUEST_READ_REGISTER, USB_DIR_IN
-+ | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-+ 0, index, &buf, 4);
-+ if (unlikely(ret < 0))
-+ netdev_warn(dev->net, "Failed to read reg index 0x%08x: %d\n",
-+ index, ret);
-+
-+ le32_to_cpus(&buf);
-+ *data = buf;
-+
-+ return ret;
-+}
-+
-+static int __must_check __smsc95xx_write_reg(struct usbnet *dev, u32 index,
-+ u32 data, int in_pm)
-+{
-+ u32 buf;
-+ int ret;
-+ int (*fn)(struct usbnet *, u8, u8, u16, u16, const void *, u16);
-+
-+ BUG_ON(!dev);
-+
-+ if (!in_pm)
-+ fn = usbnet_write_cmd;
-+ else
-+ fn = usbnet_write_cmd_nopm;
-+
-+ buf = data;
-+ cpu_to_le32s(&buf);
-+
-+ ret = fn(dev, USB_VENDOR_REQUEST_WRITE_REGISTER, USB_DIR_OUT
-+ | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-+ 0, index, &buf, 4);
-+ if (unlikely(ret < 0))
-+ netdev_warn(dev->net, "Failed to write reg index 0x%08x: %d\n",
-+ index, ret);
-+
-+ return ret;
-+}
-+
-+static int __must_check smsc95xx_read_reg_nopm(struct usbnet *dev, u32 index,
-+ u32 *data)
-+{
-+ return __smsc95xx_read_reg(dev, index, data, 1);
-+}
-+
-+static int __must_check smsc95xx_write_reg_nopm(struct usbnet *dev, u32 index,
-+ u32 data)
-+{
-+ return __smsc95xx_write_reg(dev, index, data, 1);
-+}
-+
-+static int __must_check smsc95xx_read_reg(struct usbnet *dev, u32 index,
-+ u32 *data)
-+{
-+ return __smsc95xx_read_reg(dev, index, data, 0);
-+}
-+
-+static int __must_check smsc95xx_write_reg(struct usbnet *dev, u32 index,
-+ u32 data)
-+{
-+ return __smsc95xx_write_reg(dev, index, data, 0);
-+}
-+
-+/* Loop until the read is completed with timeout
-+ * called with phy_mutex held */
-+static int __must_check __smsc95xx_phy_wait_not_busy(struct usbnet *dev,
-+ int in_pm)
-+{
-+ unsigned long start_time = jiffies;
-+ u32 val;
-+ int ret;
-+
-+ do {
-+ ret = __smsc95xx_read_reg(dev, MII_ADDR, &val, in_pm);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error reading MII_ACCESS\n");
-+ return ret;
-+ }
-+
-+ if (!(val & MII_BUSY_))
-+ return 0;
-+ } while (!time_after(jiffies, start_time + HZ));
-+
-+ return -EIO;
-+}
-+
-+static int __smsc95xx_mdio_read(struct net_device *netdev, int phy_id, int idx,
-+ int in_pm)
-+{
-+ struct usbnet *dev = netdev_priv(netdev);
-+ u32 val, addr;
-+ int ret;
-+
-+ mutex_lock(&dev->phy_mutex);
-+
-+ /* confirm MII not busy */
-+ ret = __smsc95xx_phy_wait_not_busy(dev, in_pm);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "MII is busy in smsc95xx_mdio_read\n");
-+ goto done;
-+ }
-+
-+ /* set the address, index & direction (read from PHY) */
-+ phy_id &= dev->mii.phy_id_mask;
-+ idx &= dev->mii.reg_num_mask;
-+ addr = (phy_id << 11) | (idx << 6) | MII_READ_ | MII_BUSY_;
-+ ret = __smsc95xx_write_reg(dev, MII_ADDR, addr, in_pm);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing MII_ADDR\n");
-+ goto done;
-+ }
-+
-+ ret = __smsc95xx_phy_wait_not_busy(dev, in_pm);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Timed out reading MII reg %02X\n", idx);
-+ goto done;
-+ }
-+
-+ ret = __smsc95xx_read_reg(dev, MII_DATA, &val, in_pm);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error reading MII_DATA\n");
-+ goto done;
-+ }
-+
-+ ret = (u16)(val & 0xFFFF);
-+
-+done:
-+ mutex_unlock(&dev->phy_mutex);
-+ return ret;
-+}
-+
-+static void __smsc95xx_mdio_write(struct net_device *netdev, int phy_id,
-+ int idx, int regval, int in_pm)
-+{
-+ struct usbnet *dev = netdev_priv(netdev);
-+ u32 val, addr;
-+ int ret;
-+
-+ mutex_lock(&dev->phy_mutex);
-+
-+ /* confirm MII not busy */
-+ ret = __smsc95xx_phy_wait_not_busy(dev, in_pm);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "MII is busy in smsc95xx_mdio_write\n");
-+ goto done;
-+ }
-+
-+ val = regval;
-+ ret = __smsc95xx_write_reg(dev, MII_DATA, val, in_pm);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing MII_DATA\n");
-+ goto done;
-+ }
-+
-+ /* set the address, index & direction (write to PHY) */
-+ phy_id &= dev->mii.phy_id_mask;
-+ idx &= dev->mii.reg_num_mask;
-+ addr = (phy_id << 11) | (idx << 6) | MII_WRITE_ | MII_BUSY_;
-+ ret = __smsc95xx_write_reg(dev, MII_ADDR, addr, in_pm);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing MII_ADDR\n");
-+ goto done;
-+ }
-+
-+ ret = __smsc95xx_phy_wait_not_busy(dev, in_pm);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Timed out writing MII reg %02X\n", idx);
-+ goto done;
-+ }
-+
-+done:
-+ mutex_unlock(&dev->phy_mutex);
-+}
-+
-+static int smsc95xx_mdio_read_nopm(struct net_device *netdev, int phy_id,
-+ int idx)
-+{
-+ return __smsc95xx_mdio_read(netdev, phy_id, idx, 1);
-+}
-+
-+static void smsc95xx_mdio_write_nopm(struct net_device *netdev, int phy_id,
-+ int idx, int regval)
-+{
-+ __smsc95xx_mdio_write(netdev, phy_id, idx, regval, 1);
-+}
-+
-+static int smsc95xx_mdio_read(struct net_device *netdev, int phy_id, int idx)
-+{
-+ return __smsc95xx_mdio_read(netdev, phy_id, idx, 0);
-+}
-+
-+static void smsc95xx_mdio_write(struct net_device *netdev, int phy_id, int idx,
-+ int regval)
-+{
-+ __smsc95xx_mdio_write(netdev, phy_id, idx, regval, 0);
-+}
-+
-+static int __must_check smsc95xx_wait_eeprom(struct usbnet *dev)
-+{
-+ unsigned long start_time = jiffies;
-+ u32 val;
-+ int ret;
-+
-+ do {
-+ ret = smsc95xx_read_reg(dev, E2P_CMD, &val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error reading E2P_CMD\n");
-+ return ret;
-+ }
-+
-+ if (!(val & E2P_CMD_BUSY_) || (val & E2P_CMD_TIMEOUT_))
-+ break;
-+ udelay(40);
-+ } while (!time_after(jiffies, start_time + HZ));
-+
-+ if (val & (E2P_CMD_TIMEOUT_ | E2P_CMD_BUSY_)) {
-+ netdev_warn(dev->net, "EEPROM read operation timeout\n");
-+ return -EIO;
-+ }
-+
-+ return 0;
-+}
-+
-+static int __must_check smsc95xx_eeprom_confirm_not_busy(struct usbnet *dev)
-+{
-+ unsigned long start_time = jiffies;
-+ u32 val;
-+ int ret;
-+
-+ do {
-+ ret = smsc95xx_read_reg(dev, E2P_CMD, &val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error reading E2P_CMD\n");
-+ return ret;
-+ }
-+
-+ if (!(val & E2P_CMD_BUSY_))
-+ return 0;
-+
-+ udelay(40);
-+ } while (!time_after(jiffies, start_time + HZ));
-+
-+ netdev_warn(dev->net, "EEPROM is busy\n");
-+ return -EIO;
-+}
-+
-+static int smsc95xx_read_eeprom(struct usbnet *dev, u32 offset, u32 length,
-+ u8 *data)
-+{
-+ u32 val;
-+ int i, ret;
-+
-+ BUG_ON(!dev);
-+ BUG_ON(!data);
-+
-+ ret = smsc95xx_eeprom_confirm_not_busy(dev);
-+ if (ret)
-+ return ret;
-+
-+ for (i = 0; i < length; i++) {
-+ val = E2P_CMD_BUSY_ | E2P_CMD_READ_ | (offset & E2P_CMD_ADDR_);
-+ ret = smsc95xx_write_reg(dev, E2P_CMD, val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing E2P_CMD\n");
-+ return ret;
-+ }
-+
-+ ret = smsc95xx_wait_eeprom(dev);
-+ if (ret < 0)
-+ return ret;
-+
-+ ret = smsc95xx_read_reg(dev, E2P_DATA, &val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error reading E2P_DATA\n");
-+ return ret;
-+ }
-+
-+ data[i] = val & 0xFF;
-+ offset++;
-+ }
-+
-+ return 0;
-+}
-+
-+static int smsc95xx_write_eeprom(struct usbnet *dev, u32 offset, u32 length,
-+ u8 *data)
-+{
-+ u32 val;
-+ int i, ret;
-+
-+ BUG_ON(!dev);
-+ BUG_ON(!data);
-+
-+ ret = smsc95xx_eeprom_confirm_not_busy(dev);
-+ if (ret)
-+ return ret;
-+
-+ /* Issue write/erase enable command */
-+ val = E2P_CMD_BUSY_ | E2P_CMD_EWEN_;
-+ ret = smsc95xx_write_reg(dev, E2P_CMD, val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing E2P_DATA\n");
-+ return ret;
-+ }
-+
-+ ret = smsc95xx_wait_eeprom(dev);
-+ if (ret < 0)
-+ return ret;
-+
-+ for (i = 0; i < length; i++) {
-+
-+ /* Fill data register */
-+ val = data[i];
-+ ret = smsc95xx_write_reg(dev, E2P_DATA, val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing E2P_DATA\n");
-+ return ret;
-+ }
-+
-+ /* Send "write" command */
-+ val = E2P_CMD_BUSY_ | E2P_CMD_WRITE_ | (offset & E2P_CMD_ADDR_);
-+ ret = smsc95xx_write_reg(dev, E2P_CMD, val);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Error writing E2P_CMD\n");
-+ return ret;
-+ }
-+
-+ ret = smsc95xx_wait_eeprom(dev);
-+ if (ret < 0)
-+ return ret;
-+
-+ offset++;
-+ }
-+
-+ return 0;
-+}
-+
-+static int __must_check smsc95xx_write_reg_async(struct usbnet *dev, u16 index,
-+ u32 data)
-+{
-+ const u16 size = 4;
-+ u32 buf;
-+ int ret;
-+
-+ buf = data;
-+ cpu_to_le32s(&buf);
-+
-+ ret = usbnet_write_cmd_async(dev, USB_VENDOR_REQUEST_WRITE_REGISTER,
-+ USB_DIR_OUT | USB_TYPE_VENDOR |
-+ USB_RECIP_DEVICE,
-+ 0, index, &buf, size);
-+ if (ret < 0)
-+ netdev_warn(dev->net, "Error write async cmd, sts=%d\n",
-+ ret);
-+ return ret;
-+}
-+
-+/* returns hash bit number for given MAC address
-+ * example:
-+ * 01 00 5E 00 00 01 -> returns bit number 31 */
-+static unsigned int smsc95xx_hash(char addr[ETH_ALEN])
-+{
-+ return (ether_crc(ETH_ALEN, addr) >> 26) & 0x3f;
-+}
-+
-+static void smsc95xx_set_multicast(struct net_device *netdev)
-+{
-+ struct usbnet *dev = netdev_priv(netdev);
-+ struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
-+ unsigned long flags;
-+ int ret;
-+
-+ pdata->hash_hi = 0;
-+ pdata->hash_lo = 0;
-+
-+ spin_lock_irqsave(&pdata->mac_cr_lock, flags);
-+
-+ if (dev->net->flags & IFF_PROMISC) {
-+ netif_dbg(dev, drv, dev->net, "promiscuous mode enabled\n");
-+ pdata->mac_cr |= MAC_CR_PRMS_;
-+ pdata->mac_cr &= ~(MAC_CR_MCPAS_ | MAC_CR_HPFILT_);
-+ } else if (dev->net->flags & IFF_ALLMULTI) {
-+ netif_dbg(dev, drv, dev->net, "receive all multicast enabled\n");
-+ pdata->mac_cr |= MAC_CR_MCPAS_;
-+ pdata->mac_cr &= ~(MAC_CR_PRMS_ | MAC_CR_HPFILT_);
-+ } else if (!netdev_mc_empty(dev->net)) {
-+ struct netdev_hw_addr *ha;
-+
-+ pdata->mac_cr |= MAC_CR_HPFILT_;
-+ pdata->mac_cr &= ~(MAC_CR_PRMS_ | MAC_CR_MCPAS_);
-+
-+ netdev_for_each_mc_addr(ha, netdev) {
-+ u32 bitnum = smsc95xx_hash(ha->addr);
-+ u32 mask = 0x01 << (bitnum & 0x1F);
-+ if (bitnum & 0x20)
-+ pdata->hash_hi |= mask;
-+ else
-+ pdata->hash_lo |= mask;
-+ }
-+
-+ netif_dbg(dev, drv, dev->net, "HASHH=0x%08X, HASHL=0x%08X\n",
-+ pdata->hash_hi, pdata->hash_lo);
-+ } else {
-+ netif_dbg(dev, drv, dev->net, "receive own packets only\n");
-+ pdata->mac_cr &=
-+ ~(MAC_CR_PRMS_ | MAC_CR_MCPAS_ | MAC_CR_HPFILT_);
-+ }
-+
-+ spin_unlock_irqrestore(&pdata->mac_cr_lock, flags);
-+
-+ /* Initiate async writes, as we can't wait for completion here */
-+ ret = smsc95xx_write_reg_async(dev, HASHH, pdata->hash_hi);
-+ if (ret < 0)
-+ netdev_warn(dev->net, "failed to initiate async write to HASHH\n");
-+
-+ ret = smsc95xx_write_reg_async(dev, HASHL, pdata->hash_lo);
-+ if (ret < 0)
-+ netdev_warn(dev->net, "failed to initiate async write to HASHL\n");
-+
-+ ret = smsc95xx_write_reg_async(dev, MAC_CR, pdata->mac_cr);
-+ if (ret < 0)
-+ netdev_warn(dev->net, "failed to initiate async write to MAC_CR\n");
-+}
-+
-+static int smsc95xx_phy_update_flowcontrol(struct usbnet *dev, u8 duplex,
-+ u16 lcladv, u16 rmtadv)
-+{
-+ u32 flow, afc_cfg = 0;
-+
-+ int ret = smsc95xx_read_reg(dev, AFC_CFG, &afc_cfg);
-+ if (ret < 0)
-+ return ret;
-+
-+ if (duplex == DUPLEX_FULL) {
-+ u8 cap = mii_resolve_flowctrl_fdx(lcladv, rmtadv);
-+
-+ if (cap & FLOW_CTRL_RX)
-+ flow = 0xFFFF0002;
-+ else
-+ flow = 0;
-+
-+ if (cap & FLOW_CTRL_TX)
-+ afc_cfg |= 0xF;
-+ else
-+ afc_cfg &= ~0xF;
-+
-+ netif_dbg(dev, link, dev->net, "rx pause %s, tx pause %s\n",
-+ cap & FLOW_CTRL_RX ? "enabled" : "disabled",
-+ cap & FLOW_CTRL_TX ? "enabled" : "disabled");
-+ } else {
-+ netif_dbg(dev, link, dev->net, "half duplex\n");
-+ flow = 0;
-+ afc_cfg |= 0xF;
-+ }
-+
-+ ret = smsc95xx_write_reg(dev, FLOW, flow);
-+ if (ret < 0)
-+ return ret;
-+
-+ return smsc95xx_write_reg(dev, AFC_CFG, afc_cfg);
-+}
-+
-+static int smsc95xx_link_reset(struct usbnet *dev)
-+{
-+ struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
-+ struct mii_if_info *mii = &dev->mii;
-+ struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET };
-+ unsigned long flags;
-+ u16 lcladv, rmtadv;
-+ int ret;
-+
-+ /* clear interrupt status */
-+ ret = smsc95xx_mdio_read(dev->net, mii->phy_id, PHY_INT_SRC);
-+ if (ret < 0)
-+ return ret;
-+
-+ ret = smsc95xx_write_reg(dev, INT_STS, INT_STS_CLEAR_ALL_);
-+ if (ret < 0)
-+ return ret;
-+
-+ mii_check_media(mii, 1, 1);
-+ mii_ethtool_gset(&dev->mii, &ecmd);
-+ lcladv = smsc95xx_mdio_read(dev->net, mii->phy_id, MII_ADVERTISE);
-+ rmtadv = smsc95xx_mdio_read(dev->net, mii->phy_id, MII_LPA);
-+
-+ netif_dbg(dev, link, dev->net,
-+ "speed: %u duplex: %d lcladv: %04x rmtadv: %04x\n",
-+ ethtool_cmd_speed(&ecmd), ecmd.duplex, lcladv, rmtadv);
-+
-+ spin_lock_irqsave(&pdata->mac_cr_lock, flags);
-+ if (ecmd.duplex != DUPLEX_FULL) {
-+ pdata->mac_cr &= ~MAC_CR_FDPX_;
-+ pdata->mac_cr |= MAC_CR_RCVOWN_;
-+ } else {
-+ pdata->mac_cr &= ~MAC_CR_RCVOWN_;
-+ pdata->mac_cr |= MAC_CR_FDPX_;
-+ }
-+ spin_unlock_irqrestore(&pdata->mac_cr_lock, flags);
-+
-+ ret = smsc95xx_write_reg(dev, MAC_CR, pdata->mac_cr);
-+ if (ret < 0)
-+ return ret;
-+
-+ ret = smsc95xx_phy_update_flowcontrol(dev, ecmd.duplex, lcladv, rmtadv);
-+ if (ret < 0)
-+ netdev_warn(dev->net, "Error updating PHY flow control\n");
-+
-+ return ret;
-+}
-+
-+static void smsc95xx_status(struct usbnet *dev, struct urb *urb)
-+{
-+ u32 intdata;
-+
-+ if (urb->actual_length != 4) {
-+ netdev_warn(dev->net, "unexpected urb length %d\n",
-+ urb->actual_length);
-+ return;
-+ }
-+
-+ memcpy(&intdata, urb->transfer_buffer, 4);
-+ le32_to_cpus(&intdata);
-+
-+ netif_dbg(dev, link, dev->net, "intdata: 0x%08X\n", intdata);
-+
-+ if (intdata & INT_ENP_PHY_INT_)
-+ usbnet_defer_kevent(dev, EVENT_LINK_RESET);
-+ else
-+ netdev_warn(dev->net, "unexpected interrupt, intdata=0x%08X\n",
-+ intdata);
-+}
-+
-+/* Enable or disable Tx & Rx checksum offload engines */
-+static int smsc95xx_set_features(struct net_device *netdev,
-+ netdev_features_t features)
-+{
-+ struct usbnet *dev = netdev_priv(netdev);
-+ u32 read_buf;
-+ int ret;
-+
-+ ret = smsc95xx_read_reg(dev, COE_CR, &read_buf);
-+ if (ret < 0)
-+ return ret;
-+
-+ if (features & NETIF_F_HW_CSUM)
-+ read_buf |= Tx_COE_EN_;
-+ else
-+ read_buf &= ~Tx_COE_EN_;
-+
-+ if (features & NETIF_F_RXCSUM)
-+ read_buf |= Rx_COE_EN_;
-+ else
-+ read_buf &= ~Rx_COE_EN_;
-+
-+ ret = smsc95xx_write_reg(dev, COE_CR, read_buf);
-+ if (ret < 0)
-+ return ret;
-+
-+ netif_dbg(dev, hw, dev->net, "COE_CR = 0x%08x\n", read_buf);
-+ return 0;
-+}
-+
-+static int smsc95xx_ethtool_get_eeprom_len(struct net_device *net)
-+{
-+ return MAX_EEPROM_SIZE;
-+}
-+
-+static int smsc95xx_ethtool_get_eeprom(struct net_device *netdev,
-+ struct ethtool_eeprom *ee, u8 *data)
-+{
-+ struct usbnet *dev = netdev_priv(netdev);
-+
-+ ee->magic = LAN95XX_EEPROM_MAGIC;
-+
-+ return smsc95xx_read_eeprom(dev, ee->offset, ee->len, data);
-+}
-+
-+static int smsc95xx_ethtool_set_eeprom(struct net_device *netdev,
-+ struct ethtool_eeprom *ee, u8 *data)
-+{
-+ struct usbnet *dev = netdev_priv(netdev);
-+
-+ if (ee->magic != LAN95XX_EEPROM_MAGIC) {
-+ netdev_warn(dev->net, "EEPROM: magic value mismatch, magic = 0x%x\n",
-+ ee->magic);
-+ return -EINVAL;
-+ }
-+
-+ return smsc95xx_write_eeprom(dev, ee->offset, ee->len, data);
-+}
-+
-+static int smsc95xx_ethtool_getregslen(struct net_device *netdev)
-+{
-+ /* all smsc95xx registers */
-+ return COE_CR - ID_REV + sizeof(u32);
-+}
-+
-+static void
-+smsc95xx_ethtool_getregs(struct net_device *netdev, struct ethtool_regs *regs,
-+ void *buf)
-+{
-+ struct usbnet *dev = netdev_priv(netdev);
-+ unsigned int i, j;
-+ int retval;
-+ u32 *data = buf;
-+
-+ retval = smsc95xx_read_reg(dev, ID_REV, ®s->version);
-+ if (retval < 0) {
-+ netdev_warn(netdev, "REGS: cannot read ID_REV\n");
-+ return;
-+ }
-+
-+ for (i = ID_REV, j = 0; i <= COE_CR; i += (sizeof(u32)), j++) {
-+ retval = smsc95xx_read_reg(dev, i, &data[j]);
-+ if (retval < 0) {
-+ netdev_warn(netdev, "REGS: cannot read reg[%x]\n", i);
-+ return;
-+ }
-+ }
-+}
-+
-+static void smsc95xx_ethtool_get_wol(struct net_device *net,
-+ struct ethtool_wolinfo *wolinfo)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+ struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
-+
-+ wolinfo->supported = SUPPORTED_WAKE;
-+ wolinfo->wolopts = pdata->wolopts;
-+}
-+
-+static int smsc95xx_ethtool_set_wol(struct net_device *net,
-+ struct ethtool_wolinfo *wolinfo)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+ struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
-+ int ret;
-+
-+ pdata->wolopts = wolinfo->wolopts & SUPPORTED_WAKE;
-+
-+ ret = device_set_wakeup_enable(&dev->udev->dev, pdata->wolopts);
-+ if (ret < 0)
-+ netdev_warn(dev->net, "device_set_wakeup_enable error %d\n", ret);
-+
-+ return ret;
-+}
-+
-+static const struct ethtool_ops smsc95xx_ethtool_ops = {
-+ .get_link = usbnet_get_link,
-+ .nway_reset = usbnet_nway_reset,
-+ .get_drvinfo = usbnet_get_drvinfo,
-+ .get_msglevel = usbnet_get_msglevel,
-+ .set_msglevel = usbnet_set_msglevel,
-+ .get_settings = usbnet_get_settings,
-+ .set_settings = usbnet_set_settings,
-+ .get_eeprom_len = smsc95xx_ethtool_get_eeprom_len,
-+ .get_eeprom = smsc95xx_ethtool_get_eeprom,
-+ .set_eeprom = smsc95xx_ethtool_set_eeprom,
-+ .get_regs_len = smsc95xx_ethtool_getregslen,
-+ .get_regs = smsc95xx_ethtool_getregs,
-+ .get_wol = smsc95xx_ethtool_get_wol,
-+ .set_wol = smsc95xx_ethtool_set_wol,
-+};
-+
-+static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
-+{
-+ struct usbnet *dev = netdev_priv(netdev);
-+
-+ if (!netif_running(netdev))
-+ return -EINVAL;
-+
-+ return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
-+}
-+
-+static void smsc95xx_init_mac_address(struct usbnet *dev)
-+{
-+ /* try reading mac address from EEPROM */
-+ if (smsc95xx_read_eeprom(dev, EEPROM_MAC_OFFSET, ETH_ALEN,
-+ dev->net->dev_addr) == 0) {
-+ if (is_valid_ether_addr(dev->net->dev_addr)) {
-+ /* eeprom values are valid so use them */
-+ netif_dbg(dev, ifup, dev->net, "MAC address read from EEPROM\n");
-+ return;
-+ }
-+ }
-+
-+ /* no eeprom, or eeprom values are invalid. generate random MAC */
-+ eth_hw_addr_random(dev->net);
-+ netif_dbg(dev, ifup, dev->net, "MAC address set to eth_random_addr\n");
-+}
-+
-+static int smsc95xx_set_mac_address(struct usbnet *dev)
-+{
-+ u32 addr_lo = dev->net->dev_addr[0] | dev->net->dev_addr[1] << 8 |
-+ dev->net->dev_addr[2] << 16 | dev->net->dev_addr[3] << 24;
-+ u32 addr_hi = dev->net->dev_addr[4] | dev->net->dev_addr[5] << 8;
-+ int ret;
-+
-+ ret = smsc95xx_write_reg(dev, ADDRL, addr_lo);
-+ if (ret < 0)
-+ return ret;
-+
-+ return smsc95xx_write_reg(dev, ADDRH, addr_hi);
-+}
-+
-+/* starts the TX path */
-+static int smsc95xx_start_tx_path(struct usbnet *dev)
-+{
-+ struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
-+ unsigned long flags;
-+ int ret;
-+
-+ /* Enable Tx at MAC */
-+ spin_lock_irqsave(&pdata->mac_cr_lock, flags);
-+ pdata->mac_cr |= MAC_CR_TXEN_;
-+ spin_unlock_irqrestore(&pdata->mac_cr_lock, flags);
-+
-+ ret = smsc95xx_write_reg(dev, MAC_CR, pdata->mac_cr);
-+ if (ret < 0)
-+ return ret;
-+
-+ /* Enable Tx at SCSRs */
-+ return smsc95xx_write_reg(dev, TX_CFG, TX_CFG_ON_);
-+}
-+
-+/* Starts the Receive path */
-+static int smsc95xx_start_rx_path(struct usbnet *dev, int in_pm)
-+{
-+ struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
-+ unsigned long flags;
-+
-+ spin_lock_irqsave(&pdata->mac_cr_lock, flags);
-+ pdata->mac_cr |= MAC_CR_RXEN_;
-+ spin_unlock_irqrestore(&pdata->mac_cr_lock, flags);
-+
-+ return __smsc95xx_write_reg(dev, MAC_CR, pdata->mac_cr, in_pm);
-+}
-+
-+static int smsc95xx_phy_initialize(struct usbnet *dev)
-+{
-+ int bmcr, ret, timeout = 0;
-+
-+ /* Initialize MII structure */
-+ dev->mii.dev = dev->net;
-+ dev->mii.mdio_read = smsc95xx_mdio_read;
-+ dev->mii.mdio_write = smsc95xx_mdio_write;
-+ dev->mii.phy_id_mask = 0x1f;
-+ dev->mii.reg_num_mask = 0x1f;
-+ dev->mii.phy_id = SMSC95XX_INTERNAL_PHY_ID;
-+
-+ /* reset phy and wait for reset to complete */
-+ smsc95xx_mdio_write(dev->net, dev->mii.phy_id, MII_BMCR, BMCR_RESET);
-+
-+ do {
-+ msleep(10);
-+ bmcr = smsc95xx_mdio_read(dev->net, dev->mii.phy_id, MII_BMCR);
-+ timeout++;
-+ } while ((bmcr & BMCR_RESET) && (timeout < 100));
-+
-+ if (timeout >= 100) {
-+ netdev_warn(dev->net, "timeout on PHY Reset");
-+ return -EIO;
-+ }
-+
-+ smsc95xx_mdio_write(dev->net, dev->mii.phy_id, MII_ADVERTISE,
-+ ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP |
-+ ADVERTISE_PAUSE_ASYM);
-+
-+ /* read to clear */
-+ ret = smsc95xx_mdio_read(dev->net, dev->mii.phy_id, PHY_INT_SRC);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to read PHY_INT_SRC during init\n");
-+ return ret;
-+ }
-+
-+ smsc95xx_mdio_write(dev->net, dev->mii.phy_id, PHY_INT_MASK,
-+ PHY_INT_MASK_DEFAULT_);
-+ mii_nway_restart(&dev->mii);
-+
-+ netif_dbg(dev, ifup, dev->net, "phy initialised successfully\n");
-+ return 0;
-+}
-+
-+static int smsc95xx_reset(struct usbnet *dev)
-+{
-+ struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
-+ u32 read_buf, write_buf, burst_cap;
-+ int ret = 0, timeout;
-+
-+ netif_dbg(dev, ifup, dev->net, "entering smsc95xx_reset\n");
-+
-+ ret = smsc95xx_write_reg(dev, HW_CFG, HW_CFG_LRST_);
-+ if (ret < 0)
-+ return ret;
-+
-+ timeout = 0;
-+ do {
-+ msleep(10);
-+ ret = smsc95xx_read_reg(dev, HW_CFG, &read_buf);
-+ if (ret < 0)
-+ return ret;
-+ timeout++;
-+ } while ((read_buf & HW_CFG_LRST_) && (timeout < 100));
-+
-+ if (timeout >= 100) {
-+ netdev_warn(dev->net, "timeout waiting for completion of Lite Reset\n");
-+ return ret;
-+ }
-+
-+ ret = smsc95xx_write_reg(dev, PM_CTRL, PM_CTL_PHY_RST_);
-+ if (ret < 0)
-+ return ret;
-+
-+ timeout = 0;
-+ do {
-+ msleep(10);
-+ ret = smsc95xx_read_reg(dev, PM_CTRL, &read_buf);
-+ if (ret < 0)
-+ return ret;
-+ timeout++;
-+ } while ((read_buf & PM_CTL_PHY_RST_) && (timeout < 100));
-+
-+ if (timeout >= 100) {
-+ netdev_warn(dev->net, "timeout waiting for PHY Reset\n");
-+ return ret;
-+ }
-+
-+ ret = smsc95xx_set_mac_address(dev);
-+ if (ret < 0)
-+ return ret;
-+
-+ netif_dbg(dev, ifup, dev->net, "MAC Address: %pM\n",
-+ dev->net->dev_addr);
-+
-+ ret = smsc95xx_read_reg(dev, HW_CFG, &read_buf);
-+ if (ret < 0)
-+ return ret;
-+
-+ netif_dbg(dev, ifup, dev->net, "Read Value from HW_CFG : 0x%08x\n",
-+ read_buf);
-+
-+ read_buf |= HW_CFG_BIR_;
-+
-+ ret = smsc95xx_write_reg(dev, HW_CFG, read_buf);
-+ if (ret < 0)
-+ return ret;
-+
-+ ret = smsc95xx_read_reg(dev, HW_CFG, &read_buf);
-+ if (ret < 0)
-+ return ret;
-+
-+ netif_dbg(dev, ifup, dev->net,
-+ "Read Value from HW_CFG after writing HW_CFG_BIR_: 0x%08x\n",
-+ read_buf);
-+
-+ if (!turbo_mode) {
-+ burst_cap = 0;
-+ dev->rx_urb_size = MAX_SINGLE_PACKET_SIZE;
-+ } else if (dev->udev->speed == USB_SPEED_HIGH) {
-+ burst_cap = DEFAULT_HS_BURST_CAP_SIZE / HS_USB_PKT_SIZE;
-+ dev->rx_urb_size = DEFAULT_HS_BURST_CAP_SIZE;
-+ } else {
-+ burst_cap = DEFAULT_FS_BURST_CAP_SIZE / FS_USB_PKT_SIZE;
-+ dev->rx_urb_size = DEFAULT_FS_BURST_CAP_SIZE;
-+ }
-+
-+ netif_dbg(dev, ifup, dev->net, "rx_urb_size=%ld\n",
-+ (ulong)dev->rx_urb_size);
-+
-+ ret = smsc95xx_write_reg(dev, BURST_CAP, burst_cap);
-+ if (ret < 0)
-+ return ret;
-+
-+ ret = smsc95xx_read_reg(dev, BURST_CAP, &read_buf);
-+ if (ret < 0)
-+ return ret;
-+
-+ netif_dbg(dev, ifup, dev->net,
-+ "Read Value from BURST_CAP after writing: 0x%08x\n",
-+ read_buf);
-+
-+ ret = smsc95xx_write_reg(dev, BULK_IN_DLY, DEFAULT_BULK_IN_DELAY);
-+ if (ret < 0)
-+ return ret;
-+
-+ ret = smsc95xx_read_reg(dev, BULK_IN_DLY, &read_buf);
-+ if (ret < 0)
-+ return ret;
-+
-+ netif_dbg(dev, ifup, dev->net,
-+ "Read Value from BULK_IN_DLY after writing: 0x%08x\n",
-+ read_buf);
-+
-+ ret = smsc95xx_read_reg(dev, HW_CFG, &read_buf);
-+ if (ret < 0)
-+ return ret;
-+
-+ netif_dbg(dev, ifup, dev->net, "Read Value from HW_CFG: 0x%08x\n",
-+ read_buf);
-+
-+ if (turbo_mode)
-+ read_buf |= (HW_CFG_MEF_ | HW_CFG_BCE_);
-+
-+ read_buf &= ~HW_CFG_RXDOFF_;
-+
-+ /* set Rx data offset=2, Make IP header aligns on word boundary. */
-+ read_buf |= NET_IP_ALIGN << 9;
-+
-+ ret = smsc95xx_write_reg(dev, HW_CFG, read_buf);
-+ if (ret < 0)
-+ return ret;
-+
-+ ret = smsc95xx_read_reg(dev, HW_CFG, &read_buf);
-+ if (ret < 0)
-+ return ret;
-+
-+ netif_dbg(dev, ifup, dev->net,
-+ "Read Value from HW_CFG after writing: 0x%08x\n", read_buf);
-+
-+ ret = smsc95xx_write_reg(dev, INT_STS, INT_STS_CLEAR_ALL_);
-+ if (ret < 0)
-+ return ret;
-+
-+ ret = smsc95xx_read_reg(dev, ID_REV, &read_buf);
-+ if (ret < 0)
-+ return ret;
-+ netif_dbg(dev, ifup, dev->net, "ID_REV = 0x%08x\n", read_buf);
-+
-+ /* Configure GPIO pins as LED outputs */
-+ write_buf = LED_GPIO_CFG_SPD_LED | LED_GPIO_CFG_LNK_LED |
-+ LED_GPIO_CFG_FDX_LED;
-+ ret = smsc95xx_write_reg(dev, LED_GPIO_CFG, write_buf);
-+ if (ret < 0)
-+ return ret;
-+
-+ /* Init Tx */
-+ ret = smsc95xx_write_reg(dev, FLOW, 0);
-+ if (ret < 0)
-+ return ret;
-+
-+ ret = smsc95xx_write_reg(dev, AFC_CFG, AFC_CFG_DEFAULT);
-+ if (ret < 0)
-+ return ret;
-+
-+ /* Don't need mac_cr_lock during initialisation */
-+ ret = smsc95xx_read_reg(dev, MAC_CR, &pdata->mac_cr);
-+ if (ret < 0)
-+ return ret;
-+
-+ /* Init Rx */
-+ /* Set Vlan */
-+ ret = smsc95xx_write_reg(dev, VLAN1, (u32)ETH_P_8021Q);
-+ if (ret < 0)
-+ return ret;
-+
-+ /* Enable or disable checksum offload engines */
-+ ret = smsc95xx_set_features(dev->net, dev->net->features);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to set checksum offload features\n");
-+ return ret;
-+ }
-+
-+ smsc95xx_set_multicast(dev->net);
-+
-+ ret = smsc95xx_phy_initialize(dev);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to init PHY\n");
-+ return ret;
-+ }
-+
-+ ret = smsc95xx_read_reg(dev, INT_EP_CTL, &read_buf);
-+ if (ret < 0)
-+ return ret;
-+
-+ /* enable PHY interrupts */
-+ read_buf |= INT_EP_CTL_PHY_INT_;
-+
-+ ret = smsc95xx_write_reg(dev, INT_EP_CTL, read_buf);
-+ if (ret < 0)
-+ return ret;
-+
-+ ret = smsc95xx_start_tx_path(dev);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to start TX path\n");
-+ return ret;
-+ }
-+
-+ ret = smsc95xx_start_rx_path(dev, 0);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "Failed to start RX path\n");
-+ return ret;
-+ }
-+
-+ netif_dbg(dev, ifup, dev->net, "smsc95xx_reset, return 0\n");
-+ return 0;
-+}
-+
-+static const struct net_device_ops smsc95xx_netdev_ops = {
-+ .ndo_open = usbnet_open,
-+ .ndo_stop = usbnet_stop,
-+ .ndo_start_xmit = usbnet_start_xmit,
-+ .ndo_tx_timeout = usbnet_tx_timeout,
-+ .ndo_change_mtu = usbnet_change_mtu,
-+ .ndo_set_mac_address = eth_mac_addr,
-+ .ndo_validate_addr = eth_validate_addr,
-+ .ndo_do_ioctl = smsc95xx_ioctl,
-+ .ndo_set_rx_mode = smsc95xx_set_multicast,
-+ .ndo_set_features = smsc95xx_set_features,
-+};
-+
-+static int smsc95xx_bind(struct usbnet *dev, struct usb_interface *intf)
-+{
-+ struct smsc95xx_priv *pdata = NULL;
-+ u32 val;
-+ int ret;
-+
-+ printk(KERN_INFO SMSC_CHIPNAME " v" SMSC_DRIVER_VERSION "\n");
-+
-+ ret = usbnet_get_endpoints(dev, intf);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "usbnet_get_endpoints failed: %d\n", ret);
-+ return ret;
-+ }
-+
-+ dev->data[0] = (unsigned long)kzalloc(sizeof(struct smsc95xx_priv),
-+ GFP_KERNEL);
-+
-+ pdata = (struct smsc95xx_priv *)(dev->data[0]);
-+ if (!pdata)
-+ return -ENOMEM;
-+
-+ spin_lock_init(&pdata->mac_cr_lock);
-+
-+ if (DEFAULT_TX_CSUM_ENABLE)
-+ dev->net->features |= NETIF_F_HW_CSUM;
-+ if (DEFAULT_RX_CSUM_ENABLE)
-+ dev->net->features |= NETIF_F_RXCSUM;
-+
-+ dev->net->hw_features = NETIF_F_HW_CSUM | NETIF_F_RXCSUM;
-+
-+ smsc95xx_init_mac_address(dev);
-+
-+ /* Init all registers */
-+ ret = smsc95xx_reset(dev);
-+
-+ /* detect device revision as different features may be available */
-+ ret = smsc95xx_read_reg(dev, ID_REV, &val);
-+ if (ret < 0)
-+ return ret;
-+ val >>= 16;
-+
-+ if ((val == ID_REV_CHIP_ID_9500A_) || (val == ID_REV_CHIP_ID_9530_) ||
-+ (val == ID_REV_CHIP_ID_89530_) || (val == ID_REV_CHIP_ID_9730_))
-+ pdata->features = (FEATURE_8_WAKEUP_FILTERS |
-+ FEATURE_PHY_NLP_CROSSOVER |
-+ FEATURE_REMOTE_WAKEUP);
-+ else if (val == ID_REV_CHIP_ID_9512_)
-+ pdata->features = FEATURE_8_WAKEUP_FILTERS;
-+
-+ dev->net->netdev_ops = &smsc95xx_netdev_ops;
-+ dev->net->ethtool_ops = &smsc95xx_ethtool_ops;
-+ dev->net->flags |= IFF_MULTICAST;
-+ dev->net->hard_header_len += SMSC95XX_TX_OVERHEAD_CSUM;
-+ dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len;
-+ return 0;
-+}
-+
-+static void smsc95xx_unbind(struct usbnet *dev, struct usb_interface *intf)
-+{
-+ struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
-+ if (pdata) {
-+ netif_dbg(dev, ifdown, dev->net, "free pdata\n");
-+ kfree(pdata);
-+ pdata = NULL;
-+ dev->data[0] = 0;
-+ }
-+}
-+
-+static u32 smsc_crc(const u8 *buffer, size_t len, int filter)
-+{
-+ u32 crc = bitrev16(crc16(0xFFFF, buffer, len));
-+ return crc << ((filter % 2) * 16);
-+}
-+
-+static int smsc95xx_enable_phy_wakeup_interrupts(struct usbnet *dev, u16 mask)
-+{
-+ struct mii_if_info *mii = &dev->mii;
-+ int ret;
-+
-+ netdev_dbg(dev->net, "enabling PHY wakeup interrupts\n");
-+
-+ /* read to clear */
-+ ret = smsc95xx_mdio_read_nopm(dev->net, mii->phy_id, PHY_INT_SRC);
-+ if (ret < 0)
-+ return ret;
-+
-+ /* enable interrupt source */
-+ ret = smsc95xx_mdio_read_nopm(dev->net, mii->phy_id, PHY_INT_MASK);
-+ if (ret < 0)
-+ return ret;
-+
-+ ret |= mask;
-+
-+ smsc95xx_mdio_write_nopm(dev->net, mii->phy_id, PHY_INT_MASK, ret);
-+
-+ return 0;
-+}
-+
-+static int smsc95xx_link_ok_nopm(struct usbnet *dev)
-+{
-+ struct mii_if_info *mii = &dev->mii;
-+ int ret;
-+
-+ /* first, a dummy read, needed to latch some MII phys */
-+ ret = smsc95xx_mdio_read_nopm(dev->net, mii->phy_id, MII_BMSR);
-+ if (ret < 0)
-+ return ret;
-+
-+ ret = smsc95xx_mdio_read_nopm(dev->net, mii->phy_id, MII_BMSR);
-+ if (ret < 0)
-+ return ret;
-+
-+ return !!(ret & BMSR_LSTATUS);
-+}
-+
-+static int smsc95xx_enter_suspend0(struct usbnet *dev)
-+{
-+ struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
-+ u32 val;
-+ int ret;
-+
-+ ret = smsc95xx_read_reg_nopm(dev, PM_CTRL, &val);
-+ if (ret < 0)
-+ return ret;
-+
-+ val &= (~(PM_CTL_SUS_MODE_ | PM_CTL_WUPS_ | PM_CTL_PHY_RST_));
-+ val |= PM_CTL_SUS_MODE_0;
-+
-+ ret = smsc95xx_write_reg_nopm(dev, PM_CTRL, val);
-+ if (ret < 0)
-+ return ret;
-+
-+ /* clear wol status */
-+ val &= ~PM_CTL_WUPS_;
-+ val |= PM_CTL_WUPS_WOL_;
-+
-+ /* enable energy detection */
-+ if (pdata->wolopts & WAKE_PHY)
-+ val |= PM_CTL_WUPS_ED_;
-+
-+ ret = smsc95xx_write_reg_nopm(dev, PM_CTRL, val);
-+ if (ret < 0)
-+ return ret;
-+
-+ /* read back PM_CTRL */
-+ ret = smsc95xx_read_reg_nopm(dev, PM_CTRL, &val);
-+ if (ret < 0)
-+ return ret;
-+
-+ pdata->suspend_flags |= SUSPEND_SUSPEND0;
-+
-+ return 0;
-+}
-+
-+static int smsc95xx_enter_suspend1(struct usbnet *dev)
-+{
-+ struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
-+ struct mii_if_info *mii = &dev->mii;
-+ u32 val;
-+ int ret;
-+
-+ /* reconfigure link pulse detection timing for
-+ * compatibility with non-standard link partners
-+ */
-+ if (pdata->features & FEATURE_PHY_NLP_CROSSOVER)
-+ smsc95xx_mdio_write_nopm(dev->net, mii->phy_id, PHY_EDPD_CONFIG,
-+ PHY_EDPD_CONFIG_DEFAULT);
-+
-+ /* enable energy detect power-down mode */
-+ ret = smsc95xx_mdio_read_nopm(dev->net, mii->phy_id, PHY_MODE_CTRL_STS);
-+ if (ret < 0)
-+ return ret;
-+
-+ ret |= MODE_CTRL_STS_EDPWRDOWN_;
-+
-+ smsc95xx_mdio_write_nopm(dev->net, mii->phy_id, PHY_MODE_CTRL_STS, ret);
-+
-+ /* enter SUSPEND1 mode */
-+ ret = smsc95xx_read_reg_nopm(dev, PM_CTRL, &val);
-+ if (ret < 0)
-+ return ret;
-+
-+ val &= ~(PM_CTL_SUS_MODE_ | PM_CTL_WUPS_ | PM_CTL_PHY_RST_);
-+ val |= PM_CTL_SUS_MODE_1;
-+
-+ ret = smsc95xx_write_reg_nopm(dev, PM_CTRL, val);
-+ if (ret < 0)
-+ return ret;
-+
-+ /* clear wol status, enable energy detection */
-+ val &= ~PM_CTL_WUPS_;
-+ val |= (PM_CTL_WUPS_ED_ | PM_CTL_ED_EN_);
-+
-+ ret = smsc95xx_write_reg_nopm(dev, PM_CTRL, val);
-+ if (ret < 0)
-+ return ret;
-+
-+ pdata->suspend_flags |= SUSPEND_SUSPEND1;
-+
-+ return 0;
-+}
-+
-+static int smsc95xx_enter_suspend2(struct usbnet *dev)
-+{
-+ struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
-+ u32 val;
-+ int ret;
-+
-+ ret = smsc95xx_read_reg_nopm(dev, PM_CTRL, &val);
-+ if (ret < 0)
-+ return ret;
-+
-+ val &= ~(PM_CTL_SUS_MODE_ | PM_CTL_WUPS_ | PM_CTL_PHY_RST_);
-+ val |= PM_CTL_SUS_MODE_2;
-+
-+ ret = smsc95xx_write_reg_nopm(dev, PM_CTRL, val);
-+ if (ret < 0)
-+ return ret;
-+
-+ pdata->suspend_flags |= SUSPEND_SUSPEND2;
-+
-+ return 0;
-+}
-+
-+static int smsc95xx_enter_suspend3(struct usbnet *dev)
-+{
-+ struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
-+ u32 val;
-+ int ret;
-+
-+ ret = smsc95xx_read_reg_nopm(dev, RX_FIFO_INF, &val);
-+ if (ret < 0)
-+ return ret;
-+
-+ if (val & 0xFFFF) {
-+ netdev_info(dev->net, "rx fifo not empty in autosuspend\n");
-+ return -EBUSY;
-+ }
-+
-+ ret = smsc95xx_read_reg_nopm(dev, PM_CTRL, &val);
-+ if (ret < 0)
-+ return ret;
-+
-+ val &= ~(PM_CTL_SUS_MODE_ | PM_CTL_WUPS_ | PM_CTL_PHY_RST_);
-+ val |= PM_CTL_SUS_MODE_3 | PM_CTL_RES_CLR_WKP_STS;
-+
-+ ret = smsc95xx_write_reg_nopm(dev, PM_CTRL, val);
-+ if (ret < 0)
-+ return ret;
-+
-+ /* clear wol status */
-+ val &= ~PM_CTL_WUPS_;
-+ val |= PM_CTL_WUPS_WOL_;
-+
-+ ret = smsc95xx_write_reg_nopm(dev, PM_CTRL, val);
-+ if (ret < 0)
-+ return ret;
-+
-+ pdata->suspend_flags |= SUSPEND_SUSPEND3;
-+
-+ return 0;
-+}
-+
-+static int smsc95xx_autosuspend(struct usbnet *dev, u32 link_up)
-+{
-+ struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
-+ int ret;
-+
-+ if (!netif_running(dev->net)) {
-+ /* interface is ifconfig down so fully power down hw */
-+ netdev_dbg(dev->net, "autosuspend entering SUSPEND2\n");
-+ return smsc95xx_enter_suspend2(dev);
-+ }
-+
-+ if (!link_up) {
-+ /* link is down so enter EDPD mode, but only if device can
-+ * reliably resume from it. This check should be redundant
-+ * as current FEATURE_REMOTE_WAKEUP parts also support
-+ * FEATURE_PHY_NLP_CROSSOVER but it's included for clarity */
-+ if (!(pdata->features & FEATURE_PHY_NLP_CROSSOVER)) {
-+ netdev_warn(dev->net, "EDPD not supported\n");
-+ return -EBUSY;
-+ }
-+
-+ netdev_dbg(dev->net, "autosuspend entering SUSPEND1\n");
-+
-+ /* enable PHY wakeup events for if cable is attached */
-+ ret = smsc95xx_enable_phy_wakeup_interrupts(dev,
-+ PHY_INT_MASK_ANEG_COMP_);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "error enabling PHY wakeup ints\n");
-+ return ret;
-+ }
-+
-+ netdev_info(dev->net, "entering SUSPEND1 mode\n");
-+ return smsc95xx_enter_suspend1(dev);
-+ }
-+
-+ /* enable PHY wakeup events so we remote wakeup if cable is pulled */
-+ ret = smsc95xx_enable_phy_wakeup_interrupts(dev,
-+ PHY_INT_MASK_LINK_DOWN_);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "error enabling PHY wakeup ints\n");
-+ return ret;
-+ }
-+
-+ netdev_dbg(dev->net, "autosuspend entering SUSPEND3\n");
-+ return smsc95xx_enter_suspend3(dev);
-+}
-+
-+static int smsc95xx_suspend(struct usb_interface *intf, pm_message_t message)
-+{
-+ struct usbnet *dev = usb_get_intfdata(intf);
-+ struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
-+ u32 val, link_up;
-+ int ret;
-+
-+ ret = usbnet_suspend(intf, message);
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "usbnet_suspend error\n");
-+ return ret;
-+ }
-+
-+ if (pdata->suspend_flags) {
-+ netdev_warn(dev->net, "error during last resume\n");
-+ pdata->suspend_flags = 0;
-+ }
-+
-+ /* determine if link is up using only _nopm functions */
-+ link_up = smsc95xx_link_ok_nopm(dev);
-+
-+ if (message.event == PM_EVENT_AUTO_SUSPEND &&
-+ (pdata->features & FEATURE_REMOTE_WAKEUP)) {
-+ ret = smsc95xx_autosuspend(dev, link_up);
-+ goto done;
-+ }
-+
-+ /* if we get this far we're not autosuspending */
-+ /* if no wol options set, or if link is down and we're not waking on
-+ * PHY activity, enter lowest power SUSPEND2 mode
-+ */
-+ if (!(pdata->wolopts & SUPPORTED_WAKE) ||
-+ !(link_up || (pdata->wolopts & WAKE_PHY))) {
-+ netdev_info(dev->net, "entering SUSPEND2 mode\n");
-+
-+ /* disable energy detect (link up) & wake up events */
-+ ret = smsc95xx_read_reg_nopm(dev, WUCSR, &val);
-+ if (ret < 0)
-+ goto done;
-+
-+ val &= ~(WUCSR_MPEN_ | WUCSR_WAKE_EN_);
-+
-+ ret = smsc95xx_write_reg_nopm(dev, WUCSR, val);
-+ if (ret < 0)
-+ goto done;
-+
-+ ret = smsc95xx_read_reg_nopm(dev, PM_CTRL, &val);
-+ if (ret < 0)
-+ goto done;
-+
-+ val &= ~(PM_CTL_ED_EN_ | PM_CTL_WOL_EN_);
-+
-+ ret = smsc95xx_write_reg_nopm(dev, PM_CTRL, val);
-+ if (ret < 0)
-+ goto done;
-+
-+ ret = smsc95xx_enter_suspend2(dev);
-+ goto done;
-+ }
-+
-+ if (pdata->wolopts & WAKE_PHY) {
-+ ret = smsc95xx_enable_phy_wakeup_interrupts(dev,
-+ (PHY_INT_MASK_ANEG_COMP_ | PHY_INT_MASK_LINK_DOWN_));
-+ if (ret < 0) {
-+ netdev_warn(dev->net, "error enabling PHY wakeup ints\n");
-+ goto done;
-+ }
-+
-+ /* if link is down then configure EDPD and enter SUSPEND1,
-+ * otherwise enter SUSPEND0 below
-+ */
-+ if (!link_up) {
-+ netdev_info(dev->net, "entering SUSPEND1 mode\n");
-+ ret = smsc95xx_enter_suspend1(dev);
-+ goto done;
-+ }
-+ }
-+
-+ if (pdata->wolopts & (WAKE_BCAST | WAKE_MCAST | WAKE_ARP | WAKE_UCAST)) {
-+ u32 *filter_mask = kzalloc(sizeof(u32) * 32, GFP_KERNEL);
-+ u32 command[2];
-+ u32 offset[2];
-+ u32 crc[4];
-+ int wuff_filter_count =
-+ (pdata->features & FEATURE_8_WAKEUP_FILTERS) ?
-+ LAN9500A_WUFF_NUM : LAN9500_WUFF_NUM;
-+ int i, filter = 0;
-+
-+ if (!filter_mask) {
-+ netdev_warn(dev->net, "Unable to allocate filter_mask\n");
-+ ret = -ENOMEM;
-+ goto done;
-+ }
-+
-+ memset(command, 0, sizeof(command));
-+ memset(offset, 0, sizeof(offset));
-+ memset(crc, 0, sizeof(crc));
-+
-+ if (pdata->wolopts & WAKE_BCAST) {
-+ const u8 bcast[] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
-+ netdev_info(dev->net, "enabling broadcast detection\n");
-+ filter_mask[filter * 4] = 0x003F;
-+ filter_mask[filter * 4 + 1] = 0x00;
-+ filter_mask[filter * 4 + 2] = 0x00;
-+ filter_mask[filter * 4 + 3] = 0x00;
-+ command[filter/4] |= 0x05UL << ((filter % 4) * 8);
-+ offset[filter/4] |= 0x00 << ((filter % 4) * 8);
-+ crc[filter/2] |= smsc_crc(bcast, 6, filter);
-+ filter++;
-+ }
-+
-+ if (pdata->wolopts & WAKE_MCAST) {
-+ const u8 mcast[] = {0x01, 0x00, 0x5E};
-+ netdev_info(dev->net, "enabling multicast detection\n");
-+ filter_mask[filter * 4] = 0x0007;
-+ filter_mask[filter * 4 + 1] = 0x00;
-+ filter_mask[filter * 4 + 2] = 0x00;
-+ filter_mask[filter * 4 + 3] = 0x00;
-+ command[filter/4] |= 0x09UL << ((filter % 4) * 8);
-+ offset[filter/4] |= 0x00 << ((filter % 4) * 8);
-+ crc[filter/2] |= smsc_crc(mcast, 3, filter);
-+ filter++;
-+ }
-+
-+ if (pdata->wolopts & WAKE_ARP) {
-+ const u8 arp[] = {0x08, 0x06};
-+ netdev_info(dev->net, "enabling ARP detection\n");
-+ filter_mask[filter * 4] = 0x0003;
-+ filter_mask[filter * 4 + 1] = 0x00;
-+ filter_mask[filter * 4 + 2] = 0x00;
-+ filter_mask[filter * 4 + 3] = 0x00;
-+ command[filter/4] |= 0x05UL << ((filter % 4) * 8);
-+ offset[filter/4] |= 0x0C << ((filter % 4) * 8);
-+ crc[filter/2] |= smsc_crc(arp, 2, filter);
-+ filter++;
-+ }
-+
-+ if (pdata->wolopts & WAKE_UCAST) {
-+ netdev_info(dev->net, "enabling unicast detection\n");
-+ filter_mask[filter * 4] = 0x003F;
-+ filter_mask[filter * 4 + 1] = 0x00;
-+ filter_mask[filter * 4 + 2] = 0x00;
-+ filter_mask[filter * 4 + 3] = 0x00;
-+ command[filter/4] |= 0x01UL << ((filter % 4) * 8);
-+ offset[filter/4] |= 0x00 << ((filter % 4) * 8);
-+ crc[filter/2] |= smsc_crc(dev->net->dev_addr, ETH_ALEN, filter);
-+ filter++;
-+ }
-+
-+ for (i = 0; i < (wuff_filter_count * 4); i++) {
-+ ret = smsc95xx_write_reg_nopm(dev, WUFF, filter_mask[i]);
-+ if (ret < 0) {
-+ kfree(filter_mask);
-+ goto done;
-+ }
-+ }
-+ kfree(filter_mask);
-+
-+ for (i = 0; i < (wuff_filter_count / 4); i++) {
-+ ret = smsc95xx_write_reg_nopm(dev, WUFF, command[i]);
-+ if (ret < 0)
-+ goto done;
-+ }
-+
-+ for (i = 0; i < (wuff_filter_count / 4); i++) {
-+ ret = smsc95xx_write_reg_nopm(dev, WUFF, offset[i]);
-+ if (ret < 0)
-+ goto done;
-+ }
-+
-+ for (i = 0; i < (wuff_filter_count / 2); i++) {
-+ ret = smsc95xx_write_reg_nopm(dev, WUFF, crc[i]);
-+ if (ret < 0)
-+ goto done;
-+ }
-+
-+ /* clear any pending pattern match packet status */
-+ ret = smsc95xx_read_reg_nopm(dev, WUCSR, &val);
-+ if (ret < 0)
-+ goto done;
-+
-+ val |= WUCSR_WUFR_;
-+
-+ ret = smsc95xx_write_reg_nopm(dev, WUCSR, val);
-+ if (ret < 0)
-+ goto done;
-+ }
-+
-+ if (pdata->wolopts & WAKE_MAGIC) {
-+ /* clear any pending magic packet status */
-+ ret = smsc95xx_read_reg_nopm(dev, WUCSR, &val);
-+ if (ret < 0)
-+ goto done;
-+
-+ val |= WUCSR_MPR_;
-+
-+ ret = smsc95xx_write_reg_nopm(dev, WUCSR, val);
-+ if (ret < 0)
-+ goto done;
-+ }
-+
-+ /* enable/disable wakeup sources */
-+ ret = smsc95xx_read_reg_nopm(dev, WUCSR, &val);
-+ if (ret < 0)
-+ goto done;
-+
-+ if (pdata->wolopts & (WAKE_BCAST | WAKE_MCAST | WAKE_ARP | WAKE_UCAST)) {
-+ netdev_info(dev->net, "enabling pattern match wakeup\n");
-+ val |= WUCSR_WAKE_EN_;
-+ } else {
-+ netdev_info(dev->net, "disabling pattern match wakeup\n");
-+ val &= ~WUCSR_WAKE_EN_;
-+ }
-+
-+ if (pdata->wolopts & WAKE_MAGIC) {
-+ netdev_info(dev->net, "enabling magic packet wakeup\n");
-+ val |= WUCSR_MPEN_;
-+ } else {
-+ netdev_info(dev->net, "disabling magic packet wakeup\n");
-+ val &= ~WUCSR_MPEN_;
-+ }
-+
-+ ret = smsc95xx_write_reg_nopm(dev, WUCSR, val);
-+ if (ret < 0)
-+ goto done;
-+
-+ /* enable wol wakeup source */
-+ ret = smsc95xx_read_reg_nopm(dev, PM_CTRL, &val);
-+ if (ret < 0)
-+ goto done;
-+
-+ val |= PM_CTL_WOL_EN_;
-+
-+ /* phy energy detect wakeup source */
-+ if (pdata->wolopts & WAKE_PHY)
-+ val |= PM_CTL_ED_EN_;
-+
-+ ret = smsc95xx_write_reg_nopm(dev, PM_CTRL, val);
-+ if (ret < 0)
-+ goto done;
-+
-+ /* enable receiver to enable frame reception */
-+ smsc95xx_start_rx_path(dev, 1);
-+
-+ /* some wol options are enabled, so enter SUSPEND0 */
-+ netdev_info(dev->net, "entering SUSPEND0 mode\n");
-+ ret = smsc95xx_enter_suspend0(dev);
-+
-+done:
-+ /*
-+ * TODO: resume() might need to handle the suspend failure
-+ * in system sleep
-+ */
-+ if (ret && PMSG_IS_AUTO(message))
-+ usbnet_resume(intf);
-+ return ret;
-+}
-+
-+static int smsc95xx_resume(struct usb_interface *intf)
-+{
-+ struct usbnet *dev = usb_get_intfdata(intf);
-+ struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
-+ u8 suspend_flags = pdata->suspend_flags;
-+ int ret;
-+ u32 val;
-+
-+ BUG_ON(!dev);
-+
-+ netdev_dbg(dev->net, "resume suspend_flags=0x%02x\n", suspend_flags);
-+
-+ /* do this first to ensure it's cleared even in error case */
-+ pdata->suspend_flags = 0;
-+
-+ if (suspend_flags & SUSPEND_ALLMODES) {
-+ /* clear wake-up sources */
-+ ret = smsc95xx_read_reg_nopm(dev, WUCSR, &val);
-+ if (ret < 0)
-+ return ret;
-+
-+ val &= ~(WUCSR_WAKE_EN_ | WUCSR_MPEN_);
-+
-+ ret = smsc95xx_write_reg_nopm(dev, WUCSR, val);
-+ if (ret < 0)
-+ return ret;
-+
-+ /* clear wake-up status */
-+ ret = smsc95xx_read_reg_nopm(dev, PM_CTRL, &val);
-+ if (ret < 0)
-+ return ret;
-+
-+ val &= ~PM_CTL_WOL_EN_;
-+ val |= PM_CTL_WUPS_;
-+
-+ ret = smsc95xx_write_reg_nopm(dev, PM_CTRL, val);
-+ if (ret < 0)
-+ return ret;
-+ }
-+
-+ ret = usbnet_resume(intf);
-+ if (ret < 0)
-+ netdev_warn(dev->net, "usbnet_resume error\n");
-+
-+ return ret;
-+}
-+
-+static int smsc95xx_reset_resume(struct usb_interface *intf)
-+{
-+ struct usbnet *dev = usb_get_intfdata(intf);
-+ int ret;
-+
-+ ret = smsc95xx_reset(dev);
-+ if (ret < 0)
-+ return ret;
-+
-+ return smsc95xx_resume(intf);
-+}
-+
-+static void smsc95xx_rx_csum_offload(struct sk_buff *skb)
-+{
-+ skb->csum = *(u16 *)(skb_tail_pointer(skb) - 2);
-+ skb->ip_summed = CHECKSUM_COMPLETE;
-+ skb_trim(skb, skb->len - 2);
-+}
-+
-+static int smsc95xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
-+{
-+ /* This check is no longer done by usbnet */
-+ if (skb->len < dev->net->hard_header_len)
-+ return 0;
-+
-+ while (skb->len > 0) {
-+ u32 header, align_count;
-+ struct sk_buff *ax_skb;
-+ unsigned char *packet;
-+ u16 size;
-+
-+ memcpy(&header, skb->data, sizeof(header));
-+ le32_to_cpus(&header);
-+ skb_pull(skb, 4 + NET_IP_ALIGN);
-+ packet = skb->data;
-+
-+ /* get the packet length */
-+ size = (u16)((header & RX_STS_FL_) >> 16);
-+ align_count = (4 - ((size + NET_IP_ALIGN) % 4)) % 4;
-+
-+ if (unlikely(header & RX_STS_ES_)) {
-+ netif_dbg(dev, rx_err, dev->net,
-+ "Error header=0x%08x\n", header);
-+ dev->net->stats.rx_errors++;
-+ dev->net->stats.rx_dropped++;
-+
-+ if (header & RX_STS_CRC_) {
-+ dev->net->stats.rx_crc_errors++;
-+ } else {
-+ if (header & (RX_STS_TL_ | RX_STS_RF_))
-+ dev->net->stats.rx_frame_errors++;
-+
-+ if ((header & RX_STS_LE_) &&
-+ (!(header & RX_STS_FT_)))
-+ dev->net->stats.rx_length_errors++;
-+ }
-+ } else {
-+ /* ETH_FRAME_LEN + 4(CRC) + 2(COE) + 4(Vlan) */
-+ if (unlikely(size > (ETH_FRAME_LEN + 12))) {
-+ netif_dbg(dev, rx_err, dev->net,
-+ "size err header=0x%08x\n", header);
-+ return 0;
-+ }
-+
-+ /* last frame in this batch */
-+ if (skb->len == size) {
-+ if (dev->net->features & NETIF_F_RXCSUM)
-+ smsc95xx_rx_csum_offload(skb);
-+ skb_trim(skb, skb->len - 4); /* remove fcs */
-+ skb->truesize = size + sizeof(struct sk_buff);
-+
-+ return 1;
-+ }
-+
-+ ax_skb = skb_clone(skb, GFP_ATOMIC);
-+ if (unlikely(!ax_skb)) {
-+ netdev_warn(dev->net, "Error allocating skb\n");
-+ return 0;
-+ }
-+
-+ ax_skb->len = size;
-+ ax_skb->data = packet;
-+ skb_set_tail_pointer(ax_skb, size);
-+
-+ if (dev->net->features & NETIF_F_RXCSUM)
-+ smsc95xx_rx_csum_offload(ax_skb);
-+ skb_trim(ax_skb, ax_skb->len - 4); /* remove fcs */
-+ ax_skb->truesize = size + sizeof(struct sk_buff);
-+
-+ usbnet_skb_return(dev, ax_skb);
-+ }
-+
-+ skb_pull(skb, size);
-+
-+ /* padding bytes before the next frame starts */
-+ if (skb->len)
-+ skb_pull(skb, align_count);
-+ }
-+
-+ if (unlikely(skb->len < 0)) {
-+ netdev_warn(dev->net, "invalid rx length<0 %d\n", skb->len);
-+ return 0;
-+ }
-+
-+ return 1;
-+}
-+
-+static u32 smsc95xx_calc_csum_preamble(struct sk_buff *skb)
-+{
-+ u16 low_16 = (u16)skb_checksum_start_offset(skb);
-+ u16 high_16 = low_16 + skb->csum_offset;
-+ return (high_16 << 16) | low_16;
-+}
-+
-+static struct sk_buff *smsc95xx_tx_fixup(struct usbnet *dev,
-+ struct sk_buff *skb, gfp_t flags)
-+{
-+ bool csum = skb->ip_summed == CHECKSUM_PARTIAL;
-+ int overhead = csum ? SMSC95XX_TX_OVERHEAD_CSUM : SMSC95XX_TX_OVERHEAD;
-+ u32 tx_cmd_a, tx_cmd_b;
-+
-+ /* We do not advertise SG, so skbs should be already linearized */
-+ BUG_ON(skb_shinfo(skb)->nr_frags);
-+
-+ if (skb_headroom(skb) < overhead) {
-+ struct sk_buff *skb2 = skb_copy_expand(skb,
-+ overhead, 0, flags);
-+ dev_kfree_skb_any(skb);
-+ skb = skb2;
-+ if (!skb)
-+ return NULL;
-+ }
-+
-+ if (csum) {
-+ if (skb->len <= 45) {
-+ /* workaround - hardware tx checksum does not work
-+ * properly with extremely small packets */
-+ long csstart = skb_checksum_start_offset(skb);
-+ __wsum calc = csum_partial(skb->data + csstart,
-+ skb->len - csstart, 0);
-+ *((__sum16 *)(skb->data + csstart
-+ + skb->csum_offset)) = csum_fold(calc);
-+
-+ csum = false;
-+ } else {
-+ u32 csum_preamble = smsc95xx_calc_csum_preamble(skb);
-+ skb_push(skb, 4);
-+ cpu_to_le32s(&csum_preamble);
-+ memcpy(skb->data, &csum_preamble, 4);
-+ }
-+ }
-+
-+ skb_push(skb, 4);
-+ tx_cmd_b = (u32)(skb->len - 4);
-+ if (csum)
-+ tx_cmd_b |= TX_CMD_B_CSUM_ENABLE;
-+ cpu_to_le32s(&tx_cmd_b);
-+ memcpy(skb->data, &tx_cmd_b, 4);
-+
-+ skb_push(skb, 4);
-+ tx_cmd_a = (u32)(skb->len - 8) | TX_CMD_A_FIRST_SEG_ |
-+ TX_CMD_A_LAST_SEG_;
-+ cpu_to_le32s(&tx_cmd_a);
-+ memcpy(skb->data, &tx_cmd_a, 4);
-+
-+ return skb;
-+}
-+
-+static int smsc95xx_manage_power(struct usbnet *dev, int on)
-+{
-+ struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
-+
-+ dev->intf->needs_remote_wakeup = on;
-+
-+ if (pdata->features & FEATURE_REMOTE_WAKEUP)
-+ return 0;
-+
-+ /* this chip revision isn't capable of remote wakeup */
-+ netdev_info(dev->net, "hardware isn't capable of remote wakeup\n");
-+
-+ if (on)
-+ usb_autopm_get_interface_no_resume(dev->intf);
-+ else
-+ usb_autopm_put_interface(dev->intf);
-+
-+ return 0;
-+}
-+
-+static const struct driver_info smsc95xx_info = {
-+ .description = "smsc95xx USB 2.0 Ethernet",
-+ .bind = smsc95xx_bind,
-+ .unbind = smsc95xx_unbind,
-+ .link_reset = smsc95xx_link_reset,
-+ .reset = smsc95xx_reset,
-+ .rx_fixup = smsc95xx_rx_fixup,
-+ .tx_fixup = smsc95xx_tx_fixup,
-+ .status = smsc95xx_status,
-+ .manage_power = smsc95xx_manage_power,
-+ .flags = FLAG_ETHER | FLAG_SEND_ZLP | FLAG_LINK_INTR,
-+};
-+
-+static const struct usb_device_id products[] = {
-+ {
-+ /* SMSC9500 USB Ethernet Device */
-+ USB_DEVICE(0x0424, 0x9500),
-+ .driver_info = (unsigned long) &smsc95xx_info,
-+ },
-+ {
-+ /* SMSC9505 USB Ethernet Device */
-+ USB_DEVICE(0x0424, 0x9505),
-+ .driver_info = (unsigned long) &smsc95xx_info,
-+ },
-+ {
-+ /* SMSC9500A USB Ethernet Device */
-+ USB_DEVICE(0x0424, 0x9E00),
-+ .driver_info = (unsigned long) &smsc95xx_info,
-+ },
-+ {
-+ /* SMSC9505A USB Ethernet Device */
-+ USB_DEVICE(0x0424, 0x9E01),
-+ .driver_info = (unsigned long) &smsc95xx_info,
-+ },
-+ {
-+ /* SMSC9512/9514 USB Hub & Ethernet Device */
-+ USB_DEVICE(0x0424, 0xec00),
-+ .driver_info = (unsigned long) &smsc95xx_info,
-+ },
-+ {
-+ /* SMSC9500 USB Ethernet Device (SAL10) */
-+ USB_DEVICE(0x0424, 0x9900),
-+ .driver_info = (unsigned long) &smsc95xx_info,
-+ },
-+ {
-+ /* SMSC9505 USB Ethernet Device (SAL10) */
-+ USB_DEVICE(0x0424, 0x9901),
-+ .driver_info = (unsigned long) &smsc95xx_info,
-+ },
-+ {
-+ /* SMSC9500A USB Ethernet Device (SAL10) */
-+ USB_DEVICE(0x0424, 0x9902),
-+ .driver_info = (unsigned long) &smsc95xx_info,
-+ },
-+ {
-+ /* SMSC9505A USB Ethernet Device (SAL10) */
-+ USB_DEVICE(0x0424, 0x9903),
-+ .driver_info = (unsigned long) &smsc95xx_info,
-+ },
-+ {
-+ /* SMSC9512/9514 USB Hub & Ethernet Device (SAL10) */
-+ USB_DEVICE(0x0424, 0x9904),
-+ .driver_info = (unsigned long) &smsc95xx_info,
-+ },
-+ {
-+ /* SMSC9500A USB Ethernet Device (HAL) */
-+ USB_DEVICE(0x0424, 0x9905),
-+ .driver_info = (unsigned long) &smsc95xx_info,
-+ },
-+ {
-+ /* SMSC9505A USB Ethernet Device (HAL) */
-+ USB_DEVICE(0x0424, 0x9906),
-+ .driver_info = (unsigned long) &smsc95xx_info,
-+ },
-+ {
-+ /* SMSC9500 USB Ethernet Device (Alternate ID) */
-+ USB_DEVICE(0x0424, 0x9907),
-+ .driver_info = (unsigned long) &smsc95xx_info,
-+ },
-+ {
-+ /* SMSC9500A USB Ethernet Device (Alternate ID) */
-+ USB_DEVICE(0x0424, 0x9908),
-+ .driver_info = (unsigned long) &smsc95xx_info,
-+ },
-+ {
-+ /* SMSC9512/9514 USB Hub & Ethernet Device (Alternate ID) */
-+ USB_DEVICE(0x0424, 0x9909),
-+ .driver_info = (unsigned long) &smsc95xx_info,
-+ },
-+ {
-+ /* SMSC LAN9530 USB Ethernet Device */
-+ USB_DEVICE(0x0424, 0x9530),
-+ .driver_info = (unsigned long) &smsc95xx_info,
-+ },
-+ {
-+ /* SMSC LAN9730 USB Ethernet Device */
-+ USB_DEVICE(0x0424, 0x9730),
-+ .driver_info = (unsigned long) &smsc95xx_info,
-+ },
-+ {
-+ /* SMSC LAN89530 USB Ethernet Device */
-+ USB_DEVICE(0x0424, 0x9E08),
-+ .driver_info = (unsigned long) &smsc95xx_info,
-+ },
-+ { }, /* END */
-+};
-+MODULE_DEVICE_TABLE(usb, products);
-+
-+static struct usb_driver smsc95xx_driver = {
-+ .name = "smsc95xx",
-+ .id_table = products,
-+ .probe = usbnet_probe,
-+ .suspend = smsc95xx_suspend,
-+ .resume = smsc95xx_resume,
-+ .reset_resume = smsc95xx_reset_resume,
-+ .disconnect = usbnet_disconnect,
-+ .disable_hub_initiated_lpm = 1,
-+ .supports_autosuspend = 1,
-+};
-+
-+module_usb_driver(smsc95xx_driver);
-+
-+MODULE_AUTHOR("Nancy Lin");
-+MODULE_AUTHOR("Steve Glendinning <steve.glendinning(a)shawell.net>");
-+MODULE_DESCRIPTION("SMSC95XX USB 2.0 Ethernet Devices");
-+MODULE_LICENSE("GPL");
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/smsc95xx.h backports-3.18.1-1/drivers/net/usb/smsc95xx.h
---- backports-3.18.1-1.org/drivers/net/usb/smsc95xx.h 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/smsc95xx.h 2014-12-16 18:39:45.000000000 +0100
-@@ -0,0 +1,290 @@
-+ /***************************************************************************
-+ *
-+ * Copyright (C) 2007-2008 SMSC
-+ *
-+ * 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, see <http://www.gnu.org/licenses/>.
-+ *
-+ *****************************************************************************/
-+
-+#ifndef _SMSC95XX_H
-+#define _SMSC95XX_H
-+
-+/* Tx command words */
-+#define TX_CMD_A_DATA_OFFSET_ (0x001F0000)
-+#define TX_CMD_A_FIRST_SEG_ (0x00002000)
-+#define TX_CMD_A_LAST_SEG_ (0x00001000)
-+#define TX_CMD_A_BUF_SIZE_ (0x000007FF)
-+
-+#define TX_CMD_B_CSUM_ENABLE (0x00004000)
-+#define TX_CMD_B_ADD_CRC_DISABLE_ (0x00002000)
-+#define TX_CMD_B_DISABLE_PADDING_ (0x00001000)
-+#define TX_CMD_B_PKT_BYTE_LENGTH_ (0x000007FF)
-+
-+/* Rx status word */
-+#define RX_STS_FF_ (0x40000000) /* Filter Fail */
-+#define RX_STS_FL_ (0x3FFF0000) /* Frame Length */
-+#define RX_STS_ES_ (0x00008000) /* Error Summary */
-+#define RX_STS_BF_ (0x00002000) /* Broadcast Frame */
-+#define RX_STS_LE_ (0x00001000) /* Length Error */
-+#define RX_STS_RF_ (0x00000800) /* Runt Frame */
-+#define RX_STS_MF_ (0x00000400) /* Multicast Frame */
-+#define RX_STS_TL_ (0x00000080) /* Frame too long */
-+#define RX_STS_CS_ (0x00000040) /* Collision Seen */
-+#define RX_STS_FT_ (0x00000020) /* Frame Type */
-+#define RX_STS_RW_ (0x00000010) /* Receive Watchdog */
-+#define RX_STS_ME_ (0x00000008) /* Mii Error */
-+#define RX_STS_DB_ (0x00000004) /* Dribbling */
-+#define RX_STS_CRC_ (0x00000002) /* CRC Error */
-+
-+/* SCSRs */
-+#define ID_REV (0x00)
-+#define ID_REV_CHIP_ID_MASK_ (0xFFFF0000)
-+#define ID_REV_CHIP_REV_MASK_ (0x0000FFFF)
-+#define ID_REV_CHIP_ID_9500_ (0x9500)
-+#define ID_REV_CHIP_ID_9500A_ (0x9E00)
-+#define ID_REV_CHIP_ID_9512_ (0xEC00)
-+#define ID_REV_CHIP_ID_9530_ (0x9530)
-+#define ID_REV_CHIP_ID_89530_ (0x9E08)
-+#define ID_REV_CHIP_ID_9730_ (0x9730)
-+
-+#define INT_STS (0x08)
-+#define INT_STS_TX_STOP_ (0x00020000)
-+#define INT_STS_RX_STOP_ (0x00010000)
-+#define INT_STS_PHY_INT_ (0x00008000)
-+#define INT_STS_TXE_ (0x00004000)
-+#define INT_STS_TDFU_ (0x00002000)
-+#define INT_STS_TDFO_ (0x00001000)
-+#define INT_STS_RXDF_ (0x00000800)
-+#define INT_STS_GPIOS_ (0x000007FF)
-+#define INT_STS_CLEAR_ALL_ (0xFFFFFFFF)
-+
-+#define RX_CFG (0x0C)
-+#define RX_FIFO_FLUSH_ (0x00000001)
-+
-+#define TX_CFG (0x10)
-+#define TX_CFG_ON_ (0x00000004)
-+#define TX_CFG_STOP_ (0x00000002)
-+#define TX_CFG_FIFO_FLUSH_ (0x00000001)
-+
-+#define HW_CFG (0x14)
-+#define HW_CFG_BIR_ (0x00001000)
-+#define HW_CFG_LEDB_ (0x00000800)
-+#define HW_CFG_RXDOFF_ (0x00000600)
-+#define HW_CFG_DRP_ (0x00000040)
-+#define HW_CFG_MEF_ (0x00000020)
-+#define HW_CFG_LRST_ (0x00000008)
-+#define HW_CFG_PSEL_ (0x00000004)
-+#define HW_CFG_BCE_ (0x00000002)
-+#define HW_CFG_SRST_ (0x00000001)
-+
-+#define RX_FIFO_INF (0x18)
-+
-+#define PM_CTRL (0x20)
-+#define PM_CTL_RES_CLR_WKP_STS (0x00000200)
-+#define PM_CTL_DEV_RDY_ (0x00000080)
-+#define PM_CTL_SUS_MODE_ (0x00000060)
-+#define PM_CTL_SUS_MODE_0 (0x00000000)
-+#define PM_CTL_SUS_MODE_1 (0x00000020)
-+#define PM_CTL_SUS_MODE_2 (0x00000040)
-+#define PM_CTL_SUS_MODE_3 (0x00000060)
-+#define PM_CTL_PHY_RST_ (0x00000010)
-+#define PM_CTL_WOL_EN_ (0x00000008)
-+#define PM_CTL_ED_EN_ (0x00000004)
-+#define PM_CTL_WUPS_ (0x00000003)
-+#define PM_CTL_WUPS_NO_ (0x00000000)
-+#define PM_CTL_WUPS_ED_ (0x00000001)
-+#define PM_CTL_WUPS_WOL_ (0x00000002)
-+#define PM_CTL_WUPS_MULTI_ (0x00000003)
-+
-+#define LED_GPIO_CFG (0x24)
-+#define LED_GPIO_CFG_SPD_LED (0x01000000)
-+#define LED_GPIO_CFG_LNK_LED (0x00100000)
-+#define LED_GPIO_CFG_FDX_LED (0x00010000)
-+
-+#define GPIO_CFG (0x28)
-+
-+#define AFC_CFG (0x2C)
-+
-+/* Hi watermark = 15.5Kb (~10 mtu pkts) */
-+/* low watermark = 3k (~2 mtu pkts) */
-+/* backpressure duration = ~ 350us */
-+/* Apply FC on any frame. */
-+#define AFC_CFG_DEFAULT (0x00F830A1)
-+
-+#define E2P_CMD (0x30)
-+#define E2P_CMD_BUSY_ (0x80000000)
-+#define E2P_CMD_MASK_ (0x70000000)
-+#define E2P_CMD_READ_ (0x00000000)
-+#define E2P_CMD_EWDS_ (0x10000000)
-+#define E2P_CMD_EWEN_ (0x20000000)
-+#define E2P_CMD_WRITE_ (0x30000000)
-+#define E2P_CMD_WRAL_ (0x40000000)
-+#define E2P_CMD_ERASE_ (0x50000000)
-+#define E2P_CMD_ERAL_ (0x60000000)
-+#define E2P_CMD_RELOAD_ (0x70000000)
-+#define E2P_CMD_TIMEOUT_ (0x00000400)
-+#define E2P_CMD_LOADED_ (0x00000200)
-+#define E2P_CMD_ADDR_ (0x000001FF)
-+
-+#define MAX_EEPROM_SIZE (512)
-+
-+#define E2P_DATA (0x34)
-+#define E2P_DATA_MASK_ (0x000000FF)
-+
-+#define BURST_CAP (0x38)
-+
-+#define GPIO_WAKE (0x64)
-+
-+#define INT_EP_CTL (0x68)
-+#define INT_EP_CTL_INTEP_ (0x80000000)
-+#define INT_EP_CTL_MACRTO_ (0x00080000)
-+#define INT_EP_CTL_TX_STOP_ (0x00020000)
-+#define INT_EP_CTL_RX_STOP_ (0x00010000)
-+#define INT_EP_CTL_PHY_INT_ (0x00008000)
-+#define INT_EP_CTL_TXE_ (0x00004000)
-+#define INT_EP_CTL_TDFU_ (0x00002000)
-+#define INT_EP_CTL_TDFO_ (0x00001000)
-+#define INT_EP_CTL_RXDF_ (0x00000800)
-+#define INT_EP_CTL_GPIOS_ (0x000007FF)
-+
-+#define BULK_IN_DLY (0x6C)
-+
-+/* MAC CSRs */
-+#define MAC_CR (0x100)
-+#define MAC_CR_RXALL_ (0x80000000)
-+#define MAC_CR_RCVOWN_ (0x00800000)
-+#define MAC_CR_LOOPBK_ (0x00200000)
-+#define MAC_CR_FDPX_ (0x00100000)
-+#define MAC_CR_MCPAS_ (0x00080000)
-+#define MAC_CR_PRMS_ (0x00040000)
-+#define MAC_CR_INVFILT_ (0x00020000)
-+#define MAC_CR_PASSBAD_ (0x00010000)
-+#define MAC_CR_HFILT_ (0x00008000)
-+#define MAC_CR_HPFILT_ (0x00002000)
-+#define MAC_CR_LCOLL_ (0x00001000)
-+#define MAC_CR_BCAST_ (0x00000800)
-+#define MAC_CR_DISRTY_ (0x00000400)
-+#define MAC_CR_PADSTR_ (0x00000100)
-+#define MAC_CR_BOLMT_MASK (0x000000C0)
-+#define MAC_CR_DFCHK_ (0x00000020)
-+#define MAC_CR_TXEN_ (0x00000008)
-+#define MAC_CR_RXEN_ (0x00000004)
-+
-+#define ADDRH (0x104)
-+
-+#define ADDRL (0x108)
-+
-+#define HASHH (0x10C)
-+
-+#define HASHL (0x110)
-+
-+#define MII_ADDR (0x114)
-+#define MII_WRITE_ (0x02)
-+#define MII_BUSY_ (0x01)
-+#define MII_READ_ (0x00) /* ~of MII Write bit */
-+
-+#define MII_DATA (0x118)
-+
-+#define FLOW (0x11C)
-+#define FLOW_FCPT_ (0xFFFF0000)
-+#define FLOW_FCPASS_ (0x00000004)
-+#define FLOW_FCEN_ (0x00000002)
-+#define FLOW_FCBSY_ (0x00000001)
-+
-+#define VLAN1 (0x120)
-+
-+#define VLAN2 (0x124)
-+
-+#define WUFF (0x128)
-+#define LAN9500_WUFF_NUM (4)
-+#define LAN9500A_WUFF_NUM (8)
-+
-+#define WUCSR (0x12C)
-+#define WUCSR_WFF_PTR_RST_ (0x80000000)
-+#define WUCSR_GUE_ (0x00000200)
-+#define WUCSR_WUFR_ (0x00000040)
-+#define WUCSR_MPR_ (0x00000020)
-+#define WUCSR_WAKE_EN_ (0x00000004)
-+#define WUCSR_MPEN_ (0x00000002)
-+
-+#define COE_CR (0x130)
-+#define Tx_COE_EN_ (0x00010000)
-+#define Rx_COE_MODE_ (0x00000002)
-+#define Rx_COE_EN_ (0x00000001)
-+
-+/* Vendor-specific PHY Definitions */
-+
-+/* EDPD NLP / crossover time configuration (LAN9500A only) */
-+#define PHY_EDPD_CONFIG (16)
-+#define PHY_EDPD_CONFIG_TX_NLP_EN_ ((u16)0x8000)
-+#define PHY_EDPD_CONFIG_TX_NLP_1000_ ((u16)0x0000)
-+#define PHY_EDPD_CONFIG_TX_NLP_768_ ((u16)0x2000)
-+#define PHY_EDPD_CONFIG_TX_NLP_512_ ((u16)0x4000)
-+#define PHY_EDPD_CONFIG_TX_NLP_256_ ((u16)0x6000)
-+#define PHY_EDPD_CONFIG_RX_1_NLP_ ((u16)0x1000)
-+#define PHY_EDPD_CONFIG_RX_NLP_64_ ((u16)0x0000)
-+#define PHY_EDPD_CONFIG_RX_NLP_256_ ((u16)0x0400)
-+#define PHY_EDPD_CONFIG_RX_NLP_512_ ((u16)0x0800)
-+#define PHY_EDPD_CONFIG_RX_NLP_1000_ ((u16)0x0C00)
-+#define PHY_EDPD_CONFIG_EXT_CROSSOVER_ ((u16)0x0001)
-+#define PHY_EDPD_CONFIG_DEFAULT (PHY_EDPD_CONFIG_TX_NLP_EN_ | \
-+ PHY_EDPD_CONFIG_TX_NLP_768_ | \
-+ PHY_EDPD_CONFIG_RX_1_NLP_)
-+
-+/* Mode Control/Status Register */
-+#define PHY_MODE_CTRL_STS (17)
-+#define MODE_CTRL_STS_EDPWRDOWN_ ((u16)0x2000)
-+#define MODE_CTRL_STS_ENERGYON_ ((u16)0x0002)
-+
-+#define SPECIAL_CTRL_STS (27)
-+#define SPECIAL_CTRL_STS_OVRRD_AMDIX_ ((u16)0x8000)
-+#define SPECIAL_CTRL_STS_AMDIX_ENABLE_ ((u16)0x4000)
-+#define SPECIAL_CTRL_STS_AMDIX_STATE_ ((u16)0x2000)
-+
-+#define PHY_INT_SRC (29)
-+#define PHY_INT_SRC_ENERGY_ON_ ((u16)0x0080)
-+#define PHY_INT_SRC_ANEG_COMP_ ((u16)0x0040)
-+#define PHY_INT_SRC_REMOTE_FAULT_ ((u16)0x0020)
-+#define PHY_INT_SRC_LINK_DOWN_ ((u16)0x0010)
-+
-+#define PHY_INT_MASK (30)
-+#define PHY_INT_MASK_ENERGY_ON_ ((u16)0x0080)
-+#define PHY_INT_MASK_ANEG_COMP_ ((u16)0x0040)
-+#define PHY_INT_MASK_REMOTE_FAULT_ ((u16)0x0020)
-+#define PHY_INT_MASK_LINK_DOWN_ ((u16)0x0010)
-+#define PHY_INT_MASK_DEFAULT_ (PHY_INT_MASK_ANEG_COMP_ | \
-+ PHY_INT_MASK_LINK_DOWN_)
-+
-+#define PHY_SPECIAL (31)
-+#define PHY_SPECIAL_SPD_ ((u16)0x001C)
-+#define PHY_SPECIAL_SPD_10HALF_ ((u16)0x0004)
-+#define PHY_SPECIAL_SPD_10FULL_ ((u16)0x0014)
-+#define PHY_SPECIAL_SPD_100HALF_ ((u16)0x0008)
-+#define PHY_SPECIAL_SPD_100FULL_ ((u16)0x0018)
-+
-+/* USB Vendor Requests */
-+#define USB_VENDOR_REQUEST_WRITE_REGISTER 0xA0
-+#define USB_VENDOR_REQUEST_READ_REGISTER 0xA1
-+#define USB_VENDOR_REQUEST_GET_STATS 0xA2
-+
-+/* Interrupt Endpoint status word bitfields */
-+#define INT_ENP_TX_STOP_ ((u32)BIT(17))
-+#define INT_ENP_RX_STOP_ ((u32)BIT(16))
-+#define INT_ENP_PHY_INT_ ((u32)BIT(15))
-+#define INT_ENP_TXE_ ((u32)BIT(14))
-+#define INT_ENP_TDFU_ ((u32)BIT(13))
-+#define INT_ENP_TDFO_ ((u32)BIT(12))
-+#define INT_ENP_RXDF_ ((u32)BIT(11))
-+
-+#endif /* _SMSC95XX_H */
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/sr9700.c backports-3.18.1-1/drivers/net/usb/sr9700.c
---- backports-3.18.1-1.org/drivers/net/usb/sr9700.c 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/sr9700.c 2014-12-16 18:39:45.000000000 +0100
-@@ -0,0 +1,559 @@
-+/*
-+ * CoreChip-sz SR9700 one chip USB 1.1 Ethernet Devices
-+ *
-+ * Author : Liu Junliang <liujunliang_ljl(a)163.com>
-+ *
-+ * Based on dm9601.c
-+ *
-+ * This file is licensed under the terms of the GNU General Public License
-+ * version 2. This program is licensed "as is" without any warranty of any
-+ * kind, whether express or implied.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/sched.h>
-+#include <linux/stddef.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/ethtool.h>
-+#include <linux/mii.h>
-+#include <linux/usb.h>
-+#include <linux/crc32.h>
-+#include <linux/usb/usbnet.h>
-+
-+#include "sr9700.h"
-+
-+static int sr_read(struct usbnet *dev, u8 reg, u16 length, void *data)
-+{
-+ int err;
-+
-+ err = usbnet_read_cmd(dev, SR_RD_REGS, SR_REQ_RD_REG, 0, reg, data,
-+ length);
-+ if ((err != length) && (err >= 0))
-+ err = -EINVAL;
-+ return err;
-+}
-+
-+static int sr_write(struct usbnet *dev, u8 reg, u16 length, void *data)
-+{
-+ int err;
-+
-+ err = usbnet_write_cmd(dev, SR_WR_REGS, SR_REQ_WR_REG, 0, reg, data,
-+ length);
-+ if ((err >= 0) && (err < length))
-+ err = -EINVAL;
-+ return err;
-+}
-+
-+static int sr_read_reg(struct usbnet *dev, u8 reg, u8 *value)
-+{
-+ return sr_read(dev, reg, 1, value);
-+}
-+
-+static int sr_write_reg(struct usbnet *dev, u8 reg, u8 value)
-+{
-+ return usbnet_write_cmd(dev, SR_WR_REGS, SR_REQ_WR_REG,
-+ value, reg, NULL, 0);
-+}
-+
-+static void sr_write_async(struct usbnet *dev, u8 reg, u16 length, void *data)
-+{
-+ usbnet_write_cmd_async(dev, SR_WR_REGS, SR_REQ_WR_REG,
-+ 0, reg, data, length);
-+}
-+
-+static void sr_write_reg_async(struct usbnet *dev, u8 reg, u8 value)
-+{
-+ usbnet_write_cmd_async(dev, SR_WR_REGS, SR_REQ_WR_REG,
-+ value, reg, NULL, 0);
-+}
-+
-+static int wait_phy_eeprom_ready(struct usbnet *dev, int phy)
-+{
-+ int i;
-+
-+ for (i = 0; i < SR_SHARE_TIMEOUT; i++) {
-+ u8 tmp = 0;
-+ int ret;
-+
-+ udelay(1);
-+ ret = sr_read_reg(dev, EPCR, &tmp);
-+ if (ret < 0)
-+ return ret;
-+
-+ /* ready */
-+ if (!(tmp & EPCR_ERRE))
-+ return 0;
-+ }
-+
-+ netdev_err(dev->net, "%s write timed out!\n", phy ? "phy" : "eeprom");
-+
-+ return -EIO;
-+}
-+
-+static int sr_share_read_word(struct usbnet *dev, int phy, u8 reg,
-+ __le16 *value)
-+{
-+ int ret;
-+
-+ mutex_lock(&dev->phy_mutex);
-+
-+ sr_write_reg(dev, EPAR, phy ? (reg | EPAR_PHY_ADR) : reg);
-+ sr_write_reg(dev, EPCR, phy ? (EPCR_EPOS | EPCR_ERPRR) : EPCR_ERPRR);
-+
-+ ret = wait_phy_eeprom_ready(dev, phy);
-+ if (ret < 0)
-+ goto out_unlock;
-+
-+ sr_write_reg(dev, EPCR, 0x0);
-+ ret = sr_read(dev, EPDR, 2, value);
-+
-+ netdev_dbg(dev->net, "read shared %d 0x%02x returned 0x%04x, %d\n",
-+ phy, reg, *value, ret);
-+
-+out_unlock:
-+ mutex_unlock(&dev->phy_mutex);
-+ return ret;
-+}
-+
-+static int sr_share_write_word(struct usbnet *dev, int phy, u8 reg,
-+ __le16 value)
-+{
-+ int ret;
-+
-+ mutex_lock(&dev->phy_mutex);
-+
-+ ret = sr_write(dev, EPDR, 2, &value);
-+ if (ret < 0)
-+ goto out_unlock;
-+
-+ sr_write_reg(dev, EPAR, phy ? (reg | EPAR_PHY_ADR) : reg);
-+ sr_write_reg(dev, EPCR, phy ? (EPCR_WEP | EPCR_EPOS | EPCR_ERPRW) :
-+ (EPCR_WEP | EPCR_ERPRW));
-+
-+ ret = wait_phy_eeprom_ready(dev, phy);
-+ if (ret < 0)
-+ goto out_unlock;
-+
-+ sr_write_reg(dev, EPCR, 0x0);
-+
-+out_unlock:
-+ mutex_unlock(&dev->phy_mutex);
-+ return ret;
-+}
-+
-+static int sr_read_eeprom_word(struct usbnet *dev, u8 offset, void *value)
-+{
-+ return sr_share_read_word(dev, 0, offset, value);
-+}
-+
-+static int sr9700_get_eeprom_len(struct net_device *netdev)
-+{
-+ return SR_EEPROM_LEN;
-+}
-+
-+static int sr9700_get_eeprom(struct net_device *netdev,
-+ struct ethtool_eeprom *eeprom, u8 *data)
-+{
-+ struct usbnet *dev = netdev_priv(netdev);
-+ __le16 *buf = (__le16 *)data;
-+ int ret = 0;
-+ int i;
-+
-+ /* access is 16bit */
-+ if ((eeprom->offset & 0x01) || (eeprom->len & 0x01))
-+ return -EINVAL;
-+
-+ for (i = 0; i < eeprom->len / 2; i++) {
-+ ret = sr_read_eeprom_word(dev, eeprom->offset / 2 + i, buf + i);
-+ if (ret < 0)
-+ break;
-+ }
-+
-+ return ret;
-+}
-+
-+static int sr_mdio_read(struct net_device *netdev, int phy_id, int loc)
-+{
-+ struct usbnet *dev = netdev_priv(netdev);
-+ __le16 res;
-+ int rc = 0;
-+
-+ if (phy_id) {
-+ netdev_dbg(netdev, "Only internal phy supported\n");
-+ return 0;
-+ }
-+
-+ /* Access NSR_LINKST bit for link status instead of MII_BMSR */
-+ if (loc == MII_BMSR) {
-+ u8 value;
-+
-+ sr_read_reg(dev, NSR, &value);
-+ if (value & NSR_LINKST)
-+ rc = 1;
-+ }
-+ sr_share_read_word(dev, 1, loc, &res);
-+ if (rc == 1)
-+ res = le16_to_cpu(res) | BMSR_LSTATUS;
-+ else
-+ res = le16_to_cpu(res) & ~BMSR_LSTATUS;
-+
-+ netdev_dbg(netdev, "sr_mdio_read() phy_id=0x%02x, loc=0x%02x, returns=0x%04x\n",
-+ phy_id, loc, res);
-+
-+ return res;
-+}
-+
-+static void sr_mdio_write(struct net_device *netdev, int phy_id, int loc,
-+ int val)
-+{
-+ struct usbnet *dev = netdev_priv(netdev);
-+ __le16 res = cpu_to_le16(val);
-+
-+ if (phy_id) {
-+ netdev_dbg(netdev, "Only internal phy supported\n");
-+ return;
-+ }
-+
-+ netdev_dbg(netdev, "sr_mdio_write() phy_id=0x%02x, loc=0x%02x, val=0x%04x\n",
-+ phy_id, loc, val);
-+
-+ sr_share_write_word(dev, 1, loc, res);
-+}
-+
-+static u32 sr9700_get_link(struct net_device *netdev)
-+{
-+ struct usbnet *dev = netdev_priv(netdev);
-+ u8 value = 0;
-+ int rc = 0;
-+
-+ /* Get the Link Status directly */
-+ sr_read_reg(dev, NSR, &value);
-+ if (value & NSR_LINKST)
-+ rc = 1;
-+
-+ return rc;
-+}
-+
-+static int sr9700_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
-+{
-+ struct usbnet *dev = netdev_priv(netdev);
-+
-+ return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
-+}
-+
-+static const struct ethtool_ops sr9700_ethtool_ops = {
-+ .get_drvinfo = usbnet_get_drvinfo,
-+ .get_link = sr9700_get_link,
-+ .get_msglevel = usbnet_get_msglevel,
-+ .set_msglevel = usbnet_set_msglevel,
-+ .get_eeprom_len = sr9700_get_eeprom_len,
-+ .get_eeprom = sr9700_get_eeprom,
-+ .get_settings = usbnet_get_settings,
-+ .set_settings = usbnet_set_settings,
-+ .nway_reset = usbnet_nway_reset,
-+};
-+
-+static void sr9700_set_multicast(struct net_device *netdev)
-+{
-+ struct usbnet *dev = netdev_priv(netdev);
-+ /* We use the 20 byte dev->data for our 8 byte filter buffer
-+ * to avoid allocating memory that is tricky to free later
-+ */
-+ u8 *hashes = (u8 *)&dev->data;
-+ /* rx_ctl setting : enable, disable_long, disable_crc */
-+ u8 rx_ctl = RCR_RXEN | RCR_DIS_CRC | RCR_DIS_LONG;
-+
-+ memset(hashes, 0x00, SR_MCAST_SIZE);
-+ /* broadcast address */
-+ hashes[SR_MCAST_SIZE - 1] |= SR_MCAST_ADDR_FLAG;
-+ if (netdev->flags & IFF_PROMISC) {
-+ rx_ctl |= RCR_PRMSC;
-+ } else if (netdev->flags & IFF_ALLMULTI ||
-+ netdev_mc_count(netdev) > SR_MCAST_MAX) {
-+ rx_ctl |= RCR_RUNT;
-+ } else if (!netdev_mc_empty(netdev)) {
-+ struct netdev_hw_addr *ha;
-+
-+ netdev_for_each_mc_addr(ha, netdev) {
-+ u32 crc = ether_crc(ETH_ALEN, ha->addr) >> 26;
-+ hashes[crc >> 3] |= 1 << (crc & 0x7);
-+ }
-+ }
-+
-+ sr_write_async(dev, MAR, SR_MCAST_SIZE, hashes);
-+ sr_write_reg_async(dev, RCR, rx_ctl);
-+}
-+
-+static int sr9700_set_mac_address(struct net_device *netdev, void *p)
-+{
-+ struct usbnet *dev = netdev_priv(netdev);
-+ struct sockaddr *addr = p;
-+
-+ if (!is_valid_ether_addr(addr->sa_data)) {
-+ netdev_err(netdev, "not setting invalid mac address %pM\n",
-+ addr->sa_data);
-+ return -EINVAL;
-+ }
-+
-+ memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
-+ sr_write_async(dev, PAR, 6, netdev->dev_addr);
-+
-+ return 0;
-+}
-+
-+static const struct net_device_ops sr9700_netdev_ops = {
-+ .ndo_open = usbnet_open,
-+ .ndo_stop = usbnet_stop,
-+ .ndo_start_xmit = usbnet_start_xmit,
-+ .ndo_tx_timeout = usbnet_tx_timeout,
-+ .ndo_change_mtu = usbnet_change_mtu,
-+ .ndo_validate_addr = eth_validate_addr,
-+ .ndo_do_ioctl = sr9700_ioctl,
-+ .ndo_set_rx_mode = sr9700_set_multicast,
-+ .ndo_set_mac_address = sr9700_set_mac_address,
-+};
-+
-+static int sr9700_bind(struct usbnet *dev, struct usb_interface *intf)
-+{
-+ struct net_device *netdev;
-+ struct mii_if_info *mii;
-+ int ret;
-+
-+ ret = usbnet_get_endpoints(dev, intf);
-+ if (ret)
-+ goto out;
-+
-+ netdev = dev->net;
-+
-+ netdev->netdev_ops = &sr9700_netdev_ops;
-+ netdev->ethtool_ops = &sr9700_ethtool_ops;
-+ netdev->hard_header_len += SR_TX_OVERHEAD;
-+ dev->hard_mtu = netdev->mtu + netdev->hard_header_len;
-+ /* bulkin buffer is preferably not less than 3K */
-+ dev->rx_urb_size = 3072;
-+
-+ mii = &dev->mii;
-+ mii->dev = netdev;
-+ mii->mdio_read = sr_mdio_read;
-+ mii->mdio_write = sr_mdio_write;
-+ mii->phy_id_mask = 0x1f;
-+ mii->reg_num_mask = 0x1f;
-+
-+ sr_write_reg(dev, NCR, NCR_RST);
-+ udelay(20);
-+
-+ /* read MAC
-+ * After Chip Power on, the Chip will reload the MAC from
-+ * EEPROM automatically to PAR. In case there is no EEPROM externally,
-+ * a default MAC address is stored in PAR for making chip work properly.
-+ */
-+ if (sr_read(dev, PAR, ETH_ALEN, netdev->dev_addr) < 0) {
-+ netdev_err(netdev, "Error reading MAC address\n");
-+ ret = -ENODEV;
-+ goto out;
-+ }
-+
-+ /* power up and reset phy */
-+ sr_write_reg(dev, PRR, PRR_PHY_RST);
-+ /* at least 10ms, here 20ms for safe */
-+ mdelay(20);
-+ sr_write_reg(dev, PRR, 0);
-+ /* at least 1ms, here 2ms for reading right register */
-+ udelay(2 * 1000);
-+
-+ /* receive broadcast packets */
-+ sr9700_set_multicast(netdev);
-+
-+ sr_mdio_write(netdev, mii->phy_id, MII_BMCR, BMCR_RESET);
-+ sr_mdio_write(netdev, mii->phy_id, MII_ADVERTISE, ADVERTISE_ALL |
-+ ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP);
-+ mii_nway_restart(mii);
-+
-+out:
-+ return ret;
-+}
-+
-+static int sr9700_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
-+{
-+ struct sk_buff *sr_skb;
-+ int len;
-+
-+ /* skb content (packets) format :
-+ * p0 p1 p2 ...... pm
-+ * / \
-+ * / \
-+ * / \
-+ * / \
-+ * p0b0 p0b1 p0b2 p0b3 ...... p0b(n-4) p0b(n-3)...p0bn
-+ *
-+ * p0 : packet 0
-+ * p0b0 : packet 0 byte 0
-+ *
-+ * b0: rx status
-+ * b1: packet length (incl crc) low
-+ * b2: packet length (incl crc) high
-+ * b3..n-4: packet data
-+ * bn-3..bn: ethernet packet crc
-+ */
-+ if (unlikely(skb->len < SR_RX_OVERHEAD)) {
-+ netdev_err(dev->net, "unexpected tiny rx frame\n");
-+ return 0;
-+ }
-+
-+ /* one skb may contains multiple packets */
-+ while (skb->len > SR_RX_OVERHEAD) {
-+ if (skb->data[0] != 0x40)
-+ return 0;
-+
-+ /* ignore the CRC length */
-+ len = (skb->data[1] | (skb->data[2] << 8)) - 4;
-+
-+ if (len > ETH_FRAME_LEN)
-+ return 0;
-+
-+ /* the last packet of current skb */
-+ if (skb->len == (len + SR_RX_OVERHEAD)) {
-+ skb_pull(skb, 3);
-+ skb->len = len;
-+ skb_set_tail_pointer(skb, len);
-+ skb->truesize = len + sizeof(struct sk_buff);
-+ return 2;
-+ }
-+
-+ /* skb_clone is used for address align */
-+ sr_skb = skb_clone(skb, GFP_ATOMIC);
-+ if (!sr_skb)
-+ return 0;
-+
-+ sr_skb->len = len;
-+ sr_skb->data = skb->data + 3;
-+ skb_set_tail_pointer(sr_skb, len);
-+ sr_skb->truesize = len + sizeof(struct sk_buff);
-+ usbnet_skb_return(dev, sr_skb);
-+
-+ skb_pull(skb, len + SR_RX_OVERHEAD);
-+ };
-+
-+ return 0;
-+}
-+
-+static struct sk_buff *sr9700_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
-+ gfp_t flags)
-+{
-+ int len;
-+
-+ /* SR9700 can only send out one ethernet packet at once.
-+ *
-+ * b0 b1 b2 b3 ...... b(n-4) b(n-3)...bn
-+ *
-+ * b0: rx status
-+ * b1: packet length (incl crc) low
-+ * b2: packet length (incl crc) high
-+ * b3..n-4: packet data
-+ * bn-3..bn: ethernet packet crc
-+ */
-+
-+ len = skb->len;
-+
-+ if (skb_headroom(skb) < SR_TX_OVERHEAD) {
-+ struct sk_buff *skb2;
-+
-+ skb2 = skb_copy_expand(skb, SR_TX_OVERHEAD, 0, flags);
-+ dev_kfree_skb_any(skb);
-+ skb = skb2;
-+ if (!skb)
-+ return NULL;
-+ }
-+
-+ __skb_push(skb, SR_TX_OVERHEAD);
-+
-+ /* usbnet adds padding if length is a multiple of packet size
-+ * if so, adjust length value in header
-+ */
-+ if ((skb->len % dev->maxpacket) == 0)
-+ len++;
-+
-+ skb->data[0] = len;
-+ skb->data[1] = len >> 8;
-+
-+ return skb;
-+}
-+
-+static void sr9700_status(struct usbnet *dev, struct urb *urb)
-+{
-+ int link;
-+ u8 *buf;
-+
-+ /* format:
-+ b0: net status
-+ b1: tx status 1
-+ b2: tx status 2
-+ b3: rx status
-+ b4: rx overflow
-+ b5: rx count
-+ b6: tx count
-+ b7: gpr
-+ */
-+
-+ if (urb->actual_length < 8)
-+ return;
-+
-+ buf = urb->transfer_buffer;
-+
-+ link = !!(buf[0] & 0x40);
-+ if (netif_carrier_ok(dev->net) != link) {
-+ usbnet_link_change(dev, link, 1);
-+ netdev_dbg(dev->net, "Link Status is: %d\n", link);
-+ }
-+}
-+
-+static int sr9700_link_reset(struct usbnet *dev)
-+{
-+ struct ethtool_cmd ecmd;
-+
-+ mii_check_media(&dev->mii, 1, 1);
-+ mii_ethtool_gset(&dev->mii, &ecmd);
-+
-+ netdev_dbg(dev->net, "link_reset() speed: %d duplex: %d\n",
-+ ecmd.speed, ecmd.duplex);
-+
-+ return 0;
-+}
-+
-+static const struct driver_info sr9700_driver_info = {
-+ .description = "CoreChip SR9700 USB Ethernet",
-+ .flags = FLAG_ETHER,
-+ .bind = sr9700_bind,
-+ .rx_fixup = sr9700_rx_fixup,
-+ .tx_fixup = sr9700_tx_fixup,
-+ .status = sr9700_status,
-+ .link_reset = sr9700_link_reset,
-+ .reset = sr9700_link_reset,
-+};
-+
-+static const struct usb_device_id products[] = {
-+ {
-+ USB_DEVICE(0x0fe6, 0x9700), /* SR9700 device */
-+ .driver_info = (unsigned long)&sr9700_driver_info,
-+ },
-+ {}, /* END */
-+};
-+
-+MODULE_DEVICE_TABLE(usb, products);
-+
-+static struct usb_driver sr9700_usb_driver = {
-+ .name = "sr9700",
-+ .id_table = products,
-+ .probe = usbnet_probe,
-+ .disconnect = usbnet_disconnect,
-+ .suspend = usbnet_suspend,
-+ .resume = usbnet_resume,
-+ .disable_hub_initiated_lpm = 1,
-+};
-+
-+module_usb_driver(sr9700_usb_driver);
-+
-+MODULE_AUTHOR("liujl <liujunliang_ljl(a)163.com>");
-+MODULE_DESCRIPTION("SR9700 one chip USB 1.1 USB to Ethernet device from http://www.corechip-sz.com/");
-+MODULE_LICENSE("GPL");
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/sr9700.h backports-3.18.1-1/drivers/net/usb/sr9700.h
---- backports-3.18.1-1.org/drivers/net/usb/sr9700.h 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/sr9700.h 2014-12-16 18:39:45.000000000 +0100
-@@ -0,0 +1,173 @@
-+/*
-+ * CoreChip-sz SR9700 one chip USB 1.1 Ethernet Devices
-+ *
-+ * Author : Liu Junliang <liujunliang_ljl(a)163.com>
-+ *
-+ * 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 published by the Free Software Foundation.
-+ */
-+
-+#ifndef _SR9700_H
-+#define _SR9700_H
-+
-+/* sr9700 spec. register table on Linux platform */
-+
-+/* Network Control Reg */
-+#define NCR 0x00
-+#define NCR_RST (1 << 0)
-+#define NCR_LBK (3 << 1)
-+#define NCR_FDX (1 << 3)
-+#define NCR_WAKEEN (1 << 6)
-+/* Network Status Reg */
-+#define NSR 0x01
-+#define NSR_RXRDY (1 << 0)
-+#define NSR_RXOV (1 << 1)
-+#define NSR_TX1END (1 << 2)
-+#define NSR_TX2END (1 << 3)
-+#define NSR_TXFULL (1 << 4)
-+#define NSR_WAKEST (1 << 5)
-+#define NSR_LINKST (1 << 6)
-+#define NSR_SPEED (1 << 7)
-+/* Tx Control Reg */
-+#define TCR 0x02
-+#define TCR_CRC_DIS (1 << 1)
-+#define TCR_PAD_DIS (1 << 2)
-+#define TCR_LC_CARE (1 << 3)
-+#define TCR_CRS_CARE (1 << 4)
-+#define TCR_EXCECM (1 << 5)
-+#define TCR_LF_EN (1 << 6)
-+/* Tx Status Reg for Packet Index 1 */
-+#define TSR1 0x03
-+#define TSR1_EC (1 << 2)
-+#define TSR1_COL (1 << 3)
-+#define TSR1_LC (1 << 4)
-+#define TSR1_NC (1 << 5)
-+#define TSR1_LOC (1 << 6)
-+#define TSR1_TLF (1 << 7)
-+/* Tx Status Reg for Packet Index 2 */
-+#define TSR2 0x04
-+#define TSR2_EC (1 << 2)
-+#define TSR2_COL (1 << 3)
-+#define TSR2_LC (1 << 4)
-+#define TSR2_NC (1 << 5)
-+#define TSR2_LOC (1 << 6)
-+#define TSR2_TLF (1 << 7)
-+/* Rx Control Reg*/
-+#define RCR 0x05
-+#define RCR_RXEN (1 << 0)
-+#define RCR_PRMSC (1 << 1)
-+#define RCR_RUNT (1 << 2)
-+#define RCR_ALL (1 << 3)
-+#define RCR_DIS_CRC (1 << 4)
-+#define RCR_DIS_LONG (1 << 5)
-+/* Rx Status Reg */
-+#define RSR 0x06
-+#define RSR_AE (1 << 2)
-+#define RSR_MF (1 << 6)
-+#define RSR_RF (1 << 7)
-+/* Rx Overflow Counter Reg */
-+#define ROCR 0x07
-+#define ROCR_ROC (0x7F << 0)
-+#define ROCR_RXFU (1 << 7)
-+/* Back Pressure Threshold Reg */
-+#define BPTR 0x08
-+#define BPTR_JPT (0x0F << 0)
-+#define BPTR_BPHW (0x0F << 4)
-+/* Flow Control Threshold Reg */
-+#define FCTR 0x09
-+#define FCTR_LWOT (0x0F << 0)
-+#define FCTR_HWOT (0x0F << 4)
-+/* rx/tx Flow Control Reg */
-+#define FCR 0x0A
-+#define FCR_FLCE (1 << 0)
-+#define FCR_BKPA (1 << 4)
-+#define FCR_TXPEN (1 << 5)
-+#define FCR_TXPF (1 << 6)
-+#define FCR_TXP0 (1 << 7)
-+/* Eeprom & Phy Control Reg */
-+#define EPCR 0x0B
-+#define EPCR_ERRE (1 << 0)
-+#define EPCR_ERPRW (1 << 1)
-+#define EPCR_ERPRR (1 << 2)
-+#define EPCR_EPOS (1 << 3)
-+#define EPCR_WEP (1 << 4)
-+/* Eeprom & Phy Address Reg */
-+#define EPAR 0x0C
-+#define EPAR_EROA (0x3F << 0)
-+#define EPAR_PHY_ADR_MASK (0x03 << 6)
-+#define EPAR_PHY_ADR (0x01 << 6)
-+/* Eeprom & Phy Data Reg */
-+#define EPDR 0x0D /* 0x0D ~ 0x0E for Data Reg Low & High */
-+/* Wakeup Control Reg */
-+#define WCR 0x0F
-+#define WCR_MAGICST (1 << 0)
-+#define WCR_LINKST (1 << 2)
-+#define WCR_MAGICEN (1 << 3)
-+#define WCR_LINKEN (1 << 5)
-+/* Physical Address Reg */
-+#define PAR 0x10 /* 0x10 ~ 0x15 6 bytes for PAR */
-+/* Multicast Address Reg */
-+#define MAR 0x16 /* 0x16 ~ 0x1D 8 bytes for MAR */
-+/* 0x1e unused */
-+/* Phy Reset Reg */
-+#define PRR 0x1F
-+#define PRR_PHY_RST (1 << 0)
-+/* Tx sdram Write Pointer Address Low */
-+#define TWPAL 0x20
-+/* Tx sdram Write Pointer Address High */
-+#define TWPAH 0x21
-+/* Tx sdram Read Pointer Address Low */
-+#define TRPAL 0x22
-+/* Tx sdram Read Pointer Address High */
-+#define TRPAH 0x23
-+/* Rx sdram Write Pointer Address Low */
-+#define RWPAL 0x24
-+/* Rx sdram Write Pointer Address High */
-+#define RWPAH 0x25
-+/* Rx sdram Read Pointer Address Low */
-+#define RRPAL 0x26
-+/* Rx sdram Read Pointer Address High */
-+#define RRPAH 0x27
-+/* Vendor ID register */
-+#define VID 0x28 /* 0x28 ~ 0x29 2 bytes for VID */
-+/* Product ID register */
-+#define PID 0x2A /* 0x2A ~ 0x2B 2 bytes for PID */
-+/* CHIP Revision register */
-+#define CHIPR 0x2C
-+/* 0x2D --> 0xEF unused */
-+/* USB Device Address */
-+#define USBDA 0xF0
-+#define USBDA_USBFA (0x7F << 0)
-+/* RX packet Counter Reg */
-+#define RXC 0xF1
-+/* Tx packet Counter & USB Status Reg */
-+#define TXC_USBS 0xF2
-+#define TXC_USBS_TXC0 (1 << 0)
-+#define TXC_USBS_TXC1 (1 << 1)
-+#define TXC_USBS_TXC2 (1 << 2)
-+#define TXC_USBS_EP1RDY (1 << 5)
-+#define TXC_USBS_SUSFLAG (1 << 6)
-+#define TXC_USBS_RXFAULT (1 << 7)
-+/* USB Control register */
-+#define USBC 0xF4
-+#define USBC_EP3NAK (1 << 4)
-+#define USBC_EP3ACK (1 << 5)
-+
-+/* Register access commands and flags */
-+#define SR_RD_REGS 0x00
-+#define SR_WR_REGS 0x01
-+#define SR_WR_REG 0x03
-+#define SR_REQ_RD_REG (USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE)
-+#define SR_REQ_WR_REG (USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE)
-+
-+/* parameters */
-+#define SR_SHARE_TIMEOUT 1000
-+#define SR_EEPROM_LEN 256
-+#define SR_MCAST_SIZE 8
-+#define SR_MCAST_ADDR_FLAG 0x80
-+#define SR_MCAST_MAX 64
-+#define SR_TX_OVERHEAD 2 /* 2bytes header */
-+#define SR_RX_OVERHEAD 7 /* 3bytes header + 4crc tail */
-+
-+#endif /* _SR9700_H */
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/sr9800.c backports-3.18.1-1/drivers/net/usb/sr9800.c
---- backports-3.18.1-1.org/drivers/net/usb/sr9800.c 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/sr9800.c 2014-12-16 18:39:45.000000000 +0100
-@@ -0,0 +1,874 @@
-+/* CoreChip-sz SR9800 one chip USB 2.0 Ethernet Devices
-+ *
-+ * Author : Liu Junliang <liujunliang_ljl(a)163.com>
-+ *
-+ * Based on asix_common.c, asix_devices.c
-+ *
-+ * This file is licensed under the terms of the GNU General Public License
-+ * version 2. This program is licensed "as is" without any warranty of any
-+ * kind, whether express or implied.*
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kmod.h>
-+#include <linux/init.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/ethtool.h>
-+#include <linux/workqueue.h>
-+#include <linux/mii.h>
-+#include <linux/usb.h>
-+#include <linux/crc32.h>
-+#include <linux/usb/usbnet.h>
-+#include <linux/slab.h>
-+#include <linux/if_vlan.h>
-+
-+#include "sr9800.h"
-+
-+static int sr_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
-+ u16 size, void *data)
-+{
-+ int err;
-+
-+ err = usbnet_read_cmd(dev, cmd, SR_REQ_RD_REG, value, index,
-+ data, size);
-+ if ((err != size) && (err >= 0))
-+ err = -EINVAL;
-+
-+ return err;
-+}
-+
-+static int sr_write_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
-+ u16 size, void *data)
-+{
-+ int err;
-+
-+ err = usbnet_write_cmd(dev, cmd, SR_REQ_WR_REG, value, index,
-+ data, size);
-+ if ((err != size) && (err >= 0))
-+ err = -EINVAL;
-+
-+ return err;
-+}
-+
-+static void
-+sr_write_cmd_async(struct usbnet *dev, u8 cmd, u16 value, u16 index,
-+ u16 size, void *data)
-+{
-+ usbnet_write_cmd_async(dev, cmd, SR_REQ_WR_REG, value, index, data,
-+ size);
-+}
-+
-+static int sr_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
-+{
-+ int offset = 0;
-+
-+ /* This check is no longer done by usbnet */
-+ if (skb->len < dev->net->hard_header_len)
-+ return 0;
-+
-+ while (offset + sizeof(u32) < skb->len) {
-+ struct sk_buff *sr_skb;
-+ u16 size;
-+ u32 header = get_unaligned_le32(skb->data + offset);
-+
-+ offset += sizeof(u32);
-+ /* get the packet length */
-+ size = (u16) (header & 0x7ff);
-+ if (size != ((~header >> 16) & 0x07ff)) {
-+ netdev_err(dev->net, "%s : Bad Header Length\n",
-+ __func__);
-+ return 0;
-+ }
-+
-+ if ((size > dev->net->mtu + ETH_HLEN + VLAN_HLEN) ||
-+ (size + offset > skb->len)) {
-+ netdev_err(dev->net, "%s : Bad RX Length %d\n",
-+ __func__, size);
-+ return 0;
-+ }
-+ sr_skb = netdev_alloc_skb_ip_align(dev->net, size);
-+ if (!sr_skb)
-+ return 0;
-+
-+ skb_put(sr_skb, size);
-+ memcpy(sr_skb->data, skb->data + offset, size);
-+ usbnet_skb_return(dev, sr_skb);
-+
-+ offset += (size + 1) & 0xfffe;
-+ }
-+
-+ if (skb->len != offset) {
-+ netdev_err(dev->net, "%s : Bad SKB Length %d\n", __func__,
-+ skb->len);
-+ return 0;
-+ }
-+
-+ return 1;
-+}
-+
-+static struct sk_buff *sr_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
-+ gfp_t flags)
-+{
-+ int headroom = skb_headroom(skb);
-+ int tailroom = skb_tailroom(skb);
-+ u32 padbytes = 0xffff0000;
-+ u32 packet_len;
-+ int padlen;
-+
-+ padlen = ((skb->len + 4) % (dev->maxpacket - 1)) ? 0 : 4;
-+
-+ if ((!skb_cloned(skb)) && ((headroom + tailroom) >= (4 + padlen))) {
-+ if ((headroom < 4) || (tailroom < padlen)) {
-+ skb->data = memmove(skb->head + 4, skb->data,
-+ skb->len);
-+ skb_set_tail_pointer(skb, skb->len);
-+ }
-+ } else {
-+ struct sk_buff *skb2;
-+ skb2 = skb_copy_expand(skb, 4, padlen, flags);
-+ dev_kfree_skb_any(skb);
-+ skb = skb2;
-+ if (!skb)
-+ return NULL;
-+ }
-+
-+ skb_push(skb, 4);
-+ packet_len = (((skb->len - 4) ^ 0x0000ffff) << 16) + (skb->len - 4);
-+ cpu_to_le32s(&packet_len);
-+ skb_copy_to_linear_data(skb, &packet_len, sizeof(packet_len));
-+
-+ if (padlen) {
-+ cpu_to_le32s(&padbytes);
-+ memcpy(skb_tail_pointer(skb), &padbytes, sizeof(padbytes));
-+ skb_put(skb, sizeof(padbytes));
-+ }
-+
-+ return skb;
-+}
-+
-+static void sr_status(struct usbnet *dev, struct urb *urb)
-+{
-+ struct sr9800_int_data *event;
-+ int link;
-+
-+ if (urb->actual_length < 8)
-+ return;
-+
-+ event = urb->transfer_buffer;
-+ link = event->link & 0x01;
-+ if (netif_carrier_ok(dev->net) != link) {
-+ usbnet_link_change(dev, link, 1);
-+ netdev_dbg(dev->net, "Link Status is: %d\n", link);
-+ }
-+
-+ return;
-+}
-+
-+static inline int sr_set_sw_mii(struct usbnet *dev)
-+{
-+ int ret;
-+
-+ ret = sr_write_cmd(dev, SR_CMD_SET_SW_MII, 0x0000, 0, 0, NULL);
-+ if (ret < 0)
-+ netdev_err(dev->net, "Failed to enable software MII access\n");
-+ return ret;
-+}
-+
-+static inline int sr_set_hw_mii(struct usbnet *dev)
-+{
-+ int ret;
-+
-+ ret = sr_write_cmd(dev, SR_CMD_SET_HW_MII, 0x0000, 0, 0, NULL);
-+ if (ret < 0)
-+ netdev_err(dev->net, "Failed to enable hardware MII access\n");
-+ return ret;
-+}
-+
-+static inline int sr_get_phy_addr(struct usbnet *dev)
-+{
-+ u8 buf[2];
-+ int ret;
-+
-+ ret = sr_read_cmd(dev, SR_CMD_READ_PHY_ID, 0, 0, 2, buf);
-+ if (ret < 0) {
-+ netdev_err(dev->net, "%s : Error reading PHYID register:%02x\n",
-+ __func__, ret);
-+ goto out;
-+ }
-+ netdev_dbg(dev->net, "%s : returning 0x%04x\n", __func__,
-+ *((__le16 *)buf));
-+
-+ ret = buf[1];
-+
-+out:
-+ return ret;
-+}
-+
-+static int sr_sw_reset(struct usbnet *dev, u8 flags)
-+{
-+ int ret;
-+
-+ ret = sr_write_cmd(dev, SR_CMD_SW_RESET, flags, 0, 0, NULL);
-+ if (ret < 0)
-+ netdev_err(dev->net, "Failed to send software reset:%02x\n",
-+ ret);
-+
-+ return ret;
-+}
-+
-+static u16 sr_read_rx_ctl(struct usbnet *dev)
-+{
-+ __le16 v;
-+ int ret;
-+
-+ ret = sr_read_cmd(dev, SR_CMD_READ_RX_CTL, 0, 0, 2, &v);
-+ if (ret < 0) {
-+ netdev_err(dev->net, "Error reading RX_CTL register:%02x\n",
-+ ret);
-+ goto out;
-+ }
-+
-+ ret = le16_to_cpu(v);
-+out:
-+ return ret;
-+}
-+
-+static int sr_write_rx_ctl(struct usbnet *dev, u16 mode)
-+{
-+ int ret;
-+
-+ netdev_dbg(dev->net, "%s : mode = 0x%04x\n", __func__, mode);
-+ ret = sr_write_cmd(dev, SR_CMD_WRITE_RX_CTL, mode, 0, 0, NULL);
-+ if (ret < 0)
-+ netdev_err(dev->net,
-+ "Failed to write RX_CTL mode to 0x%04x:%02x\n",
-+ mode, ret);
-+
-+ return ret;
-+}
-+
-+static u16 sr_read_medium_status(struct usbnet *dev)
-+{
-+ __le16 v;
-+ int ret;
-+
-+ ret = sr_read_cmd(dev, SR_CMD_READ_MEDIUM_STATUS, 0, 0, 2, &v);
-+ if (ret < 0) {
-+ netdev_err(dev->net,
-+ "Error reading Medium Status register:%02x\n", ret);
-+ return ret; /* TODO: callers not checking for error ret */
-+ }
-+
-+ return le16_to_cpu(v);
-+}
-+
-+static int sr_write_medium_mode(struct usbnet *dev, u16 mode)
-+{
-+ int ret;
-+
-+ netdev_dbg(dev->net, "%s : mode = 0x%04x\n", __func__, mode);
-+ ret = sr_write_cmd(dev, SR_CMD_WRITE_MEDIUM_MODE, mode, 0, 0, NULL);
-+ if (ret < 0)
-+ netdev_err(dev->net,
-+ "Failed to write Medium Mode mode to 0x%04x:%02x\n",
-+ mode, ret);
-+ return ret;
-+}
-+
-+static int sr_write_gpio(struct usbnet *dev, u16 value, int sleep)
-+{
-+ int ret;
-+
-+ netdev_dbg(dev->net, "%s : value = 0x%04x\n", __func__, value);
-+ ret = sr_write_cmd(dev, SR_CMD_WRITE_GPIOS, value, 0, 0, NULL);
-+ if (ret < 0)
-+ netdev_err(dev->net, "Failed to write GPIO value 0x%04x:%02x\n",
-+ value, ret);
-+ if (sleep)
-+ msleep(sleep);
-+
-+ return ret;
-+}
-+
-+/* SR9800 have a 16-bit RX_CTL value */
-+static void sr_set_multicast(struct net_device *net)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+ struct sr_data *data = (struct sr_data *)&dev->data;
-+ u16 rx_ctl = SR_DEFAULT_RX_CTL;
-+
-+ if (net->flags & IFF_PROMISC) {
-+ rx_ctl |= SR_RX_CTL_PRO;
-+ } else if (net->flags & IFF_ALLMULTI ||
-+ netdev_mc_count(net) > SR_MAX_MCAST) {
-+ rx_ctl |= SR_RX_CTL_AMALL;
-+ } else if (netdev_mc_empty(net)) {
-+ /* just broadcast and directed */
-+ } else {
-+ /* We use the 20 byte dev->data
-+ * for our 8 byte filter buffer
-+ * to avoid allocating memory that
-+ * is tricky to free later
-+ */
-+ struct netdev_hw_addr *ha;
-+ u32 crc_bits;
-+
-+ memset(data->multi_filter, 0, SR_MCAST_FILTER_SIZE);
-+
-+ /* Build the multicast hash filter. */
-+ netdev_for_each_mc_addr(ha, net) {
-+ crc_bits = ether_crc(ETH_ALEN, ha->addr) >> 26;
-+ data->multi_filter[crc_bits >> 3] |=
-+ 1 << (crc_bits & 7);
-+ }
-+
-+ sr_write_cmd_async(dev, SR_CMD_WRITE_MULTI_FILTER, 0, 0,
-+ SR_MCAST_FILTER_SIZE, data->multi_filter);
-+
-+ rx_ctl |= SR_RX_CTL_AM;
-+ }
-+
-+ sr_write_cmd_async(dev, SR_CMD_WRITE_RX_CTL, rx_ctl, 0, 0, NULL);
-+}
-+
-+static int sr_mdio_read(struct net_device *net, int phy_id, int loc)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+ __le16 res;
-+
-+ mutex_lock(&dev->phy_mutex);
-+ sr_set_sw_mii(dev);
-+ sr_read_cmd(dev, SR_CMD_READ_MII_REG, phy_id, (__u16)loc, 2, &res);
-+ sr_set_hw_mii(dev);
-+ mutex_unlock(&dev->phy_mutex);
-+
-+ netdev_dbg(dev->net,
-+ "%s : phy_id=0x%02x, loc=0x%02x, returns=0x%04x\n", __func__,
-+ phy_id, loc, le16_to_cpu(res));
-+
-+ return le16_to_cpu(res);
-+}
-+
-+static void
-+sr_mdio_write(struct net_device *net, int phy_id, int loc, int val)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+ __le16 res = cpu_to_le16(val);
-+
-+ netdev_dbg(dev->net,
-+ "%s : phy_id=0x%02x, loc=0x%02x, val=0x%04x\n", __func__,
-+ phy_id, loc, val);
-+ mutex_lock(&dev->phy_mutex);
-+ sr_set_sw_mii(dev);
-+ sr_write_cmd(dev, SR_CMD_WRITE_MII_REG, phy_id, (__u16)loc, 2, &res);
-+ sr_set_hw_mii(dev);
-+ mutex_unlock(&dev->phy_mutex);
-+}
-+
-+/* Get the PHY Identifier from the PHYSID1 & PHYSID2 MII registers */
-+static u32 sr_get_phyid(struct usbnet *dev)
-+{
-+ int phy_reg;
-+ u32 phy_id;
-+ int i;
-+
-+ /* Poll for the rare case the FW or phy isn't ready yet. */
-+ for (i = 0; i < 100; i++) {
-+ phy_reg = sr_mdio_read(dev->net, dev->mii.phy_id, MII_PHYSID1);
-+ if (phy_reg != 0 && phy_reg != 0xFFFF)
-+ break;
-+ mdelay(1);
-+ }
-+
-+ if (phy_reg <= 0 || phy_reg == 0xFFFF)
-+ return 0;
-+
-+ phy_id = (phy_reg & 0xffff) << 16;
-+
-+ phy_reg = sr_mdio_read(dev->net, dev->mii.phy_id, MII_PHYSID2);
-+ if (phy_reg < 0)
-+ return 0;
-+
-+ phy_id |= (phy_reg & 0xffff);
-+
-+ return phy_id;
-+}
-+
-+static void
-+sr_get_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+ u8 opt;
-+
-+ if (sr_read_cmd(dev, SR_CMD_READ_MONITOR_MODE, 0, 0, 1, &opt) < 0) {
-+ wolinfo->supported = 0;
-+ wolinfo->wolopts = 0;
-+ return;
-+ }
-+ wolinfo->supported = WAKE_PHY | WAKE_MAGIC;
-+ wolinfo->wolopts = 0;
-+ if (opt & SR_MONITOR_LINK)
-+ wolinfo->wolopts |= WAKE_PHY;
-+ if (opt & SR_MONITOR_MAGIC)
-+ wolinfo->wolopts |= WAKE_MAGIC;
-+}
-+
-+static int
-+sr_set_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+ u8 opt = 0;
-+
-+ if (wolinfo->wolopts & WAKE_PHY)
-+ opt |= SR_MONITOR_LINK;
-+ if (wolinfo->wolopts & WAKE_MAGIC)
-+ opt |= SR_MONITOR_MAGIC;
-+
-+ if (sr_write_cmd(dev, SR_CMD_WRITE_MONITOR_MODE,
-+ opt, 0, 0, NULL) < 0)
-+ return -EINVAL;
-+
-+ return 0;
-+}
-+
-+static int sr_get_eeprom_len(struct net_device *net)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+ struct sr_data *data = (struct sr_data *)&dev->data;
-+
-+ return data->eeprom_len;
-+}
-+
-+static int sr_get_eeprom(struct net_device *net,
-+ struct ethtool_eeprom *eeprom, u8 *data)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+ __le16 *ebuf = (__le16 *)data;
-+ int ret;
-+ int i;
-+
-+ /* Crude hack to ensure that we don't overwrite memory
-+ * if an odd length is supplied
-+ */
-+ if (eeprom->len % 2)
-+ return -EINVAL;
-+
-+ eeprom->magic = SR_EEPROM_MAGIC;
-+
-+ /* sr9800 returns 2 bytes from eeprom on read */
-+ for (i = 0; i < eeprom->len / 2; i++) {
-+ ret = sr_read_cmd(dev, SR_CMD_READ_EEPROM, eeprom->offset + i,
-+ 0, 2, &ebuf[i]);
-+ if (ret < 0)
-+ return -EINVAL;
-+ }
-+ return 0;
-+}
-+
-+static void sr_get_drvinfo(struct net_device *net,
-+ struct ethtool_drvinfo *info)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+ struct sr_data *data = (struct sr_data *)&dev->data;
-+
-+ /* Inherit standard device info */
-+ usbnet_get_drvinfo(net, info);
-+ strncpy(info->driver, DRIVER_NAME, sizeof(info->driver));
-+ strncpy(info->version, DRIVER_VERSION, sizeof(info->version));
-+ info->eedump_len = data->eeprom_len;
-+}
-+
-+static u32 sr_get_link(struct net_device *net)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+
-+ return mii_link_ok(&dev->mii);
-+}
-+
-+static int sr_ioctl(struct net_device *net, struct ifreq *rq, int cmd)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+
-+ return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
-+}
-+
-+static int sr_set_mac_address(struct net_device *net, void *p)
-+{
-+ struct usbnet *dev = netdev_priv(net);
-+ struct sr_data *data = (struct sr_data *)&dev->data;
-+ struct sockaddr *addr = p;
-+
-+ if (netif_running(net))
-+ return -EBUSY;
-+ if (!is_valid_ether_addr(addr->sa_data))
-+ return -EADDRNOTAVAIL;
-+
-+ memcpy(net->dev_addr, addr->sa_data, ETH_ALEN);
-+
-+ /* We use the 20 byte dev->data
-+ * for our 6 byte mac buffer
-+ * to avoid allocating memory that
-+ * is tricky to free later
-+ */
-+ memcpy(data->mac_addr, addr->sa_data, ETH_ALEN);
-+ sr_write_cmd_async(dev, SR_CMD_WRITE_NODE_ID, 0, 0, ETH_ALEN,
-+ data->mac_addr);
-+
-+ return 0;
-+}
-+
-+static const struct ethtool_ops sr9800_ethtool_ops = {
-+ .get_drvinfo = sr_get_drvinfo,
-+ .get_link = sr_get_link,
-+ .get_msglevel = usbnet_get_msglevel,
-+ .set_msglevel = usbnet_set_msglevel,
-+ .get_wol = sr_get_wol,
-+ .set_wol = sr_set_wol,
-+ .get_eeprom_len = sr_get_eeprom_len,
-+ .get_eeprom = sr_get_eeprom,
-+ .get_settings = usbnet_get_settings,
-+ .set_settings = usbnet_set_settings,
-+ .nway_reset = usbnet_nway_reset,
-+};
-+
-+static int sr9800_link_reset(struct usbnet *dev)
-+{
-+ struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET };
-+ u16 mode;
-+
-+ mii_check_media(&dev->mii, 1, 1);
-+ mii_ethtool_gset(&dev->mii, &ecmd);
-+ mode = SR9800_MEDIUM_DEFAULT;
-+
-+ if (ethtool_cmd_speed(&ecmd) != SPEED_100)
-+ mode &= ~SR_MEDIUM_PS;
-+
-+ if (ecmd.duplex != DUPLEX_FULL)
-+ mode &= ~SR_MEDIUM_FD;
-+
-+ netdev_dbg(dev->net, "%s : speed: %u duplex: %d mode: 0x%04x\n",
-+ __func__, ethtool_cmd_speed(&ecmd), ecmd.duplex, mode);
-+
-+ sr_write_medium_mode(dev, mode);
-+
-+ return 0;
-+}
-+
-+
-+static int sr9800_set_default_mode(struct usbnet *dev)
-+{
-+ u16 rx_ctl;
-+ int ret;
-+
-+ sr_mdio_write(dev->net, dev->mii.phy_id, MII_BMCR, BMCR_RESET);
-+ sr_mdio_write(dev->net, dev->mii.phy_id, MII_ADVERTISE,
-+ ADVERTISE_ALL | ADVERTISE_CSMA);
-+ mii_nway_restart(&dev->mii);
-+
-+ ret = sr_write_medium_mode(dev, SR9800_MEDIUM_DEFAULT);
-+ if (ret < 0)
-+ goto out;
-+
-+ ret = sr_write_cmd(dev, SR_CMD_WRITE_IPG012,
-+ SR9800_IPG0_DEFAULT | SR9800_IPG1_DEFAULT,
-+ SR9800_IPG2_DEFAULT, 0, NULL);
-+ if (ret < 0) {
-+ netdev_dbg(dev->net, "Write IPG,IPG1,IPG2 failed: %d\n", ret);
-+ goto out;
-+ }
-+
-+ /* Set RX_CTL to default values with 2k buffer, and enable cactus */
-+ ret = sr_write_rx_ctl(dev, SR_DEFAULT_RX_CTL);
-+ if (ret < 0)
-+ goto out;
-+
-+ rx_ctl = sr_read_rx_ctl(dev);
-+ netdev_dbg(dev->net, "RX_CTL is 0x%04x after all initializations\n",
-+ rx_ctl);
-+
-+ rx_ctl = sr_read_medium_status(dev);
-+ netdev_dbg(dev->net, "Medium Status:0x%04x after all initializations\n",
-+ rx_ctl);
-+
-+ return 0;
-+out:
-+ return ret;
-+}
-+
-+static int sr9800_reset(struct usbnet *dev)
-+{
-+ struct sr_data *data = (struct sr_data *)&dev->data;
-+ int ret, embd_phy;
-+ u16 rx_ctl;
-+
-+ ret = sr_write_gpio(dev,
-+ SR_GPIO_RSE | SR_GPIO_GPO_2 | SR_GPIO_GPO2EN, 5);
-+ if (ret < 0)
-+ goto out;
-+
-+ embd_phy = ((sr_get_phy_addr(dev) & 0x1f) == 0x10 ? 1 : 0);
-+
-+ ret = sr_write_cmd(dev, SR_CMD_SW_PHY_SELECT, embd_phy, 0, 0, NULL);
-+ if (ret < 0) {
-+ netdev_dbg(dev->net, "Select PHY #1 failed: %d\n", ret);
-+ goto out;
-+ }
-+
-+ ret = sr_sw_reset(dev, SR_SWRESET_IPPD | SR_SWRESET_PRL);
-+ if (ret < 0)
-+ goto out;
-+
-+ msleep(150);
-+
-+ ret = sr_sw_reset(dev, SR_SWRESET_CLEAR);
-+ if (ret < 0)
-+ goto out;
-+
-+ msleep(150);
-+
-+ if (embd_phy) {
-+ ret = sr_sw_reset(dev, SR_SWRESET_IPRL);
-+ if (ret < 0)
-+ goto out;
-+ } else {
-+ ret = sr_sw_reset(dev, SR_SWRESET_PRTE);
-+ if (ret < 0)
-+ goto out;
-+ }
-+
-+ msleep(150);
-+ rx_ctl = sr_read_rx_ctl(dev);
-+ netdev_dbg(dev->net, "RX_CTL is 0x%04x after software reset\n", rx_ctl);
-+ ret = sr_write_rx_ctl(dev, 0x0000);
-+ if (ret < 0)
-+ goto out;
-+
-+ rx_ctl = sr_read_rx_ctl(dev);
-+ netdev_dbg(dev->net, "RX_CTL is 0x%04x setting to 0x0000\n", rx_ctl);
-+
-+ ret = sr_sw_reset(dev, SR_SWRESET_PRL);
-+ if (ret < 0)
-+ goto out;
-+
-+ msleep(150);
-+
-+ ret = sr_sw_reset(dev, SR_SWRESET_IPRL | SR_SWRESET_PRL);
-+ if (ret < 0)
-+ goto out;
-+
-+ msleep(150);
-+
-+ ret = sr9800_set_default_mode(dev);
-+ if (ret < 0)
-+ goto out;
-+
-+ /* Rewrite MAC address */
-+ memcpy(data->mac_addr, dev->net->dev_addr, ETH_ALEN);
-+ ret = sr_write_cmd(dev, SR_CMD_WRITE_NODE_ID, 0, 0, ETH_ALEN,
-+ data->mac_addr);
-+ if (ret < 0)
-+ goto out;
-+
-+ return 0;
-+
-+out:
-+ return ret;
-+}
-+
-+static const struct net_device_ops sr9800_netdev_ops = {
-+ .ndo_open = usbnet_open,
-+ .ndo_stop = usbnet_stop,
-+ .ndo_start_xmit = usbnet_start_xmit,
-+ .ndo_tx_timeout = usbnet_tx_timeout,
-+ .ndo_change_mtu = usbnet_change_mtu,
-+ .ndo_set_mac_address = sr_set_mac_address,
-+ .ndo_validate_addr = eth_validate_addr,
-+ .ndo_do_ioctl = sr_ioctl,
-+ .ndo_set_rx_mode = sr_set_multicast,
-+};
-+
-+static int sr9800_phy_powerup(struct usbnet *dev)
-+{
-+ int ret;
-+
-+ /* set the embedded Ethernet PHY in power-down state */
-+ ret = sr_sw_reset(dev, SR_SWRESET_IPPD | SR_SWRESET_IPRL);
-+ if (ret < 0) {
-+ netdev_err(dev->net, "Failed to power down PHY : %d\n", ret);
-+ return ret;
-+ }
-+ msleep(20);
-+
-+ /* set the embedded Ethernet PHY in power-up state */
-+ ret = sr_sw_reset(dev, SR_SWRESET_IPRL);
-+ if (ret < 0) {
-+ netdev_err(dev->net, "Failed to reset PHY: %d\n", ret);
-+ return ret;
-+ }
-+ msleep(600);
-+
-+ /* set the embedded Ethernet PHY in reset state */
-+ ret = sr_sw_reset(dev, SR_SWRESET_CLEAR);
-+ if (ret < 0) {
-+ netdev_err(dev->net, "Failed to power up PHY: %d\n", ret);
-+ return ret;
-+ }
-+ msleep(20);
-+
-+ /* set the embedded Ethernet PHY in power-up state */
-+ ret = sr_sw_reset(dev, SR_SWRESET_IPRL);
-+ if (ret < 0) {
-+ netdev_err(dev->net, "Failed to reset PHY: %d\n", ret);
-+ return ret;
-+ }
-+
-+ return 0;
-+}
-+
-+static int sr9800_bind(struct usbnet *dev, struct usb_interface *intf)
-+{
-+ struct sr_data *data = (struct sr_data *)&dev->data;
-+ u16 led01_mux, led23_mux;
-+ int ret, embd_phy;
-+ u32 phyid;
-+ u16 rx_ctl;
-+
-+ data->eeprom_len = SR9800_EEPROM_LEN;
-+
-+ usbnet_get_endpoints(dev, intf);
-+
-+ /* LED Setting Rule :
-+ * AABB:CCDD
-+ * AA : MFA0(LED0)
-+ * BB : MFA1(LED1)
-+ * CC : MFA2(LED2), Reserved for SR9800
-+ * DD : MFA3(LED3), Reserved for SR9800
-+ */
-+ led01_mux = (SR_LED_MUX_LINK_ACTIVE << 8) | SR_LED_MUX_LINK;
-+ led23_mux = (SR_LED_MUX_LINK_ACTIVE << 8) | SR_LED_MUX_TX_ACTIVE;
-+ ret = sr_write_cmd(dev, SR_CMD_LED_MUX, led01_mux, led23_mux, 0, NULL);
-+ if (ret < 0) {
-+ netdev_err(dev->net, "set LINK LED failed : %d\n", ret);
-+ goto out;
-+ }
-+
-+ /* Get the MAC address */
-+ ret = sr_read_cmd(dev, SR_CMD_READ_NODE_ID, 0, 0, ETH_ALEN,
-+ dev->net->dev_addr);
-+ if (ret < 0) {
-+ netdev_dbg(dev->net, "Failed to read MAC address: %d\n", ret);
-+ return ret;
-+ }
-+ netdev_dbg(dev->net, "mac addr : %pM\n", dev->net->dev_addr);
-+
-+ /* Initialize MII structure */
-+ dev->mii.dev = dev->net;
-+ dev->mii.mdio_read = sr_mdio_read;
-+ dev->mii.mdio_write = sr_mdio_write;
-+ dev->mii.phy_id_mask = 0x1f;
-+ dev->mii.reg_num_mask = 0x1f;
-+ dev->mii.phy_id = sr_get_phy_addr(dev);
-+
-+ dev->net->netdev_ops = &sr9800_netdev_ops;
-+ dev->net->ethtool_ops = &sr9800_ethtool_ops;
-+
-+ embd_phy = ((dev->mii.phy_id & 0x1f) == 0x10 ? 1 : 0);
-+ /* Reset the PHY to normal operation mode */
-+ ret = sr_write_cmd(dev, SR_CMD_SW_PHY_SELECT, embd_phy, 0, 0, NULL);
-+ if (ret < 0) {
-+ netdev_dbg(dev->net, "Select PHY #1 failed: %d\n", ret);
-+ return ret;
-+ }
-+
-+ /* Init PHY routine */
-+ ret = sr9800_phy_powerup(dev);
-+ if (ret < 0)
-+ goto out;
-+
-+ rx_ctl = sr_read_rx_ctl(dev);
-+ netdev_dbg(dev->net, "RX_CTL is 0x%04x after software reset\n", rx_ctl);
-+ ret = sr_write_rx_ctl(dev, 0x0000);
-+ if (ret < 0)
-+ goto out;
-+
-+ rx_ctl = sr_read_rx_ctl(dev);
-+ netdev_dbg(dev->net, "RX_CTL is 0x%04x setting to 0x0000\n", rx_ctl);
-+
-+ /* Read PHYID register *AFTER* the PHY was reset properly */
-+ phyid = sr_get_phyid(dev);
-+ netdev_dbg(dev->net, "PHYID=0x%08x\n", phyid);
-+
-+ /* medium mode setting */
-+ ret = sr9800_set_default_mode(dev);
-+ if (ret < 0)
-+ goto out;
-+
-+ if (dev->udev->speed == USB_SPEED_HIGH) {
-+ ret = sr_write_cmd(dev, SR_CMD_BULKIN_SIZE,
-+ SR9800_BULKIN_SIZE[SR9800_MAX_BULKIN_4K].byte_cnt,
-+ SR9800_BULKIN_SIZE[SR9800_MAX_BULKIN_4K].threshold,
-+ 0, NULL);
-+ if (ret < 0) {
-+ netdev_err(dev->net, "Reset RX_CTL failed: %d\n", ret);
-+ goto out;
-+ }
-+ dev->rx_urb_size =
-+ SR9800_BULKIN_SIZE[SR9800_MAX_BULKIN_4K].size;
-+ } else {
-+ ret = sr_write_cmd(dev, SR_CMD_BULKIN_SIZE,
-+ SR9800_BULKIN_SIZE[SR9800_MAX_BULKIN_2K].byte_cnt,
-+ SR9800_BULKIN_SIZE[SR9800_MAX_BULKIN_2K].threshold,
-+ 0, NULL);
-+ if (ret < 0) {
-+ netdev_err(dev->net, "Reset RX_CTL failed: %d\n", ret);
-+ goto out;
-+ }
-+ dev->rx_urb_size =
-+ SR9800_BULKIN_SIZE[SR9800_MAX_BULKIN_2K].size;
-+ }
-+ netdev_dbg(dev->net, "%s : setting rx_urb_size with : %zu\n", __func__,
-+ dev->rx_urb_size);
-+ return 0;
-+
-+out:
-+ return ret;
-+}
-+
-+static const struct driver_info sr9800_driver_info = {
-+ .description = "CoreChip SR9800 USB 2.0 Ethernet",
-+ .bind = sr9800_bind,
-+ .status = sr_status,
-+ .link_reset = sr9800_link_reset,
-+ .reset = sr9800_reset,
-+ .flags = DRIVER_FLAG,
-+ .rx_fixup = sr_rx_fixup,
-+ .tx_fixup = sr_tx_fixup,
-+};
-+
-+static const struct usb_device_id products[] = {
-+ {
-+ USB_DEVICE(0x0fe6, 0x9800), /* SR9800 Device */
-+ .driver_info = (unsigned long) &sr9800_driver_info,
-+ },
-+ {}, /* END */
-+};
-+
-+MODULE_DEVICE_TABLE(usb, products);
-+
-+static struct usb_driver sr_driver = {
-+ .name = DRIVER_NAME,
-+ .id_table = products,
-+ .probe = usbnet_probe,
-+ .suspend = usbnet_suspend,
-+ .resume = usbnet_resume,
-+ .disconnect = usbnet_disconnect,
-+ .supports_autosuspend = 1,
-+};
-+
-+module_usb_driver(sr_driver);
-+
-+MODULE_AUTHOR("Liu Junliang <liujunliang_ljl(a)163.com");
-+MODULE_VERSION(DRIVER_VERSION);
-+MODULE_DESCRIPTION("SR9800 USB 2.0 USB2NET Dev : http://www.corechip-sz.com");
-+MODULE_LICENSE("GPL");
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/sr9800.h backports-3.18.1-1/drivers/net/usb/sr9800.h
---- backports-3.18.1-1.org/drivers/net/usb/sr9800.h 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/sr9800.h 2014-12-16 18:39:45.000000000 +0100
-@@ -0,0 +1,202 @@
-+/* CoreChip-sz SR9800 one chip USB 2.0 Ethernet Devices
-+ *
-+ * Author : Liu Junliang <liujunliang_ljl(a)163.com>
-+ *
-+ * This file is licensed under the terms of the GNU General Public License
-+ * version 2. This program is licensed "as is" without any warranty of any
-+ * kind, whether express or implied.
-+ */
-+
-+#ifndef _SR9800_H
-+#define _SR9800_H
-+
-+/* SR9800 spec. command table on Linux Platform */
-+
-+/* command : Software Station Management Control Reg */
-+#define SR_CMD_SET_SW_MII 0x06
-+/* command : PHY Read Reg */
-+#define SR_CMD_READ_MII_REG 0x07
-+/* command : PHY Write Reg */
-+#define SR_CMD_WRITE_MII_REG 0x08
-+/* command : Hardware Station Management Control Reg */
-+#define SR_CMD_SET_HW_MII 0x0a
-+/* command : SROM Read Reg */
-+#define SR_CMD_READ_EEPROM 0x0b
-+/* command : SROM Write Reg */
-+#define SR_CMD_WRITE_EEPROM 0x0c
-+/* command : SROM Write Enable Reg */
-+#define SR_CMD_WRITE_ENABLE 0x0d
-+/* command : SROM Write Disable Reg */
-+#define SR_CMD_WRITE_DISABLE 0x0e
-+/* command : RX Control Read Reg */
-+#define SR_CMD_READ_RX_CTL 0x0f
-+#define SR_RX_CTL_PRO (1 << 0)
-+#define SR_RX_CTL_AMALL (1 << 1)
-+#define SR_RX_CTL_SEP (1 << 2)
-+#define SR_RX_CTL_AB (1 << 3)
-+#define SR_RX_CTL_AM (1 << 4)
-+#define SR_RX_CTL_AP (1 << 5)
-+#define SR_RX_CTL_ARP (1 << 6)
-+#define SR_RX_CTL_SO (1 << 7)
-+#define SR_RX_CTL_RH1M (1 << 8)
-+#define SR_RX_CTL_RH2M (1 << 9)
-+#define SR_RX_CTL_RH3M (1 << 10)
-+/* command : RX Control Write Reg */
-+#define SR_CMD_WRITE_RX_CTL 0x10
-+/* command : IPG0/IPG1/IPG2 Control Read Reg */
-+#define SR_CMD_READ_IPG012 0x11
-+/* command : IPG0/IPG1/IPG2 Control Write Reg */
-+#define SR_CMD_WRITE_IPG012 0x12
-+/* command : Node ID Read Reg */
-+#define SR_CMD_READ_NODE_ID 0x13
-+/* command : Node ID Write Reg */
-+#define SR_CMD_WRITE_NODE_ID 0x14
-+/* command : Multicast Filter Array Read Reg */
-+#define SR_CMD_READ_MULTI_FILTER 0x15
-+/* command : Multicast Filter Array Write Reg */
-+#define SR_CMD_WRITE_MULTI_FILTER 0x16
-+/* command : Eth/HomePNA PHY Address Reg */
-+#define SR_CMD_READ_PHY_ID 0x19
-+/* command : Medium Status Read Reg */
-+#define SR_CMD_READ_MEDIUM_STATUS 0x1a
-+#define SR_MONITOR_LINK (1 << 1)
-+#define SR_MONITOR_MAGIC (1 << 2)
-+#define SR_MONITOR_HSFS (1 << 4)
-+/* command : Medium Status Write Reg */
-+#define SR_CMD_WRITE_MEDIUM_MODE 0x1b
-+#define SR_MEDIUM_GM (1 << 0)
-+#define SR_MEDIUM_FD (1 << 1)
-+#define SR_MEDIUM_AC (1 << 2)
-+#define SR_MEDIUM_ENCK (1 << 3)
-+#define SR_MEDIUM_RFC (1 << 4)
-+#define SR_MEDIUM_TFC (1 << 5)
-+#define SR_MEDIUM_JFE (1 << 6)
-+#define SR_MEDIUM_PF (1 << 7)
-+#define SR_MEDIUM_RE (1 << 8)
-+#define SR_MEDIUM_PS (1 << 9)
-+#define SR_MEDIUM_RSV (1 << 10)
-+#define SR_MEDIUM_SBP (1 << 11)
-+#define SR_MEDIUM_SM (1 << 12)
-+/* command : Monitor Mode Status Read Reg */
-+#define SR_CMD_READ_MONITOR_MODE 0x1c
-+/* command : Monitor Mode Status Write Reg */
-+#define SR_CMD_WRITE_MONITOR_MODE 0x1d
-+/* command : GPIO Status Read Reg */
-+#define SR_CMD_READ_GPIOS 0x1e
-+#define SR_GPIO_GPO0EN (1 << 0) /* GPIO0 Output enable */
-+#define SR_GPIO_GPO_0 (1 << 1) /* GPIO0 Output value */
-+#define SR_GPIO_GPO1EN (1 << 2) /* GPIO1 Output enable */
-+#define SR_GPIO_GPO_1 (1 << 3) /* GPIO1 Output value */
-+#define SR_GPIO_GPO2EN (1 << 4) /* GPIO2 Output enable */
-+#define SR_GPIO_GPO_2 (1 << 5) /* GPIO2 Output value */
-+#define SR_GPIO_RESERVED (1 << 6) /* Reserved */
-+#define SR_GPIO_RSE (1 << 7) /* Reload serial EEPROM */
-+/* command : GPIO Status Write Reg */
-+#define SR_CMD_WRITE_GPIOS 0x1f
-+/* command : Eth PHY Power and Reset Control Reg */
-+#define SR_CMD_SW_RESET 0x20
-+#define SR_SWRESET_CLEAR 0x00
-+#define SR_SWRESET_RR (1 << 0)
-+#define SR_SWRESET_RT (1 << 1)
-+#define SR_SWRESET_PRTE (1 << 2)
-+#define SR_SWRESET_PRL (1 << 3)
-+#define SR_SWRESET_BZ (1 << 4)
-+#define SR_SWRESET_IPRL (1 << 5)
-+#define SR_SWRESET_IPPD (1 << 6)
-+/* command : Software Interface Selection Status Read Reg */
-+#define SR_CMD_SW_PHY_STATUS 0x21
-+/* command : Software Interface Selection Status Write Reg */
-+#define SR_CMD_SW_PHY_SELECT 0x22
-+/* command : BULK in Buffer Size Reg */
-+#define SR_CMD_BULKIN_SIZE 0x2A
-+/* command : LED_MUX Control Reg */
-+#define SR_CMD_LED_MUX 0x70
-+#define SR_LED_MUX_TX_ACTIVE (1 << 0)
-+#define SR_LED_MUX_RX_ACTIVE (1 << 1)
-+#define SR_LED_MUX_COLLISION (1 << 2)
-+#define SR_LED_MUX_DUP_COL (1 << 3)
-+#define SR_LED_MUX_DUP (1 << 4)
-+#define SR_LED_MUX_SPEED (1 << 5)
-+#define SR_LED_MUX_LINK_ACTIVE (1 << 6)
-+#define SR_LED_MUX_LINK (1 << 7)
-+
-+/* Register Access Flags */
-+#define SR_REQ_RD_REG (USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE)
-+#define SR_REQ_WR_REG (USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE)
-+
-+/* Multicast Filter Array size & Max Number */
-+#define SR_MCAST_FILTER_SIZE 8
-+#define SR_MAX_MCAST 64
-+
-+/* IPG0/1/2 Default Value */
-+#define SR9800_IPG0_DEFAULT 0x15
-+#define SR9800_IPG1_DEFAULT 0x0c
-+#define SR9800_IPG2_DEFAULT 0x12
-+
-+/* Medium Status Default Mode */
-+#define SR9800_MEDIUM_DEFAULT \
-+ (SR_MEDIUM_FD | SR_MEDIUM_RFC | \
-+ SR_MEDIUM_TFC | SR_MEDIUM_PS | \
-+ SR_MEDIUM_AC | SR_MEDIUM_RE)
-+
-+/* RX Control Default Setting */
-+#define SR_DEFAULT_RX_CTL \
-+ (SR_RX_CTL_SO | SR_RX_CTL_AB | SR_RX_CTL_RH1M)
-+
-+/* EEPROM Magic Number & EEPROM Size */
-+#define SR_EEPROM_MAGIC 0xdeadbeef
-+#define SR9800_EEPROM_LEN 0xff
-+
-+/* SR9800 Driver Version and Driver Name */
-+#define DRIVER_VERSION "11-Nov-2013"
-+#define DRIVER_NAME "CoreChips"
-+#define DRIVER_FLAG \
-+ (FLAG_ETHER | FLAG_FRAMING_AX | FLAG_LINK_INTR | FLAG_MULTI_PACKET)
-+
-+/* SR9800 BULKIN Buffer Size */
-+#define SR9800_MAX_BULKIN_2K 0
-+#define SR9800_MAX_BULKIN_4K 1
-+#define SR9800_MAX_BULKIN_6K 2
-+#define SR9800_MAX_BULKIN_8K 3
-+#define SR9800_MAX_BULKIN_16K 4
-+#define SR9800_MAX_BULKIN_20K 5
-+#define SR9800_MAX_BULKIN_24K 6
-+#define SR9800_MAX_BULKIN_32K 7
-+
-+struct {unsigned short size, byte_cnt, threshold; } SR9800_BULKIN_SIZE[] = {
-+ /* 2k */
-+ {2048, 0x8000, 0x8001},
-+ /* 4k */
-+ {4096, 0x8100, 0x8147},
-+ /* 6k */
-+ {6144, 0x8200, 0x81EB},
-+ /* 8k */
-+ {8192, 0x8300, 0x83D7},
-+ /* 16 */
-+ {16384, 0x8400, 0x851E},
-+ /* 20k */
-+ {20480, 0x8500, 0x8666},
-+ /* 24k */
-+ {24576, 0x8600, 0x87AE},
-+ /* 32k */
-+ {32768, 0x8700, 0x8A3D},
-+};
-+
-+/* This structure cannot exceed sizeof(unsigned long [5]) AKA 20 bytes */
-+struct sr_data {
-+ u8 multi_filter[SR_MCAST_FILTER_SIZE];
-+ u8 mac_addr[ETH_ALEN];
-+ u8 phymode;
-+ u8 ledmode;
-+ u8 eeprom_len;
-+};
-+
-+struct sr9800_int_data {
-+ __le16 res1;
-+ u8 link;
-+ __le16 res2;
-+ u8 status;
-+ __le16 res3;
-+} __packed;
-+
-+#endif /* _SR9800_H */
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/zaurus.c backports-3.18.1-1/drivers/net/usb/zaurus.c
---- backports-3.18.1-1.org/drivers/net/usb/zaurus.c 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/zaurus.c 2014-12-16 18:39:45.000000000 +0100
-@@ -0,0 +1,385 @@
-+/*
-+ * Copyright (C) 2002 Pavel Machek <pavel(a)ucw.cz>
-+ * Copyright (C) 2002-2005 by David Brownell
-+ *
-+ * 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, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+// #define DEBUG // error path messages, extra info
-+// #define VERBOSE // more; success messages
-+
-+#include <linux/module.h>
-+#include <linux/netdevice.h>
-+#include <linux/ethtool.h>
-+#include <linux/workqueue.h>
-+#include <linux/mii.h>
-+#include <linux/crc32.h>
-+#include <linux/usb.h>
-+#include <linux/usb/cdc.h>
-+#include <linux/usb/usbnet.h>
-+
-+
-+/*
-+ * All known Zaurii lie about their standards conformance. At least
-+ * the earliest SA-1100 models lie by saying they support CDC Ethernet.
-+ * Some later models (especially PXA-25x and PXA-27x based ones) lie
-+ * and say they support CDC MDLM (for access to cell phone modems).
-+ *
-+ * There are non-Zaurus products that use these same protocols too.
-+ *
-+ * The annoying thing is that at the same time Sharp was developing
-+ * that annoying standards-breaking software, the Linux community had
-+ * a simple "CDC Subset" working reliably on the same SA-1100 hardware.
-+ * That is, the same functionality but not violating standards.
-+ *
-+ * The CDC Ethernet nonconformance points are troublesome to hosts
-+ * with a true CDC Ethernet implementation:
-+ * - Framing appends a CRC, which the spec says drivers "must not" do;
-+ * - Transfers data in altsetting zero, instead of altsetting 1;
-+ * - All these peripherals use the same ethernet address.
-+ *
-+ * The CDC MDLM nonconformance is less immediately troublesome, since all
-+ * MDLM implementations are quasi-proprietary anyway.
-+ */
-+
-+static struct sk_buff *
-+zaurus_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
-+{
-+ int padlen;
-+ struct sk_buff *skb2;
-+
-+ padlen = 2;
-+ if (!skb_cloned(skb)) {
-+ int tailroom = skb_tailroom(skb);
-+ if ((padlen + 4) <= tailroom)
-+ goto done;
-+ }
-+ skb2 = skb_copy_expand(skb, 0, 4 + padlen, flags);
-+ dev_kfree_skb_any(skb);
-+ skb = skb2;
-+ if (skb) {
-+ u32 fcs;
-+done:
-+ fcs = crc32_le(~0, skb->data, skb->len);
-+ fcs = ~fcs;
-+
-+ *skb_put (skb, 1) = fcs & 0xff;
-+ *skb_put (skb, 1) = (fcs>> 8) & 0xff;
-+ *skb_put (skb, 1) = (fcs>>16) & 0xff;
-+ *skb_put (skb, 1) = (fcs>>24) & 0xff;
-+ }
-+ return skb;
-+}
-+
-+static int zaurus_bind(struct usbnet *dev, struct usb_interface *intf)
-+{
-+ /* Belcarra's funky framing has other options; mostly
-+ * TRAILERS (!) with 4 bytes CRC, and maybe 2 pad bytes.
-+ */
-+ dev->net->hard_header_len += 6;
-+ dev->rx_urb_size = dev->net->hard_header_len + dev->net->mtu;
-+ return usbnet_generic_cdc_bind(dev, intf);
-+}
-+
-+/* PDA style devices are always connected if present */
-+static int always_connected (struct usbnet *dev)
-+{
-+ return 0;
-+}
-+
-+static const struct driver_info zaurus_sl5x00_info = {
-+ .description = "Sharp Zaurus SL-5x00",
-+ .flags = FLAG_POINTTOPOINT | FLAG_FRAMING_Z,
-+ .check_connect = always_connected,
-+ .bind = zaurus_bind,
-+ .unbind = usbnet_cdc_unbind,
-+ .tx_fixup = zaurus_tx_fixup,
-+};
-+#define ZAURUS_STRONGARM_INFO ((unsigned long)&zaurus_sl5x00_info)
-+
-+static const struct driver_info zaurus_pxa_info = {
-+ .description = "Sharp Zaurus, PXA-2xx based",
-+ .flags = FLAG_POINTTOPOINT | FLAG_FRAMING_Z,
-+ .check_connect = always_connected,
-+ .bind = zaurus_bind,
-+ .unbind = usbnet_cdc_unbind,
-+ .tx_fixup = zaurus_tx_fixup,
-+};
-+#define ZAURUS_PXA_INFO ((unsigned long)&zaurus_pxa_info)
-+
-+static const struct driver_info olympus_mxl_info = {
-+ .description = "Olympus R1000",
-+ .flags = FLAG_POINTTOPOINT | FLAG_FRAMING_Z,
-+ .check_connect = always_connected,
-+ .bind = zaurus_bind,
-+ .unbind = usbnet_cdc_unbind,
-+ .tx_fixup = zaurus_tx_fixup,
-+};
-+#define OLYMPUS_MXL_INFO ((unsigned long)&olympus_mxl_info)
-+
-+
-+/* Some more recent products using Lineo/Belcarra code will wrongly claim
-+ * CDC MDLM conformance. They aren't conformant: data endpoints live
-+ * in the control interface, there's no data interface, and it's not used
-+ * to talk to a cell phone radio. But at least we can detect these two
-+ * pseudo-classes, rather than growing this product list with entries for
-+ * each new nonconformant product (sigh).
-+ */
-+static const u8 safe_guid[16] = {
-+ 0x5d, 0x34, 0xcf, 0x66, 0x11, 0x18, 0x11, 0xd6,
-+ 0xa2, 0x1a, 0x00, 0x01, 0x02, 0xca, 0x9a, 0x7f,
-+};
-+static const u8 blan_guid[16] = {
-+ 0x74, 0xf0, 0x3d, 0xbd, 0x1e, 0xc1, 0x44, 0x70,
-+ 0xa3, 0x67, 0x71, 0x34, 0xc9, 0xf5, 0x54, 0x37,
-+};
-+
-+static int blan_mdlm_bind(struct usbnet *dev, struct usb_interface *intf)
-+{
-+ u8 *buf = intf->cur_altsetting->extra;
-+ int len = intf->cur_altsetting->extralen;
-+ struct usb_cdc_mdlm_desc *desc = NULL;
-+ struct usb_cdc_mdlm_detail_desc *detail = NULL;
-+
-+ while (len > 3) {
-+ if (buf [1] != USB_DT_CS_INTERFACE)
-+ goto next_desc;
-+
-+ /* use bDescriptorSubType, and just verify that we get a
-+ * "BLAN" (or "SAFE") descriptor.
-+ */
-+ switch (buf [2]) {
-+ case USB_CDC_MDLM_TYPE:
-+ if (desc) {
-+ dev_dbg(&intf->dev, "extra MDLM\n");
-+ goto bad_desc;
-+ }
-+ desc = (void *) buf;
-+ if (desc->bLength != sizeof *desc) {
-+ dev_dbg(&intf->dev, "MDLM len %u\n",
-+ desc->bLength);
-+ goto bad_desc;
-+ }
-+ /* expect bcdVersion 1.0, ignore */
-+ if (memcmp(&desc->bGUID, blan_guid, 16) &&
-+ memcmp(&desc->bGUID, safe_guid, 16)) {
-+ /* hey, this one might _really_ be MDLM! */
-+ dev_dbg(&intf->dev, "MDLM guid\n");
-+ goto bad_desc;
-+ }
-+ break;
-+ case USB_CDC_MDLM_DETAIL_TYPE:
-+ if (detail) {
-+ dev_dbg(&intf->dev, "extra MDLM detail\n");
-+ goto bad_desc;
-+ }
-+ detail = (void *) buf;
-+ switch (detail->bGuidDescriptorType) {
-+ case 0: /* "SAFE" */
-+ if (detail->bLength != (sizeof *detail + 2))
-+ goto bad_detail;
-+ break;
-+ case 1: /* "BLAN" */
-+ if (detail->bLength != (sizeof *detail + 3))
-+ goto bad_detail;
-+ break;
-+ default:
-+ goto bad_detail;
-+ }
-+
-+ /* assuming we either noticed BLAN already, or will
-+ * find it soon, there are some data bytes here:
-+ * - bmNetworkCapabilities (unused)
-+ * - bmDataCapabilities (bits, see below)
-+ * - bPad (ignored, for PADAFTER -- BLAN-only)
-+ * bits are:
-+ * - 0x01 -- Zaurus framing (add CRC)
-+ * - 0x02 -- PADBEFORE (CRC includes some padding)
-+ * - 0x04 -- PADAFTER (some padding after CRC)
-+ * - 0x08 -- "fermat" packet mangling (for hw bugs)
-+ * the PADBEFORE appears not to matter; we interop
-+ * with devices that use it and those that don't.
-+ */
-+ if ((detail->bDetailData[1] & ~0x02) != 0x01) {
-+ /* bmDataCapabilities == 0 would be fine too,
-+ * but framing is minidriver-coupled for now.
-+ */
-+bad_detail:
-+ dev_dbg(&intf->dev,
-+ "bad MDLM detail, %d %d %d\n",
-+ detail->bLength,
-+ detail->bDetailData[0],
-+ detail->bDetailData[2]);
-+ goto bad_desc;
-+ }
-+
-+ /* same extra framing as for non-BLAN mode */
-+ dev->net->hard_header_len += 6;
-+ dev->rx_urb_size = dev->net->hard_header_len
-+ + dev->net->mtu;
-+ break;
-+ }
-+next_desc:
-+ len -= buf [0]; /* bLength */
-+ buf += buf [0];
-+ }
-+
-+ if (!desc || !detail) {
-+ dev_dbg(&intf->dev, "missing cdc mdlm %s%sdescriptor\n",
-+ desc ? "" : "func ",
-+ detail ? "" : "detail ");
-+ goto bad_desc;
-+ }
-+
-+ /* There's probably a CDC Ethernet descriptor there, but we can't
-+ * rely on the Ethernet address it provides since not all vendors
-+ * bother to make it unique. Likewise there's no point in tracking
-+ * of the CDC event notifications.
-+ */
-+ return usbnet_get_endpoints(dev, intf);
-+
-+bad_desc:
-+ dev_info(&dev->udev->dev, "unsupported MDLM descriptors\n");
-+ return -ENODEV;
-+}
-+
-+static const struct driver_info bogus_mdlm_info = {
-+ .description = "pseudo-MDLM (BLAN) device",
-+ .flags = FLAG_POINTTOPOINT | FLAG_FRAMING_Z,
-+ .check_connect = always_connected,
-+ .tx_fixup = zaurus_tx_fixup,
-+ .bind = blan_mdlm_bind,
-+};
-+
-+static const struct usb_device_id products [] = {
-+#define ZAURUS_MASTER_INTERFACE \
-+ .bInterfaceClass = USB_CLASS_COMM, \
-+ .bInterfaceSubClass = USB_CDC_SUBCLASS_ETHERNET, \
-+ .bInterfaceProtocol = USB_CDC_PROTO_NONE
-+
-+/* SA-1100 based Sharp Zaurus ("collie"), or compatible. */
-+{
-+ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
-+ | USB_DEVICE_ID_MATCH_DEVICE,
-+ .idVendor = 0x04DD,
-+ .idProduct = 0x8004,
-+ ZAURUS_MASTER_INTERFACE,
-+ .driver_info = ZAURUS_STRONGARM_INFO,
-+},
-+
-+/* PXA-2xx based models are also lying-about-cdc. If you add any
-+ * more devices that claim to be CDC Ethernet, make sure they get
-+ * added to the blacklist in cdc_ether too.
-+ *
-+ * NOTE: OpenZaurus versions with 2.6 kernels won't use these entries,
-+ * unlike the older ones with 2.4 "embedix" kernels.
-+ */
-+{
-+ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
-+ | USB_DEVICE_ID_MATCH_DEVICE,
-+ .idVendor = 0x04DD,
-+ .idProduct = 0x8005, /* A-300 */
-+ ZAURUS_MASTER_INTERFACE,
-+ .driver_info = ZAURUS_PXA_INFO,
-+}, {
-+ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
-+ | USB_DEVICE_ID_MATCH_DEVICE,
-+ .idVendor = 0x04DD,
-+ .idProduct = 0x8006, /* B-500/SL-5600 */
-+ ZAURUS_MASTER_INTERFACE,
-+ .driver_info = ZAURUS_PXA_INFO,
-+}, {
-+ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
-+ | USB_DEVICE_ID_MATCH_DEVICE,
-+ .idVendor = 0x04DD,
-+ .idProduct = 0x8007, /* C-700 */
-+ ZAURUS_MASTER_INTERFACE,
-+ .driver_info = ZAURUS_PXA_INFO,
-+}, {
-+ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
-+ | USB_DEVICE_ID_MATCH_DEVICE,
-+ .idVendor = 0x04DD,
-+ .idProduct = 0x9031, /* C-750 C-760 */
-+ ZAURUS_MASTER_INTERFACE,
-+ .driver_info = ZAURUS_PXA_INFO,
-+}, {
-+ /* C-750/C-760/C-860/SL-C3000 PDA in MDLM mode */
-+ USB_DEVICE_AND_INTERFACE_INFO(0x04DD, 0x9031, USB_CLASS_COMM,
-+ USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
-+ .driver_info = (unsigned long) &bogus_mdlm_info,
-+}, {
-+ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
-+ | USB_DEVICE_ID_MATCH_DEVICE,
-+ .idVendor = 0x04DD,
-+ .idProduct = 0x9032, /* SL-6000 */
-+ ZAURUS_MASTER_INTERFACE,
-+ .driver_info = ZAURUS_PXA_INFO,
-+}, {
-+ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
-+ | USB_DEVICE_ID_MATCH_DEVICE,
-+ .idVendor = 0x04DD,
-+ /* reported with some C860 units */
-+ .idProduct = 0x9050, /* C-860 */
-+ ZAURUS_MASTER_INTERFACE,
-+ .driver_info = ZAURUS_PXA_INFO,
-+},
-+{
-+ /* Motorola Rokr E6 */
-+ USB_DEVICE_AND_INTERFACE_INFO(0x22b8, 0x6027, USB_CLASS_COMM,
-+ USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
-+ .driver_info = (unsigned long) &bogus_mdlm_info,
-+}, {
-+ /* Motorola MOTOMAGX phones */
-+ USB_DEVICE_AND_INTERFACE_INFO(0x22b8, 0x6425, USB_CLASS_COMM,
-+ USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
-+ .driver_info = (unsigned long) &bogus_mdlm_info,
-+},
-+
-+/* Olympus has some models with a Zaurus-compatible option.
-+ * R-1000 uses a FreeScale i.MXL cpu (ARMv4T)
-+ */
-+{
-+ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
-+ | USB_DEVICE_ID_MATCH_DEVICE,
-+ .idVendor = 0x07B4,
-+ .idProduct = 0x0F02, /* R-1000 */
-+ ZAURUS_MASTER_INTERFACE,
-+ .driver_info = OLYMPUS_MXL_INFO,
-+},
-+
-+/* Logitech Harmony 900 - uses the pseudo-MDLM (BLAN) driver */
-+{
-+ USB_DEVICE_AND_INTERFACE_INFO(0x046d, 0xc11f, USB_CLASS_COMM,
-+ USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
-+ .driver_info = (unsigned long) &bogus_mdlm_info,
-+},
-+ { }, // END
-+};
-+MODULE_DEVICE_TABLE(usb, products);
-+
-+static struct usb_driver zaurus_driver = {
-+ .name = "zaurus",
-+ .id_table = products,
-+ .probe = usbnet_probe,
-+ .disconnect = usbnet_disconnect,
-+ .suspend = usbnet_suspend,
-+ .resume = usbnet_resume,
-+ .disable_hub_initiated_lpm = 1,
-+};
-+
-+module_usb_driver(zaurus_driver);
-+
-+MODULE_AUTHOR("Pavel Machek, David Brownell");
-+MODULE_DESCRIPTION("Sharp Zaurus PDA, and compatible products");
-+MODULE_LICENSE("GPL");
diff --git a/src/patches/backports-3.18.1-1-grsecurity.patch b/src/patches/backports-3.18.1-1-grsecurity.patch
deleted file mode 100644
index 711f2e3..0000000
--- a/src/patches/backports-3.18.1-1-grsecurity.patch
+++ /dev/null
@@ -1,3806 +0,0 @@
-diff -Naur backports-3.18.1-1.org/drivers/bluetooth/btwilink.c backports-3.18.1-1/drivers/bluetooth/btwilink.c
---- backports-3.18.1-1.org/drivers/bluetooth/btwilink.c 2014-12-21 22:37:15.000000000 +0100
-+++ backports-3.18.1-1/drivers/bluetooth/btwilink.c 2014-12-28 14:10:09.480888533 +0100
-@@ -288,7 +288,7 @@
-
- static int bt_ti_probe(struct platform_device *pdev)
- {
-- static struct ti_st *hst;
-+ struct ti_st *hst;
- struct hci_dev *hdev;
- int err;
-
-diff -Naur backports-3.18.1-1.org/drivers/media/dvb-core/dvbdev.c backports-3.18.1-1/drivers/media/dvb-core/dvbdev.c
---- backports-3.18.1-1.org/drivers/media/dvb-core/dvbdev.c 2014-12-21 22:37:14.000000000 +0100
-+++ backports-3.18.1-1/drivers/media/dvb-core/dvbdev.c 2014-12-28 14:10:09.528888772 +0100
-@@ -185,7 +185,7 @@
- const struct dvb_device *template, void *priv, int type)
- {
- struct dvb_device *dvbdev;
-- struct file_operations *dvbdevfops;
-+ file_operations_no_const *dvbdevfops;
- struct device *clsdev;
- int minor;
- int id;
-diff -Naur backports-3.18.1-1.org/drivers/media/dvb-frontends/af9033.h backports-3.18.1-1/drivers/media/dvb-frontends/af9033.h
---- backports-3.18.1-1.org/drivers/media/dvb-frontends/af9033.h 2014-12-21 22:37:14.000000000 +0100
-+++ backports-3.18.1-1/drivers/media/dvb-frontends/af9033.h 2014-12-28 14:10:09.528888772 +0100
-@@ -96,6 +96,6 @@
- int (*pid_filter_ctrl)(struct dvb_frontend *fe, int onoff);
- int (*pid_filter)(struct dvb_frontend *fe, int index, u16 pid,
- int onoff);
--};
-+} __no_const;
-
- #endif /* AF9033_H */
-diff -Naur backports-3.18.1-1.org/drivers/media/dvb-frontends/dib3000.h backports-3.18.1-1/drivers/media/dvb-frontends/dib3000.h
---- backports-3.18.1-1.org/drivers/media/dvb-frontends/dib3000.h 2014-12-21 22:37:14.000000000 +0100
-+++ backports-3.18.1-1/drivers/media/dvb-frontends/dib3000.h 2014-12-28 14:10:09.528888772 +0100
-@@ -39,7 +39,7 @@
- int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
- int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
- int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
--};
-+} __no_const;
-
- #if IS_ENABLED(CPTCFG_DVB_DIB3000MB)
- extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
-diff -Naur backports-3.18.1-1.org/drivers/media/dvb-frontends/dib7000p.h backports-3.18.1-1/drivers/media/dvb-frontends/dib7000p.h
---- backports-3.18.1-1.org/drivers/media/dvb-frontends/dib7000p.h 2014-12-21 22:37:14.000000000 +0100
-+++ backports-3.18.1-1/drivers/media/dvb-frontends/dib7000p.h 2014-12-28 14:10:09.528888772 +0100
-@@ -64,7 +64,7 @@
- int (*get_adc_power)(struct dvb_frontend *fe);
- int (*slave_reset)(struct dvb_frontend *fe);
- struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib7000p_config *cfg);
--};
-+} __no_const;
-
- #if IS_ENABLED(CPTCFG_DVB_DIB7000P)
- void *dib7000p_attach(struct dib7000p_ops *ops);
-diff -Naur backports-3.18.1-1.org/drivers/media/dvb-frontends/dib8000.h backports-3.18.1-1/drivers/media/dvb-frontends/dib8000.h
---- backports-3.18.1-1.org/drivers/media/dvb-frontends/dib8000.h 2014-12-21 22:37:14.000000000 +0100
-+++ backports-3.18.1-1/drivers/media/dvb-frontends/dib8000.h 2014-12-28 14:10:09.528888772 +0100
-@@ -61,7 +61,7 @@
- int (*pid_filter_ctrl)(struct dvb_frontend *fe, u8 onoff);
- int (*pid_filter)(struct dvb_frontend *fe, u8 id, u16 pid, u8 onoff);
- struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib8000_config *cfg);
--};
-+} __no_const;
-
- #if IS_ENABLED(CPTCFG_DVB_DIB8000)
- void *dib8000_attach(struct dib8000_ops *ops);
-diff -Naur backports-3.18.1-1.org/drivers/media/pci/cx88/cx88-video.c backports-3.18.1-1/drivers/media/pci/cx88/cx88-video.c
---- backports-3.18.1-1.org/drivers/media/pci/cx88/cx88-video.c 2014-12-21 22:37:13.000000000 +0100
-+++ backports-3.18.1-1/drivers/media/pci/cx88/cx88-video.c 2014-12-28 14:10:09.528888772 +0100
-@@ -50,9 +50,9 @@
-
- /* ------------------------------------------------------------------ */
-
--static unsigned int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
--static unsigned int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
--static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
-+static int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
-+static int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
-+static int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
-
- module_param_array(video_nr, int, NULL, 0444);
- module_param_array(vbi_nr, int, NULL, 0444);
-diff -Naur backports-3.18.1-1.org/drivers/media/pci/ivtv/ivtv-driver.c backports-3.18.1-1/drivers/media/pci/ivtv/ivtv-driver.c
---- backports-3.18.1-1.org/drivers/media/pci/ivtv/ivtv-driver.c 2014-12-21 22:37:13.000000000 +0100
-+++ backports-3.18.1-1/drivers/media/pci/ivtv/ivtv-driver.c 2014-12-28 14:10:09.528888772 +0100
-@@ -83,7 +83,7 @@
- MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
-
- /* ivtv instance counter */
--static atomic_t ivtv_instance = ATOMIC_INIT(0);
-+static atomic_unchecked_t ivtv_instance = ATOMIC_INIT(0);
-
- /* Parameter declarations */
- static int cardtype[IVTV_MAX_CARDS];
-diff -Naur backports-3.18.1-1.org/drivers/media/pci/solo6x10/solo6x10-core.c backports-3.18.1-1/drivers/media/pci/solo6x10/solo6x10-core.c
---- backports-3.18.1-1.org/drivers/media/pci/solo6x10/solo6x10-core.c 2014-12-21 22:37:13.000000000 +0100
-+++ backports-3.18.1-1/drivers/media/pci/solo6x10/solo6x10-core.c 2014-12-28 14:10:09.528888772 +0100
-@@ -424,7 +424,7 @@
-
- static int solo_sysfs_init(struct solo_dev *solo_dev)
- {
-- struct bin_attribute *sdram_attr = &solo_dev->sdram_attr;
-+ bin_attribute_no_const *sdram_attr = &solo_dev->sdram_attr;
- struct device *dev = &solo_dev->dev;
- const char *driver;
- int i;
-diff -Naur backports-3.18.1-1.org/drivers/media/pci/solo6x10/solo6x10-g723.c backports-3.18.1-1/drivers/media/pci/solo6x10/solo6x10-g723.c
---- backports-3.18.1-1.org/drivers/media/pci/solo6x10/solo6x10-g723.c 2014-12-21 22:37:13.000000000 +0100
-+++ backports-3.18.1-1/drivers/media/pci/solo6x10/solo6x10-g723.c 2014-12-28 14:10:09.528888772 +0100
-@@ -351,7 +351,7 @@
-
- int solo_g723_init(struct solo_dev *solo_dev)
- {
-- static struct snd_device_ops ops = { NULL };
-+ static struct snd_device_ops ops = { };
- struct snd_card *card;
- struct snd_kcontrol_new kctl;
- char name[32];
-diff -Naur backports-3.18.1-1.org/drivers/media/pci/solo6x10/solo6x10.h backports-3.18.1-1/drivers/media/pci/solo6x10/solo6x10.h
---- backports-3.18.1-1.org/drivers/media/pci/solo6x10/solo6x10.h 2014-12-21 22:37:13.000000000 +0100
-+++ backports-3.18.1-1/drivers/media/pci/solo6x10/solo6x10.h 2014-12-28 14:10:09.532888798 +0100
-@@ -219,7 +219,7 @@
-
- /* P2M DMA Engine */
- struct solo_p2m_dev p2m_dev[SOLO_NR_P2M];
-- atomic_t p2m_count;
-+ atomic_unchecked_t p2m_count;
- int p2m_jiffies;
- unsigned int p2m_timeouts;
-
-diff -Naur backports-3.18.1-1.org/drivers/media/pci/solo6x10/solo6x10-p2m.c backports-3.18.1-1/drivers/media/pci/solo6x10/solo6x10-p2m.c
---- backports-3.18.1-1.org/drivers/media/pci/solo6x10/solo6x10-p2m.c 2014-12-21 22:37:13.000000000 +0100
-+++ backports-3.18.1-1/drivers/media/pci/solo6x10/solo6x10-p2m.c 2014-12-28 14:10:09.532888798 +0100
-@@ -73,7 +73,7 @@
-
- /* Get next ID. According to Softlogic, 6110 has problems on !=0 P2M */
- if (solo_dev->type != SOLO_DEV_6110 && multi_p2m) {
-- p2m_id = atomic_inc_return(&solo_dev->p2m_count) % SOLO_NR_P2M;
-+ p2m_id = atomic_inc_return_unchecked(&solo_dev->p2m_count) % SOLO_NR_P2M;
- if (p2m_id < 0)
- p2m_id = -p2m_id;
- }
-diff -Naur backports-3.18.1-1.org/drivers/media/platform/omap/omap_vout.c backports-3.18.1-1/drivers/media/platform/omap/omap_vout.c
---- backports-3.18.1-1.org/drivers/media/platform/omap/omap_vout.c 2014-12-21 22:37:13.000000000 +0100
-+++ backports-3.18.1-1/drivers/media/platform/omap/omap_vout.c 2014-12-28 14:10:09.532888798 +0100
-@@ -63,7 +63,6 @@
- OMAP_VIDEO2,
- };
-
--static struct videobuf_queue_ops video_vbq_ops;
- /* Variables configurable through module params*/
- static u32 video1_numbuffers = 3;
- static u32 video2_numbuffers = 3;
-@@ -1012,6 +1011,12 @@
- {
- struct videobuf_queue *q;
- struct omap_vout_device *vout = NULL;
-+ static struct videobuf_queue_ops video_vbq_ops = {
-+ .buf_setup = omap_vout_buffer_setup,
-+ .buf_prepare = omap_vout_buffer_prepare,
-+ .buf_release = omap_vout_buffer_release,
-+ .buf_queue = omap_vout_buffer_queue,
-+ };
-
- vout = video_drvdata(file);
- v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
-@@ -1029,10 +1034,6 @@
- vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
-
- q = &vout->vbq;
-- video_vbq_ops.buf_setup = omap_vout_buffer_setup;
-- video_vbq_ops.buf_prepare = omap_vout_buffer_prepare;
-- video_vbq_ops.buf_release = omap_vout_buffer_release;
-- video_vbq_ops.buf_queue = omap_vout_buffer_queue;
- spin_lock_init(&vout->vbq_lock);
-
- videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
-diff -Naur backports-3.18.1-1.org/drivers/media/platform/s5p-tv/mixer_grp_layer.c backports-3.18.1-1/drivers/media/platform/s5p-tv/mixer_grp_layer.c
---- backports-3.18.1-1.org/drivers/media/platform/s5p-tv/mixer_grp_layer.c 2014-12-21 22:37:13.000000000 +0100
-+++ backports-3.18.1-1/drivers/media/platform/s5p-tv/mixer_grp_layer.c 2014-12-28 14:10:09.532888798 +0100
-@@ -235,7 +235,7 @@
- {
- struct mxr_layer *layer;
- int ret;
-- struct mxr_layer_ops ops = {
-+ static struct mxr_layer_ops ops = {
- .release = mxr_graph_layer_release,
- .buffer_set = mxr_graph_buffer_set,
- .stream_set = mxr_graph_stream_set,
-diff -Naur backports-3.18.1-1.org/drivers/media/platform/s5p-tv/mixer.h backports-3.18.1-1/drivers/media/platform/s5p-tv/mixer.h
---- backports-3.18.1-1.org/drivers/media/platform/s5p-tv/mixer.h 2014-12-21 22:37:13.000000000 +0100
-+++ backports-3.18.1-1/drivers/media/platform/s5p-tv/mixer.h 2014-12-28 14:10:09.532888798 +0100
-@@ -156,7 +156,7 @@
- /** layer index (unique identifier) */
- int idx;
- /** callbacks for layer methods */
-- struct mxr_layer_ops ops;
-+ struct mxr_layer_ops *ops;
- /** format array */
- const struct mxr_format **fmt_array;
- /** size of format array */
-diff -Naur backports-3.18.1-1.org/drivers/media/platform/s5p-tv/mixer_reg.c backports-3.18.1-1/drivers/media/platform/s5p-tv/mixer_reg.c
---- backports-3.18.1-1.org/drivers/media/platform/s5p-tv/mixer_reg.c 2014-12-21 22:37:13.000000000 +0100
-+++ backports-3.18.1-1/drivers/media/platform/s5p-tv/mixer_reg.c 2014-12-28 14:10:09.532888798 +0100
-@@ -276,7 +276,7 @@
- layer->update_buf = next;
- }
-
-- layer->ops.buffer_set(layer, layer->update_buf);
-+ layer->ops->buffer_set(layer, layer->update_buf);
-
- if (done && done != layer->shadow_buf)
- vb2_buffer_done(&done->vb, VB2_BUF_STATE_DONE);
-diff -Naur backports-3.18.1-1.org/drivers/media/platform/s5p-tv/mixer_video.c backports-3.18.1-1/drivers/media/platform/s5p-tv/mixer_video.c
---- backports-3.18.1-1.org/drivers/media/platform/s5p-tv/mixer_video.c 2014-12-21 22:37:13.000000000 +0100
-+++ backports-3.18.1-1/drivers/media/platform/s5p-tv/mixer_video.c 2014-12-28 14:10:09.532888798 +0100
-@@ -210,7 +210,7 @@
- layer->geo.src.height = layer->geo.src.full_height;
-
- mxr_geometry_dump(mdev, &layer->geo);
-- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
-+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
- mxr_geometry_dump(mdev, &layer->geo);
- }
-
-@@ -228,7 +228,7 @@
- layer->geo.dst.full_width = mbus_fmt.width;
- layer->geo.dst.full_height = mbus_fmt.height;
- layer->geo.dst.field = mbus_fmt.field;
-- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
-+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
-
- mxr_geometry_dump(mdev, &layer->geo);
- }
-@@ -334,7 +334,7 @@
- /* set source size to highest accepted value */
- geo->src.full_width = max(geo->dst.full_width, pix->width);
- geo->src.full_height = max(geo->dst.full_height, pix->height);
-- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
-+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
- mxr_geometry_dump(mdev, &layer->geo);
- /* set cropping to total visible screen */
- geo->src.width = pix->width;
-@@ -342,12 +342,12 @@
- geo->src.x_offset = 0;
- geo->src.y_offset = 0;
- /* assure consistency of geometry */
-- layer->ops.fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
-+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
- mxr_geometry_dump(mdev, &layer->geo);
- /* set full size to lowest possible value */
- geo->src.full_width = 0;
- geo->src.full_height = 0;
-- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
-+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
- mxr_geometry_dump(mdev, &layer->geo);
-
- /* returning results */
-@@ -474,7 +474,7 @@
- target->width = s->r.width;
- target->height = s->r.height;
-
-- layer->ops.fix_geometry(layer, stage, s->flags);
-+ layer->ops->fix_geometry(layer, stage, s->flags);
-
- /* retrieve update selection rectangle */
- res.left = target->x_offset;
-@@ -954,13 +954,13 @@
- mxr_output_get(mdev);
-
- mxr_layer_update_output(layer);
-- layer->ops.format_set(layer);
-+ layer->ops->format_set(layer);
- /* enabling layer in hardware */
- spin_lock_irqsave(&layer->enq_slock, flags);
- layer->state = MXR_LAYER_STREAMING;
- spin_unlock_irqrestore(&layer->enq_slock, flags);
-
-- layer->ops.stream_set(layer, MXR_ENABLE);
-+ layer->ops->stream_set(layer, MXR_ENABLE);
- mxr_streamer_get(mdev);
-
- return 0;
-@@ -1030,7 +1030,7 @@
- spin_unlock_irqrestore(&layer->enq_slock, flags);
-
- /* disabling layer in hardware */
-- layer->ops.stream_set(layer, MXR_DISABLE);
-+ layer->ops->stream_set(layer, MXR_DISABLE);
- /* remove one streamer */
- mxr_streamer_put(mdev);
- /* allow changes in output configuration */
-@@ -1068,8 +1068,8 @@
-
- void mxr_layer_release(struct mxr_layer *layer)
- {
-- if (layer->ops.release)
-- layer->ops.release(layer);
-+ if (layer->ops->release)
-+ layer->ops->release(layer);
- }
-
- void mxr_base_layer_release(struct mxr_layer *layer)
-@@ -1095,7 +1095,7 @@
-
- layer->mdev = mdev;
- layer->idx = idx;
-- layer->ops = *ops;
-+ layer->ops = ops;
-
- spin_lock_init(&layer->enq_slock);
- INIT_LIST_HEAD(&layer->enq_list);
-diff -Naur backports-3.18.1-1.org/drivers/media/platform/s5p-tv/mixer_vp_layer.c backports-3.18.1-1/drivers/media/platform/s5p-tv/mixer_vp_layer.c
---- backports-3.18.1-1.org/drivers/media/platform/s5p-tv/mixer_vp_layer.c 2014-12-21 22:37:13.000000000 +0100
-+++ backports-3.18.1-1/drivers/media/platform/s5p-tv/mixer_vp_layer.c 2014-12-28 14:10:09.532888798 +0100
-@@ -206,7 +206,7 @@
- {
- struct mxr_layer *layer;
- int ret;
-- struct mxr_layer_ops ops = {
-+ static struct mxr_layer_ops ops = {
- .release = mxr_vp_layer_release,
- .buffer_set = mxr_vp_buffer_set,
- .stream_set = mxr_vp_stream_set,
-diff -Naur backports-3.18.1-1.org/drivers/media/radio/radio-cadet.c backports-3.18.1-1/drivers/media/radio/radio-cadet.c
---- backports-3.18.1-1.org/drivers/media/radio/radio-cadet.c 2014-12-21 22:37:13.000000000 +0100
-+++ backports-3.18.1-1/drivers/media/radio/radio-cadet.c 2014-12-28 14:10:09.532888798 +0100
-@@ -333,6 +333,8 @@
- unsigned char readbuf[RDS_BUFFER];
- int i = 0;
-
-+ if (count > RDS_BUFFER)
-+ return -EFAULT;
- mutex_lock(&dev->lock);
- if (dev->rdsstat == 0)
- cadet_start_rds(dev);
-@@ -349,8 +351,9 @@
- readbuf[i++] = dev->rdsbuf[dev->rdsout++];
- mutex_unlock(&dev->lock);
-
-- if (i && copy_to_user(data, readbuf, i))
-- return -EFAULT;
-+ if (i > sizeof(readbuf) || (i && copy_to_user(data, readbuf, i)))
-+ i = -EFAULT;
-+
- return i;
- }
-
-diff -Naur backports-3.18.1-1.org/drivers/media/radio/radio-maxiradio.c backports-3.18.1-1/drivers/media/radio/radio-maxiradio.c
---- backports-3.18.1-1.org/drivers/media/radio/radio-maxiradio.c 2014-12-21 22:37:13.000000000 +0100
-+++ backports-3.18.1-1/drivers/media/radio/radio-maxiradio.c 2014-12-28 14:10:09.532888798 +0100
-@@ -61,7 +61,7 @@
- /* TEA5757 pin mappings */
- static const int clk = 1, data = 2, wren = 4, mo_st = 8, power = 16;
-
--static atomic_t maxiradio_instance = ATOMIC_INIT(0);
-+static atomic_unchecked_t maxiradio_instance = ATOMIC_INIT(0);
-
- #define PCI_VENDOR_ID_GUILLEMOT 0x5046
- #define PCI_DEVICE_ID_GUILLEMOT_MAXIRADIO 0x1001
-diff -Naur backports-3.18.1-1.org/drivers/media/radio/radio-shark2.c backports-3.18.1-1/drivers/media/radio/radio-shark2.c
---- backports-3.18.1-1.org/drivers/media/radio/radio-shark2.c 2014-12-21 22:37:13.000000000 +0100
-+++ backports-3.18.1-1/drivers/media/radio/radio-shark2.c 2014-12-28 14:10:09.532888798 +0100
-@@ -74,7 +74,7 @@
- u8 *transfer_buffer;
- };
-
--static atomic_t shark_instance = ATOMIC_INIT(0);
-+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
-
- static int shark_write_reg(struct radio_tea5777 *tea, u64 reg)
- {
-diff -Naur backports-3.18.1-1.org/drivers/media/radio/radio-shark.c backports-3.18.1-1/drivers/media/radio/radio-shark.c
---- backports-3.18.1-1.org/drivers/media/radio/radio-shark.c 2014-12-21 22:37:13.000000000 +0100
-+++ backports-3.18.1-1/drivers/media/radio/radio-shark.c 2014-12-28 14:10:09.532888798 +0100
-@@ -79,7 +79,7 @@
- u32 last_val;
- };
-
--static atomic_t shark_instance = ATOMIC_INIT(0);
-+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
-
- static void shark_write_val(struct snd_tea575x *tea, u32 val)
- {
-diff -Naur backports-3.18.1-1.org/drivers/media/radio/radio-si476x.c backports-3.18.1-1/drivers/media/radio/radio-si476x.c
---- backports-3.18.1-1.org/drivers/media/radio/radio-si476x.c 2014-12-21 22:37:13.000000000 +0100
-+++ backports-3.18.1-1/drivers/media/radio/radio-si476x.c 2014-12-28 14:10:09.532888798 +0100
-@@ -1445,7 +1445,7 @@
- struct si476x_radio *radio;
- struct v4l2_ctrl *ctrl;
-
-- static atomic_t instance = ATOMIC_INIT(0);
-+ static atomic_unchecked_t instance = ATOMIC_INIT(0);
-
- radio = devm_kzalloc(&pdev->dev, sizeof(*radio), GFP_KERNEL);
- if (!radio)
-diff -Naur backports-3.18.1-1.org/drivers/media/usb/dvb-usb/cinergyT2-core.c backports-3.18.1-1/drivers/media/usb/dvb-usb/cinergyT2-core.c
---- backports-3.18.1-1.org/drivers/media/usb/dvb-usb/cinergyT2-core.c 2014-12-21 22:37:14.000000000 +0100
-+++ backports-3.18.1-1/drivers/media/usb/dvb-usb/cinergyT2-core.c 2014-12-28 14:10:09.532888798 +0100
-@@ -50,29 +50,73 @@
-
- static int cinergyt2_streaming_ctrl(struct dvb_usb_adapter *adap, int enable)
- {
-- char buf[] = { CINERGYT2_EP1_CONTROL_STREAM_TRANSFER, enable ? 1 : 0 };
-- char result[64];
-- return dvb_usb_generic_rw(adap->dev, buf, sizeof(buf), result,
-- sizeof(result), 0);
-+ char *buf;
-+ char *result;
-+ int retval;
-+
-+ buf = kmalloc(2, GFP_KERNEL);
-+ if (buf == NULL)
-+ return -ENOMEM;
-+ result = kmalloc(64, GFP_KERNEL);
-+ if (result == NULL) {
-+ kfree(buf);
-+ return -ENOMEM;
-+ }
-+
-+ buf[0] = CINERGYT2_EP1_CONTROL_STREAM_TRANSFER;
-+ buf[1] = enable ? 1 : 0;
-+
-+ retval = dvb_usb_generic_rw(adap->dev, buf, 2, result, 64, 0);
-+
-+ kfree(buf);
-+ kfree(result);
-+ return retval;
- }
-
- static int cinergyt2_power_ctrl(struct dvb_usb_device *d, int enable)
- {
-- char buf[] = { CINERGYT2_EP1_SLEEP_MODE, enable ? 0 : 1 };
-- char state[3];
-- return dvb_usb_generic_rw(d, buf, sizeof(buf), state, sizeof(state), 0);
-+ char *buf;
-+ char *state;
-+ int retval;
-+
-+ buf = kmalloc(2, GFP_KERNEL);
-+ if (buf == NULL)
-+ return -ENOMEM;
-+ state = kmalloc(3, GFP_KERNEL);
-+ if (state == NULL) {
-+ kfree(buf);
-+ return -ENOMEM;
-+ }
-+
-+ buf[0] = CINERGYT2_EP1_SLEEP_MODE;
-+ buf[1] = enable ? 1 : 0;
-+
-+ retval = dvb_usb_generic_rw(d, buf, 2, state, 3, 0);
-+
-+ kfree(buf);
-+ kfree(state);
-+ return retval;
- }
-
- static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
- {
-- char query[] = { CINERGYT2_EP1_GET_FIRMWARE_VERSION };
-- char state[3];
-+ char *query;
-+ char *state;
- int ret;
-+ query = kmalloc(1, GFP_KERNEL);
-+ if (query == NULL)
-+ return -ENOMEM;
-+ state = kmalloc(3, GFP_KERNEL);
-+ if (state == NULL) {
-+ kfree(query);
-+ return -ENOMEM;
-+ }
-+
-+ query[0] = CINERGYT2_EP1_GET_FIRMWARE_VERSION;
-
- adap->fe_adap[0].fe = cinergyt2_fe_attach(adap->dev);
-
-- ret = dvb_usb_generic_rw(adap->dev, query, sizeof(query), state,
-- sizeof(state), 0);
-+ ret = dvb_usb_generic_rw(adap->dev, query, 1, state, 3, 0);
- if (ret < 0) {
- deb_rc("cinergyt2_power_ctrl() Failed to retrieve sleep "
- "state info\n");
-@@ -80,7 +124,8 @@
-
- /* Copy this pointer as we are gonna need it in the release phase */
- cinergyt2_usb_device = adap->dev;
--
-+ kfree(query);
-+ kfree(state);
- return 0;
- }
-
-@@ -141,12 +186,23 @@
- static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
- {
- struct cinergyt2_state *st = d->priv;
-- u8 key[5] = {0, 0, 0, 0, 0}, cmd = CINERGYT2_EP1_GET_RC_EVENTS;
-+ u8 *key, *cmd;
- int i;
-
-+ cmd = kmalloc(1, GFP_KERNEL);
-+ if (cmd == NULL)
-+ return -EINVAL;
-+ key = kzalloc(5, GFP_KERNEL);
-+ if (key == NULL) {
-+ kfree(cmd);
-+ return -EINVAL;
-+ }
-+
-+ cmd[0] = CINERGYT2_EP1_GET_RC_EVENTS;
-+
- *state = REMOTE_NO_KEY_PRESSED;
-
-- dvb_usb_generic_rw(d, &cmd, 1, key, sizeof(key), 0);
-+ dvb_usb_generic_rw(d, cmd, 1, key, 5, 0);
- if (key[4] == 0xff) {
- /* key repeat */
- st->rc_counter++;
-@@ -157,12 +213,12 @@
- *event = d->last_event;
- deb_rc("repeat key, event %x\n",
- *event);
-- return 0;
-+ goto out;
- }
- }
- deb_rc("repeated key (non repeatable)\n");
- }
-- return 0;
-+ goto out;
- }
-
- /* hack to pass checksum on the custom field */
-@@ -174,6 +230,9 @@
-
- deb_rc("key: %*ph\n", 5, key);
- }
-+out:
-+ kfree(cmd);
-+ kfree(key);
- return 0;
- }
-
-diff -Naur backports-3.18.1-1.org/drivers/media/usb/dvb-usb/cinergyT2-fe.c backports-3.18.1-1/drivers/media/usb/dvb-usb/cinergyT2-fe.c
---- backports-3.18.1-1.org/drivers/media/usb/dvb-usb/cinergyT2-fe.c 2014-12-21 22:37:14.000000000 +0100
-+++ backports-3.18.1-1/drivers/media/usb/dvb-usb/cinergyT2-fe.c 2014-12-28 14:10:09.532888798 +0100
-@@ -145,103 +145,176 @@
- fe_status_t *status)
- {
- struct cinergyt2_fe_state *state = fe->demodulator_priv;
-- struct dvbt_get_status_msg result;
-- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
-+ struct dvbt_get_status_msg *result;
-+ u8 *cmd;
- int ret;
-
-- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&result,
-- sizeof(result), 0);
-+ cmd = kmalloc(1, GFP_KERNEL);
-+ if (cmd == NULL)
-+ return -ENOMEM;
-+ result = kmalloc(sizeof(*result), GFP_KERNEL);
-+ if (result == NULL) {
-+ kfree(cmd);
-+ return -ENOMEM;
-+ }
-+
-+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
-+
-+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)result,
-+ sizeof(*result), 0);
- if (ret < 0)
-- return ret;
-+ goto out;
-
- *status = 0;
-
-- if (0xffff - le16_to_cpu(result.gain) > 30)
-+ if (0xffff - le16_to_cpu(result->gain) > 30)
- *status |= FE_HAS_SIGNAL;
-- if (result.lock_bits & (1 << 6))
-+ if (result->lock_bits & (1 << 6))
- *status |= FE_HAS_LOCK;
-- if (result.lock_bits & (1 << 5))
-+ if (result->lock_bits & (1 << 5))
- *status |= FE_HAS_SYNC;
-- if (result.lock_bits & (1 << 4))
-+ if (result->lock_bits & (1 << 4))
- *status |= FE_HAS_CARRIER;
-- if (result.lock_bits & (1 << 1))
-+ if (result->lock_bits & (1 << 1))
- *status |= FE_HAS_VITERBI;
-
- if ((*status & (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC)) !=
- (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC))
- *status &= ~FE_HAS_LOCK;
-
-- return 0;
-+out:
-+ kfree(cmd);
-+ kfree(result);
-+ return ret;
- }
-
- static int cinergyt2_fe_read_ber(struct dvb_frontend *fe, u32 *ber)
- {
- struct cinergyt2_fe_state *state = fe->demodulator_priv;
-- struct dvbt_get_status_msg status;
-- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
-+ struct dvbt_get_status_msg *status;
-+ char *cmd;
- int ret;
-
-- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
-- sizeof(status), 0);
-+ cmd = kmalloc(1, GFP_KERNEL);
-+ if (cmd == NULL)
-+ return -ENOMEM;
-+ status = kmalloc(sizeof(*status), GFP_KERNEL);
-+ if (status == NULL) {
-+ kfree(cmd);
-+ return -ENOMEM;
-+ }
-+
-+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
-+
-+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
-+ sizeof(*status), 0);
- if (ret < 0)
-- return ret;
-+ goto out;
-
-- *ber = le32_to_cpu(status.viterbi_error_rate);
-+ *ber = le32_to_cpu(status->viterbi_error_rate);
-+out:
-+ kfree(cmd);
-+ kfree(status);
- return 0;
- }
-
- static int cinergyt2_fe_read_unc_blocks(struct dvb_frontend *fe, u32 *unc)
- {
- struct cinergyt2_fe_state *state = fe->demodulator_priv;
-- struct dvbt_get_status_msg status;
-- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
-+ struct dvbt_get_status_msg *status;
-+ u8 *cmd;
- int ret;
-
-- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&status,
-- sizeof(status), 0);
-+ cmd = kmalloc(1, GFP_KERNEL);
-+ if (cmd == NULL)
-+ return -ENOMEM;
-+ status = kmalloc(sizeof(*status), GFP_KERNEL);
-+ if (status == NULL) {
-+ kfree(cmd);
-+ return -ENOMEM;
-+ }
-+
-+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
-+
-+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)status,
-+ sizeof(*status), 0);
- if (ret < 0) {
- err("cinergyt2_fe_read_unc_blocks() Failed! (Error=%d)\n",
- ret);
-- return ret;
-+ goto out;
- }
-- *unc = le32_to_cpu(status.uncorrected_block_count);
-- return 0;
-+ *unc = le32_to_cpu(status->uncorrected_block_count);
-+
-+out:
-+ kfree(cmd);
-+ kfree(status);
-+ return ret;
- }
-
- static int cinergyt2_fe_read_signal_strength(struct dvb_frontend *fe,
- u16 *strength)
- {
- struct cinergyt2_fe_state *state = fe->demodulator_priv;
-- struct dvbt_get_status_msg status;
-- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
-+ struct dvbt_get_status_msg *status;
-+ char *cmd;
- int ret;
-
-- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
-- sizeof(status), 0);
-+ cmd = kmalloc(1, GFP_KERNEL);
-+ if (cmd == NULL)
-+ return -ENOMEM;
-+ status = kmalloc(sizeof(*status), GFP_KERNEL);
-+ if (status == NULL) {
-+ kfree(cmd);
-+ return -ENOMEM;
-+ }
-+
-+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
-+
-+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
-+ sizeof(*status), 0);
- if (ret < 0) {
- err("cinergyt2_fe_read_signal_strength() Failed!"
- " (Error=%d)\n", ret);
-- return ret;
-+ goto out;
- }
-- *strength = (0xffff - le16_to_cpu(status.gain));
-+ *strength = (0xffff - le16_to_cpu(status->gain));
-+
-+out:
-+ kfree(cmd);
-+ kfree(status);
- return 0;
- }
-
- static int cinergyt2_fe_read_snr(struct dvb_frontend *fe, u16 *snr)
- {
- struct cinergyt2_fe_state *state = fe->demodulator_priv;
-- struct dvbt_get_status_msg status;
-- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
-+ struct dvbt_get_status_msg *status;
-+ char *cmd;
- int ret;
-
-- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
-- sizeof(status), 0);
-+ cmd = kmalloc(1, GFP_KERNEL);
-+ if (cmd == NULL)
-+ return -ENOMEM;
-+ status = kmalloc(sizeof(*status), GFP_KERNEL);
-+ if (status == NULL) {
-+ kfree(cmd);
-+ return -ENOMEM;
-+ }
-+
-+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
-+
-+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
-+ sizeof(*status), 0);
- if (ret < 0) {
- err("cinergyt2_fe_read_snr() Failed! (Error=%d)\n", ret);
-- return ret;
-+ goto out;
- }
-- *snr = (status.snr << 8) | status.snr;
-- return 0;
-+ *snr = (status->snr << 8) | status->snr;
-+
-+out:
-+ kfree(cmd);
-+ kfree(status);
-+ return ret;
- }
-
- static int cinergyt2_fe_init(struct dvb_frontend *fe)
-@@ -266,35 +339,46 @@
- {
- struct dtv_frontend_properties *fep = &fe->dtv_property_cache;
- struct cinergyt2_fe_state *state = fe->demodulator_priv;
-- struct dvbt_set_parameters_msg param;
-- char result[2];
-+ struct dvbt_set_parameters_msg *param;
-+ char *result;
- int err;
-
-- param.cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
-- param.tps = cpu_to_le16(compute_tps(fep));
-- param.freq = cpu_to_le32(fep->frequency / 1000);
-- param.flags = 0;
-+ result = kmalloc(2, GFP_KERNEL);
-+ if (result == NULL)
-+ return -ENOMEM;
-+ param = kmalloc(sizeof(*param), GFP_KERNEL);
-+ if (param == NULL) {
-+ kfree(result);
-+ return -ENOMEM;
-+ }
-+
-+ param->cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
-+ param->tps = cpu_to_le16(compute_tps(fep));
-+ param->freq = cpu_to_le32(fep->frequency / 1000);
-+ param->flags = 0;
-
- switch (fep->bandwidth_hz) {
- default:
- case 8000000:
-- param.bandwidth = 8;
-+ param->bandwidth = 8;
- break;
- case 7000000:
-- param.bandwidth = 7;
-+ param->bandwidth = 7;
- break;
- case 6000000:
-- param.bandwidth = 6;
-+ param->bandwidth = 6;
- break;
- }
-
- err = dvb_usb_generic_rw(state->d,
-- (char *)¶m, sizeof(param),
-- result, sizeof(result), 0);
-+ (char *)param, sizeof(*param),
-+ result, 2, 0);
- if (err < 0)
- err("cinergyt2_fe_set_frontend() Failed! err=%d\n", err);
-
-- return (err < 0) ? err : 0;
-+ kfree(result);
-+ kfree(param);
-+ return err;
- }
-
- static void cinergyt2_fe_release(struct dvb_frontend *fe)
-diff -Naur backports-3.18.1-1.org/drivers/media/usb/dvb-usb/dvb-usb-firmware.c backports-3.18.1-1/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
---- backports-3.18.1-1.org/drivers/media/usb/dvb-usb/dvb-usb-firmware.c 2014-12-21 22:37:14.000000000 +0100
-+++ backports-3.18.1-1/drivers/media/usb/dvb-usb/dvb-usb-firmware.c 2014-12-28 14:10:09.532888798 +0100
-@@ -35,42 +35,57 @@
-
- int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw, int type)
- {
-- struct hexline hx;
-- u8 reset;
-+ struct hexline *hx;
-+ u8 *reset;
- int ret,pos=0;
-
-+ reset = kmalloc(1, GFP_KERNEL);
-+ if (reset == NULL)
-+ return -ENOMEM;
-+
-+ hx = kmalloc(sizeof(struct hexline), GFP_KERNEL);
-+ if (hx == NULL) {
-+ kfree(reset);
-+ return -ENOMEM;
-+ }
-+
- /* stop the CPU */
-- reset = 1;
-- if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1)) != 1)
-+ reset[0] = 1;
-+ if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1)) != 1)
- err("could not stop the USB controller CPU.");
-
-- while ((ret = dvb_usb_get_hexline(fw,&hx,&pos)) > 0) {
-- deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx.addr,hx.len,hx.chk);
-- ret = usb_cypress_writemem(udev,hx.addr,hx.data,hx.len);
-+ while ((ret = dvb_usb_get_hexline(fw,hx,&pos)) > 0) {
-+ deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx->addr,hx->len,hx->chk);
-+ ret = usb_cypress_writemem(udev,hx->addr,hx->data,hx->len);
-
-- if (ret != hx.len) {
-+ if (ret != hx->len) {
- err("error while transferring firmware "
- "(transferred size: %d, block size: %d)",
-- ret,hx.len);
-+ ret,hx->len);
- ret = -EINVAL;
- break;
- }
- }
- if (ret < 0) {
- err("firmware download failed at %d with %d",pos,ret);
-+ kfree(reset);
-+ kfree(hx);
- return ret;
- }
-
- if (ret == 0) {
- /* restart the CPU */
-- reset = 0;
-- if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1) != 1) {
-+ reset[0] = 0;
-+ if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1) != 1) {
- err("could not restart the USB controller CPU.");
- ret = -EINVAL;
- }
- } else
- ret = -EIO;
-
-+ kfree(reset);
-+ kfree(hx);
-+
- return ret;
- }
- EXPORT_SYMBOL(usb_cypress_load_firmware);
-diff -Naur backports-3.18.1-1.org/drivers/media/usb/dvb-usb/dw2102.c backports-3.18.1-1/drivers/media/usb/dvb-usb/dw2102.c
---- backports-3.18.1-1.org/drivers/media/usb/dvb-usb/dw2102.c 2014-12-21 22:37:14.000000000 +0100
-+++ backports-3.18.1-1/drivers/media/usb/dvb-usb/dw2102.c 2014-12-28 14:10:09.536888811 +0100
-@@ -118,7 +118,7 @@
-
- struct s6x0_state {
- int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);
--};
-+} __no_const;
-
- /* debug */
- static int dvb_usb_dw2102_debug;
-diff -Naur backports-3.18.1-1.org/drivers/media/usb/dvb-usb/technisat-usb2.c backports-3.18.1-1/drivers/media/usb/dvb-usb/technisat-usb2.c
---- backports-3.18.1-1.org/drivers/media/usb/dvb-usb/technisat-usb2.c 2014-12-21 22:37:14.000000000 +0100
-+++ backports-3.18.1-1/drivers/media/usb/dvb-usb/technisat-usb2.c 2014-12-28 14:10:09.536888811 +0100
-@@ -87,8 +87,11 @@
- static int technisat_usb2_i2c_access(struct usb_device *udev,
- u8 device_addr, u8 *tx, u8 txlen, u8 *rx, u8 rxlen)
- {
-- u8 b[64];
-- int ret, actual_length;
-+ u8 *b = kmalloc(64, GFP_KERNEL);
-+ int ret, actual_length, error = 0;
-+
-+ if (b == NULL)
-+ return -ENOMEM;
-
- deb_i2c("i2c-access: %02x, tx: ", device_addr);
- debug_dump(tx, txlen, deb_i2c);
-@@ -121,7 +124,8 @@
-
- if (ret < 0) {
- err("i2c-error: out failed %02x = %d", device_addr, ret);
-- return -ENODEV;
-+ error = -ENODEV;
-+ goto out;
- }
-
- ret = usb_bulk_msg(udev,
-@@ -129,7 +133,8 @@
- b, 64, &actual_length, 1000);
- if (ret < 0) {
- err("i2c-error: in failed %02x = %d", device_addr, ret);
-- return -ENODEV;
-+ error = -ENODEV;
-+ goto out;
- }
-
- if (b[0] != I2C_STATUS_OK) {
-@@ -137,8 +142,10 @@
- /* handle tuner-i2c-nak */
- if (!(b[0] == I2C_STATUS_NAK &&
- device_addr == 0x60
-- /* && device_is_technisat_usb2 */))
-- return -ENODEV;
-+ /* && device_is_technisat_usb2 */)) {
-+ error = -ENODEV;
-+ goto out;
-+ }
- }
-
- deb_i2c("status: %d, ", b[0]);
-@@ -152,7 +159,9 @@
-
- deb_i2c("\n");
-
-- return 0;
-+out:
-+ kfree(b);
-+ return error;
- }
-
- static int technisat_usb2_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msg,
-@@ -224,14 +233,16 @@
- {
- int ret;
-
-- u8 led[8] = {
-- red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
-- 0
-- };
-+ u8 *led = kzalloc(8, GFP_KERNEL);
-+
-+ if (led == NULL)
-+ return -ENOMEM;
-
- if (disable_led_control && state != TECH_LED_OFF)
- return 0;
-
-+ led[0] = red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST;
-+
- switch (state) {
- case TECH_LED_ON:
- led[1] = 0x82;
-@@ -263,16 +274,22 @@
- red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
- USB_TYPE_VENDOR | USB_DIR_OUT,
- 0, 0,
-- led, sizeof(led), 500);
-+ led, 8, 500);
-
- mutex_unlock(&d->i2c_mutex);
-+
-+ kfree(led);
-+
- return ret;
- }
-
- static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 green)
- {
- int ret;
-- u8 b = 0;
-+ u8 *b = kzalloc(1, GFP_KERNEL);
-+
-+ if (b == NULL)
-+ return -ENOMEM;
-
- if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
- return -EAGAIN;
-@@ -281,10 +298,12 @@
- SET_LED_TIMER_DIVIDER_VENDOR_REQUEST,
- USB_TYPE_VENDOR | USB_DIR_OUT,
- (red << 8) | green, 0,
-- &b, 1, 500);
-+ b, 1, 500);
-
- mutex_unlock(&d->i2c_mutex);
-
-+ kfree(b);
-+
- return ret;
- }
-
-@@ -328,7 +347,7 @@
- struct dvb_usb_device_description **desc, int *cold)
- {
- int ret;
-- u8 version[3];
-+ u8 *version = kmalloc(3, GFP_KERNEL);
-
- /* first select the interface */
- if (usb_set_interface(udev, 0, 1) != 0)
-@@ -338,11 +357,14 @@
-
- *cold = 0; /* by default do not download a firmware - just in case something is wrong */
-
-+ if (version == NULL)
-+ return 0;
-+
- ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
- GET_VERSION_INFO_VENDOR_REQUEST,
- USB_TYPE_VENDOR | USB_DIR_IN,
- 0, 0,
-- version, sizeof(version), 500);
-+ version, 3, 500);
-
- if (ret < 0)
- *cold = 1;
-@@ -351,6 +373,8 @@
- *cold = 0;
- }
-
-+ kfree(version);
-+
- return 0;
- }
-
-@@ -591,10 +615,15 @@
-
- static int technisat_usb2_get_ir(struct dvb_usb_device *d)
- {
-- u8 buf[62], *b;
-+ u8 *buf, *b;
- int ret;
- struct ir_raw_event ev;
-
-+ buf = kmalloc(62, GFP_KERNEL);
-+
-+ if (buf == NULL)
-+ return -ENOMEM;
-+
- buf[0] = GET_IR_DATA_VENDOR_REQUEST;
- buf[1] = 0x08;
- buf[2] = 0x8f;
-@@ -617,16 +646,20 @@
- GET_IR_DATA_VENDOR_REQUEST,
- USB_TYPE_VENDOR | USB_DIR_IN,
- 0x8080, 0,
-- buf, sizeof(buf), 500);
-+ buf, 62, 500);
-
- unlock:
- mutex_unlock(&d->i2c_mutex);
-
-- if (ret < 0)
-+ if (ret < 0) {
-+ kfree(buf);
- return ret;
-+ }
-
-- if (ret == 1)
-+ if (ret == 1) {
-+ kfree(buf);
- return 0; /* no key pressed */
-+ }
-
- /* decoding */
- b = buf+1;
-@@ -653,6 +686,8 @@
-
- ir_raw_event_handle(d->rc_dev);
-
-+ kfree(buf);
-+
- return 1;
- }
-
-diff -Naur backports-3.18.1-1.org/drivers/media/v4l2-core/v4l2-device.c backports-3.18.1-1/drivers/media/v4l2-core/v4l2-device.c
---- backports-3.18.1-1.org/drivers/media/v4l2-core/v4l2-device.c 2014-12-21 22:37:14.000000000 +0100
-+++ backports-3.18.1-1/drivers/media/v4l2-core/v4l2-device.c 2014-12-28 14:10:09.536888811 +0100
-@@ -75,9 +75,9 @@
- EXPORT_SYMBOL_GPL(v4l2_device_put);
-
- int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
-- atomic_t *instance)
-+ atomic_unchecked_t *instance)
- {
-- int num = atomic_inc_return(instance) - 1;
-+ int num = atomic_inc_return_unchecked(instance) - 1;
- int len = strlen(basename);
-
- if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
-diff -Naur backports-3.18.1-1.org/drivers/media/v4l2-core/v4l2-ioctl.c backports-3.18.1-1/drivers/media/v4l2-core/v4l2-ioctl.c
---- backports-3.18.1-1.org/drivers/media/v4l2-core/v4l2-ioctl.c 2014-12-21 22:37:14.000000000 +0100
-+++ backports-3.18.1-1/drivers/media/v4l2-core/v4l2-ioctl.c 2014-12-28 14:10:09.536888811 +0100
-@@ -2142,7 +2142,8 @@
- struct file *file, void *fh, void *p);
- } u;
- void (*debug)(const void *arg, bool write_only);
--};
-+} __do_const;
-+typedef struct v4l2_ioctl_info __no_const v4l2_ioctl_info_no_const;
-
- /* This control needs a priority check */
- #define INFO_FL_PRIO (1 << 0)
-@@ -2326,7 +2327,7 @@
- struct video_device *vfd = video_devdata(file);
- const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops;
- bool write_only = false;
-- struct v4l2_ioctl_info default_info;
-+ v4l2_ioctl_info_no_const default_info;
- const struct v4l2_ioctl_info *info;
- void *fh = file->private_data;
- struct v4l2_fh *vfh = NULL;
-@@ -2413,7 +2414,7 @@
- ret = -EINVAL;
- break;
- }
-- *user_ptr = (void __user *)buf->m.planes;
-+ *user_ptr = (void __force_user *)buf->m.planes;
- *kernel_ptr = (void **)&buf->m.planes;
- *array_size = sizeof(struct v4l2_plane) * buf->length;
- ret = 1;
-@@ -2430,7 +2431,7 @@
- ret = -EINVAL;
- break;
- }
-- *user_ptr = (void __user *)edid->edid;
-+ *user_ptr = (void __force_user *)edid->edid;
- *kernel_ptr = (void **)&edid->edid;
- *array_size = edid->blocks * 128;
- ret = 1;
-@@ -2448,7 +2449,7 @@
- ret = -EINVAL;
- break;
- }
-- *user_ptr = (void __user *)ctrls->controls;
-+ *user_ptr = (void __force_user *)ctrls->controls;
- *kernel_ptr = (void **)&ctrls->controls;
- *array_size = sizeof(struct v4l2_ext_control)
- * ctrls->count;
-@@ -2549,7 +2550,7 @@
- }
-
- if (has_array_args) {
-- *kernel_ptr = (void __force *)user_ptr;
-+ *kernel_ptr = (void __force_kernel *)user_ptr;
- if (copy_to_user(user_ptr, mbuf, array_size))
- err = -EFAULT;
- goto out_array_args;
-diff -Naur backports-3.18.1-1.org/drivers/net/ieee802154/fakehard.c backports-3.18.1-1/drivers/net/ieee802154/fakehard.c
---- backports-3.18.1-1.org/drivers/net/ieee802154/fakehard.c 2014-12-21 22:37:14.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/ieee802154/fakehard.c 2014-12-28 14:10:09.556888909 +0100
-@@ -365,7 +365,7 @@
- phy->transmit_power = 0xbf;
-
- dev->netdev_ops = &fake_ops;
-- dev->ml_priv = &fake_mlme;
-+ dev->ml_priv = (void *)&fake_mlme;
-
- priv = netdev_priv(dev);
- priv->phy = phy;
-diff -Naur backports-3.18.1-1.org/drivers/net/usb/sierra_net.c backports-3.18.1-1/drivers/net/usb/sierra_net.c
---- backports-3.18.1-1.org/drivers/net/usb/sierra_net.c 2014-12-21 22:37:14.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/usb/sierra_net.c 2014-12-28 14:10:09.560888936 +0100
-@@ -51,7 +51,7 @@
- /* atomic counter partially included in MAC address to make sure 2 devices
- * do not end up with the same MAC - concept breaks in case of > 255 ifaces
- */
--static atomic_t iface_counter = ATOMIC_INIT(0);
-+static atomic_unchecked_t iface_counter = ATOMIC_INIT(0);
-
- /*
- * SYNC Timer Delay definition used to set the expiry time
-@@ -697,7 +697,7 @@
- dev->net->netdev_ops = &sierra_net_device_ops;
-
- /* change MAC addr to include, ifacenum, and to be unique */
-- dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return(&iface_counter);
-+ dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return_unchecked(&iface_counter);
- dev->net->dev_addr[ETH_ALEN-1] = ifacenum;
-
- /* we will have to manufacture ethernet headers, prepare template */
-diff -Naur backports-3.18.1-1.org/drivers/net/wireless/at76c50x-usb.c backports-3.18.1-1/drivers/net/wireless/at76c50x-usb.c
---- backports-3.18.1-1.org/drivers/net/wireless/at76c50x-usb.c 2014-12-21 22:37:14.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/wireless/at76c50x-usb.c 2014-12-28 14:10:09.560888936 +0100
-@@ -353,7 +353,7 @@
- }
-
- /* Convert timeout from the DFU status to jiffies */
--static inline unsigned long at76_get_timeout(struct dfu_status *s)
-+static inline unsigned long __intentional_overflow(-1) at76_get_timeout(struct dfu_status *s)
- {
- return msecs_to_jiffies((s->poll_timeout[2] << 16)
- | (s->poll_timeout[1] << 8)
-diff -Naur backports-3.18.1-1.org/drivers/net/wireless/ath/ath10k/htc.c backports-3.18.1-1/drivers/net/wireless/ath/ath10k/htc.c
---- backports-3.18.1-1.org/drivers/net/wireless/ath/ath10k/htc.c 2014-12-21 22:37:14.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/wireless/ath/ath10k/htc.c 2014-12-28 14:10:09.560888936 +0100
-@@ -848,7 +848,10 @@
- /* registered target arrival callback from the HIF layer */
- int ath10k_htc_init(struct ath10k *ar)
- {
-- struct ath10k_hif_cb htc_callbacks;
-+ static struct ath10k_hif_cb htc_callbacks = {
-+ .rx_completion = ath10k_htc_rx_completion_handler,
-+ .tx_completion = ath10k_htc_tx_completion_handler,
-+ };
- struct ath10k_htc_ep *ep = NULL;
- struct ath10k_htc *htc = &ar->htc;
-
-@@ -857,8 +860,6 @@
- ath10k_htc_reset_endpoint_states(htc);
-
- /* setup HIF layer callbacks */
-- htc_callbacks.rx_completion = ath10k_htc_rx_completion_handler;
-- htc_callbacks.tx_completion = ath10k_htc_tx_completion_handler;
- htc->ar = ar;
-
- /* Get HIF default pipe for HTC message exchange */
-diff -Naur backports-3.18.1-1.org/drivers/net/wireless/ath/ath10k/htc.h backports-3.18.1-1/drivers/net/wireless/ath/ath10k/htc.h
---- backports-3.18.1-1.org/drivers/net/wireless/ath/ath10k/htc.h 2014-12-21 22:37:14.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/wireless/ath/ath10k/htc.h 2014-12-28 14:10:09.560888936 +0100
-@@ -270,13 +270,13 @@
-
- struct ath10k_htc_ops {
- void (*target_send_suspend_complete)(struct ath10k *ar);
--};
-+} __no_const;
-
- struct ath10k_htc_ep_ops {
- void (*ep_tx_complete)(struct ath10k *, struct sk_buff *);
- void (*ep_rx_complete)(struct ath10k *, struct sk_buff *);
- void (*ep_tx_credits)(struct ath10k *);
--};
-+} __no_const;
-
- /* service connection information */
- struct ath10k_htc_svc_conn_req {
-diff -Naur backports-3.18.1-1.org/drivers/net/wireless/ath/ath9k/ar9002_mac.c backports-3.18.1-1/drivers/net/wireless/ath/ath9k/ar9002_mac.c
---- backports-3.18.1-1.org/drivers/net/wireless/ath/ath9k/ar9002_mac.c 2014-12-21 22:37:14.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/wireless/ath/ath9k/ar9002_mac.c 2014-12-28 14:10:09.560888936 +0100
-@@ -220,8 +220,8 @@
- ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
- ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
-
-- ACCESS_ONCE(ads->ds_link) = i->link;
-- ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
-+ ACCESS_ONCE_RW(ads->ds_link) = i->link;
-+ ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
-
- ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
- ctl6 = SM(i->keytype, AR_EncrType);
-@@ -235,26 +235,26 @@
-
- if ((i->is_first || i->is_last) &&
- i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
-- ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
-+ ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
- | set11nTries(i->rates, 1)
- | set11nTries(i->rates, 2)
- | set11nTries(i->rates, 3)
- | (i->dur_update ? AR_DurUpdateEna : 0)
- | SM(0, AR_BurstDur);
-
-- ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
-+ ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
- | set11nRate(i->rates, 1)
- | set11nRate(i->rates, 2)
- | set11nRate(i->rates, 3);
- } else {
-- ACCESS_ONCE(ads->ds_ctl2) = 0;
-- ACCESS_ONCE(ads->ds_ctl3) = 0;
-+ ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
-+ ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
- }
-
- if (!i->is_first) {
-- ACCESS_ONCE(ads->ds_ctl0) = 0;
-- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
-- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
-+ ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
-+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
-+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
- return;
- }
-
-@@ -279,7 +279,7 @@
- break;
- }
-
-- ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
-+ ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
- | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
- | SM(i->txpower, AR_XmitPower0)
- | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
-@@ -289,27 +289,27 @@
- | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
- (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
-
-- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
-- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
-+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
-+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
-
- if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
- return;
-
-- ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
-+ ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
- | set11nPktDurRTSCTS(i->rates, 1);
-
-- ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
-+ ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
- | set11nPktDurRTSCTS(i->rates, 3);
-
-- ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
-+ ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
- | set11nRateFlags(i->rates, 1)
- | set11nRateFlags(i->rates, 2)
- | set11nRateFlags(i->rates, 3)
- | SM(i->rtscts_rate, AR_RTSCTSRate);
-
-- ACCESS_ONCE(ads->ds_ctl9) = SM(i->txpower, AR_XmitPower1);
-- ACCESS_ONCE(ads->ds_ctl10) = SM(i->txpower, AR_XmitPower2);
-- ACCESS_ONCE(ads->ds_ctl11) = SM(i->txpower, AR_XmitPower3);
-+ ACCESS_ONCE_RW(ads->ds_ctl9) = SM(i->txpower, AR_XmitPower1);
-+ ACCESS_ONCE_RW(ads->ds_ctl10) = SM(i->txpower, AR_XmitPower2);
-+ ACCESS_ONCE_RW(ads->ds_ctl11) = SM(i->txpower, AR_XmitPower3);
- }
-
- static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds,
-diff -Naur backports-3.18.1-1.org/drivers/net/wireless/ath/ath9k/ar9003_mac.c backports-3.18.1-1/drivers/net/wireless/ath/ath9k/ar9003_mac.c
---- backports-3.18.1-1.org/drivers/net/wireless/ath/ath9k/ar9003_mac.c 2014-12-21 22:37:14.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/wireless/ath/ath9k/ar9003_mac.c 2014-12-28 14:10:09.560888936 +0100
-@@ -39,47 +39,47 @@
- (i->qcu << AR_TxQcuNum_S) | desc_len;
-
- checksum += val;
-- ACCESS_ONCE(ads->info) = val;
-+ ACCESS_ONCE_RW(ads->info) = val;
-
- checksum += i->link;
-- ACCESS_ONCE(ads->link) = i->link;
-+ ACCESS_ONCE_RW(ads->link) = i->link;
-
- checksum += i->buf_addr[0];
-- ACCESS_ONCE(ads->data0) = i->buf_addr[0];
-+ ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
- checksum += i->buf_addr[1];
-- ACCESS_ONCE(ads->data1) = i->buf_addr[1];
-+ ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
- checksum += i->buf_addr[2];
-- ACCESS_ONCE(ads->data2) = i->buf_addr[2];
-+ ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
- checksum += i->buf_addr[3];
-- ACCESS_ONCE(ads->data3) = i->buf_addr[3];
-+ ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
-
- checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
-- ACCESS_ONCE(ads->ctl3) = val;
-+ ACCESS_ONCE_RW(ads->ctl3) = val;
- checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
-- ACCESS_ONCE(ads->ctl5) = val;
-+ ACCESS_ONCE_RW(ads->ctl5) = val;
- checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
-- ACCESS_ONCE(ads->ctl7) = val;
-+ ACCESS_ONCE_RW(ads->ctl7) = val;
- checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
-- ACCESS_ONCE(ads->ctl9) = val;
-+ ACCESS_ONCE_RW(ads->ctl9) = val;
-
- checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
-- ACCESS_ONCE(ads->ctl10) = checksum;
-+ ACCESS_ONCE_RW(ads->ctl10) = checksum;
-
- if (i->is_first || i->is_last) {
-- ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
-+ ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
- | set11nTries(i->rates, 1)
- | set11nTries(i->rates, 2)
- | set11nTries(i->rates, 3)
- | (i->dur_update ? AR_DurUpdateEna : 0)
- | SM(0, AR_BurstDur);
-
-- ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
-+ ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
- | set11nRate(i->rates, 1)
- | set11nRate(i->rates, 2)
- | set11nRate(i->rates, 3);
- } else {
-- ACCESS_ONCE(ads->ctl13) = 0;
-- ACCESS_ONCE(ads->ctl14) = 0;
-+ ACCESS_ONCE_RW(ads->ctl13) = 0;
-+ ACCESS_ONCE_RW(ads->ctl14) = 0;
- }
-
- ads->ctl20 = 0;
-@@ -89,17 +89,17 @@
-
- ctl17 = SM(i->keytype, AR_EncrType);
- if (!i->is_first) {
-- ACCESS_ONCE(ads->ctl11) = 0;
-- ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
-- ACCESS_ONCE(ads->ctl15) = 0;
-- ACCESS_ONCE(ads->ctl16) = 0;
-- ACCESS_ONCE(ads->ctl17) = ctl17;
-- ACCESS_ONCE(ads->ctl18) = 0;
-- ACCESS_ONCE(ads->ctl19) = 0;
-+ ACCESS_ONCE_RW(ads->ctl11) = 0;
-+ ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
-+ ACCESS_ONCE_RW(ads->ctl15) = 0;
-+ ACCESS_ONCE_RW(ads->ctl16) = 0;
-+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
-+ ACCESS_ONCE_RW(ads->ctl18) = 0;
-+ ACCESS_ONCE_RW(ads->ctl19) = 0;
- return;
- }
-
-- ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
-+ ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
- | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
- | SM(i->txpower, AR_XmitPower0)
- | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
-@@ -135,26 +135,26 @@
- val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
- ctl12 |= SM(val, AR_PAPRDChainMask);
-
-- ACCESS_ONCE(ads->ctl12) = ctl12;
-- ACCESS_ONCE(ads->ctl17) = ctl17;
-+ ACCESS_ONCE_RW(ads->ctl12) = ctl12;
-+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
-
-- ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
-+ ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
- | set11nPktDurRTSCTS(i->rates, 1);
-
-- ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
-+ ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
- | set11nPktDurRTSCTS(i->rates, 3);
-
-- ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
-+ ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
- | set11nRateFlags(i->rates, 1)
- | set11nRateFlags(i->rates, 2)
- | set11nRateFlags(i->rates, 3)
- | SM(i->rtscts_rate, AR_RTSCTSRate);
-
-- ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
-+ ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
-
-- ACCESS_ONCE(ads->ctl20) = SM(i->txpower, AR_XmitPower1);
-- ACCESS_ONCE(ads->ctl21) = SM(i->txpower, AR_XmitPower2);
-- ACCESS_ONCE(ads->ctl22) = SM(i->txpower, AR_XmitPower3);
-+ ACCESS_ONCE_RW(ads->ctl20) = SM(i->txpower, AR_XmitPower1);
-+ ACCESS_ONCE_RW(ads->ctl21) = SM(i->txpower, AR_XmitPower2);
-+ ACCESS_ONCE_RW(ads->ctl22) = SM(i->txpower, AR_XmitPower3);
- }
-
- static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
-diff -Naur backports-3.18.1-1.org/drivers/net/wireless/ath/ath9k/hw.h backports-3.18.1-1/drivers/net/wireless/ath/ath9k/hw.h
---- backports-3.18.1-1.org/drivers/net/wireless/ath/ath9k/hw.h 2014-12-21 22:37:14.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/wireless/ath/ath9k/hw.h 2014-12-28 14:10:09.564888946 +0100
-@@ -630,7 +630,7 @@
-
- /* ANI */
- void (*ani_cache_ini_regs)(struct ath_hw *ah);
--};
-+} __no_const;
-
- /**
- * struct ath_spec_scan - parameters for Atheros spectral scan
-@@ -708,7 +708,7 @@
- #ifdef CPTCFG_ATH9K_BTCOEX_SUPPORT
- void (*set_bt_ant_diversity)(struct ath_hw *hw, bool enable);
- #endif
--};
-+} __no_const;
-
- struct ath_nf_limits {
- s16 max;
-diff -Naur backports-3.18.1-1.org/drivers/net/wireless/ath/ath9k/main.c backports-3.18.1-1/drivers/net/wireless/ath/ath9k/main.c
---- backports-3.18.1-1.org/drivers/net/wireless/ath/ath9k/main.c 2014-12-21 22:37:14.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/wireless/ath/ath9k/main.c 2014-12-28 14:24:49.169250593 +0100
-@@ -2454,16 +2454,18 @@
- if (!ath9k_is_chanctx_enabled())
- return;
-
-- ath9k_ops.hw_scan = ath9k_hw_scan;
-- ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
-- ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
-- ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
-- ath9k_ops.add_chanctx = ath9k_add_chanctx;
-- ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
-- ath9k_ops.change_chanctx = ath9k_change_chanctx;
-- ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
-- ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
-- ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
-+ pax_open_kernel();
-+ *(void **)&ath9k_ops.hw_scan = ath9k_hw_scan;
-+ *(void **)&ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
-+ *(void **)&ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
-+ *(void **)&ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
-+ *(void **)&ath9k_ops.add_chanctx = ath9k_add_chanctx;
-+ *(void **)&ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
-+ *(void **)&ath9k_ops.change_chanctx = ath9k_change_chanctx;
-+ *(void **)&ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
-+ *(void **)&ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
-+ *(void **)&ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
-+ pax_close_kernel();
- }
-
- #endif
-diff -Naur backports-3.18.1-1.org/drivers/net/wireless/b43/phy_lp.c backports-3.18.1-1/drivers/net/wireless/b43/phy_lp.c
---- backports-3.18.1-1.org/drivers/net/wireless/b43/phy_lp.c 2014-12-21 22:37:14.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/wireless/b43/phy_lp.c 2014-12-28 14:10:09.564888946 +0100
-@@ -2502,7 +2502,7 @@
- {
- struct ssb_bus *bus = dev->dev->sdev->bus;
-
-- static const struct b206x_channel *chandata = NULL;
-+ const struct b206x_channel *chandata = NULL;
- u32 crystal_freq = bus->chipco.pmu.crystalfreq * 1000;
- u32 freqref, vco_freq, val1, val2, val3, timeout, timeoutref, count;
- u16 old_comm15, scale;
-diff -Naur backports-3.18.1-1.org/drivers/net/wireless/iwlegacy/3945-mac.c backports-3.18.1-1/drivers/net/wireless/iwlegacy/3945-mac.c
---- backports-3.18.1-1.org/drivers/net/wireless/iwlegacy/3945-mac.c 2014-12-21 22:37:14.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/wireless/iwlegacy/3945-mac.c 2014-12-28 14:10:09.564888946 +0100
-@@ -3633,7 +3633,9 @@
- */
- if (il3945_mod_params.disable_hw_scan) {
- D_INFO("Disabling hw_scan\n");
-- il3945_mac_ops.hw_scan = NULL;
-+ pax_open_kernel();
-+ *(void **)&il3945_mac_ops.hw_scan = NULL;
-+ pax_close_kernel();
- }
-
- D_INFO("*** LOAD DRIVER ***\n");
-diff -Naur backports-3.18.1-1.org/drivers/net/wireless/iwlwifi/dvm/debugfs.c backports-3.18.1-1/drivers/net/wireless/iwlwifi/dvm/debugfs.c
---- backports-3.18.1-1.org/drivers/net/wireless/iwlwifi/dvm/debugfs.c 2014-12-21 22:37:14.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/wireless/iwlwifi/dvm/debugfs.c 2014-12-28 14:10:09.564888946 +0100
-@@ -188,7 +188,7 @@
- {
- struct iwl_priv *priv = file->private_data;
- char buf[64];
-- int buf_size;
-+ size_t buf_size;
- u32 offset, len;
-
- memset(buf, 0, sizeof(buf));
-@@ -458,7 +458,7 @@
- struct iwl_priv *priv = file->private_data;
-
- char buf[8];
-- int buf_size;
-+ size_t buf_size;
- u32 reset_flag;
-
- memset(buf, 0, sizeof(buf));
-@@ -539,7 +539,7 @@
- {
- struct iwl_priv *priv = file->private_data;
- char buf[8];
-- int buf_size;
-+ size_t buf_size;
- int ht40;
-
- memset(buf, 0, sizeof(buf));
-@@ -591,7 +591,7 @@
- {
- struct iwl_priv *priv = file->private_data;
- char buf[8];
-- int buf_size;
-+ size_t buf_size;
- int value;
-
- memset(buf, 0, sizeof(buf));
-@@ -683,10 +683,10 @@
- DEBUGFS_READ_WRITE_FILE_OPS(sleep_level_override);
- DEBUGFS_READ_FILE_OPS(current_sleep_command);
-
--static const char *fmt_value = " %-30s %10u\n";
--static const char *fmt_hex = " %-30s 0x%02X\n";
--static const char *fmt_table = " %-30s %10u %10u %10u %10u\n";
--static const char *fmt_header =
-+static const char fmt_value[] = " %-30s %10u\n";
-+static const char fmt_hex[] = " %-30s 0x%02X\n";
-+static const char fmt_table[] = " %-30s %10u %10u %10u %10u\n";
-+static const char fmt_header[] =
- "%-32s current cumulative delta max\n";
-
- static int iwl_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)
-@@ -1856,7 +1856,7 @@
- {
- struct iwl_priv *priv = file->private_data;
- char buf[8];
-- int buf_size;
-+ size_t buf_size;
- int clear;
-
- memset(buf, 0, sizeof(buf));
-@@ -1901,7 +1901,7 @@
- {
- struct iwl_priv *priv = file->private_data;
- char buf[8];
-- int buf_size;
-+ size_t buf_size;
- int trace;
-
- memset(buf, 0, sizeof(buf));
-@@ -1972,7 +1972,7 @@
- {
- struct iwl_priv *priv = file->private_data;
- char buf[8];
-- int buf_size;
-+ size_t buf_size;
- int missed;
-
- memset(buf, 0, sizeof(buf));
-@@ -2013,7 +2013,7 @@
-
- struct iwl_priv *priv = file->private_data;
- char buf[8];
-- int buf_size;
-+ size_t buf_size;
- int plcp;
-
- memset(buf, 0, sizeof(buf));
-@@ -2073,7 +2073,7 @@
-
- struct iwl_priv *priv = file->private_data;
- char buf[8];
-- int buf_size;
-+ size_t buf_size;
- int flush;
-
- memset(buf, 0, sizeof(buf));
-@@ -2163,7 +2163,7 @@
-
- struct iwl_priv *priv = file->private_data;
- char buf[8];
-- int buf_size;
-+ size_t buf_size;
- int rts;
-
- if (!priv->cfg->ht_params)
-@@ -2204,7 +2204,7 @@
- {
- struct iwl_priv *priv = file->private_data;
- char buf[8];
-- int buf_size;
-+ size_t buf_size;
-
- memset(buf, 0, sizeof(buf));
- buf_size = min(count, sizeof(buf) - 1);
-@@ -2238,7 +2238,7 @@
- struct iwl_priv *priv = file->private_data;
- u32 event_log_flag;
- char buf[8];
-- int buf_size;
-+ size_t buf_size;
-
- /* check that the interface is up */
- if (!iwl_is_ready(priv))
-@@ -2292,7 +2292,7 @@
- struct iwl_priv *priv = file->private_data;
- char buf[8];
- u32 calib_disabled;
-- int buf_size;
-+ size_t buf_size;
-
- memset(buf, 0, sizeof(buf));
- buf_size = min(count, sizeof(buf) - 1);
-diff -Naur backports-3.18.1-1.org/drivers/net/wireless/iwlwifi/pcie/trans.c backports-3.18.1-1/drivers/net/wireless/iwlwifi/pcie/trans.c
---- backports-3.18.1-1.org/drivers/net/wireless/iwlwifi/pcie/trans.c 2014-12-21 22:37:14.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/wireless/iwlwifi/pcie/trans.c 2014-12-28 14:10:09.564888946 +0100
-@@ -1689,7 +1689,7 @@
- struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
-
- char buf[8];
-- int buf_size;
-+ size_t buf_size;
- u32 reset_flag;
-
- memset(buf, 0, sizeof(buf));
-@@ -1710,7 +1710,7 @@
- {
- struct iwl_trans *trans = file->private_data;
- char buf[8];
-- int buf_size;
-+ size_t buf_size;
- int csr;
-
- memset(buf, 0, sizeof(buf));
-diff -Naur backports-3.18.1-1.org/drivers/net/wireless/mac80211_hwsim.c backports-3.18.1-1/drivers/net/wireless/mac80211_hwsim.c
---- backports-3.18.1-1.org/drivers/net/wireless/mac80211_hwsim.c 2014-12-21 22:37:14.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/wireless/mac80211_hwsim.c 2014-12-28 14:10:09.568888967 +0100
-@@ -2578,20 +2578,20 @@
- if (channels < 1)
- return -EINVAL;
-
-- mac80211_hwsim_mchan_ops = mac80211_hwsim_ops;
-- mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
-- mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
-- mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
-- mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
-- mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
-- mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
-- mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
-- mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
-- mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
-- mac80211_hwsim_mchan_ops.assign_vif_chanctx =
-- mac80211_hwsim_assign_vif_chanctx;
-- mac80211_hwsim_mchan_ops.unassign_vif_chanctx =
-- mac80211_hwsim_unassign_vif_chanctx;
-+ pax_open_kernel();
-+ memcpy((void *)&mac80211_hwsim_mchan_ops, &mac80211_hwsim_ops, sizeof mac80211_hwsim_mchan_ops);
-+ *(void **)&mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
-+ *(void **)&mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
-+ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
-+ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
-+ *(void **)&mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
-+ *(void **)&mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
-+ *(void **)&mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
-+ *(void **)&mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
-+ *(void **)&mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
-+ *(void **)&mac80211_hwsim_mchan_ops.assign_vif_chanctx = mac80211_hwsim_assign_vif_chanctx;
-+ *(void **)&mac80211_hwsim_mchan_ops.unassign_vif_chanctx = mac80211_hwsim_unassign_vif_chanctx;
-+ pax_close_kernel();
-
- spin_lock_init(&hwsim_radio_lock);
- INIT_LIST_HEAD(&hwsim_radios);
-diff -Naur backports-3.18.1-1.org/drivers/net/wireless/rndis_wlan.c backports-3.18.1-1/drivers/net/wireless/rndis_wlan.c
---- backports-3.18.1-1.org/drivers/net/wireless/rndis_wlan.c 2014-12-21 22:37:14.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/wireless/rndis_wlan.c 2014-12-28 14:10:09.568888967 +0100
-@@ -1236,7 +1236,7 @@
-
- netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
-
-- if (rts_threshold < 0 || rts_threshold > 2347)
-+ if (rts_threshold > 2347)
- rts_threshold = 2347;
-
- tmp = cpu_to_le32(rts_threshold);
-diff -Naur backports-3.18.1-1.org/drivers/net/wireless/rt2x00/rt2x00.h backports-3.18.1-1/drivers/net/wireless/rt2x00/rt2x00.h
---- backports-3.18.1-1.org/drivers/net/wireless/rt2x00/rt2x00.h 2014-12-21 22:37:14.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/wireless/rt2x00/rt2x00.h 2014-12-28 14:10:09.568888967 +0100
-@@ -375,7 +375,7 @@
- * for hardware which doesn't support hardware
- * sequence counting.
- */
-- atomic_t seqno;
-+ atomic_unchecked_t seqno;
- };
-
- static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
-diff -Naur backports-3.18.1-1.org/drivers/net/wireless/rt2x00/rt2x00queue.c backports-3.18.1-1/drivers/net/wireless/rt2x00/rt2x00queue.c
---- backports-3.18.1-1.org/drivers/net/wireless/rt2x00/rt2x00queue.c 2014-12-21 22:37:14.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/wireless/rt2x00/rt2x00queue.c 2014-12-28 14:10:09.568888967 +0100
-@@ -224,9 +224,9 @@
- * sequence counter given by mac80211.
- */
- if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags))
-- seqno = atomic_add_return(0x10, &intf->seqno);
-+ seqno = atomic_add_return_unchecked(0x10, &intf->seqno);
- else
-- seqno = atomic_read(&intf->seqno);
-+ seqno = atomic_read_unchecked(&intf->seqno);
-
- hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
- hdr->seq_ctrl |= cpu_to_le16(seqno);
-diff -Naur backports-3.18.1-1.org/drivers/net/wireless/ti/wl1251/sdio.c backports-3.18.1-1/drivers/net/wireless/ti/wl1251/sdio.c
---- backports-3.18.1-1.org/drivers/net/wireless/ti/wl1251/sdio.c 2014-12-21 22:37:14.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/wireless/ti/wl1251/sdio.c 2014-12-28 14:10:09.568888967 +0100
-@@ -282,13 +282,17 @@
-
- irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
-
-- wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
-- wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
-+ pax_open_kernel();
-+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
-+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
-+ pax_close_kernel();
-
- wl1251_info("using dedicated interrupt line");
- } else {
-- wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
-- wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
-+ pax_open_kernel();
-+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
-+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
-+ pax_close_kernel();
-
- wl1251_info("using SDIO interrupt");
- }
-diff -Naur backports-3.18.1-1.org/drivers/net/wireless/ti/wl12xx/main.c backports-3.18.1-1/drivers/net/wireless/ti/wl12xx/main.c
---- backports-3.18.1-1.org/drivers/net/wireless/ti/wl12xx/main.c 2014-12-21 22:37:14.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/wireless/ti/wl12xx/main.c 2014-12-28 14:10:09.568888967 +0100
-@@ -656,7 +656,9 @@
- sizeof(wl->conf.mem));
-
- /* read data preparation is only needed by wl127x */
-- wl->ops->prepare_read = wl127x_prepare_read;
-+ pax_open_kernel();
-+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
-+ pax_close_kernel();
-
- wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
- WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
-@@ -681,7 +683,9 @@
- sizeof(wl->conf.mem));
-
- /* read data preparation is only needed by wl127x */
-- wl->ops->prepare_read = wl127x_prepare_read;
-+ pax_open_kernel();
-+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
-+ pax_close_kernel();
-
- wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
- WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
-diff -Naur backports-3.18.1-1.org/drivers/net/wireless/ti/wl18xx/main.c backports-3.18.1-1/drivers/net/wireless/ti/wl18xx/main.c
---- backports-3.18.1-1.org/drivers/net/wireless/ti/wl18xx/main.c 2014-12-21 22:37:14.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/wireless/ti/wl18xx/main.c 2014-12-28 14:10:09.568888967 +0100
-@@ -1916,8 +1916,10 @@
- }
-
- if (!checksum_param) {
-- wl18xx_ops.set_rx_csum = NULL;
-- wl18xx_ops.init_vif = NULL;
-+ pax_open_kernel();
-+ *(void **)&wl18xx_ops.set_rx_csum = NULL;
-+ *(void **)&wl18xx_ops.init_vif = NULL;
-+ pax_close_kernel();
- }
-
- /* Enable 11a Band only if we have 5G antennas */
-diff -Naur backports-3.18.1-1.org/drivers/net/wireless/zd1211rw/zd_usb.c backports-3.18.1-1/drivers/net/wireless/zd1211rw/zd_usb.c
---- backports-3.18.1-1.org/drivers/net/wireless/zd1211rw/zd_usb.c 2014-12-21 22:37:14.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/wireless/zd1211rw/zd_usb.c 2014-12-28 14:10:09.568888967 +0100
-@@ -385,7 +385,7 @@
- {
- struct zd_usb *usb = urb->context;
- struct zd_usb_interrupt *intr = &usb->intr;
-- int len;
-+ unsigned int len;
- u16 int_num;
-
- ZD_ASSERT(in_interrupt());
-diff -Naur backports-3.18.1-1.org/drivers/nfc/nfcwilink.c backports-3.18.1-1/drivers/nfc/nfcwilink.c
---- backports-3.18.1-1.org/drivers/nfc/nfcwilink.c 2014-12-21 22:37:14.000000000 +0100
-+++ backports-3.18.1-1/drivers/nfc/nfcwilink.c 2014-12-28 14:10:09.568888967 +0100
-@@ -497,7 +497,7 @@
-
- static int nfcwilink_probe(struct platform_device *pdev)
- {
-- static struct nfcwilink *drv;
-+ struct nfcwilink *drv;
- int rc;
- __u32 protocols;
-
-diff -Naur backports-3.18.1-1.org/include/linux/gracl_compat.h backports-3.18.1-1/include/linux/gracl_compat.h
---- backports-3.18.1-1.org/include/linux/gracl_compat.h 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/include/linux/gracl_compat.h 2014-12-28 14:10:09.684889542 +0100
-@@ -0,0 +1,156 @@
-+#ifndef GR_ACL_COMPAT_H
-+#define GR_ACL_COMPAT_H
-+
-+#include <linux/resource.h>
-+#include <asm/resource.h>
-+
-+struct sprole_pw_compat {
-+ compat_uptr_t rolename;
-+ unsigned char salt[GR_SALT_LEN];
-+ unsigned char sum[GR_SHA_LEN];
-+};
-+
-+struct gr_hash_struct_compat {
-+ compat_uptr_t table;
-+ compat_uptr_t nametable;
-+ compat_uptr_t first;
-+ __u32 table_size;
-+ __u32 used_size;
-+ int type;
-+};
-+
-+struct acl_subject_label_compat {
-+ compat_uptr_t filename;
-+ compat_ino_t inode;
-+ __u32 device;
-+ __u32 mode;
-+ kernel_cap_t cap_mask;
-+ kernel_cap_t cap_lower;
-+ kernel_cap_t cap_invert_audit;
-+
-+ struct compat_rlimit res[GR_NLIMITS];
-+ __u32 resmask;
-+
-+ __u8 user_trans_type;
-+ __u8 group_trans_type;
-+ compat_uptr_t user_transitions;
-+ compat_uptr_t group_transitions;
-+ __u16 user_trans_num;
-+ __u16 group_trans_num;
-+
-+ __u32 sock_families[2];
-+ __u32 ip_proto[8];
-+ __u32 ip_type;
-+ compat_uptr_t ips;
-+ __u32 ip_num;
-+ __u32 inaddr_any_override;
-+
-+ __u32 crashes;
-+ compat_ulong_t expires;
-+
-+ compat_uptr_t parent_subject;
-+ compat_uptr_t hash;
-+ compat_uptr_t prev;
-+ compat_uptr_t next;
-+
-+ compat_uptr_t obj_hash;
-+ __u32 obj_hash_size;
-+ __u16 pax_flags;
-+};
-+
-+struct role_allowed_ip_compat {
-+ __u32 addr;
-+ __u32 netmask;
-+
-+ compat_uptr_t prev;
-+ compat_uptr_t next;
-+};
-+
-+struct role_transition_compat {
-+ compat_uptr_t rolename;
-+
-+ compat_uptr_t prev;
-+ compat_uptr_t next;
-+};
-+
-+struct acl_role_label_compat {
-+ compat_uptr_t rolename;
-+ uid_t uidgid;
-+ __u16 roletype;
-+
-+ __u16 auth_attempts;
-+ compat_ulong_t expires;
-+
-+ compat_uptr_t root_label;
-+ compat_uptr_t hash;
-+
-+ compat_uptr_t prev;
-+ compat_uptr_t next;
-+
-+ compat_uptr_t transitions;
-+ compat_uptr_t allowed_ips;
-+ compat_uptr_t domain_children;
-+ __u16 domain_child_num;
-+
-+ umode_t umask;
-+
-+ compat_uptr_t subj_hash;
-+ __u32 subj_hash_size;
-+};
-+
-+struct user_acl_role_db_compat {
-+ compat_uptr_t r_table;
-+ __u32 num_pointers;
-+ __u32 num_roles;
-+ __u32 num_domain_children;
-+ __u32 num_subjects;
-+ __u32 num_objects;
-+};
-+
-+struct acl_object_label_compat {
-+ compat_uptr_t filename;
-+ compat_ino_t inode;
-+ __u32 device;
-+ __u32 mode;
-+
-+ compat_uptr_t nested;
-+ compat_uptr_t globbed;
-+
-+ compat_uptr_t prev;
-+ compat_uptr_t next;
-+};
-+
-+struct acl_ip_label_compat {
-+ compat_uptr_t iface;
-+ __u32 addr;
-+ __u32 netmask;
-+ __u16 low, high;
-+ __u8 mode;
-+ __u32 type;
-+ __u32 proto[8];
-+
-+ compat_uptr_t prev;
-+ compat_uptr_t next;
-+};
-+
-+struct gr_arg_compat {
-+ struct user_acl_role_db_compat role_db;
-+ unsigned char pw[GR_PW_LEN];
-+ unsigned char salt[GR_SALT_LEN];
-+ unsigned char sum[GR_SHA_LEN];
-+ unsigned char sp_role[GR_SPROLE_LEN];
-+ compat_uptr_t sprole_pws;
-+ __u32 segv_device;
-+ compat_ino_t segv_inode;
-+ uid_t segv_uid;
-+ __u16 num_sprole_pws;
-+ __u16 mode;
-+};
-+
-+struct gr_arg_wrapper_compat {
-+ compat_uptr_t arg;
-+ __u32 version;
-+ __u32 size;
-+};
-+
-+#endif
-diff -Naur backports-3.18.1-1.org/include/linux/gracl.h backports-3.18.1-1/include/linux/gracl.h
---- backports-3.18.1-1.org/include/linux/gracl.h 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/include/linux/gracl.h 2014-12-28 14:10:09.684889542 +0100
-@@ -0,0 +1,340 @@
-+#ifndef GR_ACL_H
-+#define GR_ACL_H
-+
-+#include <linux/grdefs.h>
-+#include <linux/resource.h>
-+#include <linux/capability.h>
-+#include <linux/dcache.h>
-+#include <asm/resource.h>
-+
-+/* Major status information */
-+
-+#define GR_VERSION "grsecurity 3.0"
-+#define GRSECURITY_VERSION 0x3000
-+
-+enum {
-+ GR_SHUTDOWN = 0,
-+ GR_ENABLE = 1,
-+ GR_SPROLE = 2,
-+ GR_OLDRELOAD = 3,
-+ GR_SEGVMOD = 4,
-+ GR_STATUS = 5,
-+ GR_UNSPROLE = 6,
-+ GR_PASSSET = 7,
-+ GR_SPROLEPAM = 8,
-+ GR_RELOAD = 9,
-+};
-+
-+/* Password setup definitions
-+ * kernel/grhash.c */
-+enum {
-+ GR_PW_LEN = 128,
-+ GR_SALT_LEN = 16,
-+ GR_SHA_LEN = 32,
-+};
-+
-+enum {
-+ GR_SPROLE_LEN = 64,
-+};
-+
-+enum {
-+ GR_NO_GLOB = 0,
-+ GR_REG_GLOB,
-+ GR_CREATE_GLOB
-+};
-+
-+#define GR_NLIMITS 32
-+
-+/* Begin Data Structures */
-+
-+struct sprole_pw {
-+ unsigned char *rolename;
-+ unsigned char salt[GR_SALT_LEN];
-+ unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
-+};
-+
-+struct name_entry {
-+ __u32 key;
-+ ino_t inode;
-+ dev_t device;
-+ char *name;
-+ __u16 len;
-+ __u8 deleted;
-+ struct name_entry *prev;
-+ struct name_entry *next;
-+};
-+
-+struct inodev_entry {
-+ struct name_entry *nentry;
-+ struct inodev_entry *prev;
-+ struct inodev_entry *next;
-+};
-+
-+struct acl_role_db {
-+ struct acl_role_label **r_hash;
-+ __u32 r_size;
-+};
-+
-+struct inodev_db {
-+ struct inodev_entry **i_hash;
-+ __u32 i_size;
-+};
-+
-+struct name_db {
-+ struct name_entry **n_hash;
-+ __u32 n_size;
-+};
-+
-+struct crash_uid {
-+ uid_t uid;
-+ unsigned long expires;
-+};
-+
-+struct gr_hash_struct {
-+ void **table;
-+ void **nametable;
-+ void *first;
-+ __u32 table_size;
-+ __u32 used_size;
-+ int type;
-+};
-+
-+/* Userspace Grsecurity ACL data structures */
-+
-+struct acl_subject_label {
-+ char *filename;
-+ ino_t inode;
-+ dev_t device;
-+ __u32 mode;
-+ kernel_cap_t cap_mask;
-+ kernel_cap_t cap_lower;
-+ kernel_cap_t cap_invert_audit;
-+
-+ struct rlimit res[GR_NLIMITS];
-+ __u32 resmask;
-+
-+ __u8 user_trans_type;
-+ __u8 group_trans_type;
-+ uid_t *user_transitions;
-+ gid_t *group_transitions;
-+ __u16 user_trans_num;
-+ __u16 group_trans_num;
-+
-+ __u32 sock_families[2];
-+ __u32 ip_proto[8];
-+ __u32 ip_type;
-+ struct acl_ip_label **ips;
-+ __u32 ip_num;
-+ __u32 inaddr_any_override;
-+
-+ __u32 crashes;
-+ unsigned long expires;
-+
-+ struct acl_subject_label *parent_subject;
-+ struct gr_hash_struct *hash;
-+ struct acl_subject_label *prev;
-+ struct acl_subject_label *next;
-+
-+ struct acl_object_label **obj_hash;
-+ __u32 obj_hash_size;
-+ __u16 pax_flags;
-+};
-+
-+struct role_allowed_ip {
-+ __u32 addr;
-+ __u32 netmask;
-+
-+ struct role_allowed_ip *prev;
-+ struct role_allowed_ip *next;
-+};
-+
-+struct role_transition {
-+ char *rolename;
-+
-+ struct role_transition *prev;
-+ struct role_transition *next;
-+};
-+
-+struct acl_role_label {
-+ char *rolename;
-+ uid_t uidgid;
-+ __u16 roletype;
-+
-+ __u16 auth_attempts;
-+ unsigned long expires;
-+
-+ struct acl_subject_label *root_label;
-+ struct gr_hash_struct *hash;
-+
-+ struct acl_role_label *prev;
-+ struct acl_role_label *next;
-+
-+ struct role_transition *transitions;
-+ struct role_allowed_ip *allowed_ips;
-+ uid_t *domain_children;
-+ __u16 domain_child_num;
-+
-+ umode_t umask;
-+
-+ struct acl_subject_label **subj_hash;
-+ __u32 subj_hash_size;
-+};
-+
-+struct user_acl_role_db {
-+ struct acl_role_label **r_table;
-+ __u32 num_pointers; /* Number of allocations to track */
-+ __u32 num_roles; /* Number of roles */
-+ __u32 num_domain_children; /* Number of domain children */
-+ __u32 num_subjects; /* Number of subjects */
-+ __u32 num_objects; /* Number of objects */
-+};
-+
-+struct acl_object_label {
-+ char *filename;
-+ ino_t inode;
-+ dev_t device;
-+ __u32 mode;
-+
-+ struct acl_subject_label *nested;
-+ struct acl_object_label *globbed;
-+
-+ /* next two structures not used */
-+
-+ struct acl_object_label *prev;
-+ struct acl_object_label *next;
-+};
-+
-+struct acl_ip_label {
-+ char *iface;
-+ __u32 addr;
-+ __u32 netmask;
-+ __u16 low, high;
-+ __u8 mode;
-+ __u32 type;
-+ __u32 proto[8];
-+
-+ /* next two structures not used */
-+
-+ struct acl_ip_label *prev;
-+ struct acl_ip_label *next;
-+};
-+
-+struct gr_arg {
-+ struct user_acl_role_db role_db;
-+ unsigned char pw[GR_PW_LEN];
-+ unsigned char salt[GR_SALT_LEN];
-+ unsigned char sum[GR_SHA_LEN];
-+ unsigned char sp_role[GR_SPROLE_LEN];
-+ struct sprole_pw *sprole_pws;
-+ dev_t segv_device;
-+ ino_t segv_inode;
-+ uid_t segv_uid;
-+ __u16 num_sprole_pws;
-+ __u16 mode;
-+};
-+
-+struct gr_arg_wrapper {
-+ struct gr_arg *arg;
-+ __u32 version;
-+ __u32 size;
-+};
-+
-+struct subject_map {
-+ struct acl_subject_label *user;
-+ struct acl_subject_label *kernel;
-+ struct subject_map *prev;
-+ struct subject_map *next;
-+};
-+
-+struct acl_subj_map_db {
-+ struct subject_map **s_hash;
-+ __u32 s_size;
-+};
-+
-+struct gr_policy_state {
-+ struct sprole_pw **acl_special_roles;
-+ __u16 num_sprole_pws;
-+ struct acl_role_label *kernel_role;
-+ struct acl_role_label *role_list;
-+ struct acl_role_label *default_role;
-+ struct acl_role_db acl_role_set;
-+ struct acl_subj_map_db subj_map_set;
-+ struct name_db name_set;
-+ struct inodev_db inodev_set;
-+};
-+
-+struct gr_alloc_state {
-+ unsigned long alloc_stack_next;
-+ unsigned long alloc_stack_size;
-+ void **alloc_stack;
-+};
-+
-+struct gr_reload_state {
-+ struct gr_policy_state oldpolicy;
-+ struct gr_alloc_state oldalloc;
-+ struct gr_policy_state newpolicy;
-+ struct gr_alloc_state newalloc;
-+ struct gr_policy_state *oldpolicy_ptr;
-+ struct gr_alloc_state *oldalloc_ptr;
-+ unsigned char oldmode;
-+};
-+
-+/* End Data Structures Section */
-+
-+/* Hash functions generated by empirical testing by Brad Spengler
-+ Makes good use of the low bits of the inode. Generally 0-1 times
-+ in loop for successful match. 0-3 for unsuccessful match.
-+ Shift/add algorithm with modulus of table size and an XOR*/
-+
-+static __inline__ unsigned int
-+gr_rhash(const uid_t uid, const __u16 type, const unsigned int sz)
-+{
-+ return ((((uid + type) << (16 + type)) ^ uid) % sz);
-+}
-+
-+ static __inline__ unsigned int
-+gr_shash(const struct acl_subject_label *userp, const unsigned int sz)
-+{
-+ return ((const unsigned long)userp % sz);
-+}
-+
-+static __inline__ unsigned int
-+gr_fhash(const ino_t ino, const dev_t dev, const unsigned int sz)
-+{
-+ return (((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9))) % sz);
-+}
-+
-+static __inline__ unsigned int
-+gr_nhash(const char *name, const __u16 len, const unsigned int sz)
-+{
-+ return full_name_hash((const unsigned char *)name, len) % sz;
-+}
-+
-+#define FOR_EACH_SUBJECT_START(role,subj,iter) \
-+ subj = NULL; \
-+ iter = 0; \
-+ while (iter < role->subj_hash_size) { \
-+ if (subj == NULL) \
-+ subj = role->subj_hash[iter]; \
-+ if (subj == NULL) { \
-+ iter++; \
-+ continue; \
-+ }
-+
-+#define FOR_EACH_SUBJECT_END(subj,iter) \
-+ subj = subj->next; \
-+ if (subj == NULL) \
-+ iter++; \
-+ }
-+
-+
-+#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
-+ subj = role->hash->first; \
-+ while (subj != NULL) {
-+
-+#define FOR_EACH_NESTED_SUBJECT_END(subj) \
-+ subj = subj->next; \
-+ }
-+
-+#endif
-+
-diff -Naur backports-3.18.1-1.org/include/linux/gralloc.h backports-3.18.1-1/include/linux/gralloc.h
---- backports-3.18.1-1.org/include/linux/gralloc.h 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/include/linux/gralloc.h 2014-12-28 14:10:09.684889542 +0100
-@@ -0,0 +1,9 @@
-+#ifndef __GRALLOC_H
-+#define __GRALLOC_H
-+
-+void acl_free_all(void);
-+int acl_alloc_stack_init(unsigned long size);
-+void *acl_alloc(unsigned long len);
-+void *acl_alloc_num(unsigned long num, unsigned long len);
-+
-+#endif
-diff -Naur backports-3.18.1-1.org/include/linux/grdefs.h backports-3.18.1-1/include/linux/grdefs.h
---- backports-3.18.1-1.org/include/linux/grdefs.h 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/include/linux/grdefs.h 2014-12-28 14:10:09.688889562 +0100
-@@ -0,0 +1,140 @@
-+#ifndef GRDEFS_H
-+#define GRDEFS_H
-+
-+/* Begin grsecurity status declarations */
-+
-+enum {
-+ GR_READY = 0x01,
-+ GR_STATUS_INIT = 0x00 // disabled state
-+};
-+
-+/* Begin ACL declarations */
-+
-+/* Role flags */
-+
-+enum {
-+ GR_ROLE_USER = 0x0001,
-+ GR_ROLE_GROUP = 0x0002,
-+ GR_ROLE_DEFAULT = 0x0004,
-+ GR_ROLE_SPECIAL = 0x0008,
-+ GR_ROLE_AUTH = 0x0010,
-+ GR_ROLE_NOPW = 0x0020,
-+ GR_ROLE_GOD = 0x0040,
-+ GR_ROLE_LEARN = 0x0080,
-+ GR_ROLE_TPE = 0x0100,
-+ GR_ROLE_DOMAIN = 0x0200,
-+ GR_ROLE_PAM = 0x0400,
-+ GR_ROLE_PERSIST = 0x0800
-+};
-+
-+/* ACL Subject and Object mode flags */
-+enum {
-+ GR_DELETED = 0x80000000
-+};
-+
-+/* ACL Object-only mode flags */
-+enum {
-+ GR_READ = 0x00000001,
-+ GR_APPEND = 0x00000002,
-+ GR_WRITE = 0x00000004,
-+ GR_EXEC = 0x00000008,
-+ GR_FIND = 0x00000010,
-+ GR_INHERIT = 0x00000020,
-+ GR_SETID = 0x00000040,
-+ GR_CREATE = 0x00000080,
-+ GR_DELETE = 0x00000100,
-+ GR_LINK = 0x00000200,
-+ GR_AUDIT_READ = 0x00000400,
-+ GR_AUDIT_APPEND = 0x00000800,
-+ GR_AUDIT_WRITE = 0x00001000,
-+ GR_AUDIT_EXEC = 0x00002000,
-+ GR_AUDIT_FIND = 0x00004000,
-+ GR_AUDIT_INHERIT= 0x00008000,
-+ GR_AUDIT_SETID = 0x00010000,
-+ GR_AUDIT_CREATE = 0x00020000,
-+ GR_AUDIT_DELETE = 0x00040000,
-+ GR_AUDIT_LINK = 0x00080000,
-+ GR_PTRACERD = 0x00100000,
-+ GR_NOPTRACE = 0x00200000,
-+ GR_SUPPRESS = 0x00400000,
-+ GR_NOLEARN = 0x00800000,
-+ GR_INIT_TRANSFER= 0x01000000
-+};
-+
-+#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
-+ GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
-+ GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
-+
-+/* ACL subject-only mode flags */
-+enum {
-+ GR_KILL = 0x00000001,
-+ GR_VIEW = 0x00000002,
-+ GR_PROTECTED = 0x00000004,
-+ GR_LEARN = 0x00000008,
-+ GR_OVERRIDE = 0x00000010,
-+ /* just a placeholder, this mode is only used in userspace */
-+ GR_DUMMY = 0x00000020,
-+ GR_PROTSHM = 0x00000040,
-+ GR_KILLPROC = 0x00000080,
-+ GR_KILLIPPROC = 0x00000100,
-+ /* just a placeholder, this mode is only used in userspace */
-+ GR_NOTROJAN = 0x00000200,
-+ GR_PROTPROCFD = 0x00000400,
-+ GR_PROCACCT = 0x00000800,
-+ GR_RELAXPTRACE = 0x00001000,
-+ //GR_NESTED = 0x00002000,
-+ GR_INHERITLEARN = 0x00004000,
-+ GR_PROCFIND = 0x00008000,
-+ GR_POVERRIDE = 0x00010000,
-+ GR_KERNELAUTH = 0x00020000,
-+ GR_ATSECURE = 0x00040000,
-+ GR_SHMEXEC = 0x00080000
-+};
-+
-+enum {
-+ GR_PAX_ENABLE_SEGMEXEC = 0x0001,
-+ GR_PAX_ENABLE_PAGEEXEC = 0x0002,
-+ GR_PAX_ENABLE_MPROTECT = 0x0004,
-+ GR_PAX_ENABLE_RANDMMAP = 0x0008,
-+ GR_PAX_ENABLE_EMUTRAMP = 0x0010,
-+ GR_PAX_DISABLE_SEGMEXEC = 0x0100,
-+ GR_PAX_DISABLE_PAGEEXEC = 0x0200,
-+ GR_PAX_DISABLE_MPROTECT = 0x0400,
-+ GR_PAX_DISABLE_RANDMMAP = 0x0800,
-+ GR_PAX_DISABLE_EMUTRAMP = 0x1000,
-+};
-+
-+enum {
-+ GR_ID_USER = 0x01,
-+ GR_ID_GROUP = 0x02,
-+};
-+
-+enum {
-+ GR_ID_ALLOW = 0x01,
-+ GR_ID_DENY = 0x02,
-+};
-+
-+#define GR_CRASH_RES 31
-+#define GR_UIDTABLE_MAX 500
-+
-+/* begin resource learning section */
-+enum {
-+ GR_RLIM_CPU_BUMP = 60,
-+ GR_RLIM_FSIZE_BUMP = 50000,
-+ GR_RLIM_DATA_BUMP = 10000,
-+ GR_RLIM_STACK_BUMP = 1000,
-+ GR_RLIM_CORE_BUMP = 10000,
-+ GR_RLIM_RSS_BUMP = 500000,
-+ GR_RLIM_NPROC_BUMP = 1,
-+ GR_RLIM_NOFILE_BUMP = 5,
-+ GR_RLIM_MEMLOCK_BUMP = 50000,
-+ GR_RLIM_AS_BUMP = 500000,
-+ GR_RLIM_LOCKS_BUMP = 2,
-+ GR_RLIM_SIGPENDING_BUMP = 5,
-+ GR_RLIM_MSGQUEUE_BUMP = 10000,
-+ GR_RLIM_NICE_BUMP = 1,
-+ GR_RLIM_RTPRIO_BUMP = 1,
-+ GR_RLIM_RTTIME_BUMP = 1000000
-+};
-+
-+#endif
-diff -Naur backports-3.18.1-1.org/include/linux/grinternal.h backports-3.18.1-1/include/linux/grinternal.h
---- backports-3.18.1-1.org/include/linux/grinternal.h 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/include/linux/grinternal.h 2014-12-28 14:10:09.688889562 +0100
-@@ -0,0 +1,229 @@
-+#ifndef __GRINTERNAL_H
-+#define __GRINTERNAL_H
-+
-+#ifdef CONFIG_GRKERNSEC
-+
-+#include <linux/fs.h>
-+#include <linux/mnt_namespace.h>
-+#include <linux/nsproxy.h>
-+#include <linux/gracl.h>
-+#include <linux/grdefs.h>
-+#include <linux/grmsg.h>
-+
-+void gr_add_learn_entry(const char *fmt, ...)
-+ __attribute__ ((format (printf, 1, 2)));
-+__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
-+ const struct vfsmount *mnt);
-+__u32 gr_check_create(const struct dentry *new_dentry,
-+ const struct dentry *parent,
-+ const struct vfsmount *mnt, const __u32 mode);
-+int gr_check_protected_task(const struct task_struct *task);
-+__u32 to_gr_audit(const __u32 reqmode);
-+int gr_set_acls(const int type);
-+int gr_acl_is_enabled(void);
-+char gr_roletype_to_char(void);
-+
-+void gr_handle_alertkill(struct task_struct *task);
-+char *gr_to_filename(const struct dentry *dentry,
-+ const struct vfsmount *mnt);
-+char *gr_to_filename1(const struct dentry *dentry,
-+ const struct vfsmount *mnt);
-+char *gr_to_filename2(const struct dentry *dentry,
-+ const struct vfsmount *mnt);
-+char *gr_to_filename3(const struct dentry *dentry,
-+ const struct vfsmount *mnt);
-+
-+extern int grsec_enable_ptrace_readexec;
-+extern int grsec_enable_harden_ptrace;
-+extern int grsec_enable_link;
-+extern int grsec_enable_fifo;
-+extern int grsec_enable_execve;
-+extern int grsec_enable_shm;
-+extern int grsec_enable_execlog;
-+extern int grsec_enable_signal;
-+extern int grsec_enable_audit_ptrace;
-+extern int grsec_enable_forkfail;
-+extern int grsec_enable_time;
-+extern int grsec_enable_rofs;
-+extern int grsec_deny_new_usb;
-+extern int grsec_enable_chroot_shmat;
-+extern int grsec_enable_chroot_mount;
-+extern int grsec_enable_chroot_double;
-+extern int grsec_enable_chroot_pivot;
-+extern int grsec_enable_chroot_chdir;
-+extern int grsec_enable_chroot_chmod;
-+extern int grsec_enable_chroot_mknod;
-+extern int grsec_enable_chroot_fchdir;
-+extern int grsec_enable_chroot_nice;
-+extern int grsec_enable_chroot_execlog;
-+extern int grsec_enable_chroot_caps;
-+extern int grsec_enable_chroot_sysctl;
-+extern int grsec_enable_chroot_unix;
-+extern int grsec_enable_symlinkown;
-+extern kgid_t grsec_symlinkown_gid;
-+extern int grsec_enable_tpe;
-+extern kgid_t grsec_tpe_gid;
-+extern int grsec_enable_tpe_all;
-+extern int grsec_enable_tpe_invert;
-+extern int grsec_enable_socket_all;
-+extern kgid_t grsec_socket_all_gid;
-+extern int grsec_enable_socket_client;
-+extern kgid_t grsec_socket_client_gid;
-+extern int grsec_enable_socket_server;
-+extern kgid_t grsec_socket_server_gid;
-+extern kgid_t grsec_audit_gid;
-+extern int grsec_enable_group;
-+extern int grsec_enable_log_rwxmaps;
-+extern int grsec_enable_mount;
-+extern int grsec_enable_chdir;
-+extern int grsec_resource_logging;
-+extern int grsec_enable_blackhole;
-+extern int grsec_lastack_retries;
-+extern int grsec_enable_brute;
-+extern int grsec_enable_harden_ipc;
-+extern int grsec_lock;
-+
-+extern spinlock_t grsec_alert_lock;
-+extern unsigned long grsec_alert_wtime;
-+extern unsigned long grsec_alert_fyet;
-+
-+extern spinlock_t grsec_audit_lock;
-+
-+extern rwlock_t grsec_exec_file_lock;
-+
-+#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
-+ gr_to_filename2((tsk)->exec_file->f_path.dentry, \
-+ (tsk)->exec_file->f_path.mnt) : "/")
-+
-+#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
-+ gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
-+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
-+
-+#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
-+ gr_to_filename((tsk)->exec_file->f_path.dentry, \
-+ (tsk)->exec_file->f_path.mnt) : "/")
-+
-+#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
-+ gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
-+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
-+
-+#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
-+
-+#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
-+
-+static inline bool gr_is_same_file(const struct file *file1, const struct file *file2)
-+{
-+ if (file1 && file2) {
-+ const struct inode *inode1 = file1->f_path.dentry->d_inode;
-+ const struct inode *inode2 = file2->f_path.dentry->d_inode;
-+ if (inode1->i_ino == inode2->i_ino && inode1->i_sb->s_dev == inode2->i_sb->s_dev)
-+ return true;
-+ }
-+
-+ return false;
-+}
-+
-+#define GR_CHROOT_CAPS {{ \
-+ CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
-+ CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
-+ CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
-+ CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
-+ CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
-+ CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
-+ CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
-+
-+#define security_learn(normal_msg,args...) \
-+({ \
-+ read_lock(&grsec_exec_file_lock); \
-+ gr_add_learn_entry(normal_msg "\n", ## args); \
-+ read_unlock(&grsec_exec_file_lock); \
-+})
-+
-+enum {
-+ GR_DO_AUDIT,
-+ GR_DONT_AUDIT,
-+ /* used for non-audit messages that we shouldn't kill the task on */
-+ GR_DONT_AUDIT_GOOD
-+};
-+
-+enum {
-+ GR_TTYSNIFF,
-+ GR_RBAC,
-+ GR_RBAC_STR,
-+ GR_STR_RBAC,
-+ GR_RBAC_MODE2,
-+ GR_RBAC_MODE3,
-+ GR_FILENAME,
-+ GR_SYSCTL_HIDDEN,
-+ GR_NOARGS,
-+ GR_ONE_INT,
-+ GR_ONE_INT_TWO_STR,
-+ GR_ONE_STR,
-+ GR_STR_INT,
-+ GR_TWO_STR_INT,
-+ GR_TWO_INT,
-+ GR_TWO_U64,
-+ GR_THREE_INT,
-+ GR_FIVE_INT_TWO_STR,
-+ GR_TWO_STR,
-+ GR_THREE_STR,
-+ GR_FOUR_STR,
-+ GR_STR_FILENAME,
-+ GR_FILENAME_STR,
-+ GR_FILENAME_TWO_INT,
-+ GR_FILENAME_TWO_INT_STR,
-+ GR_TEXTREL,
-+ GR_PTRACE,
-+ GR_RESOURCE,
-+ GR_CAP,
-+ GR_SIG,
-+ GR_SIG2,
-+ GR_CRASH1,
-+ GR_CRASH2,
-+ GR_PSACCT,
-+ GR_RWXMAP,
-+ GR_RWXMAPVMA
-+};
-+
-+#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
-+#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
-+#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
-+#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
-+#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
-+#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
-+#define gr_log_fs_rbac_mode3(audit, msg, dentry, mnt, str1, str2, str3) gr_log_varargs(audit, msg, GR_RBAC_MODE3, dentry, mnt, str1, str2, str3)
-+#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
-+#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
-+#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
-+#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
-+#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
-+#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
-+#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
-+#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
-+#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
-+#define gr_log_int5_str2(audit, msg, num1, num2, str1, str2) gr_log_varargs(audit, msg, GR_FIVE_INT_TWO_STR, num1, num2, str1, str2)
-+#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
-+#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
-+#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
-+#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
-+#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
-+#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
-+#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
-+#define gr_log_fs_int2_str(audit, msg, dentry, mnt, num1, num2, str) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT_STR, dentry, mnt, num1, num2, str)
-+#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
-+#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
-+#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
-+#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
-+#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
-+#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
-+#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
-+#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
-+#define gr_log_procacct(audit, msg, task, num1, num2, num3, num4, num5, num6, num7, num8, num9) gr_log_varargs(audit, msg, GR_PSACCT, task, num1, num2, num3, num4, num5, num6, num7, num8, num9)
-+#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
-+#define gr_log_rwxmap_vma(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAPVMA, str)
-+
-+void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
-+
-+#endif
-+
-+#endif
-diff -Naur backports-3.18.1-1.org/include/linux/grmsg.h backports-3.18.1-1/include/linux/grmsg.h
---- backports-3.18.1-1.org/include/linux/grmsg.h 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/include/linux/grmsg.h 2014-12-28 14:10:09.688889562 +0100
-@@ -0,0 +1,117 @@
-+#define DEFAULTSECMSG "%.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u, parent %.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u"
-+#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u run time:[%ud %uh %um %us] cpu time:[%ud %uh %um %us] %s with exit code %ld, parent %.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u"
-+#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
-+#define GR_STOPMOD_MSG "denied modification of module state by "
-+#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
-+#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
-+#define GR_IOPERM_MSG "denied use of ioperm() by "
-+#define GR_IOPL_MSG "denied use of iopl() by "
-+#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
-+#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
-+#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
-+#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
-+#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
-+#define GR_LEARN_AUDIT_MSG "%s\t%u\t%u\t%u\t%.4095s\t%.4095s\t%lu\t%lu\t%.4095s\t%lu\t%pI4"
-+#define GR_ID_LEARN_MSG "%s\t%u\t%u\t%u\t%.4095s\t%.4095s\t%c\t%d\t%d\t%d\t%pI4"
-+#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
-+#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
-+#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
-+#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
-+#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
-+#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
-+#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
-+#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
-+#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
-+#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
-+#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
-+#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
-+#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
-+#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
-+#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
-+#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
-+#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
-+#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
-+#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
-+#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
-+#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
-+#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
-+#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
-+#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
-+#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
-+#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
-+#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
-+#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
-+#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
-+#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
-+#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
-+#define GR_CHROOT_FHANDLE_MSG "denied use of file handles inside chroot by "
-+#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
-+#define GR_SETXATTR_ACL_MSG "%s setting extended attribute of %.950s by "
-+#define GR_REMOVEXATTR_ACL_MSG "%s removing extended attribute of %.950s by "
-+#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
-+#define GR_INITF_ACL_MSG "init_variables() failed %s by "
-+#define GR_DISABLED_ACL_MSG "Error loading %s, trying to run kernel with acls disabled. To disable acls at startup use <kernel image name> gracl=off from your boot loader"
-+#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbage by "
-+#define GR_SHUTS_ACL_MSG "shutdown auth success for "
-+#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
-+#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
-+#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
-+#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
-+#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
-+#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
-+#define GR_ENABLEF_ACL_MSG "unable to load %s for "
-+#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
-+#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
-+#define GR_RELOADF_ACL_MSG "failed reload of %s for "
-+#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
-+#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
-+#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
-+#define GR_SPROLEF_ACL_MSG "special role %s failure for "
-+#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
-+#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
-+#define GR_INVMODE_ACL_MSG "invalid mode %d by "
-+#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
-+#define GR_FAILFORK_MSG "failed fork with errno %s by "
-+#define GR_NICE_CHROOT_MSG "denied priority change by "
-+#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
-+#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
-+#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
-+#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
-+#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
-+#define GR_TIME_MSG "time set by "
-+#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
-+#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
-+#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
-+#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
-+#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
-+#define GR_BIND_MSG "denied bind() by "
-+#define GR_CONNECT_MSG "denied connect() by "
-+#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
-+#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
-+#define GR_IP_LEARN_MSG "%s\t%u\t%u\t%u\t%.4095s\t%.4095s\t%pI4\t%u\t%u\t%u\t%u\t%pI4"
-+#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
-+#define GR_CAP_ACL_MSG "use of %s denied for "
-+#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
-+#define GR_CAP_ACL_MSG2 "use of %s permitted for "
-+#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
-+#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
-+#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
-+#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
-+#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
-+#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
-+#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
-+#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
-+#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
-+#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
-+#define GR_TEXTREL_AUDIT_MSG "denied text relocation in %.950s, VMA:0x%08lx 0x%08lx by "
-+#define GR_PTGNUSTACK_MSG "denied marking stack executable as requested by PT_GNU_STACK marking in %.950s by "
-+#define GR_VM86_MSG "denied use of vm86 by "
-+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
-+#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
-+#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
-+#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
-+#define GR_SYMLINKOWNER_MSG "denied following symlink %.950s since symlink owner %u does not match target owner %u, by "
-+#define GR_BRUTE_DAEMON_MSG "bruteforce prevention initiated for the next 30 minutes or until service restarted, stalling each fork 30 seconds. Please investigate the crash report for "
-+#define GR_BRUTE_SUID_MSG "bruteforce prevention initiated due to crash of %.950s against uid %u, banning suid/sgid execs for %u minutes. Please investigate the crash report for "
-+#define GR_IPC_DENIED_MSG "denied %s of overly-permissive IPC object with creator uid %u by "
-+#define GR_MSRWRITE_MSG "denied write to CPU MSR by "
-diff -Naur backports-3.18.1-1.org/include/linux/grsecurity.h backports-3.18.1-1/include/linux/grsecurity.h
---- backports-3.18.1-1.org/include/linux/grsecurity.h 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/include/linux/grsecurity.h 2014-12-28 14:10:09.688889562 +0100
-@@ -0,0 +1,254 @@
-+#ifndef GR_SECURITY_H
-+#define GR_SECURITY_H
-+#include <linux/fs.h>
-+#include <linux/fs_struct.h>
-+#include <linux/binfmts.h>
-+#include <linux/gracl.h>
-+
-+/* notify of brain-dead configs */
-+#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
-+#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
-+#endif
-+#if defined(CONFIG_GRKERNSEC_PROC) && !defined(CONFIG_GRKERNSEC_PROC_USER) && !defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
-+#error "CONFIG_GRKERNSEC_PROC enabled, but neither CONFIG_GRKERNSEC_PROC_USER nor CONFIG_GRKERNSEC_PROC_USERGROUP enabled"
-+#endif
-+#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
-+#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
-+#endif
-+#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
-+#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
-+#endif
-+#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
-+#error "CONFIG_PAX enabled, but no PaX options are enabled."
-+#endif
-+
-+int gr_handle_new_usb(void);
-+
-+void gr_handle_brute_attach(int dumpable);
-+void gr_handle_brute_check(void);
-+void gr_handle_kernel_exploit(void);
-+
-+char gr_roletype_to_char(void);
-+
-+int gr_proc_is_restricted(void);
-+
-+int gr_acl_enable_at_secure(void);
-+
-+int gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs);
-+int gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs);
-+
-+int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap);
-+
-+void gr_del_task_from_ip_table(struct task_struct *p);
-+
-+int gr_pid_is_chrooted(struct task_struct *p);
-+int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
-+int gr_handle_chroot_nice(void);
-+int gr_handle_chroot_sysctl(const int op);
-+int gr_handle_chroot_setpriority(struct task_struct *p,
-+ const int niceval);
-+int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
-+int gr_chroot_fhandle(void);
-+int gr_handle_chroot_chroot(const struct dentry *dentry,
-+ const struct vfsmount *mnt);
-+void gr_handle_chroot_chdir(const struct path *path);
-+int gr_handle_chroot_chmod(const struct dentry *dentry,
-+ const struct vfsmount *mnt, const int mode);
-+int gr_handle_chroot_mknod(const struct dentry *dentry,
-+ const struct vfsmount *mnt, const int mode);
-+int gr_handle_chroot_mount(const struct dentry *dentry,
-+ const struct vfsmount *mnt,
-+ const char *dev_name);
-+int gr_handle_chroot_pivot(void);
-+int gr_handle_chroot_unix(const pid_t pid);
-+
-+int gr_handle_rawio(const struct inode *inode);
-+
-+void gr_handle_ioperm(void);
-+void gr_handle_iopl(void);
-+void gr_handle_msr_write(void);
-+
-+umode_t gr_acl_umask(void);
-+
-+int gr_tpe_allow(const struct file *file);
-+
-+void gr_set_chroot_entries(struct task_struct *task, const struct path *path);
-+void gr_clear_chroot_entries(struct task_struct *task);
-+
-+void gr_log_forkfail(const int retval);
-+void gr_log_timechange(void);
-+void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
-+void gr_log_chdir(const struct dentry *dentry,
-+ const struct vfsmount *mnt);
-+void gr_log_chroot_exec(const struct dentry *dentry,
-+ const struct vfsmount *mnt);
-+void gr_log_remount(const char *devname, const int retval);
-+void gr_log_unmount(const char *devname, const int retval);
-+void gr_log_mount(const char *from, const char *to, const int retval);
-+void gr_log_textrel(struct vm_area_struct *vma);
-+void gr_log_ptgnustack(struct file *file);
-+void gr_log_rwxmmap(struct file *file);
-+void gr_log_rwxmprotect(struct vm_area_struct *vma);
-+
-+int gr_handle_follow_link(const struct inode *parent,
-+ const struct inode *inode,
-+ const struct dentry *dentry,
-+ const struct vfsmount *mnt);
-+int gr_handle_fifo(const struct dentry *dentry,
-+ const struct vfsmount *mnt,
-+ const struct dentry *dir, const int flag,
-+ const int acc_mode);
-+int gr_handle_hardlink(const struct dentry *dentry,
-+ const struct vfsmount *mnt,
-+ struct inode *inode,
-+ const int mode, const struct filename *to);
-+
-+int gr_is_capable(const int cap);
-+int gr_is_capable_nolog(const int cap);
-+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
-+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap);
-+
-+void gr_copy_label(struct task_struct *tsk);
-+void gr_handle_crash(struct task_struct *task, const int sig);
-+int gr_handle_signal(const struct task_struct *p, const int sig);
-+int gr_check_crash_uid(const kuid_t uid);
-+int gr_check_protected_task(const struct task_struct *task);
-+int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
-+int gr_acl_handle_mmap(const struct file *file,
-+ const unsigned long prot);
-+int gr_acl_handle_mprotect(const struct file *file,
-+ const unsigned long prot);
-+int gr_check_hidden_task(const struct task_struct *tsk);
-+__u32 gr_acl_handle_truncate(const struct dentry *dentry,
-+ const struct vfsmount *mnt);
-+__u32 gr_acl_handle_utime(const struct dentry *dentry,
-+ const struct vfsmount *mnt);
-+__u32 gr_acl_handle_access(const struct dentry *dentry,
-+ const struct vfsmount *mnt, const int fmode);
-+__u32 gr_acl_handle_chmod(const struct dentry *dentry,
-+ const struct vfsmount *mnt, umode_t *mode);
-+__u32 gr_acl_handle_chown(const struct dentry *dentry,
-+ const struct vfsmount *mnt);
-+__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
-+ const struct vfsmount *mnt);
-+__u32 gr_acl_handle_removexattr(const struct dentry *dentry,
-+ const struct vfsmount *mnt);
-+int gr_handle_ptrace(struct task_struct *task, const long request);
-+int gr_handle_proc_ptrace(struct task_struct *task);
-+__u32 gr_acl_handle_execve(const struct dentry *dentry,
-+ const struct vfsmount *mnt);
-+int gr_check_crash_exec(const struct file *filp);
-+int gr_acl_is_enabled(void);
-+void gr_set_role_label(struct task_struct *task, const kuid_t uid,
-+ const kgid_t gid);
-+int gr_set_proc_label(const struct dentry *dentry,
-+ const struct vfsmount *mnt,
-+ const int unsafe_flags);
-+__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
-+ const struct vfsmount *mnt);
-+__u32 gr_acl_handle_open(const struct dentry *dentry,
-+ const struct vfsmount *mnt, int acc_mode);
-+__u32 gr_acl_handle_creat(const struct dentry *dentry,
-+ const struct dentry *p_dentry,
-+ const struct vfsmount *p_mnt,
-+ int open_flags, int acc_mode, const int imode);
-+void gr_handle_create(const struct dentry *dentry,
-+ const struct vfsmount *mnt);
-+void gr_handle_proc_create(const struct dentry *dentry,
-+ const struct inode *inode);
-+__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
-+ const struct dentry *parent_dentry,
-+ const struct vfsmount *parent_mnt,
-+ const int mode);
-+__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
-+ const struct dentry *parent_dentry,
-+ const struct vfsmount *parent_mnt);
-+__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
-+ const struct vfsmount *mnt);
-+void gr_handle_delete(const ino_t ino, const dev_t dev);
-+__u32 gr_acl_handle_unlink(const struct dentry *dentry,
-+ const struct vfsmount *mnt);
-+__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
-+ const struct dentry *parent_dentry,
-+ const struct vfsmount *parent_mnt,
-+ const struct filename *from);
-+__u32 gr_acl_handle_link(const struct dentry *new_dentry,
-+ const struct dentry *parent_dentry,
-+ const struct vfsmount *parent_mnt,
-+ const struct dentry *old_dentry,
-+ const struct vfsmount *old_mnt, const struct filename *to);
-+int gr_handle_symlink_owner(const struct path *link, const struct inode *target);
-+int gr_acl_handle_rename(struct dentry *new_dentry,
-+ struct dentry *parent_dentry,
-+ const struct vfsmount *parent_mnt,
-+ struct dentry *old_dentry,
-+ struct inode *old_parent_inode,
-+ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags);
-+void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
-+ struct dentry *old_dentry,
-+ struct dentry *new_dentry,
-+ struct vfsmount *mnt, const __u8 replace, unsigned int flags);
-+__u32 gr_check_link(const struct dentry *new_dentry,
-+ const struct dentry *parent_dentry,
-+ const struct vfsmount *parent_mnt,
-+ const struct dentry *old_dentry,
-+ const struct vfsmount *old_mnt);
-+int gr_acl_handle_filldir(const struct file *file, const char *name,
-+ const unsigned int namelen, const ino_t ino);
-+
-+__u32 gr_acl_handle_unix(const struct dentry *dentry,
-+ const struct vfsmount *mnt);
-+void gr_acl_handle_exit(void);
-+void gr_acl_handle_psacct(struct task_struct *task, const long code);
-+int gr_acl_handle_procpidmem(const struct task_struct *task);
-+int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
-+int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
-+void gr_audit_ptrace(struct task_struct *task);
-+dev_t gr_get_dev_from_dentry(struct dentry *dentry);
-+void gr_put_exec_file(struct task_struct *task);
-+
-+int gr_ptrace_readexec(struct file *file, int unsafe_flags);
-+
-+#if defined(CONFIG_GRKERNSEC) && (defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC))
-+extern void gr_learn_resource(const struct task_struct *task, const int res,
-+ const unsigned long wanted, const int gt);
-+#else
-+static inline void gr_learn_resource(const struct task_struct *task, const int res,
-+ const unsigned long wanted, const int gt)
-+{
-+}
-+#endif
-+
-+#ifdef CONFIG_GRKERNSEC_RESLOG
-+extern void gr_log_resource(const struct task_struct *task, const int res,
-+ const unsigned long wanted, const int gt);
-+#else
-+static inline void gr_log_resource(const struct task_struct *task, const int res,
-+ const unsigned long wanted, const int gt)
-+{
-+}
-+#endif
-+
-+#ifdef CONFIG_GRKERNSEC
-+void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
-+void gr_handle_vm86(void);
-+void gr_handle_mem_readwrite(u64 from, u64 to);
-+
-+void gr_log_badprocpid(const char *entry);
-+
-+extern int grsec_enable_dmesg;
-+extern int grsec_disable_privio;
-+
-+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
-+extern kgid_t grsec_proc_gid;
-+#endif
-+
-+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
-+extern int grsec_enable_chroot_findtask;
-+#endif
-+#ifdef CONFIG_GRKERNSEC_SETXID
-+extern int grsec_enable_setxid;
-+#endif
-+#endif
-+
-+#endif
-diff -Naur backports-3.18.1-1.org/include/linux/grsock.h backports-3.18.1-1/include/linux/grsock.h
---- backports-3.18.1-1.org/include/linux/grsock.h 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/include/linux/grsock.h 2014-12-28 14:10:09.688889562 +0100
-@@ -0,0 +1,19 @@
-+#ifndef __GRSOCK_H
-+#define __GRSOCK_H
-+
-+extern void gr_attach_curr_ip(const struct sock *sk);
-+extern int gr_handle_sock_all(const int family, const int type,
-+ const int protocol);
-+extern int gr_handle_sock_server(const struct sockaddr *sck);
-+extern int gr_handle_sock_server_other(const struct sock *sck);
-+extern int gr_handle_sock_client(const struct sockaddr *sck);
-+extern int gr_search_connect(struct socket * sock,
-+ struct sockaddr_in * addr);
-+extern int gr_search_bind(struct socket * sock,
-+ struct sockaddr_in * addr);
-+extern int gr_search_listen(struct socket * sock);
-+extern int gr_search_accept(struct socket * sock);
-+extern int gr_search_socket(const int domain, const int type,
-+ const int protocol);
-+
-+#endif
-diff -Naur backports-3.18.1-1.org/include/linux/unaligned/access_ok.h backports-3.18.1-1/include/linux/unaligned/access_ok.h
---- backports-3.18.1-1.org/include/linux/unaligned/access_ok.h 2014-12-21 22:37:13.000000000 +0100
-+++ backports-3.18.1-1/include/linux/unaligned/access_ok.h 2014-12-28 14:10:09.712889681 +0100
-@@ -4,34 +4,34 @@
- #include <linux/kernel.h>
- #include <asm/byteorder.h>
-
--static inline u16 get_unaligned_le16(const void *p)
-+static inline u16 __intentional_overflow(-1) get_unaligned_le16(const void *p)
- {
-- return le16_to_cpup((__le16 *)p);
-+ return le16_to_cpup((const __le16 *)p);
- }
-
--static inline u32 get_unaligned_le32(const void *p)
-+static inline u32 __intentional_overflow(-1) get_unaligned_le32(const void *p)
- {
-- return le32_to_cpup((__le32 *)p);
-+ return le32_to_cpup((const __le32 *)p);
- }
-
--static inline u64 get_unaligned_le64(const void *p)
-+static inline u64 __intentional_overflow(-1) get_unaligned_le64(const void *p)
- {
-- return le64_to_cpup((__le64 *)p);
-+ return le64_to_cpup((const __le64 *)p);
- }
-
--static inline u16 get_unaligned_be16(const void *p)
-+static inline u16 __intentional_overflow(-1) get_unaligned_be16(const void *p)
- {
-- return be16_to_cpup((__be16 *)p);
-+ return be16_to_cpup((const __be16 *)p);
- }
-
--static inline u32 get_unaligned_be32(const void *p)
-+static inline u32 __intentional_overflow(-1) get_unaligned_be32(const void *p)
- {
-- return be32_to_cpup((__be32 *)p);
-+ return be32_to_cpup((const __be32 *)p);
- }
-
--static inline u64 get_unaligned_be64(const void *p)
-+static inline u64 __intentional_overflow(-1) get_unaligned_be64(const void *p)
- {
-- return be64_to_cpup((__be64 *)p);
-+ return be64_to_cpup((const __be64 *)p);
- }
-
- static inline void put_unaligned_le16(u16 val, void *p)
-diff -Naur backports-3.18.1-1.org/include/media/v4l2-dev.h backports-3.18.1-1/include/media/v4l2-dev.h
---- backports-3.18.1-1.org/include/media/v4l2-dev.h 2014-12-21 22:37:13.000000000 +0100
-+++ backports-3.18.1-1/include/media/v4l2-dev.h 2014-12-28 14:10:09.716889709 +0100
-@@ -75,7 +75,7 @@
- int (*mmap) (struct file *, struct vm_area_struct *);
- int (*open) (struct file *);
- int (*release) (struct file *);
--};
-+} __do_const;
-
- /*
- * Newer version of video_device, handled by videodev2.c
-diff -Naur backports-3.18.1-1.org/include/media/v4l2-device.h backports-3.18.1-1/include/media/v4l2-device.h
---- backports-3.18.1-1.org/include/media/v4l2-device.h 2014-12-21 22:37:13.000000000 +0100
-+++ backports-3.18.1-1/include/media/v4l2-device.h 2014-12-28 14:10:09.716889709 +0100
-@@ -95,7 +95,7 @@
- this function returns 0. If the name ends with a digit (e.g. cx18),
- then the name will be set to cx18-0 since cx180 looks really odd. */
- int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
-- atomic_t *instance);
-+ atomic_unchecked_t *instance);
-
- /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
- Since the parent disappears this ensures that v4l2_dev doesn't have an
-diff -Naur backports-3.18.1-1.org/include/net/bluetooth/l2cap.h backports-3.18.1-1/include/net/bluetooth/l2cap.h
---- backports-3.18.1-1.org/include/net/bluetooth/l2cap.h 2014-12-21 22:37:13.000000000 +0100
-+++ backports-3.18.1-1/include/net/bluetooth/l2cap.h 2014-12-28 14:10:09.716889709 +0100
-@@ -608,7 +608,7 @@
- unsigned char *kdata,
- struct iovec *iov,
- int len);
--};
-+} __do_const;
-
- struct l2cap_conn {
- struct hci_conn *hcon;
-diff -Naur backports-3.18.1-1.org/include/net/mac80211.h backports-3.18.1-1/include/net/mac80211.h
---- backports-3.18.1-1.org/include/net/mac80211.h 2014-12-21 22:37:13.000000000 +0100
-+++ backports-3.18.1-1/include/net/mac80211.h 2014-12-28 14:10:09.724889743 +0100
-@@ -4648,7 +4648,7 @@
- void (*remove_sta_debugfs)(void *priv, void *priv_sta);
-
- u32 (*get_expected_throughput)(void *priv_sta);
--};
-+} __do_const;
-
- static inline int rate_supported(struct ieee80211_sta *sta,
- enum ieee80211_band band,
-diff -Naur backports-3.18.1-1.org/include/trace/events/fs.h backports-3.18.1-1/include/trace/events/fs.h
---- backports-3.18.1-1.org/include/trace/events/fs.h 1970-01-01 01:00:00.000000000 +0100
-+++ backports-3.18.1-1/include/trace/events/fs.h 2014-12-28 14:10:09.728889769 +0100
-@@ -0,0 +1,53 @@
-+#undef TRACE_SYSTEM
-+#define TRACE_SYSTEM fs
-+
-+#if !defined(_TRACE_FS_H) || defined(TRACE_HEADER_MULTI_READ)
-+#define _TRACE_FS_H
-+
-+#include <linux/fs.h>
-+#include <linux/tracepoint.h>
-+
-+TRACE_EVENT(do_sys_open,
-+
-+ TP_PROTO(const char *filename, int flags, int mode),
-+
-+ TP_ARGS(filename, flags, mode),
-+
-+ TP_STRUCT__entry(
-+ __string( filename, filename )
-+ __field( int, flags )
-+ __field( int, mode )
-+ ),
-+
-+ TP_fast_assign(
-+ __assign_str(filename, filename);
-+ __entry->flags = flags;
-+ __entry->mode = mode;
-+ ),
-+
-+ TP_printk("\"%s\" %x %o",
-+ __get_str(filename), __entry->flags, __entry->mode)
-+);
-+
-+TRACE_EVENT(open_exec,
-+
-+ TP_PROTO(const char *filename),
-+
-+ TP_ARGS(filename),
-+
-+ TP_STRUCT__entry(
-+ __string( filename, filename )
-+ ),
-+
-+ TP_fast_assign(
-+ __assign_str(filename, filename);
-+ ),
-+
-+ TP_printk("\"%s\"",
-+ __get_str(filename))
-+);
-+
-+#endif /* _TRACE_FS_H */
-+
-+/* This part must be outside protection */
-+#include <trace/define_trace.h>
-diff -Naur backports-3.18.1-1.org/net/bluetooth/6lowpan.c backports-3.18.1-1/net/bluetooth/6lowpan.c
---- backports-3.18.1-1.org/net/bluetooth/6lowpan.c 2014-12-21 22:37:15.000000000 +0100
-+++ backports-3.18.1-1/net/bluetooth/6lowpan.c 2014-12-28 14:10:09.784890034 +0100
-@@ -367,7 +367,6 @@
-
- drop:
- dev->stats.rx_dropped++;
-- kfree_skb(skb);
- return NET_RX_DROP;
- }
-
-diff -Naur backports-3.18.1-1.org/net/bluetooth/bnep/core.c backports-3.18.1-1/net/bluetooth/bnep/core.c
---- backports-3.18.1-1.org/net/bluetooth/bnep/core.c 2014-12-21 22:37:15.000000000 +0100
-+++ backports-3.18.1-1/net/bluetooth/bnep/core.c 2014-12-28 14:10:09.784890034 +0100
-@@ -533,6 +533,9 @@
-
- BT_DBG("");
-
-+ if (!l2cap_is_socket(sock))
-+ return -EBADFD;
-+
- baswap((void *) dst, &l2cap_pi(sock->sk)->chan->dst);
- baswap((void *) src, &l2cap_pi(sock->sk)->chan->src);
-
-diff -Naur backports-3.18.1-1.org/net/bluetooth/cmtp/core.c backports-3.18.1-1/net/bluetooth/cmtp/core.c
---- backports-3.18.1-1.org/net/bluetooth/cmtp/core.c 2014-12-21 22:37:15.000000000 +0100
-+++ backports-3.18.1-1/net/bluetooth/cmtp/core.c 2014-12-28 14:10:09.784890034 +0100
-@@ -334,6 +334,9 @@
-
- BT_DBG("");
-
-+ if (!l2cap_is_socket(sock))
-+ return -EBADFD;
-+
- session = kzalloc(sizeof(struct cmtp_session), GFP_KERNEL);
- if (!session)
- return -ENOMEM;
-diff -Naur backports-3.18.1-1.org/net/bluetooth/hci_sock.c backports-3.18.1-1/net/bluetooth/hci_sock.c
---- backports-3.18.1-1.org/net/bluetooth/hci_sock.c 2014-12-21 22:37:15.000000000 +0100
-+++ backports-3.18.1-1/net/bluetooth/hci_sock.c 2014-12-28 14:10:09.784890034 +0100
-@@ -1067,7 +1067,7 @@
- uf.event_mask[1] = *((u32 *) f->event_mask + 1);
- }
-
-- len = min_t(unsigned int, len, sizeof(uf));
-+ len = min((size_t)len, sizeof(uf));
- if (copy_from_user(&uf, optval, len)) {
- err = -EFAULT;
- break;
-diff -Naur backports-3.18.1-1.org/net/bluetooth/hidp/core.c backports-3.18.1-1/net/bluetooth/hidp/core.c
---- backports-3.18.1-1.org/net/bluetooth/hidp/core.c 2014-12-21 22:37:15.000000000 +0100
-+++ backports-3.18.1-1/net/bluetooth/hidp/core.c 2014-12-28 14:10:09.784890034 +0100
-@@ -1322,13 +1322,14 @@
- {
- struct hidp_session *session;
- struct l2cap_conn *conn;
-- struct l2cap_chan *chan = l2cap_pi(ctrl_sock->sk)->chan;
-+ struct l2cap_chan *chan;
- int ret;
-
- ret = hidp_verify_sockets(ctrl_sock, intr_sock);
- if (ret)
- return ret;
-
-+ chan = l2cap_pi(ctrl_sock->sk)->chan;
- conn = NULL;
- l2cap_chan_lock(chan);
- if (chan->conn)
-diff -Naur backports-3.18.1-1.org/net/bluetooth/l2cap_core.c backports-3.18.1-1/net/bluetooth/l2cap_core.c
---- backports-3.18.1-1.org/net/bluetooth/l2cap_core.c 2014-12-21 22:37:15.000000000 +0100
-+++ backports-3.18.1-1/net/bluetooth/l2cap_core.c 2014-12-28 14:10:09.784890034 +0100
-@@ -3512,8 +3512,10 @@
- break;
-
- case L2CAP_CONF_RFC:
-- if (olen == sizeof(rfc))
-- memcpy(&rfc, (void *)val, olen);
-+ if (olen != sizeof(rfc))
-+ break;
-+
-+ memcpy(&rfc, (void *)val, olen);
-
- if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
- rfc.mode != chan->mode)
-diff -Naur backports-3.18.1-1.org/net/bluetooth/l2cap_sock.c backports-3.18.1-1/net/bluetooth/l2cap_sock.c
---- backports-3.18.1-1.org/net/bluetooth/l2cap_sock.c 2014-12-21 22:37:15.000000000 +0100
-+++ backports-3.18.1-1/net/bluetooth/l2cap_sock.c 2014-12-28 14:10:09.788890064 +0100
-@@ -628,7 +628,8 @@
- struct sock *sk = sock->sk;
- struct l2cap_chan *chan = l2cap_pi(sk)->chan;
- struct l2cap_options opts;
-- int len, err = 0;
-+ int err = 0;
-+ size_t len = optlen;
- u32 opt;
-
- BT_DBG("sk %p", sk);
-@@ -655,7 +656,7 @@
- opts.max_tx = chan->max_tx;
- opts.txwin_size = chan->tx_win;
-
-- len = min_t(unsigned int, sizeof(opts), optlen);
-+ len = min(sizeof(opts), len);
- if (copy_from_user((char *) &opts, optval, len)) {
- err = -EFAULT;
- break;
-@@ -742,7 +743,8 @@
- struct bt_security sec;
- struct bt_power pwr;
- struct l2cap_conn *conn;
-- int len, err = 0;
-+ int err = 0;
-+ size_t len = optlen;
- u32 opt;
-
- BT_DBG("sk %p", sk);
-@@ -766,7 +768,7 @@
-
- sec.level = BT_SECURITY_LOW;
-
-- len = min_t(unsigned int, sizeof(sec), optlen);
-+ len = min(sizeof(sec), len);
- if (copy_from_user((char *) &sec, optval, len)) {
- err = -EFAULT;
- break;
-@@ -862,7 +864,7 @@
-
- pwr.force_active = BT_POWER_FORCE_ACTIVE_ON;
-
-- len = min_t(unsigned int, sizeof(pwr), optlen);
-+ len = min(sizeof(pwr), len);
- if (copy_from_user((char *) &pwr, optval, len)) {
- err = -EFAULT;
- break;
-diff -Naur backports-3.18.1-1.org/net/bluetooth/rfcomm/sock.c backports-3.18.1-1/net/bluetooth/rfcomm/sock.c
---- backports-3.18.1-1.org/net/bluetooth/rfcomm/sock.c 2014-12-21 22:37:15.000000000 +0100
-+++ backports-3.18.1-1/net/bluetooth/rfcomm/sock.c 2014-12-28 14:10:09.788890064 +0100
-@@ -695,7 +695,7 @@
- struct sock *sk = sock->sk;
- struct bt_security sec;
- int err = 0;
-- size_t len;
-+ size_t len = optlen;
- u32 opt;
-
- BT_DBG("sk %p", sk);
-@@ -717,7 +717,7 @@
-
- sec.level = BT_SECURITY_LOW;
-
-- len = min_t(unsigned int, sizeof(sec), optlen);
-+ len = min(sizeof(sec), len);
- if (copy_from_user((char *) &sec, optval, len)) {
- err = -EFAULT;
- break;
-diff -Naur backports-3.18.1-1.org/net/bluetooth/rfcomm/tty.c backports-3.18.1-1/net/bluetooth/rfcomm/tty.c
---- backports-3.18.1-1.org/net/bluetooth/rfcomm/tty.c 2014-12-21 22:37:15.000000000 +0100
-+++ backports-3.18.1-1/net/bluetooth/rfcomm/tty.c 2014-12-28 14:10:09.788890064 +0100
-@@ -752,7 +752,7 @@
- BT_DBG("tty %p id %d", tty, tty->index);
-
- BT_DBG("dev %p dst %pMR channel %d opened %d", dev, &dev->dst,
-- dev->channel, dev->port.count);
-+ dev->channel, atomic_read(&dev->port.count));
-
- err = tty_port_open(&dev->port, tty, filp);
- if (err)
-@@ -775,7 +775,7 @@
- struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
-
- BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc,
-- dev->port.count);
-+ atomic_read(&dev->port.count));
-
- tty_port_close(&dev->port, tty, filp);
- }
-diff -Naur backports-3.18.1-1.org/net/ieee802154/6lowpan_rtnl.c backports-3.18.1-1/net/ieee802154/6lowpan_rtnl.c
---- backports-3.18.1-1.org/net/ieee802154/6lowpan_rtnl.c 2014-12-21 22:37:15.000000000 +0100
-+++ backports-3.18.1-1/net/ieee802154/6lowpan_rtnl.c 2014-12-28 14:10:09.796890100 +0100
-@@ -639,7 +639,7 @@
- dev_put(real_dev);
- }
-
--static struct rtnl_link_ops lowpan_link_ops __read_mostly = {
-+static struct rtnl_link_ops lowpan_link_ops = {
- .kind = "lowpan",
- .priv_size = sizeof(struct lowpan_dev_info),
- .setup = lowpan_setup,
-diff -Naur backports-3.18.1-1.org/net/ieee802154/reassembly.c backports-3.18.1-1/net/ieee802154/reassembly.c
---- backports-3.18.1-1.org/net/ieee802154/reassembly.c 2014-12-21 22:37:15.000000000 +0100
-+++ backports-3.18.1-1/net/ieee802154/reassembly.c 2014-12-28 14:10:09.796890100 +0100
-@@ -460,14 +460,13 @@
-
- static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
- {
-- struct ctl_table *table;
-+ ctl_table_no_const *table = NULL;
- struct ctl_table_header *hdr;
- struct netns_ieee802154_lowpan *ieee802154_lowpan =
- net_ieee802154_lowpan(net);
-
-- table = lowpan_frags_ns_ctl_table;
- if (!net_eq(net, &init_net)) {
-- table = kmemdup(table, sizeof(lowpan_frags_ns_ctl_table),
-+ table = kmemdup(lowpan_frags_ns_ctl_table, sizeof(lowpan_frags_ns_ctl_table),
- GFP_KERNEL);
- if (table == NULL)
- goto err_alloc;
-@@ -494,8 +493,7 @@
- return 0;
-
- err_reg:
-- if (!net_eq(net, &init_net))
-- kfree(table);
-+ kfree(table);
- err_alloc:
- return -ENOMEM;
- }
-diff -Naur backports-3.18.1-1.org/net/mac80211/cfg.c backports-3.18.1-1/net/mac80211/cfg.c
---- backports-3.18.1-1.org/net/mac80211/cfg.c 2014-12-21 22:37:15.000000000 +0100
-+++ backports-3.18.1-1/net/mac80211/cfg.c 2014-12-28 14:10:09.812890175 +0100
-@@ -541,7 +541,7 @@
- ret = ieee80211_vif_use_channel(sdata, chandef,
- IEEE80211_CHANCTX_EXCLUSIVE);
- }
-- } else if (local->open_count == local->monitors) {
-+ } else if (local_read(&local->open_count) == local->monitors) {
- local->_oper_chandef = *chandef;
- ieee80211_hw_config(local, 0);
- }
-@@ -3326,7 +3326,7 @@
- else
- local->probe_req_reg--;
-
-- if (!local->open_count)
-+ if (!local_read(&local->open_count))
- break;
-
- ieee80211_queue_work(&local->hw, &local->reconfig_filter);
-@@ -3460,8 +3460,8 @@
- if (chanctx_conf) {
- *chandef = sdata->vif.bss_conf.chandef;
- ret = 0;
-- } else if (local->open_count > 0 &&
-- local->open_count == local->monitors &&
-+ } else if (local_read(&local->open_count) > 0 &&
-+ local_read(&local->open_count) == local->monitors &&
- sdata->vif.type == NL80211_IFTYPE_MONITOR) {
- if (local->use_chanctx)
- *chandef = local->monitor_chandef;
-diff -Naur backports-3.18.1-1.org/net/mac80211/ieee80211_i.h backports-3.18.1-1/net/mac80211/ieee80211_i.h
---- backports-3.18.1-1.org/net/mac80211/ieee80211_i.h 2014-12-21 22:37:15.000000000 +0100
-+++ backports-3.18.1-1/net/mac80211/ieee80211_i.h 2014-12-28 14:10:09.812890175 +0100
-@@ -29,6 +29,7 @@
- #include <net/ieee80211_radiotap.h>
- #include <net/cfg80211.h>
- #include <net/mac80211.h>
-+#include <asm/local.h>
- #include "key.h"
- #include "sta_info.h"
- #include "debug.h"
-@@ -1057,7 +1058,7 @@
- /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
- spinlock_t queue_stop_reason_lock;
-
-- int open_count;
-+ local_t open_count;
- int monitors, cooked_mntrs;
- /* number of interfaces with corresponding FIF_ flags */
- int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
-diff -Naur backports-3.18.1-1.org/net/mac80211/iface.c backports-3.18.1-1/net/mac80211/iface.c
---- backports-3.18.1-1.org/net/mac80211/iface.c 2014-12-21 22:37:15.000000000 +0100
-+++ backports-3.18.1-1/net/mac80211/iface.c 2014-12-28 14:10:09.812890175 +0100
-@@ -532,7 +532,7 @@
- break;
- }
-
-- if (local->open_count == 0) {
-+ if (local_read(&local->open_count) == 0) {
- res = drv_start(local);
- if (res)
- goto err_del_bss;
-@@ -579,7 +579,7 @@
- res = drv_add_interface(local, sdata);
- if (res)
- goto err_stop;
-- } else if (local->monitors == 0 && local->open_count == 0) {
-+ } else if (local->monitors == 0 && local_read(&local->open_count) == 0) {
- res = ieee80211_add_virtual_monitor(local);
- if (res)
- goto err_stop;
-@@ -688,7 +688,7 @@
- atomic_inc(&local->iff_promiscs);
-
- if (coming_up)
-- local->open_count++;
-+ local_inc(&local->open_count);
-
- if (hw_reconf_flags)
- ieee80211_hw_config(local, hw_reconf_flags);
-@@ -726,7 +726,7 @@
- err_del_interface:
- drv_remove_interface(local, sdata);
- err_stop:
-- if (!local->open_count)
-+ if (!local_read(&local->open_count))
- drv_stop(local);
- err_del_bss:
- sdata->bss = NULL;
-@@ -892,7 +892,7 @@
- }
-
- if (going_down)
-- local->open_count--;
-+ local_dec(&local->open_count);
-
- switch (sdata->vif.type) {
- case NL80211_IFTYPE_AP_VLAN:
-@@ -954,7 +954,7 @@
- }
- spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
-
-- if (local->open_count == 0)
-+ if (local_read(&local->open_count) == 0)
- ieee80211_clear_tx_pending(local);
-
- /*
-@@ -997,7 +997,7 @@
- if (cancel_scan)
- flush_delayed_work(&local->scan_work);
-
-- if (local->open_count == 0) {
-+ if (local_read(&local->open_count) == 0) {
- ieee80211_stop_device(local);
-
- /* no reconfiguring after stop! */
-@@ -1008,7 +1008,7 @@
- ieee80211_configure_filter(local);
- ieee80211_hw_config(local, hw_reconf_flags);
-
-- if (local->monitors == local->open_count)
-+ if (local->monitors == local_read(&local->open_count))
- ieee80211_add_virtual_monitor(local);
- }
-
-diff -Naur backports-3.18.1-1.org/net/mac80211/main.c backports-3.18.1-1/net/mac80211/main.c
---- backports-3.18.1-1.org/net/mac80211/main.c 2014-12-21 22:37:15.000000000 +0100
-+++ backports-3.18.1-1/net/mac80211/main.c 2014-12-28 14:10:09.812890175 +0100
-@@ -175,7 +175,7 @@
- changed &= ~(IEEE80211_CONF_CHANGE_CHANNEL |
- IEEE80211_CONF_CHANGE_POWER);
-
-- if (changed && local->open_count) {
-+ if (changed && local_read(&local->open_count)) {
- ret = drv_config(local, changed);
- /*
- * Goal:
-diff -Naur backports-3.18.1-1.org/net/mac80211/pm.c backports-3.18.1-1/net/mac80211/pm.c
---- backports-3.18.1-1.org/net/mac80211/pm.c 2014-12-21 22:37:15.000000000 +0100
-+++ backports-3.18.1-1/net/mac80211/pm.c 2014-12-28 14:10:09.812890175 +0100
-@@ -12,7 +12,7 @@
- struct ieee80211_sub_if_data *sdata;
- struct sta_info *sta;
-
-- if (!local->open_count)
-+ if (!local_read(&local->open_count))
- goto suspend;
-
- ieee80211_scan_cancel(local);
-@@ -59,7 +59,7 @@
- cancel_work_sync(&local->dynamic_ps_enable_work);
- del_timer_sync(&local->dynamic_ps_timer);
-
-- local->wowlan = wowlan && local->open_count;
-+ local->wowlan = wowlan && local_read(&local->open_count);
- if (local->wowlan) {
- int err = drv_suspend(local, wowlan);
- if (err < 0) {
-@@ -125,7 +125,7 @@
- WARN_ON(!list_empty(&local->chanctx_list));
-
- /* stop hardware - this must stop RX */
-- if (local->open_count)
-+ if (local_read(&local->open_count))
- ieee80211_stop_device(local);
-
- suspend:
-diff -Naur backports-3.18.1-1.org/net/mac80211/rate.c backports-3.18.1-1/net/mac80211/rate.c
---- backports-3.18.1-1.org/net/mac80211/rate.c 2014-12-21 22:37:15.000000000 +0100
-+++ backports-3.18.1-1/net/mac80211/rate.c 2014-12-28 14:10:09.812890175 +0100
-@@ -720,7 +720,7 @@
-
- ASSERT_RTNL();
-
-- if (local->open_count)
-+ if (local_read(&local->open_count))
- return -EBUSY;
-
- if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
-diff -Naur backports-3.18.1-1.org/net/mac80211/util.c backports-3.18.1-1/net/mac80211/util.c
---- backports-3.18.1-1.org/net/mac80211/util.c 2014-12-21 22:37:15.000000000 +0100
-+++ backports-3.18.1-1/net/mac80211/util.c 2014-12-28 14:10:09.816890209 +0100
-@@ -1669,7 +1669,7 @@
- }
- #endif
- /* everything else happens only if HW was up & running */
-- if (!local->open_count)
-+ if (!local_read(&local->open_count))
- goto wake_up;
-
- /*
-@@ -1895,7 +1895,7 @@
- local->in_reconfig = false;
- barrier();
-
-- if (local->monitors == local->open_count && local->monitors > 0)
-+ if (local->monitors == local_read(&local->open_count) && local->monitors > 0)
- ieee80211_add_virtual_monitor(local);
-
- /*
-diff -Naur backports-3.18.1-1.org/net/wireless/wext-core.c backports-3.18.1-1/net/wireless/wext-core.c
---- backports-3.18.1-1.org/net/wireless/wext-core.c 2014-12-21 22:37:15.000000000 +0100
-+++ backports-3.18.1-1/net/wireless/wext-core.c 2014-12-28 14:10:09.832890290 +0100
-@@ -748,8 +748,7 @@
- */
-
- /* Support for very large requests */
-- if ((descr->flags & IW_DESCR_FLAG_NOMAX) &&
-- (user_length > descr->max_tokens)) {
-+ if (user_length > descr->max_tokens) {
- /* Allow userspace to GET more than max so
- * we can support any size GET requests.
- * There is still a limit : -ENOMEM.
-@@ -788,22 +787,6 @@
- }
- }
-
-- if (IW_IS_GET(cmd) && !(descr->flags & IW_DESCR_FLAG_NOMAX)) {
-- /*
-- * If this is a GET, but not NOMAX, it means that the extra
-- * data is not bounded by userspace, but by max_tokens. Thus
-- * set the length to max_tokens. This matches the extra data
-- * allocation.
-- * The driver should fill it with the number of tokens it
-- * provided, and it may check iwp->length rather than having
-- * knowledge of max_tokens. If the driver doesn't change the
-- * iwp->length, this ioctl just copies back max_token tokens
-- * filled with zeroes. Hopefully the driver isn't claiming
-- * them to be valid data.
-- */
-- iwp->length = descr->max_tokens;
-- }
--
- err = handler(dev, info, (union iwreq_data *) iwp, extra);
-
- iwp->length += essid_compat;
diff --git a/src/patches/backports-4.2.6-1-add_usbnet_modules.patch b/src/patches/backports-4.2.6-1-add_usbnet_modules.patch
new file mode 100644
index 0000000..660ef8c
--- /dev/null
+++ b/src/patches/backports-4.2.6-1-add_usbnet_modules.patch
@@ -0,0 +1,28998 @@
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/asix_common.c backports-4.2.6-1/drivers/net/usb/asix_common.c
+--- backports-4.2.6-1.org/drivers/net/usb/asix_common.c 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/asix_common.c 2015-11-09 23:37:56.000000000 +0100
+@@ -0,0 +1,584 @@
++/*
++ * ASIX AX8817X based USB 2.0 Ethernet Devices
++ * Copyright (C) 2003-2006 David Hollis <dhollis(a)davehollis.com>
++ * Copyright (C) 2005 Phil Chang <pchang23(a)sbcglobal.net>
++ * Copyright (C) 2006 James Painter <jamie.painter(a)iname.com>
++ * Copyright (c) 2002-2003 TiVo Inc.
++ *
++ * 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, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "asix.h"
++
++int asix_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
++ u16 size, void *data)
++{
++ int ret;
++ ret = usbnet_read_cmd(dev, cmd,
++ USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
++ value, index, data, size);
++
++ if (ret != size && ret >= 0)
++ return -EINVAL;
++ return ret;
++}
++
++int asix_write_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
++ u16 size, void *data)
++{
++ return usbnet_write_cmd(dev, cmd,
++ USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
++ value, index, data, size);
++}
++
++void asix_write_cmd_async(struct usbnet *dev, u8 cmd, u16 value, u16 index,
++ u16 size, void *data)
++{
++ usbnet_write_cmd_async(dev, cmd,
++ USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
++ value, index, data, size);
++}
++
++int asix_rx_fixup_internal(struct usbnet *dev, struct sk_buff *skb,
++ struct asix_rx_fixup_info *rx)
++{
++ int offset = 0;
++
++ while (offset + sizeof(u16) <= skb->len) {
++ u16 remaining = 0;
++ unsigned char *data;
++
++ if (!rx->size) {
++ if ((skb->len - offset == sizeof(u16)) ||
++ rx->split_head) {
++ if(!rx->split_head) {
++ rx->header = get_unaligned_le16(
++ skb->data + offset);
++ rx->split_head = true;
++ offset += sizeof(u16);
++ break;
++ } else {
++ rx->header |= (get_unaligned_le16(
++ skb->data + offset)
++ << 16);
++ rx->split_head = false;
++ offset += sizeof(u16);
++ }
++ } else {
++ rx->header = get_unaligned_le32(skb->data +
++ offset);
++ offset += sizeof(u32);
++ }
++
++ /* get the packet length */
++ rx->size = (u16) (rx->header & 0x7ff);
++ if (rx->size != ((~rx->header >> 16) & 0x7ff)) {
++ netdev_err(dev->net, "asix_rx_fixup() Bad Header Length 0x%x, offset %d\n",
++ rx->header, offset);
++ rx->size = 0;
++ return 0;
++ }
++ rx->ax_skb = netdev_alloc_skb_ip_align(dev->net,
++ rx->size);
++ if (!rx->ax_skb)
++ return 0;
++ }
++
++ if (rx->size > dev->net->mtu + ETH_HLEN + VLAN_HLEN) {
++ netdev_err(dev->net, "asix_rx_fixup() Bad RX Length %d\n",
++ rx->size);
++ kfree_skb(rx->ax_skb);
++ rx->ax_skb = NULL;
++ rx->size = 0U;
++
++ return 0;
++ }
++
++ if (rx->size > skb->len - offset) {
++ remaining = rx->size - (skb->len - offset);
++ rx->size = skb->len - offset;
++ }
++
++ data = skb_put(rx->ax_skb, rx->size);
++ memcpy(data, skb->data + offset, rx->size);
++ if (!remaining)
++ usbnet_skb_return(dev, rx->ax_skb);
++
++ offset += (rx->size + 1) & 0xfffe;
++ rx->size = remaining;
++ }
++
++ if (skb->len != offset) {
++ netdev_err(dev->net, "asix_rx_fixup() Bad SKB Length %d, %d\n",
++ skb->len, offset);
++ return 0;
++ }
++
++ return 1;
++}
++
++int asix_rx_fixup_common(struct usbnet *dev, struct sk_buff *skb)
++{
++ struct asix_common_private *dp = dev->driver_priv;
++ struct asix_rx_fixup_info *rx = &dp->rx_fixup_info;
++
++ return asix_rx_fixup_internal(dev, skb, rx);
++}
++
++struct sk_buff *asix_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
++ gfp_t flags)
++{
++ int padlen;
++ int headroom = skb_headroom(skb);
++ int tailroom = skb_tailroom(skb);
++ u32 packet_len;
++ u32 padbytes = 0xffff0000;
++
++ padlen = ((skb->len + 4) & (dev->maxpacket - 1)) ? 0 : 4;
++
++ /* We need to push 4 bytes in front of frame (packet_len)
++ * and maybe add 4 bytes after the end (if padlen is 4)
++ *
++ * Avoid skb_copy_expand() expensive call, using following rules :
++ * - We are allowed to push 4 bytes in headroom if skb_header_cloned()
++ * is false (and if we have 4 bytes of headroom)
++ * - We are allowed to put 4 bytes at tail if skb_cloned()
++ * is false (and if we have 4 bytes of tailroom)
++ *
++ * TCP packets for example are cloned, but skb_header_release()
++ * was called in tcp stack, allowing us to use headroom for our needs.
++ */
++ if (!skb_header_cloned(skb) &&
++ !(padlen && skb_cloned(skb)) &&
++ headroom + tailroom >= 4 + padlen) {
++ /* following should not happen, but better be safe */
++ if (headroom < 4 ||
++ tailroom < padlen) {
++ skb->data = memmove(skb->head + 4, skb->data, skb->len);
++ skb_set_tail_pointer(skb, skb->len);
++ }
++ } else {
++ struct sk_buff *skb2;
++
++ skb2 = skb_copy_expand(skb, 4, padlen, flags);
++ dev_kfree_skb_any(skb);
++ skb = skb2;
++ if (!skb)
++ return NULL;
++ }
++
++ packet_len = ((skb->len ^ 0x0000ffff) << 16) + skb->len;
++ skb_push(skb, 4);
++ cpu_to_le32s(&packet_len);
++ skb_copy_to_linear_data(skb, &packet_len, sizeof(packet_len));
++
++ if (padlen) {
++ cpu_to_le32s(&padbytes);
++ memcpy(skb_tail_pointer(skb), &padbytes, sizeof(padbytes));
++ skb_put(skb, sizeof(padbytes));
++ }
++
++ usbnet_set_skb_tx_stats(skb, 1, 0);
++ return skb;
++}
++
++int asix_set_sw_mii(struct usbnet *dev)
++{
++ int ret;
++ ret = asix_write_cmd(dev, AX_CMD_SET_SW_MII, 0x0000, 0, 0, NULL);
++ if (ret < 0)
++ netdev_err(dev->net, "Failed to enable software MII access\n");
++ return ret;
++}
++
++int asix_set_hw_mii(struct usbnet *dev)
++{
++ int ret;
++ ret = asix_write_cmd(dev, AX_CMD_SET_HW_MII, 0x0000, 0, 0, NULL);
++ if (ret < 0)
++ netdev_err(dev->net, "Failed to enable hardware MII access\n");
++ return ret;
++}
++
++int asix_read_phy_addr(struct usbnet *dev, int internal)
++{
++ int offset = (internal ? 1 : 0);
++ u8 buf[2];
++ int ret = asix_read_cmd(dev, AX_CMD_READ_PHY_ID, 0, 0, 2, buf);
++
++ netdev_dbg(dev->net, "asix_get_phy_addr()\n");
++
++ if (ret < 0) {
++ netdev_err(dev->net, "Error reading PHYID register: %02x\n", ret);
++ goto out;
++ }
++ netdev_dbg(dev->net, "asix_get_phy_addr() returning 0x%04x\n",
++ *((__le16 *)buf));
++ ret = buf[offset];
++
++out:
++ return ret;
++}
++
++int asix_get_phy_addr(struct usbnet *dev)
++{
++ /* return the address of the internal phy */
++ return asix_read_phy_addr(dev, 1);
++}
++
++
++int asix_sw_reset(struct usbnet *dev, u8 flags)
++{
++ int ret;
++
++ ret = asix_write_cmd(dev, AX_CMD_SW_RESET, flags, 0, 0, NULL);
++ if (ret < 0)
++ netdev_err(dev->net, "Failed to send software reset: %02x\n", ret);
++
++ return ret;
++}
++
++u16 asix_read_rx_ctl(struct usbnet *dev)
++{
++ __le16 v;
++ int ret = asix_read_cmd(dev, AX_CMD_READ_RX_CTL, 0, 0, 2, &v);
++
++ if (ret < 0) {
++ netdev_err(dev->net, "Error reading RX_CTL register: %02x\n", ret);
++ goto out;
++ }
++ ret = le16_to_cpu(v);
++out:
++ return ret;
++}
++
++int asix_write_rx_ctl(struct usbnet *dev, u16 mode)
++{
++ int ret;
++
++ netdev_dbg(dev->net, "asix_write_rx_ctl() - mode = 0x%04x\n", mode);
++ ret = asix_write_cmd(dev, AX_CMD_WRITE_RX_CTL, mode, 0, 0, NULL);
++ if (ret < 0)
++ netdev_err(dev->net, "Failed to write RX_CTL mode to 0x%04x: %02x\n",
++ mode, ret);
++
++ return ret;
++}
++
++u16 asix_read_medium_status(struct usbnet *dev)
++{
++ __le16 v;
++ int ret = asix_read_cmd(dev, AX_CMD_READ_MEDIUM_STATUS, 0, 0, 2, &v);
++
++ if (ret < 0) {
++ netdev_err(dev->net, "Error reading Medium Status register: %02x\n",
++ ret);
++ return ret; /* TODO: callers not checking for error ret */
++ }
++
++ return le16_to_cpu(v);
++
++}
++
++int asix_write_medium_mode(struct usbnet *dev, u16 mode)
++{
++ int ret;
++
++ netdev_dbg(dev->net, "asix_write_medium_mode() - mode = 0x%04x\n", mode);
++ ret = asix_write_cmd(dev, AX_CMD_WRITE_MEDIUM_MODE, mode, 0, 0, NULL);
++ if (ret < 0)
++ netdev_err(dev->net, "Failed to write Medium Mode mode to 0x%04x: %02x\n",
++ mode, ret);
++
++ return ret;
++}
++
++int asix_write_gpio(struct usbnet *dev, u16 value, int sleep)
++{
++ int ret;
++
++ netdev_dbg(dev->net, "asix_write_gpio() - value = 0x%04x\n", value);
++ ret = asix_write_cmd(dev, AX_CMD_WRITE_GPIOS, value, 0, 0, NULL);
++ if (ret < 0)
++ netdev_err(dev->net, "Failed to write GPIO value 0x%04x: %02x\n",
++ value, ret);
++
++ if (sleep)
++ msleep(sleep);
++
++ return ret;
++}
++
++/*
++ * AX88772 & AX88178 have a 16-bit RX_CTL value
++ */
++void asix_set_multicast(struct net_device *net)
++{
++ struct usbnet *dev = netdev_priv(net);
++ struct asix_data *data = (struct asix_data *)&dev->data;
++ u16 rx_ctl = AX_DEFAULT_RX_CTL;
++
++ if (net->flags & IFF_PROMISC) {
++ rx_ctl |= AX_RX_CTL_PRO;
++ } else if (net->flags & IFF_ALLMULTI ||
++ netdev_mc_count(net) > AX_MAX_MCAST) {
++ rx_ctl |= AX_RX_CTL_AMALL;
++ } else if (netdev_mc_empty(net)) {
++ /* just broadcast and directed */
++ } else {
++ /* We use the 20 byte dev->data
++ * for our 8 byte filter buffer
++ * to avoid allocating memory that
++ * is tricky to free later */
++ struct netdev_hw_addr *ha;
++ u32 crc_bits;
++
++ memset(data->multi_filter, 0, AX_MCAST_FILTER_SIZE);
++
++ /* Build the multicast hash filter. */
++ netdev_for_each_mc_addr(ha, net) {
++ crc_bits = ether_crc(ETH_ALEN, ha->addr) >> 26;
++ data->multi_filter[crc_bits >> 3] |=
++ 1 << (crc_bits & 7);
++ }
++
++ asix_write_cmd_async(dev, AX_CMD_WRITE_MULTI_FILTER, 0, 0,
++ AX_MCAST_FILTER_SIZE, data->multi_filter);
++
++ rx_ctl |= AX_RX_CTL_AM;
++ }
++
++ asix_write_cmd_async(dev, AX_CMD_WRITE_RX_CTL, rx_ctl, 0, 0, NULL);
++}
++
++int asix_mdio_read(struct net_device *netdev, int phy_id, int loc)
++{
++ struct usbnet *dev = netdev_priv(netdev);
++ __le16 res;
++
++ mutex_lock(&dev->phy_mutex);
++ asix_set_sw_mii(dev);
++ asix_read_cmd(dev, AX_CMD_READ_MII_REG, phy_id,
++ (__u16)loc, 2, &res);
++ asix_set_hw_mii(dev);
++ mutex_unlock(&dev->phy_mutex);
++
++ netdev_dbg(dev->net, "asix_mdio_read() phy_id=0x%02x, loc=0x%02x, returns=0x%04x\n",
++ phy_id, loc, le16_to_cpu(res));
++
++ return le16_to_cpu(res);
++}
++
++void asix_mdio_write(struct net_device *netdev, int phy_id, int loc, int val)
++{
++ struct usbnet *dev = netdev_priv(netdev);
++ __le16 res = cpu_to_le16(val);
++
++ netdev_dbg(dev->net, "asix_mdio_write() phy_id=0x%02x, loc=0x%02x, val=0x%04x\n",
++ phy_id, loc, val);
++ mutex_lock(&dev->phy_mutex);
++ asix_set_sw_mii(dev);
++ asix_write_cmd(dev, AX_CMD_WRITE_MII_REG, phy_id, (__u16)loc, 2, &res);
++ asix_set_hw_mii(dev);
++ mutex_unlock(&dev->phy_mutex);
++}
++
++void asix_get_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo)
++{
++ struct usbnet *dev = netdev_priv(net);
++ u8 opt;
++
++ if (asix_read_cmd(dev, AX_CMD_READ_MONITOR_MODE, 0, 0, 1, &opt) < 0) {
++ wolinfo->supported = 0;
++ wolinfo->wolopts = 0;
++ return;
++ }
++ wolinfo->supported = WAKE_PHY | WAKE_MAGIC;
++ wolinfo->wolopts = 0;
++ if (opt & AX_MONITOR_LINK)
++ wolinfo->wolopts |= WAKE_PHY;
++ if (opt & AX_MONITOR_MAGIC)
++ wolinfo->wolopts |= WAKE_MAGIC;
++}
++
++int asix_set_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo)
++{
++ struct usbnet *dev = netdev_priv(net);
++ u8 opt = 0;
++
++ if (wolinfo->wolopts & WAKE_PHY)
++ opt |= AX_MONITOR_LINK;
++ if (wolinfo->wolopts & WAKE_MAGIC)
++ opt |= AX_MONITOR_MAGIC;
++
++ if (asix_write_cmd(dev, AX_CMD_WRITE_MONITOR_MODE,
++ opt, 0, 0, NULL) < 0)
++ return -EINVAL;
++
++ return 0;
++}
++
++int asix_get_eeprom_len(struct net_device *net)
++{
++ return AX_EEPROM_LEN;
++}
++
++int asix_get_eeprom(struct net_device *net, struct ethtool_eeprom *eeprom,
++ u8 *data)
++{
++ struct usbnet *dev = netdev_priv(net);
++ u16 *eeprom_buff;
++ int first_word, last_word;
++ int i;
++
++ if (eeprom->len == 0)
++ return -EINVAL;
++
++ eeprom->magic = AX_EEPROM_MAGIC;
++
++ first_word = eeprom->offset >> 1;
++ last_word = (eeprom->offset + eeprom->len - 1) >> 1;
++
++ eeprom_buff = kmalloc(sizeof(u16) * (last_word - first_word + 1),
++ GFP_KERNEL);
++ if (!eeprom_buff)
++ return -ENOMEM;
++
++ /* ax8817x returns 2 bytes from eeprom on read */
++ for (i = first_word; i <= last_word; i++) {
++ if (asix_read_cmd(dev, AX_CMD_READ_EEPROM, i, 0, 2,
++ &(eeprom_buff[i - first_word])) < 0) {
++ kfree(eeprom_buff);
++ return -EIO;
++ }
++ }
++
++ memcpy(data, (u8 *)eeprom_buff + (eeprom->offset & 1), eeprom->len);
++ kfree(eeprom_buff);
++ return 0;
++}
++
++int asix_set_eeprom(struct net_device *net, struct ethtool_eeprom *eeprom,
++ u8 *data)
++{
++ struct usbnet *dev = netdev_priv(net);
++ u16 *eeprom_buff;
++ int first_word, last_word;
++ int i;
++ int ret;
++
++ netdev_dbg(net, "write EEPROM len %d, offset %d, magic 0x%x\n",
++ eeprom->len, eeprom->offset, eeprom->magic);
++
++ if (eeprom->len == 0)
++ return -EINVAL;
++
++ if (eeprom->magic != AX_EEPROM_MAGIC)
++ return -EINVAL;
++
++ first_word = eeprom->offset >> 1;
++ last_word = (eeprom->offset + eeprom->len - 1) >> 1;
++
++ eeprom_buff = kmalloc(sizeof(u16) * (last_word - first_word + 1),
++ GFP_KERNEL);
++ if (!eeprom_buff)
++ return -ENOMEM;
++
++ /* align data to 16 bit boundaries, read the missing data from
++ the EEPROM */
++ if (eeprom->offset & 1) {
++ ret = asix_read_cmd(dev, AX_CMD_READ_EEPROM, first_word, 0, 2,
++ &(eeprom_buff[0]));
++ if (ret < 0) {
++ netdev_err(net, "Failed to read EEPROM at offset 0x%02x.\n", first_word);
++ goto free;
++ }
++ }
++
++ if ((eeprom->offset + eeprom->len) & 1) {
++ ret = asix_read_cmd(dev, AX_CMD_READ_EEPROM, last_word, 0, 2,
++ &(eeprom_buff[last_word - first_word]));
++ if (ret < 0) {
++ netdev_err(net, "Failed to read EEPROM at offset 0x%02x.\n", last_word);
++ goto free;
++ }
++ }
++
++ memcpy((u8 *)eeprom_buff + (eeprom->offset & 1), data, eeprom->len);
++
++ /* write data to EEPROM */
++ ret = asix_write_cmd(dev, AX_CMD_WRITE_ENABLE, 0x0000, 0, 0, NULL);
++ if (ret < 0) {
++ netdev_err(net, "Failed to enable EEPROM write\n");
++ goto free;
++ }
++ msleep(20);
++
++ for (i = first_word; i <= last_word; i++) {
++ netdev_dbg(net, "write to EEPROM at offset 0x%02x, data 0x%04x\n",
++ i, eeprom_buff[i - first_word]);
++ ret = asix_write_cmd(dev, AX_CMD_WRITE_EEPROM, i,
++ eeprom_buff[i - first_word], 0, NULL);
++ if (ret < 0) {
++ netdev_err(net, "Failed to write EEPROM at offset 0x%02x.\n",
++ i);
++ goto free;
++ }
++ msleep(20);
++ }
++
++ ret = asix_write_cmd(dev, AX_CMD_WRITE_DISABLE, 0x0000, 0, 0, NULL);
++ if (ret < 0) {
++ netdev_err(net, "Failed to disable EEPROM write\n");
++ goto free;
++ }
++
++ ret = 0;
++free:
++ kfree(eeprom_buff);
++ return ret;
++}
++
++void asix_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *info)
++{
++ /* Inherit standard device info */
++ usbnet_get_drvinfo(net, info);
++ strlcpy(info->driver, DRIVER_NAME, sizeof(info->driver));
++ strlcpy(info->version, DRIVER_VERSION, sizeof(info->version));
++ info->eedump_len = AX_EEPROM_LEN;
++}
++
++int asix_set_mac_address(struct net_device *net, void *p)
++{
++ struct usbnet *dev = netdev_priv(net);
++ struct asix_data *data = (struct asix_data *)&dev->data;
++ struct sockaddr *addr = p;
++
++ if (netif_running(net))
++ return -EBUSY;
++ if (!is_valid_ether_addr(addr->sa_data))
++ return -EADDRNOTAVAIL;
++
++ memcpy(net->dev_addr, addr->sa_data, ETH_ALEN);
++
++ /* We use the 20 byte dev->data
++ * for our 6 byte mac buffer
++ * to avoid allocating memory that
++ * is tricky to free later */
++ memcpy(data->mac_addr, addr->sa_data, ETH_ALEN);
++ asix_write_cmd_async(dev, AX_CMD_WRITE_NODE_ID, 0, 0, ETH_ALEN,
++ data->mac_addr);
++
++ return 0;
++}
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/asix_devices.c backports-4.2.6-1/drivers/net/usb/asix_devices.c
+--- backports-4.2.6-1.org/drivers/net/usb/asix_devices.c 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/asix_devices.c 2015-11-09 23:37:56.000000000 +0100
+@@ -0,0 +1,1107 @@
++/*
++ * ASIX AX8817X based USB 2.0 Ethernet Devices
++ * Copyright (C) 2003-2006 David Hollis <dhollis(a)davehollis.com>
++ * Copyright (C) 2005 Phil Chang <pchang23(a)sbcglobal.net>
++ * Copyright (C) 2006 James Painter <jamie.painter(a)iname.com>
++ * Copyright (c) 2002-2003 TiVo Inc.
++ *
++ * 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, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "asix.h"
++
++#define PHY_MODE_MARVELL 0x0000
++#define MII_MARVELL_LED_CTRL 0x0018
++#define MII_MARVELL_STATUS 0x001b
++#define MII_MARVELL_CTRL 0x0014
++
++#define MARVELL_LED_MANUAL 0x0019
++
++#define MARVELL_STATUS_HWCFG 0x0004
++
++#define MARVELL_CTRL_TXDELAY 0x0002
++#define MARVELL_CTRL_RXDELAY 0x0080
++
++#define PHY_MODE_RTL8211CL 0x000C
++
++struct ax88172_int_data {
++ __le16 res1;
++ u8 link;
++ __le16 res2;
++ u8 status;
++ __le16 res3;
++} __packed;
++
++static void asix_status(struct usbnet *dev, struct urb *urb)
++{
++ struct ax88172_int_data *event;
++ int link;
++
++ if (urb->actual_length < 8)
++ return;
++
++ event = urb->transfer_buffer;
++ link = event->link & 0x01;
++ if (netif_carrier_ok(dev->net) != link) {
++ usbnet_link_change(dev, link, 1);
++ netdev_dbg(dev->net, "Link Status is: %d\n", link);
++ }
++}
++
++static void asix_set_netdev_dev_addr(struct usbnet *dev, u8 *addr)
++{
++ if (is_valid_ether_addr(addr)) {
++ memcpy(dev->net->dev_addr, addr, ETH_ALEN);
++ } else {
++ netdev_info(dev->net, "invalid hw address, using random\n");
++ eth_hw_addr_random(dev->net);
++ }
++}
++
++/* Get the PHY Identifier from the PHYSID1 & PHYSID2 MII registers */
++static u32 asix_get_phyid(struct usbnet *dev)
++{
++ int phy_reg;
++ u32 phy_id;
++ int i;
++
++ /* Poll for the rare case the FW or phy isn't ready yet. */
++ for (i = 0; i < 100; i++) {
++ phy_reg = asix_mdio_read(dev->net, dev->mii.phy_id, MII_PHYSID1);
++ if (phy_reg != 0 && phy_reg != 0xFFFF)
++ break;
++ mdelay(1);
++ }
++
++ if (phy_reg <= 0 || phy_reg == 0xFFFF)
++ return 0;
++
++ phy_id = (phy_reg & 0xffff) << 16;
++
++ phy_reg = asix_mdio_read(dev->net, dev->mii.phy_id, MII_PHYSID2);
++ if (phy_reg < 0)
++ return 0;
++
++ phy_id |= (phy_reg & 0xffff);
++
++ return phy_id;
++}
++
++static u32 asix_get_link(struct net_device *net)
++{
++ struct usbnet *dev = netdev_priv(net);
++
++ return mii_link_ok(&dev->mii);
++}
++
++static int asix_ioctl (struct net_device *net, struct ifreq *rq, int cmd)
++{
++ struct usbnet *dev = netdev_priv(net);
++
++ return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
++}
++
++/* We need to override some ethtool_ops so we require our
++ own structure so we don't interfere with other usbnet
++ devices that may be connected at the same time. */
++static const struct ethtool_ops ax88172_ethtool_ops = {
++ .get_drvinfo = asix_get_drvinfo,
++ .get_link = asix_get_link,
++ .get_msglevel = usbnet_get_msglevel,
++ .set_msglevel = usbnet_set_msglevel,
++ .get_wol = asix_get_wol,
++ .set_wol = asix_set_wol,
++ .get_eeprom_len = asix_get_eeprom_len,
++ .get_eeprom = asix_get_eeprom,
++ .set_eeprom = asix_set_eeprom,
++ .get_settings = usbnet_get_settings,
++ .set_settings = usbnet_set_settings,
++ .nway_reset = usbnet_nway_reset,
++};
++
++static void ax88172_set_multicast(struct net_device *net)
++{
++ struct usbnet *dev = netdev_priv(net);
++ struct asix_data *data = (struct asix_data *)&dev->data;
++ u8 rx_ctl = 0x8c;
++
++ if (net->flags & IFF_PROMISC) {
++ rx_ctl |= 0x01;
++ } else if (net->flags & IFF_ALLMULTI ||
++ netdev_mc_count(net) > AX_MAX_MCAST) {
++ rx_ctl |= 0x02;
++ } else if (netdev_mc_empty(net)) {
++ /* just broadcast and directed */
++ } else {
++ /* We use the 20 byte dev->data
++ * for our 8 byte filter buffer
++ * to avoid allocating memory that
++ * is tricky to free later */
++ struct netdev_hw_addr *ha;
++ u32 crc_bits;
++
++ memset(data->multi_filter, 0, AX_MCAST_FILTER_SIZE);
++
++ /* Build the multicast hash filter. */
++ netdev_for_each_mc_addr(ha, net) {
++ crc_bits = ether_crc(ETH_ALEN, ha->addr) >> 26;
++ data->multi_filter[crc_bits >> 3] |=
++ 1 << (crc_bits & 7);
++ }
++
++ asix_write_cmd_async(dev, AX_CMD_WRITE_MULTI_FILTER, 0, 0,
++ AX_MCAST_FILTER_SIZE, data->multi_filter);
++
++ rx_ctl |= 0x10;
++ }
++
++ asix_write_cmd_async(dev, AX_CMD_WRITE_RX_CTL, rx_ctl, 0, 0, NULL);
++}
++
++static int ax88172_link_reset(struct usbnet *dev)
++{
++ u8 mode;
++ struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET };
++
++ mii_check_media(&dev->mii, 1, 1);
++ mii_ethtool_gset(&dev->mii, &ecmd);
++ mode = AX88172_MEDIUM_DEFAULT;
++
++ if (ecmd.duplex != DUPLEX_FULL)
++ mode |= ~AX88172_MEDIUM_FD;
++
++ netdev_dbg(dev->net, "ax88172_link_reset() speed: %u duplex: %d setting mode to 0x%04x\n",
++ ethtool_cmd_speed(&ecmd), ecmd.duplex, mode);
++
++ asix_write_medium_mode(dev, mode);
++
++ return 0;
++}
++
++static const struct net_device_ops ax88172_netdev_ops = {
++ .ndo_open = usbnet_open,
++ .ndo_stop = usbnet_stop,
++ .ndo_start_xmit = usbnet_start_xmit,
++ .ndo_tx_timeout = usbnet_tx_timeout,
++ .ndo_change_mtu = usbnet_change_mtu,
++ .ndo_set_mac_address = eth_mac_addr,
++ .ndo_validate_addr = eth_validate_addr,
++ .ndo_do_ioctl = asix_ioctl,
++ .ndo_set_rx_mode = ax88172_set_multicast,
++};
++
++static int ax88172_bind(struct usbnet *dev, struct usb_interface *intf)
++{
++ int ret = 0;
++ u8 buf[ETH_ALEN];
++ int i;
++ unsigned long gpio_bits = dev->driver_info->data;
++
++ usbnet_get_endpoints(dev,intf);
++
++ /* Toggle the GPIOs in a manufacturer/model specific way */
++ for (i = 2; i >= 0; i--) {
++ ret = asix_write_cmd(dev, AX_CMD_WRITE_GPIOS,
++ (gpio_bits >> (i * 8)) & 0xff, 0, 0, NULL);
++ if (ret < 0)
++ goto out;
++ msleep(5);
++ }
++
++ ret = asix_write_rx_ctl(dev, 0x80);
++ if (ret < 0)
++ goto out;
++
++ /* Get the MAC address */
++ ret = asix_read_cmd(dev, AX88172_CMD_READ_NODE_ID, 0, 0, ETH_ALEN, buf);
++ if (ret < 0) {
++ netdev_dbg(dev->net, "read AX_CMD_READ_NODE_ID failed: %d\n",
++ ret);
++ goto out;
++ }
++
++ asix_set_netdev_dev_addr(dev, buf);
++
++ /* Initialize MII structure */
++ dev->mii.dev = dev->net;
++ dev->mii.mdio_read = asix_mdio_read;
++ dev->mii.mdio_write = asix_mdio_write;
++ dev->mii.phy_id_mask = 0x3f;
++ dev->mii.reg_num_mask = 0x1f;
++ dev->mii.phy_id = asix_get_phy_addr(dev);
++
++ dev->net->netdev_ops = &ax88172_netdev_ops;
++ dev->net->ethtool_ops = &ax88172_ethtool_ops;
++ dev->net->needed_headroom = 4; /* cf asix_tx_fixup() */
++ dev->net->needed_tailroom = 4; /* cf asix_tx_fixup() */
++
++ asix_mdio_write(dev->net, dev->mii.phy_id, MII_BMCR, BMCR_RESET);
++ asix_mdio_write(dev->net, dev->mii.phy_id, MII_ADVERTISE,
++ ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP);
++ mii_nway_restart(&dev->mii);
++
++ return 0;
++
++out:
++ return ret;
++}
++
++static const struct ethtool_ops ax88772_ethtool_ops = {
++ .get_drvinfo = asix_get_drvinfo,
++ .get_link = asix_get_link,
++ .get_msglevel = usbnet_get_msglevel,
++ .set_msglevel = usbnet_set_msglevel,
++ .get_wol = asix_get_wol,
++ .set_wol = asix_set_wol,
++ .get_eeprom_len = asix_get_eeprom_len,
++ .get_eeprom = asix_get_eeprom,
++ .set_eeprom = asix_set_eeprom,
++ .get_settings = usbnet_get_settings,
++ .set_settings = usbnet_set_settings,
++ .nway_reset = usbnet_nway_reset,
++};
++
++static int ax88772_link_reset(struct usbnet *dev)
++{
++ u16 mode;
++ struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET };
++
++ mii_check_media(&dev->mii, 1, 1);
++ mii_ethtool_gset(&dev->mii, &ecmd);
++ mode = AX88772_MEDIUM_DEFAULT;
++
++ if (ethtool_cmd_speed(&ecmd) != SPEED_100)
++ mode &= ~AX_MEDIUM_PS;
++
++ if (ecmd.duplex != DUPLEX_FULL)
++ mode &= ~AX_MEDIUM_FD;
++
++ netdev_dbg(dev->net, "ax88772_link_reset() speed: %u duplex: %d setting mode to 0x%04x\n",
++ ethtool_cmd_speed(&ecmd), ecmd.duplex, mode);
++
++ asix_write_medium_mode(dev, mode);
++
++ return 0;
++}
++
++static int ax88772_reset(struct usbnet *dev)
++{
++ struct asix_data *data = (struct asix_data *)&dev->data;
++ int ret, embd_phy;
++ u16 rx_ctl;
++
++ ret = asix_write_gpio(dev,
++ AX_GPIO_RSE | AX_GPIO_GPO_2 | AX_GPIO_GPO2EN, 5);
++ if (ret < 0)
++ goto out;
++
++ embd_phy = ((asix_get_phy_addr(dev) & 0x1f) == 0x10 ? 1 : 0);
++
++ ret = asix_write_cmd(dev, AX_CMD_SW_PHY_SELECT, embd_phy, 0, 0, NULL);
++ if (ret < 0) {
++ netdev_dbg(dev->net, "Select PHY #1 failed: %d\n", ret);
++ goto out;
++ }
++
++ ret = asix_sw_reset(dev, AX_SWRESET_IPPD | AX_SWRESET_PRL);
++ if (ret < 0)
++ goto out;
++
++ msleep(150);
++
++ ret = asix_sw_reset(dev, AX_SWRESET_CLEAR);
++ if (ret < 0)
++ goto out;
++
++ msleep(150);
++
++ if (embd_phy) {
++ ret = asix_sw_reset(dev, AX_SWRESET_IPRL);
++ if (ret < 0)
++ goto out;
++ } else {
++ ret = asix_sw_reset(dev, AX_SWRESET_PRTE);
++ if (ret < 0)
++ goto out;
++ }
++
++ msleep(150);
++ rx_ctl = asix_read_rx_ctl(dev);
++ netdev_dbg(dev->net, "RX_CTL is 0x%04x after software reset\n", rx_ctl);
++ ret = asix_write_rx_ctl(dev, 0x0000);
++ if (ret < 0)
++ goto out;
++
++ rx_ctl = asix_read_rx_ctl(dev);
++ netdev_dbg(dev->net, "RX_CTL is 0x%04x setting to 0x0000\n", rx_ctl);
++
++ ret = asix_sw_reset(dev, AX_SWRESET_PRL);
++ if (ret < 0)
++ goto out;
++
++ msleep(150);
++
++ ret = asix_sw_reset(dev, AX_SWRESET_IPRL | AX_SWRESET_PRL);
++ if (ret < 0)
++ goto out;
++
++ msleep(150);
++
++ asix_mdio_write(dev->net, dev->mii.phy_id, MII_BMCR, BMCR_RESET);
++ asix_mdio_write(dev->net, dev->mii.phy_id, MII_ADVERTISE,
++ ADVERTISE_ALL | ADVERTISE_CSMA);
++ mii_nway_restart(&dev->mii);
++
++ ret = asix_write_medium_mode(dev, AX88772_MEDIUM_DEFAULT);
++ if (ret < 0)
++ goto out;
++
++ ret = asix_write_cmd(dev, AX_CMD_WRITE_IPG0,
++ AX88772_IPG0_DEFAULT | AX88772_IPG1_DEFAULT,
++ AX88772_IPG2_DEFAULT, 0, NULL);
++ if (ret < 0) {
++ netdev_dbg(dev->net, "Write IPG,IPG1,IPG2 failed: %d\n", ret);
++ goto out;
++ }
++
++ /* Rewrite MAC address */
++ memcpy(data->mac_addr, dev->net->dev_addr, ETH_ALEN);
++ ret = asix_write_cmd(dev, AX_CMD_WRITE_NODE_ID, 0, 0, ETH_ALEN,
++ data->mac_addr);
++ if (ret < 0)
++ goto out;
++
++ /* Set RX_CTL to default values with 2k buffer, and enable cactus */
++ ret = asix_write_rx_ctl(dev, AX_DEFAULT_RX_CTL);
++ if (ret < 0)
++ goto out;
++
++ rx_ctl = asix_read_rx_ctl(dev);
++ netdev_dbg(dev->net, "RX_CTL is 0x%04x after all initializations\n",
++ rx_ctl);
++
++ rx_ctl = asix_read_medium_status(dev);
++ netdev_dbg(dev->net,
++ "Medium Status is 0x%04x after all initializations\n",
++ rx_ctl);
++
++ return 0;
++
++out:
++ return ret;
++
++}
++
++static const struct net_device_ops ax88772_netdev_ops = {
++ .ndo_open = usbnet_open,
++ .ndo_stop = usbnet_stop,
++ .ndo_start_xmit = usbnet_start_xmit,
++ .ndo_tx_timeout = usbnet_tx_timeout,
++ .ndo_change_mtu = usbnet_change_mtu,
++ .ndo_set_mac_address = asix_set_mac_address,
++ .ndo_validate_addr = eth_validate_addr,
++ .ndo_do_ioctl = asix_ioctl,
++ .ndo_set_rx_mode = asix_set_multicast,
++};
++
++static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf)
++{
++ int ret, embd_phy, i;
++ u8 buf[ETH_ALEN];
++ u32 phyid;
++
++ usbnet_get_endpoints(dev,intf);
++
++ /* Get the MAC address */
++ if (dev->driver_info->data & FLAG_EEPROM_MAC) {
++ for (i = 0; i < (ETH_ALEN >> 1); i++) {
++ ret = asix_read_cmd(dev, AX_CMD_READ_EEPROM, 0x04 + i,
++ 0, 2, buf + i * 2);
++ if (ret < 0)
++ break;
++ }
++ } else {
++ ret = asix_read_cmd(dev, AX_CMD_READ_NODE_ID,
++ 0, 0, ETH_ALEN, buf);
++ }
++
++ if (ret < 0) {
++ netdev_dbg(dev->net, "Failed to read MAC address: %d\n", ret);
++ return ret;
++ }
++
++ asix_set_netdev_dev_addr(dev, buf);
++
++ /* Initialize MII structure */
++ dev->mii.dev = dev->net;
++ dev->mii.mdio_read = asix_mdio_read;
++ dev->mii.mdio_write = asix_mdio_write;
++ dev->mii.phy_id_mask = 0x1f;
++ dev->mii.reg_num_mask = 0x1f;
++ dev->mii.phy_id = asix_get_phy_addr(dev);
++
++ dev->net->netdev_ops = &ax88772_netdev_ops;
++ dev->net->ethtool_ops = &ax88772_ethtool_ops;
++ dev->net->needed_headroom = 4; /* cf asix_tx_fixup() */
++ dev->net->needed_tailroom = 4; /* cf asix_tx_fixup() */
++
++ embd_phy = ((dev->mii.phy_id & 0x1f) == 0x10 ? 1 : 0);
++
++ /* Reset the PHY to normal operation mode */
++ ret = asix_write_cmd(dev, AX_CMD_SW_PHY_SELECT, embd_phy, 0, 0, NULL);
++ if (ret < 0) {
++ netdev_dbg(dev->net, "Select PHY #1 failed: %d\n", ret);
++ return ret;
++ }
++
++ ax88772_reset(dev);
++
++ /* Read PHYID register *AFTER* the PHY was reset properly */
++ phyid = asix_get_phyid(dev);
++ netdev_dbg(dev->net, "PHYID=0x%08x\n", phyid);
++
++ /* Asix framing packs multiple eth frames into a 2K usb bulk transfer */
++ if (dev->driver_info->flags & FLAG_FRAMING_AX) {
++ /* hard_mtu is still the default - the device does not support
++ jumbo eth frames */
++ dev->rx_urb_size = 2048;
++ }
++
++ dev->driver_priv = kzalloc(sizeof(struct asix_common_private), GFP_KERNEL);
++ if (!dev->driver_priv)
++ return -ENOMEM;
++
++ return 0;
++}
++
++static void ax88772_unbind(struct usbnet *dev, struct usb_interface *intf)
++{
++ kfree(dev->driver_priv);
++}
++
++static const struct ethtool_ops ax88178_ethtool_ops = {
++ .get_drvinfo = asix_get_drvinfo,
++ .get_link = asix_get_link,
++ .get_msglevel = usbnet_get_msglevel,
++ .set_msglevel = usbnet_set_msglevel,
++ .get_wol = asix_get_wol,
++ .set_wol = asix_set_wol,
++ .get_eeprom_len = asix_get_eeprom_len,
++ .get_eeprom = asix_get_eeprom,
++ .set_eeprom = asix_set_eeprom,
++ .get_settings = usbnet_get_settings,
++ .set_settings = usbnet_set_settings,
++ .nway_reset = usbnet_nway_reset,
++};
++
++static int marvell_phy_init(struct usbnet *dev)
++{
++ struct asix_data *data = (struct asix_data *)&dev->data;
++ u16 reg;
++
++ netdev_dbg(dev->net, "marvell_phy_init()\n");
++
++ reg = asix_mdio_read(dev->net, dev->mii.phy_id, MII_MARVELL_STATUS);
++ netdev_dbg(dev->net, "MII_MARVELL_STATUS = 0x%04x\n", reg);
++
++ asix_mdio_write(dev->net, dev->mii.phy_id, MII_MARVELL_CTRL,
++ MARVELL_CTRL_RXDELAY | MARVELL_CTRL_TXDELAY);
++
++ if (data->ledmode) {
++ reg = asix_mdio_read(dev->net, dev->mii.phy_id,
++ MII_MARVELL_LED_CTRL);
++ netdev_dbg(dev->net, "MII_MARVELL_LED_CTRL (1) = 0x%04x\n", reg);
++
++ reg &= 0xf8ff;
++ reg |= (1 + 0x0100);
++ asix_mdio_write(dev->net, dev->mii.phy_id,
++ MII_MARVELL_LED_CTRL, reg);
++
++ reg = asix_mdio_read(dev->net, dev->mii.phy_id,
++ MII_MARVELL_LED_CTRL);
++ netdev_dbg(dev->net, "MII_MARVELL_LED_CTRL (2) = 0x%04x\n", reg);
++ reg &= 0xfc0f;
++ }
++
++ return 0;
++}
++
++static int rtl8211cl_phy_init(struct usbnet *dev)
++{
++ struct asix_data *data = (struct asix_data *)&dev->data;
++
++ netdev_dbg(dev->net, "rtl8211cl_phy_init()\n");
++
++ asix_mdio_write (dev->net, dev->mii.phy_id, 0x1f, 0x0005);
++ asix_mdio_write (dev->net, dev->mii.phy_id, 0x0c, 0);
++ asix_mdio_write (dev->net, dev->mii.phy_id, 0x01,
++ asix_mdio_read (dev->net, dev->mii.phy_id, 0x01) | 0x0080);
++ asix_mdio_write (dev->net, dev->mii.phy_id, 0x1f, 0);
++
++ if (data->ledmode == 12) {
++ asix_mdio_write (dev->net, dev->mii.phy_id, 0x1f, 0x0002);
++ asix_mdio_write (dev->net, dev->mii.phy_id, 0x1a, 0x00cb);
++ asix_mdio_write (dev->net, dev->mii.phy_id, 0x1f, 0);
++ }
++
++ return 0;
++}
++
++static int marvell_led_status(struct usbnet *dev, u16 speed)
++{
++ u16 reg = asix_mdio_read(dev->net, dev->mii.phy_id, MARVELL_LED_MANUAL);
++
++ netdev_dbg(dev->net, "marvell_led_status() read 0x%04x\n", reg);
++
++ /* Clear out the center LED bits - 0x03F0 */
++ reg &= 0xfc0f;
++
++ switch (speed) {
++ case SPEED_1000:
++ reg |= 0x03e0;
++ break;
++ case SPEED_100:
++ reg |= 0x03b0;
++ break;
++ default:
++ reg |= 0x02f0;
++ }
++
++ netdev_dbg(dev->net, "marvell_led_status() writing 0x%04x\n", reg);
++ asix_mdio_write(dev->net, dev->mii.phy_id, MARVELL_LED_MANUAL, reg);
++
++ return 0;
++}
++
++static int ax88178_reset(struct usbnet *dev)
++{
++ struct asix_data *data = (struct asix_data *)&dev->data;
++ int ret;
++ __le16 eeprom;
++ u8 status;
++ int gpio0 = 0;
++ u32 phyid;
++
++ asix_read_cmd(dev, AX_CMD_READ_GPIOS, 0, 0, 1, &status);
++ netdev_dbg(dev->net, "GPIO Status: 0x%04x\n", status);
++
++ asix_write_cmd(dev, AX_CMD_WRITE_ENABLE, 0, 0, 0, NULL);
++ asix_read_cmd(dev, AX_CMD_READ_EEPROM, 0x0017, 0, 2, &eeprom);
++ asix_write_cmd(dev, AX_CMD_WRITE_DISABLE, 0, 0, 0, NULL);
++
++ netdev_dbg(dev->net, "EEPROM index 0x17 is 0x%04x\n", eeprom);
++
++ if (eeprom == cpu_to_le16(0xffff)) {
++ data->phymode = PHY_MODE_MARVELL;
++ data->ledmode = 0;
++ gpio0 = 1;
++ } else {
++ data->phymode = le16_to_cpu(eeprom) & 0x7F;
++ data->ledmode = le16_to_cpu(eeprom) >> 8;
++ gpio0 = (le16_to_cpu(eeprom) & 0x80) ? 0 : 1;
++ }
++ netdev_dbg(dev->net, "GPIO0: %d, PhyMode: %d\n", gpio0, data->phymode);
++
++ /* Power up external GigaPHY through AX88178 GPIO pin */
++ asix_write_gpio(dev, AX_GPIO_RSE | AX_GPIO_GPO_1 | AX_GPIO_GPO1EN, 40);
++ if ((le16_to_cpu(eeprom) >> 8) != 1) {
++ asix_write_gpio(dev, 0x003c, 30);
++ asix_write_gpio(dev, 0x001c, 300);
++ asix_write_gpio(dev, 0x003c, 30);
++ } else {
++ netdev_dbg(dev->net, "gpio phymode == 1 path\n");
++ asix_write_gpio(dev, AX_GPIO_GPO1EN, 30);
++ asix_write_gpio(dev, AX_GPIO_GPO1EN | AX_GPIO_GPO_1, 30);
++ }
++
++ /* Read PHYID register *AFTER* powering up PHY */
++ phyid = asix_get_phyid(dev);
++ netdev_dbg(dev->net, "PHYID=0x%08x\n", phyid);
++
++ /* Set AX88178 to enable MII/GMII/RGMII interface for external PHY */
++ asix_write_cmd(dev, AX_CMD_SW_PHY_SELECT, 0, 0, 0, NULL);
++
++ asix_sw_reset(dev, 0);
++ msleep(150);
++
++ asix_sw_reset(dev, AX_SWRESET_PRL | AX_SWRESET_IPPD);
++ msleep(150);
++
++ asix_write_rx_ctl(dev, 0);
++
++ if (data->phymode == PHY_MODE_MARVELL) {
++ marvell_phy_init(dev);
++ msleep(60);
++ } else if (data->phymode == PHY_MODE_RTL8211CL)
++ rtl8211cl_phy_init(dev);
++
++ asix_mdio_write(dev->net, dev->mii.phy_id, MII_BMCR,
++ BMCR_RESET | BMCR_ANENABLE);
++ asix_mdio_write(dev->net, dev->mii.phy_id, MII_ADVERTISE,
++ ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP);
++ asix_mdio_write(dev->net, dev->mii.phy_id, MII_CTRL1000,
++ ADVERTISE_1000FULL);
++
++ mii_nway_restart(&dev->mii);
++
++ ret = asix_write_medium_mode(dev, AX88178_MEDIUM_DEFAULT);
++ if (ret < 0)
++ return ret;
++
++ /* Rewrite MAC address */
++ memcpy(data->mac_addr, dev->net->dev_addr, ETH_ALEN);
++ ret = asix_write_cmd(dev, AX_CMD_WRITE_NODE_ID, 0, 0, ETH_ALEN,
++ data->mac_addr);
++ if (ret < 0)
++ return ret;
++
++ ret = asix_write_rx_ctl(dev, AX_DEFAULT_RX_CTL);
++ if (ret < 0)
++ return ret;
++
++ return 0;
++}
++
++static int ax88178_link_reset(struct usbnet *dev)
++{
++ u16 mode;
++ struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET };
++ struct asix_data *data = (struct asix_data *)&dev->data;
++ u32 speed;
++
++ netdev_dbg(dev->net, "ax88178_link_reset()\n");
++
++ mii_check_media(&dev->mii, 1, 1);
++ mii_ethtool_gset(&dev->mii, &ecmd);
++ mode = AX88178_MEDIUM_DEFAULT;
++ speed = ethtool_cmd_speed(&ecmd);
++
++ if (speed == SPEED_1000)
++ mode |= AX_MEDIUM_GM;
++ else if (speed == SPEED_100)
++ mode |= AX_MEDIUM_PS;
++ else
++ mode &= ~(AX_MEDIUM_PS | AX_MEDIUM_GM);
++
++ mode |= AX_MEDIUM_ENCK;
++
++ if (ecmd.duplex == DUPLEX_FULL)
++ mode |= AX_MEDIUM_FD;
++ else
++ mode &= ~AX_MEDIUM_FD;
++
++ netdev_dbg(dev->net, "ax88178_link_reset() speed: %u duplex: %d setting mode to 0x%04x\n",
++ speed, ecmd.duplex, mode);
++
++ asix_write_medium_mode(dev, mode);
++
++ if (data->phymode == PHY_MODE_MARVELL && data->ledmode)
++ marvell_led_status(dev, speed);
++
++ return 0;
++}
++
++static void ax88178_set_mfb(struct usbnet *dev)
++{
++ u16 mfb = AX_RX_CTL_MFB_16384;
++ u16 rxctl;
++ u16 medium;
++ int old_rx_urb_size = dev->rx_urb_size;
++
++ if (dev->hard_mtu < 2048) {
++ dev->rx_urb_size = 2048;
++ mfb = AX_RX_CTL_MFB_2048;
++ } else if (dev->hard_mtu < 4096) {
++ dev->rx_urb_size = 4096;
++ mfb = AX_RX_CTL_MFB_4096;
++ } else if (dev->hard_mtu < 8192) {
++ dev->rx_urb_size = 8192;
++ mfb = AX_RX_CTL_MFB_8192;
++ } else if (dev->hard_mtu < 16384) {
++ dev->rx_urb_size = 16384;
++ mfb = AX_RX_CTL_MFB_16384;
++ }
++
++ rxctl = asix_read_rx_ctl(dev);
++ asix_write_rx_ctl(dev, (rxctl & ~AX_RX_CTL_MFB_16384) | mfb);
++
++ medium = asix_read_medium_status(dev);
++ if (dev->net->mtu > 1500)
++ medium |= AX_MEDIUM_JFE;
++ else
++ medium &= ~AX_MEDIUM_JFE;
++ asix_write_medium_mode(dev, medium);
++
++ if (dev->rx_urb_size > old_rx_urb_size)
++ usbnet_unlink_rx_urbs(dev);
++}
++
++static int ax88178_change_mtu(struct net_device *net, int new_mtu)
++{
++ struct usbnet *dev = netdev_priv(net);
++ int ll_mtu = new_mtu + net->hard_header_len + 4;
++
++ netdev_dbg(dev->net, "ax88178_change_mtu() new_mtu=%d\n", new_mtu);
++
++ if (new_mtu <= 0 || ll_mtu > 16384)
++ return -EINVAL;
++
++ if ((ll_mtu % dev->maxpacket) == 0)
++ return -EDOM;
++
++ net->mtu = new_mtu;
++ dev->hard_mtu = net->mtu + net->hard_header_len;
++ ax88178_set_mfb(dev);
++
++ /* max qlen depend on hard_mtu and rx_urb_size */
++ usbnet_update_max_qlen(dev);
++
++ return 0;
++}
++
++static const struct net_device_ops ax88178_netdev_ops = {
++ .ndo_open = usbnet_open,
++ .ndo_stop = usbnet_stop,
++ .ndo_start_xmit = usbnet_start_xmit,
++ .ndo_tx_timeout = usbnet_tx_timeout,
++ .ndo_set_mac_address = asix_set_mac_address,
++ .ndo_validate_addr = eth_validate_addr,
++ .ndo_set_rx_mode = asix_set_multicast,
++ .ndo_do_ioctl = asix_ioctl,
++ .ndo_change_mtu = ax88178_change_mtu,
++};
++
++static int ax88178_bind(struct usbnet *dev, struct usb_interface *intf)
++{
++ int ret;
++ u8 buf[ETH_ALEN];
++
++ usbnet_get_endpoints(dev,intf);
++
++ /* Get the MAC address */
++ ret = asix_read_cmd(dev, AX_CMD_READ_NODE_ID, 0, 0, ETH_ALEN, buf);
++ if (ret < 0) {
++ netdev_dbg(dev->net, "Failed to read MAC address: %d\n", ret);
++ return ret;
++ }
++
++ asix_set_netdev_dev_addr(dev, buf);
++
++ /* Initialize MII structure */
++ dev->mii.dev = dev->net;
++ dev->mii.mdio_read = asix_mdio_read;
++ dev->mii.mdio_write = asix_mdio_write;
++ dev->mii.phy_id_mask = 0x1f;
++ dev->mii.reg_num_mask = 0xff;
++ dev->mii.supports_gmii = 1;
++ dev->mii.phy_id = asix_get_phy_addr(dev);
++
++ dev->net->netdev_ops = &ax88178_netdev_ops;
++ dev->net->ethtool_ops = &ax88178_ethtool_ops;
++
++ /* Blink LEDS so users know driver saw dongle */
++ asix_sw_reset(dev, 0);
++ msleep(150);
++
++ asix_sw_reset(dev, AX_SWRESET_PRL | AX_SWRESET_IPPD);
++ msleep(150);
++
++ /* Asix framing packs multiple eth frames into a 2K usb bulk transfer */
++ if (dev->driver_info->flags & FLAG_FRAMING_AX) {
++ /* hard_mtu is still the default - the device does not support
++ jumbo eth frames */
++ dev->rx_urb_size = 2048;
++ }
++
++ dev->driver_priv = kzalloc(sizeof(struct asix_common_private), GFP_KERNEL);
++ if (!dev->driver_priv)
++ return -ENOMEM;
++
++ return 0;
++}
++
++static const struct driver_info ax8817x_info = {
++ .description = "ASIX AX8817x USB 2.0 Ethernet",
++ .bind = ax88172_bind,
++ .status = asix_status,
++ .link_reset = ax88172_link_reset,
++ .reset = ax88172_link_reset,
++ .flags = FLAG_ETHER | FLAG_LINK_INTR,
++ .data = 0x00130103,
++};
++
++static const struct driver_info dlink_dub_e100_info = {
++ .description = "DLink DUB-E100 USB Ethernet",
++ .bind = ax88172_bind,
++ .status = asix_status,
++ .link_reset = ax88172_link_reset,
++ .reset = ax88172_link_reset,
++ .flags = FLAG_ETHER | FLAG_LINK_INTR,
++ .data = 0x009f9d9f,
++};
++
++static const struct driver_info netgear_fa120_info = {
++ .description = "Netgear FA-120 USB Ethernet",
++ .bind = ax88172_bind,
++ .status = asix_status,
++ .link_reset = ax88172_link_reset,
++ .reset = ax88172_link_reset,
++ .flags = FLAG_ETHER | FLAG_LINK_INTR,
++ .data = 0x00130103,
++};
++
++static const struct driver_info hawking_uf200_info = {
++ .description = "Hawking UF200 USB Ethernet",
++ .bind = ax88172_bind,
++ .status = asix_status,
++ .link_reset = ax88172_link_reset,
++ .reset = ax88172_link_reset,
++ .flags = FLAG_ETHER | FLAG_LINK_INTR,
++ .data = 0x001f1d1f,
++};
++
++static const struct driver_info ax88772_info = {
++ .description = "ASIX AX88772 USB 2.0 Ethernet",
++ .bind = ax88772_bind,
++ .unbind = ax88772_unbind,
++ .status = asix_status,
++ .link_reset = ax88772_link_reset,
++ .reset = ax88772_link_reset,
++ .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_LINK_INTR | FLAG_MULTI_PACKET,
++ .rx_fixup = asix_rx_fixup_common,
++ .tx_fixup = asix_tx_fixup,
++};
++
++static const struct driver_info ax88772b_info = {
++ .description = "ASIX AX88772B USB 2.0 Ethernet",
++ .bind = ax88772_bind,
++ .unbind = ax88772_unbind,
++ .status = asix_status,
++ .link_reset = ax88772_link_reset,
++ .reset = ax88772_reset,
++ .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_LINK_INTR |
++ FLAG_MULTI_PACKET,
++ .rx_fixup = asix_rx_fixup_common,
++ .tx_fixup = asix_tx_fixup,
++ .data = FLAG_EEPROM_MAC,
++};
++
++static const struct driver_info ax88178_info = {
++ .description = "ASIX AX88178 USB 2.0 Ethernet",
++ .bind = ax88178_bind,
++ .unbind = ax88772_unbind,
++ .status = asix_status,
++ .link_reset = ax88178_link_reset,
++ .reset = ax88178_reset,
++ .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_LINK_INTR |
++ FLAG_MULTI_PACKET,
++ .rx_fixup = asix_rx_fixup_common,
++ .tx_fixup = asix_tx_fixup,
++};
++
++/*
++ * USBLINK 20F9 "USB 2.0 LAN" USB ethernet adapter, typically found in
++ * no-name packaging.
++ * USB device strings are:
++ * 1: Manufacturer: USBLINK
++ * 2: Product: HG20F9 USB2.0
++ * 3: Serial: 000003
++ * Appears to be compatible with Asix 88772B.
++ */
++static const struct driver_info hg20f9_info = {
++ .description = "HG20F9 USB 2.0 Ethernet",
++ .bind = ax88772_bind,
++ .unbind = ax88772_unbind,
++ .status = asix_status,
++ .link_reset = ax88772_link_reset,
++ .reset = ax88772_reset,
++ .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_LINK_INTR |
++ FLAG_MULTI_PACKET,
++ .rx_fixup = asix_rx_fixup_common,
++ .tx_fixup = asix_tx_fixup,
++ .data = FLAG_EEPROM_MAC,
++};
++
++static const struct usb_device_id products [] = {
++{
++ // Linksys USB200M
++ USB_DEVICE (0x077b, 0x2226),
++ .driver_info = (unsigned long) &ax8817x_info,
++}, {
++ // Netgear FA120
++ USB_DEVICE (0x0846, 0x1040),
++ .driver_info = (unsigned long) &netgear_fa120_info,
++}, {
++ // DLink DUB-E100
++ USB_DEVICE (0x2001, 0x1a00),
++ .driver_info = (unsigned long) &dlink_dub_e100_info,
++}, {
++ // Intellinet, ST Lab USB Ethernet
++ USB_DEVICE (0x0b95, 0x1720),
++ .driver_info = (unsigned long) &ax8817x_info,
++}, {
++ // Hawking UF200, TrendNet TU2-ET100
++ USB_DEVICE (0x07b8, 0x420a),
++ .driver_info = (unsigned long) &hawking_uf200_info,
++}, {
++ // Billionton Systems, USB2AR
++ USB_DEVICE (0x08dd, 0x90ff),
++ .driver_info = (unsigned long) &ax8817x_info,
++}, {
++ // ATEN UC210T
++ USB_DEVICE (0x0557, 0x2009),
++ .driver_info = (unsigned long) &ax8817x_info,
++}, {
++ // Buffalo LUA-U2-KTX
++ USB_DEVICE (0x0411, 0x003d),
++ .driver_info = (unsigned long) &ax8817x_info,
++}, {
++ // Buffalo LUA-U2-GT 10/100/1000
++ USB_DEVICE (0x0411, 0x006e),
++ .driver_info = (unsigned long) &ax88178_info,
++}, {
++ // Sitecom LN-029 "USB 2.0 10/100 Ethernet adapter"
++ USB_DEVICE (0x6189, 0x182d),
++ .driver_info = (unsigned long) &ax8817x_info,
++}, {
++ // Sitecom LN-031 "USB 2.0 10/100/1000 Ethernet adapter"
++ USB_DEVICE (0x0df6, 0x0056),
++ .driver_info = (unsigned long) &ax88178_info,
++}, {
++ // Sitecom LN-028 "USB 2.0 10/100/1000 Ethernet adapter"
++ USB_DEVICE (0x0df6, 0x061c),
++ .driver_info = (unsigned long) &ax88178_info,
++}, {
++ // corega FEther USB2-TX
++ USB_DEVICE (0x07aa, 0x0017),
++ .driver_info = (unsigned long) &ax8817x_info,
++}, {
++ // Surecom EP-1427X-2
++ USB_DEVICE (0x1189, 0x0893),
++ .driver_info = (unsigned long) &ax8817x_info,
++}, {
++ // goodway corp usb gwusb2e
++ USB_DEVICE (0x1631, 0x6200),
++ .driver_info = (unsigned long) &ax8817x_info,
++}, {
++ // JVC MP-PRX1 Port Replicator
++ USB_DEVICE (0x04f1, 0x3008),
++ .driver_info = (unsigned long) &ax8817x_info,
++}, {
++ // Lenovo U2L100P 10/100
++ USB_DEVICE (0x17ef, 0x7203),
++ .driver_info = (unsigned long) &ax88772_info,
++}, {
++ // ASIX AX88772B 10/100
++ USB_DEVICE (0x0b95, 0x772b),
++ .driver_info = (unsigned long) &ax88772b_info,
++}, {
++ // ASIX AX88772 10/100
++ USB_DEVICE (0x0b95, 0x7720),
++ .driver_info = (unsigned long) &ax88772_info,
++}, {
++ // ASIX AX88178 10/100/1000
++ USB_DEVICE (0x0b95, 0x1780),
++ .driver_info = (unsigned long) &ax88178_info,
++}, {
++ // Logitec LAN-GTJ/U2A
++ USB_DEVICE (0x0789, 0x0160),
++ .driver_info = (unsigned long) &ax88178_info,
++}, {
++ // Linksys USB200M Rev 2
++ USB_DEVICE (0x13b1, 0x0018),
++ .driver_info = (unsigned long) &ax88772_info,
++}, {
++ // 0Q0 cable ethernet
++ USB_DEVICE (0x1557, 0x7720),
++ .driver_info = (unsigned long) &ax88772_info,
++}, {
++ // DLink DUB-E100 H/W Ver B1
++ USB_DEVICE (0x07d1, 0x3c05),
++ .driver_info = (unsigned long) &ax88772_info,
++}, {
++ // DLink DUB-E100 H/W Ver B1 Alternate
++ USB_DEVICE (0x2001, 0x3c05),
++ .driver_info = (unsigned long) &ax88772_info,
++}, {
++ // DLink DUB-E100 H/W Ver C1
++ USB_DEVICE (0x2001, 0x1a02),
++ .driver_info = (unsigned long) &ax88772_info,
++}, {
++ // Linksys USB1000
++ USB_DEVICE (0x1737, 0x0039),
++ .driver_info = (unsigned long) &ax88178_info,
++}, {
++ // IO-DATA ETG-US2
++ USB_DEVICE (0x04bb, 0x0930),
++ .driver_info = (unsigned long) &ax88178_info,
++}, {
++ // Belkin F5D5055
++ USB_DEVICE(0x050d, 0x5055),
++ .driver_info = (unsigned long) &ax88178_info,
++}, {
++ // Apple USB Ethernet Adapter
++ USB_DEVICE(0x05ac, 0x1402),
++ .driver_info = (unsigned long) &ax88772_info,
++}, {
++ // Cables-to-Go USB Ethernet Adapter
++ USB_DEVICE(0x0b95, 0x772a),
++ .driver_info = (unsigned long) &ax88772_info,
++}, {
++ // ABOCOM for pci
++ USB_DEVICE(0x14ea, 0xab11),
++ .driver_info = (unsigned long) &ax88178_info,
++}, {
++ // ASIX 88772a
++ USB_DEVICE(0x0db0, 0xa877),
++ .driver_info = (unsigned long) &ax88772_info,
++}, {
++ // Asus USB Ethernet Adapter
++ USB_DEVICE (0x0b95, 0x7e2b),
++ .driver_info = (unsigned long) &ax88772_info,
++}, {
++ /* ASIX 88172a demo board */
++ USB_DEVICE(0x0b95, 0x172a),
++ .driver_info = (unsigned long) &ax88172a_info,
++}, {
++ /*
++ * USBLINK HG20F9 "USB 2.0 LAN"
++ * Appears to have gazumped Linksys's manufacturer ID but
++ * doesn't (yet) conflict with any known Linksys product.
++ */
++ USB_DEVICE(0x066b, 0x20f9),
++ .driver_info = (unsigned long) &hg20f9_info,
++},
++ { }, // END
++};
++MODULE_DEVICE_TABLE(usb, products);
++
++static struct usb_driver asix_driver = {
++ .name = DRIVER_NAME,
++ .id_table = products,
++ .probe = usbnet_probe,
++ .suspend = usbnet_suspend,
++ .resume = usbnet_resume,
++ .disconnect = usbnet_disconnect,
++ .supports_autosuspend = 1,
++ .disable_hub_initiated_lpm = 1,
++};
++
++module_usb_driver(asix_driver);
++
++MODULE_AUTHOR("David Hollis");
++MODULE_VERSION(DRIVER_VERSION);
++MODULE_DESCRIPTION("ASIX AX8817X based USB 2.0 Ethernet Devices");
++MODULE_LICENSE("GPL");
++
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/asix.h backports-4.2.6-1/drivers/net/usb/asix.h
+--- backports-4.2.6-1.org/drivers/net/usb/asix.h 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/asix.h 2015-11-09 23:37:56.000000000 +0100
+@@ -0,0 +1,234 @@
++/*
++ * ASIX AX8817X based USB 2.0 Ethernet Devices
++ * Copyright (C) 2003-2006 David Hollis <dhollis(a)davehollis.com>
++ * Copyright (C) 2005 Phil Chang <pchang23(a)sbcglobal.net>
++ * Copyright (C) 2006 James Painter <jamie.painter(a)iname.com>
++ * Copyright (c) 2002-2003 TiVo Inc.
++ *
++ * 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, see <http://www.gnu.org/licenses/>.
++ */
++
++#ifndef _ASIX_H
++#define _ASIX_H
++
++// #define DEBUG // error path messages, extra info
++// #define VERBOSE // more; success messages
++
++#include <linux/module.h>
++#include <linux/kmod.h>
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/ethtool.h>
++#include <linux/workqueue.h>
++#include <linux/mii.h>
++#include <linux/usb.h>
++#include <linux/crc32.h>
++#include <linux/usb/usbnet.h>
++#include <linux/slab.h>
++#include <linux/if_vlan.h>
++
++#define DRIVER_VERSION "22-Dec-2011"
++#define DRIVER_NAME "asix"
++
++/* ASIX AX8817X based USB 2.0 Ethernet Devices */
++
++#define AX_CMD_SET_SW_MII 0x06
++#define AX_CMD_READ_MII_REG 0x07
++#define AX_CMD_WRITE_MII_REG 0x08
++#define AX_CMD_SET_HW_MII 0x0a
++#define AX_CMD_READ_EEPROM 0x0b
++#define AX_CMD_WRITE_EEPROM 0x0c
++#define AX_CMD_WRITE_ENABLE 0x0d
++#define AX_CMD_WRITE_DISABLE 0x0e
++#define AX_CMD_READ_RX_CTL 0x0f
++#define AX_CMD_WRITE_RX_CTL 0x10
++#define AX_CMD_READ_IPG012 0x11
++#define AX_CMD_WRITE_IPG0 0x12
++#define AX_CMD_WRITE_IPG1 0x13
++#define AX_CMD_READ_NODE_ID 0x13
++#define AX_CMD_WRITE_NODE_ID 0x14
++#define AX_CMD_WRITE_IPG2 0x14
++#define AX_CMD_WRITE_MULTI_FILTER 0x16
++#define AX88172_CMD_READ_NODE_ID 0x17
++#define AX_CMD_READ_PHY_ID 0x19
++#define AX_CMD_READ_MEDIUM_STATUS 0x1a
++#define AX_CMD_WRITE_MEDIUM_MODE 0x1b
++#define AX_CMD_READ_MONITOR_MODE 0x1c
++#define AX_CMD_WRITE_MONITOR_MODE 0x1d
++#define AX_CMD_READ_GPIOS 0x1e
++#define AX_CMD_WRITE_GPIOS 0x1f
++#define AX_CMD_SW_RESET 0x20
++#define AX_CMD_SW_PHY_STATUS 0x21
++#define AX_CMD_SW_PHY_SELECT 0x22
++
++#define AX_PHY_SELECT_MASK (BIT(3) | BIT(2))
++#define AX_PHY_SELECT_INTERNAL 0
++#define AX_PHY_SELECT_EXTERNAL BIT(2)
++
++#define AX_MONITOR_MODE 0x01
++#define AX_MONITOR_LINK 0x02
++#define AX_MONITOR_MAGIC 0x04
++#define AX_MONITOR_HSFS 0x10
++
++/* AX88172 Medium Status Register values */
++#define AX88172_MEDIUM_FD 0x02
++#define AX88172_MEDIUM_TX 0x04
++#define AX88172_MEDIUM_FC 0x10
++#define AX88172_MEDIUM_DEFAULT \
++ ( AX88172_MEDIUM_FD | AX88172_MEDIUM_TX | AX88172_MEDIUM_FC )
++
++#define AX_MCAST_FILTER_SIZE 8
++#define AX_MAX_MCAST 64
++
++#define AX_SWRESET_CLEAR 0x00
++#define AX_SWRESET_RR 0x01
++#define AX_SWRESET_RT 0x02
++#define AX_SWRESET_PRTE 0x04
++#define AX_SWRESET_PRL 0x08
++#define AX_SWRESET_BZ 0x10
++#define AX_SWRESET_IPRL 0x20
++#define AX_SWRESET_IPPD 0x40
++
++#define AX88772_IPG0_DEFAULT 0x15
++#define AX88772_IPG1_DEFAULT 0x0c
++#define AX88772_IPG2_DEFAULT 0x12
++
++/* AX88772 & AX88178 Medium Mode Register */
++#define AX_MEDIUM_PF 0x0080
++#define AX_MEDIUM_JFE 0x0040
++#define AX_MEDIUM_TFC 0x0020
++#define AX_MEDIUM_RFC 0x0010
++#define AX_MEDIUM_ENCK 0x0008
++#define AX_MEDIUM_AC 0x0004
++#define AX_MEDIUM_FD 0x0002
++#define AX_MEDIUM_GM 0x0001
++#define AX_MEDIUM_SM 0x1000
++#define AX_MEDIUM_SBP 0x0800
++#define AX_MEDIUM_PS 0x0200
++#define AX_MEDIUM_RE 0x0100
++
++#define AX88178_MEDIUM_DEFAULT \
++ (AX_MEDIUM_PS | AX_MEDIUM_FD | AX_MEDIUM_AC | \
++ AX_MEDIUM_RFC | AX_MEDIUM_TFC | AX_MEDIUM_JFE | \
++ AX_MEDIUM_RE)
++
++#define AX88772_MEDIUM_DEFAULT \
++ (AX_MEDIUM_FD | AX_MEDIUM_RFC | \
++ AX_MEDIUM_TFC | AX_MEDIUM_PS | \
++ AX_MEDIUM_AC | AX_MEDIUM_RE)
++
++/* AX88772 & AX88178 RX_CTL values */
++#define AX_RX_CTL_SO 0x0080
++#define AX_RX_CTL_AP 0x0020
++#define AX_RX_CTL_AM 0x0010
++#define AX_RX_CTL_AB 0x0008
++#define AX_RX_CTL_SEP 0x0004
++#define AX_RX_CTL_AMALL 0x0002
++#define AX_RX_CTL_PRO 0x0001
++#define AX_RX_CTL_MFB_2048 0x0000
++#define AX_RX_CTL_MFB_4096 0x0100
++#define AX_RX_CTL_MFB_8192 0x0200
++#define AX_RX_CTL_MFB_16384 0x0300
++
++#define AX_DEFAULT_RX_CTL (AX_RX_CTL_SO | AX_RX_CTL_AB)
++
++/* GPIO 0 .. 2 toggles */
++#define AX_GPIO_GPO0EN 0x01 /* GPIO0 Output enable */
++#define AX_GPIO_GPO_0 0x02 /* GPIO0 Output value */
++#define AX_GPIO_GPO1EN 0x04 /* GPIO1 Output enable */
++#define AX_GPIO_GPO_1 0x08 /* GPIO1 Output value */
++#define AX_GPIO_GPO2EN 0x10 /* GPIO2 Output enable */
++#define AX_GPIO_GPO_2 0x20 /* GPIO2 Output value */
++#define AX_GPIO_RESERVED 0x40 /* Reserved */
++#define AX_GPIO_RSE 0x80 /* Reload serial EEPROM */
++
++#define AX_EEPROM_MAGIC 0xdeadbeef
++#define AX_EEPROM_LEN 0x200
++
++/* This structure cannot exceed sizeof(unsigned long [5]) AKA 20 bytes */
++struct asix_data {
++ u8 multi_filter[AX_MCAST_FILTER_SIZE];
++ u8 mac_addr[ETH_ALEN];
++ u8 phymode;
++ u8 ledmode;
++ u8 res;
++};
++
++struct asix_rx_fixup_info {
++ struct sk_buff *ax_skb;
++ u32 header;
++ u16 size;
++ bool split_head;
++};
++
++struct asix_common_private {
++ struct asix_rx_fixup_info rx_fixup_info;
++};
++
++extern const struct driver_info ax88172a_info;
++
++/* ASIX specific flags */
++#define FLAG_EEPROM_MAC (1UL << 0) /* init device MAC from eeprom */
++
++int asix_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
++ u16 size, void *data);
++
++int asix_write_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
++ u16 size, void *data);
++
++void asix_write_cmd_async(struct usbnet *dev, u8 cmd, u16 value,
++ u16 index, u16 size, void *data);
++
++int asix_rx_fixup_internal(struct usbnet *dev, struct sk_buff *skb,
++ struct asix_rx_fixup_info *rx);
++int asix_rx_fixup_common(struct usbnet *dev, struct sk_buff *skb);
++
++struct sk_buff *asix_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
++ gfp_t flags);
++
++int asix_set_sw_mii(struct usbnet *dev);
++int asix_set_hw_mii(struct usbnet *dev);
++
++int asix_read_phy_addr(struct usbnet *dev, int internal);
++int asix_get_phy_addr(struct usbnet *dev);
++
++int asix_sw_reset(struct usbnet *dev, u8 flags);
++
++u16 asix_read_rx_ctl(struct usbnet *dev);
++int asix_write_rx_ctl(struct usbnet *dev, u16 mode);
++
++u16 asix_read_medium_status(struct usbnet *dev);
++int asix_write_medium_mode(struct usbnet *dev, u16 mode);
++
++int asix_write_gpio(struct usbnet *dev, u16 value, int sleep);
++
++void asix_set_multicast(struct net_device *net);
++
++int asix_mdio_read(struct net_device *netdev, int phy_id, int loc);
++void asix_mdio_write(struct net_device *netdev, int phy_id, int loc, int val);
++
++void asix_get_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo);
++int asix_set_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo);
++
++int asix_get_eeprom_len(struct net_device *net);
++int asix_get_eeprom(struct net_device *net, struct ethtool_eeprom *eeprom,
++ u8 *data);
++int asix_set_eeprom(struct net_device *net, struct ethtool_eeprom *eeprom,
++ u8 *data);
++
++void asix_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *info);
++
++int asix_set_mac_address(struct net_device *net, void *p);
++
++#endif /* _ASIX_H */
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/ax88172a.c backports-4.2.6-1/drivers/net/usb/ax88172a.c
+--- backports-4.2.6-1.org/drivers/net/usb/ax88172a.c 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/ax88172a.c 2015-11-09 23:37:56.000000000 +0100
+@@ -0,0 +1,422 @@
++/*
++ * ASIX AX88172A based USB 2.0 Ethernet Devices
++ * Copyright (C) 2012 OMICRON electronics GmbH
++ *
++ * Supports external PHYs via phylib. Based on the driver for the
++ * AX88772. Original copyrights follow:
++ *
++ * Copyright (C) 2003-2006 David Hollis <dhollis(a)davehollis.com>
++ * Copyright (C) 2005 Phil Chang <pchang23(a)sbcglobal.net>
++ * Copyright (C) 2006 James Painter <jamie.painter(a)iname.com>
++ * Copyright (c) 2002-2003 TiVo Inc.
++ *
++ * 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, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "asix.h"
++#include <linux/phy.h>
++
++struct ax88172a_private {
++ struct mii_bus *mdio;
++ struct phy_device *phydev;
++ char phy_name[20];
++ u16 phy_addr;
++ u16 oldmode;
++ int use_embdphy;
++ struct asix_rx_fixup_info rx_fixup_info;
++};
++
++/* MDIO read and write wrappers for phylib */
++static int asix_mdio_bus_read(struct mii_bus *bus, int phy_id, int regnum)
++{
++ return asix_mdio_read(((struct usbnet *)bus->priv)->net, phy_id,
++ regnum);
++}
++
++static int asix_mdio_bus_write(struct mii_bus *bus, int phy_id, int regnum,
++ u16 val)
++{
++ asix_mdio_write(((struct usbnet *)bus->priv)->net, phy_id, regnum, val);
++ return 0;
++}
++
++static int ax88172a_ioctl(struct net_device *net, struct ifreq *rq, int cmd)
++{
++ if (!netif_running(net))
++ return -EINVAL;
++
++ if (!net->phydev)
++ return -ENODEV;
++
++ return phy_mii_ioctl(net->phydev, rq, cmd);
++}
++
++/* set MAC link settings according to information from phylib */
++static void ax88172a_adjust_link(struct net_device *netdev)
++{
++ struct phy_device *phydev = netdev->phydev;
++ struct usbnet *dev = netdev_priv(netdev);
++ struct ax88172a_private *priv = dev->driver_priv;
++ u16 mode = 0;
++
++ if (phydev->link) {
++ mode = AX88772_MEDIUM_DEFAULT;
++
++ if (phydev->duplex == DUPLEX_HALF)
++ mode &= ~AX_MEDIUM_FD;
++
++ if (phydev->speed != SPEED_100)
++ mode &= ~AX_MEDIUM_PS;
++ }
++
++ if (mode != priv->oldmode) {
++ asix_write_medium_mode(dev, mode);
++ priv->oldmode = mode;
++ netdev_dbg(netdev, "speed %u duplex %d, setting mode to 0x%04x\n",
++ phydev->speed, phydev->duplex, mode);
++ phy_print_status(phydev);
++ }
++}
++
++static void ax88172a_status(struct usbnet *dev, struct urb *urb)
++{
++ /* link changes are detected by polling the phy */
++}
++
++/* use phylib infrastructure */
++static int ax88172a_init_mdio(struct usbnet *dev)
++{
++ struct ax88172a_private *priv = dev->driver_priv;
++ int ret, i;
++
++ priv->mdio = mdiobus_alloc();
++ if (!priv->mdio) {
++ netdev_err(dev->net, "Could not allocate MDIO bus\n");
++ return -ENOMEM;
++ }
++
++ priv->mdio->priv = (void *)dev;
++ priv->mdio->read = &asix_mdio_bus_read;
++ priv->mdio->write = &asix_mdio_bus_write;
++ priv->mdio->name = "Asix MDIO Bus";
++ /* mii bus name is usb-<usb bus number>-<usb device number> */
++ snprintf(priv->mdio->id, MII_BUS_ID_SIZE, "usb-%03d:%03d",
++ dev->udev->bus->busnum, dev->udev->devnum);
++
++ priv->mdio->irq = kzalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);
++ if (!priv->mdio->irq) {
++ ret = -ENOMEM;
++ goto mfree;
++ }
++ for (i = 0; i < PHY_MAX_ADDR; i++)
++ priv->mdio->irq[i] = PHY_POLL;
++
++ ret = mdiobus_register(priv->mdio);
++ if (ret) {
++ netdev_err(dev->net, "Could not register MDIO bus\n");
++ goto ifree;
++ }
++
++ netdev_info(dev->net, "registered mdio bus %s\n", priv->mdio->id);
++ return 0;
++
++ifree:
++ kfree(priv->mdio->irq);
++mfree:
++ mdiobus_free(priv->mdio);
++ return ret;
++}
++
++static void ax88172a_remove_mdio(struct usbnet *dev)
++{
++ struct ax88172a_private *priv = dev->driver_priv;
++
++ netdev_info(dev->net, "deregistering mdio bus %s\n", priv->mdio->id);
++ mdiobus_unregister(priv->mdio);
++ kfree(priv->mdio->irq);
++ mdiobus_free(priv->mdio);
++}
++
++static const struct net_device_ops ax88172a_netdev_ops = {
++ .ndo_open = usbnet_open,
++ .ndo_stop = usbnet_stop,
++ .ndo_start_xmit = usbnet_start_xmit,
++ .ndo_tx_timeout = usbnet_tx_timeout,
++ .ndo_change_mtu = usbnet_change_mtu,
++ .ndo_set_mac_address = asix_set_mac_address,
++ .ndo_validate_addr = eth_validate_addr,
++ .ndo_do_ioctl = ax88172a_ioctl,
++ .ndo_set_rx_mode = asix_set_multicast,
++};
++
++static int ax88172a_get_settings(struct net_device *net,
++ struct ethtool_cmd *cmd)
++{
++ if (!net->phydev)
++ return -ENODEV;
++
++ return phy_ethtool_gset(net->phydev, cmd);
++}
++
++static int ax88172a_set_settings(struct net_device *net,
++ struct ethtool_cmd *cmd)
++{
++ if (!net->phydev)
++ return -ENODEV;
++
++ return phy_ethtool_sset(net->phydev, cmd);
++}
++
++static int ax88172a_nway_reset(struct net_device *net)
++{
++ if (!net->phydev)
++ return -ENODEV;
++
++ return phy_start_aneg(net->phydev);
++}
++
++static const struct ethtool_ops ax88172a_ethtool_ops = {
++ .get_drvinfo = asix_get_drvinfo,
++ .get_link = usbnet_get_link,
++ .get_msglevel = usbnet_get_msglevel,
++ .set_msglevel = usbnet_set_msglevel,
++ .get_wol = asix_get_wol,
++ .set_wol = asix_set_wol,
++ .get_eeprom_len = asix_get_eeprom_len,
++ .get_eeprom = asix_get_eeprom,
++ .set_eeprom = asix_set_eeprom,
++ .get_settings = ax88172a_get_settings,
++ .set_settings = ax88172a_set_settings,
++ .nway_reset = ax88172a_nway_reset,
++};
++
++static int ax88172a_reset_phy(struct usbnet *dev, int embd_phy)
++{
++ int ret;
++
++ ret = asix_sw_reset(dev, AX_SWRESET_IPPD);
++ if (ret < 0)
++ goto err;
++
++ msleep(150);
++ ret = asix_sw_reset(dev, AX_SWRESET_CLEAR);
++ if (ret < 0)
++ goto err;
++
++ msleep(150);
++
++ ret = asix_sw_reset(dev, embd_phy ? AX_SWRESET_IPRL : AX_SWRESET_IPPD);
++ if (ret < 0)
++ goto err;
++
++ return 0;
++
++err:
++ return ret;
++}
++
++
++static int ax88172a_bind(struct usbnet *dev, struct usb_interface *intf)
++{
++ int ret;
++ u8 buf[ETH_ALEN];
++ struct ax88172a_private *priv;
++
++ usbnet_get_endpoints(dev, intf);
++
++ priv = kzalloc(sizeof(*priv), GFP_KERNEL);
++ if (!priv)
++ return -ENOMEM;
++
++ dev->driver_priv = priv;
++
++ /* Get the MAC address */
++ ret = asix_read_cmd(dev, AX_CMD_READ_NODE_ID, 0, 0, ETH_ALEN, buf);
++ if (ret < 0) {
++ netdev_err(dev->net, "Failed to read MAC address: %d\n", ret);
++ goto free;
++ }
++ memcpy(dev->net->dev_addr, buf, ETH_ALEN);
++
++ dev->net->netdev_ops = &ax88172a_netdev_ops;
++ dev->net->ethtool_ops = &ax88172a_ethtool_ops;
++
++ /* are we using the internal or the external phy? */
++ ret = asix_read_cmd(dev, AX_CMD_SW_PHY_STATUS, 0, 0, 1, buf);
++ if (ret < 0) {
++ netdev_err(dev->net, "Failed to read software interface selection register: %d\n",
++ ret);
++ goto free;
++ }
++
++ netdev_dbg(dev->net, "AX_CMD_SW_PHY_STATUS = 0x%02x\n", buf[0]);
++ switch (buf[0] & AX_PHY_SELECT_MASK) {
++ case AX_PHY_SELECT_INTERNAL:
++ netdev_dbg(dev->net, "use internal phy\n");
++ priv->use_embdphy = 1;
++ break;
++ case AX_PHY_SELECT_EXTERNAL:
++ netdev_dbg(dev->net, "use external phy\n");
++ priv->use_embdphy = 0;
++ break;
++ default:
++ netdev_err(dev->net, "Interface mode not supported by driver\n");
++ ret = -ENOTSUPP;
++ goto free;
++ }
++
++ priv->phy_addr = asix_read_phy_addr(dev, priv->use_embdphy);
++ ax88172a_reset_phy(dev, priv->use_embdphy);
++
++ /* Asix framing packs multiple eth frames into a 2K usb bulk transfer */
++ if (dev->driver_info->flags & FLAG_FRAMING_AX) {
++ /* hard_mtu is still the default - the device does not support
++ jumbo eth frames */
++ dev->rx_urb_size = 2048;
++ }
++
++ /* init MDIO bus */
++ ret = ax88172a_init_mdio(dev);
++ if (ret)
++ goto free;
++
++ return 0;
++
++free:
++ kfree(priv);
++ return ret;
++}
++
++static int ax88172a_stop(struct usbnet *dev)
++{
++ struct ax88172a_private *priv = dev->driver_priv;
++
++ netdev_dbg(dev->net, "Stopping interface\n");
++
++ if (priv->phydev) {
++ netdev_info(dev->net, "Disconnecting from phy %s\n",
++ priv->phy_name);
++ phy_stop(priv->phydev);
++ phy_disconnect(priv->phydev);
++ }
++
++ return 0;
++}
++
++static void ax88172a_unbind(struct usbnet *dev, struct usb_interface *intf)
++{
++ struct ax88172a_private *priv = dev->driver_priv;
++
++ ax88172a_remove_mdio(dev);
++ kfree(priv);
++}
++
++static int ax88172a_reset(struct usbnet *dev)
++{
++ struct asix_data *data = (struct asix_data *)&dev->data;
++ struct ax88172a_private *priv = dev->driver_priv;
++ int ret;
++ u16 rx_ctl;
++
++ ax88172a_reset_phy(dev, priv->use_embdphy);
++
++ msleep(150);
++ rx_ctl = asix_read_rx_ctl(dev);
++ netdev_dbg(dev->net, "RX_CTL is 0x%04x after software reset\n", rx_ctl);
++ ret = asix_write_rx_ctl(dev, 0x0000);
++ if (ret < 0)
++ goto out;
++
++ rx_ctl = asix_read_rx_ctl(dev);
++ netdev_dbg(dev->net, "RX_CTL is 0x%04x setting to 0x0000\n", rx_ctl);
++
++ msleep(150);
++
++ ret = asix_write_cmd(dev, AX_CMD_WRITE_IPG0,
++ AX88772_IPG0_DEFAULT | AX88772_IPG1_DEFAULT,
++ AX88772_IPG2_DEFAULT, 0, NULL);
++ if (ret < 0) {
++ netdev_err(dev->net, "Write IPG,IPG1,IPG2 failed: %d\n", ret);
++ goto out;
++ }
++
++ /* Rewrite MAC address */
++ memcpy(data->mac_addr, dev->net->dev_addr, ETH_ALEN);
++ ret = asix_write_cmd(dev, AX_CMD_WRITE_NODE_ID, 0, 0, ETH_ALEN,
++ data->mac_addr);
++ if (ret < 0)
++ goto out;
++
++ /* Set RX_CTL to default values with 2k buffer, and enable cactus */
++ ret = asix_write_rx_ctl(dev, AX_DEFAULT_RX_CTL);
++ if (ret < 0)
++ goto out;
++
++ rx_ctl = asix_read_rx_ctl(dev);
++ netdev_dbg(dev->net, "RX_CTL is 0x%04x after all initializations\n",
++ rx_ctl);
++
++ rx_ctl = asix_read_medium_status(dev);
++ netdev_dbg(dev->net, "Medium Status is 0x%04x after all initializations\n",
++ rx_ctl);
++
++ /* Connect to PHY */
++ snprintf(priv->phy_name, 20, PHY_ID_FMT,
++ priv->mdio->id, priv->phy_addr);
++
++ priv->phydev = phy_connect(dev->net, priv->phy_name,
++ &ax88172a_adjust_link,
++ PHY_INTERFACE_MODE_MII);
++ if (IS_ERR(priv->phydev)) {
++ netdev_err(dev->net, "Could not connect to PHY device %s\n",
++ priv->phy_name);
++ ret = PTR_ERR(priv->phydev);
++ goto out;
++ }
++
++ netdev_info(dev->net, "Connected to phy %s\n", priv->phy_name);
++
++ /* During power-up, the AX88172A set the power down (BMCR_PDOWN)
++ * bit of the PHY. Bring the PHY up again.
++ */
++ genphy_resume(priv->phydev);
++ phy_start(priv->phydev);
++
++ return 0;
++
++out:
++ return ret;
++
++}
++
++static int ax88172a_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
++{
++ struct ax88172a_private *dp = dev->driver_priv;
++ struct asix_rx_fixup_info *rx = &dp->rx_fixup_info;
++
++ return asix_rx_fixup_internal(dev, skb, rx);
++}
++
++const struct driver_info ax88172a_info = {
++ .description = "ASIX AX88172A USB 2.0 Ethernet",
++ .bind = ax88172a_bind,
++ .reset = ax88172a_reset,
++ .stop = ax88172a_stop,
++ .unbind = ax88172a_unbind,
++ .status = ax88172a_status,
++ .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_LINK_INTR |
++ FLAG_MULTI_PACKET,
++ .rx_fixup = ax88172a_rx_fixup,
++ .tx_fixup = asix_tx_fixup,
++};
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/ax88179_178a.c backports-4.2.6-1/drivers/net/usb/ax88179_178a.c
+--- backports-4.2.6-1.org/drivers/net/usb/ax88179_178a.c 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/ax88179_178a.c 2015-11-09 23:37:56.000000000 +0100
+@@ -0,0 +1,1756 @@
++/*
++ * ASIX AX88179/178A USB 3.0/2.0 to Gigabit Ethernet Devices
++ *
++ * Copyright (C) 2011-2013 ASIX
++ *
++ * 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, see <http://www.gnu.org/licenses/>.
++ */
++
++#include <linux/module.h>
++#include <linux/etherdevice.h>
++#include <linux/mii.h>
++#include <linux/usb.h>
++#include <linux/crc32.h>
++#include <linux/usb/usbnet.h>
++#include <uapi/linux/mdio.h>
++#include <linux/mdio.h>
++
++#define AX88179_PHY_ID 0x03
++#define AX_EEPROM_LEN 0x100
++#define AX88179_EEPROM_MAGIC 0x17900b95
++#define AX_MCAST_FLTSIZE 8
++#define AX_MAX_MCAST 64
++#define AX_INT_PPLS_LINK ((u32)BIT(16))
++#define AX_RXHDR_L4_TYPE_MASK 0x1c
++#define AX_RXHDR_L4_TYPE_UDP 4
++#define AX_RXHDR_L4_TYPE_TCP 16
++#define AX_RXHDR_L3CSUM_ERR 2
++#define AX_RXHDR_L4CSUM_ERR 1
++#define AX_RXHDR_CRC_ERR ((u32)BIT(29))
++#define AX_RXHDR_DROP_ERR ((u32)BIT(31))
++#define AX_ACCESS_MAC 0x01
++#define AX_ACCESS_PHY 0x02
++#define AX_ACCESS_EEPROM 0x04
++#define AX_ACCESS_EFUS 0x05
++#define AX_PAUSE_WATERLVL_HIGH 0x54
++#define AX_PAUSE_WATERLVL_LOW 0x55
++
++#define PHYSICAL_LINK_STATUS 0x02
++ #define AX_USB_SS 0x04
++ #define AX_USB_HS 0x02
++
++#define GENERAL_STATUS 0x03
++/* Check AX88179 version. UA1:Bit2 = 0, UA2:Bit2 = 1 */
++ #define AX_SECLD 0x04
++
++#define AX_SROM_ADDR 0x07
++#define AX_SROM_CMD 0x0a
++ #define EEP_RD 0x04
++ #define EEP_BUSY 0x10
++
++#define AX_SROM_DATA_LOW 0x08
++#define AX_SROM_DATA_HIGH 0x09
++
++#define AX_RX_CTL 0x0b
++ #define AX_RX_CTL_DROPCRCERR 0x0100
++ #define AX_RX_CTL_IPE 0x0200
++ #define AX_RX_CTL_START 0x0080
++ #define AX_RX_CTL_AP 0x0020
++ #define AX_RX_CTL_AM 0x0010
++ #define AX_RX_CTL_AB 0x0008
++ #define AX_RX_CTL_AMALL 0x0002
++ #define AX_RX_CTL_PRO 0x0001
++ #define AX_RX_CTL_STOP 0x0000
++
++#define AX_NODE_ID 0x10
++#define AX_MULFLTARY 0x16
++
++#define AX_MEDIUM_STATUS_MODE 0x22
++ #define AX_MEDIUM_GIGAMODE 0x01
++ #define AX_MEDIUM_FULL_DUPLEX 0x02
++ #define AX_MEDIUM_EN_125MHZ 0x08
++ #define AX_MEDIUM_RXFLOW_CTRLEN 0x10
++ #define AX_MEDIUM_TXFLOW_CTRLEN 0x20
++ #define AX_MEDIUM_RECEIVE_EN 0x100
++ #define AX_MEDIUM_PS 0x200
++ #define AX_MEDIUM_JUMBO_EN 0x8040
++
++#define AX_MONITOR_MOD 0x24
++ #define AX_MONITOR_MODE_RWLC 0x02
++ #define AX_MONITOR_MODE_RWMP 0x04
++ #define AX_MONITOR_MODE_PMEPOL 0x20
++ #define AX_MONITOR_MODE_PMETYPE 0x40
++
++#define AX_GPIO_CTRL 0x25
++ #define AX_GPIO_CTRL_GPIO3EN 0x80
++ #define AX_GPIO_CTRL_GPIO2EN 0x40
++ #define AX_GPIO_CTRL_GPIO1EN 0x20
++
++#define AX_PHYPWR_RSTCTL 0x26
++ #define AX_PHYPWR_RSTCTL_BZ 0x0010
++ #define AX_PHYPWR_RSTCTL_IPRL 0x0020
++ #define AX_PHYPWR_RSTCTL_AT 0x1000
++
++#define AX_RX_BULKIN_QCTRL 0x2e
++#define AX_CLK_SELECT 0x33
++ #define AX_CLK_SELECT_BCS 0x01
++ #define AX_CLK_SELECT_ACS 0x02
++ #define AX_CLK_SELECT_ULR 0x08
++
++#define AX_RXCOE_CTL 0x34
++ #define AX_RXCOE_IP 0x01
++ #define AX_RXCOE_TCP 0x02
++ #define AX_RXCOE_UDP 0x04
++ #define AX_RXCOE_TCPV6 0x20
++ #define AX_RXCOE_UDPV6 0x40
++
++#define AX_TXCOE_CTL 0x35
++ #define AX_TXCOE_IP 0x01
++ #define AX_TXCOE_TCP 0x02
++ #define AX_TXCOE_UDP 0x04
++ #define AX_TXCOE_TCPV6 0x20
++ #define AX_TXCOE_UDPV6 0x40
++
++#define AX_LEDCTRL 0x73
++
++#define GMII_PHY_PHYSR 0x11
++ #define GMII_PHY_PHYSR_SMASK 0xc000
++ #define GMII_PHY_PHYSR_GIGA 0x8000
++ #define GMII_PHY_PHYSR_100 0x4000
++ #define GMII_PHY_PHYSR_FULL 0x2000
++ #define GMII_PHY_PHYSR_LINK 0x400
++
++#define GMII_LED_ACT 0x1a
++ #define GMII_LED_ACTIVE_MASK 0xff8f
++ #define GMII_LED0_ACTIVE BIT(4)
++ #define GMII_LED1_ACTIVE BIT(5)
++ #define GMII_LED2_ACTIVE BIT(6)
++
++#define GMII_LED_LINK 0x1c
++ #define GMII_LED_LINK_MASK 0xf888
++ #define GMII_LED0_LINK_10 BIT(0)
++ #define GMII_LED0_LINK_100 BIT(1)
++ #define GMII_LED0_LINK_1000 BIT(2)
++ #define GMII_LED1_LINK_10 BIT(4)
++ #define GMII_LED1_LINK_100 BIT(5)
++ #define GMII_LED1_LINK_1000 BIT(6)
++ #define GMII_LED2_LINK_10 BIT(8)
++ #define GMII_LED2_LINK_100 BIT(9)
++ #define GMII_LED2_LINK_1000 BIT(10)
++ #define LED0_ACTIVE BIT(0)
++ #define LED0_LINK_10 BIT(1)
++ #define LED0_LINK_100 BIT(2)
++ #define LED0_LINK_1000 BIT(3)
++ #define LED0_FD BIT(4)
++ #define LED0_USB3_MASK 0x001f
++ #define LED1_ACTIVE BIT(5)
++ #define LED1_LINK_10 BIT(6)
++ #define LED1_LINK_100 BIT(7)
++ #define LED1_LINK_1000 BIT(8)
++ #define LED1_FD BIT(9)
++ #define LED1_USB3_MASK 0x03e0
++ #define LED2_ACTIVE BIT(10)
++ #define LED2_LINK_1000 BIT(13)
++ #define LED2_LINK_100 BIT(12)
++ #define LED2_LINK_10 BIT(11)
++ #define LED2_FD BIT(14)
++ #define LED_VALID BIT(15)
++ #define LED2_USB3_MASK 0x7c00
++
++#define GMII_PHYPAGE 0x1e
++#define GMII_PHY_PAGE_SELECT 0x1f
++ #define GMII_PHY_PGSEL_EXT 0x0007
++ #define GMII_PHY_PGSEL_PAGE0 0x0000
++ #define GMII_PHY_PGSEL_PAGE3 0x0003
++ #define GMII_PHY_PGSEL_PAGE5 0x0005
++
++struct ax88179_data {
++ u8 eee_enabled;
++ u8 eee_active;
++ u16 rxctl;
++ u16 reserved;
++};
++
++struct ax88179_int_data {
++ __le32 intdata1;
++ __le32 intdata2;
++};
++
++static const struct {
++ unsigned char ctrl, timer_l, timer_h, size, ifg;
++} AX88179_BULKIN_SIZE[] = {
++ {7, 0x4f, 0, 0x12, 0xff},
++ {7, 0x20, 3, 0x16, 0xff},
++ {7, 0xae, 7, 0x18, 0xff},
++ {7, 0xcc, 0x4c, 0x18, 8},
++};
++
++static int __ax88179_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
++ u16 size, void *data, int in_pm)
++{
++ int ret;
++ int (*fn)(struct usbnet *, u8, u8, u16, u16, void *, u16);
++
++ BUG_ON(!dev);
++
++ if (!in_pm)
++ fn = usbnet_read_cmd;
++ else
++ fn = usbnet_read_cmd_nopm;
++
++ ret = fn(dev, cmd, USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
++ value, index, data, size);
++
++ if (unlikely(ret < 0))
++ netdev_warn(dev->net, "Failed to read reg index 0x%04x: %d\n",
++ index, ret);
++
++ return ret;
++}
++
++static int __ax88179_write_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
++ u16 size, void *data, int in_pm)
++{
++ int ret;
++ int (*fn)(struct usbnet *, u8, u8, u16, u16, const void *, u16);
++
++ BUG_ON(!dev);
++
++ if (!in_pm)
++ fn = usbnet_write_cmd;
++ else
++ fn = usbnet_write_cmd_nopm;
++
++ ret = fn(dev, cmd, USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
++ value, index, data, size);
++
++ if (unlikely(ret < 0))
++ netdev_warn(dev->net, "Failed to write reg index 0x%04x: %d\n",
++ index, ret);
++
++ return ret;
++}
++
++static void ax88179_write_cmd_async(struct usbnet *dev, u8 cmd, u16 value,
++ u16 index, u16 size, void *data)
++{
++ u16 buf;
++
++ if (2 == size) {
++ buf = *((u16 *)data);
++ cpu_to_le16s(&buf);
++ usbnet_write_cmd_async(dev, cmd, USB_DIR_OUT | USB_TYPE_VENDOR |
++ USB_RECIP_DEVICE, value, index, &buf,
++ size);
++ } else {
++ usbnet_write_cmd_async(dev, cmd, USB_DIR_OUT | USB_TYPE_VENDOR |
++ USB_RECIP_DEVICE, value, index, data,
++ size);
++ }
++}
++
++static int ax88179_read_cmd_nopm(struct usbnet *dev, u8 cmd, u16 value,
++ u16 index, u16 size, void *data)
++{
++ int ret;
++
++ if (2 == size) {
++ u16 buf;
++ ret = __ax88179_read_cmd(dev, cmd, value, index, size, &buf, 1);
++ le16_to_cpus(&buf);
++ *((u16 *)data) = buf;
++ } else if (4 == size) {
++ u32 buf;
++ ret = __ax88179_read_cmd(dev, cmd, value, index, size, &buf, 1);
++ le32_to_cpus(&buf);
++ *((u32 *)data) = buf;
++ } else {
++ ret = __ax88179_read_cmd(dev, cmd, value, index, size, data, 1);
++ }
++
++ return ret;
++}
++
++static int ax88179_write_cmd_nopm(struct usbnet *dev, u8 cmd, u16 value,
++ u16 index, u16 size, void *data)
++{
++ int ret;
++
++ if (2 == size) {
++ u16 buf;
++ buf = *((u16 *)data);
++ cpu_to_le16s(&buf);
++ ret = __ax88179_write_cmd(dev, cmd, value, index,
++ size, &buf, 1);
++ } else {
++ ret = __ax88179_write_cmd(dev, cmd, value, index,
++ size, data, 1);
++ }
++
++ return ret;
++}
++
++static int ax88179_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
++ u16 size, void *data)
++{
++ int ret;
++
++ if (2 == size) {
++ u16 buf;
++ ret = __ax88179_read_cmd(dev, cmd, value, index, size, &buf, 0);
++ le16_to_cpus(&buf);
++ *((u16 *)data) = buf;
++ } else if (4 == size) {
++ u32 buf;
++ ret = __ax88179_read_cmd(dev, cmd, value, index, size, &buf, 0);
++ le32_to_cpus(&buf);
++ *((u32 *)data) = buf;
++ } else {
++ ret = __ax88179_read_cmd(dev, cmd, value, index, size, data, 0);
++ }
++
++ return ret;
++}
++
++static int ax88179_write_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
++ u16 size, void *data)
++{
++ int ret;
++
++ if (2 == size) {
++ u16 buf;
++ buf = *((u16 *)data);
++ cpu_to_le16s(&buf);
++ ret = __ax88179_write_cmd(dev, cmd, value, index,
++ size, &buf, 0);
++ } else {
++ ret = __ax88179_write_cmd(dev, cmd, value, index,
++ size, data, 0);
++ }
++
++ return ret;
++}
++
++static void ax88179_status(struct usbnet *dev, struct urb *urb)
++{
++ struct ax88179_int_data *event;
++ u32 link;
++
++ if (urb->actual_length < 8)
++ return;
++
++ event = urb->transfer_buffer;
++ le32_to_cpus((void *)&event->intdata1);
++
++ link = (((__force u32)event->intdata1) & AX_INT_PPLS_LINK) >> 16;
++
++ if (netif_carrier_ok(dev->net) != link) {
++ usbnet_link_change(dev, link, 1);
++ netdev_info(dev->net, "ax88179 - Link status is: %d\n", link);
++ }
++}
++
++static int ax88179_mdio_read(struct net_device *netdev, int phy_id, int loc)
++{
++ struct usbnet *dev = netdev_priv(netdev);
++ u16 res;
++
++ ax88179_read_cmd(dev, AX_ACCESS_PHY, phy_id, (__u16)loc, 2, &res);
++ return res;
++}
++
++static void ax88179_mdio_write(struct net_device *netdev, int phy_id, int loc,
++ int val)
++{
++ struct usbnet *dev = netdev_priv(netdev);
++ u16 res = (u16) val;
++
++ ax88179_write_cmd(dev, AX_ACCESS_PHY, phy_id, (__u16)loc, 2, &res);
++}
++
++static inline int ax88179_phy_mmd_indirect(struct usbnet *dev, u16 prtad,
++ u16 devad)
++{
++ u16 tmp16;
++ int ret;
++
++ tmp16 = devad;
++ ret = ax88179_write_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
++ MII_MMD_CTRL, 2, &tmp16);
++
++ tmp16 = prtad;
++ ret = ax88179_write_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
++ MII_MMD_DATA, 2, &tmp16);
++
++ tmp16 = devad | MII_MMD_CTRL_NOINCR;
++ ret = ax88179_write_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
++ MII_MMD_CTRL, 2, &tmp16);
++
++ return ret;
++}
++
++static int
++ax88179_phy_read_mmd_indirect(struct usbnet *dev, u16 prtad, u16 devad)
++{
++ int ret;
++ u16 tmp16;
++
++ ax88179_phy_mmd_indirect(dev, prtad, devad);
++
++ ret = ax88179_read_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
++ MII_MMD_DATA, 2, &tmp16);
++ if (ret < 0)
++ return ret;
++
++ return tmp16;
++}
++
++static int
++ax88179_phy_write_mmd_indirect(struct usbnet *dev, u16 prtad, u16 devad,
++ u16 data)
++{
++ int ret;
++
++ ax88179_phy_mmd_indirect(dev, prtad, devad);
++
++ ret = ax88179_write_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
++ MII_MMD_DATA, 2, &data);
++
++ if (ret < 0)
++ return ret;
++
++ return 0;
++}
++
++static int ax88179_suspend(struct usb_interface *intf, pm_message_t message)
++{
++ struct usbnet *dev = usb_get_intfdata(intf);
++ u16 tmp16;
++ u8 tmp8;
++
++ usbnet_suspend(intf, message);
++
++ /* Disable RX path */
++ ax88179_read_cmd_nopm(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE,
++ 2, 2, &tmp16);
++ tmp16 &= ~AX_MEDIUM_RECEIVE_EN;
++ ax88179_write_cmd_nopm(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE,
++ 2, 2, &tmp16);
++
++ /* Force bulk-in zero length */
++ ax88179_read_cmd_nopm(dev, AX_ACCESS_MAC, AX_PHYPWR_RSTCTL,
++ 2, 2, &tmp16);
++
++ tmp16 |= AX_PHYPWR_RSTCTL_BZ | AX_PHYPWR_RSTCTL_IPRL;
++ ax88179_write_cmd_nopm(dev, AX_ACCESS_MAC, AX_PHYPWR_RSTCTL,
++ 2, 2, &tmp16);
++
++ /* change clock */
++ tmp8 = 0;
++ ax88179_write_cmd_nopm(dev, AX_ACCESS_MAC, AX_CLK_SELECT, 1, 1, &tmp8);
++
++ /* Configure RX control register => stop operation */
++ tmp16 = AX_RX_CTL_STOP;
++ ax88179_write_cmd_nopm(dev, AX_ACCESS_MAC, AX_RX_CTL, 2, 2, &tmp16);
++
++ return 0;
++}
++
++/* This function is used to enable the autodetach function. */
++/* This function is determined by offset 0x43 of EEPROM */
++static int ax88179_auto_detach(struct usbnet *dev, int in_pm)
++{
++ u16 tmp16;
++ u8 tmp8;
++ int (*fnr)(struct usbnet *, u8, u16, u16, u16, void *);
++ int (*fnw)(struct usbnet *, u8, u16, u16, u16, void *);
++
++ if (!in_pm) {
++ fnr = ax88179_read_cmd;
++ fnw = ax88179_write_cmd;
++ } else {
++ fnr = ax88179_read_cmd_nopm;
++ fnw = ax88179_write_cmd_nopm;
++ }
++
++ if (fnr(dev, AX_ACCESS_EEPROM, 0x43, 1, 2, &tmp16) < 0)
++ return 0;
++
++ if ((tmp16 == 0xFFFF) || (!(tmp16 & 0x0100)))
++ return 0;
++
++ /* Enable Auto Detach bit */
++ tmp8 = 0;
++ fnr(dev, AX_ACCESS_MAC, AX_CLK_SELECT, 1, 1, &tmp8);
++ tmp8 |= AX_CLK_SELECT_ULR;
++ fnw(dev, AX_ACCESS_MAC, AX_CLK_SELECT, 1, 1, &tmp8);
++
++ fnr(dev, AX_ACCESS_MAC, AX_PHYPWR_RSTCTL, 2, 2, &tmp16);
++ tmp16 |= AX_PHYPWR_RSTCTL_AT;
++ fnw(dev, AX_ACCESS_MAC, AX_PHYPWR_RSTCTL, 2, 2, &tmp16);
++
++ return 0;
++}
++
++static int ax88179_resume(struct usb_interface *intf)
++{
++ struct usbnet *dev = usb_get_intfdata(intf);
++ u16 tmp16;
++ u8 tmp8;
++
++ usbnet_link_change(dev, 0, 0);
++
++ /* Power up ethernet PHY */
++ tmp16 = 0;
++ ax88179_write_cmd_nopm(dev, AX_ACCESS_MAC, AX_PHYPWR_RSTCTL,
++ 2, 2, &tmp16);
++ udelay(1000);
++
++ tmp16 = AX_PHYPWR_RSTCTL_IPRL;
++ ax88179_write_cmd_nopm(dev, AX_ACCESS_MAC, AX_PHYPWR_RSTCTL,
++ 2, 2, &tmp16);
++ msleep(200);
++
++ /* Ethernet PHY Auto Detach*/
++ ax88179_auto_detach(dev, 1);
++
++ /* Enable clock */
++ ax88179_read_cmd_nopm(dev, AX_ACCESS_MAC, AX_CLK_SELECT, 1, 1, &tmp8);
++ tmp8 |= AX_CLK_SELECT_ACS | AX_CLK_SELECT_BCS;
++ ax88179_write_cmd_nopm(dev, AX_ACCESS_MAC, AX_CLK_SELECT, 1, 1, &tmp8);
++ msleep(100);
++
++ /* Configure RX control register => start operation */
++ tmp16 = AX_RX_CTL_DROPCRCERR | AX_RX_CTL_IPE | AX_RX_CTL_START |
++ AX_RX_CTL_AP | AX_RX_CTL_AMALL | AX_RX_CTL_AB;
++ ax88179_write_cmd_nopm(dev, AX_ACCESS_MAC, AX_RX_CTL, 2, 2, &tmp16);
++
++ return usbnet_resume(intf);
++}
++
++static void
++ax88179_get_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo)
++{
++ struct usbnet *dev = netdev_priv(net);
++ u8 opt;
++
++ if (ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_MONITOR_MOD,
++ 1, 1, &opt) < 0) {
++ wolinfo->supported = 0;
++ wolinfo->wolopts = 0;
++ return;
++ }
++
++ wolinfo->supported = WAKE_PHY | WAKE_MAGIC;
++ wolinfo->wolopts = 0;
++ if (opt & AX_MONITOR_MODE_RWLC)
++ wolinfo->wolopts |= WAKE_PHY;
++ if (opt & AX_MONITOR_MODE_RWMP)
++ wolinfo->wolopts |= WAKE_MAGIC;
++}
++
++static int
++ax88179_set_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo)
++{
++ struct usbnet *dev = netdev_priv(net);
++ u8 opt = 0;
++
++ if (wolinfo->wolopts & WAKE_PHY)
++ opt |= AX_MONITOR_MODE_RWLC;
++ if (wolinfo->wolopts & WAKE_MAGIC)
++ opt |= AX_MONITOR_MODE_RWMP;
++
++ if (ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_MONITOR_MOD,
++ 1, 1, &opt) < 0)
++ return -EINVAL;
++
++ return 0;
++}
++
++static int ax88179_get_eeprom_len(struct net_device *net)
++{
++ return AX_EEPROM_LEN;
++}
++
++static int
++ax88179_get_eeprom(struct net_device *net, struct ethtool_eeprom *eeprom,
++ u8 *data)
++{
++ struct usbnet *dev = netdev_priv(net);
++ u16 *eeprom_buff;
++ int first_word, last_word;
++ int i, ret;
++
++ if (eeprom->len == 0)
++ return -EINVAL;
++
++ eeprom->magic = AX88179_EEPROM_MAGIC;
++
++ first_word = eeprom->offset >> 1;
++ last_word = (eeprom->offset + eeprom->len - 1) >> 1;
++ eeprom_buff = kmalloc(sizeof(u16) * (last_word - first_word + 1),
++ GFP_KERNEL);
++ if (!eeprom_buff)
++ return -ENOMEM;
++
++ /* ax88179/178A returns 2 bytes from eeprom on read */
++ for (i = first_word; i <= last_word; i++) {
++ ret = __ax88179_read_cmd(dev, AX_ACCESS_EEPROM, i, 1, 2,
++ &eeprom_buff[i - first_word],
++ 0);
++ if (ret < 0) {
++ kfree(eeprom_buff);
++ return -EIO;
++ }
++ }
++
++ memcpy(data, (u8 *)eeprom_buff + (eeprom->offset & 1), eeprom->len);
++ kfree(eeprom_buff);
++ return 0;
++}
++
++static int ax88179_get_settings(struct net_device *net, struct ethtool_cmd *cmd)
++{
++ struct usbnet *dev = netdev_priv(net);
++ return mii_ethtool_gset(&dev->mii, cmd);
++}
++
++static int ax88179_set_settings(struct net_device *net, struct ethtool_cmd *cmd)
++{
++ struct usbnet *dev = netdev_priv(net);
++ return mii_ethtool_sset(&dev->mii, cmd);
++}
++
++static int
++ax88179_ethtool_get_eee(struct usbnet *dev, struct ethtool_eee *data)
++{
++ int val;
++
++ /* Get Supported EEE */
++ val = ax88179_phy_read_mmd_indirect(dev, MDIO_PCS_EEE_ABLE,
++ MDIO_MMD_PCS);
++ if (val < 0)
++ return val;
++ data->supported = mmd_eee_cap_to_ethtool_sup_t(val);
++
++ /* Get advertisement EEE */
++ val = ax88179_phy_read_mmd_indirect(dev, MDIO_AN_EEE_ADV,
++ MDIO_MMD_AN);
++ if (val < 0)
++ return val;
++ data->advertised = mmd_eee_adv_to_ethtool_adv_t(val);
++
++ /* Get LP advertisement EEE */
++ val = ax88179_phy_read_mmd_indirect(dev, MDIO_AN_EEE_LPABLE,
++ MDIO_MMD_AN);
++ if (val < 0)
++ return val;
++ data->lp_advertised = mmd_eee_adv_to_ethtool_adv_t(val);
++
++ return 0;
++}
++
++static int
++ax88179_ethtool_set_eee(struct usbnet *dev, struct ethtool_eee *data)
++{
++ u16 tmp16 = ethtool_adv_to_mmd_eee_adv_t(data->advertised);
++
++ return ax88179_phy_write_mmd_indirect(dev, MDIO_AN_EEE_ADV,
++ MDIO_MMD_AN, tmp16);
++}
++
++static int ax88179_chk_eee(struct usbnet *dev)
++{
++ struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET };
++ struct ax88179_data *priv = (struct ax88179_data *)dev->data;
++
++ mii_ethtool_gset(&dev->mii, &ecmd);
++
++ if (ecmd.duplex & DUPLEX_FULL) {
++ int eee_lp, eee_cap, eee_adv;
++ u32 lp, cap, adv, supported = 0;
++
++ eee_cap = ax88179_phy_read_mmd_indirect(dev,
++ MDIO_PCS_EEE_ABLE,
++ MDIO_MMD_PCS);
++ if (eee_cap < 0) {
++ priv->eee_active = 0;
++ return false;
++ }
++
++ cap = mmd_eee_cap_to_ethtool_sup_t(eee_cap);
++ if (!cap) {
++ priv->eee_active = 0;
++ return false;
++ }
++
++ eee_lp = ax88179_phy_read_mmd_indirect(dev,
++ MDIO_AN_EEE_LPABLE,
++ MDIO_MMD_AN);
++ if (eee_lp < 0) {
++ priv->eee_active = 0;
++ return false;
++ }
++
++ eee_adv = ax88179_phy_read_mmd_indirect(dev,
++ MDIO_AN_EEE_ADV,
++ MDIO_MMD_AN);
++
++ if (eee_adv < 0) {
++ priv->eee_active = 0;
++ return false;
++ }
++
++ adv = mmd_eee_adv_to_ethtool_adv_t(eee_adv);
++ lp = mmd_eee_adv_to_ethtool_adv_t(eee_lp);
++ supported = (ecmd.speed == SPEED_1000) ?
++ SUPPORTED_1000baseT_Full :
++ SUPPORTED_100baseT_Full;
++
++ if (!(lp & adv & supported)) {
++ priv->eee_active = 0;
++ return false;
++ }
++
++ priv->eee_active = 1;
++ return true;
++ }
++
++ priv->eee_active = 0;
++ return false;
++}
++
++static void ax88179_disable_eee(struct usbnet *dev)
++{
++ u16 tmp16;
++
++ tmp16 = GMII_PHY_PGSEL_PAGE3;
++ ax88179_write_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
++ GMII_PHY_PAGE_SELECT, 2, &tmp16);
++
++ tmp16 = 0x3246;
++ ax88179_write_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
++ MII_PHYADDR, 2, &tmp16);
++
++ tmp16 = GMII_PHY_PGSEL_PAGE0;
++ ax88179_write_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
++ GMII_PHY_PAGE_SELECT, 2, &tmp16);
++}
++
++static void ax88179_enable_eee(struct usbnet *dev)
++{
++ u16 tmp16;
++
++ tmp16 = GMII_PHY_PGSEL_PAGE3;
++ ax88179_write_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
++ GMII_PHY_PAGE_SELECT, 2, &tmp16);
++
++ tmp16 = 0x3247;
++ ax88179_write_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
++ MII_PHYADDR, 2, &tmp16);
++
++ tmp16 = GMII_PHY_PGSEL_PAGE5;
++ ax88179_write_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
++ GMII_PHY_PAGE_SELECT, 2, &tmp16);
++
++ tmp16 = 0x0680;
++ ax88179_write_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
++ MII_BMSR, 2, &tmp16);
++
++ tmp16 = GMII_PHY_PGSEL_PAGE0;
++ ax88179_write_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
++ GMII_PHY_PAGE_SELECT, 2, &tmp16);
++}
++
++static int ax88179_get_eee(struct net_device *net, struct ethtool_eee *edata)
++{
++ struct usbnet *dev = netdev_priv(net);
++ struct ax88179_data *priv = (struct ax88179_data *)dev->data;
++
++ edata->eee_enabled = priv->eee_enabled;
++ edata->eee_active = priv->eee_active;
++
++ return ax88179_ethtool_get_eee(dev, edata);
++}
++
++static int ax88179_set_eee(struct net_device *net, struct ethtool_eee *edata)
++{
++ struct usbnet *dev = netdev_priv(net);
++ struct ax88179_data *priv = (struct ax88179_data *)dev->data;
++ int ret = -EOPNOTSUPP;
++
++ priv->eee_enabled = edata->eee_enabled;
++ if (!priv->eee_enabled) {
++ ax88179_disable_eee(dev);
++ } else {
++ priv->eee_enabled = ax88179_chk_eee(dev);
++ if (!priv->eee_enabled)
++ return -EOPNOTSUPP;
++
++ ax88179_enable_eee(dev);
++ }
++
++ ret = ax88179_ethtool_set_eee(dev, edata);
++ if (ret)
++ return ret;
++
++ mii_nway_restart(&dev->mii);
++
++ usbnet_link_change(dev, 0, 0);
++
++ return ret;
++}
++
++static int ax88179_ioctl(struct net_device *net, struct ifreq *rq, int cmd)
++{
++ struct usbnet *dev = netdev_priv(net);
++ return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
++}
++
++static const struct ethtool_ops ax88179_ethtool_ops = {
++ .get_link = ethtool_op_get_link,
++ .get_msglevel = usbnet_get_msglevel,
++ .set_msglevel = usbnet_set_msglevel,
++ .get_wol = ax88179_get_wol,
++ .set_wol = ax88179_set_wol,
++ .get_eeprom_len = ax88179_get_eeprom_len,
++ .get_eeprom = ax88179_get_eeprom,
++ .get_settings = ax88179_get_settings,
++ .set_settings = ax88179_set_settings,
++ .get_eee = ax88179_get_eee,
++ .set_eee = ax88179_set_eee,
++ .nway_reset = usbnet_nway_reset,
++};
++
++static void ax88179_set_multicast(struct net_device *net)
++{
++ struct usbnet *dev = netdev_priv(net);
++ struct ax88179_data *data = (struct ax88179_data *)dev->data;
++ u8 *m_filter = ((u8 *)dev->data) + 12;
++
++ data->rxctl = (AX_RX_CTL_START | AX_RX_CTL_AB | AX_RX_CTL_IPE);
++
++ if (net->flags & IFF_PROMISC) {
++ data->rxctl |= AX_RX_CTL_PRO;
++ } else if (net->flags & IFF_ALLMULTI ||
++ netdev_mc_count(net) > AX_MAX_MCAST) {
++ data->rxctl |= AX_RX_CTL_AMALL;
++ } else if (netdev_mc_empty(net)) {
++ /* just broadcast and directed */
++ } else {
++ /* We use the 20 byte dev->data for our 8 byte filter buffer
++ * to avoid allocating memory that is tricky to free later
++ */
++ u32 crc_bits;
++ struct netdev_hw_addr *ha;
++
++ memset(m_filter, 0, AX_MCAST_FLTSIZE);
++
++ netdev_for_each_mc_addr(ha, net) {
++ crc_bits = ether_crc(ETH_ALEN, ha->addr) >> 26;
++ *(m_filter + (crc_bits >> 3)) |= (1 << (crc_bits & 7));
++ }
++
++ ax88179_write_cmd_async(dev, AX_ACCESS_MAC, AX_MULFLTARY,
++ AX_MCAST_FLTSIZE, AX_MCAST_FLTSIZE,
++ m_filter);
++
++ data->rxctl |= AX_RX_CTL_AM;
++ }
++
++ ax88179_write_cmd_async(dev, AX_ACCESS_MAC, AX_RX_CTL,
++ 2, 2, &data->rxctl);
++}
++
++static int
++ax88179_set_features(struct net_device *net, netdev_features_t features)
++{
++ u8 tmp;
++ struct usbnet *dev = netdev_priv(net);
++ netdev_features_t changed = net->features ^ features;
++
++ if (changed & NETIF_F_IP_CSUM) {
++ ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_TXCOE_CTL, 1, 1, &tmp);
++ tmp ^= AX_TXCOE_TCP | AX_TXCOE_UDP;
++ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_TXCOE_CTL, 1, 1, &tmp);
++ }
++
++ if (changed & NETIF_F_IPV6_CSUM) {
++ ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_TXCOE_CTL, 1, 1, &tmp);
++ tmp ^= AX_TXCOE_TCPV6 | AX_TXCOE_UDPV6;
++ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_TXCOE_CTL, 1, 1, &tmp);
++ }
++
++ if (changed & NETIF_F_RXCSUM) {
++ ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_RXCOE_CTL, 1, 1, &tmp);
++ tmp ^= AX_RXCOE_IP | AX_RXCOE_TCP | AX_RXCOE_UDP |
++ AX_RXCOE_TCPV6 | AX_RXCOE_UDPV6;
++ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_RXCOE_CTL, 1, 1, &tmp);
++ }
++
++ return 0;
++}
++
++static int ax88179_change_mtu(struct net_device *net, int new_mtu)
++{
++ struct usbnet *dev = netdev_priv(net);
++ u16 tmp16;
++
++ if (new_mtu <= 0 || new_mtu > 4088)
++ return -EINVAL;
++
++ net->mtu = new_mtu;
++ dev->hard_mtu = net->mtu + net->hard_header_len;
++
++ if (net->mtu > 1500) {
++ ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE,
++ 2, 2, &tmp16);
++ tmp16 |= AX_MEDIUM_JUMBO_EN;
++ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE,
++ 2, 2, &tmp16);
++ } else {
++ ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE,
++ 2, 2, &tmp16);
++ tmp16 &= ~AX_MEDIUM_JUMBO_EN;
++ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE,
++ 2, 2, &tmp16);
++ }
++
++ /* max qlen depend on hard_mtu and rx_urb_size */
++ usbnet_update_max_qlen(dev);
++
++ return 0;
++}
++
++static int ax88179_set_mac_addr(struct net_device *net, void *p)
++{
++ struct usbnet *dev = netdev_priv(net);
++ struct sockaddr *addr = p;
++ int ret;
++
++ if (netif_running(net))
++ return -EBUSY;
++ if (!is_valid_ether_addr(addr->sa_data))
++ return -EADDRNOTAVAIL;
++
++ memcpy(net->dev_addr, addr->sa_data, ETH_ALEN);
++
++ /* Set the MAC address */
++ ret = ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_NODE_ID, ETH_ALEN,
++ ETH_ALEN, net->dev_addr);
++ if (ret < 0)
++ return ret;
++
++ return 0;
++}
++
++static const struct net_device_ops ax88179_netdev_ops = {
++ .ndo_open = usbnet_open,
++ .ndo_stop = usbnet_stop,
++ .ndo_start_xmit = usbnet_start_xmit,
++ .ndo_tx_timeout = usbnet_tx_timeout,
++ .ndo_change_mtu = ax88179_change_mtu,
++ .ndo_set_mac_address = ax88179_set_mac_addr,
++ .ndo_validate_addr = eth_validate_addr,
++ .ndo_do_ioctl = ax88179_ioctl,
++ .ndo_set_rx_mode = ax88179_set_multicast,
++ .ndo_set_features = ax88179_set_features,
++};
++
++static int ax88179_check_eeprom(struct usbnet *dev)
++{
++ u8 i, buf, eeprom[20];
++ u16 csum, delay = HZ / 10;
++ unsigned long jtimeout;
++
++ /* Read EEPROM content */
++ for (i = 0; i < 6; i++) {
++ buf = i;
++ if (ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_SROM_ADDR,
++ 1, 1, &buf) < 0)
++ return -EINVAL;
++
++ buf = EEP_RD;
++ if (ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_SROM_CMD,
++ 1, 1, &buf) < 0)
++ return -EINVAL;
++
++ jtimeout = jiffies + delay;
++ do {
++ ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_SROM_CMD,
++ 1, 1, &buf);
++
++ if (time_after(jiffies, jtimeout))
++ return -EINVAL;
++
++ } while (buf & EEP_BUSY);
++
++ __ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_SROM_DATA_LOW,
++ 2, 2, &eeprom[i * 2], 0);
++
++ if ((i == 0) && (eeprom[0] == 0xFF))
++ return -EINVAL;
++ }
++
++ csum = eeprom[6] + eeprom[7] + eeprom[8] + eeprom[9];
++ csum = (csum >> 8) + (csum & 0xff);
++ if ((csum + eeprom[10]) != 0xff)
++ return -EINVAL;
++
++ return 0;
++}
++
++static int ax88179_check_efuse(struct usbnet *dev, u16 *ledmode)
++{
++ u8 i;
++ u8 efuse[64];
++ u16 csum = 0;
++
++ if (ax88179_read_cmd(dev, AX_ACCESS_EFUS, 0, 64, 64, efuse) < 0)
++ return -EINVAL;
++
++ if (*efuse == 0xFF)
++ return -EINVAL;
++
++ for (i = 0; i < 64; i++)
++ csum = csum + efuse[i];
++
++ while (csum > 255)
++ csum = (csum & 0x00FF) + ((csum >> 8) & 0x00FF);
++
++ if (csum != 0xFF)
++ return -EINVAL;
++
++ *ledmode = (efuse[51] << 8) | efuse[52];
++
++ return 0;
++}
++
++static int ax88179_convert_old_led(struct usbnet *dev, u16 *ledvalue)
++{
++ u16 led;
++
++ /* Loaded the old eFuse LED Mode */
++ if (ax88179_read_cmd(dev, AX_ACCESS_EEPROM, 0x3C, 1, 2, &led) < 0)
++ return -EINVAL;
++
++ led >>= 8;
++ switch (led) {
++ case 0xFF:
++ led = LED0_ACTIVE | LED1_LINK_10 | LED1_LINK_100 |
++ LED1_LINK_1000 | LED2_ACTIVE | LED2_LINK_10 |
++ LED2_LINK_100 | LED2_LINK_1000 | LED_VALID;
++ break;
++ case 0xFE:
++ led = LED0_ACTIVE | LED1_LINK_1000 | LED2_LINK_100 | LED_VALID;
++ break;
++ case 0xFD:
++ led = LED0_ACTIVE | LED1_LINK_1000 | LED2_LINK_100 |
++ LED2_LINK_10 | LED_VALID;
++ break;
++ case 0xFC:
++ led = LED0_ACTIVE | LED1_ACTIVE | LED1_LINK_1000 | LED2_ACTIVE |
++ LED2_LINK_100 | LED2_LINK_10 | LED_VALID;
++ break;
++ default:
++ led = LED0_ACTIVE | LED1_LINK_10 | LED1_LINK_100 |
++ LED1_LINK_1000 | LED2_ACTIVE | LED2_LINK_10 |
++ LED2_LINK_100 | LED2_LINK_1000 | LED_VALID;
++ break;
++ }
++
++ *ledvalue = led;
++
++ return 0;
++}
++
++static int ax88179_led_setting(struct usbnet *dev)
++{
++ u8 ledfd, value = 0;
++ u16 tmp, ledact, ledlink, ledvalue = 0, delay = HZ / 10;
++ unsigned long jtimeout;
++
++ /* Check AX88179 version. UA1 or UA2*/
++ ax88179_read_cmd(dev, AX_ACCESS_MAC, GENERAL_STATUS, 1, 1, &value);
++
++ if (!(value & AX_SECLD)) { /* UA1 */
++ value = AX_GPIO_CTRL_GPIO3EN | AX_GPIO_CTRL_GPIO2EN |
++ AX_GPIO_CTRL_GPIO1EN;
++ if (ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_GPIO_CTRL,
++ 1, 1, &value) < 0)
++ return -EINVAL;
++ }
++
++ /* Check EEPROM */
++ if (!ax88179_check_eeprom(dev)) {
++ value = 0x42;
++ if (ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_SROM_ADDR,
++ 1, 1, &value) < 0)
++ return -EINVAL;
++
++ value = EEP_RD;
++ if (ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_SROM_CMD,
++ 1, 1, &value) < 0)
++ return -EINVAL;
++
++ jtimeout = jiffies + delay;
++ do {
++ ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_SROM_CMD,
++ 1, 1, &value);
++
++ if (time_after(jiffies, jtimeout))
++ return -EINVAL;
++
++ } while (value & EEP_BUSY);
++
++ ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_SROM_DATA_HIGH,
++ 1, 1, &value);
++ ledvalue = (value << 8);
++
++ ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_SROM_DATA_LOW,
++ 1, 1, &value);
++ ledvalue |= value;
++
++ /* load internal ROM for defaule setting */
++ if ((ledvalue == 0xFFFF) || ((ledvalue & LED_VALID) == 0))
++ ax88179_convert_old_led(dev, &ledvalue);
++
++ } else if (!ax88179_check_efuse(dev, &ledvalue)) {
++ if ((ledvalue == 0xFFFF) || ((ledvalue & LED_VALID) == 0))
++ ax88179_convert_old_led(dev, &ledvalue);
++ } else {
++ ax88179_convert_old_led(dev, &ledvalue);
++ }
++
++ tmp = GMII_PHY_PGSEL_EXT;
++ ax88179_write_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
++ GMII_PHY_PAGE_SELECT, 2, &tmp);
++
++ tmp = 0x2c;
++ ax88179_write_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
++ GMII_PHYPAGE, 2, &tmp);
++
++ ax88179_read_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
++ GMII_LED_ACT, 2, &ledact);
++
++ ax88179_read_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
++ GMII_LED_LINK, 2, &ledlink);
++
++ ledact &= GMII_LED_ACTIVE_MASK;
++ ledlink &= GMII_LED_LINK_MASK;
++
++ if (ledvalue & LED0_ACTIVE)
++ ledact |= GMII_LED0_ACTIVE;
++
++ if (ledvalue & LED1_ACTIVE)
++ ledact |= GMII_LED1_ACTIVE;
++
++ if (ledvalue & LED2_ACTIVE)
++ ledact |= GMII_LED2_ACTIVE;
++
++ if (ledvalue & LED0_LINK_10)
++ ledlink |= GMII_LED0_LINK_10;
++
++ if (ledvalue & LED1_LINK_10)
++ ledlink |= GMII_LED1_LINK_10;
++
++ if (ledvalue & LED2_LINK_10)
++ ledlink |= GMII_LED2_LINK_10;
++
++ if (ledvalue & LED0_LINK_100)
++ ledlink |= GMII_LED0_LINK_100;
++
++ if (ledvalue & LED1_LINK_100)
++ ledlink |= GMII_LED1_LINK_100;
++
++ if (ledvalue & LED2_LINK_100)
++ ledlink |= GMII_LED2_LINK_100;
++
++ if (ledvalue & LED0_LINK_1000)
++ ledlink |= GMII_LED0_LINK_1000;
++
++ if (ledvalue & LED1_LINK_1000)
++ ledlink |= GMII_LED1_LINK_1000;
++
++ if (ledvalue & LED2_LINK_1000)
++ ledlink |= GMII_LED2_LINK_1000;
++
++ tmp = ledact;
++ ax88179_write_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
++ GMII_LED_ACT, 2, &tmp);
++
++ tmp = ledlink;
++ ax88179_write_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
++ GMII_LED_LINK, 2, &tmp);
++
++ tmp = GMII_PHY_PGSEL_PAGE0;
++ ax88179_write_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
++ GMII_PHY_PAGE_SELECT, 2, &tmp);
++
++ /* LED full duplex setting */
++ ledfd = 0;
++ if (ledvalue & LED0_FD)
++ ledfd |= 0x01;
++ else if ((ledvalue & LED0_USB3_MASK) == 0)
++ ledfd |= 0x02;
++
++ if (ledvalue & LED1_FD)
++ ledfd |= 0x04;
++ else if ((ledvalue & LED1_USB3_MASK) == 0)
++ ledfd |= 0x08;
++
++ if (ledvalue & LED2_FD)
++ ledfd |= 0x10;
++ else if ((ledvalue & LED2_USB3_MASK) == 0)
++ ledfd |= 0x20;
++
++ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_LEDCTRL, 1, 1, &ledfd);
++
++ return 0;
++}
++
++static int ax88179_bind(struct usbnet *dev, struct usb_interface *intf)
++{
++ u8 buf[5];
++ u16 *tmp16;
++ u8 *tmp;
++ struct ax88179_data *ax179_data = (struct ax88179_data *)dev->data;
++ struct ethtool_eee eee_data;
++
++ usbnet_get_endpoints(dev, intf);
++
++ tmp16 = (u16 *)buf;
++ tmp = (u8 *)buf;
++
++ memset(ax179_data, 0, sizeof(*ax179_data));
++
++ /* Power up ethernet PHY */
++ *tmp16 = 0;
++ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_PHYPWR_RSTCTL, 2, 2, tmp16);
++ *tmp16 = AX_PHYPWR_RSTCTL_IPRL;
++ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_PHYPWR_RSTCTL, 2, 2, tmp16);
++ msleep(200);
++
++ *tmp = AX_CLK_SELECT_ACS | AX_CLK_SELECT_BCS;
++ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_CLK_SELECT, 1, 1, tmp);
++ msleep(100);
++
++ ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_NODE_ID, ETH_ALEN,
++ ETH_ALEN, dev->net->dev_addr);
++ memcpy(dev->net->perm_addr, dev->net->dev_addr, ETH_ALEN);
++
++ /* RX bulk configuration */
++ memcpy(tmp, &AX88179_BULKIN_SIZE[0], 5);
++ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_RX_BULKIN_QCTRL, 5, 5, tmp);
++
++ dev->rx_urb_size = 1024 * 20;
++
++ *tmp = 0x34;
++ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_PAUSE_WATERLVL_LOW, 1, 1, tmp);
++
++ *tmp = 0x52;
++ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_PAUSE_WATERLVL_HIGH,
++ 1, 1, tmp);
++
++ dev->net->netdev_ops = &ax88179_netdev_ops;
++ dev->net->ethtool_ops = &ax88179_ethtool_ops;
++ dev->net->needed_headroom = 8;
++
++ /* Initialize MII structure */
++ dev->mii.dev = dev->net;
++ dev->mii.mdio_read = ax88179_mdio_read;
++ dev->mii.mdio_write = ax88179_mdio_write;
++ dev->mii.phy_id_mask = 0xff;
++ dev->mii.reg_num_mask = 0xff;
++ dev->mii.phy_id = 0x03;
++ dev->mii.supports_gmii = 1;
++
++ dev->net->features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
++ NETIF_F_RXCSUM;
++
++ dev->net->hw_features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
++ NETIF_F_RXCSUM;
++
++ /* Enable checksum offload */
++ *tmp = AX_RXCOE_IP | AX_RXCOE_TCP | AX_RXCOE_UDP |
++ AX_RXCOE_TCPV6 | AX_RXCOE_UDPV6;
++ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_RXCOE_CTL, 1, 1, tmp);
++
++ *tmp = AX_TXCOE_IP | AX_TXCOE_TCP | AX_TXCOE_UDP |
++ AX_TXCOE_TCPV6 | AX_TXCOE_UDPV6;
++ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_TXCOE_CTL, 1, 1, tmp);
++
++ /* Configure RX control register => start operation */
++ *tmp16 = AX_RX_CTL_DROPCRCERR | AX_RX_CTL_IPE | AX_RX_CTL_START |
++ AX_RX_CTL_AP | AX_RX_CTL_AMALL | AX_RX_CTL_AB;
++ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_RX_CTL, 2, 2, tmp16);
++
++ *tmp = AX_MONITOR_MODE_PMETYPE | AX_MONITOR_MODE_PMEPOL |
++ AX_MONITOR_MODE_RWMP;
++ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_MONITOR_MOD, 1, 1, tmp);
++
++ /* Configure default medium type => giga */
++ *tmp16 = AX_MEDIUM_RECEIVE_EN | AX_MEDIUM_TXFLOW_CTRLEN |
++ AX_MEDIUM_RXFLOW_CTRLEN | AX_MEDIUM_FULL_DUPLEX |
++ AX_MEDIUM_GIGAMODE;
++ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE,
++ 2, 2, tmp16);
++
++ ax88179_led_setting(dev);
++
++ ax179_data->eee_enabled = 0;
++ ax179_data->eee_active = 0;
++
++ ax88179_disable_eee(dev);
++
++ ax88179_ethtool_get_eee(dev, &eee_data);
++ eee_data.advertised = 0;
++ ax88179_ethtool_set_eee(dev, &eee_data);
++
++ /* Restart autoneg */
++ mii_nway_restart(&dev->mii);
++
++ usbnet_link_change(dev, 0, 0);
++
++ return 0;
++}
++
++static void ax88179_unbind(struct usbnet *dev, struct usb_interface *intf)
++{
++ u16 tmp16;
++
++ /* Configure RX control register => stop operation */
++ tmp16 = AX_RX_CTL_STOP;
++ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_RX_CTL, 2, 2, &tmp16);
++
++ tmp16 = 0;
++ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_CLK_SELECT, 1, 1, &tmp16);
++
++ /* Power down ethernet PHY */
++ tmp16 = 0;
++ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_PHYPWR_RSTCTL, 2, 2, &tmp16);
++}
++
++static void
++ax88179_rx_checksum(struct sk_buff *skb, u32 *pkt_hdr)
++{
++ skb->ip_summed = CHECKSUM_NONE;
++
++ /* checksum error bit is set */
++ if ((*pkt_hdr & AX_RXHDR_L3CSUM_ERR) ||
++ (*pkt_hdr & AX_RXHDR_L4CSUM_ERR))
++ return;
++
++ /* It must be a TCP or UDP packet with a valid checksum */
++ if (((*pkt_hdr & AX_RXHDR_L4_TYPE_MASK) == AX_RXHDR_L4_TYPE_TCP) ||
++ ((*pkt_hdr & AX_RXHDR_L4_TYPE_MASK) == AX_RXHDR_L4_TYPE_UDP))
++ skb->ip_summed = CHECKSUM_UNNECESSARY;
++}
++
++static int ax88179_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
++{
++ struct sk_buff *ax_skb;
++ int pkt_cnt;
++ u32 rx_hdr;
++ u16 hdr_off;
++ u32 *pkt_hdr;
++
++ /* This check is no longer done by usbnet */
++ if (skb->len < dev->net->hard_header_len)
++ return 0;
++
++ skb_trim(skb, skb->len - 4);
++ memcpy(&rx_hdr, skb_tail_pointer(skb), 4);
++ le32_to_cpus(&rx_hdr);
++
++ pkt_cnt = (u16)rx_hdr;
++ hdr_off = (u16)(rx_hdr >> 16);
++ pkt_hdr = (u32 *)(skb->data + hdr_off);
++
++ while (pkt_cnt--) {
++ u16 pkt_len;
++
++ le32_to_cpus(pkt_hdr);
++ pkt_len = (*pkt_hdr >> 16) & 0x1fff;
++
++ /* Check CRC or runt packet */
++ if ((*pkt_hdr & AX_RXHDR_CRC_ERR) ||
++ (*pkt_hdr & AX_RXHDR_DROP_ERR)) {
++ skb_pull(skb, (pkt_len + 7) & 0xFFF8);
++ pkt_hdr++;
++ continue;
++ }
++
++ if (pkt_cnt == 0) {
++ /* Skip IP alignment psudo header */
++ skb_pull(skb, 2);
++ skb->len = pkt_len;
++ skb_set_tail_pointer(skb, pkt_len);
++ skb->truesize = pkt_len + sizeof(struct sk_buff);
++ ax88179_rx_checksum(skb, pkt_hdr);
++ return 1;
++ }
++
++ ax_skb = skb_clone(skb, GFP_ATOMIC);
++ if (ax_skb) {
++ ax_skb->len = pkt_len;
++ ax_skb->data = skb->data + 2;
++ skb_set_tail_pointer(ax_skb, pkt_len);
++ ax_skb->truesize = pkt_len + sizeof(struct sk_buff);
++ ax88179_rx_checksum(ax_skb, pkt_hdr);
++ usbnet_skb_return(dev, ax_skb);
++ } else {
++ return 0;
++ }
++
++ skb_pull(skb, (pkt_len + 7) & 0xFFF8);
++ pkt_hdr++;
++ }
++ return 1;
++}
++
++static struct sk_buff *
++ax88179_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
++{
++ u32 tx_hdr1, tx_hdr2;
++ int frame_size = dev->maxpacket;
++ int mss = skb_shinfo(skb)->gso_size;
++ int headroom;
++
++ tx_hdr1 = skb->len;
++ tx_hdr2 = mss;
++ if (((skb->len + 8) % frame_size) == 0)
++ tx_hdr2 |= 0x80008000; /* Enable padding */
++
++ headroom = skb_headroom(skb) - 8;
++
++ if ((skb_header_cloned(skb) || headroom < 0) &&
++ pskb_expand_head(skb, headroom < 0 ? 8 : 0, 0, GFP_ATOMIC)) {
++ dev_kfree_skb_any(skb);
++ return NULL;
++ }
++
++ skb_push(skb, 4);
++ cpu_to_le32s(&tx_hdr2);
++ skb_copy_to_linear_data(skb, &tx_hdr2, 4);
++
++ skb_push(skb, 4);
++ cpu_to_le32s(&tx_hdr1);
++ skb_copy_to_linear_data(skb, &tx_hdr1, 4);
++
++ return skb;
++}
++
++static int ax88179_link_reset(struct usbnet *dev)
++{
++ struct ax88179_data *ax179_data = (struct ax88179_data *)dev->data;
++ u8 tmp[5], link_sts;
++ u16 mode, tmp16, delay = HZ / 10;
++ u32 tmp32 = 0x40000000;
++ unsigned long jtimeout;
++
++ jtimeout = jiffies + delay;
++ while (tmp32 & 0x40000000) {
++ mode = 0;
++ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_RX_CTL, 2, 2, &mode);
++ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_RX_CTL, 2, 2,
++ &ax179_data->rxctl);
++
++ /*link up, check the usb device control TX FIFO full or empty*/
++ ax88179_read_cmd(dev, 0x81, 0x8c, 0, 4, &tmp32);
++
++ if (time_after(jiffies, jtimeout))
++ return 0;
++ }
++
++ mode = AX_MEDIUM_RECEIVE_EN | AX_MEDIUM_TXFLOW_CTRLEN |
++ AX_MEDIUM_RXFLOW_CTRLEN;
++
++ ax88179_read_cmd(dev, AX_ACCESS_MAC, PHYSICAL_LINK_STATUS,
++ 1, 1, &link_sts);
++
++ ax88179_read_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID,
++ GMII_PHY_PHYSR, 2, &tmp16);
++
++ if (!(tmp16 & GMII_PHY_PHYSR_LINK)) {
++ return 0;
++ } else if (GMII_PHY_PHYSR_GIGA == (tmp16 & GMII_PHY_PHYSR_SMASK)) {
++ mode |= AX_MEDIUM_GIGAMODE | AX_MEDIUM_EN_125MHZ;
++ if (dev->net->mtu > 1500)
++ mode |= AX_MEDIUM_JUMBO_EN;
++
++ if (link_sts & AX_USB_SS)
++ memcpy(tmp, &AX88179_BULKIN_SIZE[0], 5);
++ else if (link_sts & AX_USB_HS)
++ memcpy(tmp, &AX88179_BULKIN_SIZE[1], 5);
++ else
++ memcpy(tmp, &AX88179_BULKIN_SIZE[3], 5);
++ } else if (GMII_PHY_PHYSR_100 == (tmp16 & GMII_PHY_PHYSR_SMASK)) {
++ mode |= AX_MEDIUM_PS;
++
++ if (link_sts & (AX_USB_SS | AX_USB_HS))
++ memcpy(tmp, &AX88179_BULKIN_SIZE[2], 5);
++ else
++ memcpy(tmp, &AX88179_BULKIN_SIZE[3], 5);
++ } else {
++ memcpy(tmp, &AX88179_BULKIN_SIZE[3], 5);
++ }
++
++ /* RX bulk configuration */
++ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_RX_BULKIN_QCTRL, 5, 5, tmp);
++
++ dev->rx_urb_size = (1024 * (tmp[3] + 2));
++
++ if (tmp16 & GMII_PHY_PHYSR_FULL)
++ mode |= AX_MEDIUM_FULL_DUPLEX;
++ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE,
++ 2, 2, &mode);
++
++ ax179_data->eee_enabled = ax88179_chk_eee(dev);
++
++ netif_carrier_on(dev->net);
++
++ return 0;
++}
++
++static int ax88179_reset(struct usbnet *dev)
++{
++ u8 buf[5];
++ u16 *tmp16;
++ u8 *tmp;
++ struct ax88179_data *ax179_data = (struct ax88179_data *)dev->data;
++ struct ethtool_eee eee_data;
++
++ tmp16 = (u16 *)buf;
++ tmp = (u8 *)buf;
++
++ /* Power up ethernet PHY */
++ *tmp16 = 0;
++ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_PHYPWR_RSTCTL, 2, 2, tmp16);
++
++ *tmp16 = AX_PHYPWR_RSTCTL_IPRL;
++ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_PHYPWR_RSTCTL, 2, 2, tmp16);
++ msleep(200);
++
++ *tmp = AX_CLK_SELECT_ACS | AX_CLK_SELECT_BCS;
++ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_CLK_SELECT, 1, 1, tmp);
++ msleep(100);
++
++ /* Ethernet PHY Auto Detach*/
++ ax88179_auto_detach(dev, 0);
++
++ ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_NODE_ID, ETH_ALEN, ETH_ALEN,
++ dev->net->dev_addr);
++ memcpy(dev->net->perm_addr, dev->net->dev_addr, ETH_ALEN);
++
++ /* RX bulk configuration */
++ memcpy(tmp, &AX88179_BULKIN_SIZE[0], 5);
++ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_RX_BULKIN_QCTRL, 5, 5, tmp);
++
++ dev->rx_urb_size = 1024 * 20;
++
++ *tmp = 0x34;
++ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_PAUSE_WATERLVL_LOW, 1, 1, tmp);
++
++ *tmp = 0x52;
++ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_PAUSE_WATERLVL_HIGH,
++ 1, 1, tmp);
++
++ dev->net->features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
++ NETIF_F_RXCSUM;
++
++ dev->net->hw_features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
++ NETIF_F_RXCSUM;
++
++ /* Enable checksum offload */
++ *tmp = AX_RXCOE_IP | AX_RXCOE_TCP | AX_RXCOE_UDP |
++ AX_RXCOE_TCPV6 | AX_RXCOE_UDPV6;
++ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_RXCOE_CTL, 1, 1, tmp);
++
++ *tmp = AX_TXCOE_IP | AX_TXCOE_TCP | AX_TXCOE_UDP |
++ AX_TXCOE_TCPV6 | AX_TXCOE_UDPV6;
++ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_TXCOE_CTL, 1, 1, tmp);
++
++ /* Configure RX control register => start operation */
++ *tmp16 = AX_RX_CTL_DROPCRCERR | AX_RX_CTL_IPE | AX_RX_CTL_START |
++ AX_RX_CTL_AP | AX_RX_CTL_AMALL | AX_RX_CTL_AB;
++ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_RX_CTL, 2, 2, tmp16);
++
++ *tmp = AX_MONITOR_MODE_PMETYPE | AX_MONITOR_MODE_PMEPOL |
++ AX_MONITOR_MODE_RWMP;
++ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_MONITOR_MOD, 1, 1, tmp);
++
++ /* Configure default medium type => giga */
++ *tmp16 = AX_MEDIUM_RECEIVE_EN | AX_MEDIUM_TXFLOW_CTRLEN |
++ AX_MEDIUM_RXFLOW_CTRLEN | AX_MEDIUM_FULL_DUPLEX |
++ AX_MEDIUM_GIGAMODE;
++ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE,
++ 2, 2, tmp16);
++
++ ax88179_led_setting(dev);
++
++ ax179_data->eee_enabled = 0;
++ ax179_data->eee_active = 0;
++
++ ax88179_disable_eee(dev);
++
++ ax88179_ethtool_get_eee(dev, &eee_data);
++ eee_data.advertised = 0;
++ ax88179_ethtool_set_eee(dev, &eee_data);
++
++ /* Restart autoneg */
++ mii_nway_restart(&dev->mii);
++
++ usbnet_link_change(dev, 0, 0);
++
++ return 0;
++}
++
++static int ax88179_stop(struct usbnet *dev)
++{
++ u16 tmp16;
++
++ ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE,
++ 2, 2, &tmp16);
++ tmp16 &= ~AX_MEDIUM_RECEIVE_EN;
++ ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE,
++ 2, 2, &tmp16);
++
++ return 0;
++}
++
++static const struct driver_info ax88179_info = {
++ .description = "ASIX AX88179 USB 3.0 Gigabit Ethernet",
++ .bind = ax88179_bind,
++ .unbind = ax88179_unbind,
++ .status = ax88179_status,
++ .link_reset = ax88179_link_reset,
++ .reset = ax88179_reset,
++ .stop = ax88179_stop,
++ .flags = FLAG_ETHER | FLAG_FRAMING_AX,
++ .rx_fixup = ax88179_rx_fixup,
++ .tx_fixup = ax88179_tx_fixup,
++};
++
++static const struct driver_info ax88178a_info = {
++ .description = "ASIX AX88178A USB 2.0 Gigabit Ethernet",
++ .bind = ax88179_bind,
++ .unbind = ax88179_unbind,
++ .status = ax88179_status,
++ .link_reset = ax88179_link_reset,
++ .reset = ax88179_reset,
++ .stop = ax88179_stop,
++ .flags = FLAG_ETHER | FLAG_FRAMING_AX,
++ .rx_fixup = ax88179_rx_fixup,
++ .tx_fixup = ax88179_tx_fixup,
++};
++
++static const struct driver_info dlink_dub1312_info = {
++ .description = "D-Link DUB-1312 USB 3.0 to Gigabit Ethernet Adapter",
++ .bind = ax88179_bind,
++ .unbind = ax88179_unbind,
++ .status = ax88179_status,
++ .link_reset = ax88179_link_reset,
++ .reset = ax88179_reset,
++ .stop = ax88179_stop,
++ .flags = FLAG_ETHER | FLAG_FRAMING_AX,
++ .rx_fixup = ax88179_rx_fixup,
++ .tx_fixup = ax88179_tx_fixup,
++};
++
++static const struct driver_info sitecom_info = {
++ .description = "Sitecom USB 3.0 to Gigabit Adapter",
++ .bind = ax88179_bind,
++ .unbind = ax88179_unbind,
++ .status = ax88179_status,
++ .link_reset = ax88179_link_reset,
++ .reset = ax88179_reset,
++ .stop = ax88179_stop,
++ .flags = FLAG_ETHER | FLAG_FRAMING_AX,
++ .rx_fixup = ax88179_rx_fixup,
++ .tx_fixup = ax88179_tx_fixup,
++};
++
++static const struct driver_info samsung_info = {
++ .description = "Samsung USB Ethernet Adapter",
++ .bind = ax88179_bind,
++ .unbind = ax88179_unbind,
++ .status = ax88179_status,
++ .link_reset = ax88179_link_reset,
++ .reset = ax88179_reset,
++ .stop = ax88179_stop,
++ .flags = FLAG_ETHER | FLAG_FRAMING_AX,
++ .rx_fixup = ax88179_rx_fixup,
++ .tx_fixup = ax88179_tx_fixup,
++};
++
++static const struct driver_info lenovo_info = {
++ .description = "Lenovo OneLinkDock Gigabit LAN",
++ .bind = ax88179_bind,
++ .unbind = ax88179_unbind,
++ .status = ax88179_status,
++ .link_reset = ax88179_link_reset,
++ .reset = ax88179_reset,
++ .stop = ax88179_stop,
++ .flags = FLAG_ETHER | FLAG_FRAMING_AX,
++ .rx_fixup = ax88179_rx_fixup,
++ .tx_fixup = ax88179_tx_fixup,
++};
++
++static const struct usb_device_id products[] = {
++{
++ /* ASIX AX88179 10/100/1000 */
++ USB_DEVICE(0x0b95, 0x1790),
++ .driver_info = (unsigned long)&ax88179_info,
++}, {
++ /* ASIX AX88178A 10/100/1000 */
++ USB_DEVICE(0x0b95, 0x178a),
++ .driver_info = (unsigned long)&ax88178a_info,
++}, {
++ /* D-Link DUB-1312 USB 3.0 to Gigabit Ethernet Adapter */
++ USB_DEVICE(0x2001, 0x4a00),
++ .driver_info = (unsigned long)&dlink_dub1312_info,
++}, {
++ /* Sitecom USB 3.0 to Gigabit Adapter */
++ USB_DEVICE(0x0df6, 0x0072),
++ .driver_info = (unsigned long)&sitecom_info,
++}, {
++ /* Samsung USB Ethernet Adapter */
++ USB_DEVICE(0x04e8, 0xa100),
++ .driver_info = (unsigned long)&samsung_info,
++}, {
++ /* Lenovo OneLinkDock Gigabit LAN */
++ USB_DEVICE(0x17ef, 0x304b),
++ .driver_info = (unsigned long)&lenovo_info,
++},
++ { },
++};
++MODULE_DEVICE_TABLE(usb, products);
++
++static struct usb_driver ax88179_178a_driver = {
++ .name = "ax88179_178a",
++ .id_table = products,
++ .probe = usbnet_probe,
++ .suspend = ax88179_suspend,
++ .resume = ax88179_resume,
++ .reset_resume = ax88179_resume,
++ .disconnect = usbnet_disconnect,
++ .supports_autosuspend = 1,
++ .disable_hub_initiated_lpm = 1,
++};
++
++module_usb_driver(ax88179_178a_driver);
++
++MODULE_DESCRIPTION("ASIX AX88179/178A based USB 3.0/2.0 Gigabit Ethernet Devices");
++MODULE_LICENSE("GPL");
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/catc.c backports-4.2.6-1/drivers/net/usb/catc.c
+--- backports-4.2.6-1.org/drivers/net/usb/catc.c 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/catc.c 2015-11-09 23:37:56.000000000 +0100
+@@ -0,0 +1,965 @@
++/*
++ * Copyright (c) 2001 Vojtech Pavlik
++ *
++ * CATC EL1210A NetMate USB Ethernet driver
++ *
++ * Sponsored by SuSE
++ *
++ * Based on the work of
++ * Donald Becker
++ *
++ * Old chipset support added by Simon Evans <spse(a)secret.org.uk> 2002
++ * - adds support for Belkin F5U011
++ */
++
++/*
++ * 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, see <http://www.gnu.org/licenses/>.
++ *
++ * Should you need to contact me, the author, you can do so either by
++ * e-mail - mail your message to <vojtech(a)suse.cz>, or by paper mail:
++ * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
++ */
++
++#include <linux/module.h>
++#include <linux/kernel.h>
++#include <linux/string.h>
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/skbuff.h>
++#include <linux/spinlock.h>
++#include <linux/ethtool.h>
++#include <linux/crc32.h>
++#include <linux/bitops.h>
++#include <linux/gfp.h>
++#include <asm/uaccess.h>
++
++#undef DEBUG
++
++#include <linux/usb.h>
++
++/*
++ * Version information.
++ */
++
++#define DRIVER_VERSION "v2.8"
++#define DRIVER_AUTHOR "Vojtech Pavlik <vojtech(a)suse.cz>"
++#define DRIVER_DESC "CATC EL1210A NetMate USB Ethernet driver"
++#define SHORT_DRIVER_DESC "EL1210A NetMate USB Ethernet"
++
++MODULE_AUTHOR(DRIVER_AUTHOR);
++MODULE_DESCRIPTION(DRIVER_DESC);
++MODULE_LICENSE("GPL");
++
++static const char driver_name[] = "catc";
++
++/*
++ * Some defines.
++ */
++
++#define STATS_UPDATE (HZ) /* Time between stats updates */
++#define TX_TIMEOUT (5*HZ) /* Max time the queue can be stopped */
++#define PKT_SZ 1536 /* Max Ethernet packet size */
++#define RX_MAX_BURST 15 /* Max packets per rx buffer (> 0, < 16) */
++#define TX_MAX_BURST 15 /* Max full sized packets per tx buffer (> 0) */
++#define CTRL_QUEUE 16 /* Max control requests in flight (power of two) */
++#define RX_PKT_SZ 1600 /* Max size of receive packet for F5U011 */
++
++/*
++ * Control requests.
++ */
++
++enum control_requests {
++ ReadMem = 0xf1,
++ GetMac = 0xf2,
++ Reset = 0xf4,
++ SetMac = 0xf5,
++ SetRxMode = 0xf5, /* F5U011 only */
++ WriteROM = 0xf8,
++ SetReg = 0xfa,
++ GetReg = 0xfb,
++ WriteMem = 0xfc,
++ ReadROM = 0xfd,
++};
++
++/*
++ * Registers.
++ */
++
++enum register_offsets {
++ TxBufCount = 0x20,
++ RxBufCount = 0x21,
++ OpModes = 0x22,
++ TxQed = 0x23,
++ RxQed = 0x24,
++ MaxBurst = 0x25,
++ RxUnit = 0x60,
++ EthStatus = 0x61,
++ StationAddr0 = 0x67,
++ EthStats = 0x69,
++ LEDCtrl = 0x81,
++};
++
++enum eth_stats {
++ TxSingleColl = 0x00,
++ TxMultiColl = 0x02,
++ TxExcessColl = 0x04,
++ RxFramErr = 0x06,
++};
++
++enum op_mode_bits {
++ Op3MemWaits = 0x03,
++ OpLenInclude = 0x08,
++ OpRxMerge = 0x10,
++ OpTxMerge = 0x20,
++ OpWin95bugfix = 0x40,
++ OpLoopback = 0x80,
++};
++
++enum rx_filter_bits {
++ RxEnable = 0x01,
++ RxPolarity = 0x02,
++ RxForceOK = 0x04,
++ RxMultiCast = 0x08,
++ RxPromisc = 0x10,
++ AltRxPromisc = 0x20, /* F5U011 uses different bit */
++};
++
++enum led_values {
++ LEDFast = 0x01,
++ LEDSlow = 0x02,
++ LEDFlash = 0x03,
++ LEDPulse = 0x04,
++ LEDLink = 0x08,
++};
++
++enum link_status {
++ LinkNoChange = 0,
++ LinkGood = 1,
++ LinkBad = 2
++};
++
++/*
++ * The catc struct.
++ */
++
++#define CTRL_RUNNING 0
++#define RX_RUNNING 1
++#define TX_RUNNING 2
++
++struct catc {
++ struct net_device *netdev;
++ struct usb_device *usbdev;
++
++ unsigned long flags;
++
++ unsigned int tx_ptr, tx_idx;
++ unsigned int ctrl_head, ctrl_tail;
++ spinlock_t tx_lock, ctrl_lock;
++
++ u8 tx_buf[2][TX_MAX_BURST * (PKT_SZ + 2)];
++ u8 rx_buf[RX_MAX_BURST * (PKT_SZ + 2)];
++ u8 irq_buf[2];
++ u8 ctrl_buf[64];
++ struct usb_ctrlrequest ctrl_dr;
++
++ struct timer_list timer;
++ u8 stats_buf[8];
++ u16 stats_vals[4];
++ unsigned long last_stats;
++
++ u8 multicast[64];
++
++ struct ctrl_queue {
++ u8 dir;
++ u8 request;
++ u16 value;
++ u16 index;
++ void *buf;
++ int len;
++ void (*callback)(struct catc *catc, struct ctrl_queue *q);
++ } ctrl_queue[CTRL_QUEUE];
++
++ struct urb *tx_urb, *rx_urb, *irq_urb, *ctrl_urb;
++
++ u8 is_f5u011; /* Set if device is an F5U011 */
++ u8 rxmode[2]; /* Used for F5U011 */
++ atomic_t recq_sz; /* Used for F5U011 - counter of waiting rx packets */
++};
++
++/*
++ * Useful macros.
++ */
++
++#define catc_get_mac(catc, mac) catc_ctrl_msg(catc, USB_DIR_IN, GetMac, 0, 0, mac, 6)
++#define catc_reset(catc) catc_ctrl_msg(catc, USB_DIR_OUT, Reset, 0, 0, NULL, 0)
++#define catc_set_reg(catc, reg, val) catc_ctrl_msg(catc, USB_DIR_OUT, SetReg, val, reg, NULL, 0)
++#define catc_get_reg(catc, reg, buf) catc_ctrl_msg(catc, USB_DIR_IN, GetReg, 0, reg, buf, 1)
++#define catc_write_mem(catc, addr, buf, size) catc_ctrl_msg(catc, USB_DIR_OUT, WriteMem, 0, addr, buf, size)
++#define catc_read_mem(catc, addr, buf, size) catc_ctrl_msg(catc, USB_DIR_IN, ReadMem, 0, addr, buf, size)
++
++#define f5u011_rxmode(catc, rxmode) catc_ctrl_msg(catc, USB_DIR_OUT, SetRxMode, 0, 1, rxmode, 2)
++#define f5u011_rxmode_async(catc, rxmode) catc_ctrl_async(catc, USB_DIR_OUT, SetRxMode, 0, 1, &rxmode, 2, NULL)
++#define f5u011_mchash_async(catc, hash) catc_ctrl_async(catc, USB_DIR_OUT, SetRxMode, 0, 2, &hash, 8, NULL)
++
++#define catc_set_reg_async(catc, reg, val) catc_ctrl_async(catc, USB_DIR_OUT, SetReg, val, reg, NULL, 0, NULL)
++#define catc_get_reg_async(catc, reg, cb) catc_ctrl_async(catc, USB_DIR_IN, GetReg, 0, reg, NULL, 1, cb)
++#define catc_write_mem_async(catc, addr, buf, size) catc_ctrl_async(catc, USB_DIR_OUT, WriteMem, 0, addr, buf, size, NULL)
++
++/*
++ * Receive routines.
++ */
++
++static void catc_rx_done(struct urb *urb)
++{
++ struct catc *catc = urb->context;
++ u8 *pkt_start = urb->transfer_buffer;
++ struct sk_buff *skb;
++ int pkt_len, pkt_offset = 0;
++ int status = urb->status;
++
++ if (!catc->is_f5u011) {
++ clear_bit(RX_RUNNING, &catc->flags);
++ pkt_offset = 2;
++ }
++
++ if (status) {
++ dev_dbg(&urb->dev->dev, "rx_done, status %d, length %d\n",
++ status, urb->actual_length);
++ return;
++ }
++
++ do {
++ if(!catc->is_f5u011) {
++ pkt_len = le16_to_cpup((__le16*)pkt_start);
++ if (pkt_len > urb->actual_length) {
++ catc->netdev->stats.rx_length_errors++;
++ catc->netdev->stats.rx_errors++;
++ break;
++ }
++ } else {
++ pkt_len = urb->actual_length;
++ }
++
++ if (!(skb = dev_alloc_skb(pkt_len)))
++ return;
++
++ skb_copy_to_linear_data(skb, pkt_start + pkt_offset, pkt_len);
++ skb_put(skb, pkt_len);
++
++ skb->protocol = eth_type_trans(skb, catc->netdev);
++ netif_rx(skb);
++
++ catc->netdev->stats.rx_packets++;
++ catc->netdev->stats.rx_bytes += pkt_len;
++
++ /* F5U011 only does one packet per RX */
++ if (catc->is_f5u011)
++ break;
++ pkt_start += (((pkt_len + 1) >> 6) + 1) << 6;
++
++ } while (pkt_start - (u8 *) urb->transfer_buffer < urb->actual_length);
++
++ if (catc->is_f5u011) {
++ if (atomic_read(&catc->recq_sz)) {
++ int state;
++ atomic_dec(&catc->recq_sz);
++ netdev_dbg(catc->netdev, "getting extra packet\n");
++ urb->dev = catc->usbdev;
++ if ((state = usb_submit_urb(urb, GFP_ATOMIC)) < 0) {
++ netdev_dbg(catc->netdev,
++ "submit(rx_urb) status %d\n", state);
++ }
++ } else {
++ clear_bit(RX_RUNNING, &catc->flags);
++ }
++ }
++}
++
++static void catc_irq_done(struct urb *urb)
++{
++ struct catc *catc = urb->context;
++ u8 *data = urb->transfer_buffer;
++ int status = urb->status;
++ unsigned int hasdata = 0, linksts = LinkNoChange;
++ int res;
++
++ if (!catc->is_f5u011) {
++ hasdata = data[1] & 0x80;
++ if (data[1] & 0x40)
++ linksts = LinkGood;
++ else if (data[1] & 0x20)
++ linksts = LinkBad;
++ } else {
++ hasdata = (unsigned int)(be16_to_cpup((__be16*)data) & 0x0fff);
++ if (data[0] == 0x90)
++ linksts = LinkGood;
++ else if (data[0] == 0xA0)
++ linksts = LinkBad;
++ }
++
++ switch (status) {
++ case 0: /* success */
++ break;
++ case -ECONNRESET: /* unlink */
++ case -ENOENT:
++ case -ESHUTDOWN:
++ return;
++ /* -EPIPE: should clear the halt */
++ default: /* error */
++ dev_dbg(&urb->dev->dev,
++ "irq_done, status %d, data %02x %02x.\n",
++ status, data[0], data[1]);
++ goto resubmit;
++ }
++
++ if (linksts == LinkGood) {
++ netif_carrier_on(catc->netdev);
++ netdev_dbg(catc->netdev, "link ok\n");
++ }
++
++ if (linksts == LinkBad) {
++ netif_carrier_off(catc->netdev);
++ netdev_dbg(catc->netdev, "link bad\n");
++ }
++
++ if (hasdata) {
++ if (test_and_set_bit(RX_RUNNING, &catc->flags)) {
++ if (catc->is_f5u011)
++ atomic_inc(&catc->recq_sz);
++ } else {
++ catc->rx_urb->dev = catc->usbdev;
++ if ((res = usb_submit_urb(catc->rx_urb, GFP_ATOMIC)) < 0) {
++ dev_err(&catc->usbdev->dev,
++ "submit(rx_urb) status %d\n", res);
++ }
++ }
++ }
++resubmit:
++ res = usb_submit_urb (urb, GFP_ATOMIC);
++ if (res)
++ dev_err(&catc->usbdev->dev,
++ "can't resubmit intr, %s-%s, status %d\n",
++ catc->usbdev->bus->bus_name,
++ catc->usbdev->devpath, res);
++}
++
++/*
++ * Transmit routines.
++ */
++
++static int catc_tx_run(struct catc *catc)
++{
++ int status;
++
++ if (catc->is_f5u011)
++ catc->tx_ptr = (catc->tx_ptr + 63) & ~63;
++
++ catc->tx_urb->transfer_buffer_length = catc->tx_ptr;
++ catc->tx_urb->transfer_buffer = catc->tx_buf[catc->tx_idx];
++ catc->tx_urb->dev = catc->usbdev;
++
++ if ((status = usb_submit_urb(catc->tx_urb, GFP_ATOMIC)) < 0)
++ dev_err(&catc->usbdev->dev, "submit(tx_urb), status %d\n",
++ status);
++
++ catc->tx_idx = !catc->tx_idx;
++ catc->tx_ptr = 0;
++
++ catc->netdev->trans_start = jiffies;
++ return status;
++}
++
++static void catc_tx_done(struct urb *urb)
++{
++ struct catc *catc = urb->context;
++ unsigned long flags;
++ int r, status = urb->status;
++
++ if (status == -ECONNRESET) {
++ dev_dbg(&urb->dev->dev, "Tx Reset.\n");
++ urb->status = 0;
++ catc->netdev->trans_start = jiffies;
++ catc->netdev->stats.tx_errors++;
++ clear_bit(TX_RUNNING, &catc->flags);
++ netif_wake_queue(catc->netdev);
++ return;
++ }
++
++ if (status) {
++ dev_dbg(&urb->dev->dev, "tx_done, status %d, length %d\n",
++ status, urb->actual_length);
++ return;
++ }
++
++ spin_lock_irqsave(&catc->tx_lock, flags);
++
++ if (catc->tx_ptr) {
++ r = catc_tx_run(catc);
++ if (unlikely(r < 0))
++ clear_bit(TX_RUNNING, &catc->flags);
++ } else {
++ clear_bit(TX_RUNNING, &catc->flags);
++ }
++
++ netif_wake_queue(catc->netdev);
++
++ spin_unlock_irqrestore(&catc->tx_lock, flags);
++}
++
++static netdev_tx_t catc_start_xmit(struct sk_buff *skb,
++ struct net_device *netdev)
++{
++ struct catc *catc = netdev_priv(netdev);
++ unsigned long flags;
++ int r = 0;
++ char *tx_buf;
++
++ spin_lock_irqsave(&catc->tx_lock, flags);
++
++ catc->tx_ptr = (((catc->tx_ptr - 1) >> 6) + 1) << 6;
++ tx_buf = catc->tx_buf[catc->tx_idx] + catc->tx_ptr;
++ if (catc->is_f5u011)
++ *(__be16 *)tx_buf = cpu_to_be16(skb->len);
++ else
++ *(__le16 *)tx_buf = cpu_to_le16(skb->len);
++ skb_copy_from_linear_data(skb, tx_buf + 2, skb->len);
++ catc->tx_ptr += skb->len + 2;
++
++ if (!test_and_set_bit(TX_RUNNING, &catc->flags)) {
++ r = catc_tx_run(catc);
++ if (r < 0)
++ clear_bit(TX_RUNNING, &catc->flags);
++ }
++
++ if ((catc->is_f5u011 && catc->tx_ptr) ||
++ (catc->tx_ptr >= ((TX_MAX_BURST - 1) * (PKT_SZ + 2))))
++ netif_stop_queue(netdev);
++
++ spin_unlock_irqrestore(&catc->tx_lock, flags);
++
++ if (r >= 0) {
++ catc->netdev->stats.tx_bytes += skb->len;
++ catc->netdev->stats.tx_packets++;
++ }
++
++ dev_kfree_skb(skb);
++
++ return NETDEV_TX_OK;
++}
++
++static void catc_tx_timeout(struct net_device *netdev)
++{
++ struct catc *catc = netdev_priv(netdev);
++
++ dev_warn(&netdev->dev, "Transmit timed out.\n");
++ usb_unlink_urb(catc->tx_urb);
++}
++
++/*
++ * Control messages.
++ */
++
++static int catc_ctrl_msg(struct catc *catc, u8 dir, u8 request, u16 value, u16 index, void *buf, int len)
++{
++ int retval = usb_control_msg(catc->usbdev,
++ dir ? usb_rcvctrlpipe(catc->usbdev, 0) : usb_sndctrlpipe(catc->usbdev, 0),
++ request, 0x40 | dir, value, index, buf, len, 1000);
++ return retval < 0 ? retval : 0;
++}
++
++static void catc_ctrl_run(struct catc *catc)
++{
++ struct ctrl_queue *q = catc->ctrl_queue + catc->ctrl_tail;
++ struct usb_device *usbdev = catc->usbdev;
++ struct urb *urb = catc->ctrl_urb;
++ struct usb_ctrlrequest *dr = &catc->ctrl_dr;
++ int status;
++
++ dr->bRequest = q->request;
++ dr->bRequestType = 0x40 | q->dir;
++ dr->wValue = cpu_to_le16(q->value);
++ dr->wIndex = cpu_to_le16(q->index);
++ dr->wLength = cpu_to_le16(q->len);
++
++ urb->pipe = q->dir ? usb_rcvctrlpipe(usbdev, 0) : usb_sndctrlpipe(usbdev, 0);
++ urb->transfer_buffer_length = q->len;
++ urb->transfer_buffer = catc->ctrl_buf;
++ urb->setup_packet = (void *) dr;
++ urb->dev = usbdev;
++
++ if (!q->dir && q->buf && q->len)
++ memcpy(catc->ctrl_buf, q->buf, q->len);
++
++ if ((status = usb_submit_urb(catc->ctrl_urb, GFP_ATOMIC)))
++ dev_err(&catc->usbdev->dev, "submit(ctrl_urb) status %d\n",
++ status);
++}
++
++static void catc_ctrl_done(struct urb *urb)
++{
++ struct catc *catc = urb->context;
++ struct ctrl_queue *q;
++ unsigned long flags;
++ int status = urb->status;
++
++ if (status)
++ dev_dbg(&urb->dev->dev, "ctrl_done, status %d, len %d.\n",
++ status, urb->actual_length);
++
++ spin_lock_irqsave(&catc->ctrl_lock, flags);
++
++ q = catc->ctrl_queue + catc->ctrl_tail;
++
++ if (q->dir) {
++ if (q->buf && q->len)
++ memcpy(q->buf, catc->ctrl_buf, q->len);
++ else
++ q->buf = catc->ctrl_buf;
++ }
++
++ if (q->callback)
++ q->callback(catc, q);
++
++ catc->ctrl_tail = (catc->ctrl_tail + 1) & (CTRL_QUEUE - 1);
++
++ if (catc->ctrl_head != catc->ctrl_tail)
++ catc_ctrl_run(catc);
++ else
++ clear_bit(CTRL_RUNNING, &catc->flags);
++
++ spin_unlock_irqrestore(&catc->ctrl_lock, flags);
++}
++
++static int catc_ctrl_async(struct catc *catc, u8 dir, u8 request, u16 value,
++ u16 index, void *buf, int len, void (*callback)(struct catc *catc, struct ctrl_queue *q))
++{
++ struct ctrl_queue *q;
++ int retval = 0;
++ unsigned long flags;
++
++ spin_lock_irqsave(&catc->ctrl_lock, flags);
++
++ q = catc->ctrl_queue + catc->ctrl_head;
++
++ q->dir = dir;
++ q->request = request;
++ q->value = value;
++ q->index = index;
++ q->buf = buf;
++ q->len = len;
++ q->callback = callback;
++
++ catc->ctrl_head = (catc->ctrl_head + 1) & (CTRL_QUEUE - 1);
++
++ if (catc->ctrl_head == catc->ctrl_tail) {
++ dev_err(&catc->usbdev->dev, "ctrl queue full\n");
++ catc->ctrl_tail = (catc->ctrl_tail + 1) & (CTRL_QUEUE - 1);
++ retval = -1;
++ }
++
++ if (!test_and_set_bit(CTRL_RUNNING, &catc->flags))
++ catc_ctrl_run(catc);
++
++ spin_unlock_irqrestore(&catc->ctrl_lock, flags);
++
++ return retval;
++}
++
++/*
++ * Statistics.
++ */
++
++static void catc_stats_done(struct catc *catc, struct ctrl_queue *q)
++{
++ int index = q->index - EthStats;
++ u16 data, last;
++
++ catc->stats_buf[index] = *((char *)q->buf);
++
++ if (index & 1)
++ return;
++
++ data = ((u16)catc->stats_buf[index] << 8) | catc->stats_buf[index + 1];
++ last = catc->stats_vals[index >> 1];
++
++ switch (index) {
++ case TxSingleColl:
++ case TxMultiColl:
++ catc->netdev->stats.collisions += data - last;
++ break;
++ case TxExcessColl:
++ catc->netdev->stats.tx_aborted_errors += data - last;
++ catc->netdev->stats.tx_errors += data - last;
++ break;
++ case RxFramErr:
++ catc->netdev->stats.rx_frame_errors += data - last;
++ catc->netdev->stats.rx_errors += data - last;
++ break;
++ }
++
++ catc->stats_vals[index >> 1] = data;
++}
++
++static void catc_stats_timer(unsigned long data)
++{
++ struct catc *catc = (void *) data;
++ int i;
++
++ for (i = 0; i < 8; i++)
++ catc_get_reg_async(catc, EthStats + 7 - i, catc_stats_done);
++
++ mod_timer(&catc->timer, jiffies + STATS_UPDATE);
++}
++
++/*
++ * Receive modes. Broadcast, Multicast, Promisc.
++ */
++
++static void catc_multicast(unsigned char *addr, u8 *multicast)
++{
++ u32 crc;
++
++ crc = ether_crc_le(6, addr);
++ multicast[(crc >> 3) & 0x3f] |= 1 << (crc & 7);
++}
++
++static void catc_set_multicast_list(struct net_device *netdev)
++{
++ struct catc *catc = netdev_priv(netdev);
++ struct netdev_hw_addr *ha;
++ u8 broadcast[ETH_ALEN];
++ u8 rx = RxEnable | RxPolarity | RxMultiCast;
++
++ eth_broadcast_addr(broadcast);
++ memset(catc->multicast, 0, 64);
++
++ catc_multicast(broadcast, catc->multicast);
++ catc_multicast(netdev->dev_addr, catc->multicast);
++
++ if (netdev->flags & IFF_PROMISC) {
++ memset(catc->multicast, 0xff, 64);
++ rx |= (!catc->is_f5u011) ? RxPromisc : AltRxPromisc;
++ }
++
++ if (netdev->flags & IFF_ALLMULTI) {
++ memset(catc->multicast, 0xff, 64);
++ } else {
++ netdev_for_each_mc_addr(ha, netdev) {
++ u32 crc = ether_crc_le(6, ha->addr);
++ if (!catc->is_f5u011) {
++ catc->multicast[(crc >> 3) & 0x3f] |= 1 << (crc & 7);
++ } else {
++ catc->multicast[7-(crc >> 29)] |= 1 << ((crc >> 26) & 7);
++ }
++ }
++ }
++ if (!catc->is_f5u011) {
++ catc_set_reg_async(catc, RxUnit, rx);
++ catc_write_mem_async(catc, 0xfa80, catc->multicast, 64);
++ } else {
++ f5u011_mchash_async(catc, catc->multicast);
++ if (catc->rxmode[0] != rx) {
++ catc->rxmode[0] = rx;
++ netdev_dbg(catc->netdev,
++ "Setting RX mode to %2.2X %2.2X\n",
++ catc->rxmode[0], catc->rxmode[1]);
++ f5u011_rxmode_async(catc, catc->rxmode);
++ }
++ }
++}
++
++static void catc_get_drvinfo(struct net_device *dev,
++ struct ethtool_drvinfo *info)
++{
++ struct catc *catc = netdev_priv(dev);
++ strlcpy(info->driver, driver_name, sizeof(info->driver));
++ strlcpy(info->version, DRIVER_VERSION, sizeof(info->version));
++ usb_make_path(catc->usbdev, info->bus_info, sizeof(info->bus_info));
++}
++
++static int catc_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
++{
++ struct catc *catc = netdev_priv(dev);
++ if (!catc->is_f5u011)
++ return -EOPNOTSUPP;
++
++ cmd->supported = SUPPORTED_10baseT_Half | SUPPORTED_TP;
++ cmd->advertising = ADVERTISED_10baseT_Half | ADVERTISED_TP;
++ ethtool_cmd_speed_set(cmd, SPEED_10);
++ cmd->duplex = DUPLEX_HALF;
++ cmd->port = PORT_TP;
++ cmd->phy_address = 0;
++ cmd->transceiver = XCVR_INTERNAL;
++ cmd->autoneg = AUTONEG_DISABLE;
++ cmd->maxtxpkt = 1;
++ cmd->maxrxpkt = 1;
++ return 0;
++}
++
++static const struct ethtool_ops ops = {
++ .get_drvinfo = catc_get_drvinfo,
++ .get_settings = catc_get_settings,
++ .get_link = ethtool_op_get_link
++};
++
++/*
++ * Open, close.
++ */
++
++static int catc_open(struct net_device *netdev)
++{
++ struct catc *catc = netdev_priv(netdev);
++ int status;
++
++ catc->irq_urb->dev = catc->usbdev;
++ if ((status = usb_submit_urb(catc->irq_urb, GFP_KERNEL)) < 0) {
++ dev_err(&catc->usbdev->dev, "submit(irq_urb) status %d\n",
++ status);
++ return -1;
++ }
++
++ netif_start_queue(netdev);
++
++ if (!catc->is_f5u011)
++ mod_timer(&catc->timer, jiffies + STATS_UPDATE);
++
++ return 0;
++}
++
++static int catc_stop(struct net_device *netdev)
++{
++ struct catc *catc = netdev_priv(netdev);
++
++ netif_stop_queue(netdev);
++
++ if (!catc->is_f5u011)
++ del_timer_sync(&catc->timer);
++
++ usb_kill_urb(catc->rx_urb);
++ usb_kill_urb(catc->tx_urb);
++ usb_kill_urb(catc->irq_urb);
++ usb_kill_urb(catc->ctrl_urb);
++
++ return 0;
++}
++
++static const struct net_device_ops catc_netdev_ops = {
++ .ndo_open = catc_open,
++ .ndo_stop = catc_stop,
++ .ndo_start_xmit = catc_start_xmit,
++
++ .ndo_tx_timeout = catc_tx_timeout,
++ .ndo_set_rx_mode = catc_set_multicast_list,
++ .ndo_change_mtu = eth_change_mtu,
++ .ndo_set_mac_address = eth_mac_addr,
++ .ndo_validate_addr = eth_validate_addr,
++};
++
++/*
++ * USB probe, disconnect.
++ */
++
++static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id)
++{
++ struct device *dev = &intf->dev;
++ struct usb_device *usbdev = interface_to_usbdev(intf);
++ struct net_device *netdev;
++ struct catc *catc;
++ u8 broadcast[ETH_ALEN];
++ int i, pktsz;
++
++ if (usb_set_interface(usbdev,
++ intf->altsetting->desc.bInterfaceNumber, 1)) {
++ dev_err(dev, "Can't set altsetting 1.\n");
++ return -EIO;
++ }
++
++ netdev = alloc_etherdev(sizeof(struct catc));
++ if (!netdev)
++ return -ENOMEM;
++
++ catc = netdev_priv(netdev);
++
++ netdev->netdev_ops = &catc_netdev_ops;
++ netdev->watchdog_timeo = TX_TIMEOUT;
++ netdev->ethtool_ops = &ops;
++
++ catc->usbdev = usbdev;
++ catc->netdev = netdev;
++
++ spin_lock_init(&catc->tx_lock);
++ spin_lock_init(&catc->ctrl_lock);
++
++ init_timer(&catc->timer);
++ catc->timer.data = (long) catc;
++ catc->timer.function = catc_stats_timer;
++
++ catc->ctrl_urb = usb_alloc_urb(0, GFP_KERNEL);
++ catc->tx_urb = usb_alloc_urb(0, GFP_KERNEL);
++ catc->rx_urb = usb_alloc_urb(0, GFP_KERNEL);
++ catc->irq_urb = usb_alloc_urb(0, GFP_KERNEL);
++ if ((!catc->ctrl_urb) || (!catc->tx_urb) ||
++ (!catc->rx_urb) || (!catc->irq_urb)) {
++ dev_err(&intf->dev, "No free urbs available.\n");
++ usb_free_urb(catc->ctrl_urb);
++ usb_free_urb(catc->tx_urb);
++ usb_free_urb(catc->rx_urb);
++ usb_free_urb(catc->irq_urb);
++ free_netdev(netdev);
++ return -ENOMEM;
++ }
++
++ /* The F5U011 has the same vendor/product as the netmate but a device version of 0x130 */
++ if (le16_to_cpu(usbdev->descriptor.idVendor) == 0x0423 &&
++ le16_to_cpu(usbdev->descriptor.idProduct) == 0xa &&
++ le16_to_cpu(catc->usbdev->descriptor.bcdDevice) == 0x0130) {
++ dev_dbg(dev, "Testing for f5u011\n");
++ catc->is_f5u011 = 1;
++ atomic_set(&catc->recq_sz, 0);
++ pktsz = RX_PKT_SZ;
++ } else {
++ pktsz = RX_MAX_BURST * (PKT_SZ + 2);
++ }
++
++ usb_fill_control_urb(catc->ctrl_urb, usbdev, usb_sndctrlpipe(usbdev, 0),
++ NULL, NULL, 0, catc_ctrl_done, catc);
++
++ usb_fill_bulk_urb(catc->tx_urb, usbdev, usb_sndbulkpipe(usbdev, 1),
++ NULL, 0, catc_tx_done, catc);
++
++ usb_fill_bulk_urb(catc->rx_urb, usbdev, usb_rcvbulkpipe(usbdev, 1),
++ catc->rx_buf, pktsz, catc_rx_done, catc);
++
++ usb_fill_int_urb(catc->irq_urb, usbdev, usb_rcvintpipe(usbdev, 2),
++ catc->irq_buf, 2, catc_irq_done, catc, 1);
++
++ if (!catc->is_f5u011) {
++ dev_dbg(dev, "Checking memory size\n");
++
++ i = 0x12345678;
++ catc_write_mem(catc, 0x7a80, &i, 4);
++ i = 0x87654321;
++ catc_write_mem(catc, 0xfa80, &i, 4);
++ catc_read_mem(catc, 0x7a80, &i, 4);
++
++ switch (i) {
++ case 0x12345678:
++ catc_set_reg(catc, TxBufCount, 8);
++ catc_set_reg(catc, RxBufCount, 32);
++ dev_dbg(dev, "64k Memory\n");
++ break;
++ default:
++ dev_warn(&intf->dev,
++ "Couldn't detect memory size, assuming 32k\n");
++ case 0x87654321:
++ catc_set_reg(catc, TxBufCount, 4);
++ catc_set_reg(catc, RxBufCount, 16);
++ dev_dbg(dev, "32k Memory\n");
++ break;
++ }
++
++ dev_dbg(dev, "Getting MAC from SEEROM.\n");
++
++ catc_get_mac(catc, netdev->dev_addr);
++
++ dev_dbg(dev, "Setting MAC into registers.\n");
++
++ for (i = 0; i < 6; i++)
++ catc_set_reg(catc, StationAddr0 - i, netdev->dev_addr[i]);
++
++ dev_dbg(dev, "Filling the multicast list.\n");
++
++ eth_broadcast_addr(broadcast);
++ catc_multicast(broadcast, catc->multicast);
++ catc_multicast(netdev->dev_addr, catc->multicast);
++ catc_write_mem(catc, 0xfa80, catc->multicast, 64);
++
++ dev_dbg(dev, "Clearing error counters.\n");
++
++ for (i = 0; i < 8; i++)
++ catc_set_reg(catc, EthStats + i, 0);
++ catc->last_stats = jiffies;
++
++ dev_dbg(dev, "Enabling.\n");
++
++ catc_set_reg(catc, MaxBurst, RX_MAX_BURST);
++ catc_set_reg(catc, OpModes, OpTxMerge | OpRxMerge | OpLenInclude | Op3MemWaits);
++ catc_set_reg(catc, LEDCtrl, LEDLink);
++ catc_set_reg(catc, RxUnit, RxEnable | RxPolarity | RxMultiCast);
++ } else {
++ dev_dbg(dev, "Performing reset\n");
++ catc_reset(catc);
++ catc_get_mac(catc, netdev->dev_addr);
++
++ dev_dbg(dev, "Setting RX Mode\n");
++ catc->rxmode[0] = RxEnable | RxPolarity | RxMultiCast;
++ catc->rxmode[1] = 0;
++ f5u011_rxmode(catc, catc->rxmode);
++ }
++ dev_dbg(dev, "Init done.\n");
++ printk(KERN_INFO "%s: %s USB Ethernet at usb-%s-%s, %pM.\n",
++ netdev->name, (catc->is_f5u011) ? "Belkin F5U011" : "CATC EL1210A NetMate",
++ usbdev->bus->bus_name, usbdev->devpath, netdev->dev_addr);
++ usb_set_intfdata(intf, catc);
++
++ SET_NETDEV_DEV(netdev, &intf->dev);
++ if (register_netdev(netdev) != 0) {
++ usb_set_intfdata(intf, NULL);
++ usb_free_urb(catc->ctrl_urb);
++ usb_free_urb(catc->tx_urb);
++ usb_free_urb(catc->rx_urb);
++ usb_free_urb(catc->irq_urb);
++ free_netdev(netdev);
++ return -EIO;
++ }
++ return 0;
++}
++
++static void catc_disconnect(struct usb_interface *intf)
++{
++ struct catc *catc = usb_get_intfdata(intf);
++
++ usb_set_intfdata(intf, NULL);
++ if (catc) {
++ unregister_netdev(catc->netdev);
++ usb_free_urb(catc->ctrl_urb);
++ usb_free_urb(catc->tx_urb);
++ usb_free_urb(catc->rx_urb);
++ usb_free_urb(catc->irq_urb);
++ free_netdev(catc->netdev);
++ }
++}
++
++/*
++ * Module functions and tables.
++ */
++
++static struct usb_device_id catc_id_table [] = {
++ { USB_DEVICE(0x0423, 0xa) }, /* CATC Netmate, Belkin F5U011 */
++ { USB_DEVICE(0x0423, 0xc) }, /* CATC Netmate II, Belkin F5U111 */
++ { USB_DEVICE(0x08d1, 0x1) }, /* smartBridges smartNIC */
++ { }
++};
++
++MODULE_DEVICE_TABLE(usb, catc_id_table);
++
++static struct usb_driver catc_driver = {
++ .name = driver_name,
++ .probe = catc_probe,
++ .disconnect = catc_disconnect,
++ .id_table = catc_id_table,
++ .disable_hub_initiated_lpm = 1,
++};
++
++module_usb_driver(catc_driver);
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/cdc_eem.c backports-4.2.6-1/drivers/net/usb/cdc_eem.c
+--- backports-4.2.6-1.org/drivers/net/usb/cdc_eem.c 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/cdc_eem.c 2015-11-09 23:37:56.000000000 +0100
+@@ -0,0 +1,381 @@
++/*
++ * USB CDC EEM network interface driver
++ * Copyright (C) 2009 Oberthur Technologies
++ * by Omar Laazimani, Olivier Condemine
++ *
++ * 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, see <http://www.gnu.org/licenses/>.
++ */
++
++#include <linux/module.h>
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/ctype.h>
++#include <linux/ethtool.h>
++#include <linux/workqueue.h>
++#include <linux/mii.h>
++#include <linux/usb.h>
++#include <linux/crc32.h>
++#include <linux/usb/cdc.h>
++#include <linux/usb/usbnet.h>
++#include <linux/gfp.h>
++#include <linux/if_vlan.h>
++
++
++/*
++ * This driver is an implementation of the CDC "Ethernet Emulation
++ * Model" (EEM) specification, which encapsulates Ethernet frames
++ * for transport over USB using a simpler USB device model than the
++ * previous CDC "Ethernet Control Model" (ECM, or "CDC Ethernet").
++ *
++ * For details, see www.usb.org/developers/devclass_docs/CDC_EEM10.pdf
++ *
++ * This version has been tested with GIGAntIC WuaoW SIM Smart Card on 2.6.24,
++ * 2.6.27 and 2.6.30rc2 kernel.
++ * It has also been validated on Openmoko Om 2008.12 (based on 2.6.24 kernel).
++ * build on 23-April-2009
++ */
++
++#define EEM_HEAD 2 /* 2 byte header */
++
++/*-------------------------------------------------------------------------*/
++
++static void eem_linkcmd_complete(struct urb *urb)
++{
++ dev_kfree_skb(urb->context);
++ usb_free_urb(urb);
++}
++
++static void eem_linkcmd(struct usbnet *dev, struct sk_buff *skb)
++{
++ struct urb *urb;
++ int status;
++
++ urb = usb_alloc_urb(0, GFP_ATOMIC);
++ if (!urb)
++ goto fail;
++
++ usb_fill_bulk_urb(urb, dev->udev, dev->out,
++ skb->data, skb->len, eem_linkcmd_complete, skb);
++
++ status = usb_submit_urb(urb, GFP_ATOMIC);
++ if (status) {
++ usb_free_urb(urb);
++fail:
++ dev_kfree_skb(skb);
++ netdev_warn(dev->net, "link cmd failure\n");
++ return;
++ }
++}
++
++static int eem_bind(struct usbnet *dev, struct usb_interface *intf)
++{
++ int status = 0;
++
++ status = usbnet_get_endpoints(dev, intf);
++ if (status < 0) {
++ usb_set_intfdata(intf, NULL);
++ usb_driver_release_interface(driver_of(intf), intf);
++ return status;
++ }
++
++ /* no jumbogram (16K) support for now */
++
++ dev->net->hard_header_len += EEM_HEAD + ETH_FCS_LEN + VLAN_HLEN;
++ dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len;
++
++ return 0;
++}
++
++/*
++ * EEM permits packing multiple Ethernet frames into USB transfers
++ * (a "bundle"), but for TX we don't try to do that.
++ */
++static struct sk_buff *eem_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
++ gfp_t flags)
++{
++ struct sk_buff *skb2 = NULL;
++ u16 len = skb->len;
++ u32 crc = 0;
++ int padlen = 0;
++
++ /* When ((len + EEM_HEAD + ETH_FCS_LEN) % dev->maxpacket) is
++ * zero, stick two bytes of zero length EEM packet on the end.
++ * Else the framework would add invalid single byte padding,
++ * since it can't know whether ZLPs will be handled right by
++ * all the relevant hardware and software.
++ */
++ if (!((len + EEM_HEAD + ETH_FCS_LEN) % dev->maxpacket))
++ padlen += 2;
++
++ if (!skb_cloned(skb)) {
++ int headroom = skb_headroom(skb);
++ int tailroom = skb_tailroom(skb);
++
++ if ((tailroom >= ETH_FCS_LEN + padlen) &&
++ (headroom >= EEM_HEAD))
++ goto done;
++
++ if ((headroom + tailroom)
++ > (EEM_HEAD + ETH_FCS_LEN + padlen)) {
++ skb->data = memmove(skb->head +
++ EEM_HEAD,
++ skb->data,
++ skb->len);
++ skb_set_tail_pointer(skb, len);
++ goto done;
++ }
++ }
++
++ skb2 = skb_copy_expand(skb, EEM_HEAD, ETH_FCS_LEN + padlen, flags);
++ if (!skb2)
++ return NULL;
++
++ dev_kfree_skb_any(skb);
++ skb = skb2;
++
++done:
++ /* we don't use the "no Ethernet CRC" option */
++ crc = crc32_le(~0, skb->data, skb->len);
++ crc = ~crc;
++
++ put_unaligned_le32(crc, skb_put(skb, 4));
++
++ /* EEM packet header format:
++ * b0..13: length of ethernet frame
++ * b14: bmCRC (1 == valid Ethernet CRC)
++ * b15: bmType (0 == data)
++ */
++ len = skb->len;
++ put_unaligned_le16(BIT(14) | len, skb_push(skb, 2));
++
++ /* Bundle a zero length EEM packet if needed */
++ if (padlen)
++ put_unaligned_le16(0, skb_put(skb, 2));
++
++ return skb;
++}
++
++static int eem_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
++{
++ /*
++ * Our task here is to strip off framing, leaving skb with one
++ * data frame for the usbnet framework code to process. But we
++ * may have received multiple EEM payloads, or command payloads.
++ * So we must process _everything_ as if it's a header, except
++ * maybe the last data payload
++ *
++ * REVISIT the framework needs updating so that when we consume
++ * all payloads (the last or only message was a command, or a
++ * zero length EEM packet) that is not accounted as an rx_error.
++ */
++ do {
++ struct sk_buff *skb2 = NULL;
++ u16 header;
++ u16 len = 0;
++
++ /* incomplete EEM header? */
++ if (skb->len < EEM_HEAD)
++ return 0;
++
++ /*
++ * EEM packet header format:
++ * b0..14: EEM type dependent (Data or Command)
++ * b15: bmType
++ */
++ header = get_unaligned_le16(skb->data);
++ skb_pull(skb, EEM_HEAD);
++
++ /*
++ * The bmType bit helps to denote when EEM
++ * packet is data or command :
++ * bmType = 0 : EEM data payload
++ * bmType = 1 : EEM (link) command
++ */
++ if (header & BIT(15)) {
++ u16 bmEEMCmd;
++
++ /*
++ * EEM (link) command packet:
++ * b0..10: bmEEMCmdParam
++ * b11..13: bmEEMCmd
++ * b14: bmReserved (must be 0)
++ * b15: 1 (EEM command)
++ */
++ if (header & BIT(14)) {
++ netdev_dbg(dev->net, "reserved command %04x\n",
++ header);
++ continue;
++ }
++
++ bmEEMCmd = (header >> 11) & 0x7;
++ switch (bmEEMCmd) {
++
++ /* Responding to echo requests is mandatory. */
++ case 0: /* Echo command */
++ len = header & 0x7FF;
++
++ /* bogus command? */
++ if (skb->len < len)
++ return 0;
++
++ skb2 = skb_clone(skb, GFP_ATOMIC);
++ if (unlikely(!skb2))
++ goto next;
++ skb_trim(skb2, len);
++ put_unaligned_le16(BIT(15) | (1 << 11) | len,
++ skb_push(skb2, 2));
++ eem_linkcmd(dev, skb2);
++ break;
++
++ /*
++ * Host may choose to ignore hints.
++ * - suspend: peripheral ready to suspend
++ * - response: suggest N millisec polling
++ * - response complete: suggest N sec polling
++ *
++ * Suspend is reported and maybe heeded.
++ */
++ case 2: /* Suspend hint */
++ usbnet_device_suggests_idle(dev);
++ continue;
++ case 3: /* Response hint */
++ case 4: /* Response complete hint */
++ continue;
++
++ /*
++ * Hosts should never receive host-to-peripheral
++ * or reserved command codes; or responses to an
++ * echo command we didn't send.
++ */
++ case 1: /* Echo response */
++ case 5: /* Tickle */
++ default: /* reserved */
++ netdev_warn(dev->net,
++ "unexpected link command %d\n",
++ bmEEMCmd);
++ continue;
++ }
++
++ } else {
++ u32 crc, crc2;
++ int is_last;
++
++ /* zero length EEM packet? */
++ if (header == 0)
++ continue;
++
++ /*
++ * EEM data packet header :
++ * b0..13: length of ethernet frame
++ * b14: bmCRC
++ * b15: 0 (EEM data)
++ */
++ len = header & 0x3FFF;
++
++ /* bogus EEM payload? */
++ if (skb->len < len)
++ return 0;
++
++ /* bogus ethernet frame? */
++ if (len < (ETH_HLEN + ETH_FCS_LEN))
++ goto next;
++
++ /*
++ * Treat the last payload differently: framework
++ * code expects our "fixup" to have stripped off
++ * headers, so "skb" is a data packet (or error).
++ * Else if it's not the last payload, keep "skb"
++ * for further processing.
++ */
++ is_last = (len == skb->len);
++ if (is_last)
++ skb2 = skb;
++ else {
++ skb2 = skb_clone(skb, GFP_ATOMIC);
++ if (unlikely(!skb2))
++ return 0;
++ }
++
++ /*
++ * The bmCRC helps to denote when the CRC field in
++ * the Ethernet frame contains a calculated CRC:
++ * bmCRC = 1 : CRC is calculated
++ * bmCRC = 0 : CRC = 0xDEADBEEF
++ */
++ if (header & BIT(14)) {
++ crc = get_unaligned_le32(skb2->data
++ + len - ETH_FCS_LEN);
++ crc2 = ~crc32_le(~0, skb2->data, skb2->len
++ - ETH_FCS_LEN);
++ } else {
++ crc = get_unaligned_be32(skb2->data
++ + len - ETH_FCS_LEN);
++ crc2 = 0xdeadbeef;
++ }
++ skb_trim(skb2, len - ETH_FCS_LEN);
++
++ if (is_last)
++ return crc == crc2;
++
++ if (unlikely(crc != crc2)) {
++ dev->net->stats.rx_errors++;
++ dev_kfree_skb_any(skb2);
++ } else
++ usbnet_skb_return(dev, skb2);
++ }
++
++next:
++ skb_pull(skb, len);
++ } while (skb->len);
++
++ return 1;
++}
++
++static const struct driver_info eem_info = {
++ .description = "CDC EEM Device",
++ .flags = FLAG_ETHER | FLAG_POINTTOPOINT,
++ .bind = eem_bind,
++ .rx_fixup = eem_rx_fixup,
++ .tx_fixup = eem_tx_fixup,
++};
++
++/*-------------------------------------------------------------------------*/
++
++static const struct usb_device_id products[] = {
++{
++ USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_EEM,
++ USB_CDC_PROTO_EEM),
++ .driver_info = (unsigned long) &eem_info,
++},
++{
++ /* EMPTY == end of list */
++},
++};
++MODULE_DEVICE_TABLE(usb, products);
++
++static struct usb_driver eem_driver = {
++ .name = "cdc_eem",
++ .id_table = products,
++ .probe = usbnet_probe,
++ .disconnect = usbnet_disconnect,
++ .suspend = usbnet_suspend,
++ .resume = usbnet_resume,
++ .disable_hub_initiated_lpm = 1,
++};
++
++module_usb_driver(eem_driver);
++
++MODULE_AUTHOR("Omar Laazimani <omar.oberthur(a)gmail.com>");
++MODULE_DESCRIPTION("USB CDC EEM");
++MODULE_LICENSE("GPL");
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/cdc-phonet.c backports-4.2.6-1/drivers/net/usb/cdc-phonet.c
+--- backports-4.2.6-1.org/drivers/net/usb/cdc-phonet.c 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/cdc-phonet.c 2015-11-09 23:37:56.000000000 +0100
+@@ -0,0 +1,466 @@
++/*
++ * phonet.c -- USB CDC Phonet host driver
++ *
++ * Copyright (C) 2008-2009 Nokia Corporation. All rights reserved.
++ *
++ * Author: Rémi Denis-Courmont
++ *
++ * 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 published by the Free Software Foundation.
++ *
++ * 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., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301 USA
++ */
++
++#include <linux/kernel.h>
++#include <linux/mm.h>
++#include <linux/module.h>
++#include <linux/gfp.h>
++#include <linux/usb.h>
++#include <linux/usb/cdc.h>
++#include <linux/netdevice.h>
++#include <linux/if_arp.h>
++#include <linux/if_phonet.h>
++#include <linux/phonet.h>
++
++#define PN_MEDIA_USB 0x1B
++
++static const unsigned rxq_size = 17;
++
++struct usbpn_dev {
++ struct net_device *dev;
++
++ struct usb_interface *intf, *data_intf;
++ struct usb_device *usb;
++ unsigned int tx_pipe, rx_pipe;
++ u8 active_setting;
++ u8 disconnected;
++
++ unsigned tx_queue;
++ spinlock_t tx_lock;
++
++ spinlock_t rx_lock;
++ struct sk_buff *rx_skb;
++ struct urb *urbs[0];
++};
++
++static void tx_complete(struct urb *req);
++static void rx_complete(struct urb *req);
++
++/*
++ * Network device callbacks
++ */
++static netdev_tx_t usbpn_xmit(struct sk_buff *skb, struct net_device *dev)
++{
++ struct usbpn_dev *pnd = netdev_priv(dev);
++ struct urb *req = NULL;
++ unsigned long flags;
++ int err;
++
++ if (skb->protocol != htons(ETH_P_PHONET))
++ goto drop;
++
++ req = usb_alloc_urb(0, GFP_ATOMIC);
++ if (!req)
++ goto drop;
++ usb_fill_bulk_urb(req, pnd->usb, pnd->tx_pipe, skb->data, skb->len,
++ tx_complete, skb);
++ req->transfer_flags = URB_ZERO_PACKET;
++ err = usb_submit_urb(req, GFP_ATOMIC);
++ if (err) {
++ usb_free_urb(req);
++ goto drop;
++ }
++
++ spin_lock_irqsave(&pnd->tx_lock, flags);
++ pnd->tx_queue++;
++ if (pnd->tx_queue >= dev->tx_queue_len)
++ netif_stop_queue(dev);
++ spin_unlock_irqrestore(&pnd->tx_lock, flags);
++ return NETDEV_TX_OK;
++
++drop:
++ dev_kfree_skb(skb);
++ dev->stats.tx_dropped++;
++ return NETDEV_TX_OK;
++}
++
++static void tx_complete(struct urb *req)
++{
++ struct sk_buff *skb = req->context;
++ struct net_device *dev = skb->dev;
++ struct usbpn_dev *pnd = netdev_priv(dev);
++ int status = req->status;
++
++ switch (status) {
++ case 0:
++ dev->stats.tx_bytes += skb->len;
++ break;
++
++ case -ENOENT:
++ case -ECONNRESET:
++ case -ESHUTDOWN:
++ dev->stats.tx_aborted_errors++;
++ default:
++ dev->stats.tx_errors++;
++ dev_dbg(&dev->dev, "TX error (%d)\n", status);
++ }
++ dev->stats.tx_packets++;
++
++ spin_lock(&pnd->tx_lock);
++ pnd->tx_queue--;
++ netif_wake_queue(dev);
++ spin_unlock(&pnd->tx_lock);
++
++ dev_kfree_skb_any(skb);
++ usb_free_urb(req);
++}
++
++static int rx_submit(struct usbpn_dev *pnd, struct urb *req, gfp_t gfp_flags)
++{
++ struct net_device *dev = pnd->dev;
++ struct page *page;
++ int err;
++
++ page = __dev_alloc_page(gfp_flags | __GFP_NOMEMALLOC);
++ if (!page)
++ return -ENOMEM;
++
++ usb_fill_bulk_urb(req, pnd->usb, pnd->rx_pipe, page_address(page),
++ PAGE_SIZE, rx_complete, dev);
++ req->transfer_flags = 0;
++ err = usb_submit_urb(req, gfp_flags);
++ if (unlikely(err)) {
++ dev_dbg(&dev->dev, "RX submit error (%d)\n", err);
++ put_page(page);
++ }
++ return err;
++}
++
++static void rx_complete(struct urb *req)
++{
++ struct net_device *dev = req->context;
++ struct usbpn_dev *pnd = netdev_priv(dev);
++ struct page *page = virt_to_page(req->transfer_buffer);
++ struct sk_buff *skb;
++ unsigned long flags;
++ int status = req->status;
++
++ switch (status) {
++ case 0:
++ spin_lock_irqsave(&pnd->rx_lock, flags);
++ skb = pnd->rx_skb;
++ if (!skb) {
++ skb = pnd->rx_skb = netdev_alloc_skb(dev, 12);
++ if (likely(skb)) {
++ /* Can't use pskb_pull() on page in IRQ */
++ memcpy(skb_put(skb, 1), page_address(page), 1);
++ skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags,
++ page, 1, req->actual_length,
++ PAGE_SIZE);
++ page = NULL;
++ }
++ } else {
++ skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags,
++ page, 0, req->actual_length,
++ PAGE_SIZE);
++ page = NULL;
++ }
++ if (req->actual_length < PAGE_SIZE)
++ pnd->rx_skb = NULL; /* Last fragment */
++ else
++ skb = NULL;
++ spin_unlock_irqrestore(&pnd->rx_lock, flags);
++ if (skb) {
++ skb->protocol = htons(ETH_P_PHONET);
++ skb_reset_mac_header(skb);
++ __skb_pull(skb, 1);
++ skb->dev = dev;
++ dev->stats.rx_packets++;
++ dev->stats.rx_bytes += skb->len;
++
++ netif_rx(skb);
++ }
++ goto resubmit;
++
++ case -ENOENT:
++ case -ECONNRESET:
++ case -ESHUTDOWN:
++ req = NULL;
++ break;
++
++ case -EOVERFLOW:
++ dev->stats.rx_over_errors++;
++ dev_dbg(&dev->dev, "RX overflow\n");
++ break;
++
++ case -EILSEQ:
++ dev->stats.rx_crc_errors++;
++ break;
++ }
++
++ dev->stats.rx_errors++;
++resubmit:
++ if (page)
++ put_page(page);
++ if (req)
++ rx_submit(pnd, req, GFP_ATOMIC);
++}
++
++static int usbpn_close(struct net_device *dev);
++
++static int usbpn_open(struct net_device *dev)
++{
++ struct usbpn_dev *pnd = netdev_priv(dev);
++ int err;
++ unsigned i;
++ unsigned num = pnd->data_intf->cur_altsetting->desc.bInterfaceNumber;
++
++ err = usb_set_interface(pnd->usb, num, pnd->active_setting);
++ if (err)
++ return err;
++
++ for (i = 0; i < rxq_size; i++) {
++ struct urb *req = usb_alloc_urb(0, GFP_KERNEL);
++
++ if (!req || rx_submit(pnd, req, GFP_KERNEL)) {
++ usb_free_urb(req);
++ usbpn_close(dev);
++ return -ENOMEM;
++ }
++ pnd->urbs[i] = req;
++ }
++
++ netif_wake_queue(dev);
++ return 0;
++}
++
++static int usbpn_close(struct net_device *dev)
++{
++ struct usbpn_dev *pnd = netdev_priv(dev);
++ unsigned i;
++ unsigned num = pnd->data_intf->cur_altsetting->desc.bInterfaceNumber;
++
++ netif_stop_queue(dev);
++
++ for (i = 0; i < rxq_size; i++) {
++ struct urb *req = pnd->urbs[i];
++
++ if (!req)
++ continue;
++ usb_kill_urb(req);
++ usb_free_urb(req);
++ pnd->urbs[i] = NULL;
++ }
++
++ return usb_set_interface(pnd->usb, num, !pnd->active_setting);
++}
++
++static int usbpn_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
++{
++ struct if_phonet_req *req = (struct if_phonet_req *)ifr;
++
++ switch (cmd) {
++ case SIOCPNGAUTOCONF:
++ req->ifr_phonet_autoconf.device = PN_DEV_PC;
++ return 0;
++ }
++ return -ENOIOCTLCMD;
++}
++
++static int usbpn_set_mtu(struct net_device *dev, int new_mtu)
++{
++ if ((new_mtu < PHONET_MIN_MTU) || (new_mtu > PHONET_MAX_MTU))
++ return -EINVAL;
++
++ dev->mtu = new_mtu;
++ return 0;
++}
++
++static const struct net_device_ops usbpn_ops = {
++ .ndo_open = usbpn_open,
++ .ndo_stop = usbpn_close,
++ .ndo_start_xmit = usbpn_xmit,
++ .ndo_do_ioctl = usbpn_ioctl,
++ .ndo_change_mtu = usbpn_set_mtu,
++};
++
++static void usbpn_setup(struct net_device *dev)
++{
++ dev->features = 0;
++ dev->netdev_ops = &usbpn_ops,
++ dev->header_ops = &phonet_header_ops;
++ dev->type = ARPHRD_PHONET;
++ dev->flags = IFF_POINTOPOINT | IFF_NOARP;
++ dev->mtu = PHONET_MAX_MTU;
++ dev->hard_header_len = 1;
++ dev->dev_addr[0] = PN_MEDIA_USB;
++ dev->addr_len = 1;
++ dev->tx_queue_len = 3;
++
++ dev->destructor = free_netdev;
++}
++
++/*
++ * USB driver callbacks
++ */
++static struct usb_device_id usbpn_ids[] = {
++ {
++ .match_flags = USB_DEVICE_ID_MATCH_VENDOR
++ | USB_DEVICE_ID_MATCH_INT_CLASS
++ | USB_DEVICE_ID_MATCH_INT_SUBCLASS,
++ .idVendor = 0x0421, /* Nokia */
++ .bInterfaceClass = USB_CLASS_COMM,
++ .bInterfaceSubClass = 0xFE,
++ },
++ { },
++};
++
++MODULE_DEVICE_TABLE(usb, usbpn_ids);
++
++static struct usb_driver usbpn_driver;
++
++static int usbpn_probe(struct usb_interface *intf, const struct usb_device_id *id)
++{
++ static const char ifname[] = "usbpn%d";
++ const struct usb_cdc_union_desc *union_header = NULL;
++ const struct usb_host_interface *data_desc;
++ struct usb_interface *data_intf;
++ struct usb_device *usbdev = interface_to_usbdev(intf);
++ struct net_device *dev;
++ struct usbpn_dev *pnd;
++ u8 *data;
++ int phonet = 0;
++ int len, err;
++
++ data = intf->altsetting->extra;
++ len = intf->altsetting->extralen;
++ while (len >= 3) {
++ u8 dlen = data[0];
++ if (dlen < 3)
++ return -EINVAL;
++
++ /* bDescriptorType */
++ if (data[1] == USB_DT_CS_INTERFACE) {
++ /* bDescriptorSubType */
++ switch (data[2]) {
++ case USB_CDC_UNION_TYPE:
++ if (union_header || dlen < 5)
++ break;
++ union_header =
++ (struct usb_cdc_union_desc *)data;
++ break;
++ case 0xAB:
++ phonet = 1;
++ break;
++ }
++ }
++ data += dlen;
++ len -= dlen;
++ }
++
++ if (!union_header || !phonet)
++ return -EINVAL;
++
++ data_intf = usb_ifnum_to_if(usbdev, union_header->bSlaveInterface0);
++ if (data_intf == NULL)
++ return -ENODEV;
++ /* Data interface has one inactive and one active setting */
++ if (data_intf->num_altsetting != 2)
++ return -EINVAL;
++ if (data_intf->altsetting[0].desc.bNumEndpoints == 0 &&
++ data_intf->altsetting[1].desc.bNumEndpoints == 2)
++ data_desc = data_intf->altsetting + 1;
++ else
++ if (data_intf->altsetting[0].desc.bNumEndpoints == 2 &&
++ data_intf->altsetting[1].desc.bNumEndpoints == 0)
++ data_desc = data_intf->altsetting;
++ else
++ return -EINVAL;
++
++ dev = alloc_netdev(sizeof(*pnd) + sizeof(pnd->urbs[0]) * rxq_size,
++ ifname, NET_NAME_UNKNOWN, usbpn_setup);
++ if (!dev)
++ return -ENOMEM;
++
++ pnd = netdev_priv(dev);
++ SET_NETDEV_DEV(dev, &intf->dev);
++
++ pnd->dev = dev;
++ pnd->usb = usbdev;
++ pnd->intf = intf;
++ pnd->data_intf = data_intf;
++ spin_lock_init(&pnd->tx_lock);
++ spin_lock_init(&pnd->rx_lock);
++ /* Endpoints */
++ if (usb_pipein(data_desc->endpoint[0].desc.bEndpointAddress)) {
++ pnd->rx_pipe = usb_rcvbulkpipe(usbdev,
++ data_desc->endpoint[0].desc.bEndpointAddress);
++ pnd->tx_pipe = usb_sndbulkpipe(usbdev,
++ data_desc->endpoint[1].desc.bEndpointAddress);
++ } else {
++ pnd->rx_pipe = usb_rcvbulkpipe(usbdev,
++ data_desc->endpoint[1].desc.bEndpointAddress);
++ pnd->tx_pipe = usb_sndbulkpipe(usbdev,
++ data_desc->endpoint[0].desc.bEndpointAddress);
++ }
++ pnd->active_setting = data_desc - data_intf->altsetting;
++
++ err = usb_driver_claim_interface(&usbpn_driver, data_intf, pnd);
++ if (err)
++ goto out;
++
++ /* Force inactive mode until the network device is brought UP */
++ usb_set_interface(usbdev, union_header->bSlaveInterface0,
++ !pnd->active_setting);
++ usb_set_intfdata(intf, pnd);
++
++ err = register_netdev(dev);
++ if (err) {
++ usb_driver_release_interface(&usbpn_driver, data_intf);
++ goto out;
++ }
++
++ dev_dbg(&dev->dev, "USB CDC Phonet device found\n");
++ return 0;
++
++out:
++ usb_set_intfdata(intf, NULL);
++ free_netdev(dev);
++ return err;
++}
++
++static void usbpn_disconnect(struct usb_interface *intf)
++{
++ struct usbpn_dev *pnd = usb_get_intfdata(intf);
++
++ if (pnd->disconnected)
++ return;
++
++ pnd->disconnected = 1;
++ usb_driver_release_interface(&usbpn_driver,
++ (pnd->intf == intf) ? pnd->data_intf : pnd->intf);
++ unregister_netdev(pnd->dev);
++}
++
++static struct usb_driver usbpn_driver = {
++ .name = "cdc_phonet",
++ .probe = usbpn_probe,
++ .disconnect = usbpn_disconnect,
++ .id_table = usbpn_ids,
++ .disable_hub_initiated_lpm = 1,
++};
++
++module_usb_driver(usbpn_driver);
++
++MODULE_AUTHOR("Remi Denis-Courmont");
++MODULE_DESCRIPTION("USB CDC Phonet host interface");
++MODULE_LICENSE("GPL");
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/cdc_subset.c backports-4.2.6-1/drivers/net/usb/cdc_subset.c
+--- backports-4.2.6-1.org/drivers/net/usb/cdc_subset.c 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/cdc_subset.c 2015-11-09 23:37:56.000000000 +0100
+@@ -0,0 +1,369 @@
++/*
++ * Simple "CDC Subset" USB Networking Links
++ * Copyright (C) 2000-2005 by David Brownell
++ *
++ * 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, see <http://www.gnu.org/licenses/>.
++ */
++
++#include <linux/module.h>
++#include <linux/kmod.h>
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/ethtool.h>
++#include <linux/workqueue.h>
++#include <linux/mii.h>
++#include <linux/usb.h>
++#include <linux/usb/usbnet.h>
++
++
++/*
++ * This supports simple USB network links that don't require any special
++ * framing or hardware control operations. The protocol used here is a
++ * strict subset of CDC Ethernet, with three basic differences reflecting
++ * the goal that almost any hardware should run it:
++ *
++ * - Minimal runtime control: one interface, no altsettings, and
++ * no vendor or class specific control requests. If a device is
++ * configured, it is allowed to exchange packets with the host.
++ * Fancier models would mean not working on some hardware.
++ *
++ * - Minimal manufacturing control: no IEEE "Organizationally
++ * Unique ID" required, or an EEPROMs to store one. Each host uses
++ * one random "locally assigned" Ethernet address instead, which can
++ * of course be overridden using standard tools like "ifconfig".
++ * (With 2^46 such addresses, same-net collisions are quite rare.)
++ *
++ * - There is no additional framing data for USB. Packets are written
++ * exactly as in CDC Ethernet, starting with an Ethernet header and
++ * terminated by a short packet. However, the host will never send a
++ * zero length packet; some systems can't handle those robustly.
++ *
++ * Anything that can transmit and receive USB bulk packets can implement
++ * this protocol. That includes both smart peripherals and quite a lot
++ * of "host-to-host" USB cables (which embed two devices back-to-back).
++ *
++ * Note that although Linux may use many of those host-to-host links
++ * with this "cdc_subset" framing, that doesn't mean there may not be a
++ * better approach. Handling the "other end unplugs/replugs" scenario
++ * well tends to require chip-specific vendor requests. Also, Windows
++ * peers at the other end of host-to-host cables may expect their own
++ * framing to be used rather than this "cdc_subset" model.
++ */
++
++#if defined(CONFIG_USB_EPSON2888) || defined(CONFIG_USB_ARMLINUX)
++/* PDA style devices are always connected if present */
++static int always_connected (struct usbnet *dev)
++{
++ return 0;
++}
++#endif
++
++#ifdef CONFIG_USB_ALI_M5632
++#define HAVE_HARDWARE
++
++/*-------------------------------------------------------------------------
++ *
++ * ALi M5632 driver ... does high speed
++ *
++ * NOTE that the MS-Windows drivers for this chip use some funky and
++ * (naturally) undocumented 7-byte prefix to each packet, so this is a
++ * case where we don't currently interoperate. Also, once you unplug
++ * one end of the cable, you need to replug the other end too ... since
++ * chip docs are unavailable, there's no way to reset the relevant state
++ * short of a power cycle.
++ *
++ *-------------------------------------------------------------------------*/
++
++static void m5632_recover(struct usbnet *dev)
++{
++ struct usb_device *udev = dev->udev;
++ struct usb_interface *intf = dev->intf;
++ int r;
++
++ r = usb_lock_device_for_reset(udev, intf);
++ if (r < 0)
++ return;
++
++ usb_reset_device(udev);
++ usb_unlock_device(udev);
++}
++
++static const struct driver_info ali_m5632_info = {
++ .description = "ALi M5632",
++ .flags = FLAG_POINTTOPOINT,
++ .recover = m5632_recover,
++};
++
++#endif
++
++#ifdef CONFIG_USB_AN2720
++#define HAVE_HARDWARE
++
++/*-------------------------------------------------------------------------
++ *
++ * AnchorChips 2720 driver ... http://www.cypress.com
++ *
++ * This doesn't seem to have a way to detect whether the peer is
++ * connected, or need any reset handshaking. It's got pretty big
++ * internal buffers (handles most of a frame's worth of data).
++ * Chip data sheets don't describe any vendor control messages.
++ *
++ *-------------------------------------------------------------------------*/
++
++static const struct driver_info an2720_info = {
++ .description = "AnchorChips/Cypress 2720",
++ .flags = FLAG_POINTTOPOINT,
++ // no reset available!
++ // no check_connect available!
++
++ .in = 2, .out = 2, // direction distinguishes these
++};
++
++#endif /* CONFIG_USB_AN2720 */
++
++
++#ifdef CONFIG_USB_BELKIN
++#define HAVE_HARDWARE
++
++/*-------------------------------------------------------------------------
++ *
++ * Belkin F5U104 ... two NetChip 2280 devices + Atmel AVR microcontroller
++ *
++ * ... also two eTEK designs, including one sold as "Advance USBNET"
++ *
++ *-------------------------------------------------------------------------*/
++
++static const struct driver_info belkin_info = {
++ .description = "Belkin, eTEK, or compatible",
++ .flags = FLAG_POINTTOPOINT,
++};
++
++#endif /* CONFIG_USB_BELKIN */
++
++
++
++#ifdef CONFIG_USB_EPSON2888
++#define HAVE_HARDWARE
++
++/*-------------------------------------------------------------------------
++ *
++ * EPSON USB clients
++ *
++ * This is the same idea as Linux PDAs (below) except the firmware in the
++ * device might not be Tux-powered. Epson provides reference firmware that
++ * implements this interface. Product developers can reuse or modify that
++ * code, such as by using their own product and vendor codes.
++ *
++ * Support was from Juro Bystricky <bystricky.juro(a)erd.epson.com>
++ *
++ *-------------------------------------------------------------------------*/
++
++static const struct driver_info epson2888_info = {
++ .description = "Epson USB Device",
++ .check_connect = always_connected,
++ .flags = FLAG_POINTTOPOINT,
++
++ .in = 4, .out = 3,
++};
++
++#endif /* CONFIG_USB_EPSON2888 */
++
++
++/*-------------------------------------------------------------------------
++ *
++ * info from Jonathan McDowell <noodles(a)earth.li>
++ *
++ *-------------------------------------------------------------------------*/
++#ifdef CONFIG_USB_KC2190
++#define HAVE_HARDWARE
++static const struct driver_info kc2190_info = {
++ .description = "KC Technology KC-190",
++ .flags = FLAG_POINTTOPOINT,
++};
++#endif /* CONFIG_USB_KC2190 */
++
++
++#ifdef CONFIG_USB_ARMLINUX
++#define HAVE_HARDWARE
++
++/*-------------------------------------------------------------------------
++ *
++ * Intel's SA-1100 chip integrates basic USB support, and is used
++ * in PDAs like some iPaqs, the Yopy, some Zaurus models, and more.
++ * When they run Linux, arch/arm/mach-sa1100/usb-eth.c may be used to
++ * network using minimal USB framing data.
++ *
++ * This describes the driver currently in standard ARM Linux kernels.
++ * The Zaurus uses a different driver (see later).
++ *
++ * PXA25x and PXA210 use XScale cores (ARM v5TE) with better USB support
++ * and different USB endpoint numbering than the SA1100 devices. The
++ * mach-pxa/usb-eth.c driver re-uses the device ids from mach-sa1100
++ * so we rely on the endpoint descriptors.
++ *
++ *-------------------------------------------------------------------------*/
++
++static const struct driver_info linuxdev_info = {
++ .description = "Linux Device",
++ .check_connect = always_connected,
++ .flags = FLAG_POINTTOPOINT,
++};
++
++static const struct driver_info yopy_info = {
++ .description = "Yopy",
++ .check_connect = always_connected,
++ .flags = FLAG_POINTTOPOINT,
++};
++
++static const struct driver_info blob_info = {
++ .description = "Boot Loader OBject",
++ .check_connect = always_connected,
++ .flags = FLAG_POINTTOPOINT,
++};
++
++#endif /* CONFIG_USB_ARMLINUX */
++
++
++/*-------------------------------------------------------------------------*/
++
++#ifndef HAVE_HARDWARE
++#warning You need to configure some hardware for this driver
++#endif
++
++/*
++ * chip vendor names won't normally be on the cables, and
++ * may not be on the device.
++ */
++
++static const struct usb_device_id products [] = {
++
++#ifdef CONFIG_USB_ALI_M5632
++{
++ USB_DEVICE (0x0402, 0x5632), // ALi defaults
++ .driver_info = (unsigned long) &ali_m5632_info,
++},
++{
++ USB_DEVICE (0x182d,0x207c), // SiteCom CN-124
++ .driver_info = (unsigned long) &ali_m5632_info,
++},
++#endif
++
++#ifdef CONFIG_USB_AN2720
++{
++ USB_DEVICE (0x0547, 0x2720), // AnchorChips defaults
++ .driver_info = (unsigned long) &an2720_info,
++}, {
++ USB_DEVICE (0x0547, 0x2727), // Xircom PGUNET
++ .driver_info = (unsigned long) &an2720_info,
++},
++#endif
++
++#ifdef CONFIG_USB_BELKIN
++{
++ USB_DEVICE (0x050d, 0x0004), // Belkin
++ .driver_info = (unsigned long) &belkin_info,
++}, {
++ USB_DEVICE (0x056c, 0x8100), // eTEK
++ .driver_info = (unsigned long) &belkin_info,
++}, {
++ USB_DEVICE (0x0525, 0x9901), // Advance USBNET (eTEK)
++ .driver_info = (unsigned long) &belkin_info,
++},
++#endif
++
++#ifdef CONFIG_USB_EPSON2888
++{
++ USB_DEVICE (0x0525, 0x2888), // EPSON USB client
++ .driver_info = (unsigned long) &epson2888_info,
++},
++#endif
++
++#ifdef CONFIG_USB_KC2190
++{
++ USB_DEVICE (0x050f, 0x0190), // KC-190
++ .driver_info = (unsigned long) &kc2190_info,
++},
++#endif
++
++#ifdef CONFIG_USB_ARMLINUX
++/*
++ * SA-1100 using standard ARM Linux kernels, or compatible.
++ * Often used when talking to Linux PDAs (iPaq, Yopy, etc).
++ * The sa-1100 "usb-eth" driver handles the basic framing.
++ *
++ * PXA25x or PXA210 ... these use a "usb-eth" driver much like
++ * the sa1100 one, but hardware uses different endpoint numbers.
++ *
++ * Or the Linux "Ethernet" gadget on hardware that can't talk
++ * CDC Ethernet (e.g., no altsettings), in either of two modes:
++ * - acting just like the old "usb-eth" firmware, though
++ * the implementation is different
++ * - supporting RNDIS as the first/default configuration for
++ * MS-Windows interop; Linux needs to use the other config
++ */
++{
++ // 1183 = 0x049F, both used as hex values?
++ // Compaq "Itsy" vendor/product id
++ USB_DEVICE (0x049F, 0x505A), // usb-eth, or compatible
++ .driver_info = (unsigned long) &linuxdev_info,
++}, {
++ USB_DEVICE (0x0E7E, 0x1001), // G.Mate "Yopy"
++ .driver_info = (unsigned long) &yopy_info,
++}, {
++ USB_DEVICE (0x8086, 0x07d3), // "blob" bootloader
++ .driver_info = (unsigned long) &blob_info,
++}, {
++ USB_DEVICE (0x1286, 0x8001), // "blob" bootloader
++ .driver_info = (unsigned long) &blob_info,
++}, {
++ // Linux Ethernet/RNDIS gadget, mostly on PXA, second config
++ // e.g. Gumstix, current OpenZaurus, ... or anything else
++ // that just enables this gadget option.
++ USB_DEVICE (0x0525, 0xa4a2),
++ .driver_info = (unsigned long) &linuxdev_info,
++},
++#endif
++
++ { }, // END
++};
++MODULE_DEVICE_TABLE(usb, products);
++
++/*-------------------------------------------------------------------------*/
++static int dummy_prereset(struct usb_interface *intf)
++{
++ return 0;
++}
++
++static int dummy_postreset(struct usb_interface *intf)
++{
++ return 0;
++}
++
++static struct usb_driver cdc_subset_driver = {
++ .name = "cdc_subset",
++ .probe = usbnet_probe,
++ .suspend = usbnet_suspend,
++ .resume = usbnet_resume,
++ .pre_reset = dummy_prereset,
++ .post_reset = dummy_postreset,
++ .disconnect = usbnet_disconnect,
++ .id_table = products,
++ .disable_hub_initiated_lpm = 1,
++};
++
++module_usb_driver(cdc_subset_driver);
++
++MODULE_AUTHOR("David Brownell");
++MODULE_DESCRIPTION("Simple 'CDC Subset' USB networking links");
++MODULE_LICENSE("GPL");
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/cx82310_eth.c backports-4.2.6-1/drivers/net/usb/cx82310_eth.c
+--- backports-4.2.6-1.org/drivers/net/usb/cx82310_eth.c 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/cx82310_eth.c 2015-11-09 23:37:56.000000000 +0100
+@@ -0,0 +1,353 @@
++/*
++ * Driver for USB ethernet port of Conexant CX82310-based ADSL routers
++ * Copyright (C) 2010 by Ondrej Zary
++ * some parts inspired by the cxacru driver
++ *
++ * 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, see <http://www.gnu.org/licenses/>.
++ */
++
++#include <linux/module.h>
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/ethtool.h>
++#include <linux/workqueue.h>
++#include <linux/mii.h>
++#include <linux/usb.h>
++#include <linux/usb/usbnet.h>
++
++enum cx82310_cmd {
++ CMD_START = 0x84, /* no effect? */
++ CMD_STOP = 0x85, /* no effect? */
++ CMD_GET_STATUS = 0x90, /* returns nothing? */
++ CMD_GET_MAC_ADDR = 0x91, /* read MAC address */
++ CMD_GET_LINK_STATUS = 0x92, /* not useful, link is always up */
++ CMD_ETHERNET_MODE = 0x99, /* unknown, needed during init */
++};
++
++enum cx82310_status {
++ STATUS_UNDEFINED,
++ STATUS_SUCCESS,
++ STATUS_ERROR,
++ STATUS_UNSUPPORTED,
++ STATUS_UNIMPLEMENTED,
++ STATUS_PARAMETER_ERROR,
++ STATUS_DBG_LOOPBACK,
++};
++
++#define CMD_PACKET_SIZE 64
++#define CMD_TIMEOUT 100
++#define CMD_REPLY_RETRY 5
++
++#define CX82310_MTU 1514
++#define CMD_EP 0x01
++
++/*
++ * execute control command
++ * - optionally send some data (command parameters)
++ * - optionally wait for the reply
++ * - optionally read some data from the reply
++ */
++static int cx82310_cmd(struct usbnet *dev, enum cx82310_cmd cmd, bool reply,
++ u8 *wdata, int wlen, u8 *rdata, int rlen)
++{
++ int actual_len, retries, ret;
++ struct usb_device *udev = dev->udev;
++ u8 *buf = kzalloc(CMD_PACKET_SIZE, GFP_KERNEL);
++
++ if (!buf)
++ return -ENOMEM;
++
++ /* create command packet */
++ buf[0] = cmd;
++ if (wdata)
++ memcpy(buf + 4, wdata, min_t(int, wlen, CMD_PACKET_SIZE - 4));
++
++ /* send command packet */
++ ret = usb_bulk_msg(udev, usb_sndbulkpipe(udev, CMD_EP), buf,
++ CMD_PACKET_SIZE, &actual_len, CMD_TIMEOUT);
++ if (ret < 0) {
++ if (cmd != CMD_GET_LINK_STATUS)
++ dev_err(&dev->udev->dev, "send command %#x: error %d\n",
++ cmd, ret);
++ goto end;
++ }
++
++ if (reply) {
++ /* wait for reply, retry if it's empty */
++ for (retries = 0; retries < CMD_REPLY_RETRY; retries++) {
++ ret = usb_bulk_msg(udev, usb_rcvbulkpipe(udev, CMD_EP),
++ buf, CMD_PACKET_SIZE, &actual_len,
++ CMD_TIMEOUT);
++ if (ret < 0) {
++ if (cmd != CMD_GET_LINK_STATUS)
++ dev_err(&dev->udev->dev,
++ "reply receive error %d\n",
++ ret);
++ goto end;
++ }
++ if (actual_len > 0)
++ break;
++ }
++ if (actual_len == 0) {
++ dev_err(&dev->udev->dev, "no reply to command %#x\n",
++ cmd);
++ ret = -EIO;
++ goto end;
++ }
++ if (buf[0] != cmd) {
++ dev_err(&dev->udev->dev,
++ "got reply to command %#x, expected: %#x\n",
++ buf[0], cmd);
++ ret = -EIO;
++ goto end;
++ }
++ if (buf[1] != STATUS_SUCCESS) {
++ dev_err(&dev->udev->dev, "command %#x failed: %#x\n",
++ cmd, buf[1]);
++ ret = -EIO;
++ goto end;
++ }
++ if (rdata)
++ memcpy(rdata, buf + 4,
++ min_t(int, rlen, CMD_PACKET_SIZE - 4));
++ }
++end:
++ kfree(buf);
++ return ret;
++}
++
++#define partial_len data[0] /* length of partial packet data */
++#define partial_rem data[1] /* remaining (missing) data length */
++#define partial_data data[2] /* partial packet data */
++
++static int cx82310_bind(struct usbnet *dev, struct usb_interface *intf)
++{
++ int ret;
++ char buf[15];
++ struct usb_device *udev = dev->udev;
++ u8 link[3];
++ int timeout = 50;
++
++ /* avoid ADSL modems - continue only if iProduct is "USB NET CARD" */
++ if (usb_string(udev, udev->descriptor.iProduct, buf, sizeof(buf)) > 0
++ && strcmp(buf, "USB NET CARD")) {
++ dev_info(&udev->dev, "ignoring: probably an ADSL modem\n");
++ return -ENODEV;
++ }
++
++ ret = usbnet_get_endpoints(dev, intf);
++ if (ret)
++ return ret;
++
++ /*
++ * this must not include ethernet header as the device can send partial
++ * packets with no header (and sometimes even empty URBs)
++ */
++ dev->net->hard_header_len = 0;
++ /* we can send at most 1514 bytes of data (+ 2-byte header) per URB */
++ dev->hard_mtu = CX82310_MTU + 2;
++ /* we can receive URBs up to 4KB from the device */
++ dev->rx_urb_size = 4096;
++
++ dev->partial_data = (unsigned long) kmalloc(dev->hard_mtu, GFP_KERNEL);
++ if (!dev->partial_data)
++ return -ENOMEM;
++
++ /* wait for firmware to become ready (indicated by the link being up) */
++ while (--timeout) {
++ ret = cx82310_cmd(dev, CMD_GET_LINK_STATUS, true, NULL, 0,
++ link, sizeof(link));
++ /* the command can time out during boot - it's not an error */
++ if (!ret && link[0] == 1 && link[2] == 1)
++ break;
++ msleep(500);
++ }
++ if (!timeout) {
++ dev_err(&udev->dev, "firmware not ready in time\n");
++ return -ETIMEDOUT;
++ }
++
++ /* enable ethernet mode (?) */
++ ret = cx82310_cmd(dev, CMD_ETHERNET_MODE, true, "\x01", 1, NULL, 0);
++ if (ret) {
++ dev_err(&udev->dev, "unable to enable ethernet mode: %d\n",
++ ret);
++ goto err;
++ }
++
++ /* get the MAC address */
++ ret = cx82310_cmd(dev, CMD_GET_MAC_ADDR, true, NULL, 0,
++ dev->net->dev_addr, ETH_ALEN);
++ if (ret) {
++ dev_err(&udev->dev, "unable to read MAC address: %d\n", ret);
++ goto err;
++ }
++
++ /* start (does not seem to have any effect?) */
++ ret = cx82310_cmd(dev, CMD_START, false, NULL, 0, NULL, 0);
++ if (ret)
++ goto err;
++
++ return 0;
++err:
++ kfree((void *)dev->partial_data);
++ return ret;
++}
++
++static void cx82310_unbind(struct usbnet *dev, struct usb_interface *intf)
++{
++ kfree((void *)dev->partial_data);
++}
++
++/*
++ * RX is NOT easy - we can receive multiple packets per skb, each having 2-byte
++ * packet length at the beginning.
++ * The last packet might be incomplete (when it crosses the 4KB URB size),
++ * continuing in the next skb (without any headers).
++ * If a packet has odd length, there is one extra byte at the end (before next
++ * packet or at the end of the URB).
++ */
++static int cx82310_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
++{
++ int len;
++ struct sk_buff *skb2;
++
++ /*
++ * If the last skb ended with an incomplete packet, this skb contains
++ * end of that packet at the beginning.
++ */
++ if (dev->partial_rem) {
++ len = dev->partial_len + dev->partial_rem;
++ skb2 = alloc_skb(len, GFP_ATOMIC);
++ if (!skb2)
++ return 0;
++ skb_put(skb2, len);
++ memcpy(skb2->data, (void *)dev->partial_data,
++ dev->partial_len);
++ memcpy(skb2->data + dev->partial_len, skb->data,
++ dev->partial_rem);
++ usbnet_skb_return(dev, skb2);
++ skb_pull(skb, (dev->partial_rem + 1) & ~1);
++ dev->partial_rem = 0;
++ if (skb->len < 2)
++ return 1;
++ }
++
++ /* a skb can contain multiple packets */
++ while (skb->len > 1) {
++ /* first two bytes are packet length */
++ len = skb->data[0] | (skb->data[1] << 8);
++ skb_pull(skb, 2);
++
++ /* if last packet in the skb, let usbnet to process it */
++ if (len == skb->len || len + 1 == skb->len) {
++ skb_trim(skb, len);
++ break;
++ }
++
++ if (len > CX82310_MTU) {
++ dev_err(&dev->udev->dev, "RX packet too long: %d B\n",
++ len);
++ return 0;
++ }
++
++ /* incomplete packet, save it for the next skb */
++ if (len > skb->len) {
++ dev->partial_len = skb->len;
++ dev->partial_rem = len - skb->len;
++ memcpy((void *)dev->partial_data, skb->data,
++ dev->partial_len);
++ skb_pull(skb, skb->len);
++ break;
++ }
++
++ skb2 = alloc_skb(len, GFP_ATOMIC);
++ if (!skb2)
++ return 0;
++ skb_put(skb2, len);
++ memcpy(skb2->data, skb->data, len);
++ /* process the packet */
++ usbnet_skb_return(dev, skb2);
++
++ skb_pull(skb, (len + 1) & ~1);
++ }
++
++ /* let usbnet process the last packet */
++ return 1;
++}
++
++/* TX is easy, just add 2 bytes of length at the beginning */
++static struct sk_buff *cx82310_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
++ gfp_t flags)
++{
++ int len = skb->len;
++
++ if (skb_headroom(skb) < 2) {
++ struct sk_buff *skb2 = skb_copy_expand(skb, 2, 0, flags);
++ dev_kfree_skb_any(skb);
++ skb = skb2;
++ if (!skb)
++ return NULL;
++ }
++ skb_push(skb, 2);
++
++ skb->data[0] = len;
++ skb->data[1] = len >> 8;
++
++ return skb;
++}
++
++
++static const struct driver_info cx82310_info = {
++ .description = "Conexant CX82310 USB ethernet",
++ .flags = FLAG_ETHER,
++ .bind = cx82310_bind,
++ .unbind = cx82310_unbind,
++ .rx_fixup = cx82310_rx_fixup,
++ .tx_fixup = cx82310_tx_fixup,
++};
++
++#define USB_DEVICE_CLASS(vend, prod, cl, sc, pr) \
++ .match_flags = USB_DEVICE_ID_MATCH_DEVICE | \
++ USB_DEVICE_ID_MATCH_DEV_INFO, \
++ .idVendor = (vend), \
++ .idProduct = (prod), \
++ .bDeviceClass = (cl), \
++ .bDeviceSubClass = (sc), \
++ .bDeviceProtocol = (pr)
++
++static const struct usb_device_id products[] = {
++ {
++ USB_DEVICE_CLASS(0x0572, 0xcb01, 0xff, 0, 0),
++ .driver_info = (unsigned long) &cx82310_info
++ },
++ { },
++};
++MODULE_DEVICE_TABLE(usb, products);
++
++static struct usb_driver cx82310_driver = {
++ .name = "cx82310_eth",
++ .id_table = products,
++ .probe = usbnet_probe,
++ .disconnect = usbnet_disconnect,
++ .suspend = usbnet_suspend,
++ .resume = usbnet_resume,
++ .disable_hub_initiated_lpm = 1,
++};
++
++module_usb_driver(cx82310_driver);
++
++MODULE_AUTHOR("Ondrej Zary");
++MODULE_DESCRIPTION("Conexant CX82310-based ADSL router USB ethernet driver");
++MODULE_LICENSE("GPL");
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/dm9601.c backports-4.2.6-1/drivers/net/usb/dm9601.c
+--- backports-4.2.6-1.org/drivers/net/usb/dm9601.c 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/dm9601.c 2015-11-09 23:37:56.000000000 +0100
+@@ -0,0 +1,647 @@
++/*
++ * Davicom DM96xx USB 10/100Mbps ethernet devices
++ *
++ * Peter Korsgaard <jacmet(a)sunsite.dk>
++ *
++ * This file is licensed under the terms of the GNU General Public License
++ * version 2. This program is licensed "as is" without any warranty of any
++ * kind, whether express or implied.
++ */
++
++//#define DEBUG
++
++#include <linux/module.h>
++#include <linux/sched.h>
++#include <linux/stddef.h>
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/ethtool.h>
++#include <linux/mii.h>
++#include <linux/usb.h>
++#include <linux/crc32.h>
++#include <linux/usb/usbnet.h>
++#include <linux/slab.h>
++
++/* datasheet:
++ http://ptm2.cc.utu.fi/ftp/network/cards/DM9601/From_NET/DM9601-DS-P01-93091…
++*/
++
++/* control requests */
++#define DM_READ_REGS 0x00
++#define DM_WRITE_REGS 0x01
++#define DM_READ_MEMS 0x02
++#define DM_WRITE_REG 0x03
++#define DM_WRITE_MEMS 0x05
++#define DM_WRITE_MEM 0x07
++
++/* registers */
++#define DM_NET_CTRL 0x00
++#define DM_RX_CTRL 0x05
++#define DM_SHARED_CTRL 0x0b
++#define DM_SHARED_ADDR 0x0c
++#define DM_SHARED_DATA 0x0d /* low + high */
++#define DM_PHY_ADDR 0x10 /* 6 bytes */
++#define DM_MCAST_ADDR 0x16 /* 8 bytes */
++#define DM_GPR_CTRL 0x1e
++#define DM_GPR_DATA 0x1f
++#define DM_CHIP_ID 0x2c
++#define DM_MODE_CTRL 0x91 /* only on dm9620 */
++
++/* chip id values */
++#define ID_DM9601 0
++#define ID_DM9620 1
++
++#define DM_MAX_MCAST 64
++#define DM_MCAST_SIZE 8
++#define DM_EEPROM_LEN 256
++#define DM_TX_OVERHEAD 2 /* 2 byte header */
++#define DM_RX_OVERHEAD 7 /* 3 byte header + 4 byte crc tail */
++#define DM_TIMEOUT 1000
++
++static int dm_read(struct usbnet *dev, u8 reg, u16 length, void *data)
++{
++ int err;
++ err = usbnet_read_cmd(dev, DM_READ_REGS,
++ USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
++ 0, reg, data, length);
++ if(err != length && err >= 0)
++ err = -EINVAL;
++ return err;
++}
++
++static int dm_read_reg(struct usbnet *dev, u8 reg, u8 *value)
++{
++ return dm_read(dev, reg, 1, value);
++}
++
++static int dm_write(struct usbnet *dev, u8 reg, u16 length, void *data)
++{
++ int err;
++ err = usbnet_write_cmd(dev, DM_WRITE_REGS,
++ USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
++ 0, reg, data, length);
++
++ if (err >= 0 && err < length)
++ err = -EINVAL;
++ return err;
++}
++
++static int dm_write_reg(struct usbnet *dev, u8 reg, u8 value)
++{
++ return usbnet_write_cmd(dev, DM_WRITE_REG,
++ USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
++ value, reg, NULL, 0);
++}
++
++static void dm_write_async(struct usbnet *dev, u8 reg, u16 length, void *data)
++{
++ usbnet_write_cmd_async(dev, DM_WRITE_REGS,
++ USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
++ 0, reg, data, length);
++}
++
++static void dm_write_reg_async(struct usbnet *dev, u8 reg, u8 value)
++{
++ usbnet_write_cmd_async(dev, DM_WRITE_REG,
++ USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
++ value, reg, NULL, 0);
++}
++
++static int dm_read_shared_word(struct usbnet *dev, int phy, u8 reg, __le16 *value)
++{
++ int ret, i;
++
++ mutex_lock(&dev->phy_mutex);
++
++ dm_write_reg(dev, DM_SHARED_ADDR, phy ? (reg | 0x40) : reg);
++ dm_write_reg(dev, DM_SHARED_CTRL, phy ? 0xc : 0x4);
++
++ for (i = 0; i < DM_TIMEOUT; i++) {
++ u8 tmp = 0;
++
++ udelay(1);
++ ret = dm_read_reg(dev, DM_SHARED_CTRL, &tmp);
++ if (ret < 0)
++ goto out;
++
++ /* ready */
++ if ((tmp & 1) == 0)
++ break;
++ }
++
++ if (i == DM_TIMEOUT) {
++ netdev_err(dev->net, "%s read timed out!\n", phy ? "phy" : "eeprom");
++ ret = -EIO;
++ goto out;
++ }
++
++ dm_write_reg(dev, DM_SHARED_CTRL, 0x0);
++ ret = dm_read(dev, DM_SHARED_DATA, 2, value);
++
++ netdev_dbg(dev->net, "read shared %d 0x%02x returned 0x%04x, %d\n",
++ phy, reg, *value, ret);
++
++ out:
++ mutex_unlock(&dev->phy_mutex);
++ return ret;
++}
++
++static int dm_write_shared_word(struct usbnet *dev, int phy, u8 reg, __le16 value)
++{
++ int ret, i;
++
++ mutex_lock(&dev->phy_mutex);
++
++ ret = dm_write(dev, DM_SHARED_DATA, 2, &value);
++ if (ret < 0)
++ goto out;
++
++ dm_write_reg(dev, DM_SHARED_ADDR, phy ? (reg | 0x40) : reg);
++ dm_write_reg(dev, DM_SHARED_CTRL, phy ? 0x1a : 0x12);
++
++ for (i = 0; i < DM_TIMEOUT; i++) {
++ u8 tmp = 0;
++
++ udelay(1);
++ ret = dm_read_reg(dev, DM_SHARED_CTRL, &tmp);
++ if (ret < 0)
++ goto out;
++
++ /* ready */
++ if ((tmp & 1) == 0)
++ break;
++ }
++
++ if (i == DM_TIMEOUT) {
++ netdev_err(dev->net, "%s write timed out!\n", phy ? "phy" : "eeprom");
++ ret = -EIO;
++ goto out;
++ }
++
++ dm_write_reg(dev, DM_SHARED_CTRL, 0x0);
++
++out:
++ mutex_unlock(&dev->phy_mutex);
++ return ret;
++}
++
++static int dm_read_eeprom_word(struct usbnet *dev, u8 offset, void *value)
++{
++ return dm_read_shared_word(dev, 0, offset, value);
++}
++
++
++
++static int dm9601_get_eeprom_len(struct net_device *dev)
++{
++ return DM_EEPROM_LEN;
++}
++
++static int dm9601_get_eeprom(struct net_device *net,
++ struct ethtool_eeprom *eeprom, u8 * data)
++{
++ struct usbnet *dev = netdev_priv(net);
++ __le16 *ebuf = (__le16 *) data;
++ int i;
++
++ /* access is 16bit */
++ if ((eeprom->offset % 2) || (eeprom->len % 2))
++ return -EINVAL;
++
++ for (i = 0; i < eeprom->len / 2; i++) {
++ if (dm_read_eeprom_word(dev, eeprom->offset / 2 + i,
++ &ebuf[i]) < 0)
++ return -EINVAL;
++ }
++ return 0;
++}
++
++static int dm9601_mdio_read(struct net_device *netdev, int phy_id, int loc)
++{
++ struct usbnet *dev = netdev_priv(netdev);
++
++ __le16 res;
++
++ if (phy_id) {
++ netdev_dbg(dev->net, "Only internal phy supported\n");
++ return 0;
++ }
++
++ dm_read_shared_word(dev, 1, loc, &res);
++
++ netdev_dbg(dev->net,
++ "dm9601_mdio_read() phy_id=0x%02x, loc=0x%02x, returns=0x%04x\n",
++ phy_id, loc, le16_to_cpu(res));
++
++ return le16_to_cpu(res);
++}
++
++static void dm9601_mdio_write(struct net_device *netdev, int phy_id, int loc,
++ int val)
++{
++ struct usbnet *dev = netdev_priv(netdev);
++ __le16 res = cpu_to_le16(val);
++
++ if (phy_id) {
++ netdev_dbg(dev->net, "Only internal phy supported\n");
++ return;
++ }
++
++ netdev_dbg(dev->net, "dm9601_mdio_write() phy_id=0x%02x, loc=0x%02x, val=0x%04x\n",
++ phy_id, loc, val);
++
++ dm_write_shared_word(dev, 1, loc, res);
++}
++
++static void dm9601_get_drvinfo(struct net_device *net,
++ struct ethtool_drvinfo *info)
++{
++ /* Inherit standard device info */
++ usbnet_get_drvinfo(net, info);
++ info->eedump_len = DM_EEPROM_LEN;
++}
++
++static u32 dm9601_get_link(struct net_device *net)
++{
++ struct usbnet *dev = netdev_priv(net);
++
++ return mii_link_ok(&dev->mii);
++}
++
++static int dm9601_ioctl(struct net_device *net, struct ifreq *rq, int cmd)
++{
++ struct usbnet *dev = netdev_priv(net);
++
++ return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
++}
++
++static const struct ethtool_ops dm9601_ethtool_ops = {
++ .get_drvinfo = dm9601_get_drvinfo,
++ .get_link = dm9601_get_link,
++ .get_msglevel = usbnet_get_msglevel,
++ .set_msglevel = usbnet_set_msglevel,
++ .get_eeprom_len = dm9601_get_eeprom_len,
++ .get_eeprom = dm9601_get_eeprom,
++ .get_settings = usbnet_get_settings,
++ .set_settings = usbnet_set_settings,
++ .nway_reset = usbnet_nway_reset,
++};
++
++static void dm9601_set_multicast(struct net_device *net)
++{
++ struct usbnet *dev = netdev_priv(net);
++ /* We use the 20 byte dev->data for our 8 byte filter buffer
++ * to avoid allocating memory that is tricky to free later */
++ u8 *hashes = (u8 *) & dev->data;
++ u8 rx_ctl = 0x31;
++
++ memset(hashes, 0x00, DM_MCAST_SIZE);
++ hashes[DM_MCAST_SIZE - 1] |= 0x80; /* broadcast address */
++
++ if (net->flags & IFF_PROMISC) {
++ rx_ctl |= 0x02;
++ } else if (net->flags & IFF_ALLMULTI ||
++ netdev_mc_count(net) > DM_MAX_MCAST) {
++ rx_ctl |= 0x08;
++ } else if (!netdev_mc_empty(net)) {
++ struct netdev_hw_addr *ha;
++
++ netdev_for_each_mc_addr(ha, net) {
++ u32 crc = ether_crc(ETH_ALEN, ha->addr) >> 26;
++ hashes[crc >> 3] |= 1 << (crc & 0x7);
++ }
++ }
++
++ dm_write_async(dev, DM_MCAST_ADDR, DM_MCAST_SIZE, hashes);
++ dm_write_reg_async(dev, DM_RX_CTRL, rx_ctl);
++}
++
++static void __dm9601_set_mac_address(struct usbnet *dev)
++{
++ dm_write_async(dev, DM_PHY_ADDR, ETH_ALEN, dev->net->dev_addr);
++}
++
++static int dm9601_set_mac_address(struct net_device *net, void *p)
++{
++ struct sockaddr *addr = p;
++ struct usbnet *dev = netdev_priv(net);
++
++ if (!is_valid_ether_addr(addr->sa_data)) {
++ dev_err(&net->dev, "not setting invalid mac address %pM\n",
++ addr->sa_data);
++ return -EINVAL;
++ }
++
++ memcpy(net->dev_addr, addr->sa_data, net->addr_len);
++ __dm9601_set_mac_address(dev);
++
++ return 0;
++}
++
++static const struct net_device_ops dm9601_netdev_ops = {
++ .ndo_open = usbnet_open,
++ .ndo_stop = usbnet_stop,
++ .ndo_start_xmit = usbnet_start_xmit,
++ .ndo_tx_timeout = usbnet_tx_timeout,
++ .ndo_change_mtu = usbnet_change_mtu,
++ .ndo_validate_addr = eth_validate_addr,
++ .ndo_do_ioctl = dm9601_ioctl,
++ .ndo_set_rx_mode = dm9601_set_multicast,
++ .ndo_set_mac_address = dm9601_set_mac_address,
++};
++
++static int dm9601_bind(struct usbnet *dev, struct usb_interface *intf)
++{
++ int ret;
++ u8 mac[ETH_ALEN], id;
++
++ ret = usbnet_get_endpoints(dev, intf);
++ if (ret)
++ goto out;
++
++ dev->net->netdev_ops = &dm9601_netdev_ops;
++ dev->net->ethtool_ops = &dm9601_ethtool_ops;
++ dev->net->hard_header_len += DM_TX_OVERHEAD;
++ dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len;
++
++ /* dm9620/21a require room for 4 byte padding, even in dm9601
++ * mode, so we need +1 to be able to receive full size
++ * ethernet frames.
++ */
++ dev->rx_urb_size = dev->net->mtu + ETH_HLEN + DM_RX_OVERHEAD + 1;
++
++ dev->mii.dev = dev->net;
++ dev->mii.mdio_read = dm9601_mdio_read;
++ dev->mii.mdio_write = dm9601_mdio_write;
++ dev->mii.phy_id_mask = 0x1f;
++ dev->mii.reg_num_mask = 0x1f;
++
++ /* reset */
++ dm_write_reg(dev, DM_NET_CTRL, 1);
++ udelay(20);
++
++ /* read MAC */
++ if (dm_read(dev, DM_PHY_ADDR, ETH_ALEN, mac) < 0) {
++ printk(KERN_ERR "Error reading MAC address\n");
++ ret = -ENODEV;
++ goto out;
++ }
++
++ /*
++ * Overwrite the auto-generated address only with good ones.
++ */
++ if (is_valid_ether_addr(mac))
++ memcpy(dev->net->dev_addr, mac, ETH_ALEN);
++ else {
++ printk(KERN_WARNING
++ "dm9601: No valid MAC address in EEPROM, using %pM\n",
++ dev->net->dev_addr);
++ __dm9601_set_mac_address(dev);
++ }
++
++ if (dm_read_reg(dev, DM_CHIP_ID, &id) < 0) {
++ netdev_err(dev->net, "Error reading chip ID\n");
++ ret = -ENODEV;
++ goto out;
++ }
++
++ /* put dm9620 devices in dm9601 mode */
++ if (id == ID_DM9620) {
++ u8 mode;
++
++ if (dm_read_reg(dev, DM_MODE_CTRL, &mode) < 0) {
++ netdev_err(dev->net, "Error reading MODE_CTRL\n");
++ ret = -ENODEV;
++ goto out;
++ }
++ dm_write_reg(dev, DM_MODE_CTRL, mode & 0x7f);
++ }
++
++ /* power up phy */
++ dm_write_reg(dev, DM_GPR_CTRL, 1);
++ dm_write_reg(dev, DM_GPR_DATA, 0);
++
++ /* receive broadcast packets */
++ dm9601_set_multicast(dev->net);
++
++ dm9601_mdio_write(dev->net, dev->mii.phy_id, MII_BMCR, BMCR_RESET);
++ dm9601_mdio_write(dev->net, dev->mii.phy_id, MII_ADVERTISE,
++ ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP);
++ mii_nway_restart(&dev->mii);
++
++out:
++ return ret;
++}
++
++static int dm9601_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
++{
++ u8 status;
++ int len;
++
++ /* format:
++ b1: rx status
++ b2: packet length (incl crc) low
++ b3: packet length (incl crc) high
++ b4..n-4: packet data
++ bn-3..bn: ethernet crc
++ */
++
++ if (unlikely(skb->len < DM_RX_OVERHEAD)) {
++ dev_err(&dev->udev->dev, "unexpected tiny rx frame\n");
++ return 0;
++ }
++
++ status = skb->data[0];
++ len = (skb->data[1] | (skb->data[2] << 8)) - 4;
++
++ if (unlikely(status & 0xbf)) {
++ if (status & 0x01) dev->net->stats.rx_fifo_errors++;
++ if (status & 0x02) dev->net->stats.rx_crc_errors++;
++ if (status & 0x04) dev->net->stats.rx_frame_errors++;
++ if (status & 0x20) dev->net->stats.rx_missed_errors++;
++ if (status & 0x90) dev->net->stats.rx_length_errors++;
++ return 0;
++ }
++
++ skb_pull(skb, 3);
++ skb_trim(skb, len);
++
++ return 1;
++}
++
++static struct sk_buff *dm9601_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
++ gfp_t flags)
++{
++ int len, pad;
++
++ /* format:
++ b1: packet length low
++ b2: packet length high
++ b3..n: packet data
++ */
++
++ len = skb->len + DM_TX_OVERHEAD;
++
++ /* workaround for dm962x errata with tx fifo getting out of
++ * sync if a USB bulk transfer retry happens right after a
++ * packet with odd / maxpacket length by adding up to 3 bytes
++ * padding.
++ */
++ while ((len & 1) || !(len % dev->maxpacket))
++ len++;
++
++ len -= DM_TX_OVERHEAD; /* hw header doesn't count as part of length */
++ pad = len - skb->len;
++
++ if (skb_headroom(skb) < DM_TX_OVERHEAD || skb_tailroom(skb) < pad) {
++ struct sk_buff *skb2;
++
++ skb2 = skb_copy_expand(skb, DM_TX_OVERHEAD, pad, flags);
++ dev_kfree_skb_any(skb);
++ skb = skb2;
++ if (!skb)
++ return NULL;
++ }
++
++ __skb_push(skb, DM_TX_OVERHEAD);
++
++ if (pad) {
++ memset(skb->data + skb->len, 0, pad);
++ __skb_put(skb, pad);
++ }
++
++ skb->data[0] = len;
++ skb->data[1] = len >> 8;
++
++ return skb;
++}
++
++static void dm9601_status(struct usbnet *dev, struct urb *urb)
++{
++ int link;
++ u8 *buf;
++
++ /* format:
++ b0: net status
++ b1: tx status 1
++ b2: tx status 2
++ b3: rx status
++ b4: rx overflow
++ b5: rx count
++ b6: tx count
++ b7: gpr
++ */
++
++ if (urb->actual_length < 8)
++ return;
++
++ buf = urb->transfer_buffer;
++
++ link = !!(buf[0] & 0x40);
++ if (netif_carrier_ok(dev->net) != link) {
++ usbnet_link_change(dev, link, 1);
++ netdev_dbg(dev->net, "Link Status is: %d\n", link);
++ }
++}
++
++static int dm9601_link_reset(struct usbnet *dev)
++{
++ struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET };
++
++ mii_check_media(&dev->mii, 1, 1);
++ mii_ethtool_gset(&dev->mii, &ecmd);
++
++ netdev_dbg(dev->net, "link_reset() speed: %u duplex: %d\n",
++ ethtool_cmd_speed(&ecmd), ecmd.duplex);
++
++ return 0;
++}
++
++static const struct driver_info dm9601_info = {
++ .description = "Davicom DM96xx USB 10/100 Ethernet",
++ .flags = FLAG_ETHER | FLAG_LINK_INTR,
++ .bind = dm9601_bind,
++ .rx_fixup = dm9601_rx_fixup,
++ .tx_fixup = dm9601_tx_fixup,
++ .status = dm9601_status,
++ .link_reset = dm9601_link_reset,
++ .reset = dm9601_link_reset,
++};
++
++static const struct usb_device_id products[] = {
++ {
++ USB_DEVICE(0x07aa, 0x9601), /* Corega FEther USB-TXC */
++ .driver_info = (unsigned long)&dm9601_info,
++ },
++ {
++ USB_DEVICE(0x0a46, 0x9601), /* Davicom USB-100 */
++ .driver_info = (unsigned long)&dm9601_info,
++ },
++ {
++ USB_DEVICE(0x0a46, 0x6688), /* ZT6688 USB NIC */
++ .driver_info = (unsigned long)&dm9601_info,
++ },
++ {
++ USB_DEVICE(0x0a46, 0x0268), /* ShanTou ST268 USB NIC */
++ .driver_info = (unsigned long)&dm9601_info,
++ },
++ {
++ USB_DEVICE(0x0a46, 0x8515), /* ADMtek ADM8515 USB NIC */
++ .driver_info = (unsigned long)&dm9601_info,
++ },
++ {
++ USB_DEVICE(0x0a47, 0x9601), /* Hirose USB-100 */
++ .driver_info = (unsigned long)&dm9601_info,
++ },
++ {
++ USB_DEVICE(0x0fe6, 0x8101), /* DM9601 USB to Fast Ethernet Adapter */
++ .driver_info = (unsigned long)&dm9601_info,
++ },
++ {
++ USB_DEVICE(0x0fe6, 0x9700), /* DM9601 USB to Fast Ethernet Adapter */
++ .driver_info = (unsigned long)&dm9601_info,
++ },
++ {
++ USB_DEVICE(0x0a46, 0x9000), /* DM9000E */
++ .driver_info = (unsigned long)&dm9601_info,
++ },
++ {
++ USB_DEVICE(0x0a46, 0x9620), /* DM9620 USB to Fast Ethernet Adapter */
++ .driver_info = (unsigned long)&dm9601_info,
++ },
++ {
++ USB_DEVICE(0x0a46, 0x9621), /* DM9621A USB to Fast Ethernet Adapter */
++ .driver_info = (unsigned long)&dm9601_info,
++ },
++ {
++ USB_DEVICE(0x0a46, 0x9622), /* DM9622 USB to Fast Ethernet Adapter */
++ .driver_info = (unsigned long)&dm9601_info,
++ },
++ {
++ USB_DEVICE(0x0a46, 0x0269), /* DM962OA USB to Fast Ethernet Adapter */
++ .driver_info = (unsigned long)&dm9601_info,
++ },
++ {
++ USB_DEVICE(0x0a46, 0x1269), /* DM9621A USB to Fast Ethernet Adapter */
++ .driver_info = (unsigned long)&dm9601_info,
++ },
++ {}, // END
++};
++
++MODULE_DEVICE_TABLE(usb, products);
++
++static struct usb_driver dm9601_driver = {
++ .name = "dm9601",
++ .id_table = products,
++ .probe = usbnet_probe,
++ .disconnect = usbnet_disconnect,
++ .suspend = usbnet_suspend,
++ .resume = usbnet_resume,
++ .disable_hub_initiated_lpm = 1,
++};
++
++module_usb_driver(dm9601_driver);
++
++MODULE_AUTHOR("Peter Korsgaard <jacmet(a)sunsite.dk>");
++MODULE_DESCRIPTION("Davicom DM96xx USB 10/100 ethernet devices");
++MODULE_LICENSE("GPL");
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/gl620a.c backports-4.2.6-1/drivers/net/usb/gl620a.c
+--- backports-4.2.6-1.org/drivers/net/usb/gl620a.c 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/gl620a.c 2015-11-09 23:37:56.000000000 +0100
+@@ -0,0 +1,242 @@
++/*
++ * GeneSys GL620USB-A based links
++ * Copyright (C) 2001 by Jiun-Jie Huang <huangjj(a)genesyslogic.com.tw>
++ * Copyright (C) 2001 by Stanislav Brabec <utx(a)penguin.cz>
++ *
++ * 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, see <http://www.gnu.org/licenses/>.
++ */
++
++// #define DEBUG // error path messages, extra info
++// #define VERBOSE // more; success messages
++
++#include <linux/module.h>
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/ethtool.h>
++#include <linux/workqueue.h>
++#include <linux/mii.h>
++#include <linux/usb.h>
++#include <linux/usb/usbnet.h>
++#include <linux/gfp.h>
++
++
++/*
++ * GeneSys GL620USB-A (www.genesyslogic.com.tw)
++ *
++ * ... should partially interop with the Win32 driver for this hardware.
++ * The GeneSys docs imply there's some NDIS issue motivating this framing.
++ *
++ * Some info from GeneSys:
++ * - GL620USB-A is full duplex; GL620USB is only half duplex for bulk.
++ * (Some cables, like the BAFO-100c, use the half duplex version.)
++ * - For the full duplex model, the low bit of the version code says
++ * which side is which ("left/right").
++ * - For the half duplex type, a control/interrupt handshake settles
++ * the transfer direction. (That's disabled here, partially coded.)
++ * A control URB would block until other side writes an interrupt.
++ *
++ * Original code from Jiun-Jie Huang <huangjj(a)genesyslogic.com.tw>
++ * and merged into "usbnet" by Stanislav Brabec <utx(a)penguin.cz>.
++ */
++
++// control msg write command
++#define GENELINK_CONNECT_WRITE 0xF0
++// interrupt pipe index
++#define GENELINK_INTERRUPT_PIPE 0x03
++// interrupt read buffer size
++#define INTERRUPT_BUFSIZE 0x08
++// interrupt pipe interval value
++#define GENELINK_INTERRUPT_INTERVAL 0x10
++// max transmit packet number per transmit
++#define GL_MAX_TRANSMIT_PACKETS 32
++// max packet length
++#define GL_MAX_PACKET_LEN 1514
++// max receive buffer size
++#define GL_RCV_BUF_SIZE \
++ (((GL_MAX_PACKET_LEN + 4) * GL_MAX_TRANSMIT_PACKETS) + 4)
++
++struct gl_packet {
++ __le32 packet_length;
++ char packet_data [1];
++};
++
++struct gl_header {
++ __le32 packet_count;
++ struct gl_packet packets;
++};
++
++static int genelink_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
++{
++ struct gl_header *header;
++ struct gl_packet *packet;
++ struct sk_buff *gl_skb;
++ u32 size;
++ u32 count;
++
++ /* This check is no longer done by usbnet */
++ if (skb->len < dev->net->hard_header_len)
++ return 0;
++
++ header = (struct gl_header *) skb->data;
++
++ // get the packet count of the received skb
++ count = le32_to_cpu(header->packet_count);
++ if (count > GL_MAX_TRANSMIT_PACKETS) {
++ netdev_dbg(dev->net,
++ "genelink: invalid received packet count %u\n",
++ count);
++ return 0;
++ }
++
++ // set the current packet pointer to the first packet
++ packet = &header->packets;
++
++ // decrement the length for the packet count size 4 bytes
++ skb_pull(skb, 4);
++
++ while (count > 1) {
++ // get the packet length
++ size = le32_to_cpu(packet->packet_length);
++
++ // this may be a broken packet
++ if (size > GL_MAX_PACKET_LEN) {
++ netdev_dbg(dev->net, "genelink: invalid rx length %d\n",
++ size);
++ return 0;
++ }
++
++ // allocate the skb for the individual packet
++ gl_skb = alloc_skb(size, GFP_ATOMIC);
++ if (gl_skb) {
++
++ // copy the packet data to the new skb
++ memcpy(skb_put(gl_skb, size),
++ packet->packet_data, size);
++ usbnet_skb_return(dev, gl_skb);
++ }
++
++ // advance to the next packet
++ packet = (struct gl_packet *)&packet->packet_data[size];
++ count--;
++
++ // shift the data pointer to the next gl_packet
++ skb_pull(skb, size + 4);
++ }
++
++ // skip the packet length field 4 bytes
++ skb_pull(skb, 4);
++
++ if (skb->len > GL_MAX_PACKET_LEN) {
++ netdev_dbg(dev->net, "genelink: invalid rx length %d\n",
++ skb->len);
++ return 0;
++ }
++ return 1;
++}
++
++static struct sk_buff *
++genelink_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
++{
++ int padlen;
++ int length = skb->len;
++ int headroom = skb_headroom(skb);
++ int tailroom = skb_tailroom(skb);
++ __le32 *packet_count;
++ __le32 *packet_len;
++
++ // FIXME: magic numbers, bleech
++ padlen = ((skb->len + (4 + 4*1)) % 64) ? 0 : 1;
++
++ if ((!skb_cloned(skb))
++ && ((headroom + tailroom) >= (padlen + (4 + 4*1)))) {
++ if ((headroom < (4 + 4*1)) || (tailroom < padlen)) {
++ skb->data = memmove(skb->head + (4 + 4*1),
++ skb->data, skb->len);
++ skb_set_tail_pointer(skb, skb->len);
++ }
++ } else {
++ struct sk_buff *skb2;
++ skb2 = skb_copy_expand(skb, (4 + 4*1) , padlen, flags);
++ dev_kfree_skb_any(skb);
++ skb = skb2;
++ if (!skb)
++ return NULL;
++ }
++
++ // attach the packet count to the header
++ packet_count = (__le32 *) skb_push(skb, (4 + 4*1));
++ packet_len = packet_count + 1;
++
++ *packet_count = cpu_to_le32(1);
++ *packet_len = cpu_to_le32(length);
++
++ // add padding byte
++ if ((skb->len % dev->maxpacket) == 0)
++ skb_put(skb, 1);
++
++ return skb;
++}
++
++static int genelink_bind(struct usbnet *dev, struct usb_interface *intf)
++{
++ dev->hard_mtu = GL_RCV_BUF_SIZE;
++ dev->net->hard_header_len += 4;
++ dev->in = usb_rcvbulkpipe(dev->udev, dev->driver_info->in);
++ dev->out = usb_sndbulkpipe(dev->udev, dev->driver_info->out);
++ return 0;
++}
++
++static const struct driver_info genelink_info = {
++ .description = "Genesys GeneLink",
++ .flags = FLAG_POINTTOPOINT | FLAG_FRAMING_GL | FLAG_NO_SETINT,
++ .bind = genelink_bind,
++ .rx_fixup = genelink_rx_fixup,
++ .tx_fixup = genelink_tx_fixup,
++
++ .in = 1, .out = 2,
++
++#ifdef GENELINK_ACK
++ .check_connect =genelink_check_connect,
++#endif
++};
++
++static const struct usb_device_id products [] = {
++
++{
++ USB_DEVICE(0x05e3, 0x0502), // GL620USB-A
++ .driver_info = (unsigned long) &genelink_info,
++},
++ /* NOT: USB_DEVICE(0x05e3, 0x0501), // GL620USB
++ * that's half duplex, not currently supported
++ */
++ { }, // END
++};
++MODULE_DEVICE_TABLE(usb, products);
++
++static struct usb_driver gl620a_driver = {
++ .name = "gl620a",
++ .id_table = products,
++ .probe = usbnet_probe,
++ .disconnect = usbnet_disconnect,
++ .suspend = usbnet_suspend,
++ .resume = usbnet_resume,
++ .disable_hub_initiated_lpm = 1,
++};
++
++module_usb_driver(gl620a_driver);
++
++MODULE_AUTHOR("Jiun-Jie Huang");
++MODULE_DESCRIPTION("GL620-USB-A Host-to-Host Link cables");
++MODULE_LICENSE("GPL");
++
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/hso.c backports-4.2.6-1/drivers/net/usb/hso.c
+--- backports-4.2.6-1.org/drivers/net/usb/hso.c 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/hso.c 2016-01-27 15:03:25.000000000 +0100
+@@ -0,0 +1,3322 @@
++/******************************************************************************
++ *
++ * Driver for Option High Speed Mobile Devices.
++ *
++ * Copyright (C) 2008 Option International
++ * Filip Aben <f.aben(a)option.com>
++ * Denis Joseph Barrow <d.barow(a)option.com>
++ * Jan Dumon <j.dumon(a)option.com>
++ * Copyright (C) 2007 Andrew Bird (Sphere Systems Ltd)
++ * <ajb(a)spheresystems.co.uk>
++ * Copyright (C) 2008 Greg Kroah-Hartman <gregkh(a)suse.de>
++ * Copyright (C) 2008 Novell, Inc.
++ *
++ * 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
++ * published by the Free Software Foundation.
++ *
++ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
++ * USA
++ *
++ *
++ *****************************************************************************/
++
++/******************************************************************************
++ *
++ * Description of the device:
++ *
++ * Interface 0: Contains the IP network interface on the bulk end points.
++ * The multiplexed serial ports are using the interrupt and
++ * control endpoints.
++ * Interrupt contains a bitmap telling which multiplexed
++ * serialport needs servicing.
++ *
++ * Interface 1: Diagnostics port, uses bulk only, do not submit urbs until the
++ * port is opened, as this have a huge impact on the network port
++ * throughput.
++ *
++ * Interface 2: Standard modem interface - circuit switched interface, this
++ * can be used to make a standard ppp connection however it
++ * should not be used in conjunction with the IP network interface
++ * enabled for USB performance reasons i.e. if using this set
++ * ideally disable_net=1.
++ *
++ *****************************************************************************/
++
++#include <linux/sched.h>
++#include <linux/slab.h>
++#include <linux/init.h>
++#include <linux/delay.h>
++#include <linux/netdevice.h>
++#include <linux/module.h>
++#include <linux/ethtool.h>
++#include <linux/usb.h>
++#include <linux/tty.h>
++#include <linux/tty_driver.h>
++#include <linux/tty_flip.h>
++#include <linux/kmod.h>
++#include <linux/rfkill.h>
++#include <linux/ip.h>
++#include <linux/uaccess.h>
++#include <linux/usb/cdc.h>
++#include <net/arp.h>
++#include <asm/byteorder.h>
++#include <linux/serial_core.h>
++#include <linux/serial.h>
++#include <asm/local.h>
++
++#define MOD_AUTHOR "Option Wireless"
++#define MOD_DESCRIPTION "USB High Speed Option driver"
++#define MOD_LICENSE "GPL"
++
++#define HSO_MAX_NET_DEVICES 10
++#define HSO__MAX_MTU 2048
++#define DEFAULT_MTU 1500
++#define DEFAULT_MRU 1500
++
++#define CTRL_URB_RX_SIZE 1024
++#define CTRL_URB_TX_SIZE 64
++
++#define BULK_URB_RX_SIZE 4096
++#define BULK_URB_TX_SIZE 8192
++
++#define MUX_BULK_RX_BUF_SIZE HSO__MAX_MTU
++#define MUX_BULK_TX_BUF_SIZE HSO__MAX_MTU
++#define MUX_BULK_RX_BUF_COUNT 4
++#define USB_TYPE_OPTION_VENDOR 0x20
++
++/* These definitions are used with the struct hso_net flags element */
++/* - use *_bit operations on it. (bit indices not values.) */
++#define HSO_NET_RUNNING 0
++
++#define HSO_NET_TX_TIMEOUT (HZ*10)
++
++#define HSO_SERIAL_MAGIC 0x48534f31
++
++/* Number of ttys to handle */
++#define HSO_SERIAL_TTY_MINORS 256
++
++#define MAX_RX_URBS 2
++
++/*****************************************************************************/
++/* Debugging functions */
++/*****************************************************************************/
++#define D__(lvl_, fmt, arg...) \
++ do { \
++ printk(lvl_ "[%d:%s]: " fmt "\n", \
++ __LINE__, __func__, ## arg); \
++ } while (0)
++
++#define D_(lvl, args...) \
++ do { \
++ if (lvl & debug) \
++ D__(KERN_INFO, args); \
++ } while (0)
++
++#define D1(args...) D_(0x01, ##args)
++#define D2(args...) D_(0x02, ##args)
++#define D3(args...) D_(0x04, ##args)
++#define D4(args...) D_(0x08, ##args)
++#define D5(args...) D_(0x10, ##args)
++
++/*****************************************************************************/
++/* Enumerators */
++/*****************************************************************************/
++enum pkt_parse_state {
++ WAIT_IP,
++ WAIT_DATA,
++ WAIT_SYNC
++};
++
++/*****************************************************************************/
++/* Structs */
++/*****************************************************************************/
++
++struct hso_shared_int {
++ struct usb_endpoint_descriptor *intr_endp;
++ void *shared_intr_buf;
++ struct urb *shared_intr_urb;
++ struct usb_device *usb;
++ int use_count;
++ int ref_count;
++ struct mutex shared_int_lock;
++};
++
++struct hso_net {
++ struct hso_device *parent;
++ struct net_device *net;
++ struct rfkill *rfkill;
++ char name[24];
++
++ struct usb_endpoint_descriptor *in_endp;
++ struct usb_endpoint_descriptor *out_endp;
++
++ struct urb *mux_bulk_rx_urb_pool[MUX_BULK_RX_BUF_COUNT];
++ struct urb *mux_bulk_tx_urb;
++ void *mux_bulk_rx_buf_pool[MUX_BULK_RX_BUF_COUNT];
++ void *mux_bulk_tx_buf;
++
++ struct sk_buff *skb_rx_buf;
++ struct sk_buff *skb_tx_buf;
++
++ enum pkt_parse_state rx_parse_state;
++ spinlock_t net_lock;
++
++ unsigned short rx_buf_size;
++ unsigned short rx_buf_missing;
++ struct iphdr rx_ip_hdr;
++
++ unsigned long flags;
++};
++
++enum rx_ctrl_state{
++ RX_IDLE,
++ RX_SENT,
++ RX_PENDING
++};
++
++#define BM_REQUEST_TYPE (0xa1)
++#define B_NOTIFICATION (0x20)
++#define W_VALUE (0x0)
++#define W_LENGTH (0x2)
++
++#define B_OVERRUN (0x1<<6)
++#define B_PARITY (0x1<<5)
++#define B_FRAMING (0x1<<4)
++#define B_RING_SIGNAL (0x1<<3)
++#define B_BREAK (0x1<<2)
++#define B_TX_CARRIER (0x1<<1)
++#define B_RX_CARRIER (0x1<<0)
++
++struct hso_serial_state_notification {
++ u8 bmRequestType;
++ u8 bNotification;
++ u16 wValue;
++ u16 wIndex;
++ u16 wLength;
++ u16 UART_state_bitmap;
++} __packed;
++
++struct hso_tiocmget {
++ struct mutex mutex;
++ wait_queue_head_t waitq;
++ int intr_completed;
++ struct usb_endpoint_descriptor *endp;
++ struct urb *urb;
++ struct hso_serial_state_notification serial_state_notification;
++ u16 prev_UART_state_bitmap;
++ struct uart_icount icount;
++};
++
++
++struct hso_serial {
++ struct hso_device *parent;
++ int magic;
++ u8 minor;
++
++ struct hso_shared_int *shared_int;
++
++ /* rx/tx urb could be either a bulk urb or a control urb depending
++ on which serial port it is used on. */
++ struct urb *rx_urb[MAX_RX_URBS];
++ u8 num_rx_urbs;
++ u8 *rx_data[MAX_RX_URBS];
++ u16 rx_data_length; /* should contain allocated length */
++
++ struct urb *tx_urb;
++ u8 *tx_data;
++ u8 *tx_buffer;
++ u16 tx_data_length; /* should contain allocated length */
++ u16 tx_data_count;
++ u16 tx_buffer_count;
++ struct usb_ctrlrequest ctrl_req_tx;
++ struct usb_ctrlrequest ctrl_req_rx;
++
++ struct usb_endpoint_descriptor *in_endp;
++ struct usb_endpoint_descriptor *out_endp;
++
++ enum rx_ctrl_state rx_state;
++ u8 rts_state;
++ u8 dtr_state;
++ unsigned tx_urb_used:1;
++
++ struct tty_port port;
++ /* from usb_serial_port */
++ spinlock_t serial_lock;
++
++ int (*write_data) (struct hso_serial *serial);
++ struct hso_tiocmget *tiocmget;
++ /* Hacks required to get flow control
++ * working on the serial receive buffers
++ * so as not to drop characters on the floor.
++ */
++ int curr_rx_urb_idx;
++ u8 rx_urb_filled[MAX_RX_URBS];
++ struct tasklet_struct unthrottle_tasklet;
++};
++
++struct hso_device {
++ union {
++ struct hso_serial *dev_serial;
++ struct hso_net *dev_net;
++ } port_data;
++
++ u32 port_spec;
++
++ u8 is_active;
++ u8 usb_gone;
++ struct work_struct async_get_intf;
++ struct work_struct async_put_intf;
++
++ struct usb_device *usb;
++ struct usb_interface *interface;
++
++ struct device *dev;
++ struct kref ref;
++ struct mutex mutex;
++};
++
++/* Type of interface */
++#define HSO_INTF_MASK 0xFF00
++#define HSO_INTF_MUX 0x0100
++#define HSO_INTF_BULK 0x0200
++
++/* Type of port */
++#define HSO_PORT_MASK 0xFF
++#define HSO_PORT_NO_PORT 0x0
++#define HSO_PORT_CONTROL 0x1
++#define HSO_PORT_APP 0x2
++#define HSO_PORT_GPS 0x3
++#define HSO_PORT_PCSC 0x4
++#define HSO_PORT_APP2 0x5
++#define HSO_PORT_GPS_CONTROL 0x6
++#define HSO_PORT_MSD 0x7
++#define HSO_PORT_VOICE 0x8
++#define HSO_PORT_DIAG2 0x9
++#define HSO_PORT_DIAG 0x10
++#define HSO_PORT_MODEM 0x11
++#define HSO_PORT_NETWORK 0x12
++
++/* Additional device info */
++#define HSO_INFO_MASK 0xFF000000
++#define HSO_INFO_CRC_BUG 0x01000000
++
++/*****************************************************************************/
++/* Prototypes */
++/*****************************************************************************/
++/* Serial driver functions */
++static int hso_serial_tiocmset(struct tty_struct *tty,
++ unsigned int set, unsigned int clear);
++static void ctrl_callback(struct urb *urb);
++static int put_rxbuf_data(struct urb *urb, struct hso_serial *serial);
++static void hso_kick_transmit(struct hso_serial *serial);
++/* Helper functions */
++static int hso_mux_submit_intr_urb(struct hso_shared_int *mux_int,
++ struct usb_device *usb, gfp_t gfp);
++static void handle_usb_error(int status, const char *function,
++ struct hso_device *hso_dev);
++static struct usb_endpoint_descriptor *hso_get_ep(struct usb_interface *intf,
++ int type, int dir);
++static int hso_get_mux_ports(struct usb_interface *intf, unsigned char *ports);
++static void hso_free_interface(struct usb_interface *intf);
++static int hso_start_serial_device(struct hso_device *hso_dev, gfp_t flags);
++static int hso_stop_serial_device(struct hso_device *hso_dev);
++static int hso_start_net_device(struct hso_device *hso_dev);
++static void hso_free_shared_int(struct hso_shared_int *shared_int);
++static int hso_stop_net_device(struct hso_device *hso_dev);
++static void hso_serial_ref_free(struct kref *ref);
++static void hso_std_serial_read_bulk_callback(struct urb *urb);
++static int hso_mux_serial_read(struct hso_serial *serial);
++static void async_get_intf(struct work_struct *data);
++static void async_put_intf(struct work_struct *data);
++static int hso_put_activity(struct hso_device *hso_dev);
++static int hso_get_activity(struct hso_device *hso_dev);
++static void tiocmget_intr_callback(struct urb *urb);
++/*****************************************************************************/
++/* Helping functions */
++/*****************************************************************************/
++
++/* #define DEBUG */
++
++static inline struct hso_net *dev2net(struct hso_device *hso_dev)
++{
++ return hso_dev->port_data.dev_net;
++}
++
++static inline struct hso_serial *dev2ser(struct hso_device *hso_dev)
++{
++ return hso_dev->port_data.dev_serial;
++}
++
++/* Debugging functions */
++#ifdef DEBUG
++static void dbg_dump(int line_count, const char *func_name, unsigned char *buf,
++ unsigned int len)
++{
++ static char name[255];
++
++ sprintf(name, "hso[%d:%s]", line_count, func_name);
++ print_hex_dump_bytes(name, DUMP_PREFIX_NONE, buf, len);
++}
++
++#define DUMP(buf_, len_) \
++ dbg_dump(__LINE__, __func__, (unsigned char *)buf_, len_)
++
++#define DUMP1(buf_, len_) \
++ do { \
++ if (0x01 & debug) \
++ DUMP(buf_, len_); \
++ } while (0)
++#else
++#define DUMP(buf_, len_)
++#define DUMP1(buf_, len_)
++#endif
++
++/* module parameters */
++static int debug;
++static int tty_major;
++static int disable_net;
++
++/* driver info */
++static const char driver_name[] = "hso";
++static const char tty_filename[] = "ttyHS";
++static const char *version = __FILE__ ": " MOD_AUTHOR;
++/* the usb driver itself (registered in hso_init) */
++static struct usb_driver hso_driver;
++/* serial structures */
++static struct tty_driver *tty_drv;
++static struct hso_device *serial_table[HSO_SERIAL_TTY_MINORS];
++static struct hso_device *network_table[HSO_MAX_NET_DEVICES];
++static spinlock_t serial_table_lock;
++
++static const s32 default_port_spec[] = {
++ HSO_INTF_MUX | HSO_PORT_NETWORK,
++ HSO_INTF_BULK | HSO_PORT_DIAG,
++ HSO_INTF_BULK | HSO_PORT_MODEM,
++ 0
++};
++
++static const s32 icon321_port_spec[] = {
++ HSO_INTF_MUX | HSO_PORT_NETWORK,
++ HSO_INTF_BULK | HSO_PORT_DIAG2,
++ HSO_INTF_BULK | HSO_PORT_MODEM,
++ HSO_INTF_BULK | HSO_PORT_DIAG,
++ 0
++};
++
++#define default_port_device(vendor, product) \
++ USB_DEVICE(vendor, product), \
++ .driver_info = (kernel_ulong_t)default_port_spec
++
++#define icon321_port_device(vendor, product) \
++ USB_DEVICE(vendor, product), \
++ .driver_info = (kernel_ulong_t)icon321_port_spec
++
++/* list of devices we support */
++static const struct usb_device_id hso_ids[] = {
++ {default_port_device(0x0af0, 0x6711)},
++ {default_port_device(0x0af0, 0x6731)},
++ {default_port_device(0x0af0, 0x6751)},
++ {default_port_device(0x0af0, 0x6771)},
++ {default_port_device(0x0af0, 0x6791)},
++ {default_port_device(0x0af0, 0x6811)},
++ {default_port_device(0x0af0, 0x6911)},
++ {default_port_device(0x0af0, 0x6951)},
++ {default_port_device(0x0af0, 0x6971)},
++ {default_port_device(0x0af0, 0x7011)},
++ {default_port_device(0x0af0, 0x7031)},
++ {default_port_device(0x0af0, 0x7051)},
++ {default_port_device(0x0af0, 0x7071)},
++ {default_port_device(0x0af0, 0x7111)},
++ {default_port_device(0x0af0, 0x7211)},
++ {default_port_device(0x0af0, 0x7251)},
++ {default_port_device(0x0af0, 0x7271)},
++ {default_port_device(0x0af0, 0x7311)},
++ {default_port_device(0x0af0, 0xc031)}, /* Icon-Edge */
++ {icon321_port_device(0x0af0, 0xd013)}, /* Module HSxPA */
++ {icon321_port_device(0x0af0, 0xd031)}, /* Icon-321 */
++ {icon321_port_device(0x0af0, 0xd033)}, /* Icon-322 */
++ {USB_DEVICE(0x0af0, 0x7301)}, /* GE40x */
++ {USB_DEVICE(0x0af0, 0x7361)}, /* GE40x */
++ {USB_DEVICE(0x0af0, 0x7381)}, /* GE40x */
++ {USB_DEVICE(0x0af0, 0x7401)}, /* GI 0401 */
++ {USB_DEVICE(0x0af0, 0x7501)}, /* GTM 382 */
++ {USB_DEVICE(0x0af0, 0x7601)}, /* GE40x */
++ {USB_DEVICE(0x0af0, 0x7701)},
++ {USB_DEVICE(0x0af0, 0x7706)},
++ {USB_DEVICE(0x0af0, 0x7801)},
++ {USB_DEVICE(0x0af0, 0x7901)},
++ {USB_DEVICE(0x0af0, 0x7A01)},
++ {USB_DEVICE(0x0af0, 0x7A05)},
++ {USB_DEVICE(0x0af0, 0x8200)},
++ {USB_DEVICE(0x0af0, 0x8201)},
++ {USB_DEVICE(0x0af0, 0x8300)},
++ {USB_DEVICE(0x0af0, 0x8302)},
++ {USB_DEVICE(0x0af0, 0x8304)},
++ {USB_DEVICE(0x0af0, 0x8400)},
++ {USB_DEVICE(0x0af0, 0x8600)},
++ {USB_DEVICE(0x0af0, 0x8800)},
++ {USB_DEVICE(0x0af0, 0x8900)},
++ {USB_DEVICE(0x0af0, 0x9000)},
++ {USB_DEVICE(0x0af0, 0x9200)}, /* Option GTM671WFS */
++ {USB_DEVICE(0x0af0, 0xd035)},
++ {USB_DEVICE(0x0af0, 0xd055)},
++ {USB_DEVICE(0x0af0, 0xd155)},
++ {USB_DEVICE(0x0af0, 0xd255)},
++ {USB_DEVICE(0x0af0, 0xd057)},
++ {USB_DEVICE(0x0af0, 0xd157)},
++ {USB_DEVICE(0x0af0, 0xd257)},
++ {USB_DEVICE(0x0af0, 0xd357)},
++ {USB_DEVICE(0x0af0, 0xd058)},
++ {USB_DEVICE(0x0af0, 0xc100)},
++ {}
++};
++MODULE_DEVICE_TABLE(usb, hso_ids);
++
++/* Sysfs attribute */
++static ssize_t hso_sysfs_show_porttype(struct device *dev,
++ struct device_attribute *attr,
++ char *buf)
++{
++ struct hso_device *hso_dev = dev_get_drvdata(dev);
++ char *port_name;
++
++ if (!hso_dev)
++ return 0;
++
++ switch (hso_dev->port_spec & HSO_PORT_MASK) {
++ case HSO_PORT_CONTROL:
++ port_name = "Control";
++ break;
++ case HSO_PORT_APP:
++ port_name = "Application";
++ break;
++ case HSO_PORT_APP2:
++ port_name = "Application2";
++ break;
++ case HSO_PORT_GPS:
++ port_name = "GPS";
++ break;
++ case HSO_PORT_GPS_CONTROL:
++ port_name = "GPS Control";
++ break;
++ case HSO_PORT_PCSC:
++ port_name = "PCSC";
++ break;
++ case HSO_PORT_DIAG:
++ port_name = "Diagnostic";
++ break;
++ case HSO_PORT_DIAG2:
++ port_name = "Diagnostic2";
++ break;
++ case HSO_PORT_MODEM:
++ port_name = "Modem";
++ break;
++ case HSO_PORT_NETWORK:
++ port_name = "Network";
++ break;
++ default:
++ port_name = "Unknown";
++ break;
++ }
++
++ return sprintf(buf, "%s\n", port_name);
++}
++static DEVICE_ATTR(hsotype, S_IRUGO, hso_sysfs_show_porttype, NULL);
++
++static struct attribute *hso_serial_dev_attrs[] = {
++ &dev_attr_hsotype.attr,
++ NULL
++};
++
++ATTRIBUTE_GROUPS(hso_serial_dev);
++
++static int hso_urb_to_index(struct hso_serial *serial, struct urb *urb)
++{
++ int idx;
++
++ for (idx = 0; idx < serial->num_rx_urbs; idx++)
++ if (serial->rx_urb[idx] == urb)
++ return idx;
++ dev_err(serial->parent->dev, "hso_urb_to_index failed\n");
++ return -1;
++}
++
++/* converts mux value to a port spec value */
++static u32 hso_mux_to_port(int mux)
++{
++ u32 result;
++
++ switch (mux) {
++ case 0x1:
++ result = HSO_PORT_CONTROL;
++ break;
++ case 0x2:
++ result = HSO_PORT_APP;
++ break;
++ case 0x4:
++ result = HSO_PORT_PCSC;
++ break;
++ case 0x8:
++ result = HSO_PORT_GPS;
++ break;
++ case 0x10:
++ result = HSO_PORT_APP2;
++ break;
++ default:
++ result = HSO_PORT_NO_PORT;
++ }
++ return result;
++}
++
++/* converts port spec value to a mux value */
++static u32 hso_port_to_mux(int port)
++{
++ u32 result;
++
++ switch (port & HSO_PORT_MASK) {
++ case HSO_PORT_CONTROL:
++ result = 0x0;
++ break;
++ case HSO_PORT_APP:
++ result = 0x1;
++ break;
++ case HSO_PORT_PCSC:
++ result = 0x2;
++ break;
++ case HSO_PORT_GPS:
++ result = 0x3;
++ break;
++ case HSO_PORT_APP2:
++ result = 0x4;
++ break;
++ default:
++ result = 0x0;
++ }
++ return result;
++}
++
++static struct hso_serial *get_serial_by_shared_int_and_type(
++ struct hso_shared_int *shared_int,
++ int mux)
++{
++ int i, port;
++
++ port = hso_mux_to_port(mux);
++
++ for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
++ if (serial_table[i] &&
++ (dev2ser(serial_table[i])->shared_int == shared_int) &&
++ ((serial_table[i]->port_spec & HSO_PORT_MASK) == port)) {
++ return dev2ser(serial_table[i]);
++ }
++ }
++
++ return NULL;
++}
++
++static struct hso_serial *get_serial_by_index(unsigned index)
++{
++ struct hso_serial *serial = NULL;
++ unsigned long flags;
++
++ spin_lock_irqsave(&serial_table_lock, flags);
++ if (serial_table[index])
++ serial = dev2ser(serial_table[index]);
++ spin_unlock_irqrestore(&serial_table_lock, flags);
++
++ return serial;
++}
++
++static int get_free_serial_index(void)
++{
++ int index;
++ unsigned long flags;
++
++ spin_lock_irqsave(&serial_table_lock, flags);
++ for (index = 0; index < HSO_SERIAL_TTY_MINORS; index++) {
++ if (serial_table[index] == NULL) {
++ spin_unlock_irqrestore(&serial_table_lock, flags);
++ return index;
++ }
++ }
++ spin_unlock_irqrestore(&serial_table_lock, flags);
++
++ printk(KERN_ERR "%s: no free serial devices in table\n", __func__);
++ return -1;
++}
++
++static void set_serial_by_index(unsigned index, struct hso_serial *serial)
++{
++ unsigned long flags;
++
++ spin_lock_irqsave(&serial_table_lock, flags);
++ if (serial)
++ serial_table[index] = serial->parent;
++ else
++ serial_table[index] = NULL;
++ spin_unlock_irqrestore(&serial_table_lock, flags);
++}
++
++static void handle_usb_error(int status, const char *function,
++ struct hso_device *hso_dev)
++{
++ char *explanation;
++
++ switch (status) {
++ case -ENODEV:
++ explanation = "no device";
++ break;
++ case -ENOENT:
++ explanation = "endpoint not enabled";
++ break;
++ case -EPIPE:
++ explanation = "endpoint stalled";
++ break;
++ case -ENOSPC:
++ explanation = "not enough bandwidth";
++ break;
++ case -ESHUTDOWN:
++ explanation = "device disabled";
++ break;
++ case -EHOSTUNREACH:
++ explanation = "device suspended";
++ break;
++ case -EINVAL:
++ case -EAGAIN:
++ case -EFBIG:
++ case -EMSGSIZE:
++ explanation = "internal error";
++ break;
++ case -EILSEQ:
++ case -EPROTO:
++ case -ETIME:
++ case -ETIMEDOUT:
++ explanation = "protocol error";
++ if (hso_dev)
++ usb_queue_reset_device(hso_dev->interface);
++ break;
++ default:
++ explanation = "unknown status";
++ break;
++ }
++
++ /* log a meaningful explanation of an USB status */
++ D1("%s: received USB status - %s (%d)", function, explanation, status);
++}
++
++/* Network interface functions */
++
++/* called when net interface is brought up by ifconfig */
++static int hso_net_open(struct net_device *net)
++{
++ struct hso_net *odev = netdev_priv(net);
++ unsigned long flags = 0;
++
++ if (!odev) {
++ dev_err(&net->dev, "No net device !\n");
++ return -ENODEV;
++ }
++
++ odev->skb_tx_buf = NULL;
++
++ /* setup environment */
++ spin_lock_irqsave(&odev->net_lock, flags);
++ odev->rx_parse_state = WAIT_IP;
++ odev->rx_buf_size = 0;
++ odev->rx_buf_missing = sizeof(struct iphdr);
++ spin_unlock_irqrestore(&odev->net_lock, flags);
++
++ /* We are up and running. */
++ set_bit(HSO_NET_RUNNING, &odev->flags);
++ hso_start_net_device(odev->parent);
++
++ /* Tell the kernel we are ready to start receiving from it */
++ netif_start_queue(net);
++
++ return 0;
++}
++
++/* called when interface is brought down by ifconfig */
++static int hso_net_close(struct net_device *net)
++{
++ struct hso_net *odev = netdev_priv(net);
++
++ /* we don't need the queue anymore */
++ netif_stop_queue(net);
++ /* no longer running */
++ clear_bit(HSO_NET_RUNNING, &odev->flags);
++
++ hso_stop_net_device(odev->parent);
++
++ /* done */
++ return 0;
++}
++
++/* USB tells is xmit done, we should start the netqueue again */
++static void write_bulk_callback(struct urb *urb)
++{
++ struct hso_net *odev = urb->context;
++ int status = urb->status;
++
++ /* Sanity check */
++ if (!odev || !test_bit(HSO_NET_RUNNING, &odev->flags)) {
++ dev_err(&urb->dev->dev, "%s: device not running\n", __func__);
++ return;
++ }
++
++ /* Do we still have a valid kernel network device? */
++ if (!netif_device_present(odev->net)) {
++ dev_err(&urb->dev->dev, "%s: net device not present\n",
++ __func__);
++ return;
++ }
++
++ /* log status, but don't act on it, we don't need to resubmit anything
++ * anyhow */
++ if (status)
++ handle_usb_error(status, __func__, odev->parent);
++
++ hso_put_activity(odev->parent);
++
++ /* Tell the network interface we are ready for another frame */
++ netif_wake_queue(odev->net);
++}
++
++/* called by kernel when we need to transmit a packet */
++static netdev_tx_t hso_net_start_xmit(struct sk_buff *skb,
++ struct net_device *net)
++{
++ struct hso_net *odev = netdev_priv(net);
++ int result;
++
++ /* Tell the kernel, "No more frames 'til we are done with this one." */
++ netif_stop_queue(net);
++ if (hso_get_activity(odev->parent) == -EAGAIN) {
++ odev->skb_tx_buf = skb;
++ return NETDEV_TX_OK;
++ }
++
++ /* log if asked */
++ DUMP1(skb->data, skb->len);
++ /* Copy it from kernel memory to OUR memory */
++ memcpy(odev->mux_bulk_tx_buf, skb->data, skb->len);
++ D1("len: %d/%d", skb->len, MUX_BULK_TX_BUF_SIZE);
++
++ /* Fill in the URB for shipping it out. */
++ usb_fill_bulk_urb(odev->mux_bulk_tx_urb,
++ odev->parent->usb,
++ usb_sndbulkpipe(odev->parent->usb,
++ odev->out_endp->
++ bEndpointAddress & 0x7F),
++ odev->mux_bulk_tx_buf, skb->len, write_bulk_callback,
++ odev);
++
++ /* Deal with the Zero Length packet problem, I hope */
++ odev->mux_bulk_tx_urb->transfer_flags |= URB_ZERO_PACKET;
++
++ /* Send the URB on its merry way. */
++ result = usb_submit_urb(odev->mux_bulk_tx_urb, GFP_ATOMIC);
++ if (result) {
++ dev_warn(&odev->parent->interface->dev,
++ "failed mux_bulk_tx_urb %d\n", result);
++ net->stats.tx_errors++;
++ netif_start_queue(net);
++ } else {
++ net->stats.tx_packets++;
++ net->stats.tx_bytes += skb->len;
++ }
++ dev_kfree_skb(skb);
++ /* we're done */
++ return NETDEV_TX_OK;
++}
++
++static const struct ethtool_ops ops = {
++ .get_link = ethtool_op_get_link
++};
++
++/* called when a packet did not ack after watchdogtimeout */
++static void hso_net_tx_timeout(struct net_device *net)
++{
++ struct hso_net *odev = netdev_priv(net);
++
++ if (!odev)
++ return;
++
++ /* Tell syslog we are hosed. */
++ dev_warn(&net->dev, "Tx timed out.\n");
++
++ /* Tear the waiting frame off the list */
++ if (odev->mux_bulk_tx_urb &&
++ (odev->mux_bulk_tx_urb->status == -EINPROGRESS))
++ usb_unlink_urb(odev->mux_bulk_tx_urb);
++
++ /* Update statistics */
++ net->stats.tx_errors++;
++}
++
++/* make a real packet from the received USB buffer */
++static void packetizeRx(struct hso_net *odev, unsigned char *ip_pkt,
++ unsigned int count, unsigned char is_eop)
++{
++ unsigned short temp_bytes;
++ unsigned short buffer_offset = 0;
++ unsigned short frame_len;
++ unsigned char *tmp_rx_buf;
++
++ /* log if needed */
++ D1("Rx %d bytes", count);
++ DUMP(ip_pkt, min(128, (int)count));
++
++ while (count) {
++ switch (odev->rx_parse_state) {
++ case WAIT_IP:
++ /* waiting for IP header. */
++ /* wanted bytes - size of ip header */
++ temp_bytes =
++ (count <
++ odev->rx_buf_missing) ? count : odev->
++ rx_buf_missing;
++
++ memcpy(((unsigned char *)(&odev->rx_ip_hdr)) +
++ odev->rx_buf_size, ip_pkt + buffer_offset,
++ temp_bytes);
++
++ odev->rx_buf_size += temp_bytes;
++ buffer_offset += temp_bytes;
++ odev->rx_buf_missing -= temp_bytes;
++ count -= temp_bytes;
++
++ if (!odev->rx_buf_missing) {
++ /* header is complete allocate an sk_buffer and
++ * continue to WAIT_DATA */
++ frame_len = ntohs(odev->rx_ip_hdr.tot_len);
++
++ if ((frame_len > DEFAULT_MRU) ||
++ (frame_len < sizeof(struct iphdr))) {
++ dev_err(&odev->net->dev,
++ "Invalid frame (%d) length\n",
++ frame_len);
++ odev->rx_parse_state = WAIT_SYNC;
++ continue;
++ }
++ /* Allocate an sk_buff */
++ odev->skb_rx_buf = netdev_alloc_skb(odev->net,
++ frame_len);
++ if (!odev->skb_rx_buf) {
++ /* We got no receive buffer. */
++ D1("could not allocate memory");
++ odev->rx_parse_state = WAIT_SYNC;
++ continue;
++ }
++
++ /* Copy what we got so far. make room for iphdr
++ * after tail. */
++ tmp_rx_buf =
++ skb_put(odev->skb_rx_buf,
++ sizeof(struct iphdr));
++ memcpy(tmp_rx_buf, (char *)&(odev->rx_ip_hdr),
++ sizeof(struct iphdr));
++
++ /* ETH_HLEN */
++ odev->rx_buf_size = sizeof(struct iphdr);
++
++ /* Filip actually use .tot_len */
++ odev->rx_buf_missing =
++ frame_len - sizeof(struct iphdr);
++ odev->rx_parse_state = WAIT_DATA;
++ }
++ break;
++
++ case WAIT_DATA:
++ temp_bytes = (count < odev->rx_buf_missing)
++ ? count : odev->rx_buf_missing;
++
++ /* Copy the rest of the bytes that are left in the
++ * buffer into the waiting sk_buf. */
++ /* Make room for temp_bytes after tail. */
++ tmp_rx_buf = skb_put(odev->skb_rx_buf, temp_bytes);
++ memcpy(tmp_rx_buf, ip_pkt + buffer_offset, temp_bytes);
++
++ odev->rx_buf_missing -= temp_bytes;
++ count -= temp_bytes;
++ buffer_offset += temp_bytes;
++ odev->rx_buf_size += temp_bytes;
++ if (!odev->rx_buf_missing) {
++ /* Packet is complete. Inject into stack. */
++ /* We have IP packet here */
++ odev->skb_rx_buf->protocol = cpu_to_be16(ETH_P_IP);
++ skb_reset_mac_header(odev->skb_rx_buf);
++
++ /* Ship it off to the kernel */
++ netif_rx(odev->skb_rx_buf);
++ /* No longer our buffer. */
++ odev->skb_rx_buf = NULL;
++
++ /* update out statistics */
++ odev->net->stats.rx_packets++;
++
++ odev->net->stats.rx_bytes += odev->rx_buf_size;
++
++ odev->rx_buf_size = 0;
++ odev->rx_buf_missing = sizeof(struct iphdr);
++ odev->rx_parse_state = WAIT_IP;
++ }
++ break;
++
++ case WAIT_SYNC:
++ D1(" W_S");
++ count = 0;
++ break;
++ default:
++ D1(" ");
++ count--;
++ break;
++ }
++ }
++
++ /* Recovery mechanism for WAIT_SYNC state. */
++ if (is_eop) {
++ if (odev->rx_parse_state == WAIT_SYNC) {
++ odev->rx_parse_state = WAIT_IP;
++ odev->rx_buf_size = 0;
++ odev->rx_buf_missing = sizeof(struct iphdr);
++ }
++ }
++}
++
++static void fix_crc_bug(struct urb *urb, __le16 max_packet_size)
++{
++ static const u8 crc_check[4] = { 0xDE, 0xAD, 0xBE, 0xEF };
++ u32 rest = urb->actual_length % le16_to_cpu(max_packet_size);
++
++ if (((rest == 5) || (rest == 6)) &&
++ !memcmp(((u8 *)urb->transfer_buffer) + urb->actual_length - 4,
++ crc_check, 4)) {
++ urb->actual_length -= 4;
++ }
++}
++
++/* Moving data from usb to kernel (in interrupt state) */
++static void read_bulk_callback(struct urb *urb)
++{
++ struct hso_net *odev = urb->context;
++ struct net_device *net;
++ int result;
++ int status = urb->status;
++
++ /* is al ok? (Filip: Who's Al ?) */
++ if (status) {
++ handle_usb_error(status, __func__, odev->parent);
++ return;
++ }
++
++ /* Sanity check */
++ if (!odev || !test_bit(HSO_NET_RUNNING, &odev->flags)) {
++ D1("BULK IN callback but driver is not active!");
++ return;
++ }
++ usb_mark_last_busy(urb->dev);
++
++ net = odev->net;
++
++ if (!netif_device_present(net)) {
++ /* Somebody killed our network interface... */
++ return;
++ }
++
++ if (odev->parent->port_spec & HSO_INFO_CRC_BUG)
++ fix_crc_bug(urb, odev->in_endp->wMaxPacketSize);
++
++ /* do we even have a packet? */
++ if (urb->actual_length) {
++ /* Handle the IP stream, add header and push it onto network
++ * stack if the packet is complete. */
++ spin_lock(&odev->net_lock);
++ packetizeRx(odev, urb->transfer_buffer, urb->actual_length,
++ (urb->transfer_buffer_length >
++ urb->actual_length) ? 1 : 0);
++ spin_unlock(&odev->net_lock);
++ }
++
++ /* We are done with this URB, resubmit it. Prep the USB to wait for
++ * another frame. Reuse same as received. */
++ usb_fill_bulk_urb(urb,
++ odev->parent->usb,
++ usb_rcvbulkpipe(odev->parent->usb,
++ odev->in_endp->
++ bEndpointAddress & 0x7F),
++ urb->transfer_buffer, MUX_BULK_RX_BUF_SIZE,
++ read_bulk_callback, odev);
++
++ /* Give this to the USB subsystem so it can tell us when more data
++ * arrives. */
++ result = usb_submit_urb(urb, GFP_ATOMIC);
++ if (result)
++ dev_warn(&odev->parent->interface->dev,
++ "%s failed submit mux_bulk_rx_urb %d\n", __func__,
++ result);
++}
++
++/* Serial driver functions */
++
++static void hso_init_termios(struct ktermios *termios)
++{
++ /*
++ * The default requirements for this device are:
++ */
++ termios->c_iflag &=
++ ~(IGNBRK /* disable ignore break */
++ | BRKINT /* disable break causes interrupt */
++ | PARMRK /* disable mark parity errors */
++ | ISTRIP /* disable clear high bit of input characters */
++ | INLCR /* disable translate NL to CR */
++ | IGNCR /* disable ignore CR */
++ | ICRNL /* disable translate CR to NL */
++ | IXON); /* disable enable XON/XOFF flow control */
++
++ /* disable postprocess output characters */
++ termios->c_oflag &= ~OPOST;
++
++ termios->c_lflag &=
++ ~(ECHO /* disable echo input characters */
++ | ECHONL /* disable echo new line */
++ | ICANON /* disable erase, kill, werase, and rprnt
++ special characters */
++ | ISIG /* disable interrupt, quit, and suspend special
++ characters */
++ | IEXTEN); /* disable non-POSIX special characters */
++
++ termios->c_cflag &=
++ ~(CSIZE /* no size */
++ | PARENB /* disable parity bit */
++ | CBAUD /* clear current baud rate */
++ | CBAUDEX); /* clear current buad rate */
++
++ termios->c_cflag |= CS8; /* character size 8 bits */
++
++ /* baud rate 115200 */
++ tty_termios_encode_baud_rate(termios, 115200, 115200);
++}
++
++static void _hso_serial_set_termios(struct tty_struct *tty,
++ struct ktermios *old)
++{
++ struct hso_serial *serial = tty->driver_data;
++
++ if (!serial) {
++ printk(KERN_ERR "%s: no tty structures", __func__);
++ return;
++ }
++
++ D4("port %d", serial->minor);
++
++ /*
++ * Fix up unsupported bits
++ */
++ tty->termios.c_iflag &= ~IXON; /* disable enable XON/XOFF flow control */
++
++ tty->termios.c_cflag &=
++ ~(CSIZE /* no size */
++ | PARENB /* disable parity bit */
++ | CBAUD /* clear current baud rate */
++ | CBAUDEX); /* clear current buad rate */
++
++ tty->termios.c_cflag |= CS8; /* character size 8 bits */
++
++ /* baud rate 115200 */
++ tty_encode_baud_rate(tty, 115200, 115200);
++}
++
++static void hso_resubmit_rx_bulk_urb(struct hso_serial *serial, struct urb *urb)
++{
++ int result;
++ /* We are done with this URB, resubmit it. Prep the USB to wait for
++ * another frame */
++ usb_fill_bulk_urb(urb, serial->parent->usb,
++ usb_rcvbulkpipe(serial->parent->usb,
++ serial->in_endp->
++ bEndpointAddress & 0x7F),
++ urb->transfer_buffer, serial->rx_data_length,
++ hso_std_serial_read_bulk_callback, serial);
++ /* Give this to the USB subsystem so it can tell us when more data
++ * arrives. */
++ result = usb_submit_urb(urb, GFP_ATOMIC);
++ if (result) {
++ dev_err(&urb->dev->dev, "%s failed submit serial rx_urb %d\n",
++ __func__, result);
++ }
++}
++
++
++
++
++static void put_rxbuf_data_and_resubmit_bulk_urb(struct hso_serial *serial)
++{
++ int count;
++ struct urb *curr_urb;
++
++ while (serial->rx_urb_filled[serial->curr_rx_urb_idx]) {
++ curr_urb = serial->rx_urb[serial->curr_rx_urb_idx];
++ count = put_rxbuf_data(curr_urb, serial);
++ if (count == -1)
++ return;
++ if (count == 0) {
++ serial->curr_rx_urb_idx++;
++ if (serial->curr_rx_urb_idx >= serial->num_rx_urbs)
++ serial->curr_rx_urb_idx = 0;
++ hso_resubmit_rx_bulk_urb(serial, curr_urb);
++ }
++ }
++}
++
++static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
++{
++ int count = 0;
++ struct urb *urb;
++
++ urb = serial->rx_urb[0];
++ if (atomic_read(&serial->port.count) > 0) {
++ count = put_rxbuf_data(urb, serial);
++ if (count == -1)
++ return;
++ }
++ /* Re issue a read as long as we receive data. */
++
++ if (count == 0 && ((urb->actual_length != 0) ||
++ (serial->rx_state == RX_PENDING))) {
++ serial->rx_state = RX_SENT;
++ hso_mux_serial_read(serial);
++ } else
++ serial->rx_state = RX_IDLE;
++}
++
++
++/* read callback for Diag and CS port */
++static void hso_std_serial_read_bulk_callback(struct urb *urb)
++{
++ struct hso_serial *serial = urb->context;
++ int status = urb->status;
++
++ D4("\n--- Got serial_read_bulk callback %02x ---", status);
++
++ /* sanity check */
++ if (!serial) {
++ D1("serial == NULL");
++ return;
++ }
++ if (status) {
++ handle_usb_error(status, __func__, serial->parent);
++ return;
++ }
++
++ D1("Actual length = %d\n", urb->actual_length);
++ DUMP1(urb->transfer_buffer, urb->actual_length);
++
++ /* Anyone listening? */
++ if (atomic_read(&serial->port.count) == 0)
++ return;
++
++ if (serial->parent->port_spec & HSO_INFO_CRC_BUG)
++ fix_crc_bug(urb, serial->in_endp->wMaxPacketSize);
++ /* Valid data, handle RX data */
++ spin_lock(&serial->serial_lock);
++ serial->rx_urb_filled[hso_urb_to_index(serial, urb)] = 1;
++ put_rxbuf_data_and_resubmit_bulk_urb(serial);
++ spin_unlock(&serial->serial_lock);
++}
++
++/*
++ * This needs to be a tasklet otherwise we will
++ * end up recursively calling this function.
++ */
++static void hso_unthrottle_tasklet(struct hso_serial *serial)
++{
++ unsigned long flags;
++
++ spin_lock_irqsave(&serial->serial_lock, flags);
++ if ((serial->parent->port_spec & HSO_INTF_MUX))
++ put_rxbuf_data_and_resubmit_ctrl_urb(serial);
++ else
++ put_rxbuf_data_and_resubmit_bulk_urb(serial);
++ spin_unlock_irqrestore(&serial->serial_lock, flags);
++}
++
++static void hso_unthrottle(struct tty_struct *tty)
++{
++ struct hso_serial *serial = tty->driver_data;
++
++ tasklet_hi_schedule(&serial->unthrottle_tasklet);
++}
++
++/* open the requested serial port */
++static int hso_serial_open(struct tty_struct *tty, struct file *filp)
++{
++ struct hso_serial *serial = get_serial_by_index(tty->index);
++ int result;
++
++ /* sanity check */
++ if (serial == NULL || serial->magic != HSO_SERIAL_MAGIC) {
++ WARN_ON(1);
++ tty->driver_data = NULL;
++ D1("Failed to open port");
++ return -ENODEV;
++ }
++
++ mutex_lock(&serial->parent->mutex);
++ result = usb_autopm_get_interface(serial->parent->interface);
++ if (result < 0)
++ goto err_out;
++
++ D1("Opening %d", serial->minor);
++
++ /* setup */
++ tty->driver_data = serial;
++ tty_port_tty_set(&serial->port, tty);
++
++ /* check for port already opened, if not set the termios */
++ if (atomic_inc_return(&serial->port.count) == 1) {
++ serial->rx_state = RX_IDLE;
++ /* Force default termio settings */
++ _hso_serial_set_termios(tty, NULL);
++ tasklet_init(&serial->unthrottle_tasklet,
++ (void (*)(unsigned long))hso_unthrottle_tasklet,
++ (unsigned long)serial);
++ result = hso_start_serial_device(serial->parent, GFP_KERNEL);
++ if (result) {
++ hso_stop_serial_device(serial->parent);
++ atomic_dec(&serial->port.count);
++ } else {
++ kref_get(&serial->parent->ref);
++ }
++ } else {
++ D1("Port was already open");
++ }
++
++ usb_autopm_put_interface(serial->parent->interface);
++
++ /* done */
++ if (result)
++ hso_serial_tiocmset(tty, TIOCM_RTS | TIOCM_DTR, 0);
++err_out:
++ mutex_unlock(&serial->parent->mutex);
++ return result;
++}
++
++/* close the requested serial port */
++static void hso_serial_close(struct tty_struct *tty, struct file *filp)
++{
++ struct hso_serial *serial = tty->driver_data;
++ u8 usb_gone;
++
++ D1("Closing serial port");
++
++ /* Open failed, no close cleanup required */
++ if (serial == NULL)
++ return;
++
++ mutex_lock(&serial->parent->mutex);
++ usb_gone = serial->parent->usb_gone;
++
++ if (!usb_gone)
++ usb_autopm_get_interface(serial->parent->interface);
++
++ /* reset the rts and dtr */
++ /* do the actual close */
++ atomic_dec(&serial->port.count);
++
++ if (atomic_read(&serial->port.count) <= 0) {
++ atomic_set(&serial->port.count, 0);
++ tty_port_tty_set(&serial->port, NULL);
++ if (!usb_gone)
++ hso_stop_serial_device(serial->parent);
++ tasklet_kill(&serial->unthrottle_tasklet);
++ }
++
++ if (!usb_gone)
++ usb_autopm_put_interface(serial->parent->interface);
++
++ mutex_unlock(&serial->parent->mutex);
++}
++
++/* close the requested serial port */
++static int hso_serial_write(struct tty_struct *tty, const unsigned char *buf,
++ int count)
++{
++ struct hso_serial *serial = tty->driver_data;
++ int space, tx_bytes;
++ unsigned long flags;
++
++ /* sanity check */
++ if (serial == NULL) {
++ printk(KERN_ERR "%s: serial is NULL\n", __func__);
++ return -ENODEV;
++ }
++
++ spin_lock_irqsave(&serial->serial_lock, flags);
++
++ space = serial->tx_data_length - serial->tx_buffer_count;
++ tx_bytes = (count < space) ? count : space;
++
++ if (!tx_bytes)
++ goto out;
++
++ memcpy(serial->tx_buffer + serial->tx_buffer_count, buf, tx_bytes);
++ serial->tx_buffer_count += tx_bytes;
++
++out:
++ spin_unlock_irqrestore(&serial->serial_lock, flags);
++
++ hso_kick_transmit(serial);
++ /* done */
++ return tx_bytes;
++}
++
++/* how much room is there for writing */
++static int hso_serial_write_room(struct tty_struct *tty)
++{
++ struct hso_serial *serial = tty->driver_data;
++ int room;
++ unsigned long flags;
++
++ spin_lock_irqsave(&serial->serial_lock, flags);
++ room = serial->tx_data_length - serial->tx_buffer_count;
++ spin_unlock_irqrestore(&serial->serial_lock, flags);
++
++ /* return free room */
++ return room;
++}
++
++static void hso_serial_cleanup(struct tty_struct *tty)
++{
++ struct hso_serial *serial = tty->driver_data;
++
++ if (!serial)
++ return;
++
++ kref_put(&serial->parent->ref, hso_serial_ref_free);
++}
++
++/* setup the term */
++static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
++{
++ struct hso_serial *serial = tty->driver_data;
++ unsigned long flags;
++
++ if (old)
++ D5("Termios called with: cflags new[%d] - old[%d]",
++ tty->termios.c_cflag, old->c_cflag);
++
++ /* the actual setup */
++ spin_lock_irqsave(&serial->serial_lock, flags);
++ if (atomic_read(&serial->port.count))
++ _hso_serial_set_termios(tty, old);
++ else
++ tty->termios = *old;
++ spin_unlock_irqrestore(&serial->serial_lock, flags);
++
++ /* done */
++}
++
++/* how many characters in the buffer */
++static int hso_serial_chars_in_buffer(struct tty_struct *tty)
++{
++ struct hso_serial *serial = tty->driver_data;
++ int chars;
++ unsigned long flags;
++
++ /* sanity check */
++ if (serial == NULL)
++ return 0;
++
++ spin_lock_irqsave(&serial->serial_lock, flags);
++ chars = serial->tx_buffer_count;
++ spin_unlock_irqrestore(&serial->serial_lock, flags);
++
++ return chars;
++}
++static int tiocmget_submit_urb(struct hso_serial *serial,
++ struct hso_tiocmget *tiocmget,
++ struct usb_device *usb)
++{
++ int result;
++
++ if (serial->parent->usb_gone)
++ return -ENODEV;
++ usb_fill_int_urb(tiocmget->urb, usb,
++ usb_rcvintpipe(usb,
++ tiocmget->endp->
++ bEndpointAddress & 0x7F),
++ &tiocmget->serial_state_notification,
++ sizeof(struct hso_serial_state_notification),
++ tiocmget_intr_callback, serial,
++ tiocmget->endp->bInterval);
++ result = usb_submit_urb(tiocmget->urb, GFP_ATOMIC);
++ if (result) {
++ dev_warn(&usb->dev, "%s usb_submit_urb failed %d\n", __func__,
++ result);
++ }
++ return result;
++
++}
++
++static void tiocmget_intr_callback(struct urb *urb)
++{
++ struct hso_serial *serial = urb->context;
++ struct hso_tiocmget *tiocmget;
++ int status = urb->status;
++ u16 UART_state_bitmap, prev_UART_state_bitmap;
++ struct uart_icount *icount;
++ struct hso_serial_state_notification *serial_state_notification;
++ struct usb_device *usb;
++ struct usb_interface *interface;
++ int if_num;
++
++ /* Sanity checks */
++ if (!serial)
++ return;
++ if (status) {
++ handle_usb_error(status, __func__, serial->parent);
++ return;
++ }
++
++ /* tiocmget is only supported on HSO_PORT_MODEM */
++ tiocmget = serial->tiocmget;
++ if (!tiocmget)
++ return;
++ BUG_ON((serial->parent->port_spec & HSO_PORT_MASK) != HSO_PORT_MODEM);
++
++ usb = serial->parent->usb;
++ interface = serial->parent->interface;
++
++ if_num = interface->cur_altsetting->desc.bInterfaceNumber;
++
++ /* wIndex should be the USB interface number of the port to which the
++ * notification applies, which should always be the Modem port.
++ */
++ serial_state_notification = &tiocmget->serial_state_notification;
++ if (serial_state_notification->bmRequestType != BM_REQUEST_TYPE ||
++ serial_state_notification->bNotification != B_NOTIFICATION ||
++ le16_to_cpu(serial_state_notification->wValue) != W_VALUE ||
++ le16_to_cpu(serial_state_notification->wIndex) != if_num ||
++ le16_to_cpu(serial_state_notification->wLength) != W_LENGTH) {
++ dev_warn(&usb->dev,
++ "hso received invalid serial state notification\n");
++ DUMP(serial_state_notification,
++ sizeof(struct hso_serial_state_notification));
++ } else {
++
++ UART_state_bitmap = le16_to_cpu(serial_state_notification->
++ UART_state_bitmap);
++ prev_UART_state_bitmap = tiocmget->prev_UART_state_bitmap;
++ icount = &tiocmget->icount;
++ spin_lock(&serial->serial_lock);
++ if ((UART_state_bitmap & B_OVERRUN) !=
++ (prev_UART_state_bitmap & B_OVERRUN))
++ icount->parity++;
++ if ((UART_state_bitmap & B_PARITY) !=
++ (prev_UART_state_bitmap & B_PARITY))
++ icount->parity++;
++ if ((UART_state_bitmap & B_FRAMING) !=
++ (prev_UART_state_bitmap & B_FRAMING))
++ icount->frame++;
++ if ((UART_state_bitmap & B_RING_SIGNAL) &&
++ !(prev_UART_state_bitmap & B_RING_SIGNAL))
++ icount->rng++;
++ if ((UART_state_bitmap & B_BREAK) !=
++ (prev_UART_state_bitmap & B_BREAK))
++ icount->brk++;
++ if ((UART_state_bitmap & B_TX_CARRIER) !=
++ (prev_UART_state_bitmap & B_TX_CARRIER))
++ icount->dsr++;
++ if ((UART_state_bitmap & B_RX_CARRIER) !=
++ (prev_UART_state_bitmap & B_RX_CARRIER))
++ icount->dcd++;
++ tiocmget->prev_UART_state_bitmap = UART_state_bitmap;
++ spin_unlock(&serial->serial_lock);
++ tiocmget->intr_completed = 1;
++ wake_up_interruptible(&tiocmget->waitq);
++ }
++ memset(serial_state_notification, 0,
++ sizeof(struct hso_serial_state_notification));
++ tiocmget_submit_urb(serial,
++ tiocmget,
++ serial->parent->usb);
++}
++
++/*
++ * next few functions largely stolen from drivers/serial/serial_core.c
++ */
++/* Wait for any of the 4 modem inputs (DCD,RI,DSR,CTS) to change
++ * - mask passed in arg for lines of interest
++ * (use |'ed TIOCM_RNG/DSR/CD/CTS for masking)
++ * Caller should use TIOCGICOUNT to see which one it was
++ */
++static int
++hso_wait_modem_status(struct hso_serial *serial, unsigned long arg)
++{
++ DECLARE_WAITQUEUE(wait, current);
++ struct uart_icount cprev, cnow;
++ struct hso_tiocmget *tiocmget;
++ int ret;
++
++ tiocmget = serial->tiocmget;
++ if (!tiocmget)
++ return -ENOENT;
++ /*
++ * note the counters on entry
++ */
++ spin_lock_irq(&serial->serial_lock);
++ memcpy(&cprev, &tiocmget->icount, sizeof(struct uart_icount));
++ spin_unlock_irq(&serial->serial_lock);
++ add_wait_queue(&tiocmget->waitq, &wait);
++ for (;;) {
++ spin_lock_irq(&serial->serial_lock);
++ memcpy(&cnow, &tiocmget->icount, sizeof(struct uart_icount));
++ spin_unlock_irq(&serial->serial_lock);
++ set_current_state(TASK_INTERRUPTIBLE);
++ if (((arg & TIOCM_RNG) && (cnow.rng != cprev.rng)) ||
++ ((arg & TIOCM_DSR) && (cnow.dsr != cprev.dsr)) ||
++ ((arg & TIOCM_CD) && (cnow.dcd != cprev.dcd))) {
++ ret = 0;
++ break;
++ }
++ schedule();
++ /* see if a signal did it */
++ if (signal_pending(current)) {
++ ret = -ERESTARTSYS;
++ break;
++ }
++ cprev = cnow;
++ }
++ __set_current_state(TASK_RUNNING);
++ remove_wait_queue(&tiocmget->waitq, &wait);
++
++ return ret;
++}
++
++/*
++ * Get counter of input serial line interrupts (DCD,RI,DSR,CTS)
++ * Return: write counters to the user passed counter struct
++ * NB: both 1->0 and 0->1 transitions are counted except for
++ * RI where only 0->1 is counted.
++ */
++static int hso_get_count(struct tty_struct *tty,
++ struct serial_icounter_struct *icount)
++{
++ struct uart_icount cnow;
++ struct hso_serial *serial = tty->driver_data;
++ struct hso_tiocmget *tiocmget = serial->tiocmget;
++
++ memset(icount, 0, sizeof(struct serial_icounter_struct));
++
++ if (!tiocmget)
++ return -ENOENT;
++ spin_lock_irq(&serial->serial_lock);
++ memcpy(&cnow, &tiocmget->icount, sizeof(struct uart_icount));
++ spin_unlock_irq(&serial->serial_lock);
++
++ icount->cts = cnow.cts;
++ icount->dsr = cnow.dsr;
++ icount->rng = cnow.rng;
++ icount->dcd = cnow.dcd;
++ icount->rx = cnow.rx;
++ icount->tx = cnow.tx;
++ icount->frame = cnow.frame;
++ icount->overrun = cnow.overrun;
++ icount->parity = cnow.parity;
++ icount->brk = cnow.brk;
++ icount->buf_overrun = cnow.buf_overrun;
++
++ return 0;
++}
++
++
++static int hso_serial_tiocmget(struct tty_struct *tty)
++{
++ int retval;
++ struct hso_serial *serial = tty->driver_data;
++ struct hso_tiocmget *tiocmget;
++ u16 UART_state_bitmap;
++
++ /* sanity check */
++ if (!serial) {
++ D1("no tty structures");
++ return -EINVAL;
++ }
++ spin_lock_irq(&serial->serial_lock);
++ retval = ((serial->rts_state) ? TIOCM_RTS : 0) |
++ ((serial->dtr_state) ? TIOCM_DTR : 0);
++ tiocmget = serial->tiocmget;
++ if (tiocmget) {
++
++ UART_state_bitmap = le16_to_cpu(
++ tiocmget->prev_UART_state_bitmap);
++ if (UART_state_bitmap & B_RING_SIGNAL)
++ retval |= TIOCM_RNG;
++ if (UART_state_bitmap & B_RX_CARRIER)
++ retval |= TIOCM_CD;
++ if (UART_state_bitmap & B_TX_CARRIER)
++ retval |= TIOCM_DSR;
++ }
++ spin_unlock_irq(&serial->serial_lock);
++ return retval;
++}
++
++static int hso_serial_tiocmset(struct tty_struct *tty,
++ unsigned int set, unsigned int clear)
++{
++ int val = 0;
++ unsigned long flags;
++ int if_num;
++ struct hso_serial *serial = tty->driver_data;
++ struct usb_interface *interface;
++
++ /* sanity check */
++ if (!serial) {
++ D1("no tty structures");
++ return -EINVAL;
++ }
++
++ if ((serial->parent->port_spec & HSO_PORT_MASK) != HSO_PORT_MODEM)
++ return -EINVAL;
++
++ interface = serial->parent->interface;
++ if_num = interface->cur_altsetting->desc.bInterfaceNumber;
++
++ spin_lock_irqsave(&serial->serial_lock, flags);
++ if (set & TIOCM_RTS)
++ serial->rts_state = 1;
++ if (set & TIOCM_DTR)
++ serial->dtr_state = 1;
++
++ if (clear & TIOCM_RTS)
++ serial->rts_state = 0;
++ if (clear & TIOCM_DTR)
++ serial->dtr_state = 0;
++
++ if (serial->dtr_state)
++ val |= 0x01;
++ if (serial->rts_state)
++ val |= 0x02;
++
++ spin_unlock_irqrestore(&serial->serial_lock, flags);
++
++ return usb_control_msg(serial->parent->usb,
++ usb_rcvctrlpipe(serial->parent->usb, 0), 0x22,
++ 0x21, val, if_num, NULL, 0,
++ USB_CTRL_SET_TIMEOUT);
++}
++
++static int hso_serial_ioctl(struct tty_struct *tty,
++ unsigned int cmd, unsigned long arg)
++{
++ struct hso_serial *serial = tty->driver_data;
++ int ret = 0;
++ D4("IOCTL cmd: %d, arg: %ld", cmd, arg);
++
++ if (!serial)
++ return -ENODEV;
++ switch (cmd) {
++ case TIOCMIWAIT:
++ ret = hso_wait_modem_status(serial, arg);
++ break;
++ default:
++ ret = -ENOIOCTLCMD;
++ break;
++ }
++ return ret;
++}
++
++
++/* starts a transmit */
++static void hso_kick_transmit(struct hso_serial *serial)
++{
++ u8 *temp;
++ unsigned long flags;
++ int res;
++
++ spin_lock_irqsave(&serial->serial_lock, flags);
++ if (!serial->tx_buffer_count)
++ goto out;
++
++ if (serial->tx_urb_used)
++ goto out;
++
++ /* Wakeup USB interface if necessary */
++ if (hso_get_activity(serial->parent) == -EAGAIN)
++ goto out;
++
++ /* Switch pointers around to avoid memcpy */
++ temp = serial->tx_buffer;
++ serial->tx_buffer = serial->tx_data;
++ serial->tx_data = temp;
++ serial->tx_data_count = serial->tx_buffer_count;
++ serial->tx_buffer_count = 0;
++
++ /* If temp is set, it means we switched buffers */
++ if (temp && serial->write_data) {
++ res = serial->write_data(serial);
++ if (res >= 0)
++ serial->tx_urb_used = 1;
++ }
++out:
++ spin_unlock_irqrestore(&serial->serial_lock, flags);
++}
++
++/* make a request (for reading and writing data to muxed serial port) */
++static int mux_device_request(struct hso_serial *serial, u8 type, u16 port,
++ struct urb *ctrl_urb,
++ struct usb_ctrlrequest *ctrl_req,
++ u8 *ctrl_urb_data, u32 size)
++{
++ int result;
++ int pipe;
++
++ /* Sanity check */
++ if (!serial || !ctrl_urb || !ctrl_req) {
++ printk(KERN_ERR "%s: Wrong arguments\n", __func__);
++ return -EINVAL;
++ }
++
++ /* initialize */
++ ctrl_req->wValue = 0;
++ ctrl_req->wIndex = cpu_to_le16(hso_port_to_mux(port));
++ ctrl_req->wLength = cpu_to_le16(size);
++
++ if (type == USB_CDC_GET_ENCAPSULATED_RESPONSE) {
++ /* Reading command */
++ ctrl_req->bRequestType = USB_DIR_IN |
++ USB_TYPE_OPTION_VENDOR |
++ USB_RECIP_INTERFACE;
++ ctrl_req->bRequest = USB_CDC_GET_ENCAPSULATED_RESPONSE;
++ pipe = usb_rcvctrlpipe(serial->parent->usb, 0);
++ } else {
++ /* Writing command */
++ ctrl_req->bRequestType = USB_DIR_OUT |
++ USB_TYPE_OPTION_VENDOR |
++ USB_RECIP_INTERFACE;
++ ctrl_req->bRequest = USB_CDC_SEND_ENCAPSULATED_COMMAND;
++ pipe = usb_sndctrlpipe(serial->parent->usb, 0);
++ }
++ /* syslog */
++ D2("%s command (%02x) len: %d, port: %d",
++ type == USB_CDC_GET_ENCAPSULATED_RESPONSE ? "Read" : "Write",
++ ctrl_req->bRequestType, ctrl_req->wLength, port);
++
++ /* Load ctrl urb */
++ ctrl_urb->transfer_flags = 0;
++ usb_fill_control_urb(ctrl_urb,
++ serial->parent->usb,
++ pipe,
++ (u8 *) ctrl_req,
++ ctrl_urb_data, size, ctrl_callback, serial);
++ /* Send it on merry way */
++ result = usb_submit_urb(ctrl_urb, GFP_ATOMIC);
++ if (result) {
++ dev_err(&ctrl_urb->dev->dev,
++ "%s failed submit ctrl_urb %d type %d\n", __func__,
++ result, type);
++ return result;
++ }
++
++ /* done */
++ return size;
++}
++
++/* called by intr_callback when read occurs */
++static int hso_mux_serial_read(struct hso_serial *serial)
++{
++ if (!serial)
++ return -EINVAL;
++
++ /* clean data */
++ memset(serial->rx_data[0], 0, CTRL_URB_RX_SIZE);
++ /* make the request */
++
++ if (serial->num_rx_urbs != 1) {
++ dev_err(&serial->parent->interface->dev,
++ "ERROR: mux'd reads with multiple buffers "
++ "not possible\n");
++ return 0;
++ }
++ return mux_device_request(serial,
++ USB_CDC_GET_ENCAPSULATED_RESPONSE,
++ serial->parent->port_spec & HSO_PORT_MASK,
++ serial->rx_urb[0],
++ &serial->ctrl_req_rx,
++ serial->rx_data[0], serial->rx_data_length);
++}
++
++/* used for muxed serial port callback (muxed serial read) */
++static void intr_callback(struct urb *urb)
++{
++ struct hso_shared_int *shared_int = urb->context;
++ struct hso_serial *serial;
++ unsigned char *port_req;
++ int status = urb->status;
++ int i;
++
++ usb_mark_last_busy(urb->dev);
++
++ /* sanity check */
++ if (!shared_int)
++ return;
++
++ /* status check */
++ if (status) {
++ handle_usb_error(status, __func__, NULL);
++ return;
++ }
++ D4("\n--- Got intr callback 0x%02X ---", status);
++
++ /* what request? */
++ port_req = urb->transfer_buffer;
++ D4(" port_req = 0x%.2X\n", *port_req);
++ /* loop over all muxed ports to find the one sending this */
++ for (i = 0; i < 8; i++) {
++ /* max 8 channels on MUX */
++ if (*port_req & (1 << i)) {
++ serial = get_serial_by_shared_int_and_type(shared_int,
++ (1 << i));
++ if (serial != NULL) {
++ D1("Pending read interrupt on port %d\n", i);
++ spin_lock(&serial->serial_lock);
++ if (serial->rx_state == RX_IDLE &&
++ atomic_read(&serial->port.count) > 0) {
++ /* Setup and send a ctrl req read on
++ * port i */
++ if (!serial->rx_urb_filled[0]) {
++ serial->rx_state = RX_SENT;
++ hso_mux_serial_read(serial);
++ } else
++ serial->rx_state = RX_PENDING;
++ } else {
++ D1("Already a read pending on "
++ "port %d or port not open\n", i);
++ }
++ spin_unlock(&serial->serial_lock);
++ }
++ }
++ }
++ /* Resubmit interrupt urb */
++ hso_mux_submit_intr_urb(shared_int, urb->dev, GFP_ATOMIC);
++}
++
++/* called for writing to muxed serial port */
++static int hso_mux_serial_write_data(struct hso_serial *serial)
++{
++ if (NULL == serial)
++ return -EINVAL;
++
++ return mux_device_request(serial,
++ USB_CDC_SEND_ENCAPSULATED_COMMAND,
++ serial->parent->port_spec & HSO_PORT_MASK,
++ serial->tx_urb,
++ &serial->ctrl_req_tx,
++ serial->tx_data, serial->tx_data_count);
++}
++
++/* write callback for Diag and CS port */
++static void hso_std_serial_write_bulk_callback(struct urb *urb)
++{
++ struct hso_serial *serial = urb->context;
++ int status = urb->status;
++
++ /* sanity check */
++ if (!serial) {
++ D1("serial == NULL");
++ return;
++ }
++
++ spin_lock(&serial->serial_lock);
++ serial->tx_urb_used = 0;
++ spin_unlock(&serial->serial_lock);
++ if (status) {
++ handle_usb_error(status, __func__, serial->parent);
++ return;
++ }
++ hso_put_activity(serial->parent);
++ tty_port_tty_wakeup(&serial->port);
++ hso_kick_transmit(serial);
++
++ D1(" ");
++}
++
++/* called for writing diag or CS serial port */
++static int hso_std_serial_write_data(struct hso_serial *serial)
++{
++ int count = serial->tx_data_count;
++ int result;
++
++ usb_fill_bulk_urb(serial->tx_urb,
++ serial->parent->usb,
++ usb_sndbulkpipe(serial->parent->usb,
++ serial->out_endp->
++ bEndpointAddress & 0x7F),
++ serial->tx_data, serial->tx_data_count,
++ hso_std_serial_write_bulk_callback, serial);
++
++ result = usb_submit_urb(serial->tx_urb, GFP_ATOMIC);
++ if (result) {
++ dev_warn(&serial->parent->usb->dev,
++ "Failed to submit urb - res %d\n", result);
++ return result;
++ }
++
++ return count;
++}
++
++/* callback after read or write on muxed serial port */
++static void ctrl_callback(struct urb *urb)
++{
++ struct hso_serial *serial = urb->context;
++ struct usb_ctrlrequest *req;
++ int status = urb->status;
++
++ /* sanity check */
++ if (!serial)
++ return;
++
++ spin_lock(&serial->serial_lock);
++ serial->tx_urb_used = 0;
++ spin_unlock(&serial->serial_lock);
++ if (status) {
++ handle_usb_error(status, __func__, serial->parent);
++ return;
++ }
++
++ /* what request? */
++ req = (struct usb_ctrlrequest *)(urb->setup_packet);
++ D4("\n--- Got muxed ctrl callback 0x%02X ---", status);
++ D4("Actual length of urb = %d\n", urb->actual_length);
++ DUMP1(urb->transfer_buffer, urb->actual_length);
++
++ if (req->bRequestType ==
++ (USB_DIR_IN | USB_TYPE_OPTION_VENDOR | USB_RECIP_INTERFACE)) {
++ /* response to a read command */
++ serial->rx_urb_filled[0] = 1;
++ spin_lock(&serial->serial_lock);
++ put_rxbuf_data_and_resubmit_ctrl_urb(serial);
++ spin_unlock(&serial->serial_lock);
++ } else {
++ hso_put_activity(serial->parent);
++ tty_port_tty_wakeup(&serial->port);
++ /* response to a write command */
++ hso_kick_transmit(serial);
++ }
++}
++
++/* handle RX data for serial port */
++static int put_rxbuf_data(struct urb *urb, struct hso_serial *serial)
++{
++ struct tty_struct *tty;
++ int count;
++
++ /* Sanity check */
++ if (urb == NULL || serial == NULL) {
++ D1("serial = NULL");
++ return -2;
++ }
++
++ tty = tty_port_tty_get(&serial->port);
++
++ if (tty && test_bit(TTY_THROTTLED, &tty->flags)) {
++ tty_kref_put(tty);
++ return -1;
++ }
++
++ /* Push data to tty */
++ D1("data to push to tty");
++ count = tty_buffer_request_room(&serial->port, urb->actual_length);
++ if (count >= urb->actual_length) {
++ tty_insert_flip_string(&serial->port, urb->transfer_buffer,
++ urb->actual_length);
++ tty_flip_buffer_push(&serial->port);
++ } else {
++ dev_warn(&serial->parent->usb->dev,
++ "dropping data, %d bytes lost\n", urb->actual_length);
++ }
++
++ tty_kref_put(tty);
++
++ serial->rx_urb_filled[hso_urb_to_index(serial, urb)] = 0;
++
++ return 0;
++}
++
++
++/* Base driver functions */
++
++static void hso_log_port(struct hso_device *hso_dev)
++{
++ char *port_type;
++ char port_dev[20];
++
++ switch (hso_dev->port_spec & HSO_PORT_MASK) {
++ case HSO_PORT_CONTROL:
++ port_type = "Control";
++ break;
++ case HSO_PORT_APP:
++ port_type = "Application";
++ break;
++ case HSO_PORT_GPS:
++ port_type = "GPS";
++ break;
++ case HSO_PORT_GPS_CONTROL:
++ port_type = "GPS control";
++ break;
++ case HSO_PORT_APP2:
++ port_type = "Application2";
++ break;
++ case HSO_PORT_PCSC:
++ port_type = "PCSC";
++ break;
++ case HSO_PORT_DIAG:
++ port_type = "Diagnostic";
++ break;
++ case HSO_PORT_DIAG2:
++ port_type = "Diagnostic2";
++ break;
++ case HSO_PORT_MODEM:
++ port_type = "Modem";
++ break;
++ case HSO_PORT_NETWORK:
++ port_type = "Network";
++ break;
++ default:
++ port_type = "Unknown";
++ break;
++ }
++ if ((hso_dev->port_spec & HSO_PORT_MASK) == HSO_PORT_NETWORK) {
++ sprintf(port_dev, "%s", dev2net(hso_dev)->net->name);
++ } else
++ sprintf(port_dev, "/dev/%s%d", tty_filename,
++ dev2ser(hso_dev)->minor);
++
++ dev_dbg(&hso_dev->interface->dev, "HSO: Found %s port %s\n",
++ port_type, port_dev);
++}
++
++static int hso_start_net_device(struct hso_device *hso_dev)
++{
++ int i, result = 0;
++ struct hso_net *hso_net = dev2net(hso_dev);
++
++ if (!hso_net)
++ return -ENODEV;
++
++ /* send URBs for all read buffers */
++ for (i = 0; i < MUX_BULK_RX_BUF_COUNT; i++) {
++
++ /* Prep a receive URB */
++ usb_fill_bulk_urb(hso_net->mux_bulk_rx_urb_pool[i],
++ hso_dev->usb,
++ usb_rcvbulkpipe(hso_dev->usb,
++ hso_net->in_endp->
++ bEndpointAddress & 0x7F),
++ hso_net->mux_bulk_rx_buf_pool[i],
++ MUX_BULK_RX_BUF_SIZE, read_bulk_callback,
++ hso_net);
++
++ /* Put it out there so the device can send us stuff */
++ result = usb_submit_urb(hso_net->mux_bulk_rx_urb_pool[i],
++ GFP_NOIO);
++ if (result)
++ dev_warn(&hso_dev->usb->dev,
++ "%s failed mux_bulk_rx_urb[%d] %d\n", __func__,
++ i, result);
++ }
++
++ return result;
++}
++
++static int hso_stop_net_device(struct hso_device *hso_dev)
++{
++ int i;
++ struct hso_net *hso_net = dev2net(hso_dev);
++
++ if (!hso_net)
++ return -ENODEV;
++
++ for (i = 0; i < MUX_BULK_RX_BUF_COUNT; i++) {
++ if (hso_net->mux_bulk_rx_urb_pool[i])
++ usb_kill_urb(hso_net->mux_bulk_rx_urb_pool[i]);
++
++ }
++ if (hso_net->mux_bulk_tx_urb)
++ usb_kill_urb(hso_net->mux_bulk_tx_urb);
++
++ return 0;
++}
++
++static int hso_start_serial_device(struct hso_device *hso_dev, gfp_t flags)
++{
++ int i, result = 0;
++ struct hso_serial *serial = dev2ser(hso_dev);
++
++ if (!serial)
++ return -ENODEV;
++
++ /* If it is not the MUX port fill in and submit a bulk urb (already
++ * allocated in hso_serial_start) */
++ if (!(serial->parent->port_spec & HSO_INTF_MUX)) {
++ for (i = 0; i < serial->num_rx_urbs; i++) {
++ usb_fill_bulk_urb(serial->rx_urb[i],
++ serial->parent->usb,
++ usb_rcvbulkpipe(serial->parent->usb,
++ serial->in_endp->
++ bEndpointAddress &
++ 0x7F),
++ serial->rx_data[i],
++ serial->rx_data_length,
++ hso_std_serial_read_bulk_callback,
++ serial);
++ result = usb_submit_urb(serial->rx_urb[i], flags);
++ if (result) {
++ dev_warn(&serial->parent->usb->dev,
++ "Failed to submit urb - res %d\n",
++ result);
++ break;
++ }
++ }
++ } else {
++ mutex_lock(&serial->shared_int->shared_int_lock);
++ if (!serial->shared_int->use_count) {
++ result =
++ hso_mux_submit_intr_urb(serial->shared_int,
++ hso_dev->usb, flags);
++ }
++ serial->shared_int->use_count++;
++ mutex_unlock(&serial->shared_int->shared_int_lock);
++ }
++ if (serial->tiocmget)
++ tiocmget_submit_urb(serial,
++ serial->tiocmget,
++ serial->parent->usb);
++ return result;
++}
++
++static int hso_stop_serial_device(struct hso_device *hso_dev)
++{
++ int i;
++ struct hso_serial *serial = dev2ser(hso_dev);
++ struct hso_tiocmget *tiocmget;
++
++ if (!serial)
++ return -ENODEV;
++
++ for (i = 0; i < serial->num_rx_urbs; i++) {
++ if (serial->rx_urb[i]) {
++ usb_kill_urb(serial->rx_urb[i]);
++ serial->rx_urb_filled[i] = 0;
++ }
++ }
++ serial->curr_rx_urb_idx = 0;
++
++ if (serial->tx_urb)
++ usb_kill_urb(serial->tx_urb);
++
++ if (serial->shared_int) {
++ mutex_lock(&serial->shared_int->shared_int_lock);
++ if (serial->shared_int->use_count &&
++ (--serial->shared_int->use_count == 0)) {
++ struct urb *urb;
++
++ urb = serial->shared_int->shared_intr_urb;
++ if (urb)
++ usb_kill_urb(urb);
++ }
++ mutex_unlock(&serial->shared_int->shared_int_lock);
++ }
++ tiocmget = serial->tiocmget;
++ if (tiocmget) {
++ wake_up_interruptible(&tiocmget->waitq);
++ usb_kill_urb(tiocmget->urb);
++ }
++
++ return 0;
++}
++
++static void hso_serial_tty_unregister(struct hso_serial *serial)
++{
++ tty_unregister_device(tty_drv, serial->minor);
++}
++
++static void hso_serial_common_free(struct hso_serial *serial)
++{
++ int i;
++
++ for (i = 0; i < serial->num_rx_urbs; i++) {
++ /* unlink and free RX URB */
++ usb_free_urb(serial->rx_urb[i]);
++ /* free the RX buffer */
++ kfree(serial->rx_data[i]);
++ }
++
++ /* unlink and free TX URB */
++ usb_free_urb(serial->tx_urb);
++ kfree(serial->tx_buffer);
++ kfree(serial->tx_data);
++ tty_port_destroy(&serial->port);
++}
++
++static int hso_serial_common_create(struct hso_serial *serial, int num_urbs,
++ int rx_size, int tx_size)
++{
++ struct device *dev;
++ int minor;
++ int i;
++
++ tty_port_init(&serial->port);
++
++ minor = get_free_serial_index();
++ if (minor < 0)
++ goto exit;
++
++ /* register our minor number */
++ serial->parent->dev = tty_port_register_device_attr(&serial->port,
++ tty_drv, minor, &serial->parent->interface->dev,
++ serial->parent, hso_serial_dev_groups);
++ dev = serial->parent->dev;
++
++ /* fill in specific data for later use */
++ serial->minor = minor;
++ serial->magic = HSO_SERIAL_MAGIC;
++ spin_lock_init(&serial->serial_lock);
++ serial->num_rx_urbs = num_urbs;
++
++ /* RX, allocate urb and initialize */
++
++ /* prepare our RX buffer */
++ serial->rx_data_length = rx_size;
++ for (i = 0; i < serial->num_rx_urbs; i++) {
++ serial->rx_urb[i] = usb_alloc_urb(0, GFP_KERNEL);
++ if (!serial->rx_urb[i]) {
++ dev_err(dev, "Could not allocate urb?\n");
++ goto exit;
++ }
++ serial->rx_urb[i]->transfer_buffer = NULL;
++ serial->rx_urb[i]->transfer_buffer_length = 0;
++ serial->rx_data[i] = kzalloc(serial->rx_data_length,
++ GFP_KERNEL);
++ if (!serial->rx_data[i])
++ goto exit;
++ }
++
++ /* TX, allocate urb and initialize */
++ serial->tx_urb = usb_alloc_urb(0, GFP_KERNEL);
++ if (!serial->tx_urb) {
++ dev_err(dev, "Could not allocate urb?\n");
++ goto exit;
++ }
++ serial->tx_urb->transfer_buffer = NULL;
++ serial->tx_urb->transfer_buffer_length = 0;
++ /* prepare our TX buffer */
++ serial->tx_data_count = 0;
++ serial->tx_buffer_count = 0;
++ serial->tx_data_length = tx_size;
++ serial->tx_data = kzalloc(serial->tx_data_length, GFP_KERNEL);
++ if (!serial->tx_data)
++ goto exit;
++
++ serial->tx_buffer = kzalloc(serial->tx_data_length, GFP_KERNEL);
++ if (!serial->tx_buffer)
++ goto exit;
++
++ return 0;
++exit:
++ hso_serial_tty_unregister(serial);
++ hso_serial_common_free(serial);
++ return -1;
++}
++
++/* Creates a general hso device */
++static struct hso_device *hso_create_device(struct usb_interface *intf,
++ int port_spec)
++{
++ struct hso_device *hso_dev;
++
++ hso_dev = kzalloc(sizeof(*hso_dev), GFP_ATOMIC);
++ if (!hso_dev)
++ return NULL;
++
++ hso_dev->port_spec = port_spec;
++ hso_dev->usb = interface_to_usbdev(intf);
++ hso_dev->interface = intf;
++ kref_init(&hso_dev->ref);
++ mutex_init(&hso_dev->mutex);
++
++ INIT_WORK(&hso_dev->async_get_intf, async_get_intf);
++ INIT_WORK(&hso_dev->async_put_intf, async_put_intf);
++
++ return hso_dev;
++}
++
++/* Removes a network device in the network device table */
++static int remove_net_device(struct hso_device *hso_dev)
++{
++ int i;
++
++ for (i = 0; i < HSO_MAX_NET_DEVICES; i++) {
++ if (network_table[i] == hso_dev) {
++ network_table[i] = NULL;
++ break;
++ }
++ }
++ if (i == HSO_MAX_NET_DEVICES)
++ return -1;
++ return 0;
++}
++
++/* Frees our network device */
++static void hso_free_net_device(struct hso_device *hso_dev)
++{
++ int i;
++ struct hso_net *hso_net = dev2net(hso_dev);
++
++ if (!hso_net)
++ return;
++
++ remove_net_device(hso_net->parent);
++
++ if (hso_net->net)
++ unregister_netdev(hso_net->net);
++
++ /* start freeing */
++ for (i = 0; i < MUX_BULK_RX_BUF_COUNT; i++) {
++ usb_free_urb(hso_net->mux_bulk_rx_urb_pool[i]);
++ kfree(hso_net->mux_bulk_rx_buf_pool[i]);
++ hso_net->mux_bulk_rx_buf_pool[i] = NULL;
++ }
++ usb_free_urb(hso_net->mux_bulk_tx_urb);
++ kfree(hso_net->mux_bulk_tx_buf);
++ hso_net->mux_bulk_tx_buf = NULL;
++
++ if (hso_net->net)
++ free_netdev(hso_net->net);
++
++ kfree(hso_dev);
++}
++
++static const struct net_device_ops hso_netdev_ops = {
++ .ndo_open = hso_net_open,
++ .ndo_stop = hso_net_close,
++ .ndo_start_xmit = hso_net_start_xmit,
++ .ndo_tx_timeout = hso_net_tx_timeout,
++};
++
++/* initialize the network interface */
++static void hso_net_init(struct net_device *net)
++{
++ struct hso_net *hso_net = netdev_priv(net);
++
++ D1("sizeof hso_net is %d", (int)sizeof(*hso_net));
++
++ /* fill in the other fields */
++ net->netdev_ops = &hso_netdev_ops;
++ net->watchdog_timeo = HSO_NET_TX_TIMEOUT;
++ net->flags = IFF_POINTOPOINT | IFF_NOARP | IFF_MULTICAST;
++ net->type = ARPHRD_NONE;
++ net->mtu = DEFAULT_MTU - 14;
++ net->tx_queue_len = 10;
++ net->ethtool_ops = &ops;
++
++ /* and initialize the semaphore */
++ spin_lock_init(&hso_net->net_lock);
++}
++
++/* Adds a network device in the network device table */
++static int add_net_device(struct hso_device *hso_dev)
++{
++ int i;
++
++ for (i = 0; i < HSO_MAX_NET_DEVICES; i++) {
++ if (network_table[i] == NULL) {
++ network_table[i] = hso_dev;
++ break;
++ }
++ }
++ if (i == HSO_MAX_NET_DEVICES)
++ return -1;
++ return 0;
++}
++
++static int hso_rfkill_set_block(void *data, bool blocked)
++{
++ struct hso_device *hso_dev = data;
++ int enabled = !blocked;
++ int rv;
++
++ mutex_lock(&hso_dev->mutex);
++ if (hso_dev->usb_gone)
++ rv = 0;
++ else
++ rv = usb_control_msg(hso_dev->usb, usb_rcvctrlpipe(hso_dev->usb, 0),
++ enabled ? 0x82 : 0x81, 0x40, 0, 0, NULL, 0,
++ USB_CTRL_SET_TIMEOUT);
++ mutex_unlock(&hso_dev->mutex);
++ return rv;
++}
++
++static const struct rfkill_ops hso_rfkill_ops = {
++ .set_block = hso_rfkill_set_block,
++};
++
++/* Creates and sets up everything for rfkill */
++static void hso_create_rfkill(struct hso_device *hso_dev,
++ struct usb_interface *interface)
++{
++ struct hso_net *hso_net = dev2net(hso_dev);
++ struct device *dev = &hso_net->net->dev;
++ static u32 rfkill_counter;
++
++ snprintf(hso_net->name, sizeof(hso_net->name), "hso-%d",
++ rfkill_counter++);
++
++ hso_net->rfkill = rfkill_alloc(hso_net->name,
++ &interface_to_usbdev(interface)->dev,
++ RFKILL_TYPE_WWAN,
++ &hso_rfkill_ops, hso_dev);
++ if (!hso_net->rfkill) {
++ dev_err(dev, "%s - Out of memory\n", __func__);
++ return;
++ }
++ if (rfkill_register(hso_net->rfkill) < 0) {
++ rfkill_destroy(hso_net->rfkill);
++ hso_net->rfkill = NULL;
++ dev_err(dev, "%s - Failed to register rfkill\n", __func__);
++ return;
++ }
++}
++
++static struct device_type hso_type = {
++ .name = "wwan",
++};
++
++/* Creates our network device */
++static struct hso_device *hso_create_net_device(struct usb_interface *interface,
++ int port_spec)
++{
++ int result, i;
++ struct net_device *net;
++ struct hso_net *hso_net;
++ struct hso_device *hso_dev;
++
++ hso_dev = hso_create_device(interface, port_spec);
++ if (!hso_dev)
++ return NULL;
++
++ /* allocate our network device, then we can put in our private data */
++ /* call hso_net_init to do the basic initialization */
++ net = alloc_netdev(sizeof(struct hso_net), "hso%d", NET_NAME_UNKNOWN,
++ hso_net_init);
++ if (!net) {
++ dev_err(&interface->dev, "Unable to create ethernet device\n");
++ goto exit;
++ }
++
++ hso_net = netdev_priv(net);
++
++ hso_dev->port_data.dev_net = hso_net;
++ hso_net->net = net;
++ hso_net->parent = hso_dev;
++
++ hso_net->in_endp = hso_get_ep(interface, USB_ENDPOINT_XFER_BULK,
++ USB_DIR_IN);
++ if (!hso_net->in_endp) {
++ dev_err(&interface->dev, "Can't find BULK IN endpoint\n");
++ goto exit;
++ }
++ hso_net->out_endp = hso_get_ep(interface, USB_ENDPOINT_XFER_BULK,
++ USB_DIR_OUT);
++ if (!hso_net->out_endp) {
++ dev_err(&interface->dev, "Can't find BULK OUT endpoint\n");
++ goto exit;
++ }
++ SET_NETDEV_DEV(net, &interface->dev);
++ SET_NETDEV_DEVTYPE(net, &hso_type);
++
++ /* registering our net device */
++ result = register_netdev(net);
++ if (result) {
++ dev_err(&interface->dev, "Failed to register device\n");
++ goto exit;
++ }
++
++ /* start allocating */
++ for (i = 0; i < MUX_BULK_RX_BUF_COUNT; i++) {
++ hso_net->mux_bulk_rx_urb_pool[i] = usb_alloc_urb(0, GFP_KERNEL);
++ if (!hso_net->mux_bulk_rx_urb_pool[i]) {
++ dev_err(&interface->dev, "Could not allocate rx urb\n");
++ goto exit;
++ }
++ hso_net->mux_bulk_rx_buf_pool[i] = kzalloc(MUX_BULK_RX_BUF_SIZE,
++ GFP_KERNEL);
++ if (!hso_net->mux_bulk_rx_buf_pool[i])
++ goto exit;
++ }
++ hso_net->mux_bulk_tx_urb = usb_alloc_urb(0, GFP_KERNEL);
++ if (!hso_net->mux_bulk_tx_urb) {
++ dev_err(&interface->dev, "Could not allocate tx urb\n");
++ goto exit;
++ }
++ hso_net->mux_bulk_tx_buf = kzalloc(MUX_BULK_TX_BUF_SIZE, GFP_KERNEL);
++ if (!hso_net->mux_bulk_tx_buf)
++ goto exit;
++
++ add_net_device(hso_dev);
++
++ hso_log_port(hso_dev);
++
++ hso_create_rfkill(hso_dev, interface);
++
++ return hso_dev;
++exit:
++ hso_free_net_device(hso_dev);
++ return NULL;
++}
++
++static void hso_free_tiomget(struct hso_serial *serial)
++{
++ struct hso_tiocmget *tiocmget;
++ if (!serial)
++ return;
++ tiocmget = serial->tiocmget;
++ if (tiocmget) {
++ usb_free_urb(tiocmget->urb);
++ tiocmget->urb = NULL;
++ serial->tiocmget = NULL;
++ kfree(tiocmget);
++ }
++}
++
++/* Frees an AT channel ( goes for both mux and non-mux ) */
++static void hso_free_serial_device(struct hso_device *hso_dev)
++{
++ struct hso_serial *serial = dev2ser(hso_dev);
++
++ if (!serial)
++ return;
++
++ hso_serial_common_free(serial);
++
++ if (serial->shared_int) {
++ mutex_lock(&serial->shared_int->shared_int_lock);
++ if (--serial->shared_int->ref_count == 0)
++ hso_free_shared_int(serial->shared_int);
++ else
++ mutex_unlock(&serial->shared_int->shared_int_lock);
++ }
++ hso_free_tiomget(serial);
++ kfree(serial);
++ kfree(hso_dev);
++}
++
++/* Creates a bulk AT channel */
++static struct hso_device *hso_create_bulk_serial_device(
++ struct usb_interface *interface, int port)
++{
++ struct hso_device *hso_dev;
++ struct hso_serial *serial;
++ int num_urbs;
++ struct hso_tiocmget *tiocmget;
++
++ hso_dev = hso_create_device(interface, port);
++ if (!hso_dev)
++ return NULL;
++
++ serial = kzalloc(sizeof(*serial), GFP_KERNEL);
++ if (!serial)
++ goto exit;
++
++ serial->parent = hso_dev;
++ hso_dev->port_data.dev_serial = serial;
++
++ if ((port & HSO_PORT_MASK) == HSO_PORT_MODEM) {
++ num_urbs = 2;
++ serial->tiocmget = kzalloc(sizeof(struct hso_tiocmget),
++ GFP_KERNEL);
++ /* it isn't going to break our heart if serial->tiocmget
++ * allocation fails don't bother checking this.
++ */
++ if (serial->tiocmget) {
++ tiocmget = serial->tiocmget;
++ tiocmget->urb = usb_alloc_urb(0, GFP_KERNEL);
++ if (tiocmget->urb) {
++ mutex_init(&tiocmget->mutex);
++ init_waitqueue_head(&tiocmget->waitq);
++ tiocmget->endp = hso_get_ep(
++ interface,
++ USB_ENDPOINT_XFER_INT,
++ USB_DIR_IN);
++ } else
++ hso_free_tiomget(serial);
++ }
++ }
++ else
++ num_urbs = 1;
++
++ if (hso_serial_common_create(serial, num_urbs, BULK_URB_RX_SIZE,
++ BULK_URB_TX_SIZE))
++ goto exit;
++
++ serial->in_endp = hso_get_ep(interface, USB_ENDPOINT_XFER_BULK,
++ USB_DIR_IN);
++ if (!serial->in_endp) {
++ dev_err(&interface->dev, "Failed to find BULK IN ep\n");
++ goto exit2;
++ }
++
++ if (!
++ (serial->out_endp =
++ hso_get_ep(interface, USB_ENDPOINT_XFER_BULK, USB_DIR_OUT))) {
++ dev_err(&interface->dev, "Failed to find BULK IN ep\n");
++ goto exit2;
++ }
++
++ serial->write_data = hso_std_serial_write_data;
++
++ /* and record this serial */
++ set_serial_by_index(serial->minor, serial);
++
++ /* setup the proc dirs and files if needed */
++ hso_log_port(hso_dev);
++
++ /* done, return it */
++ return hso_dev;
++
++exit2:
++ hso_serial_tty_unregister(serial);
++ hso_serial_common_free(serial);
++exit:
++ hso_free_tiomget(serial);
++ kfree(serial);
++ kfree(hso_dev);
++ return NULL;
++}
++
++/* Creates a multiplexed AT channel */
++static
++struct hso_device *hso_create_mux_serial_device(struct usb_interface *interface,
++ int port,
++ struct hso_shared_int *mux)
++{
++ struct hso_device *hso_dev;
++ struct hso_serial *serial;
++ int port_spec;
++
++ port_spec = HSO_INTF_MUX;
++ port_spec &= ~HSO_PORT_MASK;
++
++ port_spec |= hso_mux_to_port(port);
++ if ((port_spec & HSO_PORT_MASK) == HSO_PORT_NO_PORT)
++ return NULL;
++
++ hso_dev = hso_create_device(interface, port_spec);
++ if (!hso_dev)
++ return NULL;
++
++ serial = kzalloc(sizeof(*serial), GFP_KERNEL);
++ if (!serial)
++ goto exit;
++
++ hso_dev->port_data.dev_serial = serial;
++ serial->parent = hso_dev;
++
++ if (hso_serial_common_create
++ (serial, 1, CTRL_URB_RX_SIZE, CTRL_URB_TX_SIZE))
++ goto exit;
++
++ serial->tx_data_length--;
++ serial->write_data = hso_mux_serial_write_data;
++
++ serial->shared_int = mux;
++ mutex_lock(&serial->shared_int->shared_int_lock);
++ serial->shared_int->ref_count++;
++ mutex_unlock(&serial->shared_int->shared_int_lock);
++
++ /* and record this serial */
++ set_serial_by_index(serial->minor, serial);
++
++ /* setup the proc dirs and files if needed */
++ hso_log_port(hso_dev);
++
++ /* done, return it */
++ return hso_dev;
++
++exit:
++ if (serial) {
++ tty_unregister_device(tty_drv, serial->minor);
++ kfree(serial);
++ }
++ kfree(hso_dev);
++ return NULL;
++
++}
++
++static void hso_free_shared_int(struct hso_shared_int *mux)
++{
++ usb_free_urb(mux->shared_intr_urb);
++ kfree(mux->shared_intr_buf);
++ mutex_unlock(&mux->shared_int_lock);
++ kfree(mux);
++}
++
++static
++struct hso_shared_int *hso_create_shared_int(struct usb_interface *interface)
++{
++ struct hso_shared_int *mux = kzalloc(sizeof(*mux), GFP_KERNEL);
++
++ if (!mux)
++ return NULL;
++
++ mux->intr_endp = hso_get_ep(interface, USB_ENDPOINT_XFER_INT,
++ USB_DIR_IN);
++ if (!mux->intr_endp) {
++ dev_err(&interface->dev, "Can't find INT IN endpoint\n");
++ goto exit;
++ }
++
++ mux->shared_intr_urb = usb_alloc_urb(0, GFP_KERNEL);
++ if (!mux->shared_intr_urb) {
++ dev_err(&interface->dev, "Could not allocate intr urb?\n");
++ goto exit;
++ }
++ mux->shared_intr_buf =
++ kzalloc(le16_to_cpu(mux->intr_endp->wMaxPacketSize),
++ GFP_KERNEL);
++ if (!mux->shared_intr_buf)
++ goto exit;
++
++ mutex_init(&mux->shared_int_lock);
++
++ return mux;
++
++exit:
++ kfree(mux->shared_intr_buf);
++ usb_free_urb(mux->shared_intr_urb);
++ kfree(mux);
++ return NULL;
++}
++
++/* Gets the port spec for a certain interface */
++static int hso_get_config_data(struct usb_interface *interface)
++{
++ struct usb_device *usbdev = interface_to_usbdev(interface);
++ u8 *config_data = kmalloc(17, GFP_KERNEL);
++ u32 if_num = interface->cur_altsetting->desc.bInterfaceNumber;
++ s32 result;
++
++ if (!config_data)
++ return -ENOMEM;
++ if (usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0),
++ 0x86, 0xC0, 0, 0, config_data, 17,
++ USB_CTRL_SET_TIMEOUT) != 0x11) {
++ kfree(config_data);
++ return -EIO;
++ }
++
++ switch (config_data[if_num]) {
++ case 0x0:
++ result = 0;
++ break;
++ case 0x1:
++ result = HSO_PORT_DIAG;
++ break;
++ case 0x2:
++ result = HSO_PORT_GPS;
++ break;
++ case 0x3:
++ result = HSO_PORT_GPS_CONTROL;
++ break;
++ case 0x4:
++ result = HSO_PORT_APP;
++ break;
++ case 0x5:
++ result = HSO_PORT_APP2;
++ break;
++ case 0x6:
++ result = HSO_PORT_CONTROL;
++ break;
++ case 0x7:
++ result = HSO_PORT_NETWORK;
++ break;
++ case 0x8:
++ result = HSO_PORT_MODEM;
++ break;
++ case 0x9:
++ result = HSO_PORT_MSD;
++ break;
++ case 0xa:
++ result = HSO_PORT_PCSC;
++ break;
++ case 0xb:
++ result = HSO_PORT_VOICE;
++ break;
++ default:
++ result = 0;
++ }
++
++ if (result)
++ result |= HSO_INTF_BULK;
++
++ if (config_data[16] & 0x1)
++ result |= HSO_INFO_CRC_BUG;
++
++ kfree(config_data);
++ return result;
++}
++
++/* called once for each interface upon device insertion */
++static int hso_probe(struct usb_interface *interface,
++ const struct usb_device_id *id)
++{
++ int mux, i, if_num, port_spec;
++ unsigned char port_mask;
++ struct hso_device *hso_dev = NULL;
++ struct hso_shared_int *shared_int;
++ struct hso_device *tmp_dev = NULL;
++
++ if (interface->cur_altsetting->desc.bInterfaceClass != 0xFF) {
++ dev_err(&interface->dev, "Not our interface\n");
++ return -ENODEV;
++ }
++
++ if_num = interface->cur_altsetting->desc.bInterfaceNumber;
++
++ /* Get the interface/port specification from either driver_info or from
++ * the device itself */
++ if (id->driver_info)
++ port_spec = ((u32 *)(id->driver_info))[if_num];
++ else
++ port_spec = hso_get_config_data(interface);
++
++ /* Check if we need to switch to alt interfaces prior to port
++ * configuration */
++ if (interface->num_altsetting > 1)
++ usb_set_interface(interface_to_usbdev(interface), if_num, 1);
++ interface->needs_remote_wakeup = 1;
++
++ /* Allocate new hso device(s) */
++ switch (port_spec & HSO_INTF_MASK) {
++ case HSO_INTF_MUX:
++ if ((port_spec & HSO_PORT_MASK) == HSO_PORT_NETWORK) {
++ /* Create the network device */
++ if (!disable_net) {
++ hso_dev = hso_create_net_device(interface,
++ port_spec);
++ if (!hso_dev)
++ goto exit;
++ tmp_dev = hso_dev;
++ }
++ }
++
++ if (hso_get_mux_ports(interface, &port_mask))
++ /* TODO: de-allocate everything */
++ goto exit;
++
++ shared_int = hso_create_shared_int(interface);
++ if (!shared_int)
++ goto exit;
++
++ for (i = 1, mux = 0; i < 0x100; i = i << 1, mux++) {
++ if (port_mask & i) {
++ hso_dev = hso_create_mux_serial_device(
++ interface, i, shared_int);
++ if (!hso_dev)
++ goto exit;
++ }
++ }
++
++ if (tmp_dev)
++ hso_dev = tmp_dev;
++ break;
++
++ case HSO_INTF_BULK:
++ /* It's a regular bulk interface */
++ if ((port_spec & HSO_PORT_MASK) == HSO_PORT_NETWORK) {
++ if (!disable_net)
++ hso_dev =
++ hso_create_net_device(interface, port_spec);
++ } else {
++ hso_dev =
++ hso_create_bulk_serial_device(interface, port_spec);
++ }
++ if (!hso_dev)
++ goto exit;
++ break;
++ default:
++ goto exit;
++ }
++
++ /* save our data pointer in this device */
++ usb_set_intfdata(interface, hso_dev);
++
++ /* done */
++ return 0;
++exit:
++ hso_free_interface(interface);
++ return -ENODEV;
++}
++
++/* device removed, cleaning up */
++static void hso_disconnect(struct usb_interface *interface)
++{
++ hso_free_interface(interface);
++
++ /* remove reference of our private data */
++ usb_set_intfdata(interface, NULL);
++}
++
++static void async_get_intf(struct work_struct *data)
++{
++ struct hso_device *hso_dev =
++ container_of(data, struct hso_device, async_get_intf);
++ usb_autopm_get_interface(hso_dev->interface);
++}
++
++static void async_put_intf(struct work_struct *data)
++{
++ struct hso_device *hso_dev =
++ container_of(data, struct hso_device, async_put_intf);
++ usb_autopm_put_interface(hso_dev->interface);
++}
++
++static int hso_get_activity(struct hso_device *hso_dev)
++{
++ if (hso_dev->usb->state == USB_STATE_SUSPENDED) {
++ if (!hso_dev->is_active) {
++ hso_dev->is_active = 1;
++ schedule_work(&hso_dev->async_get_intf);
++ }
++ }
++
++ if (hso_dev->usb->state != USB_STATE_CONFIGURED)
++ return -EAGAIN;
++
++ usb_mark_last_busy(hso_dev->usb);
++
++ return 0;
++}
++
++static int hso_put_activity(struct hso_device *hso_dev)
++{
++ if (hso_dev->usb->state != USB_STATE_SUSPENDED) {
++ if (hso_dev->is_active) {
++ hso_dev->is_active = 0;
++ schedule_work(&hso_dev->async_put_intf);
++ return -EAGAIN;
++ }
++ }
++ hso_dev->is_active = 0;
++ return 0;
++}
++
++/* called by kernel when we need to suspend device */
++static int hso_suspend(struct usb_interface *iface, pm_message_t message)
++{
++ int i, result;
++
++ /* Stop all serial ports */
++ for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
++ if (serial_table[i] && (serial_table[i]->interface == iface)) {
++ result = hso_stop_serial_device(serial_table[i]);
++ if (result)
++ goto out;
++ }
++ }
++
++ /* Stop all network ports */
++ for (i = 0; i < HSO_MAX_NET_DEVICES; i++) {
++ if (network_table[i] &&
++ (network_table[i]->interface == iface)) {
++ result = hso_stop_net_device(network_table[i]);
++ if (result)
++ goto out;
++ }
++ }
++
++out:
++ return 0;
++}
++
++/* called by kernel when we need to resume device */
++static int hso_resume(struct usb_interface *iface)
++{
++ int i, result = 0;
++ struct hso_net *hso_net;
++
++ /* Start all serial ports */
++ for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
++ if (serial_table[i] && (serial_table[i]->interface == iface)) {
++ if (atomic_read(&dev2ser(serial_table[i])->port.count)) {
++ result =
++ hso_start_serial_device(serial_table[i], GFP_NOIO);
++ hso_kick_transmit(dev2ser(serial_table[i]));
++ if (result)
++ goto out;
++ }
++ }
++ }
++
++ /* Start all network ports */
++ for (i = 0; i < HSO_MAX_NET_DEVICES; i++) {
++ if (network_table[i] &&
++ (network_table[i]->interface == iface)) {
++ hso_net = dev2net(network_table[i]);
++ if (hso_net->flags & IFF_UP) {
++ /* First transmit any lingering data,
++ then restart the device. */
++ if (hso_net->skb_tx_buf) {
++ dev_dbg(&iface->dev,
++ "Transmitting"
++ " lingering data\n");
++ hso_net_start_xmit(hso_net->skb_tx_buf,
++ hso_net->net);
++ hso_net->skb_tx_buf = NULL;
++ }
++ result = hso_start_net_device(network_table[i]);
++ if (result)
++ goto out;
++ }
++ }
++ }
++
++out:
++ return result;
++}
++
++static void hso_serial_ref_free(struct kref *ref)
++{
++ struct hso_device *hso_dev = container_of(ref, struct hso_device, ref);
++
++ hso_free_serial_device(hso_dev);
++}
++
++static void hso_free_interface(struct usb_interface *interface)
++{
++ struct hso_serial *serial;
++ int i;
++
++ for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
++ if (serial_table[i] &&
++ (serial_table[i]->interface == interface)) {
++ serial = dev2ser(serial_table[i]);
++ tty_port_tty_hangup(&serial->port, false);
++ mutex_lock(&serial->parent->mutex);
++ serial->parent->usb_gone = 1;
++ mutex_unlock(&serial->parent->mutex);
++ cancel_work_sync(&serial_table[i]->async_put_intf);
++ cancel_work_sync(&serial_table[i]->async_get_intf);
++ hso_serial_tty_unregister(serial);
++ kref_put(&serial_table[i]->ref, hso_serial_ref_free);
++ set_serial_by_index(i, NULL);
++ }
++ }
++
++ for (i = 0; i < HSO_MAX_NET_DEVICES; i++) {
++ if (network_table[i] &&
++ (network_table[i]->interface == interface)) {
++ struct rfkill *rfk = dev2net(network_table[i])->rfkill;
++ /* hso_stop_net_device doesn't stop the net queue since
++ * traffic needs to start it again when suspended */
++ netif_stop_queue(dev2net(network_table[i])->net);
++ hso_stop_net_device(network_table[i]);
++ cancel_work_sync(&network_table[i]->async_put_intf);
++ cancel_work_sync(&network_table[i]->async_get_intf);
++ if (rfk) {
++ rfkill_unregister(rfk);
++ rfkill_destroy(rfk);
++ }
++ hso_free_net_device(network_table[i]);
++ }
++ }
++}
++
++/* Helper functions */
++
++/* Get the endpoint ! */
++static struct usb_endpoint_descriptor *hso_get_ep(struct usb_interface *intf,
++ int type, int dir)
++{
++ int i;
++ struct usb_host_interface *iface = intf->cur_altsetting;
++ struct usb_endpoint_descriptor *endp;
++
++ for (i = 0; i < iface->desc.bNumEndpoints; i++) {
++ endp = &iface->endpoint[i].desc;
++ if (((endp->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == dir) &&
++ (usb_endpoint_type(endp) == type))
++ return endp;
++ }
++
++ return NULL;
++}
++
++/* Get the byte that describes which ports are enabled */
++static int hso_get_mux_ports(struct usb_interface *intf, unsigned char *ports)
++{
++ int i;
++ struct usb_host_interface *iface = intf->cur_altsetting;
++
++ if (iface->extralen == 3) {
++ *ports = iface->extra[2];
++ return 0;
++ }
++
++ for (i = 0; i < iface->desc.bNumEndpoints; i++) {
++ if (iface->endpoint[i].extralen == 3) {
++ *ports = iface->endpoint[i].extra[2];
++ return 0;
++ }
++ }
++
++ return -1;
++}
++
++/* interrupt urb needs to be submitted, used for serial read of muxed port */
++static int hso_mux_submit_intr_urb(struct hso_shared_int *shared_int,
++ struct usb_device *usb, gfp_t gfp)
++{
++ int result;
++
++ usb_fill_int_urb(shared_int->shared_intr_urb, usb,
++ usb_rcvintpipe(usb,
++ shared_int->intr_endp->bEndpointAddress & 0x7F),
++ shared_int->shared_intr_buf,
++ 1,
++ intr_callback, shared_int,
++ shared_int->intr_endp->bInterval);
++
++ result = usb_submit_urb(shared_int->shared_intr_urb, gfp);
++ if (result)
++ dev_warn(&usb->dev, "%s failed mux_intr_urb %d\n", __func__,
++ result);
++
++ return result;
++}
++
++/* operations setup of the serial interface */
++static const struct tty_operations hso_serial_ops = {
++ .open = hso_serial_open,
++ .close = hso_serial_close,
++ .write = hso_serial_write,
++ .write_room = hso_serial_write_room,
++ .cleanup = hso_serial_cleanup,
++ .ioctl = hso_serial_ioctl,
++ .set_termios = hso_serial_set_termios,
++ .chars_in_buffer = hso_serial_chars_in_buffer,
++ .tiocmget = hso_serial_tiocmget,
++ .tiocmset = hso_serial_tiocmset,
++ .get_icount = hso_get_count,
++ .unthrottle = hso_unthrottle
++};
++
++static struct usb_driver hso_driver = {
++ .name = driver_name,
++ .probe = hso_probe,
++ .disconnect = hso_disconnect,
++ .id_table = hso_ids,
++ .suspend = hso_suspend,
++ .resume = hso_resume,
++ .reset_resume = hso_resume,
++ .supports_autosuspend = 1,
++ .disable_hub_initiated_lpm = 1,
++};
++
++static int __init hso_init(void)
++{
++ int i;
++ int result;
++
++ /* put it in the log */
++ printk(KERN_INFO "hso: %s\n", version);
++
++ /* Initialise the serial table semaphore and table */
++ spin_lock_init(&serial_table_lock);
++ for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++)
++ serial_table[i] = NULL;
++
++ /* allocate our driver using the proper amount of supported minors */
++ tty_drv = alloc_tty_driver(HSO_SERIAL_TTY_MINORS);
++ if (!tty_drv)
++ return -ENOMEM;
++
++ /* fill in all needed values */
++ tty_drv->driver_name = driver_name;
++ tty_drv->name = tty_filename;
++
++ /* if major number is provided as parameter, use that one */
++ if (tty_major)
++ tty_drv->major = tty_major;
++
++ tty_drv->minor_start = 0;
++ tty_drv->type = TTY_DRIVER_TYPE_SERIAL;
++ tty_drv->subtype = SERIAL_TYPE_NORMAL;
++ tty_drv->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
++ tty_drv->init_termios = tty_std_termios;
++ hso_init_termios(&tty_drv->init_termios);
++ tty_set_operations(tty_drv, &hso_serial_ops);
++
++ /* register the tty driver */
++ result = tty_register_driver(tty_drv);
++ if (result) {
++ printk(KERN_ERR "%s - tty_register_driver failed(%d)\n",
++ __func__, result);
++ goto err_free_tty;
++ }
++
++ /* register this module as an usb driver */
++ result = usb_register(&hso_driver);
++ if (result) {
++ printk(KERN_ERR "Could not register hso driver? error: %d\n",
++ result);
++ goto err_unreg_tty;
++ }
++
++ /* done */
++ return 0;
++err_unreg_tty:
++ tty_unregister_driver(tty_drv);
++err_free_tty:
++ put_tty_driver(tty_drv);
++ return result;
++}
++
++static void __exit hso_exit(void)
++{
++ printk(KERN_INFO "hso: unloaded\n");
++
++ tty_unregister_driver(tty_drv);
++ put_tty_driver(tty_drv);
++ /* deregister the usb driver */
++ usb_deregister(&hso_driver);
++}
++
++/* Module definitions */
++module_init(hso_init);
++module_exit(hso_exit);
++
++MODULE_AUTHOR(MOD_AUTHOR);
++MODULE_DESCRIPTION(MOD_DESCRIPTION);
++MODULE_LICENSE(MOD_LICENSE);
++
++/* change the debug level (eg: insmod hso.ko debug=0x04) */
++MODULE_PARM_DESC(debug, "Level of debug [0x01 | 0x02 | 0x04 | 0x08 | 0x10]");
++module_param(debug, int, S_IRUGO | S_IWUSR);
++
++/* set the major tty number (eg: insmod hso.ko tty_major=245) */
++MODULE_PARM_DESC(tty_major, "Set the major tty number");
++module_param(tty_major, int, S_IRUGO | S_IWUSR);
++
++/* disable network interface (eg: insmod hso.ko disable_net=1) */
++MODULE_PARM_DESC(disable_net, "Disable the network interface");
++module_param(disable_net, int, S_IRUGO | S_IWUSR);
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/huawei_cdc_ncm.c backports-4.2.6-1/drivers/net/usb/huawei_cdc_ncm.c
+--- backports-4.2.6-1.org/drivers/net/usb/huawei_cdc_ncm.c 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/huawei_cdc_ncm.c 2015-11-09 23:37:56.000000000 +0100
+@@ -0,0 +1,224 @@
++/* huawei_cdc_ncm.c - handles Huawei devices using the CDC NCM protocol as
++ * transport layer.
++ * Copyright (C) 2013 Enrico Mioso <mrkiko.rs(a)gmail.com>
++ *
++ *
++ * ABSTRACT:
++ * This driver handles devices resembling the CDC NCM standard, but
++ * encapsulating another protocol inside it. An example are some Huawei 3G
++ * devices, exposing an embedded AT channel where you can set up the NCM
++ * connection.
++ * This code has been heavily inspired by the cdc_mbim.c driver, which is
++ * Copyright (c) 2012 Smith Micro Software, Inc.
++ * Copyright (c) 2012 Bjørn Mork <bjorn(a)mork.no>
++ *
++ * 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 published by the Free Software Foundation.
++ */
++
++#include <linux/module.h>
++#include <linux/netdevice.h>
++#include <linux/ethtool.h>
++#include <linux/if_vlan.h>
++#include <linux/ip.h>
++#include <linux/mii.h>
++#include <linux/usb.h>
++#include <linux/usb/cdc.h>
++#include <linux/usb/usbnet.h>
++#include <linux/usb/cdc-wdm.h>
++#include <linux/usb/cdc_ncm.h>
++
++/* Driver data */
++struct huawei_cdc_ncm_state {
++ struct cdc_ncm_ctx *ctx;
++ atomic_t pmcount;
++ struct usb_driver *subdriver;
++ struct usb_interface *control;
++ struct usb_interface *data;
++};
++
++static int huawei_cdc_ncm_manage_power(struct usbnet *usbnet_dev, int on)
++{
++ struct huawei_cdc_ncm_state *drvstate = (void *)&usbnet_dev->data;
++ int rv;
++
++ if ((on && atomic_add_return(1, &drvstate->pmcount) == 1) ||
++ (!on && atomic_dec_and_test(&drvstate->pmcount))) {
++ rv = usb_autopm_get_interface(usbnet_dev->intf);
++ usbnet_dev->intf->needs_remote_wakeup = on;
++ if (!rv)
++ usb_autopm_put_interface(usbnet_dev->intf);
++ }
++ return 0;
++}
++
++static int huawei_cdc_ncm_wdm_manage_power(struct usb_interface *intf,
++ int status)
++{
++ struct usbnet *usbnet_dev = usb_get_intfdata(intf);
++
++ /* can be called while disconnecting */
++ if (!usbnet_dev)
++ return 0;
++
++ return huawei_cdc_ncm_manage_power(usbnet_dev, status);
++}
++
++
++static int huawei_cdc_ncm_bind(struct usbnet *usbnet_dev,
++ struct usb_interface *intf)
++{
++ struct cdc_ncm_ctx *ctx;
++ struct usb_driver *subdriver = ERR_PTR(-ENODEV);
++ int ret = -ENODEV;
++ struct huawei_cdc_ncm_state *drvstate = (void *)&usbnet_dev->data;
++ int drvflags = 0;
++
++ /* altsetting should always be 1 for NCM devices - so we hard-coded
++ * it here. Some huawei devices will need the NDP part of the NCM package to
++ * be at the end of the frame.
++ */
++ drvflags |= CDC_NCM_FLAG_NDP_TO_END;
++ ret = cdc_ncm_bind_common(usbnet_dev, intf, 1, drvflags);
++ if (ret)
++ goto err;
++
++ ctx = drvstate->ctx;
++
++ if (usbnet_dev->status)
++ /* The wMaxCommand buffer must be big enough to hold
++ * any message from the modem. Experience has shown
++ * that some replies are more than 256 bytes long
++ */
++ subdriver = usb_cdc_wdm_register(ctx->control,
++ &usbnet_dev->status->desc,
++ 1024, /* wMaxCommand */
++ huawei_cdc_ncm_wdm_manage_power);
++ if (IS_ERR(subdriver)) {
++ ret = PTR_ERR(subdriver);
++ cdc_ncm_unbind(usbnet_dev, intf);
++ goto err;
++ }
++
++ /* Prevent usbnet from using the status descriptor */
++ usbnet_dev->status = NULL;
++
++ drvstate->subdriver = subdriver;
++
++err:
++ return ret;
++}
++
++static void huawei_cdc_ncm_unbind(struct usbnet *usbnet_dev,
++ struct usb_interface *intf)
++{
++ struct huawei_cdc_ncm_state *drvstate = (void *)&usbnet_dev->data;
++ struct cdc_ncm_ctx *ctx = drvstate->ctx;
++
++ if (drvstate->subdriver && drvstate->subdriver->disconnect)
++ drvstate->subdriver->disconnect(ctx->control);
++ drvstate->subdriver = NULL;
++
++ cdc_ncm_unbind(usbnet_dev, intf);
++}
++
++static int huawei_cdc_ncm_suspend(struct usb_interface *intf,
++ pm_message_t message)
++{
++ int ret = 0;
++ struct usbnet *usbnet_dev = usb_get_intfdata(intf);
++ struct huawei_cdc_ncm_state *drvstate = (void *)&usbnet_dev->data;
++ struct cdc_ncm_ctx *ctx = drvstate->ctx;
++
++ if (ctx == NULL) {
++ ret = -ENODEV;
++ goto error;
++ }
++
++ ret = usbnet_suspend(intf, message);
++ if (ret < 0)
++ goto error;
++
++ if (intf == ctx->control &&
++ drvstate->subdriver &&
++ drvstate->subdriver->suspend)
++ ret = drvstate->subdriver->suspend(intf, message);
++ if (ret < 0)
++ usbnet_resume(intf);
++
++error:
++ return ret;
++}
++
++static int huawei_cdc_ncm_resume(struct usb_interface *intf)
++{
++ int ret = 0;
++ struct usbnet *usbnet_dev = usb_get_intfdata(intf);
++ struct huawei_cdc_ncm_state *drvstate = (void *)&usbnet_dev->data;
++ bool callsub;
++ struct cdc_ncm_ctx *ctx = drvstate->ctx;
++
++ /* should we call subdriver's resume function? */
++ callsub =
++ (intf == ctx->control &&
++ drvstate->subdriver &&
++ drvstate->subdriver->resume);
++
++ if (callsub)
++ ret = drvstate->subdriver->resume(intf);
++ if (ret < 0)
++ goto err;
++ ret = usbnet_resume(intf);
++ if (ret < 0 && callsub)
++ drvstate->subdriver->suspend(intf, PMSG_SUSPEND);
++err:
++ return ret;
++}
++
++static const struct driver_info huawei_cdc_ncm_info = {
++ .description = "Huawei CDC NCM device",
++ .flags = FLAG_NO_SETINT | FLAG_MULTI_PACKET | FLAG_WWAN,
++ .bind = huawei_cdc_ncm_bind,
++ .unbind = huawei_cdc_ncm_unbind,
++ .manage_power = huawei_cdc_ncm_manage_power,
++ .rx_fixup = cdc_ncm_rx_fixup,
++ .tx_fixup = cdc_ncm_tx_fixup,
++};
++
++static const struct usb_device_id huawei_cdc_ncm_devs[] = {
++ /* Huawei NCM devices disguised as vendor specific */
++ { USB_VENDOR_AND_INTERFACE_INFO(0x12d1, 0xff, 0x02, 0x16),
++ .driver_info = (unsigned long)&huawei_cdc_ncm_info,
++ },
++ { USB_VENDOR_AND_INTERFACE_INFO(0x12d1, 0xff, 0x02, 0x46),
++ .driver_info = (unsigned long)&huawei_cdc_ncm_info,
++ },
++ { USB_VENDOR_AND_INTERFACE_INFO(0x12d1, 0xff, 0x02, 0x76),
++ .driver_info = (unsigned long)&huawei_cdc_ncm_info,
++ },
++ { USB_VENDOR_AND_INTERFACE_INFO(0x12d1, 0xff, 0x03, 0x16),
++ .driver_info = (unsigned long)&huawei_cdc_ncm_info,
++ },
++
++ /* Terminating entry */
++ {
++ },
++};
++MODULE_DEVICE_TABLE(usb, huawei_cdc_ncm_devs);
++
++static struct usb_driver huawei_cdc_ncm_driver = {
++ .name = "huawei_cdc_ncm",
++ .id_table = huawei_cdc_ncm_devs,
++ .probe = usbnet_probe,
++ .disconnect = usbnet_disconnect,
++ .suspend = huawei_cdc_ncm_suspend,
++ .resume = huawei_cdc_ncm_resume,
++ .reset_resume = huawei_cdc_ncm_resume,
++ .supports_autosuspend = 1,
++ .disable_hub_initiated_lpm = 1,
++};
++module_usb_driver(huawei_cdc_ncm_driver);
++MODULE_AUTHOR("Enrico Mioso <mrkiko.rs(a)gmail.com>");
++MODULE_DESCRIPTION("USB CDC NCM host driver with encapsulated protocol support");
++MODULE_LICENSE("GPL");
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/int51x1.c backports-4.2.6-1/drivers/net/usb/int51x1.c
+--- backports-4.2.6-1.org/drivers/net/usb/int51x1.c 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/int51x1.c 2015-11-09 23:37:56.000000000 +0100
+@@ -0,0 +1,199 @@
++/*
++ * Copyright (c) 2009 Peter Holik
++ *
++ * Intellon usb PLC (Powerline Communications) usb net driver
++ *
++ * http://www.tandel.be/downloads/INT51X1_Datasheet.pdf
++ *
++ * Based on the work of Jan 'RedBully' Seiffert
++ */
++
++/*
++ * 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, see <http://www.gnu.org/licenses/>.
++ */
++
++#include <linux/module.h>
++#include <linux/ctype.h>
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/ethtool.h>
++#include <linux/slab.h>
++#include <linux/mii.h>
++#include <linux/usb.h>
++#include <linux/usb/usbnet.h>
++
++#define INT51X1_VENDOR_ID 0x09e1
++#define INT51X1_PRODUCT_ID 0x5121
++
++#define INT51X1_HEADER_SIZE 2 /* 2 byte header */
++
++#define PACKET_TYPE_PROMISCUOUS (1 << 0)
++#define PACKET_TYPE_ALL_MULTICAST (1 << 1) /* no filter */
++#define PACKET_TYPE_DIRECTED (1 << 2)
++#define PACKET_TYPE_BROADCAST (1 << 3)
++#define PACKET_TYPE_MULTICAST (1 << 4) /* filtered */
++
++#define SET_ETHERNET_PACKET_FILTER 0x43
++
++static int int51x1_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
++{
++ int len;
++
++ if (!(pskb_may_pull(skb, INT51X1_HEADER_SIZE))) {
++ netdev_err(dev->net, "unexpected tiny rx frame\n");
++ return 0;
++ }
++
++ len = le16_to_cpu(*(__le16 *)&skb->data[skb->len - 2]);
++
++ skb_trim(skb, len);
++
++ return 1;
++}
++
++static struct sk_buff *int51x1_tx_fixup(struct usbnet *dev,
++ struct sk_buff *skb, gfp_t flags)
++{
++ int pack_len = skb->len;
++ int pack_with_header_len = pack_len + INT51X1_HEADER_SIZE;
++ int headroom = skb_headroom(skb);
++ int tailroom = skb_tailroom(skb);
++ int need_tail = 0;
++ __le16 *len;
++
++ /* if packet and our header is smaler than 64 pad to 64 (+ ZLP) */
++ if ((pack_with_header_len) < dev->maxpacket)
++ need_tail = dev->maxpacket - pack_with_header_len + 1;
++ /*
++ * usbnet would send a ZLP if packetlength mod urbsize == 0 for us,
++ * but we need to know ourself, because this would add to the length
++ * we send down to the device...
++ */
++ else if (!(pack_with_header_len % dev->maxpacket))
++ need_tail = 1;
++
++ if (!skb_cloned(skb) &&
++ (headroom + tailroom >= need_tail + INT51X1_HEADER_SIZE)) {
++ if (headroom < INT51X1_HEADER_SIZE || tailroom < need_tail) {
++ skb->data = memmove(skb->head + INT51X1_HEADER_SIZE,
++ skb->data, skb->len);
++ skb_set_tail_pointer(skb, skb->len);
++ }
++ } else {
++ struct sk_buff *skb2;
++
++ skb2 = skb_copy_expand(skb,
++ INT51X1_HEADER_SIZE,
++ need_tail,
++ flags);
++ dev_kfree_skb_any(skb);
++ if (!skb2)
++ return NULL;
++ skb = skb2;
++ }
++
++ pack_len += need_tail;
++ pack_len &= 0x07ff;
++
++ len = (__le16 *) __skb_push(skb, INT51X1_HEADER_SIZE);
++ *len = cpu_to_le16(pack_len);
++
++ if(need_tail)
++ memset(__skb_put(skb, need_tail), 0, need_tail);
++
++ return skb;
++}
++
++static void int51x1_set_multicast(struct net_device *netdev)
++{
++ struct usbnet *dev = netdev_priv(netdev);
++ u16 filter = PACKET_TYPE_DIRECTED | PACKET_TYPE_BROADCAST;
++
++ if (netdev->flags & IFF_PROMISC) {
++ /* do not expect to see traffic of other PLCs */
++ filter |= PACKET_TYPE_PROMISCUOUS;
++ netdev_info(dev->net, "promiscuous mode enabled\n");
++ } else if (!netdev_mc_empty(netdev) ||
++ (netdev->flags & IFF_ALLMULTI)) {
++ filter |= PACKET_TYPE_ALL_MULTICAST;
++ netdev_dbg(dev->net, "receive all multicast enabled\n");
++ } else {
++ /* ~PROMISCUOUS, ~MULTICAST */
++ netdev_dbg(dev->net, "receive own packets only\n");
++ }
++
++ usbnet_write_cmd_async(dev, SET_ETHERNET_PACKET_FILTER,
++ USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
++ filter, 0, NULL, 0);
++}
++
++static const struct net_device_ops int51x1_netdev_ops = {
++ .ndo_open = usbnet_open,
++ .ndo_stop = usbnet_stop,
++ .ndo_start_xmit = usbnet_start_xmit,
++ .ndo_tx_timeout = usbnet_tx_timeout,
++ .ndo_change_mtu = usbnet_change_mtu,
++ .ndo_set_mac_address = eth_mac_addr,
++ .ndo_validate_addr = eth_validate_addr,
++ .ndo_set_rx_mode = int51x1_set_multicast,
++};
++
++static int int51x1_bind(struct usbnet *dev, struct usb_interface *intf)
++{
++ int status = usbnet_get_ethernet_addr(dev, 3);
++
++ if (status)
++ return status;
++
++ dev->net->hard_header_len += INT51X1_HEADER_SIZE;
++ dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len;
++ dev->net->netdev_ops = &int51x1_netdev_ops;
++
++ return usbnet_get_endpoints(dev, intf);
++}
++
++static const struct driver_info int51x1_info = {
++ .description = "Intellon usb powerline adapter",
++ .bind = int51x1_bind,
++ .rx_fixup = int51x1_rx_fixup,
++ .tx_fixup = int51x1_tx_fixup,
++ .in = 1,
++ .out = 2,
++ .flags = FLAG_ETHER,
++};
++
++static const struct usb_device_id products[] = {
++ {
++ USB_DEVICE(INT51X1_VENDOR_ID, INT51X1_PRODUCT_ID),
++ .driver_info = (unsigned long) &int51x1_info,
++ },
++ {},
++};
++MODULE_DEVICE_TABLE(usb, products);
++
++static struct usb_driver int51x1_driver = {
++ .name = "int51x1",
++ .id_table = products,
++ .probe = usbnet_probe,
++ .disconnect = usbnet_disconnect,
++ .suspend = usbnet_suspend,
++ .resume = usbnet_resume,
++ .disable_hub_initiated_lpm = 1,
++};
++
++module_usb_driver(int51x1_driver);
++
++MODULE_AUTHOR("Peter Holik");
++MODULE_DESCRIPTION("Intellon usb powerline adapter");
++MODULE_LICENSE("GPL");
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/ipheth.c backports-4.2.6-1/drivers/net/usb/ipheth.c
+--- backports-4.2.6-1.org/drivers/net/usb/ipheth.c 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/ipheth.c 2015-11-09 23:37:56.000000000 +0100
+@@ -0,0 +1,588 @@
++/*
++ * ipheth.c - Apple iPhone USB Ethernet driver
++ *
++ * Copyright (c) 2009 Diego Giagio <diego(a)giagio.com>
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ * notice, this list of conditions and the following disclaimer in the
++ * documentation and/or other materials provided with the distribution.
++ * 3. Neither the name of GIAGIO.COM nor the names of its contributors
++ * may be used to endorse or promote products derived from this software
++ * without specific prior written permission.
++ *
++ * Alternatively, provided that this notice is retained in full, this
++ * software may be distributed under the terms of the GNU General
++ * Public License ("GPL") version 2, in which case the provisions of the
++ * GPL apply INSTEAD OF those given above.
++ *
++ * The provided data structures and external interfaces from this code
++ * are not restricted to be used by modules with a GPL compatible license.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
++ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
++ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
++ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
++ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
++ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
++ * DAMAGE.
++ *
++ *
++ * Attention: iPhone device must be paired, otherwise it won't respond to our
++ * driver. For more info: http://giagio.com/wiki/moin.cgi/iPhoneEthernetDriver
++ *
++ */
++
++#include <linux/kernel.h>
++#include <linux/errno.h>
++#include <linux/slab.h>
++#include <linux/module.h>
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/ethtool.h>
++#include <linux/usb.h>
++#include <linux/workqueue.h>
++
++#define USB_VENDOR_APPLE 0x05ac
++#define USB_PRODUCT_IPHONE 0x1290
++#define USB_PRODUCT_IPHONE_3G 0x1292
++#define USB_PRODUCT_IPHONE_3GS 0x1294
++#define USB_PRODUCT_IPHONE_4 0x1297
++#define USB_PRODUCT_IPAD 0x129a
++#define USB_PRODUCT_IPAD_2 0x12a2
++#define USB_PRODUCT_IPAD_3 0x12a6
++#define USB_PRODUCT_IPAD_MINI 0x12ab
++#define USB_PRODUCT_IPHONE_4_VZW 0x129c
++#define USB_PRODUCT_IPHONE_4S 0x12a0
++#define USB_PRODUCT_IPHONE_5 0x12a8
++
++#define IPHETH_USBINTF_CLASS 255
++#define IPHETH_USBINTF_SUBCLASS 253
++#define IPHETH_USBINTF_PROTO 1
++
++#define IPHETH_BUF_SIZE 1516
++#define IPHETH_IP_ALIGN 2 /* padding at front of URB */
++#define IPHETH_TX_TIMEOUT (5 * HZ)
++
++#define IPHETH_INTFNUM 2
++#define IPHETH_ALT_INTFNUM 1
++
++#define IPHETH_CTRL_ENDP 0x00
++#define IPHETH_CTRL_BUF_SIZE 0x40
++#define IPHETH_CTRL_TIMEOUT (5 * HZ)
++
++#define IPHETH_CMD_GET_MACADDR 0x00
++#define IPHETH_CMD_CARRIER_CHECK 0x45
++
++#define IPHETH_CARRIER_CHECK_TIMEOUT round_jiffies_relative(1 * HZ)
++#define IPHETH_CARRIER_ON 0x04
++
++static struct usb_device_id ipheth_table[] = {
++ { USB_DEVICE_AND_INTERFACE_INFO(
++ USB_VENDOR_APPLE, USB_PRODUCT_IPHONE,
++ IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
++ IPHETH_USBINTF_PROTO) },
++ { USB_DEVICE_AND_INTERFACE_INFO(
++ USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_3G,
++ IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
++ IPHETH_USBINTF_PROTO) },
++ { USB_DEVICE_AND_INTERFACE_INFO(
++ USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_3GS,
++ IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
++ IPHETH_USBINTF_PROTO) },
++ { USB_DEVICE_AND_INTERFACE_INFO(
++ USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_4,
++ IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
++ IPHETH_USBINTF_PROTO) },
++ { USB_DEVICE_AND_INTERFACE_INFO(
++ USB_VENDOR_APPLE, USB_PRODUCT_IPAD,
++ IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
++ IPHETH_USBINTF_PROTO) },
++ { USB_DEVICE_AND_INTERFACE_INFO(
++ USB_VENDOR_APPLE, USB_PRODUCT_IPAD_2,
++ IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
++ IPHETH_USBINTF_PROTO) },
++ { USB_DEVICE_AND_INTERFACE_INFO(
++ USB_VENDOR_APPLE, USB_PRODUCT_IPAD_3,
++ IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
++ IPHETH_USBINTF_PROTO) },
++ { USB_DEVICE_AND_INTERFACE_INFO(
++ USB_VENDOR_APPLE, USB_PRODUCT_IPAD_MINI,
++ IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
++ IPHETH_USBINTF_PROTO) },
++ { USB_DEVICE_AND_INTERFACE_INFO(
++ USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_4_VZW,
++ IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
++ IPHETH_USBINTF_PROTO) },
++ { USB_DEVICE_AND_INTERFACE_INFO(
++ USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_4S,
++ IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
++ IPHETH_USBINTF_PROTO) },
++ { USB_DEVICE_AND_INTERFACE_INFO(
++ USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_5,
++ IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
++ IPHETH_USBINTF_PROTO) },
++ { }
++};
++MODULE_DEVICE_TABLE(usb, ipheth_table);
++
++struct ipheth_device {
++ struct usb_device *udev;
++ struct usb_interface *intf;
++ struct net_device *net;
++ struct sk_buff *tx_skb;
++ struct urb *tx_urb;
++ struct urb *rx_urb;
++ unsigned char *tx_buf;
++ unsigned char *rx_buf;
++ unsigned char *ctrl_buf;
++ u8 bulk_in;
++ u8 bulk_out;
++ struct delayed_work carrier_work;
++};
++
++static int ipheth_rx_submit(struct ipheth_device *dev, gfp_t mem_flags);
++
++static int ipheth_alloc_urbs(struct ipheth_device *iphone)
++{
++ struct urb *tx_urb = NULL;
++ struct urb *rx_urb = NULL;
++ u8 *tx_buf = NULL;
++ u8 *rx_buf = NULL;
++
++ tx_urb = usb_alloc_urb(0, GFP_KERNEL);
++ if (tx_urb == NULL)
++ goto error_nomem;
++
++ rx_urb = usb_alloc_urb(0, GFP_KERNEL);
++ if (rx_urb == NULL)
++ goto free_tx_urb;
++
++ tx_buf = usb_alloc_coherent(iphone->udev, IPHETH_BUF_SIZE,
++ GFP_KERNEL, &tx_urb->transfer_dma);
++ if (tx_buf == NULL)
++ goto free_rx_urb;
++
++ rx_buf = usb_alloc_coherent(iphone->udev, IPHETH_BUF_SIZE,
++ GFP_KERNEL, &rx_urb->transfer_dma);
++ if (rx_buf == NULL)
++ goto free_tx_buf;
++
++
++ iphone->tx_urb = tx_urb;
++ iphone->rx_urb = rx_urb;
++ iphone->tx_buf = tx_buf;
++ iphone->rx_buf = rx_buf;
++ return 0;
++
++free_tx_buf:
++ usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE, tx_buf,
++ tx_urb->transfer_dma);
++free_rx_urb:
++ usb_free_urb(rx_urb);
++free_tx_urb:
++ usb_free_urb(tx_urb);
++error_nomem:
++ return -ENOMEM;
++}
++
++static void ipheth_free_urbs(struct ipheth_device *iphone)
++{
++ usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE, iphone->rx_buf,
++ iphone->rx_urb->transfer_dma);
++ usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE, iphone->tx_buf,
++ iphone->tx_urb->transfer_dma);
++ usb_free_urb(iphone->rx_urb);
++ usb_free_urb(iphone->tx_urb);
++}
++
++static void ipheth_kill_urbs(struct ipheth_device *dev)
++{
++ usb_kill_urb(dev->tx_urb);
++ usb_kill_urb(dev->rx_urb);
++}
++
++static void ipheth_rcvbulk_callback(struct urb *urb)
++{
++ struct ipheth_device *dev;
++ struct sk_buff *skb;
++ int status;
++ char *buf;
++ int len;
++
++ dev = urb->context;
++ if (dev == NULL)
++ return;
++
++ status = urb->status;
++ switch (status) {
++ case -ENOENT:
++ case -ECONNRESET:
++ case -ESHUTDOWN:
++ return;
++ case 0:
++ break;
++ default:
++ dev_err(&dev->intf->dev, "%s: urb status: %d\n",
++ __func__, status);
++ return;
++ }
++
++ if (urb->actual_length <= IPHETH_IP_ALIGN) {
++ dev->net->stats.rx_length_errors++;
++ return;
++ }
++ len = urb->actual_length - IPHETH_IP_ALIGN;
++ buf = urb->transfer_buffer + IPHETH_IP_ALIGN;
++
++ skb = dev_alloc_skb(len);
++ if (!skb) {
++ dev_err(&dev->intf->dev, "%s: dev_alloc_skb: -ENOMEM\n",
++ __func__);
++ dev->net->stats.rx_dropped++;
++ return;
++ }
++
++ memcpy(skb_put(skb, len), buf, len);
++ skb->dev = dev->net;
++ skb->protocol = eth_type_trans(skb, dev->net);
++
++ dev->net->stats.rx_packets++;
++ dev->net->stats.rx_bytes += len;
++
++ netif_rx(skb);
++ ipheth_rx_submit(dev, GFP_ATOMIC);
++}
++
++static void ipheth_sndbulk_callback(struct urb *urb)
++{
++ struct ipheth_device *dev;
++ int status = urb->status;
++
++ dev = urb->context;
++ if (dev == NULL)
++ return;
++
++ if (status != 0 &&
++ status != -ENOENT &&
++ status != -ECONNRESET &&
++ status != -ESHUTDOWN)
++ dev_err(&dev->intf->dev, "%s: urb status: %d\n",
++ __func__, status);
++
++ dev_kfree_skb_irq(dev->tx_skb);
++ netif_wake_queue(dev->net);
++}
++
++static int ipheth_carrier_set(struct ipheth_device *dev)
++{
++ struct usb_device *udev = dev->udev;
++ int retval;
++
++ retval = usb_control_msg(udev,
++ usb_rcvctrlpipe(udev, IPHETH_CTRL_ENDP),
++ IPHETH_CMD_CARRIER_CHECK, /* request */
++ 0xc0, /* request type */
++ 0x00, /* value */
++ 0x02, /* index */
++ dev->ctrl_buf, IPHETH_CTRL_BUF_SIZE,
++ IPHETH_CTRL_TIMEOUT);
++ if (retval < 0) {
++ dev_err(&dev->intf->dev, "%s: usb_control_msg: %d\n",
++ __func__, retval);
++ return retval;
++ }
++
++ if (dev->ctrl_buf[0] == IPHETH_CARRIER_ON)
++ netif_carrier_on(dev->net);
++ else
++ netif_carrier_off(dev->net);
++
++ return 0;
++}
++
++static void ipheth_carrier_check_work(struct work_struct *work)
++{
++ struct ipheth_device *dev = container_of(work, struct ipheth_device,
++ carrier_work.work);
++
++ ipheth_carrier_set(dev);
++ schedule_delayed_work(&dev->carrier_work, IPHETH_CARRIER_CHECK_TIMEOUT);
++}
++
++static int ipheth_get_macaddr(struct ipheth_device *dev)
++{
++ struct usb_device *udev = dev->udev;
++ struct net_device *net = dev->net;
++ int retval;
++
++ retval = usb_control_msg(udev,
++ usb_rcvctrlpipe(udev, IPHETH_CTRL_ENDP),
++ IPHETH_CMD_GET_MACADDR, /* request */
++ 0xc0, /* request type */
++ 0x00, /* value */
++ 0x02, /* index */
++ dev->ctrl_buf,
++ IPHETH_CTRL_BUF_SIZE,
++ IPHETH_CTRL_TIMEOUT);
++ if (retval < 0) {
++ dev_err(&dev->intf->dev, "%s: usb_control_msg: %d\n",
++ __func__, retval);
++ } else if (retval < ETH_ALEN) {
++ dev_err(&dev->intf->dev,
++ "%s: usb_control_msg: short packet: %d bytes\n",
++ __func__, retval);
++ retval = -EINVAL;
++ } else {
++ memcpy(net->dev_addr, dev->ctrl_buf, ETH_ALEN);
++ retval = 0;
++ }
++
++ return retval;
++}
++
++static int ipheth_rx_submit(struct ipheth_device *dev, gfp_t mem_flags)
++{
++ struct usb_device *udev = dev->udev;
++ int retval;
++
++ usb_fill_bulk_urb(dev->rx_urb, udev,
++ usb_rcvbulkpipe(udev, dev->bulk_in),
++ dev->rx_buf, IPHETH_BUF_SIZE,
++ ipheth_rcvbulk_callback,
++ dev);
++ dev->rx_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
++
++ retval = usb_submit_urb(dev->rx_urb, mem_flags);
++ if (retval)
++ dev_err(&dev->intf->dev, "%s: usb_submit_urb: %d\n",
++ __func__, retval);
++ return retval;
++}
++
++static int ipheth_open(struct net_device *net)
++{
++ struct ipheth_device *dev = netdev_priv(net);
++ struct usb_device *udev = dev->udev;
++ int retval = 0;
++
++ usb_set_interface(udev, IPHETH_INTFNUM, IPHETH_ALT_INTFNUM);
++
++ retval = ipheth_carrier_set(dev);
++ if (retval)
++ return retval;
++
++ retval = ipheth_rx_submit(dev, GFP_KERNEL);
++ if (retval)
++ return retval;
++
++ schedule_delayed_work(&dev->carrier_work, IPHETH_CARRIER_CHECK_TIMEOUT);
++ netif_start_queue(net);
++ return retval;
++}
++
++static int ipheth_close(struct net_device *net)
++{
++ struct ipheth_device *dev = netdev_priv(net);
++
++ cancel_delayed_work_sync(&dev->carrier_work);
++ netif_stop_queue(net);
++ return 0;
++}
++
++static int ipheth_tx(struct sk_buff *skb, struct net_device *net)
++{
++ struct ipheth_device *dev = netdev_priv(net);
++ struct usb_device *udev = dev->udev;
++ int retval;
++
++ /* Paranoid */
++ if (skb->len > IPHETH_BUF_SIZE) {
++ WARN(1, "%s: skb too large: %d bytes\n", __func__, skb->len);
++ dev->net->stats.tx_dropped++;
++ dev_kfree_skb_irq(skb);
++ return NETDEV_TX_OK;
++ }
++
++ memcpy(dev->tx_buf, skb->data, skb->len);
++ if (skb->len < IPHETH_BUF_SIZE)
++ memset(dev->tx_buf + skb->len, 0, IPHETH_BUF_SIZE - skb->len);
++
++ usb_fill_bulk_urb(dev->tx_urb, udev,
++ usb_sndbulkpipe(udev, dev->bulk_out),
++ dev->tx_buf, IPHETH_BUF_SIZE,
++ ipheth_sndbulk_callback,
++ dev);
++ dev->tx_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
++
++ retval = usb_submit_urb(dev->tx_urb, GFP_ATOMIC);
++ if (retval) {
++ dev_err(&dev->intf->dev, "%s: usb_submit_urb: %d\n",
++ __func__, retval);
++ dev->net->stats.tx_errors++;
++ dev_kfree_skb_irq(skb);
++ } else {
++ dev->tx_skb = skb;
++
++ dev->net->stats.tx_packets++;
++ dev->net->stats.tx_bytes += skb->len;
++ netif_stop_queue(net);
++ }
++
++ return NETDEV_TX_OK;
++}
++
++static void ipheth_tx_timeout(struct net_device *net)
++{
++ struct ipheth_device *dev = netdev_priv(net);
++
++ dev_err(&dev->intf->dev, "%s: TX timeout\n", __func__);
++ dev->net->stats.tx_errors++;
++ usb_unlink_urb(dev->tx_urb);
++}
++
++static u32 ipheth_ethtool_op_get_link(struct net_device *net)
++{
++ struct ipheth_device *dev = netdev_priv(net);
++ return netif_carrier_ok(dev->net);
++}
++
++static const struct ethtool_ops ops = {
++ .get_link = ipheth_ethtool_op_get_link
++};
++
++static const struct net_device_ops ipheth_netdev_ops = {
++ .ndo_open = ipheth_open,
++ .ndo_stop = ipheth_close,
++ .ndo_start_xmit = ipheth_tx,
++ .ndo_tx_timeout = ipheth_tx_timeout,
++};
++
++static int ipheth_probe(struct usb_interface *intf,
++ const struct usb_device_id *id)
++{
++ struct usb_device *udev = interface_to_usbdev(intf);
++ struct usb_host_interface *hintf;
++ struct usb_endpoint_descriptor *endp;
++ struct ipheth_device *dev;
++ struct net_device *netdev;
++ int i;
++ int retval;
++
++ netdev = alloc_etherdev(sizeof(struct ipheth_device));
++ if (!netdev)
++ return -ENOMEM;
++
++ netdev->netdev_ops = &ipheth_netdev_ops;
++ netdev->watchdog_timeo = IPHETH_TX_TIMEOUT;
++ strcpy(netdev->name, "eth%d");
++
++ dev = netdev_priv(netdev);
++ dev->udev = udev;
++ dev->net = netdev;
++ dev->intf = intf;
++
++ /* Set up endpoints */
++ hintf = usb_altnum_to_altsetting(intf, IPHETH_ALT_INTFNUM);
++ if (hintf == NULL) {
++ retval = -ENODEV;
++ dev_err(&intf->dev, "Unable to find alternate settings interface\n");
++ goto err_endpoints;
++ }
++
++ for (i = 0; i < hintf->desc.bNumEndpoints; i++) {
++ endp = &hintf->endpoint[i].desc;
++ if (usb_endpoint_is_bulk_in(endp))
++ dev->bulk_in = endp->bEndpointAddress;
++ else if (usb_endpoint_is_bulk_out(endp))
++ dev->bulk_out = endp->bEndpointAddress;
++ }
++ if (!(dev->bulk_in && dev->bulk_out)) {
++ retval = -ENODEV;
++ dev_err(&intf->dev, "Unable to find endpoints\n");
++ goto err_endpoints;
++ }
++
++ dev->ctrl_buf = kmalloc(IPHETH_CTRL_BUF_SIZE, GFP_KERNEL);
++ if (dev->ctrl_buf == NULL) {
++ retval = -ENOMEM;
++ goto err_alloc_ctrl_buf;
++ }
++
++ retval = ipheth_get_macaddr(dev);
++ if (retval)
++ goto err_get_macaddr;
++
++ INIT_DELAYED_WORK(&dev->carrier_work, ipheth_carrier_check_work);
++
++ retval = ipheth_alloc_urbs(dev);
++ if (retval) {
++ dev_err(&intf->dev, "error allocating urbs: %d\n", retval);
++ goto err_alloc_urbs;
++ }
++
++ usb_set_intfdata(intf, dev);
++
++ SET_NETDEV_DEV(netdev, &intf->dev);
++ netdev->ethtool_ops = &ops;
++
++ retval = register_netdev(netdev);
++ if (retval) {
++ dev_err(&intf->dev, "error registering netdev: %d\n", retval);
++ retval = -EIO;
++ goto err_register_netdev;
++ }
++
++ dev_info(&intf->dev, "Apple iPhone USB Ethernet device attached\n");
++ return 0;
++
++err_register_netdev:
++ ipheth_free_urbs(dev);
++err_alloc_urbs:
++err_get_macaddr:
++err_alloc_ctrl_buf:
++ kfree(dev->ctrl_buf);
++err_endpoints:
++ free_netdev(netdev);
++ return retval;
++}
++
++static void ipheth_disconnect(struct usb_interface *intf)
++{
++ struct ipheth_device *dev;
++
++ dev = usb_get_intfdata(intf);
++ if (dev != NULL) {
++ unregister_netdev(dev->net);
++ ipheth_kill_urbs(dev);
++ ipheth_free_urbs(dev);
++ kfree(dev->ctrl_buf);
++ free_netdev(dev->net);
++ }
++ usb_set_intfdata(intf, NULL);
++ dev_info(&intf->dev, "Apple iPhone USB Ethernet now disconnected\n");
++}
++
++static struct usb_driver ipheth_driver = {
++ .name = "ipheth",
++ .probe = ipheth_probe,
++ .disconnect = ipheth_disconnect,
++ .id_table = ipheth_table,
++ .disable_hub_initiated_lpm = 1,
++};
++
++module_usb_driver(ipheth_driver);
++
++MODULE_AUTHOR("Diego Giagio <diego(a)giagio.com>");
++MODULE_DESCRIPTION("Apple iPhone USB Ethernet driver");
++MODULE_LICENSE("Dual BSD/GPL");
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/kalmia.c backports-4.2.6-1/drivers/net/usb/kalmia.c
+--- backports-4.2.6-1.org/drivers/net/usb/kalmia.c 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/kalmia.c 2015-11-09 23:37:56.000000000 +0100
+@@ -0,0 +1,366 @@
++/*
++ * USB network interface driver for Samsung Kalmia based LTE USB modem like the
++ * Samsung GT-B3730 and GT-B3710.
++ *
++ * Copyright (C) 2011 Marius Bjoernstad Kotsbak <marius(a)kotsbak.com>
++ *
++ * Sponsored by Quicklink Video Distribution Services Ltd.
++ *
++ * Based on the cdc_eem module.
++ *
++ * 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.
++ */
++
++#include <linux/module.h>
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/ctype.h>
++#include <linux/ethtool.h>
++#include <linux/workqueue.h>
++#include <linux/mii.h>
++#include <linux/usb.h>
++#include <linux/crc32.h>
++#include <linux/usb/cdc.h>
++#include <linux/usb/usbnet.h>
++#include <linux/gfp.h>
++
++/*
++ * The Samsung Kalmia based LTE USB modems have a CDC ACM port for modem control
++ * handled by the "option" module and an ethernet data port handled by this
++ * module.
++ *
++ * The stick must first be switched into modem mode by usb_modeswitch
++ * or similar tool. Then the modem gets sent two initialization packets by
++ * this module, which gives the MAC address of the device. User space can then
++ * connect the modem using AT commands through the ACM port and then use
++ * DHCP on the network interface exposed by this module. Network packets are
++ * sent to and from the modem in a proprietary format discovered after watching
++ * the behavior of the windows driver for the modem.
++ *
++ * More information about the use of the modem is available in usb_modeswitch
++ * forum and the project page:
++ *
++ * http://www.draisberghof.de/usb_modeswitch/bb/viewtopic.php?t=465
++ * https://github.com/mkotsbak/Samsung-GT-B3730-linux-driver
++ */
++
++/* #define DEBUG */
++/* #define VERBOSE */
++
++#define KALMIA_HEADER_LENGTH 6
++#define KALMIA_ALIGN_SIZE 4
++#define KALMIA_USB_TIMEOUT 10000
++
++/*-------------------------------------------------------------------------*/
++
++static int
++kalmia_send_init_packet(struct usbnet *dev, u8 *init_msg, u8 init_msg_len,
++ u8 *buffer, u8 expected_len)
++{
++ int act_len;
++ int status;
++
++ netdev_dbg(dev->net, "Sending init packet");
++
++ status = usb_bulk_msg(dev->udev, usb_sndbulkpipe(dev->udev, 0x02),
++ init_msg, init_msg_len, &act_len, KALMIA_USB_TIMEOUT);
++ if (status != 0) {
++ netdev_err(dev->net,
++ "Error sending init packet. Status %i, length %i\n",
++ status, act_len);
++ return status;
++ }
++ else if (act_len != init_msg_len) {
++ netdev_err(dev->net,
++ "Did not send all of init packet. Bytes sent: %i",
++ act_len);
++ }
++ else {
++ netdev_dbg(dev->net, "Successfully sent init packet.");
++ }
++
++ status = usb_bulk_msg(dev->udev, usb_rcvbulkpipe(dev->udev, 0x81),
++ buffer, expected_len, &act_len, KALMIA_USB_TIMEOUT);
++
++ if (status != 0)
++ netdev_err(dev->net,
++ "Error receiving init result. Status %i, length %i\n",
++ status, act_len);
++ else if (act_len != expected_len)
++ netdev_err(dev->net, "Unexpected init result length: %i\n",
++ act_len);
++
++ return status;
++}
++
++static int
++kalmia_init_and_get_ethernet_addr(struct usbnet *dev, u8 *ethernet_addr)
++{
++ static const char init_msg_1[] =
++ { 0x57, 0x50, 0x04, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00,
++ 0x00, 0x00 };
++ static const char init_msg_2[] =
++ { 0x57, 0x50, 0x04, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0xf4,
++ 0x00, 0x00 };
++ static const int buflen = 28;
++ char *usb_buf;
++ int status;
++
++ usb_buf = kmalloc(buflen, GFP_DMA | GFP_KERNEL);
++ if (!usb_buf)
++ return -ENOMEM;
++
++ memcpy(usb_buf, init_msg_1, 12);
++ status = kalmia_send_init_packet(dev, usb_buf, sizeof(init_msg_1)
++ / sizeof(init_msg_1[0]), usb_buf, 24);
++ if (status != 0)
++ return status;
++
++ memcpy(usb_buf, init_msg_2, 12);
++ status = kalmia_send_init_packet(dev, usb_buf, sizeof(init_msg_2)
++ / sizeof(init_msg_2[0]), usb_buf, 28);
++ if (status != 0)
++ return status;
++
++ memcpy(ethernet_addr, usb_buf + 10, ETH_ALEN);
++
++ kfree(usb_buf);
++ return status;
++}
++
++static int
++kalmia_bind(struct usbnet *dev, struct usb_interface *intf)
++{
++ int status;
++ u8 ethernet_addr[ETH_ALEN];
++
++ /* Don't bind to AT command interface */
++ if (intf->cur_altsetting->desc.bInterfaceClass != USB_CLASS_VENDOR_SPEC)
++ return -EINVAL;
++
++ dev->in = usb_rcvbulkpipe(dev->udev, 0x81 & USB_ENDPOINT_NUMBER_MASK);
++ dev->out = usb_sndbulkpipe(dev->udev, 0x02 & USB_ENDPOINT_NUMBER_MASK);
++ dev->status = NULL;
++
++ dev->net->hard_header_len += KALMIA_HEADER_LENGTH;
++ dev->hard_mtu = 1400;
++ dev->rx_urb_size = dev->hard_mtu * 10; // Found as optimal after testing
++
++ status = kalmia_init_and_get_ethernet_addr(dev, ethernet_addr);
++
++ if (status < 0) {
++ usb_set_intfdata(intf, NULL);
++ usb_driver_release_interface(driver_of(intf), intf);
++ return status;
++ }
++
++ memcpy(dev->net->dev_addr, ethernet_addr, ETH_ALEN);
++
++ return status;
++}
++
++static struct sk_buff *
++kalmia_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
++{
++ struct sk_buff *skb2 = NULL;
++ u16 content_len;
++ unsigned char *header_start;
++ unsigned char ether_type_1, ether_type_2;
++ u8 remainder, padlen = 0;
++
++ if (!skb_cloned(skb)) {
++ int headroom = skb_headroom(skb);
++ int tailroom = skb_tailroom(skb);
++
++ if ((tailroom >= KALMIA_ALIGN_SIZE) && (headroom
++ >= KALMIA_HEADER_LENGTH))
++ goto done;
++
++ if ((headroom + tailroom) > (KALMIA_HEADER_LENGTH
++ + KALMIA_ALIGN_SIZE)) {
++ skb->data = memmove(skb->head + KALMIA_HEADER_LENGTH,
++ skb->data, skb->len);
++ skb_set_tail_pointer(skb, skb->len);
++ goto done;
++ }
++ }
++
++ skb2 = skb_copy_expand(skb, KALMIA_HEADER_LENGTH,
++ KALMIA_ALIGN_SIZE, flags);
++ if (!skb2)
++ return NULL;
++
++ dev_kfree_skb_any(skb);
++ skb = skb2;
++
++done:
++ header_start = skb_push(skb, KALMIA_HEADER_LENGTH);
++ ether_type_1 = header_start[KALMIA_HEADER_LENGTH + 12];
++ ether_type_2 = header_start[KALMIA_HEADER_LENGTH + 13];
++
++ netdev_dbg(dev->net, "Sending etherType: %02x%02x", ether_type_1,
++ ether_type_2);
++
++ /* According to empiric data for data packages */
++ header_start[0] = 0x57;
++ header_start[1] = 0x44;
++ content_len = skb->len - KALMIA_HEADER_LENGTH;
++
++ put_unaligned_le16(content_len, &header_start[2]);
++ header_start[4] = ether_type_1;
++ header_start[5] = ether_type_2;
++
++ /* Align to 4 bytes by padding with zeros */
++ remainder = skb->len % KALMIA_ALIGN_SIZE;
++ if (remainder > 0) {
++ padlen = KALMIA_ALIGN_SIZE - remainder;
++ memset(skb_put(skb, padlen), 0, padlen);
++ }
++
++ netdev_dbg(dev->net,
++ "Sending package with length %i and padding %i. Header: %6phC.",
++ content_len, padlen, header_start);
++
++ return skb;
++}
++
++static int
++kalmia_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
++{
++ /*
++ * Our task here is to strip off framing, leaving skb with one
++ * data frame for the usbnet framework code to process.
++ */
++ static const u8 HEADER_END_OF_USB_PACKET[] =
++ { 0x57, 0x5a, 0x00, 0x00, 0x08, 0x00 };
++ static const u8 EXPECTED_UNKNOWN_HEADER_1[] =
++ { 0x57, 0x43, 0x1e, 0x00, 0x15, 0x02 };
++ static const u8 EXPECTED_UNKNOWN_HEADER_2[] =
++ { 0x57, 0x50, 0x0e, 0x00, 0x00, 0x00 };
++ int i = 0;
++
++ /* incomplete header? */
++ if (skb->len < KALMIA_HEADER_LENGTH)
++ return 0;
++
++ do {
++ struct sk_buff *skb2 = NULL;
++ u8 *header_start;
++ u16 usb_packet_length, ether_packet_length;
++ int is_last;
++
++ header_start = skb->data;
++
++ if (unlikely(header_start[0] != 0x57 || header_start[1] != 0x44)) {
++ if (!memcmp(header_start, EXPECTED_UNKNOWN_HEADER_1,
++ sizeof(EXPECTED_UNKNOWN_HEADER_1)) || !memcmp(
++ header_start, EXPECTED_UNKNOWN_HEADER_2,
++ sizeof(EXPECTED_UNKNOWN_HEADER_2))) {
++ netdev_dbg(dev->net,
++ "Received expected unknown frame header: %6phC. Package length: %i\n",
++ header_start,
++ skb->len - KALMIA_HEADER_LENGTH);
++ }
++ else {
++ netdev_err(dev->net,
++ "Received unknown frame header: %6phC. Package length: %i\n",
++ header_start,
++ skb->len - KALMIA_HEADER_LENGTH);
++ return 0;
++ }
++ }
++ else
++ netdev_dbg(dev->net,
++ "Received header: %6phC. Package length: %i\n",
++ header_start, skb->len - KALMIA_HEADER_LENGTH);
++
++ /* subtract start header and end header */
++ usb_packet_length = skb->len - (2 * KALMIA_HEADER_LENGTH);
++ ether_packet_length = get_unaligned_le16(&header_start[2]);
++ skb_pull(skb, KALMIA_HEADER_LENGTH);
++
++ /* Some small packets misses end marker */
++ if (usb_packet_length < ether_packet_length) {
++ ether_packet_length = usb_packet_length
++ + KALMIA_HEADER_LENGTH;
++ is_last = true;
++ }
++ else {
++ netdev_dbg(dev->net, "Correct package length #%i", i
++ + 1);
++
++ is_last = (memcmp(skb->data + ether_packet_length,
++ HEADER_END_OF_USB_PACKET,
++ sizeof(HEADER_END_OF_USB_PACKET)) == 0);
++ if (!is_last) {
++ header_start = skb->data + ether_packet_length;
++ netdev_dbg(dev->net,
++ "End header: %6phC. Package length: %i\n",
++ header_start,
++ skb->len - KALMIA_HEADER_LENGTH);
++ }
++ }
++
++ if (is_last) {
++ skb2 = skb;
++ }
++ else {
++ skb2 = skb_clone(skb, GFP_ATOMIC);
++ if (unlikely(!skb2))
++ return 0;
++ }
++
++ skb_trim(skb2, ether_packet_length);
++
++ if (is_last) {
++ return 1;
++ }
++ else {
++ usbnet_skb_return(dev, skb2);
++ skb_pull(skb, ether_packet_length);
++ }
++
++ i++;
++ }
++ while (skb->len);
++
++ return 1;
++}
++
++static const struct driver_info kalmia_info = {
++ .description = "Samsung Kalmia LTE USB dongle",
++ .flags = FLAG_WWAN,
++ .bind = kalmia_bind,
++ .rx_fixup = kalmia_rx_fixup,
++ .tx_fixup = kalmia_tx_fixup
++};
++
++/*-------------------------------------------------------------------------*/
++
++static const struct usb_device_id products[] = {
++ /* The unswitched USB ID, to get the module auto loaded: */
++ { USB_DEVICE(0x04e8, 0x689a) },
++ /* The stick swithed into modem (by e.g. usb_modeswitch): */
++ { USB_DEVICE(0x04e8, 0x6889),
++ .driver_info = (unsigned long) &kalmia_info, },
++ { /* EMPTY == end of list */} };
++MODULE_DEVICE_TABLE( usb, products);
++
++static struct usb_driver kalmia_driver = {
++ .name = "kalmia",
++ .id_table = products,
++ .probe = usbnet_probe,
++ .disconnect = usbnet_disconnect,
++ .suspend = usbnet_suspend,
++ .resume = usbnet_resume,
++ .disable_hub_initiated_lpm = 1,
++};
++
++module_usb_driver(kalmia_driver);
++
++MODULE_AUTHOR("Marius Bjoernstad Kotsbak <marius(a)kotsbak.com>");
++MODULE_DESCRIPTION("Samsung Kalmia USB network driver");
++MODULE_LICENSE("GPL");
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/kaweth.c backports-4.2.6-1/drivers/net/usb/kaweth.c
+--- backports-4.2.6-1.org/drivers/net/usb/kaweth.c 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/kaweth.c 2015-11-09 23:37:56.000000000 +0100
+@@ -0,0 +1,1331 @@
++/****************************************************************
++ *
++ * kaweth.c - driver for KL5KUSB101 based USB->Ethernet
++ *
++ * (c) 2000 Interlan Communications
++ * (c) 2000 Stephane Alnet
++ * (C) 2001 Brad Hards
++ * (C) 2002 Oliver Neukum
++ *
++ * Original author: The Zapman <zapman(a)interlan.net>
++ * Inspired by, and much credit goes to Michael Rothwell
++ * <rothwell(a)interlan.net> for the test equipment, help, and patience
++ * Based off of (and with thanks to) Petko Manolov's pegaus.c driver.
++ * Also many thanks to Joel Silverman and Ed Surprenant at Kawasaki
++ * for providing the firmware and driver resources.
++ *
++ * 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, 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, see <http://www.gnu.org/licenses/>.
++ *
++ ****************************************************************/
++
++/* TODO:
++ * Develop test procedures for USB net interfaces
++ * Run test procedures
++ * Fix bugs from previous two steps
++ * Snoop other OSs for any tricks we're not doing
++ * Reduce arbitrary timeouts
++ * Smart multicast support
++ * Temporary MAC change support
++ * Tunable SOFs parameter - ioctl()?
++ * Ethernet stats collection
++ * Code formatting improvements
++ */
++
++#include <linux/module.h>
++#include <linux/slab.h>
++#include <linux/string.h>
++#include <linux/delay.h>
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/usb.h>
++#include <linux/types.h>
++#include <linux/ethtool.h>
++#include <linux/dma-mapping.h>
++#include <linux/wait.h>
++#include <linux/firmware.h>
++#include <asm/uaccess.h>
++#include <asm/byteorder.h>
++
++#undef DEBUG
++
++#define KAWETH_MTU 1514
++#define KAWETH_BUF_SIZE 1664
++#define KAWETH_TX_TIMEOUT (5 * HZ)
++#define KAWETH_SCRATCH_SIZE 32
++#define KAWETH_FIRMWARE_BUF_SIZE 4096
++#define KAWETH_CONTROL_TIMEOUT (30000)
++
++#define KAWETH_STATUS_BROKEN 0x0000001
++#define KAWETH_STATUS_CLOSING 0x0000002
++#define KAWETH_STATUS_SUSPENDING 0x0000004
++
++#define KAWETH_STATUS_BLOCKED (KAWETH_STATUS_CLOSING | KAWETH_STATUS_SUSPENDING)
++
++#define KAWETH_PACKET_FILTER_PROMISCUOUS 0x01
++#define KAWETH_PACKET_FILTER_ALL_MULTICAST 0x02
++#define KAWETH_PACKET_FILTER_DIRECTED 0x04
++#define KAWETH_PACKET_FILTER_BROADCAST 0x08
++#define KAWETH_PACKET_FILTER_MULTICAST 0x10
++
++/* Table 7 */
++#define KAWETH_COMMAND_GET_ETHERNET_DESC 0x00
++#define KAWETH_COMMAND_MULTICAST_FILTERS 0x01
++#define KAWETH_COMMAND_SET_PACKET_FILTER 0x02
++#define KAWETH_COMMAND_STATISTICS 0x03
++#define KAWETH_COMMAND_SET_TEMP_MAC 0x06
++#define KAWETH_COMMAND_GET_TEMP_MAC 0x07
++#define KAWETH_COMMAND_SET_URB_SIZE 0x08
++#define KAWETH_COMMAND_SET_SOFS_WAIT 0x09
++#define KAWETH_COMMAND_SCAN 0xFF
++
++#define KAWETH_SOFS_TO_WAIT 0x05
++
++#define INTBUFFERSIZE 4
++
++#define STATE_OFFSET 0
++#define STATE_MASK 0x40
++#define STATE_SHIFT 5
++
++#define IS_BLOCKED(s) (s & KAWETH_STATUS_BLOCKED)
++
++
++MODULE_AUTHOR("Michael Zappe <zapman(a)interlan.net>, Stephane Alnet <stephane(a)u-picardie.fr>, Brad Hards <bhards(a)bigpond.net.au> and Oliver Neukum <oliver(a)neukum.org>");
++MODULE_DESCRIPTION("KL5USB101 USB Ethernet driver");
++MODULE_LICENSE("GPL");
++MODULE_FIRMWARE("kaweth/new_code.bin");
++MODULE_FIRMWARE("kaweth/new_code_fix.bin");
++MODULE_FIRMWARE("kaweth/trigger_code.bin");
++MODULE_FIRMWARE("kaweth/trigger_code_fix.bin");
++
++static const char driver_name[] = "kaweth";
++
++static int kaweth_probe(
++ struct usb_interface *intf,
++ const struct usb_device_id *id /* from id_table */
++ );
++static void kaweth_disconnect(struct usb_interface *intf);
++static int kaweth_internal_control_msg(struct usb_device *usb_dev,
++ unsigned int pipe,
++ struct usb_ctrlrequest *cmd, void *data,
++ int len, int timeout);
++static int kaweth_suspend(struct usb_interface *intf, pm_message_t message);
++static int kaweth_resume(struct usb_interface *intf);
++
++/****************************************************************
++ * usb_device_id
++ ****************************************************************/
++static struct usb_device_id usb_klsi_table[] = {
++ { USB_DEVICE(0x03e8, 0x0008) }, /* AOX Endpoints USB Ethernet */
++ { USB_DEVICE(0x04bb, 0x0901) }, /* I-O DATA USB-ET/T */
++ { USB_DEVICE(0x0506, 0x03e8) }, /* 3Com 3C19250 */
++ { USB_DEVICE(0x0506, 0x11f8) }, /* 3Com 3C460 */
++ { USB_DEVICE(0x0557, 0x2002) }, /* ATEN USB Ethernet */
++ { USB_DEVICE(0x0557, 0x4000) }, /* D-Link DSB-650C */
++ { USB_DEVICE(0x0565, 0x0002) }, /* Peracom Enet */
++ { USB_DEVICE(0x0565, 0x0003) }, /* Optus@Home UEP1045A */
++ { USB_DEVICE(0x0565, 0x0005) }, /* Peracom Enet2 */
++ { USB_DEVICE(0x05e9, 0x0008) }, /* KLSI KL5KUSB101B */
++ { USB_DEVICE(0x05e9, 0x0009) }, /* KLSI KL5KUSB101B (Board change) */
++ { USB_DEVICE(0x066b, 0x2202) }, /* Linksys USB10T */
++ { USB_DEVICE(0x06e1, 0x0008) }, /* ADS USB-10BT */
++ { USB_DEVICE(0x06e1, 0x0009) }, /* ADS USB-10BT */
++ { USB_DEVICE(0x0707, 0x0100) }, /* SMC 2202USB */
++ { USB_DEVICE(0x07aa, 0x0001) }, /* Correga K.K. */
++ { USB_DEVICE(0x07b8, 0x4000) }, /* D-Link DU-E10 */
++ { USB_DEVICE(0x07c9, 0xb010) }, /* Allied Telesyn AT-USB10 USB Ethernet Adapter */
++ { USB_DEVICE(0x0846, 0x1001) }, /* NetGear EA-101 */
++ { USB_DEVICE(0x0846, 0x1002) }, /* NetGear EA-101 */
++ { USB_DEVICE(0x085a, 0x0008) }, /* PortGear Ethernet Adapter */
++ { USB_DEVICE(0x085a, 0x0009) }, /* PortGear Ethernet Adapter */
++ { USB_DEVICE(0x087d, 0x5704) }, /* Jaton USB Ethernet Device Adapter */
++ { USB_DEVICE(0x0951, 0x0008) }, /* Kingston Technology USB Ethernet Adapter */
++ { USB_DEVICE(0x095a, 0x3003) }, /* Portsmith Express Ethernet Adapter */
++ { USB_DEVICE(0x10bd, 0x1427) }, /* ASANTE USB To Ethernet Adapter */
++ { USB_DEVICE(0x1342, 0x0204) }, /* Mobility USB-Ethernet Adapter */
++ { USB_DEVICE(0x13d2, 0x0400) }, /* Shark Pocket Adapter */
++ { USB_DEVICE(0x1485, 0x0001) }, /* Silicom U2E */
++ { USB_DEVICE(0x1485, 0x0002) }, /* Psion Dacom Gold Port Ethernet */
++ { USB_DEVICE(0x1645, 0x0005) }, /* Entrega E45 */
++ { USB_DEVICE(0x1645, 0x0008) }, /* Entrega USB Ethernet Adapter */
++ { USB_DEVICE(0x1645, 0x8005) }, /* PortGear Ethernet Adapter */
++ { USB_DEVICE(0x1668, 0x0323) }, /* Actiontec USB Ethernet */
++ { USB_DEVICE(0x2001, 0x4000) }, /* D-link DSB-650C */
++ {} /* Null terminator */
++};
++
++MODULE_DEVICE_TABLE (usb, usb_klsi_table);
++
++/****************************************************************
++ * kaweth_driver
++ ****************************************************************/
++static struct usb_driver kaweth_driver = {
++ .name = driver_name,
++ .probe = kaweth_probe,
++ .disconnect = kaweth_disconnect,
++ .suspend = kaweth_suspend,
++ .resume = kaweth_resume,
++ .id_table = usb_klsi_table,
++ .supports_autosuspend = 1,
++ .disable_hub_initiated_lpm = 1,
++};
++
++typedef __u8 eth_addr_t[6];
++
++/****************************************************************
++ * usb_eth_dev
++ ****************************************************************/
++struct usb_eth_dev {
++ char *name;
++ __u16 vendor;
++ __u16 device;
++ void *pdata;
++};
++
++/****************************************************************
++ * kaweth_ethernet_configuration
++ * Refer Table 8
++ ****************************************************************/
++struct kaweth_ethernet_configuration
++{
++ __u8 size;
++ __u8 reserved1;
++ __u8 reserved2;
++ eth_addr_t hw_addr;
++ __u32 statistics_mask;
++ __le16 segment_size;
++ __u16 max_multicast_filters;
++ __u8 reserved3;
++} __packed;
++
++/****************************************************************
++ * kaweth_device
++ ****************************************************************/
++struct kaweth_device
++{
++ spinlock_t device_lock;
++
++ __u32 status;
++ int end;
++ int suspend_lowmem_rx;
++ int suspend_lowmem_ctrl;
++ int linkstate;
++ int opened;
++ struct delayed_work lowmem_work;
++
++ struct usb_device *dev;
++ struct usb_interface *intf;
++ struct net_device *net;
++ wait_queue_head_t term_wait;
++
++ struct urb *rx_urb;
++ struct urb *tx_urb;
++ struct urb *irq_urb;
++
++ dma_addr_t intbufferhandle;
++ __u8 *intbuffer;
++ dma_addr_t rxbufferhandle;
++ __u8 *rx_buf;
++
++
++ struct sk_buff *tx_skb;
++
++ __u8 *firmware_buf;
++ __u8 scratch[KAWETH_SCRATCH_SIZE];
++ __u16 packet_filter_bitmap;
++
++ struct kaweth_ethernet_configuration configuration;
++
++ struct net_device_stats stats;
++};
++
++/****************************************************************
++ * kaweth_control
++ ****************************************************************/
++static int kaweth_control(struct kaweth_device *kaweth,
++ unsigned int pipe,
++ __u8 request,
++ __u8 requesttype,
++ __u16 value,
++ __u16 index,
++ void *data,
++ __u16 size,
++ int timeout)
++{
++ struct usb_ctrlrequest *dr;
++ int retval;
++
++ netdev_dbg(kaweth->net, "kaweth_control()\n");
++
++ if(in_interrupt()) {
++ netdev_dbg(kaweth->net, "in_interrupt()\n");
++ return -EBUSY;
++ }
++
++ dr = kmalloc(sizeof(struct usb_ctrlrequest), GFP_ATOMIC);
++ if (!dr)
++ return -ENOMEM;
++
++ dr->bRequestType = requesttype;
++ dr->bRequest = request;
++ dr->wValue = cpu_to_le16(value);
++ dr->wIndex = cpu_to_le16(index);
++ dr->wLength = cpu_to_le16(size);
++
++ retval = kaweth_internal_control_msg(kaweth->dev,
++ pipe,
++ dr,
++ data,
++ size,
++ timeout);
++
++ kfree(dr);
++ return retval;
++}
++
++/****************************************************************
++ * kaweth_read_configuration
++ ****************************************************************/
++static int kaweth_read_configuration(struct kaweth_device *kaweth)
++{
++ int retval;
++
++ netdev_dbg(kaweth->net, "Reading kaweth configuration\n");
++
++ retval = kaweth_control(kaweth,
++ usb_rcvctrlpipe(kaweth->dev, 0),
++ KAWETH_COMMAND_GET_ETHERNET_DESC,
++ USB_TYPE_VENDOR | USB_DIR_IN | USB_RECIP_DEVICE,
++ 0,
++ 0,
++ (void *)&kaweth->configuration,
++ sizeof(kaweth->configuration),
++ KAWETH_CONTROL_TIMEOUT);
++
++ return retval;
++}
++
++/****************************************************************
++ * kaweth_set_urb_size
++ ****************************************************************/
++static int kaweth_set_urb_size(struct kaweth_device *kaweth, __u16 urb_size)
++{
++ int retval;
++
++ netdev_dbg(kaweth->net, "Setting URB size to %d\n", (unsigned)urb_size);
++
++ retval = kaweth_control(kaweth,
++ usb_sndctrlpipe(kaweth->dev, 0),
++ KAWETH_COMMAND_SET_URB_SIZE,
++ USB_TYPE_VENDOR | USB_DIR_OUT | USB_RECIP_DEVICE,
++ urb_size,
++ 0,
++ (void *)&kaweth->scratch,
++ 0,
++ KAWETH_CONTROL_TIMEOUT);
++
++ return retval;
++}
++
++/****************************************************************
++ * kaweth_set_sofs_wait
++ ****************************************************************/
++static int kaweth_set_sofs_wait(struct kaweth_device *kaweth, __u16 sofs_wait)
++{
++ int retval;
++
++ netdev_dbg(kaweth->net, "Set SOFS wait to %d\n", (unsigned)sofs_wait);
++
++ retval = kaweth_control(kaweth,
++ usb_sndctrlpipe(kaweth->dev, 0),
++ KAWETH_COMMAND_SET_SOFS_WAIT,
++ USB_TYPE_VENDOR | USB_DIR_OUT | USB_RECIP_DEVICE,
++ sofs_wait,
++ 0,
++ (void *)&kaweth->scratch,
++ 0,
++ KAWETH_CONTROL_TIMEOUT);
++
++ return retval;
++}
++
++/****************************************************************
++ * kaweth_set_receive_filter
++ ****************************************************************/
++static int kaweth_set_receive_filter(struct kaweth_device *kaweth,
++ __u16 receive_filter)
++{
++ int retval;
++
++ netdev_dbg(kaweth->net, "Set receive filter to %d\n",
++ (unsigned)receive_filter);
++
++ retval = kaweth_control(kaweth,
++ usb_sndctrlpipe(kaweth->dev, 0),
++ KAWETH_COMMAND_SET_PACKET_FILTER,
++ USB_TYPE_VENDOR | USB_DIR_OUT | USB_RECIP_DEVICE,
++ receive_filter,
++ 0,
++ (void *)&kaweth->scratch,
++ 0,
++ KAWETH_CONTROL_TIMEOUT);
++
++ return retval;
++}
++
++/****************************************************************
++ * kaweth_download_firmware
++ ****************************************************************/
++static int kaweth_download_firmware(struct kaweth_device *kaweth,
++ const char *fwname,
++ __u8 interrupt,
++ __u8 type)
++{
++ const struct firmware *fw;
++ int data_len;
++ int ret;
++
++ ret = request_firmware(&fw, fwname, &kaweth->dev->dev);
++ if (ret) {
++ dev_err(&kaweth->intf->dev, "Firmware request failed\n");
++ return ret;
++ }
++
++ if (fw->size > KAWETH_FIRMWARE_BUF_SIZE) {
++ dev_err(&kaweth->intf->dev, "Firmware too big: %zu\n",
++ fw->size);
++ release_firmware(fw);
++ return -ENOSPC;
++ }
++ data_len = fw->size;
++ memcpy(kaweth->firmware_buf, fw->data, fw->size);
++
++ release_firmware(fw);
++
++ kaweth->firmware_buf[2] = (data_len & 0xFF) - 7;
++ kaweth->firmware_buf[3] = data_len >> 8;
++ kaweth->firmware_buf[4] = type;
++ kaweth->firmware_buf[5] = interrupt;
++
++ netdev_dbg(kaweth->net, "High: %i, Low:%i\n", kaweth->firmware_buf[3],
++ kaweth->firmware_buf[2]);
++
++ netdev_dbg(kaweth->net,
++ "Downloading firmware at %p to kaweth device at %p\n",
++ kaweth->firmware_buf, kaweth);
++ netdev_dbg(kaweth->net, "Firmware length: %d\n", data_len);
++
++ return kaweth_control(kaweth,
++ usb_sndctrlpipe(kaweth->dev, 0),
++ KAWETH_COMMAND_SCAN,
++ USB_TYPE_VENDOR | USB_DIR_OUT | USB_RECIP_DEVICE,
++ 0,
++ 0,
++ (void *)kaweth->firmware_buf,
++ data_len,
++ KAWETH_CONTROL_TIMEOUT);
++}
++
++/****************************************************************
++ * kaweth_trigger_firmware
++ ****************************************************************/
++static int kaweth_trigger_firmware(struct kaweth_device *kaweth,
++ __u8 interrupt)
++{
++ kaweth->firmware_buf[0] = 0xB6;
++ kaweth->firmware_buf[1] = 0xC3;
++ kaweth->firmware_buf[2] = 0x01;
++ kaweth->firmware_buf[3] = 0x00;
++ kaweth->firmware_buf[4] = 0x06;
++ kaweth->firmware_buf[5] = interrupt;
++ kaweth->firmware_buf[6] = 0x00;
++ kaweth->firmware_buf[7] = 0x00;
++
++ netdev_dbg(kaweth->net, "Triggering firmware\n");
++
++ return kaweth_control(kaweth,
++ usb_sndctrlpipe(kaweth->dev, 0),
++ KAWETH_COMMAND_SCAN,
++ USB_TYPE_VENDOR | USB_DIR_OUT | USB_RECIP_DEVICE,
++ 0,
++ 0,
++ (void *)kaweth->firmware_buf,
++ 8,
++ KAWETH_CONTROL_TIMEOUT);
++}
++
++/****************************************************************
++ * kaweth_reset
++ ****************************************************************/
++static int kaweth_reset(struct kaweth_device *kaweth)
++{
++ int result;
++
++ netdev_dbg(kaweth->net, "kaweth_reset(%p)\n", kaweth);
++ result = usb_reset_configuration(kaweth->dev);
++ mdelay(10);
++
++ netdev_dbg(kaweth->net, "kaweth_reset() returns %d.\n", result);
++
++ return result;
++}
++
++static void kaweth_usb_receive(struct urb *);
++static int kaweth_resubmit_rx_urb(struct kaweth_device *, gfp_t);
++
++/****************************************************************
++ int_callback
++*****************************************************************/
++
++static void kaweth_resubmit_int_urb(struct kaweth_device *kaweth, gfp_t mf)
++{
++ int status;
++
++ status = usb_submit_urb (kaweth->irq_urb, mf);
++ if (unlikely(status == -ENOMEM)) {
++ kaweth->suspend_lowmem_ctrl = 1;
++ schedule_delayed_work(&kaweth->lowmem_work, HZ/4);
++ } else {
++ kaweth->suspend_lowmem_ctrl = 0;
++ }
++
++ if (status)
++ dev_err(&kaweth->intf->dev,
++ "can't resubmit intr, %s-%s, status %d\n",
++ kaweth->dev->bus->bus_name,
++ kaweth->dev->devpath, status);
++}
++
++static void int_callback(struct urb *u)
++{
++ struct kaweth_device *kaweth = u->context;
++ int act_state;
++ int status = u->status;
++
++ switch (status) {
++ case 0: /* success */
++ break;
++ case -ECONNRESET: /* unlink */
++ case -ENOENT:
++ case -ESHUTDOWN:
++ return;
++ /* -EPIPE: should clear the halt */
++ default: /* error */
++ goto resubmit;
++ }
++
++ /* we check the link state to report changes */
++ if (kaweth->linkstate != (act_state = ( kaweth->intbuffer[STATE_OFFSET] | STATE_MASK) >> STATE_SHIFT)) {
++ if (act_state)
++ netif_carrier_on(kaweth->net);
++ else
++ netif_carrier_off(kaweth->net);
++
++ kaweth->linkstate = act_state;
++ }
++resubmit:
++ kaweth_resubmit_int_urb(kaweth, GFP_ATOMIC);
++}
++
++static void kaweth_resubmit_tl(struct work_struct *work)
++{
++ struct kaweth_device *kaweth =
++ container_of(work, struct kaweth_device, lowmem_work.work);
++
++ if (IS_BLOCKED(kaweth->status))
++ return;
++
++ if (kaweth->suspend_lowmem_rx)
++ kaweth_resubmit_rx_urb(kaweth, GFP_NOIO);
++
++ if (kaweth->suspend_lowmem_ctrl)
++ kaweth_resubmit_int_urb(kaweth, GFP_NOIO);
++}
++
++
++/****************************************************************
++ * kaweth_resubmit_rx_urb
++ ****************************************************************/
++static int kaweth_resubmit_rx_urb(struct kaweth_device *kaweth,
++ gfp_t mem_flags)
++{
++ int result;
++
++ usb_fill_bulk_urb(kaweth->rx_urb,
++ kaweth->dev,
++ usb_rcvbulkpipe(kaweth->dev, 1),
++ kaweth->rx_buf,
++ KAWETH_BUF_SIZE,
++ kaweth_usb_receive,
++ kaweth);
++ kaweth->rx_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
++ kaweth->rx_urb->transfer_dma = kaweth->rxbufferhandle;
++
++ if((result = usb_submit_urb(kaweth->rx_urb, mem_flags))) {
++ if (result == -ENOMEM) {
++ kaweth->suspend_lowmem_rx = 1;
++ schedule_delayed_work(&kaweth->lowmem_work, HZ/4);
++ }
++ dev_err(&kaweth->intf->dev, "resubmitting rx_urb %d failed\n",
++ result);
++ } else {
++ kaweth->suspend_lowmem_rx = 0;
++ }
++
++ return result;
++}
++
++static void kaweth_async_set_rx_mode(struct kaweth_device *kaweth);
++
++/****************************************************************
++ * kaweth_usb_receive
++ ****************************************************************/
++static void kaweth_usb_receive(struct urb *urb)
++{
++ struct device *dev = &urb->dev->dev;
++ struct kaweth_device *kaweth = urb->context;
++ struct net_device *net = kaweth->net;
++ int status = urb->status;
++
++ int count = urb->actual_length;
++ int count2 = urb->transfer_buffer_length;
++
++ __u16 pkt_len = le16_to_cpup((__le16 *)kaweth->rx_buf);
++
++ struct sk_buff *skb;
++
++ if (unlikely(status == -EPIPE)) {
++ kaweth->stats.rx_errors++;
++ kaweth->end = 1;
++ wake_up(&kaweth->term_wait);
++ dev_dbg(dev, "Status was -EPIPE.\n");
++ return;
++ }
++ if (unlikely(status == -ECONNRESET || status == -ESHUTDOWN)) {
++ /* we are killed - set a flag and wake the disconnect handler */
++ kaweth->end = 1;
++ wake_up(&kaweth->term_wait);
++ dev_dbg(dev, "Status was -ECONNRESET or -ESHUTDOWN.\n");
++ return;
++ }
++ if (unlikely(status == -EPROTO || status == -ETIME ||
++ status == -EILSEQ)) {
++ kaweth->stats.rx_errors++;
++ dev_dbg(dev, "Status was -EPROTO, -ETIME, or -EILSEQ.\n");
++ return;
++ }
++ if (unlikely(status == -EOVERFLOW)) {
++ kaweth->stats.rx_errors++;
++ dev_dbg(dev, "Status was -EOVERFLOW.\n");
++ }
++ spin_lock(&kaweth->device_lock);
++ if (IS_BLOCKED(kaweth->status)) {
++ spin_unlock(&kaweth->device_lock);
++ return;
++ }
++ spin_unlock(&kaweth->device_lock);
++
++ if(status && status != -EREMOTEIO && count != 1) {
++ dev_err(&kaweth->intf->dev,
++ "%s RX status: %d count: %d packet_len: %d\n",
++ net->name, status, count, (int)pkt_len);
++ kaweth_resubmit_rx_urb(kaweth, GFP_ATOMIC);
++ return;
++ }
++
++ if(kaweth->net && (count > 2)) {
++ if(pkt_len > (count - 2)) {
++ dev_err(&kaweth->intf->dev,
++ "Packet length too long for USB frame (pkt_len: %x, count: %x)\n",
++ pkt_len, count);
++ dev_err(&kaweth->intf->dev, "Packet len & 2047: %x\n",
++ pkt_len & 2047);
++ dev_err(&kaweth->intf->dev, "Count 2: %x\n", count2);
++ kaweth_resubmit_rx_urb(kaweth, GFP_ATOMIC);
++ return;
++ }
++
++ if(!(skb = dev_alloc_skb(pkt_len+2))) {
++ kaweth_resubmit_rx_urb(kaweth, GFP_ATOMIC);
++ return;
++ }
++
++ skb_reserve(skb, 2); /* Align IP on 16 byte boundaries */
++
++ skb_copy_to_linear_data(skb, kaweth->rx_buf + 2, pkt_len);
++
++ skb_put(skb, pkt_len);
++
++ skb->protocol = eth_type_trans(skb, net);
++
++ netif_rx(skb);
++
++ kaweth->stats.rx_packets++;
++ kaweth->stats.rx_bytes += pkt_len;
++ }
++
++ kaweth_resubmit_rx_urb(kaweth, GFP_ATOMIC);
++}
++
++/****************************************************************
++ * kaweth_open
++ ****************************************************************/
++static int kaweth_open(struct net_device *net)
++{
++ struct kaweth_device *kaweth = netdev_priv(net);
++ int res;
++
++ netdev_dbg(kaweth->net, "Opening network device.\n");
++
++ res = usb_autopm_get_interface(kaweth->intf);
++ if (res) {
++ dev_err(&kaweth->intf->dev, "Interface cannot be resumed.\n");
++ return -EIO;
++ }
++ res = kaweth_resubmit_rx_urb(kaweth, GFP_KERNEL);
++ if (res)
++ goto err_out;
++
++ usb_fill_int_urb(
++ kaweth->irq_urb,
++ kaweth->dev,
++ usb_rcvintpipe(kaweth->dev, 3),
++ kaweth->intbuffer,
++ INTBUFFERSIZE,
++ int_callback,
++ kaweth,
++ 250); /* overriding the descriptor */
++ kaweth->irq_urb->transfer_dma = kaweth->intbufferhandle;
++ kaweth->irq_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
++
++ res = usb_submit_urb(kaweth->irq_urb, GFP_KERNEL);
++ if (res) {
++ usb_kill_urb(kaweth->rx_urb);
++ goto err_out;
++ }
++ kaweth->opened = 1;
++
++ netif_start_queue(net);
++
++ kaweth_async_set_rx_mode(kaweth);
++ return 0;
++
++err_out:
++ usb_autopm_put_interface(kaweth->intf);
++ return -EIO;
++}
++
++/****************************************************************
++ * kaweth_kill_urbs
++ ****************************************************************/
++static void kaweth_kill_urbs(struct kaweth_device *kaweth)
++{
++ usb_kill_urb(kaweth->irq_urb);
++ usb_kill_urb(kaweth->rx_urb);
++ usb_kill_urb(kaweth->tx_urb);
++
++ cancel_delayed_work_sync(&kaweth->lowmem_work);
++
++ /* a scheduled work may have resubmitted,
++ we hit them again */
++ usb_kill_urb(kaweth->irq_urb);
++ usb_kill_urb(kaweth->rx_urb);
++}
++
++/****************************************************************
++ * kaweth_close
++ ****************************************************************/
++static int kaweth_close(struct net_device *net)
++{
++ struct kaweth_device *kaweth = netdev_priv(net);
++
++ netif_stop_queue(net);
++ kaweth->opened = 0;
++
++ kaweth->status |= KAWETH_STATUS_CLOSING;
++
++ kaweth_kill_urbs(kaweth);
++
++ kaweth->status &= ~KAWETH_STATUS_CLOSING;
++
++ usb_autopm_put_interface(kaweth->intf);
++
++ return 0;
++}
++
++static u32 kaweth_get_link(struct net_device *dev)
++{
++ struct kaweth_device *kaweth = netdev_priv(dev);
++
++ return kaweth->linkstate;
++}
++
++static const struct ethtool_ops ops = {
++ .get_link = kaweth_get_link
++};
++
++/****************************************************************
++ * kaweth_usb_transmit_complete
++ ****************************************************************/
++static void kaweth_usb_transmit_complete(struct urb *urb)
++{
++ struct kaweth_device *kaweth = urb->context;
++ struct sk_buff *skb = kaweth->tx_skb;
++ int status = urb->status;
++
++ if (unlikely(status != 0))
++ if (status != -ENOENT)
++ dev_dbg(&urb->dev->dev, "%s: TX status %d.\n",
++ kaweth->net->name, status);
++
++ netif_wake_queue(kaweth->net);
++ dev_kfree_skb_irq(skb);
++}
++
++/****************************************************************
++ * kaweth_start_xmit
++ ****************************************************************/
++static netdev_tx_t kaweth_start_xmit(struct sk_buff *skb,
++ struct net_device *net)
++{
++ struct kaweth_device *kaweth = netdev_priv(net);
++ __le16 *private_header;
++
++ int res;
++
++ spin_lock_irq(&kaweth->device_lock);
++
++ kaweth_async_set_rx_mode(kaweth);
++ netif_stop_queue(net);
++ if (IS_BLOCKED(kaweth->status)) {
++ goto skip;
++ }
++
++ /* We now decide whether we can put our special header into the sk_buff */
++ if (skb_cloned(skb) || skb_headroom(skb) < 2) {
++ /* no such luck - we make our own */
++ struct sk_buff *copied_skb;
++ copied_skb = skb_copy_expand(skb, 2, 0, GFP_ATOMIC);
++ dev_kfree_skb_irq(skb);
++ skb = copied_skb;
++ if (!copied_skb) {
++ kaweth->stats.tx_errors++;
++ netif_start_queue(net);
++ spin_unlock_irq(&kaweth->device_lock);
++ return NETDEV_TX_OK;
++ }
++ }
++
++ private_header = (__le16 *)__skb_push(skb, 2);
++ *private_header = cpu_to_le16(skb->len-2);
++ kaweth->tx_skb = skb;
++
++ usb_fill_bulk_urb(kaweth->tx_urb,
++ kaweth->dev,
++ usb_sndbulkpipe(kaweth->dev, 2),
++ private_header,
++ skb->len,
++ kaweth_usb_transmit_complete,
++ kaweth);
++ kaweth->end = 0;
++
++ if((res = usb_submit_urb(kaweth->tx_urb, GFP_ATOMIC)))
++ {
++ dev_warn(&net->dev, "kaweth failed tx_urb %d\n", res);
++skip:
++ kaweth->stats.tx_errors++;
++
++ netif_start_queue(net);
++ dev_kfree_skb_irq(skb);
++ }
++ else
++ {
++ kaweth->stats.tx_packets++;
++ kaweth->stats.tx_bytes += skb->len;
++ }
++
++ spin_unlock_irq(&kaweth->device_lock);
++
++ return NETDEV_TX_OK;
++}
++
++/****************************************************************
++ * kaweth_set_rx_mode
++ ****************************************************************/
++static void kaweth_set_rx_mode(struct net_device *net)
++{
++ struct kaweth_device *kaweth = netdev_priv(net);
++
++ __u16 packet_filter_bitmap = KAWETH_PACKET_FILTER_DIRECTED |
++ KAWETH_PACKET_FILTER_BROADCAST |
++ KAWETH_PACKET_FILTER_MULTICAST;
++
++ netdev_dbg(net, "Setting Rx mode to %d\n", packet_filter_bitmap);
++
++ netif_stop_queue(net);
++
++ if (net->flags & IFF_PROMISC) {
++ packet_filter_bitmap |= KAWETH_PACKET_FILTER_PROMISCUOUS;
++ }
++ else if (!netdev_mc_empty(net) || (net->flags & IFF_ALLMULTI)) {
++ packet_filter_bitmap |= KAWETH_PACKET_FILTER_ALL_MULTICAST;
++ }
++
++ kaweth->packet_filter_bitmap = packet_filter_bitmap;
++ netif_wake_queue(net);
++}
++
++/****************************************************************
++ * kaweth_async_set_rx_mode
++ ****************************************************************/
++static void kaweth_async_set_rx_mode(struct kaweth_device *kaweth)
++{
++ int result;
++ __u16 packet_filter_bitmap = kaweth->packet_filter_bitmap;
++
++ kaweth->packet_filter_bitmap = 0;
++ if (packet_filter_bitmap == 0)
++ return;
++
++ if (in_interrupt())
++ return;
++
++ result = kaweth_control(kaweth,
++ usb_sndctrlpipe(kaweth->dev, 0),
++ KAWETH_COMMAND_SET_PACKET_FILTER,
++ USB_TYPE_VENDOR | USB_DIR_OUT | USB_RECIP_DEVICE,
++ packet_filter_bitmap,
++ 0,
++ (void *)&kaweth->scratch,
++ 0,
++ KAWETH_CONTROL_TIMEOUT);
++
++ if(result < 0) {
++ dev_err(&kaweth->intf->dev, "Failed to set Rx mode: %d\n",
++ result);
++ }
++ else {
++ netdev_dbg(kaweth->net, "Set Rx mode to %d\n",
++ packet_filter_bitmap);
++ }
++}
++
++/****************************************************************
++ * kaweth_netdev_stats
++ ****************************************************************/
++static struct net_device_stats *kaweth_netdev_stats(struct net_device *dev)
++{
++ struct kaweth_device *kaweth = netdev_priv(dev);
++ return &kaweth->stats;
++}
++
++/****************************************************************
++ * kaweth_tx_timeout
++ ****************************************************************/
++static void kaweth_tx_timeout(struct net_device *net)
++{
++ struct kaweth_device *kaweth = netdev_priv(net);
++
++ dev_warn(&net->dev, "%s: Tx timed out. Resetting.\n", net->name);
++ kaweth->stats.tx_errors++;
++ net->trans_start = jiffies;
++
++ usb_unlink_urb(kaweth->tx_urb);
++}
++
++/****************************************************************
++ * kaweth_suspend
++ ****************************************************************/
++static int kaweth_suspend(struct usb_interface *intf, pm_message_t message)
++{
++ struct kaweth_device *kaweth = usb_get_intfdata(intf);
++ unsigned long flags;
++
++ dev_dbg(&intf->dev, "Suspending device\n");
++ spin_lock_irqsave(&kaweth->device_lock, flags);
++ kaweth->status |= KAWETH_STATUS_SUSPENDING;
++ spin_unlock_irqrestore(&kaweth->device_lock, flags);
++
++ kaweth_kill_urbs(kaweth);
++ return 0;
++}
++
++/****************************************************************
++ * kaweth_resume
++ ****************************************************************/
++static int kaweth_resume(struct usb_interface *intf)
++{
++ struct kaweth_device *kaweth = usb_get_intfdata(intf);
++ unsigned long flags;
++
++ dev_dbg(&intf->dev, "Resuming device\n");
++ spin_lock_irqsave(&kaweth->device_lock, flags);
++ kaweth->status &= ~KAWETH_STATUS_SUSPENDING;
++ spin_unlock_irqrestore(&kaweth->device_lock, flags);
++
++ if (!kaweth->opened)
++ return 0;
++ kaweth_resubmit_rx_urb(kaweth, GFP_NOIO);
++ kaweth_resubmit_int_urb(kaweth, GFP_NOIO);
++
++ return 0;
++}
++
++/****************************************************************
++ * kaweth_probe
++ ****************************************************************/
++
++
++static const struct net_device_ops kaweth_netdev_ops = {
++ .ndo_open = kaweth_open,
++ .ndo_stop = kaweth_close,
++ .ndo_start_xmit = kaweth_start_xmit,
++ .ndo_tx_timeout = kaweth_tx_timeout,
++ .ndo_set_rx_mode = kaweth_set_rx_mode,
++ .ndo_get_stats = kaweth_netdev_stats,
++ .ndo_change_mtu = eth_change_mtu,
++ .ndo_set_mac_address = eth_mac_addr,
++ .ndo_validate_addr = eth_validate_addr,
++};
++
++static int kaweth_probe(
++ struct usb_interface *intf,
++ const struct usb_device_id *id /* from id_table */
++ )
++{
++ struct device *dev = &intf->dev;
++ struct usb_device *udev = interface_to_usbdev(intf);
++ struct kaweth_device *kaweth;
++ struct net_device *netdev;
++ const eth_addr_t bcast_addr = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
++ int result = 0;
++
++ dev_dbg(dev,
++ "Kawasaki Device Probe (Device number:%d): 0x%4.4x:0x%4.4x:0x%4.4x\n",
++ udev->devnum, le16_to_cpu(udev->descriptor.idVendor),
++ le16_to_cpu(udev->descriptor.idProduct),
++ le16_to_cpu(udev->descriptor.bcdDevice));
++
++ dev_dbg(dev, "Device at %p\n", udev);
++
++ dev_dbg(dev, "Descriptor length: %x type: %x\n",
++ (int)udev->descriptor.bLength,
++ (int)udev->descriptor.bDescriptorType);
++
++ netdev = alloc_etherdev(sizeof(*kaweth));
++ if (!netdev)
++ return -ENOMEM;
++
++ kaweth = netdev_priv(netdev);
++ kaweth->dev = udev;
++ kaweth->net = netdev;
++
++ spin_lock_init(&kaweth->device_lock);
++ init_waitqueue_head(&kaweth->term_wait);
++
++ dev_dbg(dev, "Resetting.\n");
++
++ kaweth_reset(kaweth);
++
++ /*
++ * If high byte of bcdDevice is nonzero, firmware is already
++ * downloaded. Don't try to do it again, or we'll hang the device.
++ */
++
++ if (le16_to_cpu(udev->descriptor.bcdDevice) >> 8) {
++ dev_info(dev, "Firmware present in device.\n");
++ } else {
++ /* Download the firmware */
++ dev_info(dev, "Downloading firmware...\n");
++ kaweth->firmware_buf = (__u8 *)__get_free_page(GFP_KERNEL);
++ if ((result = kaweth_download_firmware(kaweth,
++ "kaweth/new_code.bin",
++ 100,
++ 2)) < 0) {
++ dev_err(dev, "Error downloading firmware (%d)\n",
++ result);
++ goto err_fw;
++ }
++
++ if ((result = kaweth_download_firmware(kaweth,
++ "kaweth/new_code_fix.bin",
++ 100,
++ 3)) < 0) {
++ dev_err(dev, "Error downloading firmware fix (%d)\n",
++ result);
++ goto err_fw;
++ }
++
++ if ((result = kaweth_download_firmware(kaweth,
++ "kaweth/trigger_code.bin",
++ 126,
++ 2)) < 0) {
++ dev_err(dev, "Error downloading trigger code (%d)\n",
++ result);
++ goto err_fw;
++
++ }
++
++ if ((result = kaweth_download_firmware(kaweth,
++ "kaweth/trigger_code_fix.bin",
++ 126,
++ 3)) < 0) {
++ dev_err(dev, "Error downloading trigger code fix (%d)\n", result);
++ goto err_fw;
++ }
++
++
++ if ((result = kaweth_trigger_firmware(kaweth, 126)) < 0) {
++ dev_err(dev, "Error triggering firmware (%d)\n", result);
++ goto err_fw;
++ }
++
++ /* Device will now disappear for a moment... */
++ dev_info(dev, "Firmware loaded. I'll be back...\n");
++err_fw:
++ free_page((unsigned long)kaweth->firmware_buf);
++ free_netdev(netdev);
++ return -EIO;
++ }
++
++ result = kaweth_read_configuration(kaweth);
++
++ if(result < 0) {
++ dev_err(dev, "Error reading configuration (%d), no net device created\n", result);
++ goto err_free_netdev;
++ }
++
++ dev_info(dev, "Statistics collection: %x\n", kaweth->configuration.statistics_mask);
++ dev_info(dev, "Multicast filter limit: %x\n", kaweth->configuration.max_multicast_filters & ((1 << 15) - 1));
++ dev_info(dev, "MTU: %d\n", le16_to_cpu(kaweth->configuration.segment_size));
++ dev_info(dev, "Read MAC address %pM\n", kaweth->configuration.hw_addr);
++
++ if(!memcmp(&kaweth->configuration.hw_addr,
++ &bcast_addr,
++ sizeof(bcast_addr))) {
++ dev_err(dev, "Firmware not functioning properly, no net device created\n");
++ goto err_free_netdev;
++ }
++
++ if(kaweth_set_urb_size(kaweth, KAWETH_BUF_SIZE) < 0) {
++ dev_dbg(dev, "Error setting URB size\n");
++ goto err_free_netdev;
++ }
++
++ if(kaweth_set_sofs_wait(kaweth, KAWETH_SOFS_TO_WAIT) < 0) {
++ dev_err(dev, "Error setting SOFS wait\n");
++ goto err_free_netdev;
++ }
++
++ result = kaweth_set_receive_filter(kaweth,
++ KAWETH_PACKET_FILTER_DIRECTED |
++ KAWETH_PACKET_FILTER_BROADCAST |
++ KAWETH_PACKET_FILTER_MULTICAST);
++
++ if(result < 0) {
++ dev_err(dev, "Error setting receive filter\n");
++ goto err_free_netdev;
++ }
++
++ dev_dbg(dev, "Initializing net device.\n");
++
++ kaweth->intf = intf;
++
++ kaweth->tx_urb = usb_alloc_urb(0, GFP_KERNEL);
++ if (!kaweth->tx_urb)
++ goto err_free_netdev;
++ kaweth->rx_urb = usb_alloc_urb(0, GFP_KERNEL);
++ if (!kaweth->rx_urb)
++ goto err_only_tx;
++ kaweth->irq_urb = usb_alloc_urb(0, GFP_KERNEL);
++ if (!kaweth->irq_urb)
++ goto err_tx_and_rx;
++
++ kaweth->intbuffer = usb_alloc_coherent( kaweth->dev,
++ INTBUFFERSIZE,
++ GFP_KERNEL,
++ &kaweth->intbufferhandle);
++ if (!kaweth->intbuffer)
++ goto err_tx_and_rx_and_irq;
++ kaweth->rx_buf = usb_alloc_coherent( kaweth->dev,
++ KAWETH_BUF_SIZE,
++ GFP_KERNEL,
++ &kaweth->rxbufferhandle);
++ if (!kaweth->rx_buf)
++ goto err_all_but_rxbuf;
++
++ memcpy(netdev->broadcast, &bcast_addr, sizeof(bcast_addr));
++ memcpy(netdev->dev_addr, &kaweth->configuration.hw_addr,
++ sizeof(kaweth->configuration.hw_addr));
++
++ netdev->netdev_ops = &kaweth_netdev_ops;
++ netdev->watchdog_timeo = KAWETH_TX_TIMEOUT;
++ netdev->mtu = le16_to_cpu(kaweth->configuration.segment_size);
++ netdev->ethtool_ops = &ops;
++
++ /* kaweth is zeroed as part of alloc_netdev */
++ INIT_DELAYED_WORK(&kaweth->lowmem_work, kaweth_resubmit_tl);
++ usb_set_intfdata(intf, kaweth);
++
++#if 0
++// dma_supported() is deeply broken on almost all architectures
++ if (dma_supported (dev, 0xffffffffffffffffULL))
++ kaweth->net->features |= NETIF_F_HIGHDMA;
++#endif
++
++ SET_NETDEV_DEV(netdev, dev);
++ if (register_netdev(netdev) != 0) {
++ dev_err(dev, "Error registering netdev.\n");
++ goto err_intfdata;
++ }
++
++ dev_info(dev, "kaweth interface created at %s\n",
++ kaweth->net->name);
++
++ dev_dbg(dev, "Kaweth probe returning.\n");
++
++ return 0;
++
++err_intfdata:
++ usb_set_intfdata(intf, NULL);
++ usb_free_coherent(kaweth->dev, KAWETH_BUF_SIZE, (void *)kaweth->rx_buf, kaweth->rxbufferhandle);
++err_all_but_rxbuf:
++ usb_free_coherent(kaweth->dev, INTBUFFERSIZE, (void *)kaweth->intbuffer, kaweth->intbufferhandle);
++err_tx_and_rx_and_irq:
++ usb_free_urb(kaweth->irq_urb);
++err_tx_and_rx:
++ usb_free_urb(kaweth->rx_urb);
++err_only_tx:
++ usb_free_urb(kaweth->tx_urb);
++err_free_netdev:
++ free_netdev(netdev);
++
++ return -EIO;
++}
++
++/****************************************************************
++ * kaweth_disconnect
++ ****************************************************************/
++static void kaweth_disconnect(struct usb_interface *intf)
++{
++ struct kaweth_device *kaweth = usb_get_intfdata(intf);
++ struct net_device *netdev;
++
++ dev_info(&intf->dev, "Unregistering\n");
++
++ usb_set_intfdata(intf, NULL);
++ if (!kaweth) {
++ dev_warn(&intf->dev, "unregistering non-existent device\n");
++ return;
++ }
++ netdev = kaweth->net;
++
++ netdev_dbg(kaweth->net, "Unregistering net device\n");
++ unregister_netdev(netdev);
++
++ usb_free_urb(kaweth->rx_urb);
++ usb_free_urb(kaweth->tx_urb);
++ usb_free_urb(kaweth->irq_urb);
++
++ usb_free_coherent(kaweth->dev, KAWETH_BUF_SIZE, (void *)kaweth->rx_buf, kaweth->rxbufferhandle);
++ usb_free_coherent(kaweth->dev, INTBUFFERSIZE, (void *)kaweth->intbuffer, kaweth->intbufferhandle);
++
++ free_netdev(netdev);
++}
++
++
++// FIXME this completion stuff is a modified clone of
++// an OLD version of some stuff in usb.c ...
++struct usb_api_data {
++ wait_queue_head_t wqh;
++ int done;
++};
++
++/*-------------------------------------------------------------------*
++ * completion handler for compatibility wrappers (sync control/bulk) *
++ *-------------------------------------------------------------------*/
++static void usb_api_blocking_completion(struct urb *urb)
++{
++ struct usb_api_data *awd = (struct usb_api_data *)urb->context;
++
++ awd->done=1;
++ wake_up(&awd->wqh);
++}
++
++/*-------------------------------------------------------------------*
++ * COMPATIBILITY STUFF *
++ *-------------------------------------------------------------------*/
++
++// Starts urb and waits for completion or timeout
++static int usb_start_wait_urb(struct urb *urb, int timeout, int* actual_length)
++{
++ struct usb_api_data awd;
++ int status;
++
++ init_waitqueue_head(&awd.wqh);
++ awd.done = 0;
++
++ urb->context = &awd;
++ status = usb_submit_urb(urb, GFP_ATOMIC);
++ if (status) {
++ // something went wrong
++ usb_free_urb(urb);
++ return status;
++ }
++
++ if (!wait_event_timeout(awd.wqh, awd.done, timeout)) {
++ // timeout
++ dev_warn(&urb->dev->dev, "usb_control/bulk_msg: timeout\n");
++ usb_kill_urb(urb); // remove urb safely
++ status = -ETIMEDOUT;
++ }
++ else {
++ status = urb->status;
++ }
++
++ if (actual_length) {
++ *actual_length = urb->actual_length;
++ }
++
++ usb_free_urb(urb);
++ return status;
++}
++
++/*-------------------------------------------------------------------*/
++// returns status (negative) or length (positive)
++static int kaweth_internal_control_msg(struct usb_device *usb_dev,
++ unsigned int pipe,
++ struct usb_ctrlrequest *cmd, void *data,
++ int len, int timeout)
++{
++ struct urb *urb;
++ int retv;
++ int length = 0; /* shut up GCC */
++
++ urb = usb_alloc_urb(0, GFP_ATOMIC);
++ if (!urb)
++ return -ENOMEM;
++
++ usb_fill_control_urb(urb, usb_dev, pipe, (unsigned char*)cmd, data,
++ len, usb_api_blocking_completion, NULL);
++
++ retv = usb_start_wait_urb(urb, timeout, &length);
++ if (retv < 0) {
++ return retv;
++ }
++ else {
++ return length;
++ }
++}
++
++module_usb_driver(kaweth_driver);
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/Kconfig backports-4.2.6-1/drivers/net/usb/Kconfig
+--- backports-4.2.6-1.org/drivers/net/usb/Kconfig 2015-11-15 22:19:40.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/Kconfig 2016-01-27 15:58:23.159192032 +0100
+@@ -13,7 +13,6 @@
+ if USB_NET_DRIVERS
+
+ config USB_CATC
+- depends on n
+ tristate "USB CATC NetMate-based Ethernet device support"
+ depends on m
+ depends on CRC32
+@@ -34,7 +33,6 @@
+ module will be called catc.
+
+ config USB_KAWETH
+- depends on n
+ tristate "USB KLSI KL5USB101-based ethernet device support"
+ depends on m
+ ---help---
+@@ -75,7 +73,6 @@
+ module will be called kaweth.
+
+ config USB_PEGASUS
+- depends on n
+ tristate "USB Pegasus/Pegasus-II based ethernet device support"
+ depends on m
+ select BPAUTO_MII
+@@ -92,7 +89,6 @@
+ module will be called pegasus.
+
+ config USB_RTL8150
+- depends on n
+ tristate "USB RTL8150 based ethernet device support"
+ depends on m
+ select BPAUTO_MII
+@@ -105,7 +101,6 @@
+ module will be called rtl8150.
+
+ config USB_RTL8152
+- depends on n
+ tristate "Realtek RTL8152/RTL8153 Based USB Ethernet Adapters"
+ depends on m
+ select BPAUTO_MII
+@@ -153,7 +148,6 @@
+ module will be called usbnet.
+
+ config USB_NET_AX8817X
+- depends on n
+ tristate "ASIX AX88xxx Based USB 2.0 Ethernet Adapters"
+ depends on m
+ depends on USB_USBNET
+@@ -184,7 +178,6 @@
+ what other networking devices you have in use.
+
+ config USB_NET_AX88179_178A
+- depends on n
+ tristate "ASIX AX88179/178A USB 3.0/2.0 to Gigabit Ethernet"
+ depends on m
+ depends on USB_USBNET
+@@ -233,7 +226,6 @@
+ name is used instead.
+
+ config USB_NET_CDC_EEM
+- depends on n
+ tristate "CDC EEM support"
+ depends on m
+ depends on USB_USBNET
+@@ -269,7 +261,6 @@
+ * Ericsson F5521gw Mobile Broadband Module
+
+ config USB_NET_HUAWEI_CDC_NCM
+- depends on n
+ tristate "Huawei NCM embedded AT channel support"
+ depends on m
+ depends on USB_USBNET
+@@ -305,7 +296,6 @@
+ module will be called cdc_mbim.
+
+ config USB_NET_DM9601
+- depends on n
+ tristate "Davicom DM96xx based USB 10/100 ethernet devices"
+ depends on m
+ depends on USB_USBNET
+@@ -315,7 +305,6 @@
+ based USB 10/100 Ethernet adapters.
+
+ config USB_NET_SR9700
+- depends on n
+ tristate "CoreChip-sz SR9700 based USB 1.1 10/100 ethernet devices"
+ depends on m
+ depends on USB_USBNET
+@@ -325,7 +314,6 @@
+ 10/100 Ethernet adapters.
+
+ config USB_NET_SR9800
+- depends on n
+ tristate "CoreChip-sz SR9800 based USB 2.0 10/100 ethernet devices"
+ depends on m
+ depends on USB_USBNET
+@@ -342,7 +330,6 @@
+ module will be called sr9800.
+
+ config USB_NET_SMSC75XX
+- depends on n
+ tristate "SMSC LAN75XX based USB 2.0 gigabit ethernet devices"
+ depends on m
+ depends on USB_USBNET
+@@ -354,7 +341,6 @@
+ Gigabit Ethernet adapters.
+
+ config USB_NET_SMSC95XX
+- depends on n
+ tristate "SMSC LAN95XX based USB 2.0 10/100 ethernet devices"
+ depends on m
+ depends on USB_USBNET
+@@ -366,7 +352,6 @@
+ 10/100 Ethernet adapters.
+
+ config USB_NET_GL620A
+- depends on n
+ tristate "GeneSys GL620USB-A based cables"
+ depends on m
+ depends on USB_USBNET
+@@ -377,7 +362,6 @@
+ Note that the half-duplex "GL620USB" is not supported.
+
+ config USB_NET_NET1080
+- depends on n
+ tristate "NetChip 1080 based cables (Laplink, ...)"
+ depends on m
+ default y
+@@ -388,7 +372,6 @@
+ optionally with LEDs that indicate traffic
+
+ config USB_NET_PLUSB
+- depends on n
+ tristate "Prolific PL-2301/2302/25A1 based cables"
+ depends on m
+ # if the handshake/init/reset problems, from original 'plusb',
+@@ -399,7 +382,6 @@
+ with one of these chips.
+
+ config USB_NET_MCS7830
+- depends on n
+ tristate "MosChip MCS7830 based Ethernet adapters"
+ depends on m
+ depends on USB_USBNET
+@@ -425,7 +407,6 @@
+ (and for) Microsoft; it isn't an "Open" ecosystem or market.
+
+ config USB_NET_CDC_SUBSET
+- depends on n
+ tristate "Simple USB Network Links (CDC Ethernet subset)"
+ depends on m
+ depends on USB_USBNET
+@@ -497,7 +478,6 @@
+ with one of these chips.
+
+ config USB_NET_ZAURUS
+- depends on n
+ tristate "Sharp Zaurus (stock ROMs) and compatible"
+ depends on m
+ depends on USB_USBNET
+@@ -517,7 +497,6 @@
+ some cases CDC MDLM) protocol, not "g_ether".
+
+ config USB_NET_CX82310_ETH
+- depends on n
+ tristate "Conexant CX82310 USB ethernet port"
+ depends on m
+ depends on USB_USBNET
+@@ -527,7 +506,6 @@
+ it will not work with ADSL modems (use cxacru driver instead).
+
+ config USB_NET_KALMIA
+- depends on n
+ tristate "Samsung Kalmia based LTE USB modem"
+ depends on m
+ depends on USB_USBNET
+@@ -562,7 +540,6 @@
+ module will be called qmi_wwan.
+
+ config USB_HSO
+- depends on n
+ tristate "Option USB High Speed Mobile Devices"
+ depends on m
+ depends on USB && RFKILL && TTY
+@@ -575,7 +552,6 @@
+ module will be called hso.
+
+ config USB_NET_INT51X1
+- depends on n
+ tristate "Intellon PLC based usb adapter"
+ depends on m
+ depends on USB_USBNET
+@@ -585,7 +561,6 @@
+ INT51x1/INT5200 chip, like the "devolo dLan duo".
+
+ config USB_CDC_PHONET
+- depends on n
+ tristate "CDC Phonet support"
+ depends on m
+ depends on PHONET
+@@ -595,7 +570,6 @@
+ "PC suite" USB profile.
+
+ config USB_IPHETH
+- depends on n
+ tristate "Apple iPhone USB Ethernet driver"
+ depends on m
+ default n
+@@ -619,11 +593,10 @@
+ module will be called sierra_net.
+
+ config USB_VL600
+- depends on n
+ tristate "LG VL600 modem dongle"
+ depends on m
+ depends on USB_NET_CDCETHER && TTY
+- select USB_ACM
++# depends on USB_ACM
+ help
+ Select this if you want to use an LG Electronics 4G/LTE usb modem
+ called VL600. This driver only handles the ethernet
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/Kconfig.orig backports-4.2.6-1/drivers/net/usb/Kconfig.orig
+--- backports-4.2.6-1.org/drivers/net/usb/Kconfig.orig 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/Kconfig.orig 2015-11-15 22:19:40.000000000 +0100
+@@ -0,0 +1,638 @@
++#
++# USB Network devices configuration
++#
++comment "Host-side USB support is needed for USB Network Adapter support"
++ depends on !USB && NET
++
++menuconfig USB_NET_DRIVERS
++ tristate "USB Network Adapters"
++ depends on m
++ default USB if USB
++ depends on USB && NET
++
++if USB_NET_DRIVERS
++
++config USB_CATC
++ depends on n
++ tristate "USB CATC NetMate-based Ethernet device support"
++ depends on m
++ depends on CRC32
++ ---help---
++ Say Y if you want to use one of the following 10Mbps USB Ethernet
++ device based on the EL1210A chip. Supported devices are:
++ Belkin F5U011
++ Belkin F5U111
++ CATC NetMate
++ CATC NetMate II
++ smartBridges smartNIC
++
++ This driver makes the adapter appear as a normal Ethernet interface,
++ typically on eth0, if it is the only ethernet device, or perhaps on
++ eth1, if you have a PCI or ISA ethernet card installed.
++
++ To compile this driver as a module, choose M here: the
++ module will be called catc.
++
++config USB_KAWETH
++ depends on n
++ tristate "USB KLSI KL5USB101-based ethernet device support"
++ depends on m
++ ---help---
++ Say Y here if you want to use one of the following 10Mbps only
++ USB Ethernet adapters based on the KLSI KL5KUSB101B chipset:
++ 3Com 3C19250
++ ADS USB-10BT
++ ATEN USB Ethernet
++ ASANTE USB To Ethernet Adapter
++ AOX Endpoints USB Ethernet
++ Correga K.K.
++ D-Link DSB-650C and DU-E10
++ Entrega / Portgear E45
++ I-O DATA USB-ET/T
++ Jaton USB Ethernet Device Adapter
++ Kingston Technology USB Ethernet Adapter
++ Linksys USB10T
++ Mobility USB-Ethernet Adapter
++ NetGear EA-101
++ Peracom Enet and Enet2
++ Portsmith Express Ethernet Adapter
++ Shark Pocket Adapter
++ SMC 2202USB
++ Sony Vaio port extender
++
++ This driver is likely to work with most 10Mbps only USB Ethernet
++ adapters, including some "no brand" devices. It does NOT work on
++ SmartBridges smartNIC or on Belkin F5U111 devices - you should use
++ the CATC NetMate driver for those. If you are not sure which one
++ you need, select both, and the correct one should be selected for
++ you.
++
++ This driver makes the adapter appear as a normal Ethernet interface,
++ typically on eth0, if it is the only ethernet device, or perhaps on
++ eth1, if you have a PCI or ISA ethernet card installed.
++
++ To compile this driver as a module, choose M here: the
++ module will be called kaweth.
++
++config USB_PEGASUS
++ depends on n
++ tristate "USB Pegasus/Pegasus-II based ethernet device support"
++ depends on m
++ select BPAUTO_MII
++ ---help---
++ Say Y here if you know you have Pegasus or Pegasus-II based adapter.
++ If in doubt then look at <file:drivers/net/usb/pegasus.h> for the
++ complete list of supported devices.
++
++ If your particular adapter is not in the list and you are _sure_ it
++ is Pegasus or Pegasus II based then send me
++ <petkan(a)users.sourceforge.net> vendor and device IDs.
++
++ To compile this driver as a module, choose M here: the
++ module will be called pegasus.
++
++config USB_RTL8150
++ depends on n
++ tristate "USB RTL8150 based ethernet device support"
++ depends on m
++ select BPAUTO_MII
++ help
++ Say Y here if you have RTL8150 based usb-ethernet adapter.
++ Send me <petkan(a)users.sourceforge.net> any comments you may have.
++ You can also check for updates at <http://pegasus2.sourceforge.net/>.
++
++ To compile this driver as a module, choose M here: the
++ module will be called rtl8150.
++
++config USB_RTL8152
++ depends on n
++ tristate "Realtek RTL8152/RTL8153 Based USB Ethernet Adapters"
++ depends on m
++ select BPAUTO_MII
++ help
++ This option adds support for Realtek RTL8152 based USB 2.0
++ 10/100 Ethernet adapters and RTL8153 based USB 3.0 10/100/1000
++ Ethernet adapters.
++
++ To compile this driver as a module, choose M here: the
++ module will be called r8152.
++
++config USB_USBNET
++ tristate "Multi-purpose USB Networking Framework"
++ depends on m
++ select BPAUTO_MII
++ ---help---
++ This driver supports several kinds of network links over USB,
++ with "minidrivers" built around a common network driver core
++ that supports deep queues for efficient transfers. (This gives
++ better performance with small packets and at high speeds).
++
++ The USB host runs "usbnet", and the other end of the link might be:
++
++ - Another USB host, when using USB "network" or "data transfer"
++ cables. These are often used to network laptops to PCs, like
++ "Laplink" parallel cables or some motherboards. These rely
++ on specialized chips from many suppliers.
++
++ - An intelligent USB gadget, perhaps embedding a Linux system.
++ These include PDAs running Linux (iPaq, Yopy, Zaurus, and
++ others), and devices that interoperate using the standard
++ CDC-Ethernet specification (including many cable modems).
++
++ - Network adapter hardware (like those for 10/100 Ethernet) which
++ uses this driver framework.
++
++ The link will appear with a name like "usb0", when the link is
++ a two-node link, or "eth0" for most CDC-Ethernet devices. Those
++ two-node links are most easily managed with Ethernet Bridging
++ (CONFIG_BRIDGE) instead of routing.
++
++ For more information see <http://www.linux-usb.org/usbnet/>.
++
++ To compile this driver as a module, choose M here: the
++ module will be called usbnet.
++
++config USB_NET_AX8817X
++ depends on n
++ tristate "ASIX AX88xxx Based USB 2.0 Ethernet Adapters"
++ depends on m
++ depends on USB_USBNET
++ depends on CRC32
++ depends on PHYLIB
++ default y
++ help
++ This option adds support for ASIX AX88xxx based USB 2.0
++ 10/100 Ethernet adapters.
++
++ This driver should work with at least the following devices:
++ * Aten UC210T
++ * ASIX AX88172
++ * Billionton Systems, USB2AR
++ * Buffalo LUA-U2-KTX
++ * Corega FEther USB2-TX
++ * D-Link DUB-E100
++ * Hawking UF200
++ * Linksys USB200M
++ * Netgear FA120
++ * Sitecom LN-029
++ * Sitecom LN-028
++ * Intellinet USB 2.0 Ethernet
++ * ST Lab USB 2.0 Ethernet
++ * TrendNet TU2-ET100
++
++ This driver creates an interface named "ethX", where X depends on
++ what other networking devices you have in use.
++
++config USB_NET_AX88179_178A
++ depends on n
++ tristate "ASIX AX88179/178A USB 3.0/2.0 to Gigabit Ethernet"
++ depends on m
++ depends on USB_USBNET
++ depends on CRC32
++ depends on PHYLIB
++ default y
++ help
++ This option adds support for ASIX AX88179 based USB 3.0/2.0
++ to Gigabit Ethernet adapters.
++
++ This driver should work with at least the following devices:
++ * ASIX AX88179
++ * ASIX AX88178A
++ * Sitcomm LN-032
++
++ This driver creates an interface named "ethX", where X depends on
++ what other networking devices you have in use.
++
++config USB_NET_CDCETHER
++ tristate "CDC Ethernet support (smart devices such as cable modems)"
++ depends on m
++ depends on USB_USBNET
++ default y
++ help
++ This option supports devices conforming to the Communication Device
++ Class (CDC) Ethernet Control Model, a specification that's easy to
++ implement in device firmware. The CDC specifications are available
++ from <http://www.usb.org/>.
++
++ CDC Ethernet is an implementation option for DOCSIS cable modems
++ that support USB connectivity, used for non-Microsoft USB hosts.
++ The Linux-USB CDC Ethernet Gadget driver is an open implementation.
++ This driver should work with at least the following devices:
++
++ * Dell Wireless 5530 HSPA
++ * Ericsson PipeRider (all variants)
++ * Ericsson Mobile Broadband Module (all variants)
++ * Motorola (DM100 and SB4100)
++ * Broadcom Cable Modem (reference design)
++ * Toshiba (PCX1100U and F3507g/F3607gw)
++ * ...
++
++ This driver creates an interface named "ethX", where X depends on
++ what other networking devices you have in use. However, if the
++ IEEE 802 "local assignment" bit is set in the address, a "usbX"
++ name is used instead.
++
++config USB_NET_CDC_EEM
++ depends on n
++ tristate "CDC EEM support"
++ depends on m
++ depends on USB_USBNET
++ help
++ This option supports devices conforming to the Communication Device
++ Class (CDC) Ethernet Emulation Model, a specification that's easy to
++ implement in device firmware. The CDC EEM specifications are available
++ from <http://www.usb.org/>.
++
++ This driver creates an interface named "ethX", where X depends on
++ what other networking devices you have in use. However, if the
++ IEEE 802 "local assignment" bit is set in the address, a "usbX"
++ name is used instead.
++
++config USB_NET_CDC_NCM
++ tristate "CDC NCM support"
++ depends on m
++ depends on USB_USBNET
++ default y
++ help
++ This driver provides support for CDC NCM (Network Control Model
++ Device USB Class Specification). The CDC NCM specification is
++ available from <http://www.usb.org/>.
++
++ Say "y" to link the driver statically, or "m" to build a
++ dynamically linked module.
++
++ This driver should work with at least the following devices:
++ * ST-Ericsson M700 LTE FDD/TDD Mobile Broadband Modem (ref. design)
++ * ST-Ericsson M5730 HSPA+ Mobile Broadband Modem (reference design)
++ * ST-Ericsson M570 HSPA+ Mobile Broadband Modem (reference design)
++ * ST-Ericsson M343 HSPA Mobile Broadband Modem (reference design)
++ * Ericsson F5521gw Mobile Broadband Module
++
++config USB_NET_HUAWEI_CDC_NCM
++ depends on n
++ tristate "Huawei NCM embedded AT channel support"
++ depends on m
++ depends on USB_USBNET
++ select USB_WDM
++ select USB_NET_CDC_NCM
++ help
++ This driver supports huawei-style NCM devices, that use NCM as a
++ transport for other protocols, usually an embedded AT channel.
++ Good examples are:
++ * Huawei E3131
++ * Huawei E3251
++
++ To compile this driver as a module, choose M here: the module will be
++ called huawei_cdc_ncm.ko.
++
++config USB_NET_CDC_MBIM
++ tristate "CDC MBIM support"
++ depends on m
++ depends on USB_USBNET
++ select USB_WDM
++ select USB_NET_CDC_NCM
++ help
++ This driver provides support for CDC MBIM (Mobile Broadband
++ Interface Model) devices. The CDC MBIM specification is
++ available from <http://www.usb.org/>.
++
++ MBIM devices require configuration using the management
++ protocol defined by the MBIM specification. This driver
++ provides unfiltered access to the MBIM control channel
++ through the associated /dev/cdc-wdmx character device.
++
++ To compile this driver as a module, choose M here: the
++ module will be called cdc_mbim.
++
++config USB_NET_DM9601
++ depends on n
++ tristate "Davicom DM96xx based USB 10/100 ethernet devices"
++ depends on m
++ depends on USB_USBNET
++ depends on CRC32
++ help
++ This option adds support for Davicom DM9601/DM9620/DM9621A
++ based USB 10/100 Ethernet adapters.
++
++config USB_NET_SR9700
++ depends on n
++ tristate "CoreChip-sz SR9700 based USB 1.1 10/100 ethernet devices"
++ depends on m
++ depends on USB_USBNET
++ depends on CRC32
++ help
++ This option adds support for CoreChip-sz SR9700 based USB 1.1
++ 10/100 Ethernet adapters.
++
++config USB_NET_SR9800
++ depends on n
++ tristate "CoreChip-sz SR9800 based USB 2.0 10/100 ethernet devices"
++ depends on m
++ depends on USB_USBNET
++ depends on CRC32
++ ---help---
++ Say Y if you want to use one of the following 100Mbps USB Ethernet
++ device based on the CoreChip-sz SR9800 chip.
++
++ This driver makes the adapter appear as a normal Ethernet interface,
++ typically on eth0, if it is the only ethernet device, or perhaps on
++ eth1, if you have a PCI or ISA ethernet card installed.
++
++ To compile this driver as a module, choose M here: the
++ module will be called sr9800.
++
++config USB_NET_SMSC75XX
++ depends on n
++ tristate "SMSC LAN75XX based USB 2.0 gigabit ethernet devices"
++ depends on m
++ depends on USB_USBNET
++ depends on BITREVERSE
++ depends on CRC16
++ depends on CRC32
++ help
++ This option adds support for SMSC LAN75XX based USB 2.0
++ Gigabit Ethernet adapters.
++
++config USB_NET_SMSC95XX
++ depends on n
++ tristate "SMSC LAN95XX based USB 2.0 10/100 ethernet devices"
++ depends on m
++ depends on USB_USBNET
++ depends on BITREVERSE
++ depends on CRC16
++ depends on CRC32
++ help
++ This option adds support for SMSC LAN95XX based USB 2.0
++ 10/100 Ethernet adapters.
++
++config USB_NET_GL620A
++ depends on n
++ tristate "GeneSys GL620USB-A based cables"
++ depends on m
++ depends on USB_USBNET
++ help
++ Choose this option if you're using a host-to-host cable,
++ or PC2PC motherboard, with this chip.
++
++ Note that the half-duplex "GL620USB" is not supported.
++
++config USB_NET_NET1080
++ depends on n
++ tristate "NetChip 1080 based cables (Laplink, ...)"
++ depends on m
++ default y
++ depends on USB_USBNET
++ help
++ Choose this option if you're using a host-to-host cable based
++ on this design: one NetChip 1080 chip and supporting logic,
++ optionally with LEDs that indicate traffic
++
++config USB_NET_PLUSB
++ depends on n
++ tristate "Prolific PL-2301/2302/25A1 based cables"
++ depends on m
++ # if the handshake/init/reset problems, from original 'plusb',
++ # are ever resolved ... then remove "experimental"
++ depends on USB_USBNET
++ help
++ Choose this option if you're using a host-to-host cable
++ with one of these chips.
++
++config USB_NET_MCS7830
++ depends on n
++ tristate "MosChip MCS7830 based Ethernet adapters"
++ depends on m
++ depends on USB_USBNET
++ help
++ Choose this option if you're using a 10/100 Ethernet USB2
++ adapter based on the MosChip 7830 controller. This includes
++ adapters marketed under the DeLOCK brand.
++
++config USB_NET_RNDIS_HOST
++ tristate "Host for RNDIS and ActiveSync devices"
++ depends on m
++ depends on USB_USBNET
++ select USB_NET_CDCETHER
++ help
++ This option enables hosting "Remote NDIS" USB networking links,
++ as encouraged by Microsoft (instead of CDC Ethernet!) for use in
++ various devices that may only support this protocol. A variant
++ of this protocol (with even less public documentation) seems to
++ be at the root of Microsoft's "ActiveSync" too.
++
++ Avoid using this protocol unless you have no better options.
++ The protocol specification is incomplete, and is controlled by
++ (and for) Microsoft; it isn't an "Open" ecosystem or market.
++
++config USB_NET_CDC_SUBSET
++ depends on n
++ tristate "Simple USB Network Links (CDC Ethernet subset)"
++ depends on m
++ depends on USB_USBNET
++ default y
++ help
++ This driver module supports USB network devices that can work
++ without any device-specific information. Select it if you have
++ one of these drivers.
++
++ Note that while many USB host-to-host cables can work in this mode,
++ that may mean not being able to talk to Win32 systems or more
++ commonly not being able to handle certain events (like replugging
++ the host on the other end) very well. Also, these devices will
++ not generally have permanently assigned Ethernet addresses.
++
++config USB_ALI_M5632
++ bool "ALi M5632 based 'USB 2.0 Data Link' cables"
++ depends on USB_NET_CDC_SUBSET
++ help
++ Choose this option if you're using a host-to-host cable
++ based on this design, which supports USB 2.0 high speed.
++
++config USB_AN2720
++ bool "AnchorChips 2720 based cables (Xircom PGUNET, ...)"
++ depends on USB_NET_CDC_SUBSET
++ help
++ Choose this option if you're using a host-to-host cable
++ based on this design. Note that AnchorChips is now a
++ Cypress brand.
++
++config USB_BELKIN
++ bool "eTEK based host-to-host cables (Advance, Belkin, ...)"
++ depends on USB_NET_CDC_SUBSET
++ default y
++ help
++ Choose this option if you're using a host-to-host cable
++ based on this design: two NetChip 2890 chips and an Atmel
++ microcontroller, with LEDs that indicate traffic.
++
++config USB_ARMLINUX
++ bool "Embedded ARM Linux links (iPaq, ...)"
++ depends on USB_NET_CDC_SUBSET
++ default y
++ help
++ Choose this option to support the "usb-eth" networking driver
++ used by most of the ARM Linux community with device controllers
++ such as the SA-11x0 and PXA-25x UDCs, or the tftp capabilities
++ in some PXA versions of the "blob" boot loader.
++
++ Linux-based "Gumstix" PXA-25x based systems use this protocol
++ to talk with other Linux systems.
++
++ Although the ROMs shipped with Sharp Zaurus products use a
++ different link level framing protocol, you can have them use
++ this simpler protocol by installing a different kernel.
++
++config USB_EPSON2888
++ bool "Epson 2888 based firmware (DEVELOPMENT)"
++ depends on USB_NET_CDC_SUBSET
++ help
++ Choose this option to support the usb networking links used
++ by some sample firmware from Epson.
++
++config USB_KC2190
++ bool "KT Technology KC2190 based cables (InstaNet)"
++ depends on USB_NET_CDC_SUBSET
++ help
++ Choose this option if you're using a host-to-host cable
++ with one of these chips.
++
++config USB_NET_ZAURUS
++ depends on n
++ tristate "Sharp Zaurus (stock ROMs) and compatible"
++ depends on m
++ depends on USB_USBNET
++ select USB_NET_CDCETHER
++ depends on CRC32
++ default y
++ help
++ Choose this option to support the usb networking links used by
++ Zaurus models like the SL-5000D, SL-5500, SL-5600, A-300, B-500.
++ This also supports some related device firmware, as used in some
++ PDAs from Olympus and some cell phones from Motorola.
++
++ If you install an alternate image, such as the Linux 2.6 based
++ versions of OpenZaurus, you should no longer need to support this
++ protocol. Only the "eth-fd" or "net_fd" drivers in these devices
++ really need this non-conformant variant of CDC Ethernet (or in
++ some cases CDC MDLM) protocol, not "g_ether".
++
++config USB_NET_CX82310_ETH
++ depends on n
++ tristate "Conexant CX82310 USB ethernet port"
++ depends on m
++ depends on USB_USBNET
++ help
++ Choose this option if you're using a Conexant CX82310-based ADSL
++ router with USB ethernet port. This driver is for routers only,
++ it will not work with ADSL modems (use cxacru driver instead).
++
++config USB_NET_KALMIA
++ depends on n
++ tristate "Samsung Kalmia based LTE USB modem"
++ depends on m
++ depends on USB_USBNET
++ help
++ Choose this option if you have a Samsung Kalmia based USB modem
++ as Samsung GT-B3730.
++
++ To compile this driver as a module, choose M here: the
++ module will be called kalmia.
++
++config USB_NET_QMI_WWAN
++ tristate "QMI WWAN driver for Qualcomm MSM based 3G and LTE modems"
++ depends on m
++ depends on USB_USBNET
++ select USB_WDM
++ help
++ Support WWAN LTE/3G devices based on Qualcomm Mobile Data Modem
++ (MDM) chipsets. Examples of such devices are
++ * Huawei E392/E398
++
++ This driver will only drive the ethernet part of the chips.
++ The devices require additional configuration to be usable.
++ Multiple management interfaces with linux drivers are
++ available:
++
++ * option: AT commands on /dev/ttyUSBx
++ * cdc-wdm: Qualcomm MSM Interface (QMI) protocol on /dev/cdc-wdmx
++
++ A modem manager with support for QMI is recommended.
++
++ To compile this driver as a module, choose M here: the
++ module will be called qmi_wwan.
++
++config USB_HSO
++ depends on n
++ tristate "Option USB High Speed Mobile Devices"
++ depends on m
++ depends on USB && RFKILL && TTY
++ default n
++ help
++ Choose this option if you have an Option HSDPA/HSUPA card.
++ These cards support downlink speeds of 7.2Mbps or greater.
++
++ To compile this driver as a module, choose M here: the
++ module will be called hso.
++
++config USB_NET_INT51X1
++ depends on n
++ tristate "Intellon PLC based usb adapter"
++ depends on m
++ depends on USB_USBNET
++ help
++ Choose this option if you're using a 14Mb USB-based PLC
++ (Powerline Communications) solution with an Intellon
++ INT51x1/INT5200 chip, like the "devolo dLan duo".
++
++config USB_CDC_PHONET
++ depends on n
++ tristate "CDC Phonet support"
++ depends on m
++ depends on PHONET
++ help
++ Choose this option to support the Phonet interface to a Nokia
++ cellular modem, as found on most Nokia handsets with the
++ "PC suite" USB profile.
++
++config USB_IPHETH
++ depends on n
++ tristate "Apple iPhone USB Ethernet driver"
++ depends on m
++ default n
++ ---help---
++ Module used to share Internet connection (tethering) from your
++ iPhone (Original, 3G and 3GS) to your system.
++ Note that you need userspace libraries and programs that are needed
++ to pair your device with your system and that understand the iPhone
++ protocol.
++
++ For more information: http://giagio.com/wiki/moin.cgi/iPhoneEthernetDriver
++
++config USB_SIERRA_NET
++ tristate "USB-to-WWAN Driver for Sierra Wireless modems"
++ depends on m
++ depends on USB_USBNET
++ help
++ Choose this option if you have a Sierra Wireless USB-to-WWAN device.
++
++ To compile this driver as a module, choose M here: the
++ module will be called sierra_net.
++
++config USB_VL600
++ depends on n
++ tristate "LG VL600 modem dongle"
++ depends on m
++ depends on USB_NET_CDCETHER && TTY
++ select USB_ACM
++ help
++ Select this if you want to use an LG Electronics 4G/LTE usb modem
++ called VL600. This driver only handles the ethernet
++ interface exposed by the modem firmware. To establish a connection
++ you will first need a userspace program that sends the right
++ command to the modem through its CDC ACM port, and most
++ likely also a DHCP client. See this thread about using the
++ 4G modem from Verizon:
++
++ http://ubuntuforums.org/showpost.php?p=10589647&postcount=17
++
++endif # USB_NET_DRIVERS
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/lg-vl600.c backports-4.2.6-1/drivers/net/usb/lg-vl600.c
+--- backports-4.2.6-1.org/drivers/net/usb/lg-vl600.c 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/lg-vl600.c 2015-11-09 23:37:56.000000000 +0100
+@@ -0,0 +1,353 @@
++/*
++ * Ethernet interface part of the LG VL600 LTE modem (4G dongle)
++ *
++ * Copyright (C) 2011 Intel Corporation
++ * Author: Andrzej Zaborowski <balrogg(a)gmail.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, see <http://www.gnu.org/licenses/>.
++ */
++#include <linux/etherdevice.h>
++#include <linux/ethtool.h>
++#include <linux/mii.h>
++#include <linux/usb.h>
++#include <linux/usb/cdc.h>
++#include <linux/usb/usbnet.h>
++#include <linux/if_ether.h>
++#include <linux/if_arp.h>
++#include <linux/inetdevice.h>
++#include <linux/module.h>
++
++/*
++ * The device has a CDC ACM port for modem control (it claims to be
++ * CDC ACM anyway) and a CDC Ethernet port for actual network data.
++ * It will however ignore data on both ports that is not encapsulated
++ * in a specific way, any data returned is also encapsulated the same
++ * way. The headers don't seem to follow any popular standard.
++ *
++ * This driver adds and strips these headers from the ethernet frames
++ * sent/received from the CDC Ethernet port. The proprietary header
++ * replaces the standard ethernet header in a packet so only actual
++ * ethernet frames are allowed. The headers allow some form of
++ * multiplexing by using non standard values of the .h_proto field.
++ * Windows/Mac drivers do send a couple of such frames to the device
++ * during initialisation, with protocol set to 0x0906 or 0x0b06 and (what
++ * seems to be) a flag in the .dummy_flags. This doesn't seem necessary
++ * for modem operation but can possibly be used for GPS or other funcitons.
++ */
++
++struct vl600_frame_hdr {
++ __le32 len;
++ __le32 serial;
++ __le32 pkt_cnt;
++ __le32 dummy_flags;
++ __le32 dummy;
++ __le32 magic;
++} __attribute__((packed));
++
++struct vl600_pkt_hdr {
++ __le32 dummy[2];
++ __le32 len;
++ __be16 h_proto;
++} __attribute__((packed));
++
++struct vl600_state {
++ struct sk_buff *current_rx_buf;
++};
++
++static int vl600_bind(struct usbnet *dev, struct usb_interface *intf)
++{
++ int ret;
++ struct vl600_state *s = kzalloc(sizeof(struct vl600_state), GFP_KERNEL);
++
++ if (!s)
++ return -ENOMEM;
++
++ ret = usbnet_cdc_bind(dev, intf);
++ if (ret) {
++ kfree(s);
++ return ret;
++ }
++
++ dev->driver_priv = s;
++
++ /* ARP packets don't go through, but they're also of no use. The
++ * subnet has only two hosts anyway: us and the gateway / DHCP
++ * server (probably simulated by modem firmware or network operator)
++ * whose address changes everytime we connect to the intarwebz and
++ * who doesn't bother answering ARP requests either. So hardware
++ * addresses have no meaning, the destination and the source of every
++ * packet depend only on whether it is on the IN or OUT endpoint. */
++ dev->net->flags |= IFF_NOARP;
++ /* IPv6 NDP relies on multicast. Enable it by default. */
++ dev->net->flags |= IFF_MULTICAST;
++
++ return ret;
++}
++
++static void vl600_unbind(struct usbnet *dev, struct usb_interface *intf)
++{
++ struct vl600_state *s = dev->driver_priv;
++
++ if (s->current_rx_buf)
++ dev_kfree_skb(s->current_rx_buf);
++
++ kfree(s);
++
++ return usbnet_cdc_unbind(dev, intf);
++}
++
++static int vl600_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
++{
++ struct vl600_frame_hdr *frame;
++ struct vl600_pkt_hdr *packet;
++ struct ethhdr *ethhdr;
++ int packet_len, count;
++ struct sk_buff *buf = skb;
++ struct sk_buff *clone;
++ struct vl600_state *s = dev->driver_priv;
++
++ /* Frame lengths are generally 4B multiplies but every couple of
++ * hours there's an odd number of bytes sized yet correct frame,
++ * so don't require this. */
++
++ /* Allow a packet (or multiple packets batched together) to be
++ * split across many frames. We don't allow a new batch to
++ * begin in the same frame another one is ending however, and no
++ * leading or trailing pad bytes. */
++ if (s->current_rx_buf) {
++ frame = (struct vl600_frame_hdr *) s->current_rx_buf->data;
++ if (skb->len + s->current_rx_buf->len >
++ le32_to_cpup(&frame->len)) {
++ netif_err(dev, ifup, dev->net, "Fragment too long\n");
++ dev->net->stats.rx_length_errors++;
++ goto error;
++ }
++
++ buf = s->current_rx_buf;
++ memcpy(skb_put(buf, skb->len), skb->data, skb->len);
++ } else if (skb->len < 4) {
++ netif_err(dev, ifup, dev->net, "Frame too short\n");
++ dev->net->stats.rx_length_errors++;
++ goto error;
++ }
++
++ frame = (struct vl600_frame_hdr *) buf->data;
++ /* Yes, check that frame->magic == 0x53544448 (or 0x44544d48),
++ * otherwise we may run out of memory w/a bad packet */
++ if (ntohl(frame->magic) != 0x53544448 &&
++ ntohl(frame->magic) != 0x44544d48)
++ goto error;
++
++ if (buf->len < sizeof(*frame) ||
++ buf->len != le32_to_cpup(&frame->len)) {
++ /* Save this fragment for later assembly */
++ if (s->current_rx_buf)
++ return 0;
++
++ s->current_rx_buf = skb_copy_expand(skb, 0,
++ le32_to_cpup(&frame->len), GFP_ATOMIC);
++ if (!s->current_rx_buf) {
++ netif_err(dev, ifup, dev->net, "Reserving %i bytes "
++ "for packet assembly failed.\n",
++ le32_to_cpup(&frame->len));
++ dev->net->stats.rx_errors++;
++ }
++
++ return 0;
++ }
++
++ count = le32_to_cpup(&frame->pkt_cnt);
++
++ skb_pull(buf, sizeof(*frame));
++
++ while (count--) {
++ if (buf->len < sizeof(*packet)) {
++ netif_err(dev, ifup, dev->net, "Packet too short\n");
++ goto error;
++ }
++
++ packet = (struct vl600_pkt_hdr *) buf->data;
++ packet_len = sizeof(*packet) + le32_to_cpup(&packet->len);
++ if (packet_len > buf->len) {
++ netif_err(dev, ifup, dev->net,
++ "Bad packet length stored in header\n");
++ goto error;
++ }
++
++ /* Packet header is same size as the ethernet header
++ * (sizeof(*packet) == sizeof(*ethhdr)), additionally
++ * the h_proto field is in the same place so we just leave it
++ * alone and fill in the remaining fields.
++ */
++ ethhdr = (struct ethhdr *) skb->data;
++ if (be16_to_cpup(ðhdr->h_proto) == ETH_P_ARP &&
++ buf->len > 0x26) {
++ /* Copy the addresses from packet contents */
++ memcpy(ethhdr->h_source,
++ &buf->data[sizeof(*ethhdr) + 0x8],
++ ETH_ALEN);
++ memcpy(ethhdr->h_dest,
++ &buf->data[sizeof(*ethhdr) + 0x12],
++ ETH_ALEN);
++ } else {
++ eth_zero_addr(ethhdr->h_source);
++ memcpy(ethhdr->h_dest, dev->net->dev_addr, ETH_ALEN);
++
++ /* Inbound IPv6 packets have an IPv4 ethertype (0x800)
++ * for some reason. Peek at the L3 header to check
++ * for IPv6 packets, and set the ethertype to IPv6
++ * (0x86dd) so Linux can understand it.
++ */
++ if ((buf->data[sizeof(*ethhdr)] & 0xf0) == 0x60)
++ ethhdr->h_proto = htons(ETH_P_IPV6);
++ }
++
++ if (count) {
++ /* Not the last packet in this batch */
++ clone = skb_clone(buf, GFP_ATOMIC);
++ if (!clone)
++ goto error;
++
++ skb_trim(clone, packet_len);
++ usbnet_skb_return(dev, clone);
++
++ skb_pull(buf, (packet_len + 3) & ~3);
++ } else {
++ skb_trim(buf, packet_len);
++
++ if (s->current_rx_buf) {
++ usbnet_skb_return(dev, buf);
++ s->current_rx_buf = NULL;
++ return 0;
++ }
++
++ return 1;
++ }
++ }
++
++error:
++ if (s->current_rx_buf) {
++ dev_kfree_skb_any(s->current_rx_buf);
++ s->current_rx_buf = NULL;
++ }
++ dev->net->stats.rx_errors++;
++ return 0;
++}
++
++static struct sk_buff *vl600_tx_fixup(struct usbnet *dev,
++ struct sk_buff *skb, gfp_t flags)
++{
++ struct sk_buff *ret;
++ struct vl600_frame_hdr *frame;
++ struct vl600_pkt_hdr *packet;
++ static uint32_t serial = 1;
++ int orig_len = skb->len - sizeof(struct ethhdr);
++ int full_len = (skb->len + sizeof(struct vl600_frame_hdr) + 3) & ~3;
++
++ frame = (struct vl600_frame_hdr *) skb->data;
++ if (skb->len > sizeof(*frame) && skb->len == le32_to_cpup(&frame->len))
++ return skb; /* Already encapsulated? */
++
++ if (skb->len < sizeof(struct ethhdr))
++ /* Drop, device can only deal with ethernet packets */
++ return NULL;
++
++ if (!skb_cloned(skb)) {
++ int headroom = skb_headroom(skb);
++ int tailroom = skb_tailroom(skb);
++
++ if (tailroom >= full_len - skb->len - sizeof(*frame) &&
++ headroom >= sizeof(*frame))
++ /* There's enough head and tail room */
++ goto encapsulate;
++
++ if (headroom + tailroom + skb->len >= full_len) {
++ /* There's enough total room, just readjust */
++ skb->data = memmove(skb->head + sizeof(*frame),
++ skb->data, skb->len);
++ skb_set_tail_pointer(skb, skb->len);
++ goto encapsulate;
++ }
++ }
++
++ /* Alloc a new skb with the required size */
++ ret = skb_copy_expand(skb, sizeof(struct vl600_frame_hdr), full_len -
++ skb->len - sizeof(struct vl600_frame_hdr), flags);
++ dev_kfree_skb_any(skb);
++ if (!ret)
++ return ret;
++ skb = ret;
++
++encapsulate:
++ /* Packet header is same size as ethernet packet header
++ * (sizeof(*packet) == sizeof(struct ethhdr)), additionally the
++ * h_proto field is in the same place so we just leave it alone and
++ * overwrite the remaining fields.
++ */
++ packet = (struct vl600_pkt_hdr *) skb->data;
++ /* The VL600 wants IPv6 packets to have an IPv4 ethertype
++ * Since this modem only supports IPv4 and IPv6, just set all
++ * frames to 0x0800 (ETH_P_IP)
++ */
++ packet->h_proto = htons(ETH_P_IP);
++ memset(&packet->dummy, 0, sizeof(packet->dummy));
++ packet->len = cpu_to_le32(orig_len);
++
++ frame = (struct vl600_frame_hdr *) skb_push(skb, sizeof(*frame));
++ memset(frame, 0, sizeof(*frame));
++ frame->len = cpu_to_le32(full_len);
++ frame->serial = cpu_to_le32(serial++);
++ frame->pkt_cnt = cpu_to_le32(1);
++
++ if (skb->len < full_len) /* Pad */
++ skb_put(skb, full_len - skb->len);
++
++ return skb;
++}
++
++static const struct driver_info vl600_info = {
++ .description = "LG VL600 modem",
++ .flags = FLAG_RX_ASSEMBLE | FLAG_WWAN,
++ .bind = vl600_bind,
++ .unbind = vl600_unbind,
++ .status = usbnet_cdc_status,
++ .rx_fixup = vl600_rx_fixup,
++ .tx_fixup = vl600_tx_fixup,
++};
++
++static const struct usb_device_id products[] = {
++ {
++ USB_DEVICE_AND_INTERFACE_INFO(0x1004, 0x61aa, USB_CLASS_COMM,
++ USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
++ .driver_info = (unsigned long) &vl600_info,
++ },
++ {}, /* End */
++};
++MODULE_DEVICE_TABLE(usb, products);
++
++static struct usb_driver lg_vl600_driver = {
++ .name = "lg-vl600",
++ .id_table = products,
++ .probe = usbnet_probe,
++ .disconnect = usbnet_disconnect,
++ .suspend = usbnet_suspend,
++ .resume = usbnet_resume,
++ .disable_hub_initiated_lpm = 1,
++};
++
++module_usb_driver(lg_vl600_driver);
++
++MODULE_AUTHOR("Anrzej Zaborowski");
++MODULE_DESCRIPTION("LG-VL600 modem's ethernet link");
++MODULE_LICENSE("GPL");
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/Makefile backports-4.2.6-1/drivers/net/usb/Makefile
+--- backports-4.2.6-1.org/drivers/net/usb/Makefile 2015-11-15 22:19:40.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/Makefile 2016-01-27 15:53:50.000000000 +0100
+@@ -1,39 +1,40 @@
+ #
+ # Makefile for USB Network drivers
+ #
+-#
+-#obj-$(CPTCFG_USB_CATC) += catc.o
+-#obj-$(CPTCFG_USB_KAWETH) += kaweth.o
+-#obj-$(CPTCFG_USB_PEGASUS) += pegasus.o
+-#obj-$(CPTCFG_USB_RTL8150) += rtl8150.o
+-#obj-$(CPTCFG_USB_RTL8152) += r8152.o
+-#obj-$(CPTCFG_USB_HSO) += hso.o
+-#obj-$(CPTCFG_USB_NET_AX8817X) += asix.o
+-#obj-$(CPTCFG_USB_NET_AX88179_178A) += ax88179_178a.o
++
++obj-$(CPTCFG_USB_CATC) += catc.o
++obj-$(CPTCFG_USB_KAWETH) += kaweth.o
++obj-$(CPTCFG_USB_PEGASUS) += pegasus.o
++obj-$(CPTCFG_USB_RTL8150) += rtl8150.o
++obj-$(CPTCFG_USB_RTL8152) += r8152.o
++obj-$(CPTCFG_USB_HSO) += hso.o
++obj-$(CPTCFG_USB_NET_AX8817X) += asix.o
++asix-y := asix_devices.o asix_common.o ax88172a.o
++obj-$(CPTCFG_USB_NET_AX88179_178A) += ax88179_178a.o
+ obj-$(CPTCFG_USB_NET_CDCETHER) += cdc_ether.o
+-#obj-$(CPTCFG_USB_NET_CDC_EEM) += cdc_eem.o
+-#obj-$(CPTCFG_USB_NET_DM9601) += dm9601.o
+-#obj-$(CPTCFG_USB_NET_SR9700) += sr9700.o
+-#obj-$(CPTCFG_USB_NET_SR9800) += sr9800.o
+-#obj-$(CPTCFG_USB_NET_SMSC75XX) += smsc75xx.o
+-#obj-$(CPTCFG_USB_NET_SMSC95XX) += smsc95xx.o
+-#obj-$(CPTCFG_USB_NET_GL620A) += gl620a.o
+-#obj-$(CPTCFG_USB_NET_NET1080) += net1080.o
+-#obj-$(CPTCFG_USB_NET_PLUSB) += plusb.o
++obj-$(CPTCFG_USB_NET_CDC_EEM) += cdc_eem.o
++obj-$(CPTCFG_USB_NET_DM9601) += dm9601.o
++obj-$(CPTCFG_USB_NET_SR9700) += sr9700.o
++obj-$(CPTCFG_USB_NET_SR9800) += sr9800.o
++obj-$(CPTCFG_USB_NET_SMSC75XX) += smsc75xx.o
++obj-$(CPTCFG_USB_NET_SMSC95XX) += smsc95xx.o
++obj-$(CPTCFG_USB_NET_GL620A) += gl620a.o
++obj-$(CPTCFG_USB_NET_NET1080) += net1080.o
++obj-$(CPTCFG_USB_NET_PLUSB) += plusb.o
+ obj-$(CPTCFG_USB_NET_RNDIS_HOST) += rndis_host.o
+-#obj-$(CPTCFG_USB_NET_CDC_SUBSET) += cdc_subset.o
+-#obj-$(CPTCFG_USB_NET_ZAURUS) += zaurus.o
+-#obj-$(CPTCFG_USB_NET_MCS7830) += mcs7830.o
++obj-$(CPTCFG_USB_NET_CDC_SUBSET) += cdc_subset.o
++obj-$(CPTCFG_USB_NET_ZAURUS) += zaurus.o
++obj-$(CPTCFG_USB_NET_MCS7830) += mcs7830.o
+ obj-$(CPTCFG_USB_USBNET) += usbnet.o
+-#obj-$(CPTCFG_USB_NET_INT51X1) += int51x1.o
+-#obj-$(CPTCFG_USB_CDC_PHONET) += cdc-phonet.o
+-#obj-$(CPTCFG_USB_NET_KALMIA) += kalmia.o
+-#obj-$(CPTCFG_USB_IPHETH) += ipheth.o
++obj-$(CPTCFG_USB_NET_INT51X1) += int51x1.o
++obj-$(CPTCFG_USB_CDC_PHONET) += cdc-phonet.o
++obj-$(CPTCFG_USB_NET_KALMIA) += kalmia.o
++obj-$(CPTCFG_USB_IPHETH) += ipheth.o
+ obj-$(CPTCFG_USB_SIERRA_NET) += sierra_net.o
+-#obj-$(CPTCFG_USB_NET_CX82310_ETH) += cx82310_eth.o
++obj-$(CPTCFG_USB_NET_CX82310_ETH) += cx82310_eth.o
+ obj-$(CPTCFG_USB_NET_CDC_NCM) += cdc_ncm.o
+-#obj-$(CPTCFG_USB_NET_HUAWEI_CDC_NCM) += huawei_cdc_ncm.o
+-#obj-$(CPTCFG_USB_VL600) += lg-vl600.o
++obj-$(CPTCFG_USB_NET_HUAWEI_CDC_NCM) += huawei_cdc_ncm.o
++obj-$(CPTCFG_USB_VL600) += lg-vl600.o
+ obj-$(CPTCFG_USB_NET_QMI_WWAN) += qmi_wwan.o
+ obj-$(CPTCFG_USB_NET_CDC_MBIM) += cdc_mbim.o
+
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/mcs7830.c backports-4.2.6-1/drivers/net/usb/mcs7830.c
+--- backports-4.2.6-1.org/drivers/net/usb/mcs7830.c 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/mcs7830.c 2015-11-09 23:37:56.000000000 +0100
+@@ -0,0 +1,643 @@
++/*
++ * MOSCHIP MCS7830 based (7730/7830/7832) USB 2.0 Ethernet Devices
++ *
++ * based on usbnet.c, asix.c and the vendor provided mcs7830 driver
++ *
++ * Copyright (C) 2010 Andreas Mohr <andi(a)lisas.de>
++ * Copyright (C) 2006 Arnd Bergmann <arnd(a)arndb.de>
++ * Copyright (C) 2003-2005 David Hollis <dhollis(a)davehollis.com>
++ * Copyright (C) 2005 Phil Chang <pchang23(a)sbcglobal.net>
++ * Copyright (c) 2002-2003 TiVo Inc.
++ *
++ * Definitions gathered from MOSCHIP, Data Sheet_7830DA.pdf (thanks!).
++ *
++ * 2010-12-19: add 7832 USB PID ("functionality same as MCS7830"),
++ * per active notification by manufacturer
++ *
++ * TODO:
++ * - support HIF_REG_CONFIG_SLEEPMODE/HIF_REG_CONFIG_TXENABLE (via autopm?)
++ * - implement ethtool_ops get_pauseparam/set_pauseparam
++ * via HIF_REG_PAUSE_THRESHOLD (>= revision C only!)
++ * - implement get_eeprom/[set_eeprom]
++ * - switch PHY on/off on ifup/ifdown (perhaps in usbnet.c, via MII)
++ * - mcs7830_get_regs() handling is weird: for rev 2 we return 32 regs,
++ * can access only ~ 24, remaining user buffer is uninitialized garbage
++ * - anything else?
++ *
++ *
++ * 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, see <http://www.gnu.org/licenses/>.
++ */
++
++#include <linux/crc32.h>
++#include <linux/etherdevice.h>
++#include <linux/ethtool.h>
++#include <linux/mii.h>
++#include <linux/module.h>
++#include <linux/netdevice.h>
++#include <linux/slab.h>
++#include <linux/usb.h>
++#include <linux/usb/usbnet.h>
++
++/* requests */
++#define MCS7830_RD_BMREQ (USB_DIR_IN | USB_TYPE_VENDOR | \
++ USB_RECIP_DEVICE)
++#define MCS7830_WR_BMREQ (USB_DIR_OUT | USB_TYPE_VENDOR | \
++ USB_RECIP_DEVICE)
++#define MCS7830_RD_BREQ 0x0E
++#define MCS7830_WR_BREQ 0x0D
++
++#define MCS7830_CTRL_TIMEOUT 1000
++#define MCS7830_MAX_MCAST 64
++
++#define MCS7830_VENDOR_ID 0x9710
++#define MCS7832_PRODUCT_ID 0x7832
++#define MCS7830_PRODUCT_ID 0x7830
++#define MCS7730_PRODUCT_ID 0x7730
++
++#define SITECOM_VENDOR_ID 0x0DF6
++#define LN_030_PRODUCT_ID 0x0021
++
++#define MCS7830_MII_ADVERTISE (ADVERTISE_PAUSE_CAP | ADVERTISE_100FULL | \
++ ADVERTISE_100HALF | ADVERTISE_10FULL | \
++ ADVERTISE_10HALF | ADVERTISE_CSMA)
++
++/* HIF_REG_XX corresponding index value */
++enum {
++ HIF_REG_MULTICAST_HASH = 0x00,
++ HIF_REG_PACKET_GAP1 = 0x08,
++ HIF_REG_PACKET_GAP2 = 0x09,
++ HIF_REG_PHY_DATA = 0x0a,
++ HIF_REG_PHY_CMD1 = 0x0c,
++ HIF_REG_PHY_CMD1_READ = 0x40,
++ HIF_REG_PHY_CMD1_WRITE = 0x20,
++ HIF_REG_PHY_CMD1_PHYADDR = 0x01,
++ HIF_REG_PHY_CMD2 = 0x0d,
++ HIF_REG_PHY_CMD2_PEND_FLAG_BIT = 0x80,
++ HIF_REG_PHY_CMD2_READY_FLAG_BIT = 0x40,
++ HIF_REG_CONFIG = 0x0e,
++ /* hmm, spec sez: "R/W", "Except bit 3" (likely TXENABLE). */
++ HIF_REG_CONFIG_CFG = 0x80,
++ HIF_REG_CONFIG_SPEED100 = 0x40,
++ HIF_REG_CONFIG_FULLDUPLEX_ENABLE = 0x20,
++ HIF_REG_CONFIG_RXENABLE = 0x10,
++ HIF_REG_CONFIG_TXENABLE = 0x08,
++ HIF_REG_CONFIG_SLEEPMODE = 0x04,
++ HIF_REG_CONFIG_ALLMULTICAST = 0x02,
++ HIF_REG_CONFIG_PROMISCUOUS = 0x01,
++ HIF_REG_ETHERNET_ADDR = 0x0f,
++ HIF_REG_FRAME_DROP_COUNTER = 0x15, /* 0..ff; reset: 0 */
++ HIF_REG_PAUSE_THRESHOLD = 0x16,
++ HIF_REG_PAUSE_THRESHOLD_DEFAULT = 0,
++};
++
++/* Trailing status byte in Ethernet Rx frame */
++enum {
++ MCS7830_RX_SHORT_FRAME = 0x01, /* < 64 bytes */
++ MCS7830_RX_LENGTH_ERROR = 0x02, /* framelen != Ethernet length field */
++ MCS7830_RX_ALIGNMENT_ERROR = 0x04, /* non-even number of nibbles */
++ MCS7830_RX_CRC_ERROR = 0x08,
++ MCS7830_RX_LARGE_FRAME = 0x10, /* > 1518 bytes */
++ MCS7830_RX_FRAME_CORRECT = 0x20, /* frame is correct */
++ /* [7:6] reserved */
++};
++
++struct mcs7830_data {
++ u8 multi_filter[8];
++ u8 config;
++};
++
++static const char driver_name[] = "MOSCHIP usb-ethernet driver";
++
++static int mcs7830_get_reg(struct usbnet *dev, u16 index, u16 size, void *data)
++{
++ return usbnet_read_cmd(dev, MCS7830_RD_BREQ, MCS7830_RD_BMREQ,
++ 0x0000, index, data, size);
++}
++
++static int mcs7830_set_reg(struct usbnet *dev, u16 index, u16 size, const void *data)
++{
++ return usbnet_write_cmd(dev, MCS7830_WR_BREQ, MCS7830_WR_BMREQ,
++ 0x0000, index, data, size);
++}
++
++static void mcs7830_set_reg_async(struct usbnet *dev, u16 index, u16 size, void *data)
++{
++ usbnet_write_cmd_async(dev, MCS7830_WR_BREQ, MCS7830_WR_BMREQ,
++ 0x0000, index, data, size);
++}
++
++static int mcs7830_hif_get_mac_address(struct usbnet *dev, unsigned char *addr)
++{
++ int ret = mcs7830_get_reg(dev, HIF_REG_ETHERNET_ADDR, ETH_ALEN, addr);
++ if (ret < 0)
++ return ret;
++ return 0;
++}
++
++static int mcs7830_hif_set_mac_address(struct usbnet *dev, unsigned char *addr)
++{
++ int ret = mcs7830_set_reg(dev, HIF_REG_ETHERNET_ADDR, ETH_ALEN, addr);
++
++ if (ret < 0)
++ return ret;
++ return 0;
++}
++
++static int mcs7830_set_mac_address(struct net_device *netdev, void *p)
++{
++ int ret;
++ struct usbnet *dev = netdev_priv(netdev);
++ struct sockaddr *addr = p;
++
++ if (netif_running(netdev))
++ return -EBUSY;
++
++ if (!is_valid_ether_addr(addr->sa_data))
++ return -EADDRNOTAVAIL;
++
++ ret = mcs7830_hif_set_mac_address(dev, addr->sa_data);
++
++ if (ret < 0)
++ return ret;
++
++ /* it worked --> adopt it on netdev side */
++ memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
++
++ return 0;
++}
++
++static int mcs7830_read_phy(struct usbnet *dev, u8 index)
++{
++ int ret;
++ int i;
++ __le16 val;
++
++ u8 cmd[2] = {
++ HIF_REG_PHY_CMD1_READ | HIF_REG_PHY_CMD1_PHYADDR,
++ HIF_REG_PHY_CMD2_PEND_FLAG_BIT | index,
++ };
++
++ mutex_lock(&dev->phy_mutex);
++ /* write the MII command */
++ ret = mcs7830_set_reg(dev, HIF_REG_PHY_CMD1, 2, cmd);
++ if (ret < 0)
++ goto out;
++
++ /* wait for the data to become valid, should be within < 1ms */
++ for (i = 0; i < 10; i++) {
++ ret = mcs7830_get_reg(dev, HIF_REG_PHY_CMD1, 2, cmd);
++ if ((ret < 0) || (cmd[1] & HIF_REG_PHY_CMD2_READY_FLAG_BIT))
++ break;
++ ret = -EIO;
++ msleep(1);
++ }
++ if (ret < 0)
++ goto out;
++
++ /* read actual register contents */
++ ret = mcs7830_get_reg(dev, HIF_REG_PHY_DATA, 2, &val);
++ if (ret < 0)
++ goto out;
++ ret = le16_to_cpu(val);
++ dev_dbg(&dev->udev->dev, "read PHY reg %02x: %04x (%d tries)\n",
++ index, val, i);
++out:
++ mutex_unlock(&dev->phy_mutex);
++ return ret;
++}
++
++static int mcs7830_write_phy(struct usbnet *dev, u8 index, u16 val)
++{
++ int ret;
++ int i;
++ __le16 le_val;
++
++ u8 cmd[2] = {
++ HIF_REG_PHY_CMD1_WRITE | HIF_REG_PHY_CMD1_PHYADDR,
++ HIF_REG_PHY_CMD2_PEND_FLAG_BIT | (index & 0x1F),
++ };
++
++ mutex_lock(&dev->phy_mutex);
++
++ /* write the new register contents */
++ le_val = cpu_to_le16(val);
++ ret = mcs7830_set_reg(dev, HIF_REG_PHY_DATA, 2, &le_val);
++ if (ret < 0)
++ goto out;
++
++ /* write the MII command */
++ ret = mcs7830_set_reg(dev, HIF_REG_PHY_CMD1, 2, cmd);
++ if (ret < 0)
++ goto out;
++
++ /* wait for the command to be accepted by the PHY */
++ for (i = 0; i < 10; i++) {
++ ret = mcs7830_get_reg(dev, HIF_REG_PHY_CMD1, 2, cmd);
++ if ((ret < 0) || (cmd[1] & HIF_REG_PHY_CMD2_READY_FLAG_BIT))
++ break;
++ ret = -EIO;
++ msleep(1);
++ }
++ if (ret < 0)
++ goto out;
++
++ ret = 0;
++ dev_dbg(&dev->udev->dev, "write PHY reg %02x: %04x (%d tries)\n",
++ index, val, i);
++out:
++ mutex_unlock(&dev->phy_mutex);
++ return ret;
++}
++
++/*
++ * This algorithm comes from the original mcs7830 version 1.4 driver,
++ * not sure if it is needed.
++ */
++static int mcs7830_set_autoneg(struct usbnet *dev, int ptrUserPhyMode)
++{
++ int ret;
++ /* Enable all media types */
++ ret = mcs7830_write_phy(dev, MII_ADVERTISE, MCS7830_MII_ADVERTISE);
++
++ /* First reset BMCR */
++ if (!ret)
++ ret = mcs7830_write_phy(dev, MII_BMCR, 0x0000);
++ /* Enable Auto Neg */
++ if (!ret)
++ ret = mcs7830_write_phy(dev, MII_BMCR, BMCR_ANENABLE);
++ /* Restart Auto Neg (Keep the Enable Auto Neg Bit Set) */
++ if (!ret)
++ ret = mcs7830_write_phy(dev, MII_BMCR,
++ BMCR_ANENABLE | BMCR_ANRESTART );
++ return ret;
++}
++
++
++/*
++ * if we can read register 22, the chip revision is C or higher
++ */
++static int mcs7830_get_rev(struct usbnet *dev)
++{
++ u8 dummy[2];
++ int ret;
++ ret = mcs7830_get_reg(dev, HIF_REG_FRAME_DROP_COUNTER, 2, dummy);
++ if (ret > 0)
++ return 2; /* Rev C or later */
++ return 1; /* earlier revision */
++}
++
++/*
++ * On rev. C we need to set the pause threshold
++ */
++static void mcs7830_rev_C_fixup(struct usbnet *dev)
++{
++ u8 pause_threshold = HIF_REG_PAUSE_THRESHOLD_DEFAULT;
++ int retry;
++
++ for (retry = 0; retry < 2; retry++) {
++ if (mcs7830_get_rev(dev) == 2) {
++ dev_info(&dev->udev->dev, "applying rev.C fixup\n");
++ mcs7830_set_reg(dev, HIF_REG_PAUSE_THRESHOLD,
++ 1, &pause_threshold);
++ }
++ msleep(1);
++ }
++}
++
++static int mcs7830_mdio_read(struct net_device *netdev, int phy_id,
++ int location)
++{
++ struct usbnet *dev = netdev_priv(netdev);
++ return mcs7830_read_phy(dev, location);
++}
++
++static void mcs7830_mdio_write(struct net_device *netdev, int phy_id,
++ int location, int val)
++{
++ struct usbnet *dev = netdev_priv(netdev);
++ mcs7830_write_phy(dev, location, val);
++}
++
++static int mcs7830_ioctl(struct net_device *net, struct ifreq *rq, int cmd)
++{
++ struct usbnet *dev = netdev_priv(net);
++ return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
++}
++
++static inline struct mcs7830_data *mcs7830_get_data(struct usbnet *dev)
++{
++ return (struct mcs7830_data *)&dev->data;
++}
++
++static void mcs7830_hif_update_multicast_hash(struct usbnet *dev)
++{
++ struct mcs7830_data *data = mcs7830_get_data(dev);
++ mcs7830_set_reg_async(dev, HIF_REG_MULTICAST_HASH,
++ sizeof data->multi_filter,
++ data->multi_filter);
++}
++
++static void mcs7830_hif_update_config(struct usbnet *dev)
++{
++ /* implementation specific to data->config
++ (argument needs to be heap-based anyway - USB DMA!) */
++ struct mcs7830_data *data = mcs7830_get_data(dev);
++ mcs7830_set_reg_async(dev, HIF_REG_CONFIG, 1, &data->config);
++}
++
++static void mcs7830_data_set_multicast(struct net_device *net)
++{
++ struct usbnet *dev = netdev_priv(net);
++ struct mcs7830_data *data = mcs7830_get_data(dev);
++
++ memset(data->multi_filter, 0, sizeof data->multi_filter);
++
++ data->config = HIF_REG_CONFIG_TXENABLE;
++
++ /* this should not be needed, but it doesn't work otherwise */
++ data->config |= HIF_REG_CONFIG_ALLMULTICAST;
++
++ if (net->flags & IFF_PROMISC) {
++ data->config |= HIF_REG_CONFIG_PROMISCUOUS;
++ } else if (net->flags & IFF_ALLMULTI ||
++ netdev_mc_count(net) > MCS7830_MAX_MCAST) {
++ data->config |= HIF_REG_CONFIG_ALLMULTICAST;
++ } else if (netdev_mc_empty(net)) {
++ /* just broadcast and directed */
++ } else {
++ /* We use the 20 byte dev->data
++ * for our 8 byte filter buffer
++ * to avoid allocating memory that
++ * is tricky to free later */
++ struct netdev_hw_addr *ha;
++ u32 crc_bits;
++
++ /* Build the multicast hash filter. */
++ netdev_for_each_mc_addr(ha, net) {
++ crc_bits = ether_crc(ETH_ALEN, ha->addr) >> 26;
++ data->multi_filter[crc_bits >> 3] |= 1 << (crc_bits & 7);
++ }
++ }
++}
++
++static int mcs7830_apply_base_config(struct usbnet *dev)
++{
++ int ret;
++
++ /* re-configure known MAC (suspend case etc.) */
++ ret = mcs7830_hif_set_mac_address(dev, dev->net->dev_addr);
++ if (ret) {
++ dev_info(&dev->udev->dev, "Cannot set MAC address\n");
++ goto out;
++ }
++
++ /* Set up PHY */
++ ret = mcs7830_set_autoneg(dev, 0);
++ if (ret) {
++ dev_info(&dev->udev->dev, "Cannot set autoneg\n");
++ goto out;
++ }
++
++ mcs7830_hif_update_multicast_hash(dev);
++ mcs7830_hif_update_config(dev);
++
++ mcs7830_rev_C_fixup(dev);
++ ret = 0;
++out:
++ return ret;
++}
++
++/* credits go to asix_set_multicast */
++static void mcs7830_set_multicast(struct net_device *net)
++{
++ struct usbnet *dev = netdev_priv(net);
++
++ mcs7830_data_set_multicast(net);
++
++ mcs7830_hif_update_multicast_hash(dev);
++ mcs7830_hif_update_config(dev);
++}
++
++static int mcs7830_get_regs_len(struct net_device *net)
++{
++ struct usbnet *dev = netdev_priv(net);
++
++ switch (mcs7830_get_rev(dev)) {
++ case 1:
++ return 21;
++ case 2:
++ return 32;
++ }
++ return 0;
++}
++
++static void mcs7830_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *drvinfo)
++{
++ usbnet_get_drvinfo(net, drvinfo);
++ drvinfo->regdump_len = mcs7830_get_regs_len(net);
++}
++
++static void mcs7830_get_regs(struct net_device *net, struct ethtool_regs *regs, void *data)
++{
++ struct usbnet *dev = netdev_priv(net);
++
++ regs->version = mcs7830_get_rev(dev);
++ mcs7830_get_reg(dev, 0, regs->len, data);
++}
++
++static const struct ethtool_ops mcs7830_ethtool_ops = {
++ .get_drvinfo = mcs7830_get_drvinfo,
++ .get_regs_len = mcs7830_get_regs_len,
++ .get_regs = mcs7830_get_regs,
++
++ /* common usbnet calls */
++ .get_link = usbnet_get_link,
++ .get_msglevel = usbnet_get_msglevel,
++ .set_msglevel = usbnet_set_msglevel,
++ .get_settings = usbnet_get_settings,
++ .set_settings = usbnet_set_settings,
++ .nway_reset = usbnet_nway_reset,
++};
++
++static const struct net_device_ops mcs7830_netdev_ops = {
++ .ndo_open = usbnet_open,
++ .ndo_stop = usbnet_stop,
++ .ndo_start_xmit = usbnet_start_xmit,
++ .ndo_tx_timeout = usbnet_tx_timeout,
++ .ndo_change_mtu = usbnet_change_mtu,
++ .ndo_validate_addr = eth_validate_addr,
++ .ndo_do_ioctl = mcs7830_ioctl,
++ .ndo_set_rx_mode = mcs7830_set_multicast,
++ .ndo_set_mac_address = mcs7830_set_mac_address,
++};
++
++static int mcs7830_bind(struct usbnet *dev, struct usb_interface *udev)
++{
++ struct net_device *net = dev->net;
++ int ret;
++ int retry;
++
++ /* Initial startup: Gather MAC address setting from EEPROM */
++ ret = -EINVAL;
++ for (retry = 0; retry < 5 && ret; retry++)
++ ret = mcs7830_hif_get_mac_address(dev, net->dev_addr);
++ if (ret) {
++ dev_warn(&dev->udev->dev, "Cannot read MAC address\n");
++ goto out;
++ }
++
++ mcs7830_data_set_multicast(net);
++
++ ret = mcs7830_apply_base_config(dev);
++ if (ret)
++ goto out;
++
++ net->ethtool_ops = &mcs7830_ethtool_ops;
++ net->netdev_ops = &mcs7830_netdev_ops;
++
++ /* reserve space for the status byte on rx */
++ dev->rx_urb_size = ETH_FRAME_LEN + 1;
++
++ dev->mii.mdio_read = mcs7830_mdio_read;
++ dev->mii.mdio_write = mcs7830_mdio_write;
++ dev->mii.dev = net;
++ dev->mii.phy_id_mask = 0x3f;
++ dev->mii.reg_num_mask = 0x1f;
++ dev->mii.phy_id = *((u8 *) net->dev_addr + 1);
++
++ ret = usbnet_get_endpoints(dev, udev);
++out:
++ return ret;
++}
++
++/* The chip always appends a status byte that we need to strip */
++static int mcs7830_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
++{
++ u8 status;
++
++ /* This check is no longer done by usbnet */
++ if (skb->len < dev->net->hard_header_len) {
++ dev_err(&dev->udev->dev, "unexpected tiny rx frame\n");
++ return 0;
++ }
++
++ skb_trim(skb, skb->len - 1);
++ status = skb->data[skb->len];
++
++ if (status != MCS7830_RX_FRAME_CORRECT) {
++ dev_dbg(&dev->udev->dev, "rx fixup status %x\n", status);
++
++ /* hmm, perhaps usbnet.c already sees a globally visible
++ frame error and increments rx_errors on its own already? */
++ dev->net->stats.rx_errors++;
++
++ if (status & (MCS7830_RX_SHORT_FRAME
++ |MCS7830_RX_LENGTH_ERROR
++ |MCS7830_RX_LARGE_FRAME))
++ dev->net->stats.rx_length_errors++;
++ if (status & MCS7830_RX_ALIGNMENT_ERROR)
++ dev->net->stats.rx_frame_errors++;
++ if (status & MCS7830_RX_CRC_ERROR)
++ dev->net->stats.rx_crc_errors++;
++ }
++
++ return skb->len > 0;
++}
++
++static void mcs7830_status(struct usbnet *dev, struct urb *urb)
++{
++ u8 *buf = urb->transfer_buffer;
++ bool link, link_changed;
++
++ if (urb->actual_length < 16)
++ return;
++
++ link = !(buf[1] == 0x20);
++ link_changed = netif_carrier_ok(dev->net) != link;
++ if (link_changed) {
++ usbnet_link_change(dev, link, 0);
++ netdev_dbg(dev->net, "Link Status is: %d\n", link);
++ }
++}
++
++static const struct driver_info moschip_info = {
++ .description = "MOSCHIP 7830/7832/7730 usb-NET adapter",
++ .bind = mcs7830_bind,
++ .rx_fixup = mcs7830_rx_fixup,
++ .flags = FLAG_ETHER | FLAG_LINK_INTR,
++ .status = mcs7830_status,
++ .in = 1,
++ .out = 2,
++};
++
++static const struct driver_info sitecom_info = {
++ .description = "Sitecom LN-30 usb-NET adapter",
++ .bind = mcs7830_bind,
++ .rx_fixup = mcs7830_rx_fixup,
++ .flags = FLAG_ETHER | FLAG_LINK_INTR,
++ .status = mcs7830_status,
++ .in = 1,
++ .out = 2,
++};
++
++static const struct usb_device_id products[] = {
++ {
++ USB_DEVICE(MCS7830_VENDOR_ID, MCS7832_PRODUCT_ID),
++ .driver_info = (unsigned long) &moschip_info,
++ },
++ {
++ USB_DEVICE(MCS7830_VENDOR_ID, MCS7830_PRODUCT_ID),
++ .driver_info = (unsigned long) &moschip_info,
++ },
++ {
++ USB_DEVICE(MCS7830_VENDOR_ID, MCS7730_PRODUCT_ID),
++ .driver_info = (unsigned long) &moschip_info,
++ },
++ {
++ USB_DEVICE(SITECOM_VENDOR_ID, LN_030_PRODUCT_ID),
++ .driver_info = (unsigned long) &sitecom_info,
++ },
++ {},
++};
++MODULE_DEVICE_TABLE(usb, products);
++
++static int mcs7830_reset_resume (struct usb_interface *intf)
++{
++ /* YES, this function is successful enough that ethtool -d
++ does show same output pre-/post-suspend */
++
++ struct usbnet *dev = usb_get_intfdata(intf);
++
++ mcs7830_apply_base_config(dev);
++
++ usbnet_resume(intf);
++
++ return 0;
++}
++
++static struct usb_driver mcs7830_driver = {
++ .name = driver_name,
++ .id_table = products,
++ .probe = usbnet_probe,
++ .disconnect = usbnet_disconnect,
++ .suspend = usbnet_suspend,
++ .resume = usbnet_resume,
++ .reset_resume = mcs7830_reset_resume,
++ .disable_hub_initiated_lpm = 1,
++};
++
++module_usb_driver(mcs7830_driver);
++
++MODULE_DESCRIPTION("USB to network adapter MCS7830)");
++MODULE_LICENSE("GPL");
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/net1080.c backports-4.2.6-1/drivers/net/usb/net1080.c
+--- backports-4.2.6-1.org/drivers/net/usb/net1080.c 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/net1080.c 2015-11-09 23:37:56.000000000 +0100
+@@ -0,0 +1,544 @@
++/*
++ * Net1080 based USB host-to-host cables
++ * Copyright (C) 2000-2005 by David Brownell
++ *
++ * 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, see <http://www.gnu.org/licenses/>.
++ */
++
++// #define DEBUG // error path messages, extra info
++// #define VERBOSE // more; success messages
++
++#include <linux/module.h>
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/ethtool.h>
++#include <linux/workqueue.h>
++#include <linux/mii.h>
++#include <linux/usb.h>
++#include <linux/usb/usbnet.h>
++#include <linux/slab.h>
++
++#include <asm/unaligned.h>
++
++
++/*
++ * Netchip 1080 driver ... http://www.netchip.com
++ * (Sept 2004: End-of-life announcement has been sent.)
++ * Used in (some) LapLink cables
++ */
++
++#define frame_errors data[1]
++
++/*
++ * NetChip framing of ethernet packets, supporting additional error
++ * checks for links that may drop bulk packets from inside messages.
++ * Odd USB length == always short read for last usb packet.
++ * - nc_header
++ * - Ethernet header (14 bytes)
++ * - payload
++ * - (optional padding byte, if needed so length becomes odd)
++ * - nc_trailer
++ *
++ * This framing is to be avoided for non-NetChip devices.
++ */
++
++struct nc_header { // packed:
++ __le16 hdr_len; // sizeof nc_header (LE, all)
++ __le16 packet_len; // payload size (including ethhdr)
++ __le16 packet_id; // detects dropped packets
++#define MIN_HEADER 6
++
++ // all else is optional, and must start with:
++ // __le16 vendorId; // from usb-if
++ // __le16 productId;
++} __packed;
++
++#define PAD_BYTE ((unsigned char)0xAC)
++
++struct nc_trailer {
++ __le16 packet_id;
++} __packed;
++
++// packets may use FLAG_FRAMING_NC and optional pad
++#define FRAMED_SIZE(mtu) (sizeof (struct nc_header) \
++ + sizeof (struct ethhdr) \
++ + (mtu) \
++ + 1 \
++ + sizeof (struct nc_trailer))
++
++#define MIN_FRAMED FRAMED_SIZE(0)
++
++/* packets _could_ be up to 64KB... */
++#define NC_MAX_PACKET 32767
++
++
++/*
++ * Zero means no timeout; else, how long a 64 byte bulk packet may be queued
++ * before the hardware drops it. If that's done, the driver will need to
++ * frame network packets to guard against the dropped USB packets. The win32
++ * driver sets this for both sides of the link.
++ */
++#define NC_READ_TTL_MS ((u8)255) // ms
++
++/*
++ * We ignore most registers and EEPROM contents.
++ */
++#define REG_USBCTL ((u8)0x04)
++#define REG_TTL ((u8)0x10)
++#define REG_STATUS ((u8)0x11)
++
++/*
++ * Vendor specific requests to read/write data
++ */
++#define REQUEST_REGISTER ((u8)0x10)
++#define REQUEST_EEPROM ((u8)0x11)
++
++static int
++nc_vendor_read(struct usbnet *dev, u8 req, u8 regnum, u16 *retval_ptr)
++{
++ int status = usbnet_read_cmd(dev, req,
++ USB_DIR_IN | USB_TYPE_VENDOR |
++ USB_RECIP_DEVICE,
++ 0, regnum, retval_ptr,
++ sizeof *retval_ptr);
++ if (status > 0)
++ status = 0;
++ if (!status)
++ le16_to_cpus(retval_ptr);
++ return status;
++}
++
++static inline int
++nc_register_read(struct usbnet *dev, u8 regnum, u16 *retval_ptr)
++{
++ return nc_vendor_read(dev, REQUEST_REGISTER, regnum, retval_ptr);
++}
++
++// no retval ... can become async, usable in_interrupt()
++static void
++nc_vendor_write(struct usbnet *dev, u8 req, u8 regnum, u16 value)
++{
++ usbnet_write_cmd(dev, req,
++ USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
++ value, regnum, NULL, 0);
++}
++
++static inline void
++nc_register_write(struct usbnet *dev, u8 regnum, u16 value)
++{
++ nc_vendor_write(dev, REQUEST_REGISTER, regnum, value);
++}
++
++
++#if 0
++static void nc_dump_registers(struct usbnet *dev)
++{
++ u8 reg;
++ u16 *vp = kmalloc(sizeof (u16));
++
++ if (!vp)
++ return;
++
++ netdev_dbg(dev->net, "registers:\n");
++ for (reg = 0; reg < 0x20; reg++) {
++ int retval;
++
++ // reading some registers is trouble
++ if (reg >= 0x08 && reg <= 0xf)
++ continue;
++ if (reg >= 0x12 && reg <= 0x1e)
++ continue;
++
++ retval = nc_register_read(dev, reg, vp);
++ if (retval < 0)
++ netdev_dbg(dev->net, "reg [0x%x] ==> error %d\n",
++ reg, retval);
++ else
++ netdev_dbg(dev->net, "reg [0x%x] = 0x%x\n", reg, *vp);
++ }
++ kfree(vp);
++}
++#endif
++
++
++/*-------------------------------------------------------------------------*/
++
++/*
++ * Control register
++ */
++
++#define USBCTL_WRITABLE_MASK 0x1f0f
++// bits 15-13 reserved, r/o
++#define USBCTL_ENABLE_LANG (1 << 12)
++#define USBCTL_ENABLE_MFGR (1 << 11)
++#define USBCTL_ENABLE_PROD (1 << 10)
++#define USBCTL_ENABLE_SERIAL (1 << 9)
++#define USBCTL_ENABLE_DEFAULTS (1 << 8)
++// bits 7-4 reserved, r/o
++#define USBCTL_FLUSH_OTHER (1 << 3)
++#define USBCTL_FLUSH_THIS (1 << 2)
++#define USBCTL_DISCONN_OTHER (1 << 1)
++#define USBCTL_DISCONN_THIS (1 << 0)
++
++static inline void nc_dump_usbctl(struct usbnet *dev, u16 usbctl)
++{
++ netif_dbg(dev, link, dev->net,
++ "net1080 %s-%s usbctl 0x%x:%s%s%s%s%s; this%s%s; other%s%s; r/o 0x%x\n",
++ dev->udev->bus->bus_name, dev->udev->devpath,
++ usbctl,
++ (usbctl & USBCTL_ENABLE_LANG) ? " lang" : "",
++ (usbctl & USBCTL_ENABLE_MFGR) ? " mfgr" : "",
++ (usbctl & USBCTL_ENABLE_PROD) ? " prod" : "",
++ (usbctl & USBCTL_ENABLE_SERIAL) ? " serial" : "",
++ (usbctl & USBCTL_ENABLE_DEFAULTS) ? " defaults" : "",
++
++ (usbctl & USBCTL_FLUSH_THIS) ? " FLUSH" : "",
++ (usbctl & USBCTL_DISCONN_THIS) ? " DIS" : "",
++
++ (usbctl & USBCTL_FLUSH_OTHER) ? " FLUSH" : "",
++ (usbctl & USBCTL_DISCONN_OTHER) ? " DIS" : "",
++
++ usbctl & ~USBCTL_WRITABLE_MASK);
++}
++
++/*-------------------------------------------------------------------------*/
++
++/*
++ * Status register
++ */
++
++#define STATUS_PORT_A (1 << 15)
++
++#define STATUS_CONN_OTHER (1 << 14)
++#define STATUS_SUSPEND_OTHER (1 << 13)
++#define STATUS_MAILBOX_OTHER (1 << 12)
++#define STATUS_PACKETS_OTHER(n) (((n) >> 8) & 0x03)
++
++#define STATUS_CONN_THIS (1 << 6)
++#define STATUS_SUSPEND_THIS (1 << 5)
++#define STATUS_MAILBOX_THIS (1 << 4)
++#define STATUS_PACKETS_THIS(n) (((n) >> 0) & 0x03)
++
++#define STATUS_UNSPEC_MASK 0x0c8c
++#define STATUS_NOISE_MASK ((u16)~(0x0303|STATUS_UNSPEC_MASK))
++
++
++static inline void nc_dump_status(struct usbnet *dev, u16 status)
++{
++ netif_dbg(dev, link, dev->net,
++ "net1080 %s-%s status 0x%x: this (%c) PKT=%d%s%s%s; other PKT=%d%s%s%s; unspec 0x%x\n",
++ dev->udev->bus->bus_name, dev->udev->devpath,
++ status,
++
++ // XXX the packet counts don't seem right
++ // (1 at reset, not 0); maybe UNSPEC too
++
++ (status & STATUS_PORT_A) ? 'A' : 'B',
++ STATUS_PACKETS_THIS(status),
++ (status & STATUS_CONN_THIS) ? " CON" : "",
++ (status & STATUS_SUSPEND_THIS) ? " SUS" : "",
++ (status & STATUS_MAILBOX_THIS) ? " MBOX" : "",
++
++ STATUS_PACKETS_OTHER(status),
++ (status & STATUS_CONN_OTHER) ? " CON" : "",
++ (status & STATUS_SUSPEND_OTHER) ? " SUS" : "",
++ (status & STATUS_MAILBOX_OTHER) ? " MBOX" : "",
++
++ status & STATUS_UNSPEC_MASK);
++}
++
++/*-------------------------------------------------------------------------*/
++
++/*
++ * TTL register
++ */
++
++#define TTL_THIS(ttl) (0x00ff & ttl)
++#define TTL_OTHER(ttl) (0x00ff & (ttl >> 8))
++#define MK_TTL(this,other) ((u16)(((other)<<8)|(0x00ff&(this))))
++
++static inline void nc_dump_ttl(struct usbnet *dev, u16 ttl)
++{
++ netif_dbg(dev, link, dev->net, "net1080 %s-%s ttl 0x%x this = %d, other = %d\n",
++ dev->udev->bus->bus_name, dev->udev->devpath,
++ ttl, TTL_THIS(ttl), TTL_OTHER(ttl));
++}
++
++/*-------------------------------------------------------------------------*/
++
++static int net1080_reset(struct usbnet *dev)
++{
++ u16 usbctl, status, ttl;
++ u16 vp;
++ int retval;
++
++ // nc_dump_registers(dev);
++
++ if ((retval = nc_register_read(dev, REG_STATUS, &vp)) < 0) {
++ netdev_dbg(dev->net, "can't read %s-%s status: %d\n",
++ dev->udev->bus->bus_name, dev->udev->devpath, retval);
++ goto done;
++ }
++ status = vp;
++ nc_dump_status(dev, status);
++
++ if ((retval = nc_register_read(dev, REG_USBCTL, &vp)) < 0) {
++ netdev_dbg(dev->net, "can't read USBCTL, %d\n", retval);
++ goto done;
++ }
++ usbctl = vp;
++ nc_dump_usbctl(dev, usbctl);
++
++ nc_register_write(dev, REG_USBCTL,
++ USBCTL_FLUSH_THIS | USBCTL_FLUSH_OTHER);
++
++ if ((retval = nc_register_read(dev, REG_TTL, &vp)) < 0) {
++ netdev_dbg(dev->net, "can't read TTL, %d\n", retval);
++ goto done;
++ }
++ ttl = vp;
++ // nc_dump_ttl(dev, ttl);
++
++ nc_register_write(dev, REG_TTL,
++ MK_TTL(NC_READ_TTL_MS, TTL_OTHER(ttl)) );
++ netdev_dbg(dev->net, "assigned TTL, %d ms\n", NC_READ_TTL_MS);
++
++ netif_info(dev, link, dev->net, "port %c, peer %sconnected\n",
++ (status & STATUS_PORT_A) ? 'A' : 'B',
++ (status & STATUS_CONN_OTHER) ? "" : "dis");
++ retval = 0;
++
++done:
++ return retval;
++}
++
++static int net1080_check_connect(struct usbnet *dev)
++{
++ int retval;
++ u16 status;
++ u16 vp;
++
++ retval = nc_register_read(dev, REG_STATUS, &vp);
++ status = vp;
++ if (retval != 0) {
++ netdev_dbg(dev->net, "net1080_check_conn read - %d\n", retval);
++ return retval;
++ }
++ if ((status & STATUS_CONN_OTHER) != STATUS_CONN_OTHER)
++ return -ENOLINK;
++ return 0;
++}
++
++static void nc_ensure_sync(struct usbnet *dev)
++{
++ if (++dev->frame_errors <= 5)
++ return;
++
++ if (usbnet_write_cmd_async(dev, REQUEST_REGISTER,
++ USB_DIR_OUT | USB_TYPE_VENDOR |
++ USB_RECIP_DEVICE,
++ USBCTL_FLUSH_THIS |
++ USBCTL_FLUSH_OTHER,
++ REG_USBCTL, NULL, 0))
++ return;
++
++ netif_dbg(dev, rx_err, dev->net,
++ "flush net1080; too many framing errors\n");
++ dev->frame_errors = 0;
++}
++
++static int net1080_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
++{
++ struct nc_header *header;
++ struct nc_trailer *trailer;
++ u16 hdr_len, packet_len;
++
++ /* This check is no longer done by usbnet */
++ if (skb->len < dev->net->hard_header_len)
++ return 0;
++
++ if (!(skb->len & 0x01)) {
++ netdev_dbg(dev->net, "rx framesize %d range %d..%d mtu %d\n",
++ skb->len, dev->net->hard_header_len, dev->hard_mtu,
++ dev->net->mtu);
++ dev->net->stats.rx_frame_errors++;
++ nc_ensure_sync(dev);
++ return 0;
++ }
++
++ header = (struct nc_header *) skb->data;
++ hdr_len = le16_to_cpup(&header->hdr_len);
++ packet_len = le16_to_cpup(&header->packet_len);
++ if (FRAMED_SIZE(packet_len) > NC_MAX_PACKET) {
++ dev->net->stats.rx_frame_errors++;
++ netdev_dbg(dev->net, "packet too big, %d\n", packet_len);
++ nc_ensure_sync(dev);
++ return 0;
++ } else if (hdr_len < MIN_HEADER) {
++ dev->net->stats.rx_frame_errors++;
++ netdev_dbg(dev->net, "header too short, %d\n", hdr_len);
++ nc_ensure_sync(dev);
++ return 0;
++ } else if (hdr_len > MIN_HEADER) {
++ // out of band data for us?
++ netdev_dbg(dev->net, "header OOB, %d bytes\n", hdr_len - MIN_HEADER);
++ nc_ensure_sync(dev);
++ // switch (vendor/product ids) { ... }
++ }
++ skb_pull(skb, hdr_len);
++
++ trailer = (struct nc_trailer *)
++ (skb->data + skb->len - sizeof *trailer);
++ skb_trim(skb, skb->len - sizeof *trailer);
++
++ if ((packet_len & 0x01) == 0) {
++ if (skb->data [packet_len] != PAD_BYTE) {
++ dev->net->stats.rx_frame_errors++;
++ netdev_dbg(dev->net, "bad pad\n");
++ return 0;
++ }
++ skb_trim(skb, skb->len - 1);
++ }
++ if (skb->len != packet_len) {
++ dev->net->stats.rx_frame_errors++;
++ netdev_dbg(dev->net, "bad packet len %d (expected %d)\n",
++ skb->len, packet_len);
++ nc_ensure_sync(dev);
++ return 0;
++ }
++ if (header->packet_id != get_unaligned(&trailer->packet_id)) {
++ dev->net->stats.rx_fifo_errors++;
++ netdev_dbg(dev->net, "(2+ dropped) rx packet_id mismatch 0x%x 0x%x\n",
++ le16_to_cpu(header->packet_id),
++ le16_to_cpu(trailer->packet_id));
++ return 0;
++ }
++#if 0
++ netdev_dbg(dev->net, "frame <rx h %d p %d id %d\n", header->hdr_len,
++ header->packet_len, header->packet_id);
++#endif
++ dev->frame_errors = 0;
++ return 1;
++}
++
++static struct sk_buff *
++net1080_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
++{
++ struct sk_buff *skb2;
++ struct nc_header *header = NULL;
++ struct nc_trailer *trailer = NULL;
++ int padlen = sizeof (struct nc_trailer);
++ int len = skb->len;
++
++ if (!((len + padlen + sizeof (struct nc_header)) & 0x01))
++ padlen++;
++ if (!skb_cloned(skb)) {
++ int headroom = skb_headroom(skb);
++ int tailroom = skb_tailroom(skb);
++
++ if (padlen <= tailroom &&
++ sizeof(struct nc_header) <= headroom)
++ /* There's enough head and tail room */
++ goto encapsulate;
++
++ if ((sizeof (struct nc_header) + padlen) <
++ (headroom + tailroom)) {
++ /* There's enough total room, so just readjust */
++ skb->data = memmove(skb->head
++ + sizeof (struct nc_header),
++ skb->data, skb->len);
++ skb_set_tail_pointer(skb, len);
++ goto encapsulate;
++ }
++ }
++
++ /* Create a new skb to use with the correct size */
++ skb2 = skb_copy_expand(skb,
++ sizeof (struct nc_header),
++ padlen,
++ flags);
++ dev_kfree_skb_any(skb);
++ if (!skb2)
++ return skb2;
++ skb = skb2;
++
++encapsulate:
++ /* header first */
++ header = (struct nc_header *) skb_push(skb, sizeof *header);
++ header->hdr_len = cpu_to_le16(sizeof (*header));
++ header->packet_len = cpu_to_le16(len);
++ header->packet_id = cpu_to_le16((u16)dev->xid++);
++
++ /* maybe pad; then trailer */
++ if (!((skb->len + sizeof *trailer) & 0x01))
++ *skb_put(skb, 1) = PAD_BYTE;
++ trailer = (struct nc_trailer *) skb_put(skb, sizeof *trailer);
++ put_unaligned(header->packet_id, &trailer->packet_id);
++#if 0
++ netdev_dbg(dev->net, "frame >tx h %d p %d id %d\n",
++ header->hdr_len, header->packet_len,
++ header->packet_id);
++#endif
++ return skb;
++}
++
++static int net1080_bind(struct usbnet *dev, struct usb_interface *intf)
++{
++ unsigned extra = sizeof (struct nc_header)
++ + 1
++ + sizeof (struct nc_trailer);
++
++ dev->net->hard_header_len += extra;
++ dev->rx_urb_size = dev->net->hard_header_len + dev->net->mtu;
++ dev->hard_mtu = NC_MAX_PACKET;
++ return usbnet_get_endpoints (dev, intf);
++}
++
++static const struct driver_info net1080_info = {
++ .description = "NetChip TurboCONNECT",
++ .flags = FLAG_POINTTOPOINT | FLAG_FRAMING_NC,
++ .bind = net1080_bind,
++ .reset = net1080_reset,
++ .check_connect = net1080_check_connect,
++ .rx_fixup = net1080_rx_fixup,
++ .tx_fixup = net1080_tx_fixup,
++};
++
++static const struct usb_device_id products [] = {
++{
++ USB_DEVICE(0x0525, 0x1080), // NetChip ref design
++ .driver_info = (unsigned long) &net1080_info,
++}, {
++ USB_DEVICE(0x06D0, 0x0622), // Laplink Gold
++ .driver_info = (unsigned long) &net1080_info,
++},
++ { }, // END
++};
++MODULE_DEVICE_TABLE(usb, products);
++
++static struct usb_driver net1080_driver = {
++ .name = "net1080",
++ .id_table = products,
++ .probe = usbnet_probe,
++ .disconnect = usbnet_disconnect,
++ .suspend = usbnet_suspend,
++ .resume = usbnet_resume,
++ .disable_hub_initiated_lpm = 1,
++};
++
++module_usb_driver(net1080_driver);
++
++MODULE_AUTHOR("David Brownell");
++MODULE_DESCRIPTION("NetChip 1080 based USB Host-to-Host Links");
++MODULE_LICENSE("GPL");
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/pegasus.c backports-4.2.6-1/drivers/net/usb/pegasus.c
+--- backports-4.2.6-1.org/drivers/net/usb/pegasus.c 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/pegasus.c 2015-11-09 23:37:56.000000000 +0100
+@@ -0,0 +1,1335 @@
++/*
++ * Copyright (c) 1999-2013 Petko Manolov (petkan(a)nucleusys.com)
++ *
++ * 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
++ * published by the Free Software Foundation.
++ *
++ * ChangeLog:
++ * .... Most of the time spent on reading sources & docs.
++ * v0.2.x First official release for the Linux kernel.
++ * v0.3.0 Beutified and structured, some bugs fixed.
++ * v0.3.x URBifying bulk requests and bugfixing. First relatively
++ * stable release. Still can touch device's registers only
++ * from top-halves.
++ * v0.4.0 Control messages remained unurbified are now URBs.
++ * Now we can touch the HW at any time.
++ * v0.4.9 Control urbs again use process context to wait. Argh...
++ * Some long standing bugs (enable_net_traffic) fixed.
++ * Also nasty trick about resubmiting control urb from
++ * interrupt context used. Please let me know how it
++ * behaves. Pegasus II support added since this version.
++ * TODO: suppressing HCD warnings spewage on disconnect.
++ * v0.4.13 Ethernet address is now set at probe(), not at open()
++ * time as this seems to break dhcpd.
++ * v0.5.0 branch to 2.5.x kernels
++ * v0.5.1 ethtool support added
++ * v0.5.5 rx socket buffers are in a pool and the their allocation
++ * is out of the interrupt routine.
++ * ...
++ * v0.9.3 simplified [get|set]_register(s), async update registers
++ * logic revisited, receive skb_pool removed.
++ */
++
++#include <linux/sched.h>
++#include <linux/slab.h>
++#include <linux/init.h>
++#include <linux/delay.h>
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/ethtool.h>
++#include <linux/mii.h>
++#include <linux/usb.h>
++#include <linux/module.h>
++#include <asm/byteorder.h>
++#include <asm/uaccess.h>
++#include "pegasus.h"
++
++/*
++ * Version Information
++ */
++#define DRIVER_VERSION "v0.9.3 (2013/04/25)"
++#define DRIVER_AUTHOR "Petko Manolov <petkan(a)nucleusys.com>"
++#define DRIVER_DESC "Pegasus/Pegasus II USB Ethernet driver"
++
++static const char driver_name[] = "pegasus";
++
++#undef PEGASUS_WRITE_EEPROM
++#define BMSR_MEDIA (BMSR_10HALF | BMSR_10FULL | BMSR_100HALF | \
++ BMSR_100FULL | BMSR_ANEGCAPABLE)
++
++static bool loopback;
++static bool mii_mode;
++static char *devid;
++
++static struct usb_eth_dev usb_dev_id[] = {
++#define PEGASUS_DEV(pn, vid, pid, flags) \
++ {.name = pn, .vendor = vid, .device = pid, .private = flags},
++#define PEGASUS_DEV_CLASS(pn, vid, pid, dclass, flags) \
++ PEGASUS_DEV(pn, vid, pid, flags)
++#include "pegasus.h"
++#undef PEGASUS_DEV
++#undef PEGASUS_DEV_CLASS
++ {NULL, 0, 0, 0},
++ {NULL, 0, 0, 0}
++};
++
++static struct usb_device_id pegasus_ids[] = {
++#define PEGASUS_DEV(pn, vid, pid, flags) \
++ {.match_flags = USB_DEVICE_ID_MATCH_DEVICE, .idVendor = vid, .idProduct = pid},
++/*
++ * The Belkin F8T012xx1 bluetooth adaptor has the same vendor and product
++ * IDs as the Belkin F5D5050, so we need to teach the pegasus driver to
++ * ignore adaptors belonging to the "Wireless" class 0xE0. For this one
++ * case anyway, seeing as the pegasus is for "Wired" adaptors.
++ */
++#define PEGASUS_DEV_CLASS(pn, vid, pid, dclass, flags) \
++ {.match_flags = (USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_DEV_CLASS), \
++ .idVendor = vid, .idProduct = pid, .bDeviceClass = dclass},
++#include "pegasus.h"
++#undef PEGASUS_DEV
++#undef PEGASUS_DEV_CLASS
++ {},
++ {}
++};
++
++MODULE_AUTHOR(DRIVER_AUTHOR);
++MODULE_DESCRIPTION(DRIVER_DESC);
++MODULE_LICENSE("GPL");
++module_param(loopback, bool, 0);
++module_param(mii_mode, bool, 0);
++module_param(devid, charp, 0);
++MODULE_PARM_DESC(loopback, "Enable MAC loopback mode (bit 0)");
++MODULE_PARM_DESC(mii_mode, "Enable HomePNA mode (bit 0),default=MII mode = 0");
++MODULE_PARM_DESC(devid, "The format is: 'DEV_name:VendorID:DeviceID:Flags'");
++
++/* use ethtool to change the level for any given device */
++static int msg_level = -1;
++module_param(msg_level, int, 0);
++MODULE_PARM_DESC(msg_level, "Override default message level");
++
++MODULE_DEVICE_TABLE(usb, pegasus_ids);
++static const struct net_device_ops pegasus_netdev_ops;
++
++/*****/
++
++static void async_ctrl_callback(struct urb *urb)
++{
++ struct usb_ctrlrequest *req = (struct usb_ctrlrequest *)urb->context;
++ int status = urb->status;
++
++ if (status < 0)
++ dev_dbg(&urb->dev->dev, "%s failed with %d", __func__, status);
++ kfree(req);
++ usb_free_urb(urb);
++}
++
++static int get_registers(pegasus_t *pegasus, __u16 indx, __u16 size, void *data)
++{
++ int ret;
++
++ ret = usb_control_msg(pegasus->usb, usb_rcvctrlpipe(pegasus->usb, 0),
++ PEGASUS_REQ_GET_REGS, PEGASUS_REQT_READ, 0,
++ indx, data, size, 1000);
++ if (ret < 0)
++ netif_dbg(pegasus, drv, pegasus->net,
++ "%s returned %d\n", __func__, ret);
++ return ret;
++}
++
++static int set_registers(pegasus_t *pegasus, __u16 indx, __u16 size, void *data)
++{
++ int ret;
++
++ ret = usb_control_msg(pegasus->usb, usb_sndctrlpipe(pegasus->usb, 0),
++ PEGASUS_REQ_SET_REGS, PEGASUS_REQT_WRITE, 0,
++ indx, data, size, 100);
++ if (ret < 0)
++ netif_dbg(pegasus, drv, pegasus->net,
++ "%s returned %d\n", __func__, ret);
++ return ret;
++}
++
++static int set_register(pegasus_t *pegasus, __u16 indx, __u8 data)
++{
++ int ret;
++
++ ret = usb_control_msg(pegasus->usb, usb_sndctrlpipe(pegasus->usb, 0),
++ PEGASUS_REQ_SET_REG, PEGASUS_REQT_WRITE, data,
++ indx, &data, 1, 1000);
++ if (ret < 0)
++ netif_dbg(pegasus, drv, pegasus->net,
++ "%s returned %d\n", __func__, ret);
++ return ret;
++}
++
++static int update_eth_regs_async(pegasus_t *pegasus)
++{
++ int ret = -ENOMEM;
++ struct urb *async_urb;
++ struct usb_ctrlrequest *req;
++
++ req = kmalloc(sizeof(struct usb_ctrlrequest), GFP_ATOMIC);
++ if (req == NULL)
++ return ret;
++
++ async_urb = usb_alloc_urb(0, GFP_ATOMIC);
++ if (async_urb == NULL) {
++ kfree(req);
++ return ret;
++ }
++ req->bRequestType = PEGASUS_REQT_WRITE;
++ req->bRequest = PEGASUS_REQ_SET_REGS;
++ req->wValue = cpu_to_le16(0);
++ req->wIndex = cpu_to_le16(EthCtrl0);
++ req->wLength = cpu_to_le16(3);
++
++ usb_fill_control_urb(async_urb, pegasus->usb,
++ usb_sndctrlpipe(pegasus->usb, 0), (void *)req,
++ pegasus->eth_regs, 3, async_ctrl_callback, req);
++
++ ret = usb_submit_urb(async_urb, GFP_ATOMIC);
++ if (ret) {
++ if (ret == -ENODEV)
++ netif_device_detach(pegasus->net);
++ netif_err(pegasus, drv, pegasus->net,
++ "%s returned %d\n", __func__, ret);
++ }
++ return ret;
++}
++
++static int __mii_op(pegasus_t *p, __u8 phy, __u8 indx, __u16 *regd, __u8 cmd)
++{
++ int i;
++ __u8 data[4] = { phy, 0, 0, indx };
++ __le16 regdi;
++ int ret = -ETIMEDOUT;
++
++ if (cmd & PHY_WRITE) {
++ __le16 *t = (__le16 *) & data[1];
++ *t = cpu_to_le16(*regd);
++ }
++ set_register(p, PhyCtrl, 0);
++ set_registers(p, PhyAddr, sizeof(data), data);
++ set_register(p, PhyCtrl, (indx | cmd));
++ for (i = 0; i < REG_TIMEOUT; i++) {
++ ret = get_registers(p, PhyCtrl, 1, data);
++ if (ret < 0)
++ goto fail;
++ if (data[0] & PHY_DONE)
++ break;
++ }
++ if (i >= REG_TIMEOUT)
++ goto fail;
++ if (cmd & PHY_READ) {
++ ret = get_registers(p, PhyData, 2, ®di);
++ *regd = le16_to_cpu(regdi);
++ return ret;
++ }
++ return 0;
++fail:
++ netif_dbg(p, drv, p->net, "%s failed\n", __func__);
++ return ret;
++}
++
++/* Returns non-negative int on success, error on failure */
++static int read_mii_word(pegasus_t *pegasus, __u8 phy, __u8 indx, __u16 *regd)
++{
++ return __mii_op(pegasus, phy, indx, regd, PHY_READ);
++}
++
++/* Returns zero on success, error on failure */
++static int write_mii_word(pegasus_t *pegasus, __u8 phy, __u8 indx, __u16 *regd)
++{
++ return __mii_op(pegasus, phy, indx, regd, PHY_WRITE);
++}
++
++static int mdio_read(struct net_device *dev, int phy_id, int loc)
++{
++ pegasus_t *pegasus = netdev_priv(dev);
++ u16 res;
++
++ read_mii_word(pegasus, phy_id, loc, &res);
++ return (int)res;
++}
++
++static void mdio_write(struct net_device *dev, int phy_id, int loc, int val)
++{
++ pegasus_t *pegasus = netdev_priv(dev);
++ u16 data = val;
++
++ write_mii_word(pegasus, phy_id, loc, &data);
++}
++
++static int read_eprom_word(pegasus_t *pegasus, __u8 index, __u16 *retdata)
++{
++ int i;
++ __u8 tmp;
++ __le16 retdatai;
++ int ret;
++
++ set_register(pegasus, EpromCtrl, 0);
++ set_register(pegasus, EpromOffset, index);
++ set_register(pegasus, EpromCtrl, EPROM_READ);
++
++ for (i = 0; i < REG_TIMEOUT; i++) {
++ ret = get_registers(pegasus, EpromCtrl, 1, &tmp);
++ if (tmp & EPROM_DONE)
++ break;
++ if (ret == -ESHUTDOWN)
++ goto fail;
++ }
++ if (i >= REG_TIMEOUT)
++ goto fail;
++
++ ret = get_registers(pegasus, EpromData, 2, &retdatai);
++ *retdata = le16_to_cpu(retdatai);
++ return ret;
++
++fail:
++ netif_warn(pegasus, drv, pegasus->net, "%s failed\n", __func__);
++ return -ETIMEDOUT;
++}
++
++#ifdef PEGASUS_WRITE_EEPROM
++static inline void enable_eprom_write(pegasus_t *pegasus)
++{
++ __u8 tmp;
++
++ get_registers(pegasus, EthCtrl2, 1, &tmp);
++ set_register(pegasus, EthCtrl2, tmp | EPROM_WR_ENABLE);
++}
++
++static inline void disable_eprom_write(pegasus_t *pegasus)
++{
++ __u8 tmp;
++
++ get_registers(pegasus, EthCtrl2, 1, &tmp);
++ set_register(pegasus, EpromCtrl, 0);
++ set_register(pegasus, EthCtrl2, tmp & ~EPROM_WR_ENABLE);
++}
++
++static int write_eprom_word(pegasus_t *pegasus, __u8 index, __u16 data)
++{
++ int i;
++ __u8 tmp, d[4] = { 0x3f, 0, 0, EPROM_WRITE };
++ int ret;
++ __le16 le_data = cpu_to_le16(data);
++
++ set_registers(pegasus, EpromOffset, 4, d);
++ enable_eprom_write(pegasus);
++ set_register(pegasus, EpromOffset, index);
++ set_registers(pegasus, EpromData, 2, &le_data);
++ set_register(pegasus, EpromCtrl, EPROM_WRITE);
++
++ for (i = 0; i < REG_TIMEOUT; i++) {
++ ret = get_registers(pegasus, EpromCtrl, 1, &tmp);
++ if (ret == -ESHUTDOWN)
++ goto fail;
++ if (tmp & EPROM_DONE)
++ break;
++ }
++ disable_eprom_write(pegasus);
++ if (i >= REG_TIMEOUT)
++ goto fail;
++
++ return ret;
++
++fail:
++ netif_warn(pegasus, drv, pegasus->net, "%s failed\n", __func__);
++ return -ETIMEDOUT;
++}
++#endif /* PEGASUS_WRITE_EEPROM */
++
++static inline void get_node_id(pegasus_t *pegasus, __u8 *id)
++{
++ int i;
++ __u16 w16;
++
++ for (i = 0; i < 3; i++) {
++ read_eprom_word(pegasus, i, &w16);
++ ((__le16 *) id)[i] = cpu_to_le16(w16);
++ }
++}
++
++static void set_ethernet_addr(pegasus_t *pegasus)
++{
++ __u8 node_id[6];
++
++ if (pegasus->features & PEGASUS_II) {
++ get_registers(pegasus, 0x10, sizeof(node_id), node_id);
++ } else {
++ get_node_id(pegasus, node_id);
++ set_registers(pegasus, EthID, sizeof(node_id), node_id);
++ }
++ memcpy(pegasus->net->dev_addr, node_id, sizeof(node_id));
++}
++
++static inline int reset_mac(pegasus_t *pegasus)
++{
++ __u8 data = 0x8;
++ int i;
++
++ set_register(pegasus, EthCtrl1, data);
++ for (i = 0; i < REG_TIMEOUT; i++) {
++ get_registers(pegasus, EthCtrl1, 1, &data);
++ if (~data & 0x08) {
++ if (loopback)
++ break;
++ if (mii_mode && (pegasus->features & HAS_HOME_PNA))
++ set_register(pegasus, Gpio1, 0x34);
++ else
++ set_register(pegasus, Gpio1, 0x26);
++ set_register(pegasus, Gpio0, pegasus->features);
++ set_register(pegasus, Gpio0, DEFAULT_GPIO_SET);
++ break;
++ }
++ }
++ if (i == REG_TIMEOUT)
++ return -ETIMEDOUT;
++
++ if (usb_dev_id[pegasus->dev_index].vendor == VENDOR_LINKSYS ||
++ usb_dev_id[pegasus->dev_index].vendor == VENDOR_DLINK) {
++ set_register(pegasus, Gpio0, 0x24);
++ set_register(pegasus, Gpio0, 0x26);
++ }
++ if (usb_dev_id[pegasus->dev_index].vendor == VENDOR_ELCON) {
++ __u16 auxmode;
++ read_mii_word(pegasus, 3, 0x1b, &auxmode);
++ auxmode |= 4;
++ write_mii_word(pegasus, 3, 0x1b, &auxmode);
++ }
++
++ return 0;
++}
++
++static int enable_net_traffic(struct net_device *dev, struct usb_device *usb)
++{
++ __u16 linkpart;
++ __u8 data[4];
++ pegasus_t *pegasus = netdev_priv(dev);
++ int ret;
++
++ read_mii_word(pegasus, pegasus->phy, MII_LPA, &linkpart);
++ data[0] = 0xc9;
++ data[1] = 0;
++ if (linkpart & (ADVERTISE_100FULL | ADVERTISE_10FULL))
++ data[1] |= 0x20; /* set full duplex */
++ if (linkpart & (ADVERTISE_100FULL | ADVERTISE_100HALF))
++ data[1] |= 0x10; /* set 100 Mbps */
++ if (mii_mode)
++ data[1] = 0;
++ data[2] = loopback ? 0x09 : 0x01;
++
++ memcpy(pegasus->eth_regs, data, sizeof(data));
++ ret = set_registers(pegasus, EthCtrl0, 3, data);
++
++ if (usb_dev_id[pegasus->dev_index].vendor == VENDOR_LINKSYS ||
++ usb_dev_id[pegasus->dev_index].vendor == VENDOR_LINKSYS2 ||
++ usb_dev_id[pegasus->dev_index].vendor == VENDOR_DLINK) {
++ u16 auxmode;
++ read_mii_word(pegasus, 0, 0x1b, &auxmode);
++ auxmode |= 4;
++ write_mii_word(pegasus, 0, 0x1b, &auxmode);
++ }
++
++ return ret;
++}
++
++static void read_bulk_callback(struct urb *urb)
++{
++ pegasus_t *pegasus = urb->context;
++ struct net_device *net;
++ int rx_status, count = urb->actual_length;
++ int status = urb->status;
++ u8 *buf = urb->transfer_buffer;
++ __u16 pkt_len;
++
++ if (!pegasus)
++ return;
++
++ net = pegasus->net;
++ if (!netif_device_present(net) || !netif_running(net))
++ return;
++
++ switch (status) {
++ case 0:
++ break;
++ case -ETIME:
++ netif_dbg(pegasus, rx_err, net, "reset MAC\n");
++ pegasus->flags &= ~PEGASUS_RX_BUSY;
++ break;
++ case -EPIPE: /* stall, or disconnect from TT */
++ /* FIXME schedule work to clear the halt */
++ netif_warn(pegasus, rx_err, net, "no rx stall recovery\n");
++ return;
++ case -ENOENT:
++ case -ECONNRESET:
++ case -ESHUTDOWN:
++ netif_dbg(pegasus, ifdown, net, "rx unlink, %d\n", status);
++ return;
++ default:
++ netif_dbg(pegasus, rx_err, net, "RX status %d\n", status);
++ goto goon;
++ }
++
++ if (!count || count < 4)
++ goto goon;
++
++ rx_status = buf[count - 2];
++ if (rx_status & 0x1e) {
++ netif_dbg(pegasus, rx_err, net,
++ "RX packet error %x\n", rx_status);
++ pegasus->stats.rx_errors++;
++ if (rx_status & 0x06) /* long or runt */
++ pegasus->stats.rx_length_errors++;
++ if (rx_status & 0x08)
++ pegasus->stats.rx_crc_errors++;
++ if (rx_status & 0x10) /* extra bits */
++ pegasus->stats.rx_frame_errors++;
++ goto goon;
++ }
++ if (pegasus->chip == 0x8513) {
++ pkt_len = le32_to_cpu(*(__le32 *)urb->transfer_buffer);
++ pkt_len &= 0x0fff;
++ pegasus->rx_skb->data += 2;
++ } else {
++ pkt_len = buf[count - 3] << 8;
++ pkt_len += buf[count - 4];
++ pkt_len &= 0xfff;
++ pkt_len -= 8;
++ }
++
++ /*
++ * If the packet is unreasonably long, quietly drop it rather than
++ * kernel panicing by calling skb_put.
++ */
++ if (pkt_len > PEGASUS_MTU)
++ goto goon;
++
++ /*
++ * at this point we are sure pegasus->rx_skb != NULL
++ * so we go ahead and pass up the packet.
++ */
++ skb_put(pegasus->rx_skb, pkt_len);
++ pegasus->rx_skb->protocol = eth_type_trans(pegasus->rx_skb, net);
++ netif_rx(pegasus->rx_skb);
++ pegasus->stats.rx_packets++;
++ pegasus->stats.rx_bytes += pkt_len;
++
++ if (pegasus->flags & PEGASUS_UNPLUG)
++ return;
++
++ pegasus->rx_skb = __netdev_alloc_skb_ip_align(pegasus->net, PEGASUS_MTU,
++ GFP_ATOMIC);
++
++ if (pegasus->rx_skb == NULL)
++ goto tl_sched;
++goon:
++ usb_fill_bulk_urb(pegasus->rx_urb, pegasus->usb,
++ usb_rcvbulkpipe(pegasus->usb, 1),
++ pegasus->rx_skb->data, PEGASUS_MTU + 8,
++ read_bulk_callback, pegasus);
++ rx_status = usb_submit_urb(pegasus->rx_urb, GFP_ATOMIC);
++ if (rx_status == -ENODEV)
++ netif_device_detach(pegasus->net);
++ else if (rx_status) {
++ pegasus->flags |= PEGASUS_RX_URB_FAIL;
++ goto tl_sched;
++ } else {
++ pegasus->flags &= ~PEGASUS_RX_URB_FAIL;
++ }
++
++ return;
++
++tl_sched:
++ tasklet_schedule(&pegasus->rx_tl);
++}
++
++static void rx_fixup(unsigned long data)
++{
++ pegasus_t *pegasus;
++ int status;
++
++ pegasus = (pegasus_t *) data;
++ if (pegasus->flags & PEGASUS_UNPLUG)
++ return;
++
++ if (pegasus->flags & PEGASUS_RX_URB_FAIL)
++ if (pegasus->rx_skb)
++ goto try_again;
++ if (pegasus->rx_skb == NULL)
++ pegasus->rx_skb = __netdev_alloc_skb_ip_align(pegasus->net,
++ PEGASUS_MTU,
++ GFP_ATOMIC);
++ if (pegasus->rx_skb == NULL) {
++ netif_warn(pegasus, rx_err, pegasus->net, "low on memory\n");
++ tasklet_schedule(&pegasus->rx_tl);
++ return;
++ }
++ usb_fill_bulk_urb(pegasus->rx_urb, pegasus->usb,
++ usb_rcvbulkpipe(pegasus->usb, 1),
++ pegasus->rx_skb->data, PEGASUS_MTU + 8,
++ read_bulk_callback, pegasus);
++try_again:
++ status = usb_submit_urb(pegasus->rx_urb, GFP_ATOMIC);
++ if (status == -ENODEV)
++ netif_device_detach(pegasus->net);
++ else if (status) {
++ pegasus->flags |= PEGASUS_RX_URB_FAIL;
++ tasklet_schedule(&pegasus->rx_tl);
++ } else {
++ pegasus->flags &= ~PEGASUS_RX_URB_FAIL;
++ }
++}
++
++static void write_bulk_callback(struct urb *urb)
++{
++ pegasus_t *pegasus = urb->context;
++ struct net_device *net;
++ int status = urb->status;
++
++ if (!pegasus)
++ return;
++
++ net = pegasus->net;
++
++ if (!netif_device_present(net) || !netif_running(net))
++ return;
++
++ switch (status) {
++ case -EPIPE:
++ /* FIXME schedule_work() to clear the tx halt */
++ netif_stop_queue(net);
++ netif_warn(pegasus, tx_err, net, "no tx stall recovery\n");
++ return;
++ case -ENOENT:
++ case -ECONNRESET:
++ case -ESHUTDOWN:
++ netif_dbg(pegasus, ifdown, net, "tx unlink, %d\n", status);
++ return;
++ default:
++ netif_info(pegasus, tx_err, net, "TX status %d\n", status);
++ /* FALL THROUGH */
++ case 0:
++ break;
++ }
++
++ net->trans_start = jiffies; /* prevent tx timeout */
++ netif_wake_queue(net);
++}
++
++static void intr_callback(struct urb *urb)
++{
++ pegasus_t *pegasus = urb->context;
++ struct net_device *net;
++ int res, status = urb->status;
++
++ if (!pegasus)
++ return;
++ net = pegasus->net;
++
++ switch (status) {
++ case 0:
++ break;
++ case -ECONNRESET: /* unlink */
++ case -ENOENT:
++ case -ESHUTDOWN:
++ return;
++ default:
++ /* some Pegasus-I products report LOTS of data
++ * toggle errors... avoid log spamming
++ */
++ netif_dbg(pegasus, timer, net, "intr status %d\n", status);
++ }
++
++ if (urb->actual_length >= 6) {
++ u8 *d = urb->transfer_buffer;
++
++ /* byte 0 == tx_status1, reg 2B */
++ if (d[0] & (TX_UNDERRUN|EXCESSIVE_COL
++ |LATE_COL|JABBER_TIMEOUT)) {
++ pegasus->stats.tx_errors++;
++ if (d[0] & TX_UNDERRUN)
++ pegasus->stats.tx_fifo_errors++;
++ if (d[0] & (EXCESSIVE_COL | JABBER_TIMEOUT))
++ pegasus->stats.tx_aborted_errors++;
++ if (d[0] & LATE_COL)
++ pegasus->stats.tx_window_errors++;
++ }
++
++ /* d[5].LINK_STATUS lies on some adapters.
++ * d[0].NO_CARRIER kicks in only with failed TX.
++ * ... so monitoring with MII may be safest.
++ */
++
++ /* bytes 3-4 == rx_lostpkt, reg 2E/2F */
++ pegasus->stats.rx_missed_errors += ((d[3] & 0x7f) << 8) | d[4];
++ }
++
++ res = usb_submit_urb(urb, GFP_ATOMIC);
++ if (res == -ENODEV)
++ netif_device_detach(pegasus->net);
++ if (res)
++ netif_err(pegasus, timer, net,
++ "can't resubmit interrupt urb, %d\n", res);
++}
++
++static void pegasus_tx_timeout(struct net_device *net)
++{
++ pegasus_t *pegasus = netdev_priv(net);
++ netif_warn(pegasus, timer, net, "tx timeout\n");
++ usb_unlink_urb(pegasus->tx_urb);
++ pegasus->stats.tx_errors++;
++}
++
++static netdev_tx_t pegasus_start_xmit(struct sk_buff *skb,
++ struct net_device *net)
++{
++ pegasus_t *pegasus = netdev_priv(net);
++ int count = ((skb->len + 2) & 0x3f) ? skb->len + 2 : skb->len + 3;
++ int res;
++ __u16 l16 = skb->len;
++
++ netif_stop_queue(net);
++
++ ((__le16 *) pegasus->tx_buff)[0] = cpu_to_le16(l16);
++ skb_copy_from_linear_data(skb, pegasus->tx_buff + 2, skb->len);
++ usb_fill_bulk_urb(pegasus->tx_urb, pegasus->usb,
++ usb_sndbulkpipe(pegasus->usb, 2),
++ pegasus->tx_buff, count,
++ write_bulk_callback, pegasus);
++ if ((res = usb_submit_urb(pegasus->tx_urb, GFP_ATOMIC))) {
++ netif_warn(pegasus, tx_err, net, "fail tx, %d\n", res);
++ switch (res) {
++ case -EPIPE: /* stall, or disconnect from TT */
++ /* cleanup should already have been scheduled */
++ break;
++ case -ENODEV: /* disconnect() upcoming */
++ case -EPERM:
++ netif_device_detach(pegasus->net);
++ break;
++ default:
++ pegasus->stats.tx_errors++;
++ netif_start_queue(net);
++ }
++ } else {
++ pegasus->stats.tx_packets++;
++ pegasus->stats.tx_bytes += skb->len;
++ }
++ dev_kfree_skb(skb);
++
++ return NETDEV_TX_OK;
++}
++
++static struct net_device_stats *pegasus_netdev_stats(struct net_device *dev)
++{
++ return &((pegasus_t *) netdev_priv(dev))->stats;
++}
++
++static inline void disable_net_traffic(pegasus_t *pegasus)
++{
++ __le16 tmp = cpu_to_le16(0);
++
++ set_registers(pegasus, EthCtrl0, sizeof(tmp), &tmp);
++}
++
++static inline void get_interrupt_interval(pegasus_t *pegasus)
++{
++ u16 data;
++ u8 interval;
++
++ read_eprom_word(pegasus, 4, &data);
++ interval = data >> 8;
++ if (pegasus->usb->speed != USB_SPEED_HIGH) {
++ if (interval < 0x80) {
++ netif_info(pegasus, timer, pegasus->net,
++ "intr interval changed from %ums to %ums\n",
++ interval, 0x80);
++ interval = 0x80;
++ data = (data & 0x00FF) | ((u16)interval << 8);
++#ifdef PEGASUS_WRITE_EEPROM
++ write_eprom_word(pegasus, 4, data);
++#endif
++ }
++ }
++ pegasus->intr_interval = interval;
++}
++
++static void set_carrier(struct net_device *net)
++{
++ pegasus_t *pegasus = netdev_priv(net);
++ u16 tmp;
++
++ if (read_mii_word(pegasus, pegasus->phy, MII_BMSR, &tmp))
++ return;
++
++ if (tmp & BMSR_LSTATUS)
++ netif_carrier_on(net);
++ else
++ netif_carrier_off(net);
++}
++
++static void free_all_urbs(pegasus_t *pegasus)
++{
++ usb_free_urb(pegasus->intr_urb);
++ usb_free_urb(pegasus->tx_urb);
++ usb_free_urb(pegasus->rx_urb);
++}
++
++static void unlink_all_urbs(pegasus_t *pegasus)
++{
++ usb_kill_urb(pegasus->intr_urb);
++ usb_kill_urb(pegasus->tx_urb);
++ usb_kill_urb(pegasus->rx_urb);
++}
++
++static int alloc_urbs(pegasus_t *pegasus)
++{
++ int res = -ENOMEM;
++
++ pegasus->rx_urb = usb_alloc_urb(0, GFP_KERNEL);
++ if (!pegasus->rx_urb) {
++ return res;
++ }
++ pegasus->tx_urb = usb_alloc_urb(0, GFP_KERNEL);
++ if (!pegasus->tx_urb) {
++ usb_free_urb(pegasus->rx_urb);
++ return res;
++ }
++ pegasus->intr_urb = usb_alloc_urb(0, GFP_KERNEL);
++ if (!pegasus->intr_urb) {
++ usb_free_urb(pegasus->tx_urb);
++ usb_free_urb(pegasus->rx_urb);
++ return res;
++ }
++
++ return 0;
++}
++
++static int pegasus_open(struct net_device *net)
++{
++ pegasus_t *pegasus = netdev_priv(net);
++ int res=-ENOMEM;
++
++ if (pegasus->rx_skb == NULL)
++ pegasus->rx_skb = __netdev_alloc_skb_ip_align(pegasus->net,
++ PEGASUS_MTU,
++ GFP_KERNEL);
++ if (!pegasus->rx_skb)
++ goto exit;
++
++ res = set_registers(pegasus, EthID, 6, net->dev_addr);
++
++ usb_fill_bulk_urb(pegasus->rx_urb, pegasus->usb,
++ usb_rcvbulkpipe(pegasus->usb, 1),
++ pegasus->rx_skb->data, PEGASUS_MTU + 8,
++ read_bulk_callback, pegasus);
++ if ((res = usb_submit_urb(pegasus->rx_urb, GFP_KERNEL))) {
++ if (res == -ENODEV)
++ netif_device_detach(pegasus->net);
++ netif_dbg(pegasus, ifup, net, "failed rx_urb, %d\n", res);
++ goto exit;
++ }
++
++ usb_fill_int_urb(pegasus->intr_urb, pegasus->usb,
++ usb_rcvintpipe(pegasus->usb, 3),
++ pegasus->intr_buff, sizeof(pegasus->intr_buff),
++ intr_callback, pegasus, pegasus->intr_interval);
++ if ((res = usb_submit_urb(pegasus->intr_urb, GFP_KERNEL))) {
++ if (res == -ENODEV)
++ netif_device_detach(pegasus->net);
++ netif_dbg(pegasus, ifup, net, "failed intr_urb, %d\n", res);
++ usb_kill_urb(pegasus->rx_urb);
++ goto exit;
++ }
++ res = enable_net_traffic(net, pegasus->usb);
++ if (res < 0) {
++ netif_dbg(pegasus, ifup, net,
++ "can't enable_net_traffic() - %d\n", res);
++ res = -EIO;
++ usb_kill_urb(pegasus->rx_urb);
++ usb_kill_urb(pegasus->intr_urb);
++ goto exit;
++ }
++ set_carrier(net);
++ netif_start_queue(net);
++ netif_dbg(pegasus, ifup, net, "open\n");
++ res = 0;
++exit:
++ return res;
++}
++
++static int pegasus_close(struct net_device *net)
++{
++ pegasus_t *pegasus = netdev_priv(net);
++
++ netif_stop_queue(net);
++ if (!(pegasus->flags & PEGASUS_UNPLUG))
++ disable_net_traffic(pegasus);
++ tasklet_kill(&pegasus->rx_tl);
++ unlink_all_urbs(pegasus);
++
++ return 0;
++}
++
++static void pegasus_get_drvinfo(struct net_device *dev,
++ struct ethtool_drvinfo *info)
++{
++ pegasus_t *pegasus = netdev_priv(dev);
++
++ strlcpy(info->driver, driver_name, sizeof(info->driver));
++ strlcpy(info->version, DRIVER_VERSION, sizeof(info->version));
++ usb_make_path(pegasus->usb, info->bus_info, sizeof(info->bus_info));
++}
++
++/* also handles three patterns of some kind in hardware */
++#define WOL_SUPPORTED (WAKE_MAGIC|WAKE_PHY)
++
++static void
++pegasus_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
++{
++ pegasus_t *pegasus = netdev_priv(dev);
++
++ wol->supported = WAKE_MAGIC | WAKE_PHY;
++ wol->wolopts = pegasus->wolopts;
++}
++
++static int
++pegasus_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
++{
++ pegasus_t *pegasus = netdev_priv(dev);
++ u8 reg78 = 0x04;
++ int ret;
++
++ if (wol->wolopts & ~WOL_SUPPORTED)
++ return -EINVAL;
++
++ if (wol->wolopts & WAKE_MAGIC)
++ reg78 |= 0x80;
++ if (wol->wolopts & WAKE_PHY)
++ reg78 |= 0x40;
++ /* FIXME this 0x10 bit still needs to get set in the chip... */
++ if (wol->wolopts)
++ pegasus->eth_regs[0] |= 0x10;
++ else
++ pegasus->eth_regs[0] &= ~0x10;
++ pegasus->wolopts = wol->wolopts;
++
++ ret = set_register(pegasus, WakeupControl, reg78);
++ if (!ret)
++ ret = device_set_wakeup_enable(&pegasus->usb->dev,
++ wol->wolopts);
++ return ret;
++}
++
++static inline void pegasus_reset_wol(struct net_device *dev)
++{
++ struct ethtool_wolinfo wol;
++
++ memset(&wol, 0, sizeof wol);
++ (void) pegasus_set_wol(dev, &wol);
++}
++
++static int
++pegasus_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
++{
++ pegasus_t *pegasus;
++
++ pegasus = netdev_priv(dev);
++ mii_ethtool_gset(&pegasus->mii, ecmd);
++ return 0;
++}
++
++static int
++pegasus_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
++{
++ pegasus_t *pegasus = netdev_priv(dev);
++ return mii_ethtool_sset(&pegasus->mii, ecmd);
++}
++
++static int pegasus_nway_reset(struct net_device *dev)
++{
++ pegasus_t *pegasus = netdev_priv(dev);
++ return mii_nway_restart(&pegasus->mii);
++}
++
++static u32 pegasus_get_link(struct net_device *dev)
++{
++ pegasus_t *pegasus = netdev_priv(dev);
++ return mii_link_ok(&pegasus->mii);
++}
++
++static u32 pegasus_get_msglevel(struct net_device *dev)
++{
++ pegasus_t *pegasus = netdev_priv(dev);
++ return pegasus->msg_enable;
++}
++
++static void pegasus_set_msglevel(struct net_device *dev, u32 v)
++{
++ pegasus_t *pegasus = netdev_priv(dev);
++ pegasus->msg_enable = v;
++}
++
++static const struct ethtool_ops ops = {
++ .get_drvinfo = pegasus_get_drvinfo,
++ .get_settings = pegasus_get_settings,
++ .set_settings = pegasus_set_settings,
++ .nway_reset = pegasus_nway_reset,
++ .get_link = pegasus_get_link,
++ .get_msglevel = pegasus_get_msglevel,
++ .set_msglevel = pegasus_set_msglevel,
++ .get_wol = pegasus_get_wol,
++ .set_wol = pegasus_set_wol,
++};
++
++static int pegasus_ioctl(struct net_device *net, struct ifreq *rq, int cmd)
++{
++ __u16 *data = (__u16 *) &rq->ifr_ifru;
++ pegasus_t *pegasus = netdev_priv(net);
++ int res;
++
++ switch (cmd) {
++ case SIOCDEVPRIVATE:
++ data[0] = pegasus->phy;
++ case SIOCDEVPRIVATE + 1:
++ read_mii_word(pegasus, data[0], data[1] & 0x1f, &data[3]);
++ res = 0;
++ break;
++ case SIOCDEVPRIVATE + 2:
++ if (!capable(CAP_NET_ADMIN))
++ return -EPERM;
++ write_mii_word(pegasus, pegasus->phy, data[1] & 0x1f, &data[2]);
++ res = 0;
++ break;
++ default:
++ res = -EOPNOTSUPP;
++ }
++ return res;
++}
++
++static void pegasus_set_multicast(struct net_device *net)
++{
++ pegasus_t *pegasus = netdev_priv(net);
++
++ if (net->flags & IFF_PROMISC) {
++ pegasus->eth_regs[EthCtrl2] |= RX_PROMISCUOUS;
++ netif_info(pegasus, link, net, "Promiscuous mode enabled\n");
++ } else if (!netdev_mc_empty(net) || (net->flags & IFF_ALLMULTI)) {
++ pegasus->eth_regs[EthCtrl0] |= RX_MULTICAST;
++ pegasus->eth_regs[EthCtrl2] &= ~RX_PROMISCUOUS;
++ netif_dbg(pegasus, link, net, "set allmulti\n");
++ } else {
++ pegasus->eth_regs[EthCtrl0] &= ~RX_MULTICAST;
++ pegasus->eth_regs[EthCtrl2] &= ~RX_PROMISCUOUS;
++ }
++ update_eth_regs_async(pegasus);
++}
++
++static __u8 mii_phy_probe(pegasus_t *pegasus)
++{
++ int i;
++ __u16 tmp;
++
++ for (i = 0; i < 32; i++) {
++ read_mii_word(pegasus, i, MII_BMSR, &tmp);
++ if (tmp == 0 || tmp == 0xffff || (tmp & BMSR_MEDIA) == 0)
++ continue;
++ else
++ return i;
++ }
++
++ return 0xff;
++}
++
++static inline void setup_pegasus_II(pegasus_t *pegasus)
++{
++ __u8 data = 0xa5;
++
++ set_register(pegasus, Reg1d, 0);
++ set_register(pegasus, Reg7b, 1);
++ mdelay(100);
++ if ((pegasus->features & HAS_HOME_PNA) && mii_mode)
++ set_register(pegasus, Reg7b, 0);
++ else
++ set_register(pegasus, Reg7b, 2);
++
++ set_register(pegasus, 0x83, data);
++ get_registers(pegasus, 0x83, 1, &data);
++
++ if (data == 0xa5)
++ pegasus->chip = 0x8513;
++ else
++ pegasus->chip = 0;
++
++ set_register(pegasus, 0x80, 0xc0);
++ set_register(pegasus, 0x83, 0xff);
++ set_register(pegasus, 0x84, 0x01);
++
++ if (pegasus->features & HAS_HOME_PNA && mii_mode)
++ set_register(pegasus, Reg81, 6);
++ else
++ set_register(pegasus, Reg81, 2);
++}
++
++
++static int pegasus_count;
++static struct workqueue_struct *pegasus_workqueue;
++#define CARRIER_CHECK_DELAY (2 * HZ)
++
++static void check_carrier(struct work_struct *work)
++{
++ pegasus_t *pegasus = container_of(work, pegasus_t, carrier_check.work);
++ set_carrier(pegasus->net);
++ if (!(pegasus->flags & PEGASUS_UNPLUG)) {
++ queue_delayed_work(pegasus_workqueue, &pegasus->carrier_check,
++ CARRIER_CHECK_DELAY);
++ }
++}
++
++static int pegasus_blacklisted(struct usb_device *udev)
++{
++ struct usb_device_descriptor *udd = &udev->descriptor;
++
++ /* Special quirk to keep the driver from handling the Belkin Bluetooth
++ * dongle which happens to have the same ID.
++ */
++ if ((udd->idVendor == cpu_to_le16(VENDOR_BELKIN)) &&
++ (udd->idProduct == cpu_to_le16(0x0121)) &&
++ (udd->bDeviceClass == USB_CLASS_WIRELESS_CONTROLLER) &&
++ (udd->bDeviceProtocol == 1))
++ return 1;
++
++ return 0;
++}
++
++/* we rely on probe() and remove() being serialized so we
++ * don't need extra locking on pegasus_count.
++ */
++static void pegasus_dec_workqueue(void)
++{
++ pegasus_count--;
++ if (pegasus_count == 0) {
++ destroy_workqueue(pegasus_workqueue);
++ pegasus_workqueue = NULL;
++ }
++}
++
++static int pegasus_probe(struct usb_interface *intf,
++ const struct usb_device_id *id)
++{
++ struct usb_device *dev = interface_to_usbdev(intf);
++ struct net_device *net;
++ pegasus_t *pegasus;
++ int dev_index = id - pegasus_ids;
++ int res = -ENOMEM;
++
++ if (pegasus_blacklisted(dev))
++ return -ENODEV;
++
++ if (pegasus_count == 0) {
++ pegasus_workqueue = create_singlethread_workqueue("pegasus");
++ if (!pegasus_workqueue)
++ return -ENOMEM;
++ }
++ pegasus_count++;
++
++ net = alloc_etherdev(sizeof(struct pegasus));
++ if (!net)
++ goto out;
++
++ pegasus = netdev_priv(net);
++ pegasus->dev_index = dev_index;
++
++ res = alloc_urbs(pegasus);
++ if (res < 0) {
++ dev_err(&intf->dev, "can't allocate %s\n", "urbs");
++ goto out1;
++ }
++
++ tasklet_init(&pegasus->rx_tl, rx_fixup, (unsigned long) pegasus);
++
++ INIT_DELAYED_WORK(&pegasus->carrier_check, check_carrier);
++
++ pegasus->intf = intf;
++ pegasus->usb = dev;
++ pegasus->net = net;
++
++
++ net->watchdog_timeo = PEGASUS_TX_TIMEOUT;
++ net->netdev_ops = &pegasus_netdev_ops;
++ net->ethtool_ops = &ops;
++ pegasus->mii.dev = net;
++ pegasus->mii.mdio_read = mdio_read;
++ pegasus->mii.mdio_write = mdio_write;
++ pegasus->mii.phy_id_mask = 0x1f;
++ pegasus->mii.reg_num_mask = 0x1f;
++ pegasus->msg_enable = netif_msg_init(msg_level, NETIF_MSG_DRV
++ | NETIF_MSG_PROBE | NETIF_MSG_LINK);
++
++ pegasus->features = usb_dev_id[dev_index].private;
++ get_interrupt_interval(pegasus);
++ if (reset_mac(pegasus)) {
++ dev_err(&intf->dev, "can't reset MAC\n");
++ res = -EIO;
++ goto out2;
++ }
++ set_ethernet_addr(pegasus);
++ if (pegasus->features & PEGASUS_II) {
++ dev_info(&intf->dev, "setup Pegasus II specific registers\n");
++ setup_pegasus_II(pegasus);
++ }
++ pegasus->phy = mii_phy_probe(pegasus);
++ if (pegasus->phy == 0xff) {
++ dev_warn(&intf->dev, "can't locate MII phy, using default\n");
++ pegasus->phy = 1;
++ }
++ pegasus->mii.phy_id = pegasus->phy;
++ usb_set_intfdata(intf, pegasus);
++ SET_NETDEV_DEV(net, &intf->dev);
++ pegasus_reset_wol(net);
++ res = register_netdev(net);
++ if (res)
++ goto out3;
++ queue_delayed_work(pegasus_workqueue, &pegasus->carrier_check,
++ CARRIER_CHECK_DELAY);
++ dev_info(&intf->dev, "%s, %s, %pM\n", net->name,
++ usb_dev_id[dev_index].name, net->dev_addr);
++ return 0;
++
++out3:
++ usb_set_intfdata(intf, NULL);
++out2:
++ free_all_urbs(pegasus);
++out1:
++ free_netdev(net);
++out:
++ pegasus_dec_workqueue();
++ return res;
++}
++
++static void pegasus_disconnect(struct usb_interface *intf)
++{
++ struct pegasus *pegasus = usb_get_intfdata(intf);
++
++ usb_set_intfdata(intf, NULL);
++ if (!pegasus) {
++ dev_dbg(&intf->dev, "unregistering non-bound device?\n");
++ return;
++ }
++
++ pegasus->flags |= PEGASUS_UNPLUG;
++ cancel_delayed_work(&pegasus->carrier_check);
++ unregister_netdev(pegasus->net);
++ unlink_all_urbs(pegasus);
++ free_all_urbs(pegasus);
++ if (pegasus->rx_skb != NULL) {
++ dev_kfree_skb(pegasus->rx_skb);
++ pegasus->rx_skb = NULL;
++ }
++ free_netdev(pegasus->net);
++ pegasus_dec_workqueue();
++}
++
++static int pegasus_suspend(struct usb_interface *intf, pm_message_t message)
++{
++ struct pegasus *pegasus = usb_get_intfdata(intf);
++
++ netif_device_detach(pegasus->net);
++ cancel_delayed_work(&pegasus->carrier_check);
++ if (netif_running(pegasus->net)) {
++ usb_kill_urb(pegasus->rx_urb);
++ usb_kill_urb(pegasus->intr_urb);
++ }
++ return 0;
++}
++
++static int pegasus_resume(struct usb_interface *intf)
++{
++ struct pegasus *pegasus = usb_get_intfdata(intf);
++
++ netif_device_attach(pegasus->net);
++ if (netif_running(pegasus->net)) {
++ pegasus->rx_urb->status = 0;
++ pegasus->rx_urb->actual_length = 0;
++ read_bulk_callback(pegasus->rx_urb);
++
++ pegasus->intr_urb->status = 0;
++ pegasus->intr_urb->actual_length = 0;
++ intr_callback(pegasus->intr_urb);
++ }
++ queue_delayed_work(pegasus_workqueue, &pegasus->carrier_check,
++ CARRIER_CHECK_DELAY);
++ return 0;
++}
++
++static const struct net_device_ops pegasus_netdev_ops = {
++ .ndo_open = pegasus_open,
++ .ndo_stop = pegasus_close,
++ .ndo_do_ioctl = pegasus_ioctl,
++ .ndo_start_xmit = pegasus_start_xmit,
++ .ndo_set_rx_mode = pegasus_set_multicast,
++ .ndo_get_stats = pegasus_netdev_stats,
++ .ndo_tx_timeout = pegasus_tx_timeout,
++ .ndo_change_mtu = eth_change_mtu,
++ .ndo_set_mac_address = eth_mac_addr,
++ .ndo_validate_addr = eth_validate_addr,
++};
++
++static struct usb_driver pegasus_driver = {
++ .name = driver_name,
++ .probe = pegasus_probe,
++ .disconnect = pegasus_disconnect,
++ .id_table = pegasus_ids,
++ .suspend = pegasus_suspend,
++ .resume = pegasus_resume,
++ .disable_hub_initiated_lpm = 1,
++};
++
++static void __init parse_id(char *id)
++{
++ unsigned int vendor_id = 0, device_id = 0, flags = 0, i = 0;
++ char *token, *name = NULL;
++
++ if ((token = strsep(&id, ":")) != NULL)
++ name = token;
++ /* name now points to a null terminated string*/
++ if ((token = strsep(&id, ":")) != NULL)
++ vendor_id = simple_strtoul(token, NULL, 16);
++ if ((token = strsep(&id, ":")) != NULL)
++ device_id = simple_strtoul(token, NULL, 16);
++ flags = simple_strtoul(id, NULL, 16);
++ pr_info("%s: new device %s, vendor ID 0x%04x, device ID 0x%04x, flags: 0x%x\n",
++ driver_name, name, vendor_id, device_id, flags);
++
++ if (vendor_id > 0x10000 || vendor_id == 0)
++ return;
++ if (device_id > 0x10000 || device_id == 0)
++ return;
++
++ for (i = 0; usb_dev_id[i].name; i++);
++ usb_dev_id[i].name = name;
++ usb_dev_id[i].vendor = vendor_id;
++ usb_dev_id[i].device = device_id;
++ usb_dev_id[i].private = flags;
++ pegasus_ids[i].match_flags = USB_DEVICE_ID_MATCH_DEVICE;
++ pegasus_ids[i].idVendor = vendor_id;
++ pegasus_ids[i].idProduct = device_id;
++}
++
++static int __init pegasus_init(void)
++{
++ pr_info("%s: %s, " DRIVER_DESC "\n", driver_name, DRIVER_VERSION);
++ if (devid)
++ parse_id(devid);
++ return usb_register(&pegasus_driver);
++}
++
++static void __exit pegasus_exit(void)
++{
++ usb_deregister(&pegasus_driver);
++}
++
++module_init(pegasus_init);
++module_exit(pegasus_exit);
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/pegasus.h backports-4.2.6-1/drivers/net/usb/pegasus.h
+--- backports-4.2.6-1.org/drivers/net/usb/pegasus.h 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/pegasus.h 2015-11-09 23:37:56.000000000 +0100
+@@ -0,0 +1,308 @@
++/*
++ * Copyright (c) 1999-2013 Petko Manolov (petkan(a)nucleusys.com)
++ *
++ * 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 published
++ * by the Free Software Foundation.
++ */
++
++
++#ifndef PEGASUS_DEV
++
++#define PEGASUS_II 0x80000000
++#define HAS_HOME_PNA 0x40000000
++
++#define PEGASUS_MTU 1536
++
++#define EPROM_WRITE 0x01
++#define EPROM_READ 0x02
++#define EPROM_DONE 0x04
++#define EPROM_WR_ENABLE 0x10
++#define EPROM_LOAD 0x20
++
++#define PHY_DONE 0x80
++#define PHY_READ 0x40
++#define PHY_WRITE 0x20
++#define DEFAULT_GPIO_RESET 0x24
++#define DEFAULT_GPIO_SET 0x26
++
++#define PEGASUS_PRESENT 0x00000001
++#define PEGASUS_TX_BUSY 0x00000004
++#define PEGASUS_RX_BUSY 0x00000008
++#define CTRL_URB_RUNNING 0x00000010
++#define CTRL_URB_SLEEP 0x00000020
++#define PEGASUS_UNPLUG 0x00000040
++#define PEGASUS_RX_URB_FAIL 0x00000080
++
++#define RX_MULTICAST 2
++#define RX_PROMISCUOUS 4
++
++#define REG_TIMEOUT (HZ)
++#define PEGASUS_TX_TIMEOUT (HZ*10)
++
++#define TX_UNDERRUN 0x80
++#define EXCESSIVE_COL 0x40
++#define LATE_COL 0x20
++#define NO_CARRIER 0x10
++#define LOSS_CARRIER 0x08
++#define JABBER_TIMEOUT 0x04
++
++#define LINK_STATUS 0x01
++
++#define PEGASUS_REQT_READ 0xc0
++#define PEGASUS_REQT_WRITE 0x40
++#define PEGASUS_REQ_GET_REGS 0xf0
++#define PEGASUS_REQ_SET_REGS 0xf1
++#define PEGASUS_REQ_SET_REG PEGASUS_REQ_SET_REGS
++
++enum pegasus_registers {
++ EthCtrl0 = 0,
++ EthCtrl1 = 1,
++ EthCtrl2 = 2,
++ EthID = 0x10,
++ Reg1d = 0x1d,
++ EpromOffset = 0x20,
++ EpromData = 0x21, /* 0x21 low, 0x22 high byte */
++ EpromCtrl = 0x23,
++ PhyAddr = 0x25,
++ PhyData = 0x26, /* 0x26 low, 0x27 high byte */
++ PhyCtrl = 0x28,
++ UsbStst = 0x2a,
++ EthTxStat0 = 0x2b,
++ EthTxStat1 = 0x2c,
++ EthRxStat = 0x2d,
++ WakeupControl = 0x78,
++ Reg7b = 0x7b,
++ Gpio0 = 0x7e,
++ Gpio1 = 0x7f,
++ Reg81 = 0x81,
++};
++
++
++typedef struct pegasus {
++ struct usb_device *usb;
++ struct usb_interface *intf;
++ struct net_device *net;
++ struct net_device_stats stats;
++ struct mii_if_info mii;
++ unsigned flags;
++ unsigned features;
++ u32 msg_enable;
++ u32 wolopts;
++ int dev_index;
++ int intr_interval;
++ struct tasklet_struct rx_tl;
++ struct delayed_work carrier_check;
++ struct urb *rx_urb, *tx_urb, *intr_urb;
++ struct sk_buff *rx_skb;
++ int chip;
++ unsigned char intr_buff[8];
++ __u8 tx_buff[PEGASUS_MTU];
++ __u8 eth_regs[4];
++ __u8 phy;
++ __u8 gpio_res;
++} pegasus_t;
++
++
++struct usb_eth_dev {
++ char *name;
++ __u16 vendor;
++ __u16 device;
++ __u32 private; /* LSB is gpio reset value */
++};
++
++#define VENDOR_3COM 0x0506
++#define VENDOR_ABOCOM 0x07b8
++#define VENDOR_ACCTON 0x083a
++#define VENDOR_ADMTEK 0x07a6
++#define VENDOR_AEILAB 0x3334
++#define VENDOR_ALLIEDTEL 0x07c9
++#define VENDOR_ATEN 0x0557
++#define VENDOR_BELKIN 0x050d
++#define VENDOR_BILLIONTON 0x08dd
++#define VENDOR_COMPAQ 0x049f
++#define VENDOR_COREGA 0x07aa
++#define VENDOR_DLINK 0x2001
++#define VENDOR_ELCON 0x0db7
++#define VENDOR_ELECOM 0x056e
++#define VENDOR_ELSA 0x05cc
++#define VENDOR_GIGABYTE 0x1044
++#define VENDOR_HAWKING 0x0e66
++#define VENDOR_HP 0x03f0
++#define VENDOR_IODATA 0x04bb
++#define VENDOR_KINGSTON 0x0951
++#define VENDOR_LANEED 0x056e
++#define VENDOR_LINKSYS 0x066b
++#define VENDOR_LINKSYS2 0x077b
++#define VENDOR_MELCO 0x0411
++#define VENDOR_MICROSOFT 0x045e
++#define VENDOR_MOBILITY 0x1342
++#define VENDOR_NETGEAR 0x0846
++#define VENDOR_OCT 0x0b39
++#define VENDOR_SMARTBRIDGES 0x08d1
++#define VENDOR_SMC 0x0707
++#define VENDOR_SOHOWARE 0x15e8
++#define VENDOR_SIEMENS 0x067c
++
++
++#else /* PEGASUS_DEV */
++
++PEGASUS_DEV("3Com USB Ethernet 3C460B", VENDOR_3COM, 0x4601,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("ATEN USB Ethernet UC-110T", VENDOR_ATEN, 0x2007,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("USB HPNA/Ethernet", VENDOR_ABOCOM, 0x110c,
++ DEFAULT_GPIO_RESET | PEGASUS_II | HAS_HOME_PNA)
++PEGASUS_DEV("USB HPNA/Ethernet", VENDOR_ABOCOM, 0x4104,
++ DEFAULT_GPIO_RESET | HAS_HOME_PNA)
++PEGASUS_DEV("USB HPNA/Ethernet", VENDOR_ABOCOM, 0x4004,
++ DEFAULT_GPIO_RESET | HAS_HOME_PNA)
++PEGASUS_DEV("USB HPNA/Ethernet", VENDOR_ABOCOM, 0x4007,
++ DEFAULT_GPIO_RESET | HAS_HOME_PNA)
++PEGASUS_DEV("USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0x4102,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0x4002,
++ DEFAULT_GPIO_RESET)
++PEGASUS_DEV("USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0x400b,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0x400c,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0xabc1,
++ DEFAULT_GPIO_RESET)
++PEGASUS_DEV("USB 10/100 Fast Ethernet", VENDOR_ABOCOM, 0x200c,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("Accton USB 10/100 Ethernet Adapter", VENDOR_ACCTON, 0x1046,
++ DEFAULT_GPIO_RESET)
++PEGASUS_DEV("SpeedStream USB 10/100 Ethernet", VENDOR_ACCTON, 0x5046,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("Philips USB 10/100 Ethernet", VENDOR_ACCTON, 0xb004,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("ADMtek ADM8511 \"Pegasus II\" USB Ethernet",
++ VENDOR_ADMTEK, 0x8511,
++ DEFAULT_GPIO_RESET | PEGASUS_II | HAS_HOME_PNA)
++PEGASUS_DEV("ADMtek ADM8513 \"Pegasus II\" USB Ethernet",
++ VENDOR_ADMTEK, 0x8513,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("ADMtek ADM8515 \"Pegasus II\" USB-2.0 Ethernet",
++ VENDOR_ADMTEK, 0x8515,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("ADMtek AN986 \"Pegasus\" USB Ethernet (evaluation board)",
++ VENDOR_ADMTEK, 0x0986,
++ DEFAULT_GPIO_RESET | HAS_HOME_PNA)
++PEGASUS_DEV("AN986A USB MAC", VENDOR_ADMTEK, 1986,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("AEI USB Fast Ethernet Adapter", VENDOR_AEILAB, 0x1701,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("Allied Telesyn Int. AT-USB100", VENDOR_ALLIEDTEL, 0xb100,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++/*
++ * Distinguish between this Belkin adaptor and the Belkin bluetooth adaptors
++ * with the same product IDs by checking the device class too.
++ */
++PEGASUS_DEV_CLASS("Belkin F5D5050 USB Ethernet", VENDOR_BELKIN, 0x0121, 0x00,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("Belkin F5U122 10/100 USB Ethernet", VENDOR_BELKIN, 0x0122,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("Billionton USB-100", VENDOR_BILLIONTON, 0x0986,
++ DEFAULT_GPIO_RESET)
++PEGASUS_DEV("Billionton USBLP-100", VENDOR_BILLIONTON, 0x0987,
++ DEFAULT_GPIO_RESET | HAS_HOME_PNA)
++PEGASUS_DEV("iPAQ Networking 10/100 USB", VENDOR_COMPAQ, 0x8511,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("Billionton USBEL-100", VENDOR_BILLIONTON, 0x0988,
++ DEFAULT_GPIO_RESET)
++PEGASUS_DEV("Billionton USBE-100", VENDOR_BILLIONTON, 0x8511,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("Corega FEther USB-TX", VENDOR_COREGA, 0x0004,
++ DEFAULT_GPIO_RESET)
++PEGASUS_DEV("Corega FEther USB-TXS", VENDOR_COREGA, 0x000d,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("D-Link DSB-650TX", VENDOR_DLINK, 0x4001,
++ DEFAULT_GPIO_RESET)
++PEGASUS_DEV("D-Link DSB-650TX", VENDOR_DLINK, 0x4002,
++ DEFAULT_GPIO_RESET)
++PEGASUS_DEV("D-Link DSB-650TX", VENDOR_DLINK, 0x4102,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("D-Link DSB-650TX", VENDOR_DLINK, 0x400b,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("D-Link DSB-650TX", VENDOR_DLINK, 0x200c,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("D-Link DSB-650TX(PNA)", VENDOR_DLINK, 0x4003,
++ DEFAULT_GPIO_RESET | HAS_HOME_PNA)
++PEGASUS_DEV("D-Link DSB-650", VENDOR_DLINK, 0xabc1,
++ DEFAULT_GPIO_RESET)
++PEGASUS_DEV("GOLDPFEIL USB Adapter", VENDOR_ELCON, 0x0002,
++ DEFAULT_GPIO_RESET | PEGASUS_II | HAS_HOME_PNA)
++PEGASUS_DEV("ELECOM USB Ethernet LD-USB20", VENDOR_ELECOM, 0x4010,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("EasiDock Ethernet", VENDOR_MOBILITY, 0x0304,
++ DEFAULT_GPIO_RESET)
++PEGASUS_DEV("Elsa Micolink USB2Ethernet", VENDOR_ELSA, 0x3000,
++ DEFAULT_GPIO_RESET)
++PEGASUS_DEV("GIGABYTE GN-BR402W Wireless Router", VENDOR_GIGABYTE, 0x8002,
++ DEFAULT_GPIO_RESET)
++PEGASUS_DEV("Hawking UF100 10/100 Ethernet", VENDOR_HAWKING, 0x400c,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("HP hn210c Ethernet USB", VENDOR_HP, 0x811c,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("IO DATA USB ET/TX", VENDOR_IODATA, 0x0904,
++ DEFAULT_GPIO_RESET)
++PEGASUS_DEV("IO DATA USB ET/TX-S", VENDOR_IODATA, 0x0913,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("IO DATA USB ETX-US2", VENDOR_IODATA, 0x093a,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("Kingston KNU101TX Ethernet", VENDOR_KINGSTON, 0x000a,
++ DEFAULT_GPIO_RESET)
++PEGASUS_DEV("LANEED USB Ethernet LD-USB/TX", VENDOR_LANEED, 0x4002,
++ DEFAULT_GPIO_RESET)
++PEGASUS_DEV("LANEED USB Ethernet LD-USBL/TX", VENDOR_LANEED, 0x4005,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("LANEED USB Ethernet LD-USB/TX", VENDOR_LANEED, 0x400b,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("LANEED USB Ethernet LD-USB/T", VENDOR_LANEED, 0xabc1,
++ DEFAULT_GPIO_RESET)
++PEGASUS_DEV("LANEED USB Ethernet LD-USB/TX", VENDOR_LANEED, 0x200c,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("Linksys USB10TX", VENDOR_LINKSYS, 0x2202,
++ DEFAULT_GPIO_RESET)
++PEGASUS_DEV("Linksys USB100TX", VENDOR_LINKSYS, 0x2203,
++ DEFAULT_GPIO_RESET)
++PEGASUS_DEV("Linksys USB100TX", VENDOR_LINKSYS, 0x2204,
++ DEFAULT_GPIO_RESET | HAS_HOME_PNA)
++PEGASUS_DEV("Linksys USB10T Ethernet Adapter", VENDOR_LINKSYS, 0x2206,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("Linksys USBVPN1", VENDOR_LINKSYS2, 0x08b4,
++ DEFAULT_GPIO_RESET)
++PEGASUS_DEV("Linksys USB USB100TX", VENDOR_LINKSYS, 0x400b,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("Linksys USB10TX", VENDOR_LINKSYS, 0x200c,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("MELCO/BUFFALO LUA-TX", VENDOR_MELCO, 0x0001,
++ DEFAULT_GPIO_RESET)
++PEGASUS_DEV("MELCO/BUFFALO LUA-TX", VENDOR_MELCO, 0x0005,
++ DEFAULT_GPIO_RESET)
++PEGASUS_DEV("MELCO/BUFFALO LUA2-TX", VENDOR_MELCO, 0x0009,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("Microsoft MN-110", VENDOR_MICROSOFT, 0x007a,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("NETGEAR FA101", VENDOR_NETGEAR, 0x1020,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("OCT Inc.", VENDOR_OCT, 0x0109,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("OCT USB TO Ethernet", VENDOR_OCT, 0x0901,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("smartNIC 2 PnP Adapter", VENDOR_SMARTBRIDGES, 0x0003,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("SMC 202 USB Ethernet", VENDOR_SMC, 0x0200,
++ DEFAULT_GPIO_RESET)
++PEGASUS_DEV("SMC 2206 USB Ethernet", VENDOR_SMC, 0x0201,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("SOHOware NUB100 Ethernet", VENDOR_SOHOWARE, 0x9100,
++ DEFAULT_GPIO_RESET)
++PEGASUS_DEV("SOHOware NUB110 Ethernet", VENDOR_SOHOWARE, 0x9110,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++PEGASUS_DEV("SpeedStream USB 10/100 Ethernet", VENDOR_SIEMENS, 0x1001,
++ DEFAULT_GPIO_RESET | PEGASUS_II)
++
++
++#endif /* PEGASUS_DEV */
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/plusb.c backports-4.2.6-1/drivers/net/usb/plusb.c
+--- backports-4.2.6-1.org/drivers/net/usb/plusb.c 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/plusb.c 2015-11-09 23:37:56.000000000 +0100
+@@ -0,0 +1,162 @@
++/*
++ * PL-2301/2302 USB host-to-host link cables
++ * Copyright (C) 2000-2005 by David Brownell
++ *
++ * 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, see <http://www.gnu.org/licenses/>.
++ */
++
++// #define DEBUG // error path messages, extra info
++// #define VERBOSE // more; success messages
++
++#include <linux/module.h>
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/ethtool.h>
++#include <linux/workqueue.h>
++#include <linux/mii.h>
++#include <linux/usb.h>
++#include <linux/usb/usbnet.h>
++
++
++/*
++ * Prolific PL-2301/PL-2302 driver ... http://www.prolific.com.tw/
++ *
++ * The protocol and handshaking used here should be bug-compatible
++ * with the Linux 2.2 "plusb" driver, by Deti Fliegl.
++ *
++ * HEADS UP: this handshaking isn't all that robust. This driver
++ * gets confused easily if you unplug one end of the cable then
++ * try to connect it again; you'll need to restart both ends. The
++ * "naplink" software (used by some PlayStation/2 deveopers) does
++ * the handshaking much better! Also, sometimes this hardware
++ * seems to get wedged under load. Prolific docs are weak, and
++ * don't identify differences between PL2301 and PL2302, much less
++ * anything to explain the different PL2302 versions observed.
++ *
++ * NOTE: pl2501 has several modes, including pl2301 and pl2302
++ * compatibility. Some docs suggest the difference between 2301
++ * and 2302 is only to make MS-Windows use a different driver...
++ *
++ * pl25a1 glue based on patch from Tony Gibbs. Prolific "docs" on
++ * this chip are as usual incomplete about what control messages
++ * are supported.
++ */
++
++/*
++ * Bits 0-4 can be used for software handshaking; they're set from
++ * one end, cleared from the other, "read" with the interrupt byte.
++ */
++#define PL_S_EN (1<<7) /* (feature only) suspend enable */
++/* reserved bit -- rx ready (6) ? */
++#define PL_TX_READY (1<<5) /* (interrupt only) transmit ready */
++#define PL_RESET_OUT (1<<4) /* reset output pipe */
++#define PL_RESET_IN (1<<3) /* reset input pipe */
++#define PL_TX_C (1<<2) /* transmission complete */
++#define PL_TX_REQ (1<<1) /* transmission received */
++#define PL_PEER_E (1<<0) /* peer exists */
++
++static inline int
++pl_vendor_req(struct usbnet *dev, u8 req, u8 val, u8 index)
++{
++ return usbnet_read_cmd(dev, req,
++ USB_DIR_IN | USB_TYPE_VENDOR |
++ USB_RECIP_DEVICE,
++ val, index, NULL, 0);
++}
++
++static inline int
++pl_clear_QuickLink_features(struct usbnet *dev, int val)
++{
++ return pl_vendor_req(dev, 1, (u8) val, 0);
++}
++
++static inline int
++pl_set_QuickLink_features(struct usbnet *dev, int val)
++{
++ return pl_vendor_req(dev, 3, (u8) val, 0);
++}
++
++static int pl_reset(struct usbnet *dev)
++{
++ int status;
++
++ /* some units seem to need this reset, others reject it utterly.
++ * FIXME be more like "naplink" or windows drivers.
++ */
++ status = pl_set_QuickLink_features(dev,
++ PL_S_EN|PL_RESET_OUT|PL_RESET_IN|PL_PEER_E);
++ if (status != 0 && netif_msg_probe(dev))
++ netif_dbg(dev, link, dev->net, "pl_reset --> %d\n", status);
++ return 0;
++}
++
++static const struct driver_info prolific_info = {
++ .description = "Prolific PL-2301/PL-2302/PL-25A1",
++ .flags = FLAG_POINTTOPOINT | FLAG_NO_SETINT,
++ /* some PL-2302 versions seem to fail usb_set_interface() */
++ .reset = pl_reset,
++};
++
++
++/*-------------------------------------------------------------------------*/
++
++/*
++ * Proilific's name won't normally be on the cables, and
++ * may not be on the device.
++ */
++
++static const struct usb_device_id products [] = {
++
++/* full speed cables */
++{
++ USB_DEVICE(0x067b, 0x0000), // PL-2301
++ .driver_info = (unsigned long) &prolific_info,
++}, {
++ USB_DEVICE(0x067b, 0x0001), // PL-2302
++ .driver_info = (unsigned long) &prolific_info,
++},
++
++/* high speed cables */
++{
++ USB_DEVICE(0x067b, 0x25a1), /* PL-25A1, no eeprom */
++ .driver_info = (unsigned long) &prolific_info,
++}, {
++ USB_DEVICE(0x050d, 0x258a), /* Belkin F5U258/F5U279 (PL-25A1) */
++ .driver_info = (unsigned long) &prolific_info,
++}, {
++ USB_DEVICE(0x3923, 0x7825), /* National Instruments USB
++ * Host-to-Host Cable
++ */
++ .driver_info = (unsigned long) &prolific_info,
++},
++
++ { }, // END
++};
++MODULE_DEVICE_TABLE(usb, products);
++
++static struct usb_driver plusb_driver = {
++ .name = "plusb",
++ .id_table = products,
++ .probe = usbnet_probe,
++ .disconnect = usbnet_disconnect,
++ .suspend = usbnet_suspend,
++ .resume = usbnet_resume,
++ .disable_hub_initiated_lpm = 1,
++};
++
++module_usb_driver(plusb_driver);
++
++MODULE_AUTHOR("David Brownell");
++MODULE_DESCRIPTION("Prolific PL-2301/2302/25A1 USB Host to Host Link Driver");
++MODULE_LICENSE("GPL");
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/r8152.c backports-4.2.6-1/drivers/net/usb/r8152.c
+--- backports-4.2.6-1.org/drivers/net/usb/r8152.c 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/r8152.c 2016-01-27 12:43:25.000000000 +0100
+@@ -0,0 +1,2847 @@
++/*
++ * Copyright (c) 2014 Realtek Semiconductor Corp. All rights reserved.
++ *
++ * 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 published by the Free Software Foundation.
++ *
++ */
++
++#include <linux/signal.h>
++#include <linux/slab.h>
++#include <linux/module.h>
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/mii.h>
++#include <linux/ethtool.h>
++#include <linux/usb.h>
++#include <linux/crc32.h>
++#include <linux/if_vlan.h>
++#include <linux/uaccess.h>
++#include <linux/list.h>
++#include <linux/ip.h>
++#include <linux/ipv6.h>
++
++/* Version Information */
++#define DRIVER_VERSION "v1.04.0 (2014/01/15)"
++#define DRIVER_AUTHOR "Realtek linux nic maintainers <nic_swsd(a)realtek.com>"
++#define DRIVER_DESC "Realtek RTL8152/RTL8153 Based USB Ethernet Adapters"
++#define MODULENAME "r8152"
++
++#define R8152_PHY_ID 32
++
++#define PLA_IDR 0xc000
++#define PLA_RCR 0xc010
++#define PLA_RMS 0xc016
++#define PLA_RXFIFO_CTRL0 0xc0a0
++#define PLA_RXFIFO_CTRL1 0xc0a4
++#define PLA_RXFIFO_CTRL2 0xc0a8
++#define PLA_FMC 0xc0b4
++#define PLA_CFG_WOL 0xc0b6
++#define PLA_TEREDO_CFG 0xc0bc
++#define PLA_MAR 0xcd00
++#define PLA_BACKUP 0xd000
++#define PAL_BDC_CR 0xd1a0
++#define PLA_TEREDO_TIMER 0xd2cc
++#define PLA_REALWOW_TIMER 0xd2e8
++#define PLA_LEDSEL 0xdd90
++#define PLA_LED_FEATURE 0xdd92
++#define PLA_PHYAR 0xde00
++#define PLA_BOOT_CTRL 0xe004
++#define PLA_GPHY_INTR_IMR 0xe022
++#define PLA_EEE_CR 0xe040
++#define PLA_EEEP_CR 0xe080
++#define PLA_MAC_PWR_CTRL 0xe0c0
++#define PLA_MAC_PWR_CTRL2 0xe0ca
++#define PLA_MAC_PWR_CTRL3 0xe0cc
++#define PLA_MAC_PWR_CTRL4 0xe0ce
++#define PLA_WDT6_CTRL 0xe428
++#define PLA_TCR0 0xe610
++#define PLA_TCR1 0xe612
++#define PLA_TXFIFO_CTRL 0xe618
++#define PLA_RSTTELLY 0xe800
++#define PLA_CR 0xe813
++#define PLA_CRWECR 0xe81c
++#define PLA_CONFIG5 0xe822
++#define PLA_PHY_PWR 0xe84c
++#define PLA_OOB_CTRL 0xe84f
++#define PLA_CPCR 0xe854
++#define PLA_MISC_0 0xe858
++#define PLA_MISC_1 0xe85a
++#define PLA_OCP_GPHY_BASE 0xe86c
++#define PLA_TELLYCNT 0xe890
++#define PLA_SFF_STS_7 0xe8de
++#define PLA_PHYSTATUS 0xe908
++#define PLA_BP_BA 0xfc26
++#define PLA_BP_0 0xfc28
++#define PLA_BP_1 0xfc2a
++#define PLA_BP_2 0xfc2c
++#define PLA_BP_3 0xfc2e
++#define PLA_BP_4 0xfc30
++#define PLA_BP_5 0xfc32
++#define PLA_BP_6 0xfc34
++#define PLA_BP_7 0xfc36
++#define PLA_BP_EN 0xfc38
++
++#define USB_U2P3_CTRL 0xb460
++#define USB_DEV_STAT 0xb808
++#define USB_USB_CTRL 0xd406
++#define USB_PHY_CTRL 0xd408
++#define USB_TX_AGG 0xd40a
++#define USB_RX_BUF_TH 0xd40c
++#define USB_USB_TIMER 0xd428
++#define USB_RX_EARLY_AGG 0xd42c
++#define USB_PM_CTRL_STATUS 0xd432
++#define USB_TX_DMA 0xd434
++#define USB_TOLERANCE 0xd490
++#define USB_LPM_CTRL 0xd41a
++#define USB_UPS_CTRL 0xd800
++#define USB_MISC_0 0xd81a
++#define USB_POWER_CUT 0xd80a
++#define USB_AFE_CTRL2 0xd824
++#define USB_WDT11_CTRL 0xe43c
++#define USB_BP_BA 0xfc26
++#define USB_BP_0 0xfc28
++#define USB_BP_1 0xfc2a
++#define USB_BP_2 0xfc2c
++#define USB_BP_3 0xfc2e
++#define USB_BP_4 0xfc30
++#define USB_BP_5 0xfc32
++#define USB_BP_6 0xfc34
++#define USB_BP_7 0xfc36
++#define USB_BP_EN 0xfc38
++
++/* OCP Registers */
++#define OCP_ALDPS_CONFIG 0x2010
++#define OCP_EEE_CONFIG1 0x2080
++#define OCP_EEE_CONFIG2 0x2092
++#define OCP_EEE_CONFIG3 0x2094
++#define OCP_BASE_MII 0xa400
++#define OCP_EEE_AR 0xa41a
++#define OCP_EEE_DATA 0xa41c
++#define OCP_PHY_STATUS 0xa420
++#define OCP_POWER_CFG 0xa430
++#define OCP_EEE_CFG 0xa432
++#define OCP_SRAM_ADDR 0xa436
++#define OCP_SRAM_DATA 0xa438
++#define OCP_DOWN_SPEED 0xa442
++#define OCP_EEE_CFG2 0xa5d0
++#define OCP_ADC_CFG 0xbc06
++
++/* SRAM Register */
++#define SRAM_LPF_CFG 0x8012
++#define SRAM_10M_AMP1 0x8080
++#define SRAM_10M_AMP2 0x8082
++#define SRAM_IMPEDANCE 0x8084
++
++/* PLA_RCR */
++#define RCR_AAP 0x00000001
++#define RCR_APM 0x00000002
++#define RCR_AM 0x00000004
++#define RCR_AB 0x00000008
++#define RCR_ACPT_ALL (RCR_AAP | RCR_APM | RCR_AM | RCR_AB)
++
++/* PLA_RXFIFO_CTRL0 */
++#define RXFIFO_THR1_NORMAL 0x00080002
++#define RXFIFO_THR1_OOB 0x01800003
++
++/* PLA_RXFIFO_CTRL1 */
++#define RXFIFO_THR2_FULL 0x00000060
++#define RXFIFO_THR2_HIGH 0x00000038
++#define RXFIFO_THR2_OOB 0x0000004a
++#define RXFIFO_THR2_NORMAL 0x00a0
++
++/* PLA_RXFIFO_CTRL2 */
++#define RXFIFO_THR3_FULL 0x00000078
++#define RXFIFO_THR3_HIGH 0x00000048
++#define RXFIFO_THR3_OOB 0x0000005a
++#define RXFIFO_THR3_NORMAL 0x0110
++
++/* PLA_TXFIFO_CTRL */
++#define TXFIFO_THR_NORMAL 0x00400008
++#define TXFIFO_THR_NORMAL2 0x01000008
++
++/* PLA_FMC */
++#define FMC_FCR_MCU_EN 0x0001
++
++/* PLA_EEEP_CR */
++#define EEEP_CR_EEEP_TX 0x0002
++
++/* PLA_WDT6_CTRL */
++#define WDT6_SET_MODE 0x0010
++
++/* PLA_TCR0 */
++#define TCR0_TX_EMPTY 0x0800
++#define TCR0_AUTO_FIFO 0x0080
++
++/* PLA_TCR1 */
++#define VERSION_MASK 0x7cf0
++
++/* PLA_CR */
++#define CR_RST 0x10
++#define CR_RE 0x08
++#define CR_TE 0x04
++
++/* PLA_CRWECR */
++#define CRWECR_NORAML 0x00
++#define CRWECR_CONFIG 0xc0
++
++/* PLA_OOB_CTRL */
++#define NOW_IS_OOB 0x80
++#define TXFIFO_EMPTY 0x20
++#define RXFIFO_EMPTY 0x10
++#define LINK_LIST_READY 0x02
++#define DIS_MCU_CLROOB 0x01
++#define FIFO_EMPTY (TXFIFO_EMPTY | RXFIFO_EMPTY)
++
++/* PLA_MISC_1 */
++#define RXDY_GATED_EN 0x0008
++
++/* PLA_SFF_STS_7 */
++#define RE_INIT_LL 0x8000
++#define MCU_BORW_EN 0x4000
++
++/* PLA_CPCR */
++#define CPCR_RX_VLAN 0x0040
++
++/* PLA_CFG_WOL */
++#define MAGIC_EN 0x0001
++
++/* PLA_TEREDO_CFG */
++#define TEREDO_SEL 0x8000
++#define TEREDO_WAKE_MASK 0x7f00
++#define TEREDO_RS_EVENT_MASK 0x00fe
++#define OOB_TEREDO_EN 0x0001
++
++/* PAL_BDC_CR */
++#define ALDPS_PROXY_MODE 0x0001
++
++/* PLA_CONFIG5 */
++#define LAN_WAKE_EN 0x0002
++
++/* PLA_LED_FEATURE */
++#define LED_MODE_MASK 0x0700
++
++/* PLA_PHY_PWR */
++#define TX_10M_IDLE_EN 0x0080
++#define PFM_PWM_SWITCH 0x0040
++
++/* PLA_MAC_PWR_CTRL */
++#define D3_CLK_GATED_EN 0x00004000
++#define MCU_CLK_RATIO 0x07010f07
++#define MCU_CLK_RATIO_MASK 0x0f0f0f0f
++#define ALDPS_SPDWN_RATIO 0x0f87
++
++/* PLA_MAC_PWR_CTRL2 */
++#define EEE_SPDWN_RATIO 0x8007
++
++/* PLA_MAC_PWR_CTRL3 */
++#define PKT_AVAIL_SPDWN_EN 0x0100
++#define SUSPEND_SPDWN_EN 0x0004
++#define U1U2_SPDWN_EN 0x0002
++#define L1_SPDWN_EN 0x0001
++
++/* PLA_MAC_PWR_CTRL4 */
++#define PWRSAVE_SPDWN_EN 0x1000
++#define RXDV_SPDWN_EN 0x0800
++#define TX10MIDLE_EN 0x0100
++#define TP100_SPDWN_EN 0x0020
++#define TP500_SPDWN_EN 0x0010
++#define TP1000_SPDWN_EN 0x0008
++#define EEE_SPDWN_EN 0x0001
++
++/* PLA_GPHY_INTR_IMR */
++#define GPHY_STS_MSK 0x0001
++#define SPEED_DOWN_MSK 0x0002
++#define SPDWN_RXDV_MSK 0x0004
++#define SPDWN_LINKCHG_MSK 0x0008
++
++/* PLA_PHYAR */
++#define PHYAR_FLAG 0x80000000
++
++/* PLA_EEE_CR */
++#define EEE_RX_EN 0x0001
++#define EEE_TX_EN 0x0002
++
++/* PLA_BOOT_CTRL */
++#define AUTOLOAD_DONE 0x0002
++
++/* USB_DEV_STAT */
++#define STAT_SPEED_MASK 0x0006
++#define STAT_SPEED_HIGH 0x0000
++#define STAT_SPEED_FULL 0x0001
++
++/* USB_TX_AGG */
++#define TX_AGG_MAX_THRESHOLD 0x03
++
++/* USB_RX_BUF_TH */
++#define RX_THR_SUPPER 0x0c350180
++#define RX_THR_HIGH 0x7a120180
++#define RX_THR_SLOW 0xffff0180
++
++/* USB_TX_DMA */
++#define TEST_MODE_DISABLE 0x00000001
++#define TX_SIZE_ADJUST1 0x00000100
++
++/* USB_UPS_CTRL */
++#define POWER_CUT 0x0100
++
++/* USB_PM_CTRL_STATUS */
++#define RESUME_INDICATE 0x0001
++
++/* USB_USB_CTRL */
++#define RX_AGG_DISABLE 0x0010
++
++/* USB_U2P3_CTRL */
++#define U2P3_ENABLE 0x0001
++
++/* USB_POWER_CUT */
++#define PWR_EN 0x0001
++#define PHASE2_EN 0x0008
++
++/* USB_MISC_0 */
++#define PCUT_STATUS 0x0001
++
++/* USB_RX_EARLY_AGG */
++#define EARLY_AGG_SUPPER 0x0e832981
++#define EARLY_AGG_HIGH 0x0e837a12
++#define EARLY_AGG_SLOW 0x0e83ffff
++
++/* USB_WDT11_CTRL */
++#define TIMER11_EN 0x0001
++
++/* USB_LPM_CTRL */
++#define LPM_TIMER_MASK 0x0c
++#define LPM_TIMER_500MS 0x04 /* 500 ms */
++#define LPM_TIMER_500US 0x0c /* 500 us */
++
++/* USB_AFE_CTRL2 */
++#define SEN_VAL_MASK 0xf800
++#define SEN_VAL_NORMAL 0xa000
++#define SEL_RXIDLE 0x0100
++
++/* OCP_ALDPS_CONFIG */
++#define ENPWRSAVE 0x8000
++#define ENPDNPS 0x0200
++#define LINKENA 0x0100
++#define DIS_SDSAVE 0x0010
++
++/* OCP_PHY_STATUS */
++#define PHY_STAT_MASK 0x0007
++#define PHY_STAT_LAN_ON 3
++#define PHY_STAT_PWRDN 5
++
++/* OCP_POWER_CFG */
++#define EEE_CLKDIV_EN 0x8000
++#define EN_ALDPS 0x0004
++#define EN_10M_PLLOFF 0x0001
++
++/* OCP_EEE_CONFIG1 */
++#define RG_TXLPI_MSK_HFDUP 0x8000
++#define RG_MATCLR_EN 0x4000
++#define EEE_10_CAP 0x2000
++#define EEE_NWAY_EN 0x1000
++#define TX_QUIET_EN 0x0200
++#define RX_QUIET_EN 0x0100
++#define SDRISETIME 0x0010 /* bit 4 ~ 6 */
++#define RG_RXLPI_MSK_HFDUP 0x0008
++#define SDFALLTIME 0x0007 /* bit 0 ~ 2 */
++
++/* OCP_EEE_CONFIG2 */
++#define RG_LPIHYS_NUM 0x7000 /* bit 12 ~ 15 */
++#define RG_DACQUIET_EN 0x0400
++#define RG_LDVQUIET_EN 0x0200
++#define RG_CKRSEL 0x0020
++#define RG_EEEPRG_EN 0x0010
++
++/* OCP_EEE_CONFIG3 */
++#define FST_SNR_EYE_R 0x1500 /* bit 7 ~ 15 */
++#define RG_LFS_SEL 0x0060 /* bit 6 ~ 5 */
++#define MSK_PH 0x0006 /* bit 0 ~ 3 */
++
++/* OCP_EEE_AR */
++/* bit[15:14] function */
++#define FUN_ADDR 0x0000
++#define FUN_DATA 0x4000
++/* bit[4:0] device addr */
++#define DEVICE_ADDR 0x0007
++
++/* OCP_EEE_DATA */
++#define EEE_ADDR 0x003C
++#define EEE_DATA 0x0002
++
++/* OCP_EEE_CFG */
++#define CTAP_SHORT_EN 0x0040
++#define EEE10_EN 0x0010
++
++/* OCP_DOWN_SPEED */
++#define EN_10M_BGOFF 0x0080
++
++/* OCP_EEE_CFG2 */
++#define MY1000_EEE 0x0004
++#define MY100_EEE 0x0002
++
++/* OCP_ADC_CFG */
++#define CKADSEL_L 0x0100
++#define ADC_EN 0x0080
++#define EN_EMI_L 0x0040
++
++/* SRAM_LPF_CFG */
++#define LPF_AUTO_TUNE 0x8000
++
++/* SRAM_10M_AMP1 */
++#define GDAC_IB_UPALL 0x0008
++
++/* SRAM_10M_AMP2 */
++#define AMP_DN 0x0200
++
++/* SRAM_IMPEDANCE */
++#define RX_DRIVING_MASK 0x6000
++
++enum rtl_register_content {
++ _1000bps = 0x10,
++ _100bps = 0x08,
++ _10bps = 0x04,
++ LINK_STATUS = 0x02,
++ FULL_DUP = 0x01,
++};
++
++#define RTL8152_MAX_TX 10
++#define RTL8152_MAX_RX 10
++#define INTBUFSIZE 2
++#define CRC_SIZE 4
++#define TX_ALIGN 4
++#define RX_ALIGN 8
++
++#define INTR_LINK 0x0004
++
++#define RTL8152_REQT_READ 0xc0
++#define RTL8152_REQT_WRITE 0x40
++#define RTL8152_REQ_GET_REGS 0x05
++#define RTL8152_REQ_SET_REGS 0x05
++
++#define BYTE_EN_DWORD 0xff
++#define BYTE_EN_WORD 0x33
++#define BYTE_EN_BYTE 0x11
++#define BYTE_EN_SIX_BYTES 0x3f
++#define BYTE_EN_START_MASK 0x0f
++#define BYTE_EN_END_MASK 0xf0
++
++#define RTL8152_RMS (VLAN_ETH_FRAME_LEN + VLAN_HLEN)
++#define RTL8152_TX_TIMEOUT (HZ)
++
++/* rtl8152 flags */
++enum rtl8152_flags {
++ RTL8152_UNPLUG = 0,
++ RTL8152_SET_RX_MODE,
++ WORK_ENABLE,
++ RTL8152_LINK_CHG,
++};
++
++/* Define these values to match your device */
++#define VENDOR_ID_REALTEK 0x0bda
++#define PRODUCT_ID_RTL8152 0x8152
++#define PRODUCT_ID_RTL8153 0x8153
++
++#define VENDOR_ID_SAMSUNG 0x04e8
++#define PRODUCT_ID_SAMSUNG 0xa101
++
++#define MCU_TYPE_PLA 0x0100
++#define MCU_TYPE_USB 0x0000
++
++struct rx_desc {
++ __le32 opts1;
++#define RX_LEN_MASK 0x7fff
++ __le32 opts2;
++ __le32 opts3;
++ __le32 opts4;
++ __le32 opts5;
++ __le32 opts6;
++};
++
++struct tx_desc {
++ __le32 opts1;
++#define TX_FS (1 << 31) /* First segment of a packet */
++#define TX_LS (1 << 30) /* Final segment of a packet */
++#define TX_LEN_MASK 0x3ffff
++
++ __le32 opts2;
++#define UDP_CS (1 << 31) /* Calculate UDP/IP checksum */
++#define TCP_CS (1 << 30) /* Calculate TCP/IP checksum */
++#define IPV4_CS (1 << 29) /* Calculate IPv4 checksum */
++#define IPV6_CS (1 << 28) /* Calculate IPv6 checksum */
++};
++
++struct r8152;
++
++struct rx_agg {
++ struct list_head list;
++ struct urb *urb;
++ struct r8152 *context;
++ void *buffer;
++ void *head;
++};
++
++struct tx_agg {
++ struct list_head list;
++ struct urb *urb;
++ struct r8152 *context;
++ void *buffer;
++ void *head;
++ u32 skb_num;
++ u32 skb_len;
++};
++
++struct r8152 {
++ unsigned long flags;
++ struct usb_device *udev;
++ struct tasklet_struct tl;
++ struct usb_interface *intf;
++ struct net_device *netdev;
++ struct urb *intr_urb;
++ struct tx_agg tx_info[RTL8152_MAX_TX];
++ struct rx_agg rx_info[RTL8152_MAX_RX];
++ struct list_head rx_done, tx_free;
++ struct sk_buff_head tx_queue;
++ spinlock_t rx_lock, tx_lock;
++ struct delayed_work schedule;
++ struct mii_if_info mii;
++
++ struct rtl_ops {
++ void (*init)(struct r8152 *);
++ int (*enable)(struct r8152 *);
++ void (*disable)(struct r8152 *);
++ void (*down)(struct r8152 *);
++ void (*unload)(struct r8152 *);
++ } __no_const rtl_ops;
++
++ int intr_interval;
++ u32 msg_enable;
++ u32 tx_qlen;
++ u16 ocp_base;
++ u8 *intr_buff;
++ u8 version;
++ u8 speed;
++};
++
++enum rtl_version {
++ RTL_VER_UNKNOWN = 0,
++ RTL_VER_01,
++ RTL_VER_02,
++ RTL_VER_03,
++ RTL_VER_04,
++ RTL_VER_05,
++ RTL_VER_MAX
++};
++
++/* Maximum number of multicast addresses to filter (vs. Rx-all-multicast).
++ * The RTL chips use a 64 element hash table based on the Ethernet CRC.
++ */
++static const int multicast_filter_limit = 32;
++static unsigned int rx_buf_sz = 16384;
++
++static
++int get_registers(struct r8152 *tp, u16 value, u16 index, u16 size, void *data)
++{
++ int ret;
++ void *tmp;
++
++ tmp = kmalloc(size, GFP_KERNEL);
++ if (!tmp)
++ return -ENOMEM;
++
++ ret = usb_control_msg(tp->udev, usb_rcvctrlpipe(tp->udev, 0),
++ RTL8152_REQ_GET_REGS, RTL8152_REQT_READ,
++ value, index, tmp, size, 500);
++
++ memcpy(data, tmp, size);
++ kfree(tmp);
++
++ return ret;
++}
++
++static
++int set_registers(struct r8152 *tp, u16 value, u16 index, u16 size, void *data)
++{
++ int ret;
++ void *tmp;
++
++ tmp = kmalloc(size, GFP_KERNEL);
++ if (!tmp)
++ return -ENOMEM;
++
++ memcpy(tmp, data, size);
++
++ ret = usb_control_msg(tp->udev, usb_sndctrlpipe(tp->udev, 0),
++ RTL8152_REQ_SET_REGS, RTL8152_REQT_WRITE,
++ value, index, tmp, size, 500);
++
++ kfree(tmp);
++ return ret;
++}
++
++static int generic_ocp_read(struct r8152 *tp, u16 index, u16 size,
++ void *data, u16 type)
++{
++ u16 limit = 64;
++ int ret = 0;
++
++ if (test_bit(RTL8152_UNPLUG, &tp->flags))
++ return -ENODEV;
++
++ /* both size and indix must be 4 bytes align */
++ if ((size & 3) || !size || (index & 3) || !data)
++ return -EPERM;
++
++ if ((u32)index + (u32)size > 0xffff)
++ return -EPERM;
++
++ while (size) {
++ if (size > limit) {
++ ret = get_registers(tp, index, type, limit, data);
++ if (ret < 0)
++ break;
++
++ index += limit;
++ data += limit;
++ size -= limit;
++ } else {
++ ret = get_registers(tp, index, type, size, data);
++ if (ret < 0)
++ break;
++
++ index += size;
++ data += size;
++ size = 0;
++ break;
++ }
++ }
++
++ return ret;
++}
++
++static int generic_ocp_write(struct r8152 *tp, u16 index, u16 byteen,
++ u16 size, void *data, u16 type)
++{
++ int ret;
++ u16 byteen_start, byteen_end, byen;
++ u16 limit = 512;
++
++ if (test_bit(RTL8152_UNPLUG, &tp->flags))
++ return -ENODEV;
++
++ /* both size and indix must be 4 bytes align */
++ if ((size & 3) || !size || (index & 3) || !data)
++ return -EPERM;
++
++ if ((u32)index + (u32)size > 0xffff)
++ return -EPERM;
++
++ byteen_start = byteen & BYTE_EN_START_MASK;
++ byteen_end = byteen & BYTE_EN_END_MASK;
++
++ byen = byteen_start | (byteen_start << 4);
++ ret = set_registers(tp, index, type | byen, 4, data);
++ if (ret < 0)
++ goto error1;
++
++ index += 4;
++ data += 4;
++ size -= 4;
++
++ if (size) {
++ size -= 4;
++
++ while (size) {
++ if (size > limit) {
++ ret = set_registers(tp, index,
++ type | BYTE_EN_DWORD,
++ limit, data);
++ if (ret < 0)
++ goto error1;
++
++ index += limit;
++ data += limit;
++ size -= limit;
++ } else {
++ ret = set_registers(tp, index,
++ type | BYTE_EN_DWORD,
++ size, data);
++ if (ret < 0)
++ goto error1;
++
++ index += size;
++ data += size;
++ size = 0;
++ break;
++ }
++ }
++
++ byen = byteen_end | (byteen_end >> 4);
++ ret = set_registers(tp, index, type | byen, 4, data);
++ if (ret < 0)
++ goto error1;
++ }
++
++error1:
++ return ret;
++}
++
++static inline
++int pla_ocp_read(struct r8152 *tp, u16 index, u16 size, void *data)
++{
++ return generic_ocp_read(tp, index, size, data, MCU_TYPE_PLA);
++}
++
++static inline
++int pla_ocp_write(struct r8152 *tp, u16 index, u16 byteen, u16 size, void *data)
++{
++ return generic_ocp_write(tp, index, byteen, size, data, MCU_TYPE_PLA);
++}
++
++static inline
++int usb_ocp_read(struct r8152 *tp, u16 index, u16 size, void *data)
++{
++ return generic_ocp_read(tp, index, size, data, MCU_TYPE_USB);
++}
++
++static inline
++int usb_ocp_write(struct r8152 *tp, u16 index, u16 byteen, u16 size, void *data)
++{
++ return generic_ocp_write(tp, index, byteen, size, data, MCU_TYPE_USB);
++}
++
++static u32 ocp_read_dword(struct r8152 *tp, u16 type, u16 index)
++{
++ __le32 data;
++
++ generic_ocp_read(tp, index, sizeof(data), &data, type);
++
++ return __le32_to_cpu(data);
++}
++
++static void ocp_write_dword(struct r8152 *tp, u16 type, u16 index, u32 data)
++{
++ __le32 tmp = __cpu_to_le32(data);
++
++ generic_ocp_write(tp, index, BYTE_EN_DWORD, sizeof(tmp), &tmp, type);
++}
++
++static u16 ocp_read_word(struct r8152 *tp, u16 type, u16 index)
++{
++ u32 data;
++ __le32 tmp;
++ u8 shift = index & 2;
++
++ index &= ~3;
++
++ generic_ocp_read(tp, index, sizeof(tmp), &tmp, type);
++
++ data = __le32_to_cpu(tmp);
++ data >>= (shift * 8);
++ data &= 0xffff;
++
++ return (u16)data;
++}
++
++static void ocp_write_word(struct r8152 *tp, u16 type, u16 index, u32 data)
++{
++ u32 mask = 0xffff;
++ __le32 tmp;
++ u16 byen = BYTE_EN_WORD;
++ u8 shift = index & 2;
++
++ data &= mask;
++
++ if (index & 2) {
++ byen <<= shift;
++ mask <<= (shift * 8);
++ data <<= (shift * 8);
++ index &= ~3;
++ }
++
++ generic_ocp_read(tp, index, sizeof(tmp), &tmp, type);
++
++ data |= __le32_to_cpu(tmp) & ~mask;
++ tmp = __cpu_to_le32(data);
++
++ generic_ocp_write(tp, index, byen, sizeof(tmp), &tmp, type);
++}
++
++static u8 ocp_read_byte(struct r8152 *tp, u16 type, u16 index)
++{
++ u32 data;
++ __le32 tmp;
++ u8 shift = index & 3;
++
++ index &= ~3;
++
++ generic_ocp_read(tp, index, sizeof(tmp), &tmp, type);
++
++ data = __le32_to_cpu(tmp);
++ data >>= (shift * 8);
++ data &= 0xff;
++
++ return (u8)data;
++}
++
++static void ocp_write_byte(struct r8152 *tp, u16 type, u16 index, u32 data)
++{
++ u32 mask = 0xff;
++ __le32 tmp;
++ u16 byen = BYTE_EN_BYTE;
++ u8 shift = index & 3;
++
++ data &= mask;
++
++ if (index & 3) {
++ byen <<= shift;
++ mask <<= (shift * 8);
++ data <<= (shift * 8);
++ index &= ~3;
++ }
++
++ generic_ocp_read(tp, index, sizeof(tmp), &tmp, type);
++
++ data |= __le32_to_cpu(tmp) & ~mask;
++ tmp = __cpu_to_le32(data);
++
++ generic_ocp_write(tp, index, byen, sizeof(tmp), &tmp, type);
++}
++
++static u16 ocp_reg_read(struct r8152 *tp, u16 addr)
++{
++ u16 ocp_base, ocp_index;
++
++ ocp_base = addr & 0xf000;
++ if (ocp_base != tp->ocp_base) {
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_OCP_GPHY_BASE, ocp_base);
++ tp->ocp_base = ocp_base;
++ }
++
++ ocp_index = (addr & 0x0fff) | 0xb000;
++ return ocp_read_word(tp, MCU_TYPE_PLA, ocp_index);
++}
++
++static void ocp_reg_write(struct r8152 *tp, u16 addr, u16 data)
++{
++ u16 ocp_base, ocp_index;
++
++ ocp_base = addr & 0xf000;
++ if (ocp_base != tp->ocp_base) {
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_OCP_GPHY_BASE, ocp_base);
++ tp->ocp_base = ocp_base;
++ }
++
++ ocp_index = (addr & 0x0fff) | 0xb000;
++ ocp_write_word(tp, MCU_TYPE_PLA, ocp_index, data);
++}
++
++static inline void r8152_mdio_write(struct r8152 *tp, u32 reg_addr, u32 value)
++{
++ ocp_reg_write(tp, OCP_BASE_MII + reg_addr * 2, value);
++}
++
++static inline int r8152_mdio_read(struct r8152 *tp, u32 reg_addr)
++{
++ return ocp_reg_read(tp, OCP_BASE_MII + reg_addr * 2);
++}
++
++static void sram_write(struct r8152 *tp, u16 addr, u16 data)
++{
++ ocp_reg_write(tp, OCP_SRAM_ADDR, addr);
++ ocp_reg_write(tp, OCP_SRAM_DATA, data);
++}
++
++static u16 sram_read(struct r8152 *tp, u16 addr)
++{
++ ocp_reg_write(tp, OCP_SRAM_ADDR, addr);
++ return ocp_reg_read(tp, OCP_SRAM_DATA);
++}
++
++static int read_mii_word(struct net_device *netdev, int phy_id, int reg)
++{
++ struct r8152 *tp = netdev_priv(netdev);
++
++ if (phy_id != R8152_PHY_ID)
++ return -EINVAL;
++
++ return r8152_mdio_read(tp, reg);
++}
++
++static
++void write_mii_word(struct net_device *netdev, int phy_id, int reg, int val)
++{
++ struct r8152 *tp = netdev_priv(netdev);
++
++ if (phy_id != R8152_PHY_ID)
++ return;
++
++ r8152_mdio_write(tp, reg, val);
++}
++
++static
++int r8152_submit_rx(struct r8152 *tp, struct rx_agg *agg, gfp_t mem_flags);
++
++static inline void set_ethernet_addr(struct r8152 *tp)
++{
++ struct net_device *dev = tp->netdev;
++ u8 node_id[8] = {0};
++
++ if (pla_ocp_read(tp, PLA_IDR, sizeof(node_id), node_id) < 0)
++ netif_notice(tp, probe, dev, "inet addr fail\n");
++ else {
++ memcpy(dev->dev_addr, node_id, dev->addr_len);
++ memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
++ }
++}
++
++static int rtl8152_set_mac_address(struct net_device *netdev, void *p)
++{
++ struct r8152 *tp = netdev_priv(netdev);
++ struct sockaddr *addr = p;
++
++ if (!is_valid_ether_addr(addr->sa_data))
++ return -EADDRNOTAVAIL;
++
++ memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
++
++ ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_CONFIG);
++ pla_ocp_write(tp, PLA_IDR, BYTE_EN_SIX_BYTES, 8, addr->sa_data);
++ ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_NORAML);
++
++ return 0;
++}
++
++static struct net_device_stats *rtl8152_get_stats(struct net_device *dev)
++{
++ return &dev->stats;
++}
++
++static void read_bulk_callback(struct urb *urb)
++{
++ struct net_device *netdev;
++ unsigned long flags;
++ int status = urb->status;
++ struct rx_agg *agg;
++ struct r8152 *tp;
++ int result;
++
++ agg = urb->context;
++ if (!agg)
++ return;
++
++ tp = agg->context;
++ if (!tp)
++ return;
++
++ if (test_bit(RTL8152_UNPLUG, &tp->flags))
++ return;
++
++ if (!test_bit(WORK_ENABLE, &tp->flags))
++ return;
++
++ netdev = tp->netdev;
++
++ /* When link down, the driver would cancel all bulks. */
++ /* This avoid the re-submitting bulk */
++ if (!netif_carrier_ok(netdev))
++ return;
++
++ switch (status) {
++ case 0:
++ if (urb->actual_length < ETH_ZLEN)
++ break;
++
++ spin_lock_irqsave(&tp->rx_lock, flags);
++ list_add_tail(&agg->list, &tp->rx_done);
++ spin_unlock_irqrestore(&tp->rx_lock, flags);
++ tasklet_schedule(&tp->tl);
++ return;
++ case -ESHUTDOWN:
++ set_bit(RTL8152_UNPLUG, &tp->flags);
++ netif_device_detach(tp->netdev);
++ return;
++ case -ENOENT:
++ return; /* the urb is in unlink state */
++ case -ETIME:
++ if (net_ratelimit())
++ netdev_warn(netdev, "maybe reset is needed?\n");
++ break;
++ default:
++ if (net_ratelimit())
++ netdev_warn(netdev, "Rx status %d\n", status);
++ break;
++ }
++
++ result = r8152_submit_rx(tp, agg, GFP_ATOMIC);
++ if (result == -ENODEV) {
++ netif_device_detach(tp->netdev);
++ } else if (result) {
++ spin_lock_irqsave(&tp->rx_lock, flags);
++ list_add_tail(&agg->list, &tp->rx_done);
++ spin_unlock_irqrestore(&tp->rx_lock, flags);
++ tasklet_schedule(&tp->tl);
++ }
++}
++
++static void write_bulk_callback(struct urb *urb)
++{
++ struct net_device_stats *stats;
++ unsigned long flags;
++ struct tx_agg *agg;
++ struct r8152 *tp;
++ int status = urb->status;
++
++ agg = urb->context;
++ if (!agg)
++ return;
++
++ tp = agg->context;
++ if (!tp)
++ return;
++
++ stats = rtl8152_get_stats(tp->netdev);
++ if (status) {
++ if (net_ratelimit())
++ netdev_warn(tp->netdev, "Tx status %d\n", status);
++ stats->tx_errors += agg->skb_num;
++ } else {
++ stats->tx_packets += agg->skb_num;
++ stats->tx_bytes += agg->skb_len;
++ }
++
++ spin_lock_irqsave(&tp->tx_lock, flags);
++ list_add_tail(&agg->list, &tp->tx_free);
++ spin_unlock_irqrestore(&tp->tx_lock, flags);
++
++ if (!netif_carrier_ok(tp->netdev))
++ return;
++
++ if (!test_bit(WORK_ENABLE, &tp->flags))
++ return;
++
++ if (test_bit(RTL8152_UNPLUG, &tp->flags))
++ return;
++
++ if (!skb_queue_empty(&tp->tx_queue))
++ tasklet_schedule(&tp->tl);
++}
++
++static void intr_callback(struct urb *urb)
++{
++ struct r8152 *tp;
++ __le16 *d;
++ int status = urb->status;
++ int res;
++
++ tp = urb->context;
++ if (!tp)
++ return;
++
++ if (!test_bit(WORK_ENABLE, &tp->flags))
++ return;
++
++ if (test_bit(RTL8152_UNPLUG, &tp->flags))
++ return;
++
++ switch (status) {
++ case 0: /* success */
++ break;
++ case -ECONNRESET: /* unlink */
++ case -ESHUTDOWN:
++ netif_device_detach(tp->netdev);
++ case -ENOENT:
++ return;
++ case -EOVERFLOW:
++ netif_info(tp, intr, tp->netdev, "intr status -EOVERFLOW\n");
++ goto resubmit;
++ /* -EPIPE: should clear the halt */
++ default:
++ netif_info(tp, intr, tp->netdev, "intr status %d\n", status);
++ goto resubmit;
++ }
++
++ d = urb->transfer_buffer;
++ if (INTR_LINK & __le16_to_cpu(d[0])) {
++ if (!(tp->speed & LINK_STATUS)) {
++ set_bit(RTL8152_LINK_CHG, &tp->flags);
++ schedule_delayed_work(&tp->schedule, 0);
++ }
++ } else {
++ if (tp->speed & LINK_STATUS) {
++ set_bit(RTL8152_LINK_CHG, &tp->flags);
++ schedule_delayed_work(&tp->schedule, 0);
++ }
++ }
++
++resubmit:
++ res = usb_submit_urb(urb, GFP_ATOMIC);
++ if (res == -ENODEV)
++ netif_device_detach(tp->netdev);
++ else if (res)
++ netif_err(tp, intr, tp->netdev,
++ "can't resubmit intr, status %d\n", res);
++}
++
++static inline void *rx_agg_align(void *data)
++{
++ return (void *)ALIGN((uintptr_t)data, RX_ALIGN);
++}
++
++static inline void *tx_agg_align(void *data)
++{
++ return (void *)ALIGN((uintptr_t)data, TX_ALIGN);
++}
++
++static void free_all_mem(struct r8152 *tp)
++{
++ int i;
++
++ for (i = 0; i < RTL8152_MAX_RX; i++) {
++ usb_free_urb(tp->rx_info[i].urb);
++ tp->rx_info[i].urb = NULL;
++
++ kfree(tp->rx_info[i].buffer);
++ tp->rx_info[i].buffer = NULL;
++ tp->rx_info[i].head = NULL;
++ }
++
++ for (i = 0; i < RTL8152_MAX_TX; i++) {
++ usb_free_urb(tp->tx_info[i].urb);
++ tp->tx_info[i].urb = NULL;
++
++ kfree(tp->tx_info[i].buffer);
++ tp->tx_info[i].buffer = NULL;
++ tp->tx_info[i].head = NULL;
++ }
++
++ usb_free_urb(tp->intr_urb);
++ tp->intr_urb = NULL;
++
++ kfree(tp->intr_buff);
++ tp->intr_buff = NULL;
++}
++
++static int alloc_all_mem(struct r8152 *tp)
++{
++ struct net_device *netdev = tp->netdev;
++ struct usb_interface *intf = tp->intf;
++ struct usb_host_interface *alt = intf->cur_altsetting;
++ struct usb_host_endpoint *ep_intr = alt->endpoint + 2;
++ struct urb *urb;
++ int node, i;
++ u8 *buf;
++
++ node = netdev->dev.parent ? dev_to_node(netdev->dev.parent) : -1;
++
++ spin_lock_init(&tp->rx_lock);
++ spin_lock_init(&tp->tx_lock);
++ INIT_LIST_HEAD(&tp->rx_done);
++ INIT_LIST_HEAD(&tp->tx_free);
++ skb_queue_head_init(&tp->tx_queue);
++
++ for (i = 0; i < RTL8152_MAX_RX; i++) {
++ buf = kmalloc_node(rx_buf_sz, GFP_KERNEL, node);
++ if (!buf)
++ goto err1;
++
++ if (buf != rx_agg_align(buf)) {
++ kfree(buf);
++ buf = kmalloc_node(rx_buf_sz + RX_ALIGN, GFP_KERNEL,
++ node);
++ if (!buf)
++ goto err1;
++ }
++
++ urb = usb_alloc_urb(0, GFP_KERNEL);
++ if (!urb) {
++ kfree(buf);
++ goto err1;
++ }
++
++ INIT_LIST_HEAD(&tp->rx_info[i].list);
++ tp->rx_info[i].context = tp;
++ tp->rx_info[i].urb = urb;
++ tp->rx_info[i].buffer = buf;
++ tp->rx_info[i].head = rx_agg_align(buf);
++ }
++
++ for (i = 0; i < RTL8152_MAX_TX; i++) {
++ buf = kmalloc_node(rx_buf_sz, GFP_KERNEL, node);
++ if (!buf)
++ goto err1;
++
++ if (buf != tx_agg_align(buf)) {
++ kfree(buf);
++ buf = kmalloc_node(rx_buf_sz + TX_ALIGN, GFP_KERNEL,
++ node);
++ if (!buf)
++ goto err1;
++ }
++
++ urb = usb_alloc_urb(0, GFP_KERNEL);
++ if (!urb) {
++ kfree(buf);
++ goto err1;
++ }
++
++ INIT_LIST_HEAD(&tp->tx_info[i].list);
++ tp->tx_info[i].context = tp;
++ tp->tx_info[i].urb = urb;
++ tp->tx_info[i].buffer = buf;
++ tp->tx_info[i].head = tx_agg_align(buf);
++
++ list_add_tail(&tp->tx_info[i].list, &tp->tx_free);
++ }
++
++ tp->intr_urb = usb_alloc_urb(0, GFP_KERNEL);
++ if (!tp->intr_urb)
++ goto err1;
++
++ tp->intr_buff = kmalloc(INTBUFSIZE, GFP_KERNEL);
++ if (!tp->intr_buff)
++ goto err1;
++
++ tp->intr_interval = (int)ep_intr->desc.bInterval;
++ usb_fill_int_urb(tp->intr_urb, tp->udev, usb_rcvintpipe(tp->udev, 3),
++ tp->intr_buff, INTBUFSIZE, intr_callback,
++ tp, tp->intr_interval);
++
++ return 0;
++
++err1:
++ free_all_mem(tp);
++ return -ENOMEM;
++}
++
++static struct tx_agg *r8152_get_tx_agg(struct r8152 *tp)
++{
++ struct tx_agg *agg = NULL;
++ unsigned long flags;
++
++ spin_lock_irqsave(&tp->tx_lock, flags);
++ if (!list_empty(&tp->tx_free)) {
++ struct list_head *cursor;
++
++ cursor = tp->tx_free.next;
++ list_del_init(cursor);
++ agg = list_entry(cursor, struct tx_agg, list);
++ }
++ spin_unlock_irqrestore(&tp->tx_lock, flags);
++
++ return agg;
++}
++
++static void
++r8152_tx_csum(struct r8152 *tp, struct tx_desc *desc, struct sk_buff *skb)
++{
++ memset(desc, 0, sizeof(*desc));
++
++ desc->opts1 = cpu_to_le32((skb->len & TX_LEN_MASK) | TX_FS | TX_LS);
++
++ if (skb->ip_summed == CHECKSUM_PARTIAL) {
++ __be16 protocol;
++ u8 ip_protocol;
++ u32 opts2 = 0;
++
++ if (skb->protocol == htons(ETH_P_8021Q))
++ protocol = vlan_eth_hdr(skb)->h_vlan_encapsulated_proto;
++ else
++ protocol = skb->protocol;
++
++ switch (protocol) {
++ case htons(ETH_P_IP):
++ opts2 |= IPV4_CS;
++ ip_protocol = ip_hdr(skb)->protocol;
++ break;
++
++ case htons(ETH_P_IPV6):
++ opts2 |= IPV6_CS;
++ ip_protocol = ipv6_hdr(skb)->nexthdr;
++ break;
++
++ default:
++ ip_protocol = IPPROTO_RAW;
++ break;
++ }
++
++ if (ip_protocol == IPPROTO_TCP) {
++ opts2 |= TCP_CS;
++ opts2 |= (skb_transport_offset(skb) & 0x7fff) << 17;
++ } else if (ip_protocol == IPPROTO_UDP) {
++ opts2 |= UDP_CS;
++ } else {
++ WARN_ON_ONCE(1);
++ }
++
++ desc->opts2 = cpu_to_le32(opts2);
++ }
++}
++
++static int r8152_tx_agg_fill(struct r8152 *tp, struct tx_agg *agg)
++{
++ int remain;
++ u8 *tx_data;
++
++ tx_data = agg->head;
++ agg->skb_num = agg->skb_len = 0;
++ remain = rx_buf_sz;
++
++ while (remain >= ETH_ZLEN + sizeof(struct tx_desc)) {
++ struct tx_desc *tx_desc;
++ struct sk_buff *skb;
++ unsigned int len;
++
++ skb = skb_dequeue(&tp->tx_queue);
++ if (!skb)
++ break;
++
++ remain -= sizeof(*tx_desc);
++ len = skb->len;
++ if (remain < len) {
++ skb_queue_head(&tp->tx_queue, skb);
++ break;
++ }
++
++ tx_data = tx_agg_align(tx_data);
++ tx_desc = (struct tx_desc *)tx_data;
++ tx_data += sizeof(*tx_desc);
++
++ r8152_tx_csum(tp, tx_desc, skb);
++ memcpy(tx_data, skb->data, len);
++ agg->skb_num++;
++ agg->skb_len += len;
++ dev_kfree_skb_any(skb);
++
++ tx_data += len;
++ remain = rx_buf_sz - (int)(tx_agg_align(tx_data) - agg->head);
++ }
++
++ netif_tx_lock(tp->netdev);
++
++ if (netif_queue_stopped(tp->netdev) &&
++ skb_queue_len(&tp->tx_queue) < tp->tx_qlen)
++ netif_wake_queue(tp->netdev);
++
++ netif_tx_unlock(tp->netdev);
++
++ usb_fill_bulk_urb(agg->urb, tp->udev, usb_sndbulkpipe(tp->udev, 2),
++ agg->head, (int)(tx_data - (u8 *)agg->head),
++ (usb_complete_t)write_bulk_callback, agg);
++
++ return usb_submit_urb(agg->urb, GFP_ATOMIC);
++}
++
++static void rx_bottom(struct r8152 *tp)
++{
++ unsigned long flags;
++ struct list_head *cursor, *next;
++
++ spin_lock_irqsave(&tp->rx_lock, flags);
++ list_for_each_safe(cursor, next, &tp->rx_done) {
++ struct rx_desc *rx_desc;
++ struct rx_agg *agg;
++ int len_used = 0;
++ struct urb *urb;
++ u8 *rx_data;
++ int ret;
++
++ list_del_init(cursor);
++ spin_unlock_irqrestore(&tp->rx_lock, flags);
++
++ agg = list_entry(cursor, struct rx_agg, list);
++ urb = agg->urb;
++ if (urb->actual_length < ETH_ZLEN)
++ goto submit;
++
++ rx_desc = agg->head;
++ rx_data = agg->head;
++ len_used += sizeof(struct rx_desc);
++
++ while (urb->actual_length > len_used) {
++ struct net_device *netdev = tp->netdev;
++ struct net_device_stats *stats;
++ unsigned int pkt_len;
++ struct sk_buff *skb;
++
++ pkt_len = le32_to_cpu(rx_desc->opts1) & RX_LEN_MASK;
++ if (pkt_len < ETH_ZLEN)
++ break;
++
++ len_used += pkt_len;
++ if (urb->actual_length < len_used)
++ break;
++
++ stats = rtl8152_get_stats(netdev);
++
++ pkt_len -= CRC_SIZE;
++ rx_data += sizeof(struct rx_desc);
++
++ skb = netdev_alloc_skb_ip_align(netdev, pkt_len);
++ if (!skb) {
++ stats->rx_dropped++;
++ break;
++ }
++ memcpy(skb->data, rx_data, pkt_len);
++ skb_put(skb, pkt_len);
++ skb->protocol = eth_type_trans(skb, netdev);
++ netif_rx(skb);
++ stats->rx_packets++;
++ stats->rx_bytes += pkt_len;
++
++ rx_data = rx_agg_align(rx_data + pkt_len + CRC_SIZE);
++ rx_desc = (struct rx_desc *)rx_data;
++ len_used = (int)(rx_data - (u8 *)agg->head);
++ len_used += sizeof(struct rx_desc);
++ }
++
++submit:
++ ret = r8152_submit_rx(tp, agg, GFP_ATOMIC);
++ spin_lock_irqsave(&tp->rx_lock, flags);
++ if (ret && ret != -ENODEV) {
++ list_add_tail(&agg->list, next);
++ tasklet_schedule(&tp->tl);
++ }
++ }
++ spin_unlock_irqrestore(&tp->rx_lock, flags);
++}
++
++static void tx_bottom(struct r8152 *tp)
++{
++ int res;
++
++ do {
++ struct tx_agg *agg;
++
++ if (skb_queue_empty(&tp->tx_queue))
++ break;
++
++ agg = r8152_get_tx_agg(tp);
++ if (!agg)
++ break;
++
++ res = r8152_tx_agg_fill(tp, agg);
++ if (res) {
++ struct net_device_stats *stats;
++ struct net_device *netdev;
++ unsigned long flags;
++
++ netdev = tp->netdev;
++ stats = rtl8152_get_stats(netdev);
++
++ if (res == -ENODEV) {
++ netif_device_detach(netdev);
++ } else {
++ netif_warn(tp, tx_err, netdev,
++ "failed tx_urb %d\n", res);
++ stats->tx_dropped += agg->skb_num;
++ spin_lock_irqsave(&tp->tx_lock, flags);
++ list_add_tail(&agg->list, &tp->tx_free);
++ spin_unlock_irqrestore(&tp->tx_lock, flags);
++ }
++ }
++ } while (res == 0);
++}
++
++static void bottom_half(unsigned long data)
++{
++ struct r8152 *tp;
++
++ tp = (struct r8152 *)data;
++
++ if (test_bit(RTL8152_UNPLUG, &tp->flags))
++ return;
++
++ if (!test_bit(WORK_ENABLE, &tp->flags))
++ return;
++
++ /* When link down, the driver would cancel all bulks. */
++ /* This avoid the re-submitting bulk */
++ if (!netif_carrier_ok(tp->netdev))
++ return;
++
++ rx_bottom(tp);
++ tx_bottom(tp);
++}
++
++static
++int r8152_submit_rx(struct r8152 *tp, struct rx_agg *agg, gfp_t mem_flags)
++{
++ usb_fill_bulk_urb(agg->urb, tp->udev, usb_rcvbulkpipe(tp->udev, 1),
++ agg->head, rx_buf_sz,
++ (usb_complete_t)read_bulk_callback, agg);
++
++ return usb_submit_urb(agg->urb, mem_flags);
++}
++
++static void rtl8152_tx_timeout(struct net_device *netdev)
++{
++ struct r8152 *tp = netdev_priv(netdev);
++ int i;
++
++ netif_warn(tp, tx_err, netdev, "Tx timeout\n");
++ for (i = 0; i < RTL8152_MAX_TX; i++)
++ usb_unlink_urb(tp->tx_info[i].urb);
++}
++
++static void rtl8152_set_rx_mode(struct net_device *netdev)
++{
++ struct r8152 *tp = netdev_priv(netdev);
++
++ if (tp->speed & LINK_STATUS) {
++ set_bit(RTL8152_SET_RX_MODE, &tp->flags);
++ schedule_delayed_work(&tp->schedule, 0);
++ }
++}
++
++static void _rtl8152_set_rx_mode(struct net_device *netdev)
++{
++ struct r8152 *tp = netdev_priv(netdev);
++ u32 mc_filter[2]; /* Multicast hash filter */
++ __le32 tmp[2];
++ u32 ocp_data;
++
++ clear_bit(RTL8152_SET_RX_MODE, &tp->flags);
++ netif_stop_queue(netdev);
++ ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_RCR);
++ ocp_data &= ~RCR_ACPT_ALL;
++ ocp_data |= RCR_AB | RCR_APM;
++
++ if (netdev->flags & IFF_PROMISC) {
++ /* Unconditionally log net taps. */
++ netif_notice(tp, link, netdev, "Promiscuous mode enabled\n");
++ ocp_data |= RCR_AM | RCR_AAP;
++ mc_filter[1] = mc_filter[0] = 0xffffffff;
++ } else if ((netdev_mc_count(netdev) > multicast_filter_limit) ||
++ (netdev->flags & IFF_ALLMULTI)) {
++ /* Too many to filter perfectly -- accept all multicasts. */
++ ocp_data |= RCR_AM;
++ mc_filter[1] = mc_filter[0] = 0xffffffff;
++ } else {
++ struct netdev_hw_addr *ha;
++
++ mc_filter[1] = mc_filter[0] = 0;
++ netdev_for_each_mc_addr(ha, netdev) {
++ int bit_nr = ether_crc(ETH_ALEN, ha->addr) >> 26;
++ mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31);
++ ocp_data |= RCR_AM;
++ }
++ }
++
++ tmp[0] = __cpu_to_le32(swab32(mc_filter[1]));
++ tmp[1] = __cpu_to_le32(swab32(mc_filter[0]));
++
++ pla_ocp_write(tp, PLA_MAR, BYTE_EN_DWORD, sizeof(tmp), tmp);
++ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, ocp_data);
++ netif_wake_queue(netdev);
++}
++
++static netdev_tx_t rtl8152_start_xmit(struct sk_buff *skb,
++ struct net_device *netdev)
++{
++ struct r8152 *tp = netdev_priv(netdev);
++
++ skb_tx_timestamp(skb);
++
++ skb_queue_tail(&tp->tx_queue, skb);
++
++ if (list_empty(&tp->tx_free) &&
++ skb_queue_len(&tp->tx_queue) > tp->tx_qlen)
++ netif_stop_queue(netdev);
++
++ if (!list_empty(&tp->tx_free))
++ tasklet_schedule(&tp->tl);
++
++ return NETDEV_TX_OK;
++}
++
++static void r8152b_reset_packet_filter(struct r8152 *tp)
++{
++ u32 ocp_data;
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_FMC);
++ ocp_data &= ~FMC_FCR_MCU_EN;
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_FMC, ocp_data);
++ ocp_data |= FMC_FCR_MCU_EN;
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_FMC, ocp_data);
++}
++
++static void rtl8152_nic_reset(struct r8152 *tp)
++{
++ int i;
++
++ ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CR, CR_RST);
++
++ for (i = 0; i < 1000; i++) {
++ if (!(ocp_read_byte(tp, MCU_TYPE_PLA, PLA_CR) & CR_RST))
++ break;
++ udelay(100);
++ }
++}
++
++static void set_tx_qlen(struct r8152 *tp)
++{
++ struct net_device *netdev = tp->netdev;
++
++ tp->tx_qlen = rx_buf_sz / (netdev->mtu + VLAN_ETH_HLEN + VLAN_HLEN +
++ sizeof(struct tx_desc));
++}
++
++static inline u8 rtl8152_get_speed(struct r8152 *tp)
++{
++ return ocp_read_byte(tp, MCU_TYPE_PLA, PLA_PHYSTATUS);
++}
++
++static void rtl_set_eee_plus(struct r8152 *tp)
++{
++ u32 ocp_data;
++ u8 speed;
++
++ speed = rtl8152_get_speed(tp);
++ if (speed & _10bps) {
++ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EEEP_CR);
++ ocp_data |= EEEP_CR_EEEP_TX;
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_EEEP_CR, ocp_data);
++ } else {
++ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EEEP_CR);
++ ocp_data &= ~EEEP_CR_EEEP_TX;
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_EEEP_CR, ocp_data);
++ }
++}
++
++static int rtl_enable(struct r8152 *tp)
++{
++ u32 ocp_data;
++ int i, ret;
++
++ r8152b_reset_packet_filter(tp);
++
++ ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_CR);
++ ocp_data |= CR_RE | CR_TE;
++ ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CR, ocp_data);
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_MISC_1);
++ ocp_data &= ~RXDY_GATED_EN;
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_MISC_1, ocp_data);
++
++ INIT_LIST_HEAD(&tp->rx_done);
++ ret = 0;
++ for (i = 0; i < RTL8152_MAX_RX; i++) {
++ INIT_LIST_HEAD(&tp->rx_info[i].list);
++ ret |= r8152_submit_rx(tp, &tp->rx_info[i], GFP_KERNEL);
++ }
++
++ return ret;
++}
++
++static int rtl8152_enable(struct r8152 *tp)
++{
++ set_tx_qlen(tp);
++ rtl_set_eee_plus(tp);
++
++ return rtl_enable(tp);
++}
++
++static void r8153_set_rx_agg(struct r8152 *tp)
++{
++ u8 speed;
++
++ speed = rtl8152_get_speed(tp);
++ if (speed & _1000bps) {
++ if (tp->udev->speed == USB_SPEED_SUPER) {
++ ocp_write_dword(tp, MCU_TYPE_USB, USB_RX_BUF_TH,
++ RX_THR_SUPPER);
++ ocp_write_dword(tp, MCU_TYPE_USB, USB_RX_EARLY_AGG,
++ EARLY_AGG_SUPPER);
++ } else {
++ ocp_write_dword(tp, MCU_TYPE_USB, USB_RX_BUF_TH,
++ RX_THR_HIGH);
++ ocp_write_dword(tp, MCU_TYPE_USB, USB_RX_EARLY_AGG,
++ EARLY_AGG_HIGH);
++ }
++ } else {
++ ocp_write_dword(tp, MCU_TYPE_USB, USB_RX_BUF_TH, RX_THR_SLOW);
++ ocp_write_dword(tp, MCU_TYPE_USB, USB_RX_EARLY_AGG,
++ EARLY_AGG_SLOW);
++ }
++}
++
++static int rtl8153_enable(struct r8152 *tp)
++{
++ set_tx_qlen(tp);
++ rtl_set_eee_plus(tp);
++ r8153_set_rx_agg(tp);
++
++ return rtl_enable(tp);
++}
++
++static void rtl8152_disable(struct r8152 *tp)
++{
++ struct net_device_stats *stats = rtl8152_get_stats(tp->netdev);
++ struct sk_buff *skb;
++ u32 ocp_data;
++ int i;
++
++ ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_RCR);
++ ocp_data &= ~RCR_ACPT_ALL;
++ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, ocp_data);
++
++ while ((skb = skb_dequeue(&tp->tx_queue))) {
++ dev_kfree_skb(skb);
++ stats->tx_dropped++;
++ }
++
++ for (i = 0; i < RTL8152_MAX_TX; i++)
++ usb_kill_urb(tp->tx_info[i].urb);
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_MISC_1);
++ ocp_data |= RXDY_GATED_EN;
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_MISC_1, ocp_data);
++
++ for (i = 0; i < 1000; i++) {
++ ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
++ if ((ocp_data & FIFO_EMPTY) == FIFO_EMPTY)
++ break;
++ mdelay(1);
++ }
++
++ for (i = 0; i < 1000; i++) {
++ if (ocp_read_word(tp, MCU_TYPE_PLA, PLA_TCR0) & TCR0_TX_EMPTY)
++ break;
++ mdelay(1);
++ }
++
++ for (i = 0; i < RTL8152_MAX_RX; i++)
++ usb_kill_urb(tp->rx_info[i].urb);
++
++ rtl8152_nic_reset(tp);
++}
++
++static void r8152b_exit_oob(struct r8152 *tp)
++{
++ u32 ocp_data;
++ int i;
++
++ ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_RCR);
++ ocp_data &= ~RCR_ACPT_ALL;
++ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, ocp_data);
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_MISC_1);
++ ocp_data |= RXDY_GATED_EN;
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_MISC_1, ocp_data);
++
++ ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_NORAML);
++ ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CR, 0x00);
++
++ ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
++ ocp_data &= ~NOW_IS_OOB;
++ ocp_write_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, ocp_data);
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7);
++ ocp_data &= ~MCU_BORW_EN;
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, ocp_data);
++
++ for (i = 0; i < 1000; i++) {
++ ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
++ if (ocp_data & LINK_LIST_READY)
++ break;
++ mdelay(1);
++ }
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7);
++ ocp_data |= RE_INIT_LL;
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, ocp_data);
++
++ for (i = 0; i < 1000; i++) {
++ ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
++ if (ocp_data & LINK_LIST_READY)
++ break;
++ mdelay(1);
++ }
++
++ rtl8152_nic_reset(tp);
++
++ /* rx share fifo credit full threshold */
++ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL0, RXFIFO_THR1_NORMAL);
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_DEV_STAT);
++ ocp_data &= STAT_SPEED_MASK;
++ if (ocp_data == STAT_SPEED_FULL) {
++ /* rx share fifo credit near full threshold */
++ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL1,
++ RXFIFO_THR2_FULL);
++ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL2,
++ RXFIFO_THR3_FULL);
++ } else {
++ /* rx share fifo credit near full threshold */
++ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL1,
++ RXFIFO_THR2_HIGH);
++ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL2,
++ RXFIFO_THR3_HIGH);
++ }
++
++ /* TX share fifo free credit full threshold */
++ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_TXFIFO_CTRL, TXFIFO_THR_NORMAL);
++
++ ocp_write_byte(tp, MCU_TYPE_USB, USB_TX_AGG, TX_AGG_MAX_THRESHOLD);
++ ocp_write_dword(tp, MCU_TYPE_USB, USB_RX_BUF_TH, RX_THR_HIGH);
++ ocp_write_dword(tp, MCU_TYPE_USB, USB_TX_DMA,
++ TEST_MODE_DISABLE | TX_SIZE_ADJUST1);
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CPCR);
++ ocp_data &= ~CPCR_RX_VLAN;
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_CPCR, ocp_data);
++
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_RMS, RTL8152_RMS);
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_TCR0);
++ ocp_data |= TCR0_AUTO_FIFO;
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_TCR0, ocp_data);
++}
++
++static void r8152b_enter_oob(struct r8152 *tp)
++{
++ u32 ocp_data;
++ int i;
++
++ ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
++ ocp_data &= ~NOW_IS_OOB;
++ ocp_write_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, ocp_data);
++
++ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL0, RXFIFO_THR1_OOB);
++ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL1, RXFIFO_THR2_OOB);
++ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL2, RXFIFO_THR3_OOB);
++
++ rtl8152_disable(tp);
++
++ for (i = 0; i < 1000; i++) {
++ ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
++ if (ocp_data & LINK_LIST_READY)
++ break;
++ mdelay(1);
++ }
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7);
++ ocp_data |= RE_INIT_LL;
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, ocp_data);
++
++ for (i = 0; i < 1000; i++) {
++ ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
++ if (ocp_data & LINK_LIST_READY)
++ break;
++ mdelay(1);
++ }
++
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_RMS, RTL8152_RMS);
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CFG_WOL);
++ ocp_data |= MAGIC_EN;
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_CFG_WOL, ocp_data);
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CPCR);
++ ocp_data |= CPCR_RX_VLAN;
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_CPCR, ocp_data);
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PAL_BDC_CR);
++ ocp_data |= ALDPS_PROXY_MODE;
++ ocp_write_word(tp, MCU_TYPE_PLA, PAL_BDC_CR, ocp_data);
++
++ ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
++ ocp_data |= NOW_IS_OOB | DIS_MCU_CLROOB;
++ ocp_write_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, ocp_data);
++
++ ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CONFIG5, LAN_WAKE_EN);
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_MISC_1);
++ ocp_data &= ~RXDY_GATED_EN;
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_MISC_1, ocp_data);
++
++ ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_RCR);
++ ocp_data |= RCR_APM | RCR_AM | RCR_AB;
++ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, ocp_data);
++}
++
++static void r8152b_disable_aldps(struct r8152 *tp)
++{
++ ocp_reg_write(tp, OCP_ALDPS_CONFIG, ENPDNPS | LINKENA | DIS_SDSAVE);
++ msleep(20);
++}
++
++static inline void r8152b_enable_aldps(struct r8152 *tp)
++{
++ ocp_reg_write(tp, OCP_ALDPS_CONFIG, ENPWRSAVE | ENPDNPS |
++ LINKENA | DIS_SDSAVE);
++}
++
++static void r8153_hw_phy_cfg(struct r8152 *tp)
++{
++ u32 ocp_data;
++ u16 data;
++
++ ocp_reg_write(tp, OCP_ADC_CFG, CKADSEL_L | ADC_EN | EN_EMI_L);
++ r8152_mdio_write(tp, MII_BMCR, BMCR_ANENABLE);
++
++ if (tp->version == RTL_VER_03) {
++ data = ocp_reg_read(tp, OCP_EEE_CFG);
++ data &= ~CTAP_SHORT_EN;
++ ocp_reg_write(tp, OCP_EEE_CFG, data);
++ }
++
++ data = ocp_reg_read(tp, OCP_POWER_CFG);
++ data |= EEE_CLKDIV_EN;
++ ocp_reg_write(tp, OCP_POWER_CFG, data);
++
++ data = ocp_reg_read(tp, OCP_DOWN_SPEED);
++ data |= EN_10M_BGOFF;
++ ocp_reg_write(tp, OCP_DOWN_SPEED, data);
++ data = ocp_reg_read(tp, OCP_POWER_CFG);
++ data |= EN_10M_PLLOFF;
++ ocp_reg_write(tp, OCP_POWER_CFG, data);
++ data = sram_read(tp, SRAM_IMPEDANCE);
++ data &= ~RX_DRIVING_MASK;
++ sram_write(tp, SRAM_IMPEDANCE, data);
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_PHY_PWR);
++ ocp_data |= PFM_PWM_SWITCH;
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_PHY_PWR, ocp_data);
++
++ data = sram_read(tp, SRAM_LPF_CFG);
++ data |= LPF_AUTO_TUNE;
++ sram_write(tp, SRAM_LPF_CFG, data);
++
++ data = sram_read(tp, SRAM_10M_AMP1);
++ data |= GDAC_IB_UPALL;
++ sram_write(tp, SRAM_10M_AMP1, data);
++ data = sram_read(tp, SRAM_10M_AMP2);
++ data |= AMP_DN;
++ sram_write(tp, SRAM_10M_AMP2, data);
++}
++
++static void r8153_u1u2en(struct r8152 *tp, int enable)
++{
++ u8 u1u2[8];
++
++ if (enable)
++ memset(u1u2, 0xff, sizeof(u1u2));
++ else
++ memset(u1u2, 0x00, sizeof(u1u2));
++
++ usb_ocp_write(tp, USB_TOLERANCE, BYTE_EN_SIX_BYTES, sizeof(u1u2), u1u2);
++}
++
++static void r8153_u2p3en(struct r8152 *tp, int enable)
++{
++ u32 ocp_data;
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_U2P3_CTRL);
++ if (enable)
++ ocp_data |= U2P3_ENABLE;
++ else
++ ocp_data &= ~U2P3_ENABLE;
++ ocp_write_word(tp, MCU_TYPE_USB, USB_U2P3_CTRL, ocp_data);
++}
++
++static void r8153_power_cut_en(struct r8152 *tp, int enable)
++{
++ u32 ocp_data;
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_POWER_CUT);
++ if (enable)
++ ocp_data |= PWR_EN | PHASE2_EN;
++ else
++ ocp_data &= ~(PWR_EN | PHASE2_EN);
++ ocp_write_word(tp, MCU_TYPE_USB, USB_POWER_CUT, ocp_data);
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_MISC_0);
++ ocp_data &= ~PCUT_STATUS;
++ ocp_write_word(tp, MCU_TYPE_USB, USB_MISC_0, ocp_data);
++}
++
++static void r8153_teredo_off(struct r8152 *tp)
++{
++ u32 ocp_data;
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_TEREDO_CFG);
++ ocp_data &= ~(TEREDO_SEL | TEREDO_RS_EVENT_MASK | OOB_TEREDO_EN);
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_TEREDO_CFG, ocp_data);
++
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_WDT6_CTRL, WDT6_SET_MODE);
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_REALWOW_TIMER, 0);
++ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_TEREDO_TIMER, 0);
++}
++
++static void r8153_first_init(struct r8152 *tp)
++{
++ u32 ocp_data;
++ int i;
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_MISC_1);
++ ocp_data |= RXDY_GATED_EN;
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_MISC_1, ocp_data);
++
++ r8153_teredo_off(tp);
++
++ ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_RCR);
++ ocp_data &= ~RCR_ACPT_ALL;
++ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, ocp_data);
++
++ r8153_hw_phy_cfg(tp);
++
++ rtl8152_nic_reset(tp);
++
++ ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
++ ocp_data &= ~NOW_IS_OOB;
++ ocp_write_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, ocp_data);
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7);
++ ocp_data &= ~MCU_BORW_EN;
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, ocp_data);
++
++ for (i = 0; i < 1000; i++) {
++ ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
++ if (ocp_data & LINK_LIST_READY)
++ break;
++ mdelay(1);
++ }
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7);
++ ocp_data |= RE_INIT_LL;
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, ocp_data);
++
++ for (i = 0; i < 1000; i++) {
++ ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
++ if (ocp_data & LINK_LIST_READY)
++ break;
++ mdelay(1);
++ }
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CPCR);
++ ocp_data &= ~CPCR_RX_VLAN;
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_CPCR, ocp_data);
++
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_RMS, RTL8152_RMS);
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_TCR0);
++ ocp_data |= TCR0_AUTO_FIFO;
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_TCR0, ocp_data);
++
++ rtl8152_nic_reset(tp);
++
++ /* rx share fifo credit full threshold */
++ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL0, RXFIFO_THR1_NORMAL);
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL1, RXFIFO_THR2_NORMAL);
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL2, RXFIFO_THR3_NORMAL);
++ /* TX share fifo free credit full threshold */
++ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_TXFIFO_CTRL, TXFIFO_THR_NORMAL2);
++
++ /* rx aggregation */
++ ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL);
++ ocp_data &= ~RX_AGG_DISABLE;
++ ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data);
++}
++
++static void r8153_enter_oob(struct r8152 *tp)
++{
++ u32 ocp_data;
++ int i;
++
++ ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
++ ocp_data &= ~NOW_IS_OOB;
++ ocp_write_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, ocp_data);
++
++ rtl8152_disable(tp);
++
++ for (i = 0; i < 1000; i++) {
++ ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
++ if (ocp_data & LINK_LIST_READY)
++ break;
++ mdelay(1);
++ }
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7);
++ ocp_data |= RE_INIT_LL;
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, ocp_data);
++
++ for (i = 0; i < 1000; i++) {
++ ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
++ if (ocp_data & LINK_LIST_READY)
++ break;
++ mdelay(1);
++ }
++
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_RMS, RTL8152_RMS);
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CFG_WOL);
++ ocp_data |= MAGIC_EN;
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_CFG_WOL, ocp_data);
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_TEREDO_CFG);
++ ocp_data &= ~TEREDO_WAKE_MASK;
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_TEREDO_CFG, ocp_data);
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CPCR);
++ ocp_data |= CPCR_RX_VLAN;
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_CPCR, ocp_data);
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PAL_BDC_CR);
++ ocp_data |= ALDPS_PROXY_MODE;
++ ocp_write_word(tp, MCU_TYPE_PLA, PAL_BDC_CR, ocp_data);
++
++ ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
++ ocp_data |= NOW_IS_OOB | DIS_MCU_CLROOB;
++ ocp_write_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, ocp_data);
++
++ ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CONFIG5, LAN_WAKE_EN);
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_MISC_1);
++ ocp_data &= ~RXDY_GATED_EN;
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_MISC_1, ocp_data);
++
++ ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_RCR);
++ ocp_data |= RCR_APM | RCR_AM | RCR_AB;
++ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, ocp_data);
++}
++
++static void r8153_disable_aldps(struct r8152 *tp)
++{
++ u16 data;
++
++ data = ocp_reg_read(tp, OCP_POWER_CFG);
++ data &= ~EN_ALDPS;
++ ocp_reg_write(tp, OCP_POWER_CFG, data);
++ msleep(20);
++}
++
++static void r8153_enable_aldps(struct r8152 *tp)
++{
++ u16 data;
++
++ data = ocp_reg_read(tp, OCP_POWER_CFG);
++ data |= EN_ALDPS;
++ ocp_reg_write(tp, OCP_POWER_CFG, data);
++}
++
++static int rtl8152_set_speed(struct r8152 *tp, u8 autoneg, u16 speed, u8 duplex)
++{
++ u16 bmcr, anar, gbcr;
++ int ret = 0;
++
++ cancel_delayed_work_sync(&tp->schedule);
++ anar = r8152_mdio_read(tp, MII_ADVERTISE);
++ anar &= ~(ADVERTISE_10HALF | ADVERTISE_10FULL |
++ ADVERTISE_100HALF | ADVERTISE_100FULL);
++ if (tp->mii.supports_gmii) {
++ gbcr = r8152_mdio_read(tp, MII_CTRL1000);
++ gbcr &= ~(ADVERTISE_1000FULL | ADVERTISE_1000HALF);
++ } else {
++ gbcr = 0;
++ }
++
++ if (autoneg == AUTONEG_DISABLE) {
++ if (speed == SPEED_10) {
++ bmcr = 0;
++ anar |= ADVERTISE_10HALF | ADVERTISE_10FULL;
++ } else if (speed == SPEED_100) {
++ bmcr = BMCR_SPEED100;
++ anar |= ADVERTISE_100HALF | ADVERTISE_100FULL;
++ } else if (speed == SPEED_1000 && tp->mii.supports_gmii) {
++ bmcr = BMCR_SPEED1000;
++ gbcr |= ADVERTISE_1000FULL | ADVERTISE_1000HALF;
++ } else {
++ ret = -EINVAL;
++ goto out;
++ }
++
++ if (duplex == DUPLEX_FULL)
++ bmcr |= BMCR_FULLDPLX;
++ } else {
++ if (speed == SPEED_10) {
++ if (duplex == DUPLEX_FULL)
++ anar |= ADVERTISE_10HALF | ADVERTISE_10FULL;
++ else
++ anar |= ADVERTISE_10HALF;
++ } else if (speed == SPEED_100) {
++ if (duplex == DUPLEX_FULL) {
++ anar |= ADVERTISE_10HALF | ADVERTISE_10FULL;
++ anar |= ADVERTISE_100HALF | ADVERTISE_100FULL;
++ } else {
++ anar |= ADVERTISE_10HALF;
++ anar |= ADVERTISE_100HALF;
++ }
++ } else if (speed == SPEED_1000 && tp->mii.supports_gmii) {
++ if (duplex == DUPLEX_FULL) {
++ anar |= ADVERTISE_10HALF | ADVERTISE_10FULL;
++ anar |= ADVERTISE_100HALF | ADVERTISE_100FULL;
++ gbcr |= ADVERTISE_1000FULL | ADVERTISE_1000HALF;
++ } else {
++ anar |= ADVERTISE_10HALF;
++ anar |= ADVERTISE_100HALF;
++ gbcr |= ADVERTISE_1000HALF;
++ }
++ } else {
++ ret = -EINVAL;
++ goto out;
++ }
++
++ bmcr = BMCR_ANENABLE | BMCR_ANRESTART;
++ }
++
++ if (tp->mii.supports_gmii)
++ r8152_mdio_write(tp, MII_CTRL1000, gbcr);
++
++ r8152_mdio_write(tp, MII_ADVERTISE, anar);
++ r8152_mdio_write(tp, MII_BMCR, bmcr);
++
++out:
++
++ return ret;
++}
++
++static void rtl8152_down(struct r8152 *tp)
++{
++ u32 ocp_data;
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_UPS_CTRL);
++ ocp_data &= ~POWER_CUT;
++ ocp_write_word(tp, MCU_TYPE_USB, USB_UPS_CTRL, ocp_data);
++
++ r8152b_disable_aldps(tp);
++ r8152b_enter_oob(tp);
++ r8152b_enable_aldps(tp);
++}
++
++static void rtl8153_down(struct r8152 *tp)
++{
++ r8153_u1u2en(tp, 0);
++ r8153_power_cut_en(tp, 0);
++ r8153_disable_aldps(tp);
++ r8153_enter_oob(tp);
++ r8153_enable_aldps(tp);
++}
++
++static void set_carrier(struct r8152 *tp)
++{
++ struct net_device *netdev = tp->netdev;
++ u8 speed;
++
++ clear_bit(RTL8152_LINK_CHG, &tp->flags);
++ speed = rtl8152_get_speed(tp);
++
++ if (speed & LINK_STATUS) {
++ if (!(tp->speed & LINK_STATUS)) {
++ tp->rtl_ops.enable(tp);
++ set_bit(RTL8152_SET_RX_MODE, &tp->flags);
++ netif_carrier_on(netdev);
++ }
++ } else {
++ if (tp->speed & LINK_STATUS) {
++ netif_carrier_off(netdev);
++ tasklet_disable(&tp->tl);
++ tp->rtl_ops.disable(tp);
++ tasklet_enable(&tp->tl);
++ }
++ }
++ tp->speed = speed;
++}
++
++static void rtl_work_func_t(struct work_struct *work)
++{
++ struct r8152 *tp = container_of(work, struct r8152, schedule.work);
++
++ if (!test_bit(WORK_ENABLE, &tp->flags))
++ goto out1;
++
++ if (test_bit(RTL8152_UNPLUG, &tp->flags))
++ goto out1;
++
++ if (test_bit(RTL8152_LINK_CHG, &tp->flags))
++ set_carrier(tp);
++
++ if (test_bit(RTL8152_SET_RX_MODE, &tp->flags))
++ _rtl8152_set_rx_mode(tp->netdev);
++
++out1:
++ return;
++}
++
++static int rtl8152_open(struct net_device *netdev)
++{
++ struct r8152 *tp = netdev_priv(netdev);
++ int res = 0;
++
++ rtl8152_set_speed(tp, AUTONEG_ENABLE,
++ tp->mii.supports_gmii ? SPEED_1000 : SPEED_100,
++ DUPLEX_FULL);
++ tp->speed = 0;
++ netif_carrier_off(netdev);
++ netif_start_queue(netdev);
++ set_bit(WORK_ENABLE, &tp->flags);
++ res = usb_submit_urb(tp->intr_urb, GFP_KERNEL);
++ if (res) {
++ if (res == -ENODEV)
++ netif_device_detach(tp->netdev);
++ netif_warn(tp, ifup, netdev, "intr_urb submit failed: %d\n",
++ res);
++ }
++
++
++ return res;
++}
++
++static int rtl8152_close(struct net_device *netdev)
++{
++ struct r8152 *tp = netdev_priv(netdev);
++ int res = 0;
++
++ clear_bit(WORK_ENABLE, &tp->flags);
++ usb_kill_urb(tp->intr_urb);
++ cancel_delayed_work_sync(&tp->schedule);
++ netif_stop_queue(netdev);
++ tasklet_disable(&tp->tl);
++ tp->rtl_ops.disable(tp);
++ tasklet_enable(&tp->tl);
++
++ return res;
++}
++
++static void rtl_clear_bp(struct r8152 *tp)
++{
++ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_BP_0, 0);
++ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_BP_2, 0);
++ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_BP_4, 0);
++ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_BP_6, 0);
++ ocp_write_dword(tp, MCU_TYPE_USB, USB_BP_0, 0);
++ ocp_write_dword(tp, MCU_TYPE_USB, USB_BP_2, 0);
++ ocp_write_dword(tp, MCU_TYPE_USB, USB_BP_4, 0);
++ ocp_write_dword(tp, MCU_TYPE_USB, USB_BP_6, 0);
++ mdelay(3);
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_BP_BA, 0);
++ ocp_write_word(tp, MCU_TYPE_USB, USB_BP_BA, 0);
++}
++
++static void r8153_clear_bp(struct r8152 *tp)
++{
++ ocp_write_byte(tp, MCU_TYPE_PLA, PLA_BP_EN, 0);
++ ocp_write_byte(tp, MCU_TYPE_USB, USB_BP_EN, 0);
++ rtl_clear_bp(tp);
++}
++
++static void r8152b_enable_eee(struct r8152 *tp)
++{
++ u32 ocp_data;
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EEE_CR);
++ ocp_data |= EEE_RX_EN | EEE_TX_EN;
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_EEE_CR, ocp_data);
++ ocp_reg_write(tp, OCP_EEE_CONFIG1, RG_TXLPI_MSK_HFDUP | RG_MATCLR_EN |
++ EEE_10_CAP | EEE_NWAY_EN |
++ TX_QUIET_EN | RX_QUIET_EN |
++ SDRISETIME | RG_RXLPI_MSK_HFDUP |
++ SDFALLTIME);
++ ocp_reg_write(tp, OCP_EEE_CONFIG2, RG_LPIHYS_NUM | RG_DACQUIET_EN |
++ RG_LDVQUIET_EN | RG_CKRSEL |
++ RG_EEEPRG_EN);
++ ocp_reg_write(tp, OCP_EEE_CONFIG3, FST_SNR_EYE_R | RG_LFS_SEL | MSK_PH);
++ ocp_reg_write(tp, OCP_EEE_AR, FUN_ADDR | DEVICE_ADDR);
++ ocp_reg_write(tp, OCP_EEE_DATA, EEE_ADDR);
++ ocp_reg_write(tp, OCP_EEE_AR, FUN_DATA | DEVICE_ADDR);
++ ocp_reg_write(tp, OCP_EEE_DATA, EEE_DATA);
++ ocp_reg_write(tp, OCP_EEE_AR, 0x0000);
++}
++
++static void r8153_enable_eee(struct r8152 *tp)
++{
++ u32 ocp_data;
++ u16 data;
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EEE_CR);
++ ocp_data |= EEE_RX_EN | EEE_TX_EN;
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_EEE_CR, ocp_data);
++ data = ocp_reg_read(tp, OCP_EEE_CFG);
++ data |= EEE10_EN;
++ ocp_reg_write(tp, OCP_EEE_CFG, data);
++ data = ocp_reg_read(tp, OCP_EEE_CFG2);
++ data |= MY1000_EEE | MY100_EEE;
++ ocp_reg_write(tp, OCP_EEE_CFG2, data);
++}
++
++static void r8152b_enable_fc(struct r8152 *tp)
++{
++ u16 anar;
++
++ anar = r8152_mdio_read(tp, MII_ADVERTISE);
++ anar |= ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM;
++ r8152_mdio_write(tp, MII_ADVERTISE, anar);
++}
++
++static void r8152b_hw_phy_cfg(struct r8152 *tp)
++{
++ r8152_mdio_write(tp, MII_BMCR, BMCR_ANENABLE);
++ r8152b_disable_aldps(tp);
++}
++
++static void r8152b_init(struct r8152 *tp)
++{
++ u32 ocp_data;
++ int i;
++
++ rtl_clear_bp(tp);
++
++ if (tp->version == RTL_VER_01) {
++ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_LED_FEATURE);
++ ocp_data &= ~LED_MODE_MASK;
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_LED_FEATURE, ocp_data);
++ }
++
++ r8152b_hw_phy_cfg(tp);
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_UPS_CTRL);
++ ocp_data &= ~POWER_CUT;
++ ocp_write_word(tp, MCU_TYPE_USB, USB_UPS_CTRL, ocp_data);
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_PM_CTRL_STATUS);
++ ocp_data &= ~RESUME_INDICATE;
++ ocp_write_word(tp, MCU_TYPE_USB, USB_PM_CTRL_STATUS, ocp_data);
++
++ r8152b_exit_oob(tp);
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_PHY_PWR);
++ ocp_data |= TX_10M_IDLE_EN | PFM_PWM_SWITCH;
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_PHY_PWR, ocp_data);
++ ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL);
++ ocp_data &= ~MCU_CLK_RATIO_MASK;
++ ocp_data |= MCU_CLK_RATIO | D3_CLK_GATED_EN;
++ ocp_write_dword(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL, ocp_data);
++ ocp_data = GPHY_STS_MSK | SPEED_DOWN_MSK |
++ SPDWN_RXDV_MSK | SPDWN_LINKCHG_MSK;
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_GPHY_INTR_IMR, ocp_data);
++
++ r8152b_enable_eee(tp);
++ r8152b_enable_aldps(tp);
++ r8152b_enable_fc(tp);
++
++ r8152_mdio_write(tp, MII_BMCR, BMCR_RESET | BMCR_ANENABLE |
++ BMCR_ANRESTART);
++ for (i = 0; i < 100; i++) {
++ udelay(100);
++ if (!(r8152_mdio_read(tp, MII_BMCR) & BMCR_RESET))
++ break;
++ }
++
++ /* enable rx aggregation */
++ ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL);
++ ocp_data &= ~RX_AGG_DISABLE;
++ ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data);
++}
++
++static void r8153_init(struct r8152 *tp)
++{
++ u32 ocp_data;
++ int i;
++
++ r8153_u1u2en(tp, 0);
++
++ for (i = 0; i < 500; i++) {
++ if (ocp_read_word(tp, MCU_TYPE_PLA, PLA_BOOT_CTRL) &
++ AUTOLOAD_DONE)
++ break;
++ msleep(20);
++ }
++
++ for (i = 0; i < 500; i++) {
++ ocp_data = ocp_reg_read(tp, OCP_PHY_STATUS) & PHY_STAT_MASK;
++ if (ocp_data == PHY_STAT_LAN_ON || ocp_data == PHY_STAT_PWRDN)
++ break;
++ msleep(20);
++ }
++
++ r8153_u2p3en(tp, 0);
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_WDT11_CTRL);
++ ocp_data &= ~TIMER11_EN;
++ ocp_write_word(tp, MCU_TYPE_USB, USB_WDT11_CTRL, ocp_data);
++
++ r8153_clear_bp(tp);
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_LED_FEATURE);
++ ocp_data &= ~LED_MODE_MASK;
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_LED_FEATURE, ocp_data);
++
++ ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_LPM_CTRL);
++ ocp_data &= ~LPM_TIMER_MASK;
++ if (tp->udev->speed == USB_SPEED_SUPER)
++ ocp_data |= LPM_TIMER_500US;
++ else
++ ocp_data |= LPM_TIMER_500MS;
++ ocp_write_byte(tp, MCU_TYPE_USB, USB_LPM_CTRL, ocp_data);
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_AFE_CTRL2);
++ ocp_data &= ~SEN_VAL_MASK;
++ ocp_data |= SEN_VAL_NORMAL | SEL_RXIDLE;
++ ocp_write_word(tp, MCU_TYPE_USB, USB_AFE_CTRL2, ocp_data);
++
++ r8153_power_cut_en(tp, 0);
++ r8153_u1u2en(tp, 1);
++
++ r8153_first_init(tp);
++
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL, ALDPS_SPDWN_RATIO);
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL2, EEE_SPDWN_RATIO);
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL3,
++ PKT_AVAIL_SPDWN_EN | SUSPEND_SPDWN_EN |
++ U1U2_SPDWN_EN | L1_SPDWN_EN);
++ ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL4,
++ PWRSAVE_SPDWN_EN | RXDV_SPDWN_EN | TX10MIDLE_EN |
++ TP100_SPDWN_EN | TP500_SPDWN_EN | TP1000_SPDWN_EN |
++ EEE_SPDWN_EN);
++
++ r8153_enable_eee(tp);
++ r8153_enable_aldps(tp);
++ r8152b_enable_fc(tp);
++
++ r8152_mdio_write(tp, MII_BMCR, BMCR_RESET | BMCR_ANENABLE |
++ BMCR_ANRESTART);
++}
++
++static int rtl8152_suspend(struct usb_interface *intf, pm_message_t message)
++{
++ struct r8152 *tp = usb_get_intfdata(intf);
++
++ netif_device_detach(tp->netdev);
++
++ if (netif_running(tp->netdev)) {
++ clear_bit(WORK_ENABLE, &tp->flags);
++ usb_kill_urb(tp->intr_urb);
++ cancel_delayed_work_sync(&tp->schedule);
++ tasklet_disable(&tp->tl);
++ }
++
++ tp->rtl_ops.down(tp);
++
++ return 0;
++}
++
++static int rtl8152_resume(struct usb_interface *intf)
++{
++ struct r8152 *tp = usb_get_intfdata(intf);
++
++ tp->rtl_ops.init(tp);
++ netif_device_attach(tp->netdev);
++ if (netif_running(tp->netdev)) {
++ rtl8152_set_speed(tp, AUTONEG_ENABLE,
++ tp->mii.supports_gmii ? SPEED_1000 : SPEED_100,
++ DUPLEX_FULL);
++ tp->speed = 0;
++ netif_carrier_off(tp->netdev);
++ set_bit(WORK_ENABLE, &tp->flags);
++ usb_submit_urb(tp->intr_urb, GFP_KERNEL);
++ tasklet_enable(&tp->tl);
++ }
++
++ return 0;
++}
++
++static void rtl8152_get_drvinfo(struct net_device *netdev,
++ struct ethtool_drvinfo *info)
++{
++ struct r8152 *tp = netdev_priv(netdev);
++
++ strncpy(info->driver, MODULENAME, ETHTOOL_BUSINFO_LEN);
++ strncpy(info->version, DRIVER_VERSION, ETHTOOL_BUSINFO_LEN);
++ usb_make_path(tp->udev, info->bus_info, sizeof(info->bus_info));
++}
++
++static
++int rtl8152_get_settings(struct net_device *netdev, struct ethtool_cmd *cmd)
++{
++ struct r8152 *tp = netdev_priv(netdev);
++
++ if (!tp->mii.mdio_read)
++ return -EOPNOTSUPP;
++
++ return mii_ethtool_gset(&tp->mii, cmd);
++}
++
++static int rtl8152_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
++{
++ struct r8152 *tp = netdev_priv(dev);
++
++ return rtl8152_set_speed(tp, cmd->autoneg, cmd->speed, cmd->duplex);
++}
++
++static struct ethtool_ops ops = {
++ .get_drvinfo = rtl8152_get_drvinfo,
++ .get_settings = rtl8152_get_settings,
++ .set_settings = rtl8152_set_settings,
++ .get_link = ethtool_op_get_link,
++};
++
++static int rtl8152_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
++{
++ struct r8152 *tp = netdev_priv(netdev);
++ struct mii_ioctl_data *data = if_mii(rq);
++ int res = 0;
++
++ switch (cmd) {
++ case SIOCGMIIPHY:
++ data->phy_id = R8152_PHY_ID; /* Internal PHY */
++ break;
++
++ case SIOCGMIIREG:
++ data->val_out = r8152_mdio_read(tp, data->reg_num);
++ break;
++
++ case SIOCSMIIREG:
++ if (!capable(CAP_NET_ADMIN)) {
++ res = -EPERM;
++ break;
++ }
++ r8152_mdio_write(tp, data->reg_num, data->val_in);
++ break;
++
++ default:
++ res = -EOPNOTSUPP;
++ }
++
++ return res;
++}
++
++static const struct net_device_ops rtl8152_netdev_ops = {
++ .ndo_open = rtl8152_open,
++ .ndo_stop = rtl8152_close,
++ .ndo_do_ioctl = rtl8152_ioctl,
++ .ndo_start_xmit = rtl8152_start_xmit,
++ .ndo_tx_timeout = rtl8152_tx_timeout,
++ .ndo_set_rx_mode = rtl8152_set_rx_mode,
++ .ndo_set_mac_address = rtl8152_set_mac_address,
++
++ .ndo_change_mtu = eth_change_mtu,
++ .ndo_validate_addr = eth_validate_addr,
++};
++
++static void r8152b_get_version(struct r8152 *tp)
++{
++ u32 ocp_data;
++ u16 version;
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_TCR1);
++ version = (u16)(ocp_data & VERSION_MASK);
++
++ switch (version) {
++ case 0x4c00:
++ tp->version = RTL_VER_01;
++ break;
++ case 0x4c10:
++ tp->version = RTL_VER_02;
++ break;
++ case 0x5c00:
++ tp->version = RTL_VER_03;
++ tp->mii.supports_gmii = 1;
++ break;
++ case 0x5c10:
++ tp->version = RTL_VER_04;
++ tp->mii.supports_gmii = 1;
++ break;
++ case 0x5c20:
++ tp->version = RTL_VER_05;
++ tp->mii.supports_gmii = 1;
++ break;
++ default:
++ netif_info(tp, probe, tp->netdev,
++ "Unknown version 0x%04x\n", version);
++ break;
++ }
++}
++
++static void rtl8152_unload(struct r8152 *tp)
++{
++ u32 ocp_data;
++
++ if (tp->version != RTL_VER_01) {
++ ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_UPS_CTRL);
++ ocp_data |= POWER_CUT;
++ ocp_write_word(tp, MCU_TYPE_USB, USB_UPS_CTRL, ocp_data);
++ }
++
++ ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_PM_CTRL_STATUS);
++ ocp_data &= ~RESUME_INDICATE;
++ ocp_write_word(tp, MCU_TYPE_USB, USB_PM_CTRL_STATUS, ocp_data);
++}
++
++static void rtl8153_unload(struct r8152 *tp)
++{
++ r8153_power_cut_en(tp, 1);
++}
++
++static int rtl_ops_init(struct r8152 *tp, const struct usb_device_id *id)
++{
++ struct rtl_ops *ops = &tp->rtl_ops;
++ int ret = -ENODEV;
++
++ switch (id->idVendor) {
++ case VENDOR_ID_REALTEK:
++ switch (id->idProduct) {
++ case PRODUCT_ID_RTL8152:
++ ops->init = r8152b_init;
++ ops->enable = rtl8152_enable;
++ ops->disable = rtl8152_disable;
++ ops->down = rtl8152_down;
++ ops->unload = rtl8152_unload;
++ ret = 0;
++ break;
++ case PRODUCT_ID_RTL8153:
++ ops->init = r8153_init;
++ ops->enable = rtl8153_enable;
++ ops->disable = rtl8152_disable;
++ ops->down = rtl8153_down;
++ ops->unload = rtl8153_unload;
++ ret = 0;
++ break;
++ default:
++ break;
++ }
++ break;
++
++ case VENDOR_ID_SAMSUNG:
++ switch (id->idProduct) {
++ case PRODUCT_ID_SAMSUNG:
++ ops->init = r8153_init;
++ ops->enable = rtl8153_enable;
++ ops->disable = rtl8152_disable;
++ ops->down = rtl8153_down;
++ ops->unload = rtl8153_unload;
++ ret = 0;
++ break;
++ default:
++ break;
++ }
++ break;
++
++ default:
++ break;
++ }
++
++ if (ret)
++ netif_err(tp, probe, tp->netdev, "Unknown Device\n");
++
++ return ret;
++}
++
++static int rtl8152_probe(struct usb_interface *intf,
++ const struct usb_device_id *id)
++{
++ struct usb_device *udev = interface_to_usbdev(intf);
++ struct r8152 *tp;
++ struct net_device *netdev;
++ int ret;
++
++ if (udev->actconfig->desc.bConfigurationValue != 1) {
++ usb_driver_set_configuration(udev, 1);
++ return -ENODEV;
++ }
++
++ usb_reset_device(udev);
++ netdev = alloc_etherdev(sizeof(struct r8152));
++ if (!netdev) {
++ dev_err(&intf->dev, "Out of memory\n");
++ return -ENOMEM;
++ }
++
++ SET_NETDEV_DEV(netdev, &intf->dev);
++ tp = netdev_priv(netdev);
++ tp->msg_enable = 0x7FFF;
++
++ tp->udev = udev;
++ tp->netdev = netdev;
++ tp->intf = intf;
++
++ ret = rtl_ops_init(tp, id);
++ if (ret)
++ goto out;
++
++ tasklet_init(&tp->tl, bottom_half, (unsigned long)tp);
++ INIT_DELAYED_WORK(&tp->schedule, rtl_work_func_t);
++
++ netdev->netdev_ops = &rtl8152_netdev_ops;
++ netdev->watchdog_timeo = RTL8152_TX_TIMEOUT;
++
++ netdev->features |= NETIF_F_IP_CSUM;
++ netdev->hw_features = NETIF_F_IP_CSUM;
++ SET_ETHTOOL_OPS(netdev, &ops);
++
++ tp->mii.dev = netdev;
++ tp->mii.mdio_read = read_mii_word;
++ tp->mii.mdio_write = write_mii_word;
++ tp->mii.phy_id_mask = 0x3f;
++ tp->mii.reg_num_mask = 0x1f;
++ tp->mii.phy_id = R8152_PHY_ID;
++ tp->mii.supports_gmii = 0;
++
++ r8152b_get_version(tp);
++ tp->rtl_ops.init(tp);
++ set_ethernet_addr(tp);
++
++ ret = alloc_all_mem(tp);
++ if (ret)
++ goto out;
++
++ usb_set_intfdata(intf, tp);
++
++ ret = register_netdev(netdev);
++ if (ret != 0) {
++ netif_err(tp, probe, netdev, "couldn't register the device\n");
++ goto out1;
++ }
++
++ netif_info(tp, probe, netdev, "%s\n", DRIVER_VERSION);
++
++ return 0;
++
++out1:
++ usb_set_intfdata(intf, NULL);
++out:
++ free_netdev(netdev);
++ return ret;
++}
++
++static void rtl8152_disconnect(struct usb_interface *intf)
++{
++ struct r8152 *tp = usb_get_intfdata(intf);
++
++ usb_set_intfdata(intf, NULL);
++ if (tp) {
++ set_bit(RTL8152_UNPLUG, &tp->flags);
++ tasklet_kill(&tp->tl);
++ unregister_netdev(tp->netdev);
++ tp->rtl_ops.unload(tp);
++ free_all_mem(tp);
++ free_netdev(tp->netdev);
++ }
++}
++
++/* table of devices that work with this driver */
++static struct usb_device_id rtl8152_table[] = {
++ {USB_DEVICE(VENDOR_ID_REALTEK, PRODUCT_ID_RTL8152)},
++ {USB_DEVICE(VENDOR_ID_REALTEK, PRODUCT_ID_RTL8153)},
++ {USB_DEVICE(VENDOR_ID_SAMSUNG, PRODUCT_ID_SAMSUNG)},
++ {}
++};
++
++MODULE_DEVICE_TABLE(usb, rtl8152_table);
++
++static struct usb_driver rtl8152_driver = {
++ .name = MODULENAME,
++ .id_table = rtl8152_table,
++ .probe = rtl8152_probe,
++ .disconnect = rtl8152_disconnect,
++ .suspend = rtl8152_suspend,
++ .resume = rtl8152_resume,
++ .reset_resume = rtl8152_resume,
++};
++
++module_usb_driver(rtl8152_driver);
++
++MODULE_AUTHOR(DRIVER_AUTHOR);
++MODULE_DESCRIPTION(DRIVER_DESC);
++MODULE_LICENSE("GPL");
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/rtl8150.c backports-4.2.6-1/drivers/net/usb/rtl8150.c
+--- backports-4.2.6-1.org/drivers/net/usb/rtl8150.c 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/rtl8150.c 2015-11-09 23:37:56.000000000 +0100
+@@ -0,0 +1,949 @@
++/*
++ * Copyright (c) 2002 Petko Manolov (petkan(a)users.sourceforge.net)
++ *
++ * 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 published by the Free Software Foundation.
++ */
++
++#include <linux/signal.h>
++#include <linux/slab.h>
++#include <linux/module.h>
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/mii.h>
++#include <linux/ethtool.h>
++#include <linux/usb.h>
++#include <asm/uaccess.h>
++
++/* Version Information */
++#define DRIVER_VERSION "v0.6.2 (2004/08/27)"
++#define DRIVER_AUTHOR "Petko Manolov <petkan(a)users.sourceforge.net>"
++#define DRIVER_DESC "rtl8150 based usb-ethernet driver"
++
++#define IDR 0x0120
++#define MAR 0x0126
++#define CR 0x012e
++#define TCR 0x012f
++#define RCR 0x0130
++#define TSR 0x0132
++#define RSR 0x0133
++#define CON0 0x0135
++#define CON1 0x0136
++#define MSR 0x0137
++#define PHYADD 0x0138
++#define PHYDAT 0x0139
++#define PHYCNT 0x013b
++#define GPPC 0x013d
++#define BMCR 0x0140
++#define BMSR 0x0142
++#define ANAR 0x0144
++#define ANLP 0x0146
++#define AER 0x0148
++#define CSCR 0x014C /* This one has the link status */
++#define CSCR_LINK_STATUS (1 << 3)
++
++#define IDR_EEPROM 0x1202
++
++#define PHY_READ 0
++#define PHY_WRITE 0x20
++#define PHY_GO 0x40
++
++#define MII_TIMEOUT 10
++#define INTBUFSIZE 8
++
++#define RTL8150_REQT_READ 0xc0
++#define RTL8150_REQT_WRITE 0x40
++#define RTL8150_REQ_GET_REGS 0x05
++#define RTL8150_REQ_SET_REGS 0x05
++
++
++/* Transmit status register errors */
++#define TSR_ECOL (1<<5)
++#define TSR_LCOL (1<<4)
++#define TSR_LOSS_CRS (1<<3)
++#define TSR_JBR (1<<2)
++#define TSR_ERRORS (TSR_ECOL | TSR_LCOL | TSR_LOSS_CRS | TSR_JBR)
++/* Receive status register errors */
++#define RSR_CRC (1<<2)
++#define RSR_FAE (1<<1)
++#define RSR_ERRORS (RSR_CRC | RSR_FAE)
++
++/* Media status register definitions */
++#define MSR_DUPLEX (1<<4)
++#define MSR_SPEED (1<<3)
++#define MSR_LINK (1<<2)
++
++/* Interrupt pipe data */
++#define INT_TSR 0x00
++#define INT_RSR 0x01
++#define INT_MSR 0x02
++#define INT_WAKSR 0x03
++#define INT_TXOK_CNT 0x04
++#define INT_RXLOST_CNT 0x05
++#define INT_CRERR_CNT 0x06
++#define INT_COL_CNT 0x07
++
++
++#define RTL8150_MTU 1540
++#define RTL8150_TX_TIMEOUT (HZ)
++#define RX_SKB_POOL_SIZE 4
++
++/* rtl8150 flags */
++#define RTL8150_HW_CRC 0
++#define RX_REG_SET 1
++#define RTL8150_UNPLUG 2
++#define RX_URB_FAIL 3
++
++/* Define these values to match your device */
++#define VENDOR_ID_REALTEK 0x0bda
++#define VENDOR_ID_MELCO 0x0411
++#define VENDOR_ID_MICRONET 0x3980
++#define VENDOR_ID_LONGSHINE 0x07b8
++#define VENDOR_ID_OQO 0x1557
++#define VENDOR_ID_ZYXEL 0x0586
++
++#define PRODUCT_ID_RTL8150 0x8150
++#define PRODUCT_ID_LUAKTX 0x0012
++#define PRODUCT_ID_LCS8138TX 0x401a
++#define PRODUCT_ID_SP128AR 0x0003
++#define PRODUCT_ID_PRESTIGE 0x401a
++
++#undef EEPROM_WRITE
++
++/* table of devices that work with this driver */
++static struct usb_device_id rtl8150_table[] = {
++ {USB_DEVICE(VENDOR_ID_REALTEK, PRODUCT_ID_RTL8150)},
++ {USB_DEVICE(VENDOR_ID_MELCO, PRODUCT_ID_LUAKTX)},
++ {USB_DEVICE(VENDOR_ID_MICRONET, PRODUCT_ID_SP128AR)},
++ {USB_DEVICE(VENDOR_ID_LONGSHINE, PRODUCT_ID_LCS8138TX)},
++ {USB_DEVICE(VENDOR_ID_OQO, PRODUCT_ID_RTL8150)},
++ {USB_DEVICE(VENDOR_ID_ZYXEL, PRODUCT_ID_PRESTIGE)},
++ {}
++};
++
++MODULE_DEVICE_TABLE(usb, rtl8150_table);
++
++struct rtl8150 {
++ unsigned long flags;
++ struct usb_device *udev;
++ struct tasklet_struct tl;
++ struct net_device *netdev;
++ struct urb *rx_urb, *tx_urb, *intr_urb;
++ struct sk_buff *tx_skb, *rx_skb;
++ struct sk_buff *rx_skb_pool[RX_SKB_POOL_SIZE];
++ spinlock_t rx_pool_lock;
++ struct usb_ctrlrequest dr;
++ int intr_interval;
++ u8 *intr_buff;
++ u8 phy;
++};
++
++typedef struct rtl8150 rtl8150_t;
++
++struct async_req {
++ struct usb_ctrlrequest dr;
++ u16 rx_creg;
++};
++
++static const char driver_name [] = "rtl8150";
++
++/*
++**
++** device related part of the code
++**
++*/
++static int get_registers(rtl8150_t * dev, u16 indx, u16 size, void *data)
++{
++ return usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev, 0),
++ RTL8150_REQ_GET_REGS, RTL8150_REQT_READ,
++ indx, 0, data, size, 500);
++}
++
++static int set_registers(rtl8150_t * dev, u16 indx, u16 size, void *data)
++{
++ return usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, 0),
++ RTL8150_REQ_SET_REGS, RTL8150_REQT_WRITE,
++ indx, 0, data, size, 500);
++}
++
++static void async_set_reg_cb(struct urb *urb)
++{
++ struct async_req *req = (struct async_req *)urb->context;
++ int status = urb->status;
++
++ if (status < 0)
++ dev_dbg(&urb->dev->dev, "%s failed with %d", __func__, status);
++ kfree(req);
++ usb_free_urb(urb);
++}
++
++static int async_set_registers(rtl8150_t *dev, u16 indx, u16 size, u16 reg)
++{
++ int res = -ENOMEM;
++ struct urb *async_urb;
++ struct async_req *req;
++
++ req = kmalloc(sizeof(struct async_req), GFP_ATOMIC);
++ if (req == NULL)
++ return res;
++ async_urb = usb_alloc_urb(0, GFP_ATOMIC);
++ if (async_urb == NULL) {
++ kfree(req);
++ return res;
++ }
++ req->rx_creg = cpu_to_le16(reg);
++ req->dr.bRequestType = RTL8150_REQT_WRITE;
++ req->dr.bRequest = RTL8150_REQ_SET_REGS;
++ req->dr.wIndex = 0;
++ req->dr.wValue = cpu_to_le16(indx);
++ req->dr.wLength = cpu_to_le16(size);
++ usb_fill_control_urb(async_urb, dev->udev,
++ usb_sndctrlpipe(dev->udev, 0), (void *)&req->dr,
++ &req->rx_creg, size, async_set_reg_cb, req);
++ res = usb_submit_urb(async_urb, GFP_ATOMIC);
++ if (res) {
++ if (res == -ENODEV)
++ netif_device_detach(dev->netdev);
++ dev_err(&dev->udev->dev, "%s failed with %d\n", __func__, res);
++ }
++ return res;
++}
++
++static int read_mii_word(rtl8150_t * dev, u8 phy, __u8 indx, u16 * reg)
++{
++ int i;
++ u8 data[3], tmp;
++
++ data[0] = phy;
++ data[1] = data[2] = 0;
++ tmp = indx | PHY_READ | PHY_GO;
++ i = 0;
++
++ set_registers(dev, PHYADD, sizeof(data), data);
++ set_registers(dev, PHYCNT, 1, &tmp);
++ do {
++ get_registers(dev, PHYCNT, 1, data);
++ } while ((data[0] & PHY_GO) && (i++ < MII_TIMEOUT));
++
++ if (i <= MII_TIMEOUT) {
++ get_registers(dev, PHYDAT, 2, data);
++ *reg = data[0] | (data[1] << 8);
++ return 0;
++ } else
++ return 1;
++}
++
++static int write_mii_word(rtl8150_t * dev, u8 phy, __u8 indx, u16 reg)
++{
++ int i;
++ u8 data[3], tmp;
++
++ data[0] = phy;
++ data[1] = reg & 0xff;
++ data[2] = (reg >> 8) & 0xff;
++ tmp = indx | PHY_WRITE | PHY_GO;
++ i = 0;
++
++ set_registers(dev, PHYADD, sizeof(data), data);
++ set_registers(dev, PHYCNT, 1, &tmp);
++ do {
++ get_registers(dev, PHYCNT, 1, data);
++ } while ((data[0] & PHY_GO) && (i++ < MII_TIMEOUT));
++
++ if (i <= MII_TIMEOUT)
++ return 0;
++ else
++ return 1;
++}
++
++static inline void set_ethernet_addr(rtl8150_t * dev)
++{
++ u8 node_id[6];
++
++ get_registers(dev, IDR, sizeof(node_id), node_id);
++ memcpy(dev->netdev->dev_addr, node_id, sizeof(node_id));
++}
++
++static int rtl8150_set_mac_address(struct net_device *netdev, void *p)
++{
++ struct sockaddr *addr = p;
++ rtl8150_t *dev = netdev_priv(netdev);
++
++ if (netif_running(netdev))
++ return -EBUSY;
++
++ memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
++ netdev_dbg(netdev, "Setting MAC address to %pM\n", netdev->dev_addr);
++ /* Set the IDR registers. */
++ set_registers(dev, IDR, netdev->addr_len, netdev->dev_addr);
++#ifdef EEPROM_WRITE
++ {
++ int i;
++ u8 cr;
++ /* Get the CR contents. */
++ get_registers(dev, CR, 1, &cr);
++ /* Set the WEPROM bit (eeprom write enable). */
++ cr |= 0x20;
++ set_registers(dev, CR, 1, &cr);
++ /* Write the MAC address into eeprom. Eeprom writes must be word-sized,
++ so we need to split them up. */
++ for (i = 0; i * 2 < netdev->addr_len; i++) {
++ set_registers(dev, IDR_EEPROM + (i * 2), 2,
++ netdev->dev_addr + (i * 2));
++ }
++ /* Clear the WEPROM bit (preventing accidental eeprom writes). */
++ cr &= 0xdf;
++ set_registers(dev, CR, 1, &cr);
++ }
++#endif
++ return 0;
++}
++
++static int rtl8150_reset(rtl8150_t * dev)
++{
++ u8 data = 0x10;
++ int i = HZ;
++
++ set_registers(dev, CR, 1, &data);
++ do {
++ get_registers(dev, CR, 1, &data);
++ } while ((data & 0x10) && --i);
++
++ return (i > 0) ? 1 : 0;
++}
++
++static int alloc_all_urbs(rtl8150_t * dev)
++{
++ dev->rx_urb = usb_alloc_urb(0, GFP_KERNEL);
++ if (!dev->rx_urb)
++ return 0;
++ dev->tx_urb = usb_alloc_urb(0, GFP_KERNEL);
++ if (!dev->tx_urb) {
++ usb_free_urb(dev->rx_urb);
++ return 0;
++ }
++ dev->intr_urb = usb_alloc_urb(0, GFP_KERNEL);
++ if (!dev->intr_urb) {
++ usb_free_urb(dev->rx_urb);
++ usb_free_urb(dev->tx_urb);
++ return 0;
++ }
++
++ return 1;
++}
++
++static void free_all_urbs(rtl8150_t * dev)
++{
++ usb_free_urb(dev->rx_urb);
++ usb_free_urb(dev->tx_urb);
++ usb_free_urb(dev->intr_urb);
++}
++
++static void unlink_all_urbs(rtl8150_t * dev)
++{
++ usb_kill_urb(dev->rx_urb);
++ usb_kill_urb(dev->tx_urb);
++ usb_kill_urb(dev->intr_urb);
++}
++
++static inline struct sk_buff *pull_skb(rtl8150_t *dev)
++{
++ struct sk_buff *skb;
++ int i;
++
++ for (i = 0; i < RX_SKB_POOL_SIZE; i++) {
++ if (dev->rx_skb_pool[i]) {
++ skb = dev->rx_skb_pool[i];
++ dev->rx_skb_pool[i] = NULL;
++ return skb;
++ }
++ }
++ return NULL;
++}
++
++static void read_bulk_callback(struct urb *urb)
++{
++ rtl8150_t *dev;
++ unsigned pkt_len, res;
++ struct sk_buff *skb;
++ struct net_device *netdev;
++ u16 rx_stat;
++ int status = urb->status;
++ int result;
++
++ dev = urb->context;
++ if (!dev)
++ return;
++ if (test_bit(RTL8150_UNPLUG, &dev->flags))
++ return;
++ netdev = dev->netdev;
++ if (!netif_device_present(netdev))
++ return;
++
++ switch (status) {
++ case 0:
++ break;
++ case -ENOENT:
++ return; /* the urb is in unlink state */
++ case -ETIME:
++ if (printk_ratelimit())
++ dev_warn(&urb->dev->dev, "may be reset is needed?..\n");
++ goto goon;
++ default:
++ if (printk_ratelimit())
++ dev_warn(&urb->dev->dev, "Rx status %d\n", status);
++ goto goon;
++ }
++
++ if (!dev->rx_skb)
++ goto resched;
++ /* protect against short packets (tell me why we got some?!?) */
++ if (urb->actual_length < 4)
++ goto goon;
++
++ res = urb->actual_length;
++ rx_stat = le16_to_cpu(*(__le16 *)(urb->transfer_buffer + res - 4));
++ pkt_len = res - 4;
++
++ skb_put(dev->rx_skb, pkt_len);
++ dev->rx_skb->protocol = eth_type_trans(dev->rx_skb, netdev);
++ netif_rx(dev->rx_skb);
++ netdev->stats.rx_packets++;
++ netdev->stats.rx_bytes += pkt_len;
++
++ spin_lock(&dev->rx_pool_lock);
++ skb = pull_skb(dev);
++ spin_unlock(&dev->rx_pool_lock);
++ if (!skb)
++ goto resched;
++
++ dev->rx_skb = skb;
++goon:
++ usb_fill_bulk_urb(dev->rx_urb, dev->udev, usb_rcvbulkpipe(dev->udev, 1),
++ dev->rx_skb->data, RTL8150_MTU, read_bulk_callback, dev);
++ result = usb_submit_urb(dev->rx_urb, GFP_ATOMIC);
++ if (result == -ENODEV)
++ netif_device_detach(dev->netdev);
++ else if (result) {
++ set_bit(RX_URB_FAIL, &dev->flags);
++ goto resched;
++ } else {
++ clear_bit(RX_URB_FAIL, &dev->flags);
++ }
++
++ return;
++resched:
++ tasklet_schedule(&dev->tl);
++}
++
++static void write_bulk_callback(struct urb *urb)
++{
++ rtl8150_t *dev;
++ int status = urb->status;
++
++ dev = urb->context;
++ if (!dev)
++ return;
++ dev_kfree_skb_irq(dev->tx_skb);
++ if (!netif_device_present(dev->netdev))
++ return;
++ if (status)
++ dev_info(&urb->dev->dev, "%s: Tx status %d\n",
++ dev->netdev->name, status);
++ dev->netdev->trans_start = jiffies;
++ netif_wake_queue(dev->netdev);
++}
++
++static void intr_callback(struct urb *urb)
++{
++ rtl8150_t *dev;
++ __u8 *d;
++ int status = urb->status;
++ int res;
++
++ dev = urb->context;
++ if (!dev)
++ return;
++ switch (status) {
++ case 0: /* success */
++ break;
++ case -ECONNRESET: /* unlink */
++ case -ENOENT:
++ case -ESHUTDOWN:
++ return;
++ /* -EPIPE: should clear the halt */
++ default:
++ dev_info(&urb->dev->dev, "%s: intr status %d\n",
++ dev->netdev->name, status);
++ goto resubmit;
++ }
++
++ d = urb->transfer_buffer;
++ if (d[0] & TSR_ERRORS) {
++ dev->netdev->stats.tx_errors++;
++ if (d[INT_TSR] & (TSR_ECOL | TSR_JBR))
++ dev->netdev->stats.tx_aborted_errors++;
++ if (d[INT_TSR] & TSR_LCOL)
++ dev->netdev->stats.tx_window_errors++;
++ if (d[INT_TSR] & TSR_LOSS_CRS)
++ dev->netdev->stats.tx_carrier_errors++;
++ }
++ /* Report link status changes to the network stack */
++ if ((d[INT_MSR] & MSR_LINK) == 0) {
++ if (netif_carrier_ok(dev->netdev)) {
++ netif_carrier_off(dev->netdev);
++ netdev_dbg(dev->netdev, "%s: LINK LOST\n", __func__);
++ }
++ } else {
++ if (!netif_carrier_ok(dev->netdev)) {
++ netif_carrier_on(dev->netdev);
++ netdev_dbg(dev->netdev, "%s: LINK CAME BACK\n", __func__);
++ }
++ }
++
++resubmit:
++ res = usb_submit_urb (urb, GFP_ATOMIC);
++ if (res == -ENODEV)
++ netif_device_detach(dev->netdev);
++ else if (res)
++ dev_err(&dev->udev->dev,
++ "can't resubmit intr, %s-%s/input0, status %d\n",
++ dev->udev->bus->bus_name, dev->udev->devpath, res);
++}
++
++static int rtl8150_suspend(struct usb_interface *intf, pm_message_t message)
++{
++ rtl8150_t *dev = usb_get_intfdata(intf);
++
++ netif_device_detach(dev->netdev);
++
++ if (netif_running(dev->netdev)) {
++ usb_kill_urb(dev->rx_urb);
++ usb_kill_urb(dev->intr_urb);
++ }
++ return 0;
++}
++
++static int rtl8150_resume(struct usb_interface *intf)
++{
++ rtl8150_t *dev = usb_get_intfdata(intf);
++
++ netif_device_attach(dev->netdev);
++ if (netif_running(dev->netdev)) {
++ dev->rx_urb->status = 0;
++ dev->rx_urb->actual_length = 0;
++ read_bulk_callback(dev->rx_urb);
++
++ dev->intr_urb->status = 0;
++ dev->intr_urb->actual_length = 0;
++ intr_callback(dev->intr_urb);
++ }
++ return 0;
++}
++
++/*
++**
++** network related part of the code
++**
++*/
++
++static void fill_skb_pool(rtl8150_t *dev)
++{
++ struct sk_buff *skb;
++ int i;
++
++ for (i = 0; i < RX_SKB_POOL_SIZE; i++) {
++ if (dev->rx_skb_pool[i])
++ continue;
++ skb = dev_alloc_skb(RTL8150_MTU + 2);
++ if (!skb) {
++ return;
++ }
++ skb_reserve(skb, 2);
++ dev->rx_skb_pool[i] = skb;
++ }
++}
++
++static void free_skb_pool(rtl8150_t *dev)
++{
++ int i;
++
++ for (i = 0; i < RX_SKB_POOL_SIZE; i++)
++ if (dev->rx_skb_pool[i])
++ dev_kfree_skb(dev->rx_skb_pool[i]);
++}
++
++static void rx_fixup(unsigned long data)
++{
++ struct rtl8150 *dev = (struct rtl8150 *)data;
++ struct sk_buff *skb;
++ int status;
++
++ spin_lock_irq(&dev->rx_pool_lock);
++ fill_skb_pool(dev);
++ spin_unlock_irq(&dev->rx_pool_lock);
++ if (test_bit(RX_URB_FAIL, &dev->flags))
++ if (dev->rx_skb)
++ goto try_again;
++ spin_lock_irq(&dev->rx_pool_lock);
++ skb = pull_skb(dev);
++ spin_unlock_irq(&dev->rx_pool_lock);
++ if (skb == NULL)
++ goto tlsched;
++ dev->rx_skb = skb;
++ usb_fill_bulk_urb(dev->rx_urb, dev->udev, usb_rcvbulkpipe(dev->udev, 1),
++ dev->rx_skb->data, RTL8150_MTU, read_bulk_callback, dev);
++try_again:
++ status = usb_submit_urb(dev->rx_urb, GFP_ATOMIC);
++ if (status == -ENODEV) {
++ netif_device_detach(dev->netdev);
++ } else if (status) {
++ set_bit(RX_URB_FAIL, &dev->flags);
++ goto tlsched;
++ } else {
++ clear_bit(RX_URB_FAIL, &dev->flags);
++ }
++
++ return;
++tlsched:
++ tasklet_schedule(&dev->tl);
++}
++
++static int enable_net_traffic(rtl8150_t * dev)
++{
++ u8 cr, tcr, rcr, msr;
++
++ if (!rtl8150_reset(dev)) {
++ dev_warn(&dev->udev->dev, "device reset failed\n");
++ }
++ /* RCR bit7=1 attach Rx info at the end; =0 HW CRC (which is broken) */
++ rcr = 0x9e;
++ tcr = 0xd8;
++ cr = 0x0c;
++ if (!(rcr & 0x80))
++ set_bit(RTL8150_HW_CRC, &dev->flags);
++ set_registers(dev, RCR, 1, &rcr);
++ set_registers(dev, TCR, 1, &tcr);
++ set_registers(dev, CR, 1, &cr);
++ get_registers(dev, MSR, 1, &msr);
++
++ return 0;
++}
++
++static void disable_net_traffic(rtl8150_t * dev)
++{
++ u8 cr;
++
++ get_registers(dev, CR, 1, &cr);
++ cr &= 0xf3;
++ set_registers(dev, CR, 1, &cr);
++}
++
++static void rtl8150_tx_timeout(struct net_device *netdev)
++{
++ rtl8150_t *dev = netdev_priv(netdev);
++ dev_warn(&netdev->dev, "Tx timeout.\n");
++ usb_unlink_urb(dev->tx_urb);
++ netdev->stats.tx_errors++;
++}
++
++static void rtl8150_set_multicast(struct net_device *netdev)
++{
++ rtl8150_t *dev = netdev_priv(netdev);
++ u16 rx_creg = 0x9e;
++
++ netif_stop_queue(netdev);
++ if (netdev->flags & IFF_PROMISC) {
++ rx_creg |= 0x0001;
++ dev_info(&netdev->dev, "%s: promiscuous mode\n", netdev->name);
++ } else if (!netdev_mc_empty(netdev) ||
++ (netdev->flags & IFF_ALLMULTI)) {
++ rx_creg &= 0xfffe;
++ rx_creg |= 0x0002;
++ dev_info(&netdev->dev, "%s: allmulti set\n", netdev->name);
++ } else {
++ /* ~RX_MULTICAST, ~RX_PROMISCUOUS */
++ rx_creg &= 0x00fc;
++ }
++ async_set_registers(dev, RCR, sizeof(rx_creg), rx_creg);
++ netif_wake_queue(netdev);
++}
++
++static netdev_tx_t rtl8150_start_xmit(struct sk_buff *skb,
++ struct net_device *netdev)
++{
++ rtl8150_t *dev = netdev_priv(netdev);
++ int count, res;
++
++ netif_stop_queue(netdev);
++ count = (skb->len < 60) ? 60 : skb->len;
++ count = (count & 0x3f) ? count : count + 1;
++ dev->tx_skb = skb;
++ usb_fill_bulk_urb(dev->tx_urb, dev->udev, usb_sndbulkpipe(dev->udev, 2),
++ skb->data, count, write_bulk_callback, dev);
++ if ((res = usb_submit_urb(dev->tx_urb, GFP_ATOMIC))) {
++ /* Can we get/handle EPIPE here? */
++ if (res == -ENODEV)
++ netif_device_detach(dev->netdev);
++ else {
++ dev_warn(&netdev->dev, "failed tx_urb %d\n", res);
++ netdev->stats.tx_errors++;
++ netif_start_queue(netdev);
++ }
++ } else {
++ netdev->stats.tx_packets++;
++ netdev->stats.tx_bytes += skb->len;
++ netdev->trans_start = jiffies;
++ }
++
++ return NETDEV_TX_OK;
++}
++
++
++static void set_carrier(struct net_device *netdev)
++{
++ rtl8150_t *dev = netdev_priv(netdev);
++ short tmp;
++
++ get_registers(dev, CSCR, 2, &tmp);
++ if (tmp & CSCR_LINK_STATUS)
++ netif_carrier_on(netdev);
++ else
++ netif_carrier_off(netdev);
++}
++
++static int rtl8150_open(struct net_device *netdev)
++{
++ rtl8150_t *dev = netdev_priv(netdev);
++ int res;
++
++ if (dev->rx_skb == NULL)
++ dev->rx_skb = pull_skb(dev);
++ if (!dev->rx_skb)
++ return -ENOMEM;
++
++ set_registers(dev, IDR, 6, netdev->dev_addr);
++
++ usb_fill_bulk_urb(dev->rx_urb, dev->udev, usb_rcvbulkpipe(dev->udev, 1),
++ dev->rx_skb->data, RTL8150_MTU, read_bulk_callback, dev);
++ if ((res = usb_submit_urb(dev->rx_urb, GFP_KERNEL))) {
++ if (res == -ENODEV)
++ netif_device_detach(dev->netdev);
++ dev_warn(&netdev->dev, "rx_urb submit failed: %d\n", res);
++ return res;
++ }
++ usb_fill_int_urb(dev->intr_urb, dev->udev, usb_rcvintpipe(dev->udev, 3),
++ dev->intr_buff, INTBUFSIZE, intr_callback,
++ dev, dev->intr_interval);
++ if ((res = usb_submit_urb(dev->intr_urb, GFP_KERNEL))) {
++ if (res == -ENODEV)
++ netif_device_detach(dev->netdev);
++ dev_warn(&netdev->dev, "intr_urb submit failed: %d\n", res);
++ usb_kill_urb(dev->rx_urb);
++ return res;
++ }
++ enable_net_traffic(dev);
++ set_carrier(netdev);
++ netif_start_queue(netdev);
++
++ return res;
++}
++
++static int rtl8150_close(struct net_device *netdev)
++{
++ rtl8150_t *dev = netdev_priv(netdev);
++
++ netif_stop_queue(netdev);
++ if (!test_bit(RTL8150_UNPLUG, &dev->flags))
++ disable_net_traffic(dev);
++ unlink_all_urbs(dev);
++
++ return 0;
++}
++
++static void rtl8150_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *info)
++{
++ rtl8150_t *dev = netdev_priv(netdev);
++
++ strlcpy(info->driver, driver_name, sizeof(info->driver));
++ strlcpy(info->version, DRIVER_VERSION, sizeof(info->version));
++ usb_make_path(dev->udev, info->bus_info, sizeof(info->bus_info));
++}
++
++static int rtl8150_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
++{
++ rtl8150_t *dev = netdev_priv(netdev);
++ short lpa, bmcr;
++
++ ecmd->supported = (SUPPORTED_10baseT_Half |
++ SUPPORTED_10baseT_Full |
++ SUPPORTED_100baseT_Half |
++ SUPPORTED_100baseT_Full |
++ SUPPORTED_Autoneg |
++ SUPPORTED_TP | SUPPORTED_MII);
++ ecmd->port = PORT_TP;
++ ecmd->transceiver = XCVR_INTERNAL;
++ ecmd->phy_address = dev->phy;
++ get_registers(dev, BMCR, 2, &bmcr);
++ get_registers(dev, ANLP, 2, &lpa);
++ if (bmcr & BMCR_ANENABLE) {
++ u32 speed = ((lpa & (LPA_100HALF | LPA_100FULL)) ?
++ SPEED_100 : SPEED_10);
++ ethtool_cmd_speed_set(ecmd, speed);
++ ecmd->autoneg = AUTONEG_ENABLE;
++ if (speed == SPEED_100)
++ ecmd->duplex = (lpa & LPA_100FULL) ?
++ DUPLEX_FULL : DUPLEX_HALF;
++ else
++ ecmd->duplex = (lpa & LPA_10FULL) ?
++ DUPLEX_FULL : DUPLEX_HALF;
++ } else {
++ ecmd->autoneg = AUTONEG_DISABLE;
++ ethtool_cmd_speed_set(ecmd, ((bmcr & BMCR_SPEED100) ?
++ SPEED_100 : SPEED_10));
++ ecmd->duplex = (bmcr & BMCR_FULLDPLX) ?
++ DUPLEX_FULL : DUPLEX_HALF;
++ }
++ return 0;
++}
++
++static const struct ethtool_ops ops = {
++ .get_drvinfo = rtl8150_get_drvinfo,
++ .get_settings = rtl8150_get_settings,
++ .get_link = ethtool_op_get_link
++};
++
++static int rtl8150_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
++{
++ rtl8150_t *dev = netdev_priv(netdev);
++ u16 *data = (u16 *) & rq->ifr_ifru;
++ int res = 0;
++
++ switch (cmd) {
++ case SIOCDEVPRIVATE:
++ data[0] = dev->phy;
++ case SIOCDEVPRIVATE + 1:
++ read_mii_word(dev, dev->phy, (data[1] & 0x1f), &data[3]);
++ break;
++ case SIOCDEVPRIVATE + 2:
++ if (!capable(CAP_NET_ADMIN))
++ return -EPERM;
++ write_mii_word(dev, dev->phy, (data[1] & 0x1f), data[2]);
++ break;
++ default:
++ res = -EOPNOTSUPP;
++ }
++
++ return res;
++}
++
++static const struct net_device_ops rtl8150_netdev_ops = {
++ .ndo_open = rtl8150_open,
++ .ndo_stop = rtl8150_close,
++ .ndo_do_ioctl = rtl8150_ioctl,
++ .ndo_start_xmit = rtl8150_start_xmit,
++ .ndo_tx_timeout = rtl8150_tx_timeout,
++ .ndo_set_rx_mode = rtl8150_set_multicast,
++ .ndo_set_mac_address = rtl8150_set_mac_address,
++
++ .ndo_change_mtu = eth_change_mtu,
++ .ndo_validate_addr = eth_validate_addr,
++};
++
++static int rtl8150_probe(struct usb_interface *intf,
++ const struct usb_device_id *id)
++{
++ struct usb_device *udev = interface_to_usbdev(intf);
++ rtl8150_t *dev;
++ struct net_device *netdev;
++
++ netdev = alloc_etherdev(sizeof(rtl8150_t));
++ if (!netdev)
++ return -ENOMEM;
++
++ dev = netdev_priv(netdev);
++
++ dev->intr_buff = kmalloc(INTBUFSIZE, GFP_KERNEL);
++ if (!dev->intr_buff) {
++ free_netdev(netdev);
++ return -ENOMEM;
++ }
++
++ tasklet_init(&dev->tl, rx_fixup, (unsigned long)dev);
++ spin_lock_init(&dev->rx_pool_lock);
++
++ dev->udev = udev;
++ dev->netdev = netdev;
++ netdev->netdev_ops = &rtl8150_netdev_ops;
++ netdev->watchdog_timeo = RTL8150_TX_TIMEOUT;
++ netdev->ethtool_ops = &ops;
++ dev->intr_interval = 100; /* 100ms */
++
++ if (!alloc_all_urbs(dev)) {
++ dev_err(&intf->dev, "out of memory\n");
++ goto out;
++ }
++ if (!rtl8150_reset(dev)) {
++ dev_err(&intf->dev, "couldn't reset the device\n");
++ goto out1;
++ }
++ fill_skb_pool(dev);
++ set_ethernet_addr(dev);
++
++ usb_set_intfdata(intf, dev);
++ SET_NETDEV_DEV(netdev, &intf->dev);
++ if (register_netdev(netdev) != 0) {
++ dev_err(&intf->dev, "couldn't register the device\n");
++ goto out2;
++ }
++
++ dev_info(&intf->dev, "%s: rtl8150 is detected\n", netdev->name);
++
++ return 0;
++
++out2:
++ usb_set_intfdata(intf, NULL);
++ free_skb_pool(dev);
++out1:
++ free_all_urbs(dev);
++out:
++ kfree(dev->intr_buff);
++ free_netdev(netdev);
++ return -EIO;
++}
++
++static void rtl8150_disconnect(struct usb_interface *intf)
++{
++ rtl8150_t *dev = usb_get_intfdata(intf);
++
++ usb_set_intfdata(intf, NULL);
++ if (dev) {
++ set_bit(RTL8150_UNPLUG, &dev->flags);
++ tasklet_kill(&dev->tl);
++ unregister_netdev(dev->netdev);
++ unlink_all_urbs(dev);
++ free_all_urbs(dev);
++ free_skb_pool(dev);
++ if (dev->rx_skb)
++ dev_kfree_skb(dev->rx_skb);
++ kfree(dev->intr_buff);
++ free_netdev(dev->netdev);
++ }
++}
++
++static struct usb_driver rtl8150_driver = {
++ .name = driver_name,
++ .probe = rtl8150_probe,
++ .disconnect = rtl8150_disconnect,
++ .id_table = rtl8150_table,
++ .suspend = rtl8150_suspend,
++ .resume = rtl8150_resume,
++ .disable_hub_initiated_lpm = 1,
++};
++
++module_usb_driver(rtl8150_driver);
++
++MODULE_AUTHOR(DRIVER_AUTHOR);
++MODULE_DESCRIPTION(DRIVER_DESC);
++MODULE_LICENSE("GPL");
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/smsc75xx.c backports-4.2.6-1/drivers/net/usb/smsc75xx.c
+--- backports-4.2.6-1.org/drivers/net/usb/smsc75xx.c 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/smsc75xx.c 2015-11-09 23:37:56.000000000 +0100
+@@ -0,0 +1,2286 @@
++ /***************************************************************************
++ *
++ * Copyright (C) 2007-2010 SMSC
++ *
++ * 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, see <http://www.gnu.org/licenses/>.
++ *
++ *****************************************************************************/
++
++#include <linux/module.h>
++#include <linux/kmod.h>
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/ethtool.h>
++#include <linux/mii.h>
++#include <linux/usb.h>
++#include <linux/bitrev.h>
++#include <linux/crc16.h>
++#include <linux/crc32.h>
++#include <linux/usb/usbnet.h>
++#include <linux/slab.h>
++#include "smsc75xx.h"
++
++#define SMSC_CHIPNAME "smsc75xx"
++#define SMSC_DRIVER_VERSION "1.0.0"
++#define HS_USB_PKT_SIZE (512)
++#define FS_USB_PKT_SIZE (64)
++#define DEFAULT_HS_BURST_CAP_SIZE (16 * 1024 + 5 * HS_USB_PKT_SIZE)
++#define DEFAULT_FS_BURST_CAP_SIZE (6 * 1024 + 33 * FS_USB_PKT_SIZE)
++#define DEFAULT_BULK_IN_DELAY (0x00002000)
++#define MAX_SINGLE_PACKET_SIZE (9000)
++#define LAN75XX_EEPROM_MAGIC (0x7500)
++#define EEPROM_MAC_OFFSET (0x01)
++#define DEFAULT_TX_CSUM_ENABLE (true)
++#define DEFAULT_RX_CSUM_ENABLE (true)
++#define SMSC75XX_INTERNAL_PHY_ID (1)
++#define SMSC75XX_TX_OVERHEAD (8)
++#define MAX_RX_FIFO_SIZE (20 * 1024)
++#define MAX_TX_FIFO_SIZE (12 * 1024)
++#define USB_VENDOR_ID_SMSC (0x0424)
++#define USB_PRODUCT_ID_LAN7500 (0x7500)
++#define USB_PRODUCT_ID_LAN7505 (0x7505)
++#define RXW_PADDING 2
++#define SUPPORTED_WAKE (WAKE_PHY | WAKE_UCAST | WAKE_BCAST | \
++ WAKE_MCAST | WAKE_ARP | WAKE_MAGIC)
++
++#define SUSPEND_SUSPEND0 (0x01)
++#define SUSPEND_SUSPEND1 (0x02)
++#define SUSPEND_SUSPEND2 (0x04)
++#define SUSPEND_SUSPEND3 (0x08)
++#define SUSPEND_ALLMODES (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \
++ SUSPEND_SUSPEND2 | SUSPEND_SUSPEND3)
++
++struct smsc75xx_priv {
++ struct usbnet *dev;
++ u32 rfe_ctl;
++ u32 wolopts;
++ u32 multicast_hash_table[DP_SEL_VHF_HASH_LEN];
++ struct mutex dataport_mutex;
++ spinlock_t rfe_ctl_lock;
++ struct work_struct set_multicast;
++ u8 suspend_flags;
++};
++
++struct usb_context {
++ struct usb_ctrlrequest req;
++ struct usbnet *dev;
++};
++
++static bool turbo_mode = true;
++module_param(turbo_mode, bool, 0644);
++MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction");
++
++static int __must_check __smsc75xx_read_reg(struct usbnet *dev, u32 index,
++ u32 *data, int in_pm)
++{
++ u32 buf;
++ int ret;
++ int (*fn)(struct usbnet *, u8, u8, u16, u16, void *, u16);
++
++ BUG_ON(!dev);
++
++ if (!in_pm)
++ fn = usbnet_read_cmd;
++ else
++ fn = usbnet_read_cmd_nopm;
++
++ ret = fn(dev, USB_VENDOR_REQUEST_READ_REGISTER, USB_DIR_IN
++ | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
++ 0, index, &buf, 4);
++ if (unlikely(ret < 0))
++ netdev_warn(dev->net, "Failed to read reg index 0x%08x: %d\n",
++ index, ret);
++
++ le32_to_cpus(&buf);
++ *data = buf;
++
++ return ret;
++}
++
++static int __must_check __smsc75xx_write_reg(struct usbnet *dev, u32 index,
++ u32 data, int in_pm)
++{
++ u32 buf;
++ int ret;
++ int (*fn)(struct usbnet *, u8, u8, u16, u16, const void *, u16);
++
++ BUG_ON(!dev);
++
++ if (!in_pm)
++ fn = usbnet_write_cmd;
++ else
++ fn = usbnet_write_cmd_nopm;
++
++ buf = data;
++ cpu_to_le32s(&buf);
++
++ ret = fn(dev, USB_VENDOR_REQUEST_WRITE_REGISTER, USB_DIR_OUT
++ | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
++ 0, index, &buf, 4);
++ if (unlikely(ret < 0))
++ netdev_warn(dev->net, "Failed to write reg index 0x%08x: %d\n",
++ index, ret);
++
++ return ret;
++}
++
++static int __must_check smsc75xx_read_reg_nopm(struct usbnet *dev, u32 index,
++ u32 *data)
++{
++ return __smsc75xx_read_reg(dev, index, data, 1);
++}
++
++static int __must_check smsc75xx_write_reg_nopm(struct usbnet *dev, u32 index,
++ u32 data)
++{
++ return __smsc75xx_write_reg(dev, index, data, 1);
++}
++
++static int __must_check smsc75xx_read_reg(struct usbnet *dev, u32 index,
++ u32 *data)
++{
++ return __smsc75xx_read_reg(dev, index, data, 0);
++}
++
++static int __must_check smsc75xx_write_reg(struct usbnet *dev, u32 index,
++ u32 data)
++{
++ return __smsc75xx_write_reg(dev, index, data, 0);
++}
++
++/* Loop until the read is completed with timeout
++ * called with phy_mutex held */
++static __must_check int __smsc75xx_phy_wait_not_busy(struct usbnet *dev,
++ int in_pm)
++{
++ unsigned long start_time = jiffies;
++ u32 val;
++ int ret;
++
++ do {
++ ret = __smsc75xx_read_reg(dev, MII_ACCESS, &val, in_pm);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error reading MII_ACCESS\n");
++ return ret;
++ }
++
++ if (!(val & MII_ACCESS_BUSY))
++ return 0;
++ } while (!time_after(jiffies, start_time + HZ));
++
++ return -EIO;
++}
++
++static int __smsc75xx_mdio_read(struct net_device *netdev, int phy_id, int idx,
++ int in_pm)
++{
++ struct usbnet *dev = netdev_priv(netdev);
++ u32 val, addr;
++ int ret;
++
++ mutex_lock(&dev->phy_mutex);
++
++ /* confirm MII not busy */
++ ret = __smsc75xx_phy_wait_not_busy(dev, in_pm);
++ if (ret < 0) {
++ netdev_warn(dev->net, "MII is busy in smsc75xx_mdio_read\n");
++ goto done;
++ }
++
++ /* set the address, index & direction (read from PHY) */
++ phy_id &= dev->mii.phy_id_mask;
++ idx &= dev->mii.reg_num_mask;
++ addr = ((phy_id << MII_ACCESS_PHY_ADDR_SHIFT) & MII_ACCESS_PHY_ADDR)
++ | ((idx << MII_ACCESS_REG_ADDR_SHIFT) & MII_ACCESS_REG_ADDR)
++ | MII_ACCESS_READ | MII_ACCESS_BUSY;
++ ret = __smsc75xx_write_reg(dev, MII_ACCESS, addr, in_pm);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing MII_ACCESS\n");
++ goto done;
++ }
++
++ ret = __smsc75xx_phy_wait_not_busy(dev, in_pm);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Timed out reading MII reg %02X\n", idx);
++ goto done;
++ }
++
++ ret = __smsc75xx_read_reg(dev, MII_DATA, &val, in_pm);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error reading MII_DATA\n");
++ goto done;
++ }
++
++ ret = (u16)(val & 0xFFFF);
++
++done:
++ mutex_unlock(&dev->phy_mutex);
++ return ret;
++}
++
++static void __smsc75xx_mdio_write(struct net_device *netdev, int phy_id,
++ int idx, int regval, int in_pm)
++{
++ struct usbnet *dev = netdev_priv(netdev);
++ u32 val, addr;
++ int ret;
++
++ mutex_lock(&dev->phy_mutex);
++
++ /* confirm MII not busy */
++ ret = __smsc75xx_phy_wait_not_busy(dev, in_pm);
++ if (ret < 0) {
++ netdev_warn(dev->net, "MII is busy in smsc75xx_mdio_write\n");
++ goto done;
++ }
++
++ val = regval;
++ ret = __smsc75xx_write_reg(dev, MII_DATA, val, in_pm);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing MII_DATA\n");
++ goto done;
++ }
++
++ /* set the address, index & direction (write to PHY) */
++ phy_id &= dev->mii.phy_id_mask;
++ idx &= dev->mii.reg_num_mask;
++ addr = ((phy_id << MII_ACCESS_PHY_ADDR_SHIFT) & MII_ACCESS_PHY_ADDR)
++ | ((idx << MII_ACCESS_REG_ADDR_SHIFT) & MII_ACCESS_REG_ADDR)
++ | MII_ACCESS_WRITE | MII_ACCESS_BUSY;
++ ret = __smsc75xx_write_reg(dev, MII_ACCESS, addr, in_pm);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing MII_ACCESS\n");
++ goto done;
++ }
++
++ ret = __smsc75xx_phy_wait_not_busy(dev, in_pm);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Timed out writing MII reg %02X\n", idx);
++ goto done;
++ }
++
++done:
++ mutex_unlock(&dev->phy_mutex);
++}
++
++static int smsc75xx_mdio_read_nopm(struct net_device *netdev, int phy_id,
++ int idx)
++{
++ return __smsc75xx_mdio_read(netdev, phy_id, idx, 1);
++}
++
++static void smsc75xx_mdio_write_nopm(struct net_device *netdev, int phy_id,
++ int idx, int regval)
++{
++ __smsc75xx_mdio_write(netdev, phy_id, idx, regval, 1);
++}
++
++static int smsc75xx_mdio_read(struct net_device *netdev, int phy_id, int idx)
++{
++ return __smsc75xx_mdio_read(netdev, phy_id, idx, 0);
++}
++
++static void smsc75xx_mdio_write(struct net_device *netdev, int phy_id, int idx,
++ int regval)
++{
++ __smsc75xx_mdio_write(netdev, phy_id, idx, regval, 0);
++}
++
++static int smsc75xx_wait_eeprom(struct usbnet *dev)
++{
++ unsigned long start_time = jiffies;
++ u32 val;
++ int ret;
++
++ do {
++ ret = smsc75xx_read_reg(dev, E2P_CMD, &val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error reading E2P_CMD\n");
++ return ret;
++ }
++
++ if (!(val & E2P_CMD_BUSY) || (val & E2P_CMD_TIMEOUT))
++ break;
++ udelay(40);
++ } while (!time_after(jiffies, start_time + HZ));
++
++ if (val & (E2P_CMD_TIMEOUT | E2P_CMD_BUSY)) {
++ netdev_warn(dev->net, "EEPROM read operation timeout\n");
++ return -EIO;
++ }
++
++ return 0;
++}
++
++static int smsc75xx_eeprom_confirm_not_busy(struct usbnet *dev)
++{
++ unsigned long start_time = jiffies;
++ u32 val;
++ int ret;
++
++ do {
++ ret = smsc75xx_read_reg(dev, E2P_CMD, &val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error reading E2P_CMD\n");
++ return ret;
++ }
++
++ if (!(val & E2P_CMD_BUSY))
++ return 0;
++
++ udelay(40);
++ } while (!time_after(jiffies, start_time + HZ));
++
++ netdev_warn(dev->net, "EEPROM is busy\n");
++ return -EIO;
++}
++
++static int smsc75xx_read_eeprom(struct usbnet *dev, u32 offset, u32 length,
++ u8 *data)
++{
++ u32 val;
++ int i, ret;
++
++ BUG_ON(!dev);
++ BUG_ON(!data);
++
++ ret = smsc75xx_eeprom_confirm_not_busy(dev);
++ if (ret)
++ return ret;
++
++ for (i = 0; i < length; i++) {
++ val = E2P_CMD_BUSY | E2P_CMD_READ | (offset & E2P_CMD_ADDR);
++ ret = smsc75xx_write_reg(dev, E2P_CMD, val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing E2P_CMD\n");
++ return ret;
++ }
++
++ ret = smsc75xx_wait_eeprom(dev);
++ if (ret < 0)
++ return ret;
++
++ ret = smsc75xx_read_reg(dev, E2P_DATA, &val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error reading E2P_DATA\n");
++ return ret;
++ }
++
++ data[i] = val & 0xFF;
++ offset++;
++ }
++
++ return 0;
++}
++
++static int smsc75xx_write_eeprom(struct usbnet *dev, u32 offset, u32 length,
++ u8 *data)
++{
++ u32 val;
++ int i, ret;
++
++ BUG_ON(!dev);
++ BUG_ON(!data);
++
++ ret = smsc75xx_eeprom_confirm_not_busy(dev);
++ if (ret)
++ return ret;
++
++ /* Issue write/erase enable command */
++ val = E2P_CMD_BUSY | E2P_CMD_EWEN;
++ ret = smsc75xx_write_reg(dev, E2P_CMD, val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing E2P_CMD\n");
++ return ret;
++ }
++
++ ret = smsc75xx_wait_eeprom(dev);
++ if (ret < 0)
++ return ret;
++
++ for (i = 0; i < length; i++) {
++
++ /* Fill data register */
++ val = data[i];
++ ret = smsc75xx_write_reg(dev, E2P_DATA, val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing E2P_DATA\n");
++ return ret;
++ }
++
++ /* Send "write" command */
++ val = E2P_CMD_BUSY | E2P_CMD_WRITE | (offset & E2P_CMD_ADDR);
++ ret = smsc75xx_write_reg(dev, E2P_CMD, val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing E2P_CMD\n");
++ return ret;
++ }
++
++ ret = smsc75xx_wait_eeprom(dev);
++ if (ret < 0)
++ return ret;
++
++ offset++;
++ }
++
++ return 0;
++}
++
++static int smsc75xx_dataport_wait_not_busy(struct usbnet *dev)
++{
++ int i, ret;
++
++ for (i = 0; i < 100; i++) {
++ u32 dp_sel;
++ ret = smsc75xx_read_reg(dev, DP_SEL, &dp_sel);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error reading DP_SEL\n");
++ return ret;
++ }
++
++ if (dp_sel & DP_SEL_DPRDY)
++ return 0;
++
++ udelay(40);
++ }
++
++ netdev_warn(dev->net, "smsc75xx_dataport_wait_not_busy timed out\n");
++
++ return -EIO;
++}
++
++static int smsc75xx_dataport_write(struct usbnet *dev, u32 ram_select, u32 addr,
++ u32 length, u32 *buf)
++{
++ struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
++ u32 dp_sel;
++ int i, ret;
++
++ mutex_lock(&pdata->dataport_mutex);
++
++ ret = smsc75xx_dataport_wait_not_busy(dev);
++ if (ret < 0) {
++ netdev_warn(dev->net, "smsc75xx_dataport_write busy on entry\n");
++ goto done;
++ }
++
++ ret = smsc75xx_read_reg(dev, DP_SEL, &dp_sel);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error reading DP_SEL\n");
++ goto done;
++ }
++
++ dp_sel &= ~DP_SEL_RSEL;
++ dp_sel |= ram_select;
++ ret = smsc75xx_write_reg(dev, DP_SEL, dp_sel);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing DP_SEL\n");
++ goto done;
++ }
++
++ for (i = 0; i < length; i++) {
++ ret = smsc75xx_write_reg(dev, DP_ADDR, addr + i);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing DP_ADDR\n");
++ goto done;
++ }
++
++ ret = smsc75xx_write_reg(dev, DP_DATA, buf[i]);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing DP_DATA\n");
++ goto done;
++ }
++
++ ret = smsc75xx_write_reg(dev, DP_CMD, DP_CMD_WRITE);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing DP_CMD\n");
++ goto done;
++ }
++
++ ret = smsc75xx_dataport_wait_not_busy(dev);
++ if (ret < 0) {
++ netdev_warn(dev->net, "smsc75xx_dataport_write timeout\n");
++ goto done;
++ }
++ }
++
++done:
++ mutex_unlock(&pdata->dataport_mutex);
++ return ret;
++}
++
++/* returns hash bit number for given MAC address */
++static u32 smsc75xx_hash(char addr[ETH_ALEN])
++{
++ return (ether_crc(ETH_ALEN, addr) >> 23) & 0x1ff;
++}
++
++static void smsc75xx_deferred_multicast_write(struct work_struct *param)
++{
++ struct smsc75xx_priv *pdata =
++ container_of(param, struct smsc75xx_priv, set_multicast);
++ struct usbnet *dev = pdata->dev;
++ int ret;
++
++ netif_dbg(dev, drv, dev->net, "deferred multicast write 0x%08x\n",
++ pdata->rfe_ctl);
++
++ smsc75xx_dataport_write(dev, DP_SEL_VHF, DP_SEL_VHF_VLAN_LEN,
++ DP_SEL_VHF_HASH_LEN, pdata->multicast_hash_table);
++
++ ret = smsc75xx_write_reg(dev, RFE_CTL, pdata->rfe_ctl);
++ if (ret < 0)
++ netdev_warn(dev->net, "Error writing RFE_CRL\n");
++}
++
++static void smsc75xx_set_multicast(struct net_device *netdev)
++{
++ struct usbnet *dev = netdev_priv(netdev);
++ struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
++ unsigned long flags;
++ int i;
++
++ spin_lock_irqsave(&pdata->rfe_ctl_lock, flags);
++
++ pdata->rfe_ctl &=
++ ~(RFE_CTL_AU | RFE_CTL_AM | RFE_CTL_DPF | RFE_CTL_MHF);
++ pdata->rfe_ctl |= RFE_CTL_AB;
++
++ for (i = 0; i < DP_SEL_VHF_HASH_LEN; i++)
++ pdata->multicast_hash_table[i] = 0;
++
++ if (dev->net->flags & IFF_PROMISC) {
++ netif_dbg(dev, drv, dev->net, "promiscuous mode enabled\n");
++ pdata->rfe_ctl |= RFE_CTL_AM | RFE_CTL_AU;
++ } else if (dev->net->flags & IFF_ALLMULTI) {
++ netif_dbg(dev, drv, dev->net, "receive all multicast enabled\n");
++ pdata->rfe_ctl |= RFE_CTL_AM | RFE_CTL_DPF;
++ } else if (!netdev_mc_empty(dev->net)) {
++ struct netdev_hw_addr *ha;
++
++ netif_dbg(dev, drv, dev->net, "receive multicast hash filter\n");
++
++ pdata->rfe_ctl |= RFE_CTL_MHF | RFE_CTL_DPF;
++
++ netdev_for_each_mc_addr(ha, netdev) {
++ u32 bitnum = smsc75xx_hash(ha->addr);
++ pdata->multicast_hash_table[bitnum / 32] |=
++ (1 << (bitnum % 32));
++ }
++ } else {
++ netif_dbg(dev, drv, dev->net, "receive own packets only\n");
++ pdata->rfe_ctl |= RFE_CTL_DPF;
++ }
++
++ spin_unlock_irqrestore(&pdata->rfe_ctl_lock, flags);
++
++ /* defer register writes to a sleepable context */
++ schedule_work(&pdata->set_multicast);
++}
++
++static int smsc75xx_update_flowcontrol(struct usbnet *dev, u8 duplex,
++ u16 lcladv, u16 rmtadv)
++{
++ u32 flow = 0, fct_flow = 0;
++ int ret;
++
++ if (duplex == DUPLEX_FULL) {
++ u8 cap = mii_resolve_flowctrl_fdx(lcladv, rmtadv);
++
++ if (cap & FLOW_CTRL_TX) {
++ flow = (FLOW_TX_FCEN | 0xFFFF);
++ /* set fct_flow thresholds to 20% and 80% */
++ fct_flow = (8 << 8) | 32;
++ }
++
++ if (cap & FLOW_CTRL_RX)
++ flow |= FLOW_RX_FCEN;
++
++ netif_dbg(dev, link, dev->net, "rx pause %s, tx pause %s\n",
++ (cap & FLOW_CTRL_RX ? "enabled" : "disabled"),
++ (cap & FLOW_CTRL_TX ? "enabled" : "disabled"));
++ } else {
++ netif_dbg(dev, link, dev->net, "half duplex\n");
++ }
++
++ ret = smsc75xx_write_reg(dev, FLOW, flow);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing FLOW\n");
++ return ret;
++ }
++
++ ret = smsc75xx_write_reg(dev, FCT_FLOW, fct_flow);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing FCT_FLOW\n");
++ return ret;
++ }
++
++ return 0;
++}
++
++static int smsc75xx_link_reset(struct usbnet *dev)
++{
++ struct mii_if_info *mii = &dev->mii;
++ struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET };
++ u16 lcladv, rmtadv;
++ int ret;
++
++ /* write to clear phy interrupt status */
++ smsc75xx_mdio_write(dev->net, mii->phy_id, PHY_INT_SRC,
++ PHY_INT_SRC_CLEAR_ALL);
++
++ ret = smsc75xx_write_reg(dev, INT_STS, INT_STS_CLEAR_ALL);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing INT_STS\n");
++ return ret;
++ }
++
++ mii_check_media(mii, 1, 1);
++ mii_ethtool_gset(&dev->mii, &ecmd);
++ lcladv = smsc75xx_mdio_read(dev->net, mii->phy_id, MII_ADVERTISE);
++ rmtadv = smsc75xx_mdio_read(dev->net, mii->phy_id, MII_LPA);
++
++ netif_dbg(dev, link, dev->net, "speed: %u duplex: %d lcladv: %04x rmtadv: %04x\n",
++ ethtool_cmd_speed(&ecmd), ecmd.duplex, lcladv, rmtadv);
++
++ return smsc75xx_update_flowcontrol(dev, ecmd.duplex, lcladv, rmtadv);
++}
++
++static void smsc75xx_status(struct usbnet *dev, struct urb *urb)
++{
++ u32 intdata;
++
++ if (urb->actual_length != 4) {
++ netdev_warn(dev->net, "unexpected urb length %d\n",
++ urb->actual_length);
++ return;
++ }
++
++ memcpy(&intdata, urb->transfer_buffer, 4);
++ le32_to_cpus(&intdata);
++
++ netif_dbg(dev, link, dev->net, "intdata: 0x%08X\n", intdata);
++
++ if (intdata & INT_ENP_PHY_INT)
++ usbnet_defer_kevent(dev, EVENT_LINK_RESET);
++ else
++ netdev_warn(dev->net, "unexpected interrupt, intdata=0x%08X\n",
++ intdata);
++}
++
++static int smsc75xx_ethtool_get_eeprom_len(struct net_device *net)
++{
++ return MAX_EEPROM_SIZE;
++}
++
++static int smsc75xx_ethtool_get_eeprom(struct net_device *netdev,
++ struct ethtool_eeprom *ee, u8 *data)
++{
++ struct usbnet *dev = netdev_priv(netdev);
++
++ ee->magic = LAN75XX_EEPROM_MAGIC;
++
++ return smsc75xx_read_eeprom(dev, ee->offset, ee->len, data);
++}
++
++static int smsc75xx_ethtool_set_eeprom(struct net_device *netdev,
++ struct ethtool_eeprom *ee, u8 *data)
++{
++ struct usbnet *dev = netdev_priv(netdev);
++
++ if (ee->magic != LAN75XX_EEPROM_MAGIC) {
++ netdev_warn(dev->net, "EEPROM: magic value mismatch: 0x%x\n",
++ ee->magic);
++ return -EINVAL;
++ }
++
++ return smsc75xx_write_eeprom(dev, ee->offset, ee->len, data);
++}
++
++static void smsc75xx_ethtool_get_wol(struct net_device *net,
++ struct ethtool_wolinfo *wolinfo)
++{
++ struct usbnet *dev = netdev_priv(net);
++ struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
++
++ wolinfo->supported = SUPPORTED_WAKE;
++ wolinfo->wolopts = pdata->wolopts;
++}
++
++static int smsc75xx_ethtool_set_wol(struct net_device *net,
++ struct ethtool_wolinfo *wolinfo)
++{
++ struct usbnet *dev = netdev_priv(net);
++ struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
++ int ret;
++
++ pdata->wolopts = wolinfo->wolopts & SUPPORTED_WAKE;
++
++ ret = device_set_wakeup_enable(&dev->udev->dev, pdata->wolopts);
++ if (ret < 0)
++ netdev_warn(dev->net, "device_set_wakeup_enable error %d\n", ret);
++
++ return ret;
++}
++
++static const struct ethtool_ops smsc75xx_ethtool_ops = {
++ .get_link = usbnet_get_link,
++ .nway_reset = usbnet_nway_reset,
++ .get_drvinfo = usbnet_get_drvinfo,
++ .get_msglevel = usbnet_get_msglevel,
++ .set_msglevel = usbnet_set_msglevel,
++ .get_settings = usbnet_get_settings,
++ .set_settings = usbnet_set_settings,
++ .get_eeprom_len = smsc75xx_ethtool_get_eeprom_len,
++ .get_eeprom = smsc75xx_ethtool_get_eeprom,
++ .set_eeprom = smsc75xx_ethtool_set_eeprom,
++ .get_wol = smsc75xx_ethtool_get_wol,
++ .set_wol = smsc75xx_ethtool_set_wol,
++};
++
++static int smsc75xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
++{
++ struct usbnet *dev = netdev_priv(netdev);
++
++ if (!netif_running(netdev))
++ return -EINVAL;
++
++ return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
++}
++
++static void smsc75xx_init_mac_address(struct usbnet *dev)
++{
++ /* try reading mac address from EEPROM */
++ if (smsc75xx_read_eeprom(dev, EEPROM_MAC_OFFSET, ETH_ALEN,
++ dev->net->dev_addr) == 0) {
++ if (is_valid_ether_addr(dev->net->dev_addr)) {
++ /* eeprom values are valid so use them */
++ netif_dbg(dev, ifup, dev->net,
++ "MAC address read from EEPROM\n");
++ return;
++ }
++ }
++
++ /* no eeprom, or eeprom values are invalid. generate random MAC */
++ eth_hw_addr_random(dev->net);
++ netif_dbg(dev, ifup, dev->net, "MAC address set to eth_random_addr\n");
++}
++
++static int smsc75xx_set_mac_address(struct usbnet *dev)
++{
++ u32 addr_lo = dev->net->dev_addr[0] | dev->net->dev_addr[1] << 8 |
++ dev->net->dev_addr[2] << 16 | dev->net->dev_addr[3] << 24;
++ u32 addr_hi = dev->net->dev_addr[4] | dev->net->dev_addr[5] << 8;
++
++ int ret = smsc75xx_write_reg(dev, RX_ADDRH, addr_hi);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to write RX_ADDRH: %d\n", ret);
++ return ret;
++ }
++
++ ret = smsc75xx_write_reg(dev, RX_ADDRL, addr_lo);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to write RX_ADDRL: %d\n", ret);
++ return ret;
++ }
++
++ addr_hi |= ADDR_FILTX_FB_VALID;
++ ret = smsc75xx_write_reg(dev, ADDR_FILTX, addr_hi);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to write ADDR_FILTX: %d\n", ret);
++ return ret;
++ }
++
++ ret = smsc75xx_write_reg(dev, ADDR_FILTX + 4, addr_lo);
++ if (ret < 0)
++ netdev_warn(dev->net, "Failed to write ADDR_FILTX+4: %d\n", ret);
++
++ return ret;
++}
++
++static int smsc75xx_phy_initialize(struct usbnet *dev)
++{
++ int bmcr, ret, timeout = 0;
++
++ /* Initialize MII structure */
++ dev->mii.dev = dev->net;
++ dev->mii.mdio_read = smsc75xx_mdio_read;
++ dev->mii.mdio_write = smsc75xx_mdio_write;
++ dev->mii.phy_id_mask = 0x1f;
++ dev->mii.reg_num_mask = 0x1f;
++ dev->mii.supports_gmii = 1;
++ dev->mii.phy_id = SMSC75XX_INTERNAL_PHY_ID;
++
++ /* reset phy and wait for reset to complete */
++ smsc75xx_mdio_write(dev->net, dev->mii.phy_id, MII_BMCR, BMCR_RESET);
++
++ do {
++ msleep(10);
++ bmcr = smsc75xx_mdio_read(dev->net, dev->mii.phy_id, MII_BMCR);
++ if (bmcr < 0) {
++ netdev_warn(dev->net, "Error reading MII_BMCR\n");
++ return bmcr;
++ }
++ timeout++;
++ } while ((bmcr & BMCR_RESET) && (timeout < 100));
++
++ if (timeout >= 100) {
++ netdev_warn(dev->net, "timeout on PHY Reset\n");
++ return -EIO;
++ }
++
++ smsc75xx_mdio_write(dev->net, dev->mii.phy_id, MII_ADVERTISE,
++ ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP |
++ ADVERTISE_PAUSE_ASYM);
++ smsc75xx_mdio_write(dev->net, dev->mii.phy_id, MII_CTRL1000,
++ ADVERTISE_1000FULL);
++
++ /* read and write to clear phy interrupt status */
++ ret = smsc75xx_mdio_read(dev->net, dev->mii.phy_id, PHY_INT_SRC);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error reading PHY_INT_SRC\n");
++ return ret;
++ }
++
++ smsc75xx_mdio_write(dev->net, dev->mii.phy_id, PHY_INT_SRC, 0xffff);
++
++ smsc75xx_mdio_write(dev->net, dev->mii.phy_id, PHY_INT_MASK,
++ PHY_INT_MASK_DEFAULT);
++ mii_nway_restart(&dev->mii);
++
++ netif_dbg(dev, ifup, dev->net, "phy initialised successfully\n");
++ return 0;
++}
++
++static int smsc75xx_set_rx_max_frame_length(struct usbnet *dev, int size)
++{
++ int ret = 0;
++ u32 buf;
++ bool rxenabled;
++
++ ret = smsc75xx_read_reg(dev, MAC_RX, &buf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to read MAC_RX: %d\n", ret);
++ return ret;
++ }
++
++ rxenabled = ((buf & MAC_RX_RXEN) != 0);
++
++ if (rxenabled) {
++ buf &= ~MAC_RX_RXEN;
++ ret = smsc75xx_write_reg(dev, MAC_RX, buf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to write MAC_RX: %d\n", ret);
++ return ret;
++ }
++ }
++
++ /* add 4 to size for FCS */
++ buf &= ~MAC_RX_MAX_SIZE;
++ buf |= (((size + 4) << MAC_RX_MAX_SIZE_SHIFT) & MAC_RX_MAX_SIZE);
++
++ ret = smsc75xx_write_reg(dev, MAC_RX, buf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to write MAC_RX: %d\n", ret);
++ return ret;
++ }
++
++ if (rxenabled) {
++ buf |= MAC_RX_RXEN;
++ ret = smsc75xx_write_reg(dev, MAC_RX, buf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to write MAC_RX: %d\n", ret);
++ return ret;
++ }
++ }
++
++ return 0;
++}
++
++static int smsc75xx_change_mtu(struct net_device *netdev, int new_mtu)
++{
++ struct usbnet *dev = netdev_priv(netdev);
++ int ret;
++
++ if (new_mtu > MAX_SINGLE_PACKET_SIZE)
++ return -EINVAL;
++
++ ret = smsc75xx_set_rx_max_frame_length(dev, new_mtu + ETH_HLEN);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to set mac rx frame length\n");
++ return ret;
++ }
++
++ return usbnet_change_mtu(netdev, new_mtu);
++}
++
++/* Enable or disable Rx checksum offload engine */
++static int smsc75xx_set_features(struct net_device *netdev,
++ netdev_features_t features)
++{
++ struct usbnet *dev = netdev_priv(netdev);
++ struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
++ unsigned long flags;
++ int ret;
++
++ spin_lock_irqsave(&pdata->rfe_ctl_lock, flags);
++
++ if (features & NETIF_F_RXCSUM)
++ pdata->rfe_ctl |= RFE_CTL_TCPUDP_CKM | RFE_CTL_IP_CKM;
++ else
++ pdata->rfe_ctl &= ~(RFE_CTL_TCPUDP_CKM | RFE_CTL_IP_CKM);
++
++ spin_unlock_irqrestore(&pdata->rfe_ctl_lock, flags);
++ /* it's racing here! */
++
++ ret = smsc75xx_write_reg(dev, RFE_CTL, pdata->rfe_ctl);
++ if (ret < 0)
++ netdev_warn(dev->net, "Error writing RFE_CTL\n");
++
++ return ret;
++}
++
++static int smsc75xx_wait_ready(struct usbnet *dev, int in_pm)
++{
++ int timeout = 0;
++
++ do {
++ u32 buf;
++ int ret;
++
++ ret = __smsc75xx_read_reg(dev, PMT_CTL, &buf, in_pm);
++
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to read PMT_CTL: %d\n", ret);
++ return ret;
++ }
++
++ if (buf & PMT_CTL_DEV_RDY)
++ return 0;
++
++ msleep(10);
++ timeout++;
++ } while (timeout < 100);
++
++ netdev_warn(dev->net, "timeout waiting for device ready\n");
++ return -EIO;
++}
++
++static int smsc75xx_reset(struct usbnet *dev)
++{
++ struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
++ u32 buf;
++ int ret = 0, timeout;
++
++ netif_dbg(dev, ifup, dev->net, "entering smsc75xx_reset\n");
++
++ ret = smsc75xx_wait_ready(dev, 0);
++ if (ret < 0) {
++ netdev_warn(dev->net, "device not ready in smsc75xx_reset\n");
++ return ret;
++ }
++
++ ret = smsc75xx_read_reg(dev, HW_CFG, &buf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to read HW_CFG: %d\n", ret);
++ return ret;
++ }
++
++ buf |= HW_CFG_LRST;
++
++ ret = smsc75xx_write_reg(dev, HW_CFG, buf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to write HW_CFG: %d\n", ret);
++ return ret;
++ }
++
++ timeout = 0;
++ do {
++ msleep(10);
++ ret = smsc75xx_read_reg(dev, HW_CFG, &buf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to read HW_CFG: %d\n", ret);
++ return ret;
++ }
++ timeout++;
++ } while ((buf & HW_CFG_LRST) && (timeout < 100));
++
++ if (timeout >= 100) {
++ netdev_warn(dev->net, "timeout on completion of Lite Reset\n");
++ return -EIO;
++ }
++
++ netif_dbg(dev, ifup, dev->net, "Lite reset complete, resetting PHY\n");
++
++ ret = smsc75xx_read_reg(dev, PMT_CTL, &buf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to read PMT_CTL: %d\n", ret);
++ return ret;
++ }
++
++ buf |= PMT_CTL_PHY_RST;
++
++ ret = smsc75xx_write_reg(dev, PMT_CTL, buf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to write PMT_CTL: %d\n", ret);
++ return ret;
++ }
++
++ timeout = 0;
++ do {
++ msleep(10);
++ ret = smsc75xx_read_reg(dev, PMT_CTL, &buf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to read PMT_CTL: %d\n", ret);
++ return ret;
++ }
++ timeout++;
++ } while ((buf & PMT_CTL_PHY_RST) && (timeout < 100));
++
++ if (timeout >= 100) {
++ netdev_warn(dev->net, "timeout waiting for PHY Reset\n");
++ return -EIO;
++ }
++
++ netif_dbg(dev, ifup, dev->net, "PHY reset complete\n");
++
++ ret = smsc75xx_set_mac_address(dev);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to set mac address\n");
++ return ret;
++ }
++
++ netif_dbg(dev, ifup, dev->net, "MAC Address: %pM\n",
++ dev->net->dev_addr);
++
++ ret = smsc75xx_read_reg(dev, HW_CFG, &buf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to read HW_CFG: %d\n", ret);
++ return ret;
++ }
++
++ netif_dbg(dev, ifup, dev->net, "Read Value from HW_CFG : 0x%08x\n",
++ buf);
++
++ buf |= HW_CFG_BIR;
++
++ ret = smsc75xx_write_reg(dev, HW_CFG, buf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to write HW_CFG: %d\n", ret);
++ return ret;
++ }
++
++ ret = smsc75xx_read_reg(dev, HW_CFG, &buf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to read HW_CFG: %d\n", ret);
++ return ret;
++ }
++
++ netif_dbg(dev, ifup, dev->net, "Read Value from HW_CFG after writing HW_CFG_BIR: 0x%08x\n",
++ buf);
++
++ if (!turbo_mode) {
++ buf = 0;
++ dev->rx_urb_size = MAX_SINGLE_PACKET_SIZE;
++ } else if (dev->udev->speed == USB_SPEED_HIGH) {
++ buf = DEFAULT_HS_BURST_CAP_SIZE / HS_USB_PKT_SIZE;
++ dev->rx_urb_size = DEFAULT_HS_BURST_CAP_SIZE;
++ } else {
++ buf = DEFAULT_FS_BURST_CAP_SIZE / FS_USB_PKT_SIZE;
++ dev->rx_urb_size = DEFAULT_FS_BURST_CAP_SIZE;
++ }
++
++ netif_dbg(dev, ifup, dev->net, "rx_urb_size=%ld\n",
++ (ulong)dev->rx_urb_size);
++
++ ret = smsc75xx_write_reg(dev, BURST_CAP, buf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to write BURST_CAP: %d\n", ret);
++ return ret;
++ }
++
++ ret = smsc75xx_read_reg(dev, BURST_CAP, &buf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to read BURST_CAP: %d\n", ret);
++ return ret;
++ }
++
++ netif_dbg(dev, ifup, dev->net,
++ "Read Value from BURST_CAP after writing: 0x%08x\n", buf);
++
++ ret = smsc75xx_write_reg(dev, BULK_IN_DLY, DEFAULT_BULK_IN_DELAY);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to write BULK_IN_DLY: %d\n", ret);
++ return ret;
++ }
++
++ ret = smsc75xx_read_reg(dev, BULK_IN_DLY, &buf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to read BULK_IN_DLY: %d\n", ret);
++ return ret;
++ }
++
++ netif_dbg(dev, ifup, dev->net,
++ "Read Value from BULK_IN_DLY after writing: 0x%08x\n", buf);
++
++ if (turbo_mode) {
++ ret = smsc75xx_read_reg(dev, HW_CFG, &buf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to read HW_CFG: %d\n", ret);
++ return ret;
++ }
++
++ netif_dbg(dev, ifup, dev->net, "HW_CFG: 0x%08x\n", buf);
++
++ buf |= (HW_CFG_MEF | HW_CFG_BCE);
++
++ ret = smsc75xx_write_reg(dev, HW_CFG, buf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to write HW_CFG: %d\n", ret);
++ return ret;
++ }
++
++ ret = smsc75xx_read_reg(dev, HW_CFG, &buf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to read HW_CFG: %d\n", ret);
++ return ret;
++ }
++
++ netif_dbg(dev, ifup, dev->net, "HW_CFG: 0x%08x\n", buf);
++ }
++
++ /* set FIFO sizes */
++ buf = (MAX_RX_FIFO_SIZE - 512) / 512;
++ ret = smsc75xx_write_reg(dev, FCT_RX_FIFO_END, buf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to write FCT_RX_FIFO_END: %d\n", ret);
++ return ret;
++ }
++
++ netif_dbg(dev, ifup, dev->net, "FCT_RX_FIFO_END set to 0x%08x\n", buf);
++
++ buf = (MAX_TX_FIFO_SIZE - 512) / 512;
++ ret = smsc75xx_write_reg(dev, FCT_TX_FIFO_END, buf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to write FCT_TX_FIFO_END: %d\n", ret);
++ return ret;
++ }
++
++ netif_dbg(dev, ifup, dev->net, "FCT_TX_FIFO_END set to 0x%08x\n", buf);
++
++ ret = smsc75xx_write_reg(dev, INT_STS, INT_STS_CLEAR_ALL);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to write INT_STS: %d\n", ret);
++ return ret;
++ }
++
++ ret = smsc75xx_read_reg(dev, ID_REV, &buf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to read ID_REV: %d\n", ret);
++ return ret;
++ }
++
++ netif_dbg(dev, ifup, dev->net, "ID_REV = 0x%08x\n", buf);
++
++ ret = smsc75xx_read_reg(dev, E2P_CMD, &buf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to read E2P_CMD: %d\n", ret);
++ return ret;
++ }
++
++ /* only set default GPIO/LED settings if no EEPROM is detected */
++ if (!(buf & E2P_CMD_LOADED)) {
++ ret = smsc75xx_read_reg(dev, LED_GPIO_CFG, &buf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to read LED_GPIO_CFG: %d\n", ret);
++ return ret;
++ }
++
++ buf &= ~(LED_GPIO_CFG_LED2_FUN_SEL | LED_GPIO_CFG_LED10_FUN_SEL);
++ buf |= LED_GPIO_CFG_LEDGPIO_EN | LED_GPIO_CFG_LED2_FUN_SEL;
++
++ ret = smsc75xx_write_reg(dev, LED_GPIO_CFG, buf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to write LED_GPIO_CFG: %d\n", ret);
++ return ret;
++ }
++ }
++
++ ret = smsc75xx_write_reg(dev, FLOW, 0);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to write FLOW: %d\n", ret);
++ return ret;
++ }
++
++ ret = smsc75xx_write_reg(dev, FCT_FLOW, 0);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to write FCT_FLOW: %d\n", ret);
++ return ret;
++ }
++
++ /* Don't need rfe_ctl_lock during initialisation */
++ ret = smsc75xx_read_reg(dev, RFE_CTL, &pdata->rfe_ctl);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to read RFE_CTL: %d\n", ret);
++ return ret;
++ }
++
++ pdata->rfe_ctl |= RFE_CTL_AB | RFE_CTL_DPF;
++
++ ret = smsc75xx_write_reg(dev, RFE_CTL, pdata->rfe_ctl);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to write RFE_CTL: %d\n", ret);
++ return ret;
++ }
++
++ ret = smsc75xx_read_reg(dev, RFE_CTL, &pdata->rfe_ctl);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to read RFE_CTL: %d\n", ret);
++ return ret;
++ }
++
++ netif_dbg(dev, ifup, dev->net, "RFE_CTL set to 0x%08x\n",
++ pdata->rfe_ctl);
++
++ /* Enable or disable checksum offload engines */
++ smsc75xx_set_features(dev->net, dev->net->features);
++
++ smsc75xx_set_multicast(dev->net);
++
++ ret = smsc75xx_phy_initialize(dev);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to initialize PHY: %d\n", ret);
++ return ret;
++ }
++
++ ret = smsc75xx_read_reg(dev, INT_EP_CTL, &buf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to read INT_EP_CTL: %d\n", ret);
++ return ret;
++ }
++
++ /* enable PHY interrupts */
++ buf |= INT_ENP_PHY_INT;
++
++ ret = smsc75xx_write_reg(dev, INT_EP_CTL, buf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to write INT_EP_CTL: %d\n", ret);
++ return ret;
++ }
++
++ /* allow mac to detect speed and duplex from phy */
++ ret = smsc75xx_read_reg(dev, MAC_CR, &buf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to read MAC_CR: %d\n", ret);
++ return ret;
++ }
++
++ buf |= (MAC_CR_ADD | MAC_CR_ASD);
++ ret = smsc75xx_write_reg(dev, MAC_CR, buf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to write MAC_CR: %d\n", ret);
++ return ret;
++ }
++
++ ret = smsc75xx_read_reg(dev, MAC_TX, &buf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to read MAC_TX: %d\n", ret);
++ return ret;
++ }
++
++ buf |= MAC_TX_TXEN;
++
++ ret = smsc75xx_write_reg(dev, MAC_TX, buf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to write MAC_TX: %d\n", ret);
++ return ret;
++ }
++
++ netif_dbg(dev, ifup, dev->net, "MAC_TX set to 0x%08x\n", buf);
++
++ ret = smsc75xx_read_reg(dev, FCT_TX_CTL, &buf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to read FCT_TX_CTL: %d\n", ret);
++ return ret;
++ }
++
++ buf |= FCT_TX_CTL_EN;
++
++ ret = smsc75xx_write_reg(dev, FCT_TX_CTL, buf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to write FCT_TX_CTL: %d\n", ret);
++ return ret;
++ }
++
++ netif_dbg(dev, ifup, dev->net, "FCT_TX_CTL set to 0x%08x\n", buf);
++
++ ret = smsc75xx_set_rx_max_frame_length(dev, dev->net->mtu + ETH_HLEN);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to set max rx frame length\n");
++ return ret;
++ }
++
++ ret = smsc75xx_read_reg(dev, MAC_RX, &buf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to read MAC_RX: %d\n", ret);
++ return ret;
++ }
++
++ buf |= MAC_RX_RXEN;
++
++ ret = smsc75xx_write_reg(dev, MAC_RX, buf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to write MAC_RX: %d\n", ret);
++ return ret;
++ }
++
++ netif_dbg(dev, ifup, dev->net, "MAC_RX set to 0x%08x\n", buf);
++
++ ret = smsc75xx_read_reg(dev, FCT_RX_CTL, &buf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to read FCT_RX_CTL: %d\n", ret);
++ return ret;
++ }
++
++ buf |= FCT_RX_CTL_EN;
++
++ ret = smsc75xx_write_reg(dev, FCT_RX_CTL, buf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to write FCT_RX_CTL: %d\n", ret);
++ return ret;
++ }
++
++ netif_dbg(dev, ifup, dev->net, "FCT_RX_CTL set to 0x%08x\n", buf);
++
++ netif_dbg(dev, ifup, dev->net, "smsc75xx_reset, return 0\n");
++ return 0;
++}
++
++static const struct net_device_ops smsc75xx_netdev_ops = {
++ .ndo_open = usbnet_open,
++ .ndo_stop = usbnet_stop,
++ .ndo_start_xmit = usbnet_start_xmit,
++ .ndo_tx_timeout = usbnet_tx_timeout,
++ .ndo_change_mtu = smsc75xx_change_mtu,
++ .ndo_set_mac_address = eth_mac_addr,
++ .ndo_validate_addr = eth_validate_addr,
++ .ndo_do_ioctl = smsc75xx_ioctl,
++ .ndo_set_rx_mode = smsc75xx_set_multicast,
++ .ndo_set_features = smsc75xx_set_features,
++};
++
++static int smsc75xx_bind(struct usbnet *dev, struct usb_interface *intf)
++{
++ struct smsc75xx_priv *pdata = NULL;
++ int ret;
++
++ printk(KERN_INFO SMSC_CHIPNAME " v" SMSC_DRIVER_VERSION "\n");
++
++ ret = usbnet_get_endpoints(dev, intf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "usbnet_get_endpoints failed: %d\n", ret);
++ return ret;
++ }
++
++ dev->data[0] = (unsigned long)kzalloc(sizeof(struct smsc75xx_priv),
++ GFP_KERNEL);
++
++ pdata = (struct smsc75xx_priv *)(dev->data[0]);
++ if (!pdata)
++ return -ENOMEM;
++
++ pdata->dev = dev;
++
++ spin_lock_init(&pdata->rfe_ctl_lock);
++ mutex_init(&pdata->dataport_mutex);
++
++ INIT_WORK(&pdata->set_multicast, smsc75xx_deferred_multicast_write);
++
++ if (DEFAULT_TX_CSUM_ENABLE)
++ dev->net->features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM;
++
++ if (DEFAULT_RX_CSUM_ENABLE)
++ dev->net->features |= NETIF_F_RXCSUM;
++
++ dev->net->hw_features = NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
++ NETIF_F_RXCSUM;
++
++ ret = smsc75xx_wait_ready(dev, 0);
++ if (ret < 0) {
++ netdev_warn(dev->net, "device not ready in smsc75xx_bind\n");
++ return ret;
++ }
++
++ smsc75xx_init_mac_address(dev);
++
++ /* Init all registers */
++ ret = smsc75xx_reset(dev);
++ if (ret < 0) {
++ netdev_warn(dev->net, "smsc75xx_reset error %d\n", ret);
++ return ret;
++ }
++
++ dev->net->netdev_ops = &smsc75xx_netdev_ops;
++ dev->net->ethtool_ops = &smsc75xx_ethtool_ops;
++ dev->net->flags |= IFF_MULTICAST;
++ dev->net->hard_header_len += SMSC75XX_TX_OVERHEAD;
++ dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len;
++ return 0;
++}
++
++static void smsc75xx_unbind(struct usbnet *dev, struct usb_interface *intf)
++{
++ struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
++ if (pdata) {
++ netif_dbg(dev, ifdown, dev->net, "free pdata\n");
++ kfree(pdata);
++ pdata = NULL;
++ dev->data[0] = 0;
++ }
++}
++
++static u16 smsc_crc(const u8 *buffer, size_t len)
++{
++ return bitrev16(crc16(0xFFFF, buffer, len));
++}
++
++static int smsc75xx_write_wuff(struct usbnet *dev, int filter, u32 wuf_cfg,
++ u32 wuf_mask1)
++{
++ int cfg_base = WUF_CFGX + filter * 4;
++ int mask_base = WUF_MASKX + filter * 16;
++ int ret;
++
++ ret = smsc75xx_write_reg(dev, cfg_base, wuf_cfg);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing WUF_CFGX\n");
++ return ret;
++ }
++
++ ret = smsc75xx_write_reg(dev, mask_base, wuf_mask1);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing WUF_MASKX\n");
++ return ret;
++ }
++
++ ret = smsc75xx_write_reg(dev, mask_base + 4, 0);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing WUF_MASKX\n");
++ return ret;
++ }
++
++ ret = smsc75xx_write_reg(dev, mask_base + 8, 0);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing WUF_MASKX\n");
++ return ret;
++ }
++
++ ret = smsc75xx_write_reg(dev, mask_base + 12, 0);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing WUF_MASKX\n");
++ return ret;
++ }
++
++ return 0;
++}
++
++static int smsc75xx_enter_suspend0(struct usbnet *dev)
++{
++ struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
++ u32 val;
++ int ret;
++
++ ret = smsc75xx_read_reg_nopm(dev, PMT_CTL, &val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error reading PMT_CTL\n");
++ return ret;
++ }
++
++ val &= (~(PMT_CTL_SUS_MODE | PMT_CTL_PHY_RST));
++ val |= PMT_CTL_SUS_MODE_0 | PMT_CTL_WOL_EN | PMT_CTL_WUPS;
++
++ ret = smsc75xx_write_reg_nopm(dev, PMT_CTL, val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing PMT_CTL\n");
++ return ret;
++ }
++
++ pdata->suspend_flags |= SUSPEND_SUSPEND0;
++
++ return 0;
++}
++
++static int smsc75xx_enter_suspend1(struct usbnet *dev)
++{
++ struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
++ u32 val;
++ int ret;
++
++ ret = smsc75xx_read_reg_nopm(dev, PMT_CTL, &val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error reading PMT_CTL\n");
++ return ret;
++ }
++
++ val &= ~(PMT_CTL_SUS_MODE | PMT_CTL_WUPS | PMT_CTL_PHY_RST);
++ val |= PMT_CTL_SUS_MODE_1;
++
++ ret = smsc75xx_write_reg_nopm(dev, PMT_CTL, val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing PMT_CTL\n");
++ return ret;
++ }
++
++ /* clear wol status, enable energy detection */
++ val &= ~PMT_CTL_WUPS;
++ val |= (PMT_CTL_WUPS_ED | PMT_CTL_ED_EN);
++
++ ret = smsc75xx_write_reg_nopm(dev, PMT_CTL, val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing PMT_CTL\n");
++ return ret;
++ }
++
++ pdata->suspend_flags |= SUSPEND_SUSPEND1;
++
++ return 0;
++}
++
++static int smsc75xx_enter_suspend2(struct usbnet *dev)
++{
++ struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
++ u32 val;
++ int ret;
++
++ ret = smsc75xx_read_reg_nopm(dev, PMT_CTL, &val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error reading PMT_CTL\n");
++ return ret;
++ }
++
++ val &= ~(PMT_CTL_SUS_MODE | PMT_CTL_WUPS | PMT_CTL_PHY_RST);
++ val |= PMT_CTL_SUS_MODE_2;
++
++ ret = smsc75xx_write_reg_nopm(dev, PMT_CTL, val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing PMT_CTL\n");
++ return ret;
++ }
++
++ pdata->suspend_flags |= SUSPEND_SUSPEND2;
++
++ return 0;
++}
++
++static int smsc75xx_enter_suspend3(struct usbnet *dev)
++{
++ struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
++ u32 val;
++ int ret;
++
++ ret = smsc75xx_read_reg_nopm(dev, FCT_RX_CTL, &val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error reading FCT_RX_CTL\n");
++ return ret;
++ }
++
++ if (val & FCT_RX_CTL_RXUSED) {
++ netdev_dbg(dev->net, "rx fifo not empty in autosuspend\n");
++ return -EBUSY;
++ }
++
++ ret = smsc75xx_read_reg_nopm(dev, PMT_CTL, &val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error reading PMT_CTL\n");
++ return ret;
++ }
++
++ val &= ~(PMT_CTL_SUS_MODE | PMT_CTL_WUPS | PMT_CTL_PHY_RST);
++ val |= PMT_CTL_SUS_MODE_3 | PMT_CTL_RES_CLR_WKP_EN;
++
++ ret = smsc75xx_write_reg_nopm(dev, PMT_CTL, val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing PMT_CTL\n");
++ return ret;
++ }
++
++ /* clear wol status */
++ val &= ~PMT_CTL_WUPS;
++ val |= PMT_CTL_WUPS_WOL;
++
++ ret = smsc75xx_write_reg_nopm(dev, PMT_CTL, val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing PMT_CTL\n");
++ return ret;
++ }
++
++ pdata->suspend_flags |= SUSPEND_SUSPEND3;
++
++ return 0;
++}
++
++static int smsc75xx_enable_phy_wakeup_interrupts(struct usbnet *dev, u16 mask)
++{
++ struct mii_if_info *mii = &dev->mii;
++ int ret;
++
++ netdev_dbg(dev->net, "enabling PHY wakeup interrupts\n");
++
++ /* read to clear */
++ ret = smsc75xx_mdio_read_nopm(dev->net, mii->phy_id, PHY_INT_SRC);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error reading PHY_INT_SRC\n");
++ return ret;
++ }
++
++ /* enable interrupt source */
++ ret = smsc75xx_mdio_read_nopm(dev->net, mii->phy_id, PHY_INT_MASK);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error reading PHY_INT_MASK\n");
++ return ret;
++ }
++
++ ret |= mask;
++
++ smsc75xx_mdio_write_nopm(dev->net, mii->phy_id, PHY_INT_MASK, ret);
++
++ return 0;
++}
++
++static int smsc75xx_link_ok_nopm(struct usbnet *dev)
++{
++ struct mii_if_info *mii = &dev->mii;
++ int ret;
++
++ /* first, a dummy read, needed to latch some MII phys */
++ ret = smsc75xx_mdio_read_nopm(dev->net, mii->phy_id, MII_BMSR);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error reading MII_BMSR\n");
++ return ret;
++ }
++
++ ret = smsc75xx_mdio_read_nopm(dev->net, mii->phy_id, MII_BMSR);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error reading MII_BMSR\n");
++ return ret;
++ }
++
++ return !!(ret & BMSR_LSTATUS);
++}
++
++static int smsc75xx_autosuspend(struct usbnet *dev, u32 link_up)
++{
++ int ret;
++
++ if (!netif_running(dev->net)) {
++ /* interface is ifconfig down so fully power down hw */
++ netdev_dbg(dev->net, "autosuspend entering SUSPEND2\n");
++ return smsc75xx_enter_suspend2(dev);
++ }
++
++ if (!link_up) {
++ /* link is down so enter EDPD mode */
++ netdev_dbg(dev->net, "autosuspend entering SUSPEND1\n");
++
++ /* enable PHY wakeup events for if cable is attached */
++ ret = smsc75xx_enable_phy_wakeup_interrupts(dev,
++ PHY_INT_MASK_ANEG_COMP);
++ if (ret < 0) {
++ netdev_warn(dev->net, "error enabling PHY wakeup ints\n");
++ return ret;
++ }
++
++ netdev_info(dev->net, "entering SUSPEND1 mode\n");
++ return smsc75xx_enter_suspend1(dev);
++ }
++
++ /* enable PHY wakeup events so we remote wakeup if cable is pulled */
++ ret = smsc75xx_enable_phy_wakeup_interrupts(dev,
++ PHY_INT_MASK_LINK_DOWN);
++ if (ret < 0) {
++ netdev_warn(dev->net, "error enabling PHY wakeup ints\n");
++ return ret;
++ }
++
++ netdev_dbg(dev->net, "autosuspend entering SUSPEND3\n");
++ return smsc75xx_enter_suspend3(dev);
++}
++
++static int smsc75xx_suspend(struct usb_interface *intf, pm_message_t message)
++{
++ struct usbnet *dev = usb_get_intfdata(intf);
++ struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
++ u32 val, link_up;
++ int ret;
++
++ ret = usbnet_suspend(intf, message);
++ if (ret < 0) {
++ netdev_warn(dev->net, "usbnet_suspend error\n");
++ return ret;
++ }
++
++ if (pdata->suspend_flags) {
++ netdev_warn(dev->net, "error during last resume\n");
++ pdata->suspend_flags = 0;
++ }
++
++ /* determine if link is up using only _nopm functions */
++ link_up = smsc75xx_link_ok_nopm(dev);
++
++ if (message.event == PM_EVENT_AUTO_SUSPEND) {
++ ret = smsc75xx_autosuspend(dev, link_up);
++ goto done;
++ }
++
++ /* if we get this far we're not autosuspending */
++ /* if no wol options set, or if link is down and we're not waking on
++ * PHY activity, enter lowest power SUSPEND2 mode
++ */
++ if (!(pdata->wolopts & SUPPORTED_WAKE) ||
++ !(link_up || (pdata->wolopts & WAKE_PHY))) {
++ netdev_info(dev->net, "entering SUSPEND2 mode\n");
++
++ /* disable energy detect (link up) & wake up events */
++ ret = smsc75xx_read_reg_nopm(dev, WUCSR, &val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error reading WUCSR\n");
++ goto done;
++ }
++
++ val &= ~(WUCSR_MPEN | WUCSR_WUEN);
++
++ ret = smsc75xx_write_reg_nopm(dev, WUCSR, val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing WUCSR\n");
++ goto done;
++ }
++
++ ret = smsc75xx_read_reg_nopm(dev, PMT_CTL, &val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error reading PMT_CTL\n");
++ goto done;
++ }
++
++ val &= ~(PMT_CTL_ED_EN | PMT_CTL_WOL_EN);
++
++ ret = smsc75xx_write_reg_nopm(dev, PMT_CTL, val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing PMT_CTL\n");
++ goto done;
++ }
++
++ ret = smsc75xx_enter_suspend2(dev);
++ goto done;
++ }
++
++ if (pdata->wolopts & WAKE_PHY) {
++ ret = smsc75xx_enable_phy_wakeup_interrupts(dev,
++ (PHY_INT_MASK_ANEG_COMP | PHY_INT_MASK_LINK_DOWN));
++ if (ret < 0) {
++ netdev_warn(dev->net, "error enabling PHY wakeup ints\n");
++ goto done;
++ }
++
++ /* if link is down then configure EDPD and enter SUSPEND1,
++ * otherwise enter SUSPEND0 below
++ */
++ if (!link_up) {
++ struct mii_if_info *mii = &dev->mii;
++ netdev_info(dev->net, "entering SUSPEND1 mode\n");
++
++ /* enable energy detect power-down mode */
++ ret = smsc75xx_mdio_read_nopm(dev->net, mii->phy_id,
++ PHY_MODE_CTRL_STS);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error reading PHY_MODE_CTRL_STS\n");
++ goto done;
++ }
++
++ ret |= MODE_CTRL_STS_EDPWRDOWN;
++
++ smsc75xx_mdio_write_nopm(dev->net, mii->phy_id,
++ PHY_MODE_CTRL_STS, ret);
++
++ /* enter SUSPEND1 mode */
++ ret = smsc75xx_enter_suspend1(dev);
++ goto done;
++ }
++ }
++
++ if (pdata->wolopts & (WAKE_MCAST | WAKE_ARP)) {
++ int i, filter = 0;
++
++ /* disable all filters */
++ for (i = 0; i < WUF_NUM; i++) {
++ ret = smsc75xx_write_reg_nopm(dev, WUF_CFGX + i * 4, 0);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing WUF_CFGX\n");
++ goto done;
++ }
++ }
++
++ if (pdata->wolopts & WAKE_MCAST) {
++ const u8 mcast[] = {0x01, 0x00, 0x5E};
++ netdev_info(dev->net, "enabling multicast detection\n");
++
++ val = WUF_CFGX_EN | WUF_CFGX_ATYPE_MULTICAST
++ | smsc_crc(mcast, 3);
++ ret = smsc75xx_write_wuff(dev, filter++, val, 0x0007);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing wakeup filter\n");
++ goto done;
++ }
++ }
++
++ if (pdata->wolopts & WAKE_ARP) {
++ const u8 arp[] = {0x08, 0x06};
++ netdev_info(dev->net, "enabling ARP detection\n");
++
++ val = WUF_CFGX_EN | WUF_CFGX_ATYPE_ALL | (0x0C << 16)
++ | smsc_crc(arp, 2);
++ ret = smsc75xx_write_wuff(dev, filter++, val, 0x0003);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing wakeup filter\n");
++ goto done;
++ }
++ }
++
++ /* clear any pending pattern match packet status */
++ ret = smsc75xx_read_reg_nopm(dev, WUCSR, &val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error reading WUCSR\n");
++ goto done;
++ }
++
++ val |= WUCSR_WUFR;
++
++ ret = smsc75xx_write_reg_nopm(dev, WUCSR, val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing WUCSR\n");
++ goto done;
++ }
++
++ netdev_info(dev->net, "enabling packet match detection\n");
++ ret = smsc75xx_read_reg_nopm(dev, WUCSR, &val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error reading WUCSR\n");
++ goto done;
++ }
++
++ val |= WUCSR_WUEN;
++
++ ret = smsc75xx_write_reg_nopm(dev, WUCSR, val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing WUCSR\n");
++ goto done;
++ }
++ } else {
++ netdev_info(dev->net, "disabling packet match detection\n");
++ ret = smsc75xx_read_reg_nopm(dev, WUCSR, &val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error reading WUCSR\n");
++ goto done;
++ }
++
++ val &= ~WUCSR_WUEN;
++
++ ret = smsc75xx_write_reg_nopm(dev, WUCSR, val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing WUCSR\n");
++ goto done;
++ }
++ }
++
++ /* disable magic, bcast & unicast wakeup sources */
++ ret = smsc75xx_read_reg_nopm(dev, WUCSR, &val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error reading WUCSR\n");
++ goto done;
++ }
++
++ val &= ~(WUCSR_MPEN | WUCSR_BCST_EN | WUCSR_PFDA_EN);
++
++ ret = smsc75xx_write_reg_nopm(dev, WUCSR, val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing WUCSR\n");
++ goto done;
++ }
++
++ if (pdata->wolopts & WAKE_PHY) {
++ netdev_info(dev->net, "enabling PHY wakeup\n");
++
++ ret = smsc75xx_read_reg_nopm(dev, PMT_CTL, &val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error reading PMT_CTL\n");
++ goto done;
++ }
++
++ /* clear wol status, enable energy detection */
++ val &= ~PMT_CTL_WUPS;
++ val |= (PMT_CTL_WUPS_ED | PMT_CTL_ED_EN);
++
++ ret = smsc75xx_write_reg_nopm(dev, PMT_CTL, val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing PMT_CTL\n");
++ goto done;
++ }
++ }
++
++ if (pdata->wolopts & WAKE_MAGIC) {
++ netdev_info(dev->net, "enabling magic packet wakeup\n");
++ ret = smsc75xx_read_reg_nopm(dev, WUCSR, &val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error reading WUCSR\n");
++ goto done;
++ }
++
++ /* clear any pending magic packet status */
++ val |= WUCSR_MPR | WUCSR_MPEN;
++
++ ret = smsc75xx_write_reg_nopm(dev, WUCSR, val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing WUCSR\n");
++ goto done;
++ }
++ }
++
++ if (pdata->wolopts & WAKE_BCAST) {
++ netdev_info(dev->net, "enabling broadcast detection\n");
++ ret = smsc75xx_read_reg_nopm(dev, WUCSR, &val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error reading WUCSR\n");
++ goto done;
++ }
++
++ val |= WUCSR_BCAST_FR | WUCSR_BCST_EN;
++
++ ret = smsc75xx_write_reg_nopm(dev, WUCSR, val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing WUCSR\n");
++ goto done;
++ }
++ }
++
++ if (pdata->wolopts & WAKE_UCAST) {
++ netdev_info(dev->net, "enabling unicast detection\n");
++ ret = smsc75xx_read_reg_nopm(dev, WUCSR, &val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error reading WUCSR\n");
++ goto done;
++ }
++
++ val |= WUCSR_WUFR | WUCSR_PFDA_EN;
++
++ ret = smsc75xx_write_reg_nopm(dev, WUCSR, val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing WUCSR\n");
++ goto done;
++ }
++ }
++
++ /* enable receiver to enable frame reception */
++ ret = smsc75xx_read_reg_nopm(dev, MAC_RX, &val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to read MAC_RX: %d\n", ret);
++ goto done;
++ }
++
++ val |= MAC_RX_RXEN;
++
++ ret = smsc75xx_write_reg_nopm(dev, MAC_RX, val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to write MAC_RX: %d\n", ret);
++ goto done;
++ }
++
++ /* some wol options are enabled, so enter SUSPEND0 */
++ netdev_info(dev->net, "entering SUSPEND0 mode\n");
++ ret = smsc75xx_enter_suspend0(dev);
++
++done:
++ /*
++ * TODO: resume() might need to handle the suspend failure
++ * in system sleep
++ */
++ if (ret && PMSG_IS_AUTO(message))
++ usbnet_resume(intf);
++ return ret;
++}
++
++static int smsc75xx_resume(struct usb_interface *intf)
++{
++ struct usbnet *dev = usb_get_intfdata(intf);
++ struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
++ u8 suspend_flags = pdata->suspend_flags;
++ int ret;
++ u32 val;
++
++ netdev_dbg(dev->net, "resume suspend_flags=0x%02x\n", suspend_flags);
++
++ /* do this first to ensure it's cleared even in error case */
++ pdata->suspend_flags = 0;
++
++ if (suspend_flags & SUSPEND_ALLMODES) {
++ /* Disable wakeup sources */
++ ret = smsc75xx_read_reg_nopm(dev, WUCSR, &val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error reading WUCSR\n");
++ return ret;
++ }
++
++ val &= ~(WUCSR_WUEN | WUCSR_MPEN | WUCSR_PFDA_EN
++ | WUCSR_BCST_EN);
++
++ ret = smsc75xx_write_reg_nopm(dev, WUCSR, val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing WUCSR\n");
++ return ret;
++ }
++
++ /* clear wake-up status */
++ ret = smsc75xx_read_reg_nopm(dev, PMT_CTL, &val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error reading PMT_CTL\n");
++ return ret;
++ }
++
++ val &= ~PMT_CTL_WOL_EN;
++ val |= PMT_CTL_WUPS;
++
++ ret = smsc75xx_write_reg_nopm(dev, PMT_CTL, val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing PMT_CTL\n");
++ return ret;
++ }
++ }
++
++ if (suspend_flags & SUSPEND_SUSPEND2) {
++ netdev_info(dev->net, "resuming from SUSPEND2\n");
++
++ ret = smsc75xx_read_reg_nopm(dev, PMT_CTL, &val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error reading PMT_CTL\n");
++ return ret;
++ }
++
++ val |= PMT_CTL_PHY_PWRUP;
++
++ ret = smsc75xx_write_reg_nopm(dev, PMT_CTL, val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing PMT_CTL\n");
++ return ret;
++ }
++ }
++
++ ret = smsc75xx_wait_ready(dev, 1);
++ if (ret < 0) {
++ netdev_warn(dev->net, "device not ready in smsc75xx_resume\n");
++ return ret;
++ }
++
++ return usbnet_resume(intf);
++}
++
++static void smsc75xx_rx_csum_offload(struct usbnet *dev, struct sk_buff *skb,
++ u32 rx_cmd_a, u32 rx_cmd_b)
++{
++ if (!(dev->net->features & NETIF_F_RXCSUM) ||
++ unlikely(rx_cmd_a & RX_CMD_A_LCSM)) {
++ skb->ip_summed = CHECKSUM_NONE;
++ } else {
++ skb->csum = ntohs((u16)(rx_cmd_b >> RX_CMD_B_CSUM_SHIFT));
++ skb->ip_summed = CHECKSUM_COMPLETE;
++ }
++}
++
++static int smsc75xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
++{
++ /* This check is no longer done by usbnet */
++ if (skb->len < dev->net->hard_header_len)
++ return 0;
++
++ while (skb->len > 0) {
++ u32 rx_cmd_a, rx_cmd_b, align_count, size;
++ struct sk_buff *ax_skb;
++ unsigned char *packet;
++
++ memcpy(&rx_cmd_a, skb->data, sizeof(rx_cmd_a));
++ le32_to_cpus(&rx_cmd_a);
++ skb_pull(skb, 4);
++
++ memcpy(&rx_cmd_b, skb->data, sizeof(rx_cmd_b));
++ le32_to_cpus(&rx_cmd_b);
++ skb_pull(skb, 4 + RXW_PADDING);
++
++ packet = skb->data;
++
++ /* get the packet length */
++ size = (rx_cmd_a & RX_CMD_A_LEN) - RXW_PADDING;
++ align_count = (4 - ((size + RXW_PADDING) % 4)) % 4;
++
++ if (unlikely(rx_cmd_a & RX_CMD_A_RED)) {
++ netif_dbg(dev, rx_err, dev->net,
++ "Error rx_cmd_a=0x%08x\n", rx_cmd_a);
++ dev->net->stats.rx_errors++;
++ dev->net->stats.rx_dropped++;
++
++ if (rx_cmd_a & RX_CMD_A_FCS)
++ dev->net->stats.rx_crc_errors++;
++ else if (rx_cmd_a & (RX_CMD_A_LONG | RX_CMD_A_RUNT))
++ dev->net->stats.rx_frame_errors++;
++ } else {
++ /* MAX_SINGLE_PACKET_SIZE + 4(CRC) + 2(COE) + 4(Vlan) */
++ if (unlikely(size > (MAX_SINGLE_PACKET_SIZE + ETH_HLEN + 12))) {
++ netif_dbg(dev, rx_err, dev->net,
++ "size err rx_cmd_a=0x%08x\n",
++ rx_cmd_a);
++ return 0;
++ }
++
++ /* last frame in this batch */
++ if (skb->len == size) {
++ smsc75xx_rx_csum_offload(dev, skb, rx_cmd_a,
++ rx_cmd_b);
++
++ skb_trim(skb, skb->len - 4); /* remove fcs */
++ skb->truesize = size + sizeof(struct sk_buff);
++
++ return 1;
++ }
++
++ ax_skb = skb_clone(skb, GFP_ATOMIC);
++ if (unlikely(!ax_skb)) {
++ netdev_warn(dev->net, "Error allocating skb\n");
++ return 0;
++ }
++
++ ax_skb->len = size;
++ ax_skb->data = packet;
++ skb_set_tail_pointer(ax_skb, size);
++
++ smsc75xx_rx_csum_offload(dev, ax_skb, rx_cmd_a,
++ rx_cmd_b);
++
++ skb_trim(ax_skb, ax_skb->len - 4); /* remove fcs */
++ ax_skb->truesize = size + sizeof(struct sk_buff);
++
++ usbnet_skb_return(dev, ax_skb);
++ }
++
++ skb_pull(skb, size);
++
++ /* padding bytes before the next frame starts */
++ if (skb->len)
++ skb_pull(skb, align_count);
++ }
++
++ if (unlikely(skb->len < 0)) {
++ netdev_warn(dev->net, "invalid rx length<0 %d\n", skb->len);
++ return 0;
++ }
++
++ return 1;
++}
++
++static struct sk_buff *smsc75xx_tx_fixup(struct usbnet *dev,
++ struct sk_buff *skb, gfp_t flags)
++{
++ u32 tx_cmd_a, tx_cmd_b;
++
++ if (skb_headroom(skb) < SMSC75XX_TX_OVERHEAD) {
++ struct sk_buff *skb2 =
++ skb_copy_expand(skb, SMSC75XX_TX_OVERHEAD, 0, flags);
++ dev_kfree_skb_any(skb);
++ skb = skb2;
++ if (!skb)
++ return NULL;
++ }
++
++ tx_cmd_a = (u32)(skb->len & TX_CMD_A_LEN) | TX_CMD_A_FCS;
++
++ if (skb->ip_summed == CHECKSUM_PARTIAL)
++ tx_cmd_a |= TX_CMD_A_IPE | TX_CMD_A_TPE;
++
++ if (skb_is_gso(skb)) {
++ u16 mss = max(skb_shinfo(skb)->gso_size, TX_MSS_MIN);
++ tx_cmd_b = (mss << TX_CMD_B_MSS_SHIFT) & TX_CMD_B_MSS;
++
++ tx_cmd_a |= TX_CMD_A_LSO;
++ } else {
++ tx_cmd_b = 0;
++ }
++
++ skb_push(skb, 4);
++ cpu_to_le32s(&tx_cmd_b);
++ memcpy(skb->data, &tx_cmd_b, 4);
++
++ skb_push(skb, 4);
++ cpu_to_le32s(&tx_cmd_a);
++ memcpy(skb->data, &tx_cmd_a, 4);
++
++ return skb;
++}
++
++static int smsc75xx_manage_power(struct usbnet *dev, int on)
++{
++ dev->intf->needs_remote_wakeup = on;
++ return 0;
++}
++
++static const struct driver_info smsc75xx_info = {
++ .description = "smsc75xx USB 2.0 Gigabit Ethernet",
++ .bind = smsc75xx_bind,
++ .unbind = smsc75xx_unbind,
++ .link_reset = smsc75xx_link_reset,
++ .reset = smsc75xx_reset,
++ .rx_fixup = smsc75xx_rx_fixup,
++ .tx_fixup = smsc75xx_tx_fixup,
++ .status = smsc75xx_status,
++ .manage_power = smsc75xx_manage_power,
++ .flags = FLAG_ETHER | FLAG_SEND_ZLP | FLAG_LINK_INTR,
++};
++
++static const struct usb_device_id products[] = {
++ {
++ /* SMSC7500 USB Gigabit Ethernet Device */
++ USB_DEVICE(USB_VENDOR_ID_SMSC, USB_PRODUCT_ID_LAN7500),
++ .driver_info = (unsigned long) &smsc75xx_info,
++ },
++ {
++ /* SMSC7500 USB Gigabit Ethernet Device */
++ USB_DEVICE(USB_VENDOR_ID_SMSC, USB_PRODUCT_ID_LAN7505),
++ .driver_info = (unsigned long) &smsc75xx_info,
++ },
++ { }, /* END */
++};
++MODULE_DEVICE_TABLE(usb, products);
++
++static struct usb_driver smsc75xx_driver = {
++ .name = SMSC_CHIPNAME,
++ .id_table = products,
++ .probe = usbnet_probe,
++ .suspend = smsc75xx_suspend,
++ .resume = smsc75xx_resume,
++ .reset_resume = smsc75xx_resume,
++ .disconnect = usbnet_disconnect,
++ .disable_hub_initiated_lpm = 1,
++ .supports_autosuspend = 1,
++};
++
++module_usb_driver(smsc75xx_driver);
++
++MODULE_AUTHOR("Nancy Lin");
++MODULE_AUTHOR("Steve Glendinning <steve.glendinning(a)shawell.net>");
++MODULE_DESCRIPTION("SMSC75XX USB 2.0 Gigabit Ethernet Devices");
++MODULE_LICENSE("GPL");
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/smsc75xx.h backports-4.2.6-1/drivers/net/usb/smsc75xx.h
+--- backports-4.2.6-1.org/drivers/net/usb/smsc75xx.h 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/smsc75xx.h 2015-11-09 23:37:56.000000000 +0100
+@@ -0,0 +1,421 @@
++ /***************************************************************************
++ *
++ * Copyright (C) 2007-2010 SMSC
++ *
++ * 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, see <http://www.gnu.org/licenses/>.
++ *
++ *****************************************************************************/
++
++#ifndef _SMSC75XX_H
++#define _SMSC75XX_H
++
++/* Tx command words */
++#define TX_CMD_A_LSO (0x08000000)
++#define TX_CMD_A_IPE (0x04000000)
++#define TX_CMD_A_TPE (0x02000000)
++#define TX_CMD_A_IVTG (0x01000000)
++#define TX_CMD_A_RVTG (0x00800000)
++#define TX_CMD_A_FCS (0x00400000)
++#define TX_CMD_A_LEN (0x000FFFFF)
++
++#define TX_CMD_B_MSS (0x3FFF0000)
++#define TX_CMD_B_MSS_SHIFT (16)
++#define TX_MSS_MIN ((u16)8)
++#define TX_CMD_B_VTAG (0x0000FFFF)
++
++/* Rx command words */
++#define RX_CMD_A_ICE (0x80000000)
++#define RX_CMD_A_TCE (0x40000000)
++#define RX_CMD_A_IPV (0x20000000)
++#define RX_CMD_A_PID (0x18000000)
++#define RX_CMD_A_PID_NIP (0x00000000)
++#define RX_CMD_A_PID_TCP (0x08000000)
++#define RX_CMD_A_PID_UDP (0x10000000)
++#define RX_CMD_A_PID_PP (0x18000000)
++#define RX_CMD_A_PFF (0x04000000)
++#define RX_CMD_A_BAM (0x02000000)
++#define RX_CMD_A_MAM (0x01000000)
++#define RX_CMD_A_FVTG (0x00800000)
++#define RX_CMD_A_RED (0x00400000)
++#define RX_CMD_A_RWT (0x00200000)
++#define RX_CMD_A_RUNT (0x00100000)
++#define RX_CMD_A_LONG (0x00080000)
++#define RX_CMD_A_RXE (0x00040000)
++#define RX_CMD_A_DRB (0x00020000)
++#define RX_CMD_A_FCS (0x00010000)
++#define RX_CMD_A_UAM (0x00008000)
++#define RX_CMD_A_LCSM (0x00004000)
++#define RX_CMD_A_LEN (0x00003FFF)
++
++#define RX_CMD_B_CSUM (0xFFFF0000)
++#define RX_CMD_B_CSUM_SHIFT (16)
++#define RX_CMD_B_VTAG (0x0000FFFF)
++
++/* SCSRs */
++#define ID_REV (0x0000)
++
++#define FPGA_REV (0x0004)
++
++#define BOND_CTL (0x0008)
++
++#define INT_STS (0x000C)
++#define INT_STS_RDFO_INT (0x00400000)
++#define INT_STS_TXE_INT (0x00200000)
++#define INT_STS_MACRTO_INT (0x00100000)
++#define INT_STS_TX_DIS_INT (0x00080000)
++#define INT_STS_RX_DIS_INT (0x00040000)
++#define INT_STS_PHY_INT_ (0x00020000)
++#define INT_STS_MAC_ERR_INT (0x00008000)
++#define INT_STS_TDFU (0x00004000)
++#define INT_STS_TDFO (0x00002000)
++#define INT_STS_GPIOS (0x00000FFF)
++#define INT_STS_CLEAR_ALL (0xFFFFFFFF)
++
++#define HW_CFG (0x0010)
++#define HW_CFG_SMDET_STS (0x00008000)
++#define HW_CFG_SMDET_EN (0x00004000)
++#define HW_CFG_EEM (0x00002000)
++#define HW_CFG_RST_PROTECT (0x00001000)
++#define HW_CFG_PORT_SWAP (0x00000800)
++#define HW_CFG_PHY_BOOST (0x00000600)
++#define HW_CFG_PHY_BOOST_NORMAL (0x00000000)
++#define HW_CFG_PHY_BOOST_4 (0x00002000)
++#define HW_CFG_PHY_BOOST_8 (0x00004000)
++#define HW_CFG_PHY_BOOST_12 (0x00006000)
++#define HW_CFG_LEDB (0x00000100)
++#define HW_CFG_BIR (0x00000080)
++#define HW_CFG_SBP (0x00000040)
++#define HW_CFG_IME (0x00000020)
++#define HW_CFG_MEF (0x00000010)
++#define HW_CFG_ETC (0x00000008)
++#define HW_CFG_BCE (0x00000004)
++#define HW_CFG_LRST (0x00000002)
++#define HW_CFG_SRST (0x00000001)
++
++#define PMT_CTL (0x0014)
++#define PMT_CTL_PHY_PWRUP (0x00000400)
++#define PMT_CTL_RES_CLR_WKP_EN (0x00000100)
++#define PMT_CTL_DEV_RDY (0x00000080)
++#define PMT_CTL_SUS_MODE (0x00000060)
++#define PMT_CTL_SUS_MODE_0 (0x00000000)
++#define PMT_CTL_SUS_MODE_1 (0x00000020)
++#define PMT_CTL_SUS_MODE_2 (0x00000040)
++#define PMT_CTL_SUS_MODE_3 (0x00000060)
++#define PMT_CTL_PHY_RST (0x00000010)
++#define PMT_CTL_WOL_EN (0x00000008)
++#define PMT_CTL_ED_EN (0x00000004)
++#define PMT_CTL_WUPS (0x00000003)
++#define PMT_CTL_WUPS_NO (0x00000000)
++#define PMT_CTL_WUPS_ED (0x00000001)
++#define PMT_CTL_WUPS_WOL (0x00000002)
++#define PMT_CTL_WUPS_MULTI (0x00000003)
++
++#define LED_GPIO_CFG (0x0018)
++#define LED_GPIO_CFG_LED2_FUN_SEL (0x80000000)
++#define LED_GPIO_CFG_LED10_FUN_SEL (0x40000000)
++#define LED_GPIO_CFG_LEDGPIO_EN (0x0000F000)
++#define LED_GPIO_CFG_LEDGPIO_EN_0 (0x00001000)
++#define LED_GPIO_CFG_LEDGPIO_EN_1 (0x00002000)
++#define LED_GPIO_CFG_LEDGPIO_EN_2 (0x00004000)
++#define LED_GPIO_CFG_LEDGPIO_EN_3 (0x00008000)
++#define LED_GPIO_CFG_GPBUF (0x00000F00)
++#define LED_GPIO_CFG_GPBUF_0 (0x00000100)
++#define LED_GPIO_CFG_GPBUF_1 (0x00000200)
++#define LED_GPIO_CFG_GPBUF_2 (0x00000400)
++#define LED_GPIO_CFG_GPBUF_3 (0x00000800)
++#define LED_GPIO_CFG_GPDIR (0x000000F0)
++#define LED_GPIO_CFG_GPDIR_0 (0x00000010)
++#define LED_GPIO_CFG_GPDIR_1 (0x00000020)
++#define LED_GPIO_CFG_GPDIR_2 (0x00000040)
++#define LED_GPIO_CFG_GPDIR_3 (0x00000080)
++#define LED_GPIO_CFG_GPDATA (0x0000000F)
++#define LED_GPIO_CFG_GPDATA_0 (0x00000001)
++#define LED_GPIO_CFG_GPDATA_1 (0x00000002)
++#define LED_GPIO_CFG_GPDATA_2 (0x00000004)
++#define LED_GPIO_CFG_GPDATA_3 (0x00000008)
++
++#define GPIO_CFG (0x001C)
++#define GPIO_CFG_SHIFT (24)
++#define GPIO_CFG_GPEN (0xFF000000)
++#define GPIO_CFG_GPBUF (0x00FF0000)
++#define GPIO_CFG_GPDIR (0x0000FF00)
++#define GPIO_CFG_GPDATA (0x000000FF)
++
++#define GPIO_WAKE (0x0020)
++#define GPIO_WAKE_PHY_LINKUP_EN (0x80000000)
++#define GPIO_WAKE_POL (0x0FFF0000)
++#define GPIO_WAKE_POL_SHIFT (16)
++#define GPIO_WAKE_WK (0x00000FFF)
++
++#define DP_SEL (0x0024)
++#define DP_SEL_DPRDY (0x80000000)
++#define DP_SEL_RSEL (0x0000000F)
++#define DP_SEL_URX (0x00000000)
++#define DP_SEL_VHF (0x00000001)
++#define DP_SEL_VHF_HASH_LEN (16)
++#define DP_SEL_VHF_VLAN_LEN (128)
++#define DP_SEL_LSO_HEAD (0x00000002)
++#define DP_SEL_FCT_RX (0x00000003)
++#define DP_SEL_FCT_TX (0x00000004)
++#define DP_SEL_DESCRIPTOR (0x00000005)
++#define DP_SEL_WOL (0x00000006)
++
++#define DP_CMD (0x0028)
++#define DP_CMD_WRITE (0x01)
++#define DP_CMD_READ (0x00)
++
++#define DP_ADDR (0x002C)
++
++#define DP_DATA (0x0030)
++
++#define BURST_CAP (0x0034)
++#define BURST_CAP_MASK (0x0000000F)
++
++#define INT_EP_CTL (0x0038)
++#define INT_EP_CTL_INTEP_ON (0x80000000)
++#define INT_EP_CTL_RDFO_EN (0x00400000)
++#define INT_EP_CTL_TXE_EN (0x00200000)
++#define INT_EP_CTL_MACROTO_EN (0x00100000)
++#define INT_EP_CTL_TX_DIS_EN (0x00080000)
++#define INT_EP_CTL_RX_DIS_EN (0x00040000)
++#define INT_EP_CTL_PHY_EN_ (0x00020000)
++#define INT_EP_CTL_MAC_ERR_EN (0x00008000)
++#define INT_EP_CTL_TDFU_EN (0x00004000)
++#define INT_EP_CTL_TDFO_EN (0x00002000)
++#define INT_EP_CTL_RX_FIFO_EN (0x00001000)
++#define INT_EP_CTL_GPIOX_EN (0x00000FFF)
++
++#define BULK_IN_DLY (0x003C)
++#define BULK_IN_DLY_MASK (0xFFFF)
++
++#define E2P_CMD (0x0040)
++#define E2P_CMD_BUSY (0x80000000)
++#define E2P_CMD_MASK (0x70000000)
++#define E2P_CMD_READ (0x00000000)
++#define E2P_CMD_EWDS (0x10000000)
++#define E2P_CMD_EWEN (0x20000000)
++#define E2P_CMD_WRITE (0x30000000)
++#define E2P_CMD_WRAL (0x40000000)
++#define E2P_CMD_ERASE (0x50000000)
++#define E2P_CMD_ERAL (0x60000000)
++#define E2P_CMD_RELOAD (0x70000000)
++#define E2P_CMD_TIMEOUT (0x00000400)
++#define E2P_CMD_LOADED (0x00000200)
++#define E2P_CMD_ADDR (0x000001FF)
++
++#define MAX_EEPROM_SIZE (512)
++
++#define E2P_DATA (0x0044)
++#define E2P_DATA_MASK_ (0x000000FF)
++
++#define RFE_CTL (0x0060)
++#define RFE_CTL_TCPUDP_CKM (0x00001000)
++#define RFE_CTL_IP_CKM (0x00000800)
++#define RFE_CTL_AB (0x00000400)
++#define RFE_CTL_AM (0x00000200)
++#define RFE_CTL_AU (0x00000100)
++#define RFE_CTL_VS (0x00000080)
++#define RFE_CTL_UF (0x00000040)
++#define RFE_CTL_VF (0x00000020)
++#define RFE_CTL_SPF (0x00000010)
++#define RFE_CTL_MHF (0x00000008)
++#define RFE_CTL_DHF (0x00000004)
++#define RFE_CTL_DPF (0x00000002)
++#define RFE_CTL_RST_RF (0x00000001)
++
++#define VLAN_TYPE (0x0064)
++#define VLAN_TYPE_MASK (0x0000FFFF)
++
++#define FCT_RX_CTL (0x0090)
++#define FCT_RX_CTL_EN (0x80000000)
++#define FCT_RX_CTL_RST (0x40000000)
++#define FCT_RX_CTL_SBF (0x02000000)
++#define FCT_RX_CTL_OVERFLOW (0x01000000)
++#define FCT_RX_CTL_FRM_DROP (0x00800000)
++#define FCT_RX_CTL_RX_NOT_EMPTY (0x00400000)
++#define FCT_RX_CTL_RX_EMPTY (0x00200000)
++#define FCT_RX_CTL_RX_DISABLED (0x00100000)
++#define FCT_RX_CTL_RXUSED (0x0000FFFF)
++
++#define FCT_TX_CTL (0x0094)
++#define FCT_TX_CTL_EN (0x80000000)
++#define FCT_TX_CTL_RST (0x40000000)
++#define FCT_TX_CTL_TX_NOT_EMPTY (0x00400000)
++#define FCT_TX_CTL_TX_EMPTY (0x00200000)
++#define FCT_TX_CTL_TX_DISABLED (0x00100000)
++#define FCT_TX_CTL_TXUSED (0x0000FFFF)
++
++#define FCT_RX_FIFO_END (0x0098)
++#define FCT_RX_FIFO_END_MASK (0x0000007F)
++
++#define FCT_TX_FIFO_END (0x009C)
++#define FCT_TX_FIFO_END_MASK (0x0000003F)
++
++#define FCT_FLOW (0x00A0)
++#define FCT_FLOW_THRESHOLD_OFF (0x00007F00)
++#define FCT_FLOW_THRESHOLD_OFF_SHIFT (8)
++#define FCT_FLOW_THRESHOLD_ON (0x0000007F)
++
++/* MAC CSRs */
++#define MAC_CR (0x100)
++#define MAC_CR_ADP (0x00002000)
++#define MAC_CR_ADD (0x00001000)
++#define MAC_CR_ASD (0x00000800)
++#define MAC_CR_INT_LOOP (0x00000400)
++#define MAC_CR_BOLMT (0x000000C0)
++#define MAC_CR_FDPX (0x00000008)
++#define MAC_CR_CFG (0x00000006)
++#define MAC_CR_CFG_10 (0x00000000)
++#define MAC_CR_CFG_100 (0x00000002)
++#define MAC_CR_CFG_1000 (0x00000004)
++#define MAC_CR_RST (0x00000001)
++
++#define MAC_RX (0x104)
++#define MAC_RX_MAX_SIZE (0x3FFF0000)
++#define MAC_RX_MAX_SIZE_SHIFT (16)
++#define MAC_RX_FCS_STRIP (0x00000010)
++#define MAC_RX_FSE (0x00000004)
++#define MAC_RX_RXD (0x00000002)
++#define MAC_RX_RXEN (0x00000001)
++
++#define MAC_TX (0x108)
++#define MAC_TX_BFCS (0x00000004)
++#define MAC_TX_TXD (0x00000002)
++#define MAC_TX_TXEN (0x00000001)
++
++#define FLOW (0x10C)
++#define FLOW_FORCE_FC (0x80000000)
++#define FLOW_TX_FCEN (0x40000000)
++#define FLOW_RX_FCEN (0x20000000)
++#define FLOW_FPF (0x10000000)
++#define FLOW_PAUSE_TIME (0x0000FFFF)
++
++#define RAND_SEED (0x110)
++#define RAND_SEED_MASK (0x0000FFFF)
++
++#define ERR_STS (0x114)
++#define ERR_STS_FCS_ERR (0x00000100)
++#define ERR_STS_LFRM_ERR (0x00000080)
++#define ERR_STS_RUNT_ERR (0x00000040)
++#define ERR_STS_COLLISION_ERR (0x00000010)
++#define ERR_STS_ALIGN_ERR (0x00000008)
++#define ERR_STS_URUN_ERR (0x00000004)
++
++#define RX_ADDRH (0x118)
++#define RX_ADDRH_MASK (0x0000FFFF)
++
++#define RX_ADDRL (0x11C)
++
++#define MII_ACCESS (0x120)
++#define MII_ACCESS_PHY_ADDR (0x0000F800)
++#define MII_ACCESS_PHY_ADDR_SHIFT (11)
++#define MII_ACCESS_REG_ADDR (0x000007C0)
++#define MII_ACCESS_REG_ADDR_SHIFT (6)
++#define MII_ACCESS_READ (0x00000000)
++#define MII_ACCESS_WRITE (0x00000002)
++#define MII_ACCESS_BUSY (0x00000001)
++
++#define MII_DATA (0x124)
++#define MII_DATA_MASK (0x0000FFFF)
++
++#define WUCSR (0x140)
++#define WUCSR_PFDA_FR (0x00000080)
++#define WUCSR_WUFR (0x00000040)
++#define WUCSR_MPR (0x00000020)
++#define WUCSR_BCAST_FR (0x00000010)
++#define WUCSR_PFDA_EN (0x00000008)
++#define WUCSR_WUEN (0x00000004)
++#define WUCSR_MPEN (0x00000002)
++#define WUCSR_BCST_EN (0x00000001)
++
++#define WUF_CFGX (0x144)
++#define WUF_CFGX_EN (0x80000000)
++#define WUF_CFGX_ATYPE (0x03000000)
++#define WUF_CFGX_ATYPE_UNICAST (0x00000000)
++#define WUF_CFGX_ATYPE_MULTICAST (0x02000000)
++#define WUF_CFGX_ATYPE_ALL (0x03000000)
++#define WUF_CFGX_PATTERN_OFFSET (0x007F0000)
++#define WUF_CFGX_PATTERN_OFFSET_SHIFT (16)
++#define WUF_CFGX_CRC16 (0x0000FFFF)
++#define WUF_NUM (8)
++
++#define WUF_MASKX (0x170)
++#define WUF_MASKX_AVALID (0x80000000)
++#define WUF_MASKX_ATYPE (0x40000000)
++
++#define ADDR_FILTX (0x300)
++#define ADDR_FILTX_FB_VALID (0x80000000)
++#define ADDR_FILTX_FB_TYPE (0x40000000)
++#define ADDR_FILTX_FB_ADDRHI (0x0000FFFF)
++#define ADDR_FILTX_SB_ADDRLO (0xFFFFFFFF)
++
++#define WUCSR2 (0x500)
++#define WUCSR2_NS_RCD (0x00000040)
++#define WUCSR2_ARP_RCD (0x00000020)
++#define WUCSR2_TCPSYN_RCD (0x00000010)
++#define WUCSR2_NS_OFFLOAD (0x00000004)
++#define WUCSR2_ARP_OFFLOAD (0x00000002)
++#define WUCSR2_TCPSYN_OFFLOAD (0x00000001)
++
++#define WOL_FIFO_STS (0x504)
++
++#define IPV6_ADDRX (0x510)
++
++#define IPV4_ADDRX (0x590)
++
++
++/* Vendor-specific PHY Definitions */
++
++/* Mode Control/Status Register */
++#define PHY_MODE_CTRL_STS (17)
++#define MODE_CTRL_STS_EDPWRDOWN ((u16)0x2000)
++#define MODE_CTRL_STS_ENERGYON ((u16)0x0002)
++
++#define PHY_INT_SRC (29)
++#define PHY_INT_SRC_ENERGY_ON ((u16)0x0080)
++#define PHY_INT_SRC_ANEG_COMP ((u16)0x0040)
++#define PHY_INT_SRC_REMOTE_FAULT ((u16)0x0020)
++#define PHY_INT_SRC_LINK_DOWN ((u16)0x0010)
++#define PHY_INT_SRC_CLEAR_ALL ((u16)0xffff)
++
++#define PHY_INT_MASK (30)
++#define PHY_INT_MASK_ENERGY_ON ((u16)0x0080)
++#define PHY_INT_MASK_ANEG_COMP ((u16)0x0040)
++#define PHY_INT_MASK_REMOTE_FAULT ((u16)0x0020)
++#define PHY_INT_MASK_LINK_DOWN ((u16)0x0010)
++#define PHY_INT_MASK_DEFAULT (PHY_INT_MASK_ANEG_COMP | \
++ PHY_INT_MASK_LINK_DOWN)
++
++#define PHY_SPECIAL (31)
++#define PHY_SPECIAL_SPD ((u16)0x001C)
++#define PHY_SPECIAL_SPD_10HALF ((u16)0x0004)
++#define PHY_SPECIAL_SPD_10FULL ((u16)0x0014)
++#define PHY_SPECIAL_SPD_100HALF ((u16)0x0008)
++#define PHY_SPECIAL_SPD_100FULL ((u16)0x0018)
++
++/* USB Vendor Requests */
++#define USB_VENDOR_REQUEST_WRITE_REGISTER 0xA0
++#define USB_VENDOR_REQUEST_READ_REGISTER 0xA1
++#define USB_VENDOR_REQUEST_GET_STATS 0xA2
++
++/* Interrupt Endpoint status word bitfields */
++#define INT_ENP_RDFO_INT ((u32)BIT(22))
++#define INT_ENP_TXE_INT ((u32)BIT(21))
++#define INT_ENP_TX_DIS_INT ((u32)BIT(19))
++#define INT_ENP_RX_DIS_INT ((u32)BIT(18))
++#define INT_ENP_PHY_INT ((u32)BIT(17))
++#define INT_ENP_MAC_ERR_INT ((u32)BIT(15))
++#define INT_ENP_RX_FIFO_DATA_INT ((u32)BIT(12))
++
++#endif /* _SMSC75XX_H */
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/smsc95xx.c backports-4.2.6-1/drivers/net/usb/smsc95xx.c
+--- backports-4.2.6-1.org/drivers/net/usb/smsc95xx.c 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/smsc95xx.c 2015-11-09 23:37:56.000000000 +0100
+@@ -0,0 +1,2032 @@
++ /***************************************************************************
++ *
++ * Copyright (C) 2007-2008 SMSC
++ *
++ * 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, see <http://www.gnu.org/licenses/>.
++ *
++ *****************************************************************************/
++
++#include <linux/module.h>
++#include <linux/kmod.h>
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/ethtool.h>
++#include <linux/mii.h>
++#include <linux/usb.h>
++#include <linux/bitrev.h>
++#include <linux/crc16.h>
++#include <linux/crc32.h>
++#include <linux/usb/usbnet.h>
++#include <linux/slab.h>
++#include "smsc95xx.h"
++
++#define SMSC_CHIPNAME "smsc95xx"
++#define SMSC_DRIVER_VERSION "1.0.4"
++#define HS_USB_PKT_SIZE (512)
++#define FS_USB_PKT_SIZE (64)
++#define DEFAULT_HS_BURST_CAP_SIZE (16 * 1024 + 5 * HS_USB_PKT_SIZE)
++#define DEFAULT_FS_BURST_CAP_SIZE (6 * 1024 + 33 * FS_USB_PKT_SIZE)
++#define DEFAULT_BULK_IN_DELAY (0x00002000)
++#define MAX_SINGLE_PACKET_SIZE (2048)
++#define LAN95XX_EEPROM_MAGIC (0x9500)
++#define EEPROM_MAC_OFFSET (0x01)
++#define DEFAULT_TX_CSUM_ENABLE (true)
++#define DEFAULT_RX_CSUM_ENABLE (true)
++#define SMSC95XX_INTERNAL_PHY_ID (1)
++#define SMSC95XX_TX_OVERHEAD (8)
++#define SMSC95XX_TX_OVERHEAD_CSUM (12)
++#define SUPPORTED_WAKE (WAKE_PHY | WAKE_UCAST | WAKE_BCAST | \
++ WAKE_MCAST | WAKE_ARP | WAKE_MAGIC)
++
++#define FEATURE_8_WAKEUP_FILTERS (0x01)
++#define FEATURE_PHY_NLP_CROSSOVER (0x02)
++#define FEATURE_REMOTE_WAKEUP (0x04)
++
++#define SUSPEND_SUSPEND0 (0x01)
++#define SUSPEND_SUSPEND1 (0x02)
++#define SUSPEND_SUSPEND2 (0x04)
++#define SUSPEND_SUSPEND3 (0x08)
++#define SUSPEND_ALLMODES (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \
++ SUSPEND_SUSPEND2 | SUSPEND_SUSPEND3)
++
++struct smsc95xx_priv {
++ u32 mac_cr;
++ u32 hash_hi;
++ u32 hash_lo;
++ u32 wolopts;
++ spinlock_t mac_cr_lock;
++ u8 features;
++ u8 suspend_flags;
++};
++
++static bool turbo_mode = true;
++module_param(turbo_mode, bool, 0644);
++MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction");
++
++static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
++ u32 *data, int in_pm)
++{
++ u32 buf;
++ int ret;
++ int (*fn)(struct usbnet *, u8, u8, u16, u16, void *, u16);
++
++ BUG_ON(!dev);
++
++ if (!in_pm)
++ fn = usbnet_read_cmd;
++ else
++ fn = usbnet_read_cmd_nopm;
++
++ ret = fn(dev, USB_VENDOR_REQUEST_READ_REGISTER, USB_DIR_IN
++ | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
++ 0, index, &buf, 4);
++ if (unlikely(ret < 0))
++ netdev_warn(dev->net, "Failed to read reg index 0x%08x: %d\n",
++ index, ret);
++
++ le32_to_cpus(&buf);
++ *data = buf;
++
++ return ret;
++}
++
++static int __must_check __smsc95xx_write_reg(struct usbnet *dev, u32 index,
++ u32 data, int in_pm)
++{
++ u32 buf;
++ int ret;
++ int (*fn)(struct usbnet *, u8, u8, u16, u16, const void *, u16);
++
++ BUG_ON(!dev);
++
++ if (!in_pm)
++ fn = usbnet_write_cmd;
++ else
++ fn = usbnet_write_cmd_nopm;
++
++ buf = data;
++ cpu_to_le32s(&buf);
++
++ ret = fn(dev, USB_VENDOR_REQUEST_WRITE_REGISTER, USB_DIR_OUT
++ | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
++ 0, index, &buf, 4);
++ if (unlikely(ret < 0))
++ netdev_warn(dev->net, "Failed to write reg index 0x%08x: %d\n",
++ index, ret);
++
++ return ret;
++}
++
++static int __must_check smsc95xx_read_reg_nopm(struct usbnet *dev, u32 index,
++ u32 *data)
++{
++ return __smsc95xx_read_reg(dev, index, data, 1);
++}
++
++static int __must_check smsc95xx_write_reg_nopm(struct usbnet *dev, u32 index,
++ u32 data)
++{
++ return __smsc95xx_write_reg(dev, index, data, 1);
++}
++
++static int __must_check smsc95xx_read_reg(struct usbnet *dev, u32 index,
++ u32 *data)
++{
++ return __smsc95xx_read_reg(dev, index, data, 0);
++}
++
++static int __must_check smsc95xx_write_reg(struct usbnet *dev, u32 index,
++ u32 data)
++{
++ return __smsc95xx_write_reg(dev, index, data, 0);
++}
++
++/* Loop until the read is completed with timeout
++ * called with phy_mutex held */
++static int __must_check __smsc95xx_phy_wait_not_busy(struct usbnet *dev,
++ int in_pm)
++{
++ unsigned long start_time = jiffies;
++ u32 val;
++ int ret;
++
++ do {
++ ret = __smsc95xx_read_reg(dev, MII_ADDR, &val, in_pm);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error reading MII_ACCESS\n");
++ return ret;
++ }
++
++ if (!(val & MII_BUSY_))
++ return 0;
++ } while (!time_after(jiffies, start_time + HZ));
++
++ return -EIO;
++}
++
++static int __smsc95xx_mdio_read(struct net_device *netdev, int phy_id, int idx,
++ int in_pm)
++{
++ struct usbnet *dev = netdev_priv(netdev);
++ u32 val, addr;
++ int ret;
++
++ mutex_lock(&dev->phy_mutex);
++
++ /* confirm MII not busy */
++ ret = __smsc95xx_phy_wait_not_busy(dev, in_pm);
++ if (ret < 0) {
++ netdev_warn(dev->net, "MII is busy in smsc95xx_mdio_read\n");
++ goto done;
++ }
++
++ /* set the address, index & direction (read from PHY) */
++ phy_id &= dev->mii.phy_id_mask;
++ idx &= dev->mii.reg_num_mask;
++ addr = (phy_id << 11) | (idx << 6) | MII_READ_ | MII_BUSY_;
++ ret = __smsc95xx_write_reg(dev, MII_ADDR, addr, in_pm);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing MII_ADDR\n");
++ goto done;
++ }
++
++ ret = __smsc95xx_phy_wait_not_busy(dev, in_pm);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Timed out reading MII reg %02X\n", idx);
++ goto done;
++ }
++
++ ret = __smsc95xx_read_reg(dev, MII_DATA, &val, in_pm);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error reading MII_DATA\n");
++ goto done;
++ }
++
++ ret = (u16)(val & 0xFFFF);
++
++done:
++ mutex_unlock(&dev->phy_mutex);
++ return ret;
++}
++
++static void __smsc95xx_mdio_write(struct net_device *netdev, int phy_id,
++ int idx, int regval, int in_pm)
++{
++ struct usbnet *dev = netdev_priv(netdev);
++ u32 val, addr;
++ int ret;
++
++ mutex_lock(&dev->phy_mutex);
++
++ /* confirm MII not busy */
++ ret = __smsc95xx_phy_wait_not_busy(dev, in_pm);
++ if (ret < 0) {
++ netdev_warn(dev->net, "MII is busy in smsc95xx_mdio_write\n");
++ goto done;
++ }
++
++ val = regval;
++ ret = __smsc95xx_write_reg(dev, MII_DATA, val, in_pm);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing MII_DATA\n");
++ goto done;
++ }
++
++ /* set the address, index & direction (write to PHY) */
++ phy_id &= dev->mii.phy_id_mask;
++ idx &= dev->mii.reg_num_mask;
++ addr = (phy_id << 11) | (idx << 6) | MII_WRITE_ | MII_BUSY_;
++ ret = __smsc95xx_write_reg(dev, MII_ADDR, addr, in_pm);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing MII_ADDR\n");
++ goto done;
++ }
++
++ ret = __smsc95xx_phy_wait_not_busy(dev, in_pm);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Timed out writing MII reg %02X\n", idx);
++ goto done;
++ }
++
++done:
++ mutex_unlock(&dev->phy_mutex);
++}
++
++static int smsc95xx_mdio_read_nopm(struct net_device *netdev, int phy_id,
++ int idx)
++{
++ return __smsc95xx_mdio_read(netdev, phy_id, idx, 1);
++}
++
++static void smsc95xx_mdio_write_nopm(struct net_device *netdev, int phy_id,
++ int idx, int regval)
++{
++ __smsc95xx_mdio_write(netdev, phy_id, idx, regval, 1);
++}
++
++static int smsc95xx_mdio_read(struct net_device *netdev, int phy_id, int idx)
++{
++ return __smsc95xx_mdio_read(netdev, phy_id, idx, 0);
++}
++
++static void smsc95xx_mdio_write(struct net_device *netdev, int phy_id, int idx,
++ int regval)
++{
++ __smsc95xx_mdio_write(netdev, phy_id, idx, regval, 0);
++}
++
++static int __must_check smsc95xx_wait_eeprom(struct usbnet *dev)
++{
++ unsigned long start_time = jiffies;
++ u32 val;
++ int ret;
++
++ do {
++ ret = smsc95xx_read_reg(dev, E2P_CMD, &val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error reading E2P_CMD\n");
++ return ret;
++ }
++
++ if (!(val & E2P_CMD_BUSY_) || (val & E2P_CMD_TIMEOUT_))
++ break;
++ udelay(40);
++ } while (!time_after(jiffies, start_time + HZ));
++
++ if (val & (E2P_CMD_TIMEOUT_ | E2P_CMD_BUSY_)) {
++ netdev_warn(dev->net, "EEPROM read operation timeout\n");
++ return -EIO;
++ }
++
++ return 0;
++}
++
++static int __must_check smsc95xx_eeprom_confirm_not_busy(struct usbnet *dev)
++{
++ unsigned long start_time = jiffies;
++ u32 val;
++ int ret;
++
++ do {
++ ret = smsc95xx_read_reg(dev, E2P_CMD, &val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error reading E2P_CMD\n");
++ return ret;
++ }
++
++ if (!(val & E2P_CMD_BUSY_))
++ return 0;
++
++ udelay(40);
++ } while (!time_after(jiffies, start_time + HZ));
++
++ netdev_warn(dev->net, "EEPROM is busy\n");
++ return -EIO;
++}
++
++static int smsc95xx_read_eeprom(struct usbnet *dev, u32 offset, u32 length,
++ u8 *data)
++{
++ u32 val;
++ int i, ret;
++
++ BUG_ON(!dev);
++ BUG_ON(!data);
++
++ ret = smsc95xx_eeprom_confirm_not_busy(dev);
++ if (ret)
++ return ret;
++
++ for (i = 0; i < length; i++) {
++ val = E2P_CMD_BUSY_ | E2P_CMD_READ_ | (offset & E2P_CMD_ADDR_);
++ ret = smsc95xx_write_reg(dev, E2P_CMD, val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing E2P_CMD\n");
++ return ret;
++ }
++
++ ret = smsc95xx_wait_eeprom(dev);
++ if (ret < 0)
++ return ret;
++
++ ret = smsc95xx_read_reg(dev, E2P_DATA, &val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error reading E2P_DATA\n");
++ return ret;
++ }
++
++ data[i] = val & 0xFF;
++ offset++;
++ }
++
++ return 0;
++}
++
++static int smsc95xx_write_eeprom(struct usbnet *dev, u32 offset, u32 length,
++ u8 *data)
++{
++ u32 val;
++ int i, ret;
++
++ BUG_ON(!dev);
++ BUG_ON(!data);
++
++ ret = smsc95xx_eeprom_confirm_not_busy(dev);
++ if (ret)
++ return ret;
++
++ /* Issue write/erase enable command */
++ val = E2P_CMD_BUSY_ | E2P_CMD_EWEN_;
++ ret = smsc95xx_write_reg(dev, E2P_CMD, val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing E2P_DATA\n");
++ return ret;
++ }
++
++ ret = smsc95xx_wait_eeprom(dev);
++ if (ret < 0)
++ return ret;
++
++ for (i = 0; i < length; i++) {
++
++ /* Fill data register */
++ val = data[i];
++ ret = smsc95xx_write_reg(dev, E2P_DATA, val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing E2P_DATA\n");
++ return ret;
++ }
++
++ /* Send "write" command */
++ val = E2P_CMD_BUSY_ | E2P_CMD_WRITE_ | (offset & E2P_CMD_ADDR_);
++ ret = smsc95xx_write_reg(dev, E2P_CMD, val);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Error writing E2P_CMD\n");
++ return ret;
++ }
++
++ ret = smsc95xx_wait_eeprom(dev);
++ if (ret < 0)
++ return ret;
++
++ offset++;
++ }
++
++ return 0;
++}
++
++static int __must_check smsc95xx_write_reg_async(struct usbnet *dev, u16 index,
++ u32 data)
++{
++ const u16 size = 4;
++ u32 buf;
++ int ret;
++
++ buf = data;
++ cpu_to_le32s(&buf);
++
++ ret = usbnet_write_cmd_async(dev, USB_VENDOR_REQUEST_WRITE_REGISTER,
++ USB_DIR_OUT | USB_TYPE_VENDOR |
++ USB_RECIP_DEVICE,
++ 0, index, &buf, size);
++ if (ret < 0)
++ netdev_warn(dev->net, "Error write async cmd, sts=%d\n",
++ ret);
++ return ret;
++}
++
++/* returns hash bit number for given MAC address
++ * example:
++ * 01 00 5E 00 00 01 -> returns bit number 31 */
++static unsigned int smsc95xx_hash(char addr[ETH_ALEN])
++{
++ return (ether_crc(ETH_ALEN, addr) >> 26) & 0x3f;
++}
++
++static void smsc95xx_set_multicast(struct net_device *netdev)
++{
++ struct usbnet *dev = netdev_priv(netdev);
++ struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
++ unsigned long flags;
++ int ret;
++
++ pdata->hash_hi = 0;
++ pdata->hash_lo = 0;
++
++ spin_lock_irqsave(&pdata->mac_cr_lock, flags);
++
++ if (dev->net->flags & IFF_PROMISC) {
++ netif_dbg(dev, drv, dev->net, "promiscuous mode enabled\n");
++ pdata->mac_cr |= MAC_CR_PRMS_;
++ pdata->mac_cr &= ~(MAC_CR_MCPAS_ | MAC_CR_HPFILT_);
++ } else if (dev->net->flags & IFF_ALLMULTI) {
++ netif_dbg(dev, drv, dev->net, "receive all multicast enabled\n");
++ pdata->mac_cr |= MAC_CR_MCPAS_;
++ pdata->mac_cr &= ~(MAC_CR_PRMS_ | MAC_CR_HPFILT_);
++ } else if (!netdev_mc_empty(dev->net)) {
++ struct netdev_hw_addr *ha;
++
++ pdata->mac_cr |= MAC_CR_HPFILT_;
++ pdata->mac_cr &= ~(MAC_CR_PRMS_ | MAC_CR_MCPAS_);
++
++ netdev_for_each_mc_addr(ha, netdev) {
++ u32 bitnum = smsc95xx_hash(ha->addr);
++ u32 mask = 0x01 << (bitnum & 0x1F);
++ if (bitnum & 0x20)
++ pdata->hash_hi |= mask;
++ else
++ pdata->hash_lo |= mask;
++ }
++
++ netif_dbg(dev, drv, dev->net, "HASHH=0x%08X, HASHL=0x%08X\n",
++ pdata->hash_hi, pdata->hash_lo);
++ } else {
++ netif_dbg(dev, drv, dev->net, "receive own packets only\n");
++ pdata->mac_cr &=
++ ~(MAC_CR_PRMS_ | MAC_CR_MCPAS_ | MAC_CR_HPFILT_);
++ }
++
++ spin_unlock_irqrestore(&pdata->mac_cr_lock, flags);
++
++ /* Initiate async writes, as we can't wait for completion here */
++ ret = smsc95xx_write_reg_async(dev, HASHH, pdata->hash_hi);
++ if (ret < 0)
++ netdev_warn(dev->net, "failed to initiate async write to HASHH\n");
++
++ ret = smsc95xx_write_reg_async(dev, HASHL, pdata->hash_lo);
++ if (ret < 0)
++ netdev_warn(dev->net, "failed to initiate async write to HASHL\n");
++
++ ret = smsc95xx_write_reg_async(dev, MAC_CR, pdata->mac_cr);
++ if (ret < 0)
++ netdev_warn(dev->net, "failed to initiate async write to MAC_CR\n");
++}
++
++static int smsc95xx_phy_update_flowcontrol(struct usbnet *dev, u8 duplex,
++ u16 lcladv, u16 rmtadv)
++{
++ u32 flow, afc_cfg = 0;
++
++ int ret = smsc95xx_read_reg(dev, AFC_CFG, &afc_cfg);
++ if (ret < 0)
++ return ret;
++
++ if (duplex == DUPLEX_FULL) {
++ u8 cap = mii_resolve_flowctrl_fdx(lcladv, rmtadv);
++
++ if (cap & FLOW_CTRL_RX)
++ flow = 0xFFFF0002;
++ else
++ flow = 0;
++
++ if (cap & FLOW_CTRL_TX)
++ afc_cfg |= 0xF;
++ else
++ afc_cfg &= ~0xF;
++
++ netif_dbg(dev, link, dev->net, "rx pause %s, tx pause %s\n",
++ cap & FLOW_CTRL_RX ? "enabled" : "disabled",
++ cap & FLOW_CTRL_TX ? "enabled" : "disabled");
++ } else {
++ netif_dbg(dev, link, dev->net, "half duplex\n");
++ flow = 0;
++ afc_cfg |= 0xF;
++ }
++
++ ret = smsc95xx_write_reg(dev, FLOW, flow);
++ if (ret < 0)
++ return ret;
++
++ return smsc95xx_write_reg(dev, AFC_CFG, afc_cfg);
++}
++
++static int smsc95xx_link_reset(struct usbnet *dev)
++{
++ struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
++ struct mii_if_info *mii = &dev->mii;
++ struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET };
++ unsigned long flags;
++ u16 lcladv, rmtadv;
++ int ret;
++
++ /* clear interrupt status */
++ ret = smsc95xx_mdio_read(dev->net, mii->phy_id, PHY_INT_SRC);
++ if (ret < 0)
++ return ret;
++
++ ret = smsc95xx_write_reg(dev, INT_STS, INT_STS_CLEAR_ALL_);
++ if (ret < 0)
++ return ret;
++
++ mii_check_media(mii, 1, 1);
++ mii_ethtool_gset(&dev->mii, &ecmd);
++ lcladv = smsc95xx_mdio_read(dev->net, mii->phy_id, MII_ADVERTISE);
++ rmtadv = smsc95xx_mdio_read(dev->net, mii->phy_id, MII_LPA);
++
++ netif_dbg(dev, link, dev->net,
++ "speed: %u duplex: %d lcladv: %04x rmtadv: %04x\n",
++ ethtool_cmd_speed(&ecmd), ecmd.duplex, lcladv, rmtadv);
++
++ spin_lock_irqsave(&pdata->mac_cr_lock, flags);
++ if (ecmd.duplex != DUPLEX_FULL) {
++ pdata->mac_cr &= ~MAC_CR_FDPX_;
++ pdata->mac_cr |= MAC_CR_RCVOWN_;
++ } else {
++ pdata->mac_cr &= ~MAC_CR_RCVOWN_;
++ pdata->mac_cr |= MAC_CR_FDPX_;
++ }
++ spin_unlock_irqrestore(&pdata->mac_cr_lock, flags);
++
++ ret = smsc95xx_write_reg(dev, MAC_CR, pdata->mac_cr);
++ if (ret < 0)
++ return ret;
++
++ ret = smsc95xx_phy_update_flowcontrol(dev, ecmd.duplex, lcladv, rmtadv);
++ if (ret < 0)
++ netdev_warn(dev->net, "Error updating PHY flow control\n");
++
++ return ret;
++}
++
++static void smsc95xx_status(struct usbnet *dev, struct urb *urb)
++{
++ u32 intdata;
++
++ if (urb->actual_length != 4) {
++ netdev_warn(dev->net, "unexpected urb length %d\n",
++ urb->actual_length);
++ return;
++ }
++
++ memcpy(&intdata, urb->transfer_buffer, 4);
++ le32_to_cpus(&intdata);
++
++ netif_dbg(dev, link, dev->net, "intdata: 0x%08X\n", intdata);
++
++ if (intdata & INT_ENP_PHY_INT_)
++ usbnet_defer_kevent(dev, EVENT_LINK_RESET);
++ else
++ netdev_warn(dev->net, "unexpected interrupt, intdata=0x%08X\n",
++ intdata);
++}
++
++/* Enable or disable Tx & Rx checksum offload engines */
++static int smsc95xx_set_features(struct net_device *netdev,
++ netdev_features_t features)
++{
++ struct usbnet *dev = netdev_priv(netdev);
++ u32 read_buf;
++ int ret;
++
++ ret = smsc95xx_read_reg(dev, COE_CR, &read_buf);
++ if (ret < 0)
++ return ret;
++
++ if (features & NETIF_F_HW_CSUM)
++ read_buf |= Tx_COE_EN_;
++ else
++ read_buf &= ~Tx_COE_EN_;
++
++ if (features & NETIF_F_RXCSUM)
++ read_buf |= Rx_COE_EN_;
++ else
++ read_buf &= ~Rx_COE_EN_;
++
++ ret = smsc95xx_write_reg(dev, COE_CR, read_buf);
++ if (ret < 0)
++ return ret;
++
++ netif_dbg(dev, hw, dev->net, "COE_CR = 0x%08x\n", read_buf);
++ return 0;
++}
++
++static int smsc95xx_ethtool_get_eeprom_len(struct net_device *net)
++{
++ return MAX_EEPROM_SIZE;
++}
++
++static int smsc95xx_ethtool_get_eeprom(struct net_device *netdev,
++ struct ethtool_eeprom *ee, u8 *data)
++{
++ struct usbnet *dev = netdev_priv(netdev);
++
++ ee->magic = LAN95XX_EEPROM_MAGIC;
++
++ return smsc95xx_read_eeprom(dev, ee->offset, ee->len, data);
++}
++
++static int smsc95xx_ethtool_set_eeprom(struct net_device *netdev,
++ struct ethtool_eeprom *ee, u8 *data)
++{
++ struct usbnet *dev = netdev_priv(netdev);
++
++ if (ee->magic != LAN95XX_EEPROM_MAGIC) {
++ netdev_warn(dev->net, "EEPROM: magic value mismatch, magic = 0x%x\n",
++ ee->magic);
++ return -EINVAL;
++ }
++
++ return smsc95xx_write_eeprom(dev, ee->offset, ee->len, data);
++}
++
++static int smsc95xx_ethtool_getregslen(struct net_device *netdev)
++{
++ /* all smsc95xx registers */
++ return COE_CR - ID_REV + sizeof(u32);
++}
++
++static void
++smsc95xx_ethtool_getregs(struct net_device *netdev, struct ethtool_regs *regs,
++ void *buf)
++{
++ struct usbnet *dev = netdev_priv(netdev);
++ unsigned int i, j;
++ int retval;
++ u32 *data = buf;
++
++ retval = smsc95xx_read_reg(dev, ID_REV, ®s->version);
++ if (retval < 0) {
++ netdev_warn(netdev, "REGS: cannot read ID_REV\n");
++ return;
++ }
++
++ for (i = ID_REV, j = 0; i <= COE_CR; i += (sizeof(u32)), j++) {
++ retval = smsc95xx_read_reg(dev, i, &data[j]);
++ if (retval < 0) {
++ netdev_warn(netdev, "REGS: cannot read reg[%x]\n", i);
++ return;
++ }
++ }
++}
++
++static void smsc95xx_ethtool_get_wol(struct net_device *net,
++ struct ethtool_wolinfo *wolinfo)
++{
++ struct usbnet *dev = netdev_priv(net);
++ struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
++
++ wolinfo->supported = SUPPORTED_WAKE;
++ wolinfo->wolopts = pdata->wolopts;
++}
++
++static int smsc95xx_ethtool_set_wol(struct net_device *net,
++ struct ethtool_wolinfo *wolinfo)
++{
++ struct usbnet *dev = netdev_priv(net);
++ struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
++ int ret;
++
++ pdata->wolopts = wolinfo->wolopts & SUPPORTED_WAKE;
++
++ ret = device_set_wakeup_enable(&dev->udev->dev, pdata->wolopts);
++ if (ret < 0)
++ netdev_warn(dev->net, "device_set_wakeup_enable error %d\n", ret);
++
++ return ret;
++}
++
++static const struct ethtool_ops smsc95xx_ethtool_ops = {
++ .get_link = usbnet_get_link,
++ .nway_reset = usbnet_nway_reset,
++ .get_drvinfo = usbnet_get_drvinfo,
++ .get_msglevel = usbnet_get_msglevel,
++ .set_msglevel = usbnet_set_msglevel,
++ .get_settings = usbnet_get_settings,
++ .set_settings = usbnet_set_settings,
++ .get_eeprom_len = smsc95xx_ethtool_get_eeprom_len,
++ .get_eeprom = smsc95xx_ethtool_get_eeprom,
++ .set_eeprom = smsc95xx_ethtool_set_eeprom,
++ .get_regs_len = smsc95xx_ethtool_getregslen,
++ .get_regs = smsc95xx_ethtool_getregs,
++ .get_wol = smsc95xx_ethtool_get_wol,
++ .set_wol = smsc95xx_ethtool_set_wol,
++};
++
++static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
++{
++ struct usbnet *dev = netdev_priv(netdev);
++
++ if (!netif_running(netdev))
++ return -EINVAL;
++
++ return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
++}
++
++static void smsc95xx_init_mac_address(struct usbnet *dev)
++{
++ /* try reading mac address from EEPROM */
++ if (smsc95xx_read_eeprom(dev, EEPROM_MAC_OFFSET, ETH_ALEN,
++ dev->net->dev_addr) == 0) {
++ if (is_valid_ether_addr(dev->net->dev_addr)) {
++ /* eeprom values are valid so use them */
++ netif_dbg(dev, ifup, dev->net, "MAC address read from EEPROM\n");
++ return;
++ }
++ }
++
++ /* no eeprom, or eeprom values are invalid. generate random MAC */
++ eth_hw_addr_random(dev->net);
++ netif_dbg(dev, ifup, dev->net, "MAC address set to eth_random_addr\n");
++}
++
++static int smsc95xx_set_mac_address(struct usbnet *dev)
++{
++ u32 addr_lo = dev->net->dev_addr[0] | dev->net->dev_addr[1] << 8 |
++ dev->net->dev_addr[2] << 16 | dev->net->dev_addr[3] << 24;
++ u32 addr_hi = dev->net->dev_addr[4] | dev->net->dev_addr[5] << 8;
++ int ret;
++
++ ret = smsc95xx_write_reg(dev, ADDRL, addr_lo);
++ if (ret < 0)
++ return ret;
++
++ return smsc95xx_write_reg(dev, ADDRH, addr_hi);
++}
++
++/* starts the TX path */
++static int smsc95xx_start_tx_path(struct usbnet *dev)
++{
++ struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
++ unsigned long flags;
++ int ret;
++
++ /* Enable Tx at MAC */
++ spin_lock_irqsave(&pdata->mac_cr_lock, flags);
++ pdata->mac_cr |= MAC_CR_TXEN_;
++ spin_unlock_irqrestore(&pdata->mac_cr_lock, flags);
++
++ ret = smsc95xx_write_reg(dev, MAC_CR, pdata->mac_cr);
++ if (ret < 0)
++ return ret;
++
++ /* Enable Tx at SCSRs */
++ return smsc95xx_write_reg(dev, TX_CFG, TX_CFG_ON_);
++}
++
++/* Starts the Receive path */
++static int smsc95xx_start_rx_path(struct usbnet *dev, int in_pm)
++{
++ struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
++ unsigned long flags;
++
++ spin_lock_irqsave(&pdata->mac_cr_lock, flags);
++ pdata->mac_cr |= MAC_CR_RXEN_;
++ spin_unlock_irqrestore(&pdata->mac_cr_lock, flags);
++
++ return __smsc95xx_write_reg(dev, MAC_CR, pdata->mac_cr, in_pm);
++}
++
++static int smsc95xx_phy_initialize(struct usbnet *dev)
++{
++ int bmcr, ret, timeout = 0;
++
++ /* Initialize MII structure */
++ dev->mii.dev = dev->net;
++ dev->mii.mdio_read = smsc95xx_mdio_read;
++ dev->mii.mdio_write = smsc95xx_mdio_write;
++ dev->mii.phy_id_mask = 0x1f;
++ dev->mii.reg_num_mask = 0x1f;
++ dev->mii.phy_id = SMSC95XX_INTERNAL_PHY_ID;
++
++ /* reset phy and wait for reset to complete */
++ smsc95xx_mdio_write(dev->net, dev->mii.phy_id, MII_BMCR, BMCR_RESET);
++
++ do {
++ msleep(10);
++ bmcr = smsc95xx_mdio_read(dev->net, dev->mii.phy_id, MII_BMCR);
++ timeout++;
++ } while ((bmcr & BMCR_RESET) && (timeout < 100));
++
++ if (timeout >= 100) {
++ netdev_warn(dev->net, "timeout on PHY Reset");
++ return -EIO;
++ }
++
++ smsc95xx_mdio_write(dev->net, dev->mii.phy_id, MII_ADVERTISE,
++ ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP |
++ ADVERTISE_PAUSE_ASYM);
++
++ /* read to clear */
++ ret = smsc95xx_mdio_read(dev->net, dev->mii.phy_id, PHY_INT_SRC);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to read PHY_INT_SRC during init\n");
++ return ret;
++ }
++
++ smsc95xx_mdio_write(dev->net, dev->mii.phy_id, PHY_INT_MASK,
++ PHY_INT_MASK_DEFAULT_);
++ mii_nway_restart(&dev->mii);
++
++ netif_dbg(dev, ifup, dev->net, "phy initialised successfully\n");
++ return 0;
++}
++
++static int smsc95xx_reset(struct usbnet *dev)
++{
++ struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
++ u32 read_buf, write_buf, burst_cap;
++ int ret = 0, timeout;
++
++ netif_dbg(dev, ifup, dev->net, "entering smsc95xx_reset\n");
++
++ ret = smsc95xx_write_reg(dev, HW_CFG, HW_CFG_LRST_);
++ if (ret < 0)
++ return ret;
++
++ timeout = 0;
++ do {
++ msleep(10);
++ ret = smsc95xx_read_reg(dev, HW_CFG, &read_buf);
++ if (ret < 0)
++ return ret;
++ timeout++;
++ } while ((read_buf & HW_CFG_LRST_) && (timeout < 100));
++
++ if (timeout >= 100) {
++ netdev_warn(dev->net, "timeout waiting for completion of Lite Reset\n");
++ return ret;
++ }
++
++ ret = smsc95xx_write_reg(dev, PM_CTRL, PM_CTL_PHY_RST_);
++ if (ret < 0)
++ return ret;
++
++ timeout = 0;
++ do {
++ msleep(10);
++ ret = smsc95xx_read_reg(dev, PM_CTRL, &read_buf);
++ if (ret < 0)
++ return ret;
++ timeout++;
++ } while ((read_buf & PM_CTL_PHY_RST_) && (timeout < 100));
++
++ if (timeout >= 100) {
++ netdev_warn(dev->net, "timeout waiting for PHY Reset\n");
++ return ret;
++ }
++
++ ret = smsc95xx_set_mac_address(dev);
++ if (ret < 0)
++ return ret;
++
++ netif_dbg(dev, ifup, dev->net, "MAC Address: %pM\n",
++ dev->net->dev_addr);
++
++ ret = smsc95xx_read_reg(dev, HW_CFG, &read_buf);
++ if (ret < 0)
++ return ret;
++
++ netif_dbg(dev, ifup, dev->net, "Read Value from HW_CFG : 0x%08x\n",
++ read_buf);
++
++ read_buf |= HW_CFG_BIR_;
++
++ ret = smsc95xx_write_reg(dev, HW_CFG, read_buf);
++ if (ret < 0)
++ return ret;
++
++ ret = smsc95xx_read_reg(dev, HW_CFG, &read_buf);
++ if (ret < 0)
++ return ret;
++
++ netif_dbg(dev, ifup, dev->net,
++ "Read Value from HW_CFG after writing HW_CFG_BIR_: 0x%08x\n",
++ read_buf);
++
++ if (!turbo_mode) {
++ burst_cap = 0;
++ dev->rx_urb_size = MAX_SINGLE_PACKET_SIZE;
++ } else if (dev->udev->speed == USB_SPEED_HIGH) {
++ burst_cap = DEFAULT_HS_BURST_CAP_SIZE / HS_USB_PKT_SIZE;
++ dev->rx_urb_size = DEFAULT_HS_BURST_CAP_SIZE;
++ } else {
++ burst_cap = DEFAULT_FS_BURST_CAP_SIZE / FS_USB_PKT_SIZE;
++ dev->rx_urb_size = DEFAULT_FS_BURST_CAP_SIZE;
++ }
++
++ netif_dbg(dev, ifup, dev->net, "rx_urb_size=%ld\n",
++ (ulong)dev->rx_urb_size);
++
++ ret = smsc95xx_write_reg(dev, BURST_CAP, burst_cap);
++ if (ret < 0)
++ return ret;
++
++ ret = smsc95xx_read_reg(dev, BURST_CAP, &read_buf);
++ if (ret < 0)
++ return ret;
++
++ netif_dbg(dev, ifup, dev->net,
++ "Read Value from BURST_CAP after writing: 0x%08x\n",
++ read_buf);
++
++ ret = smsc95xx_write_reg(dev, BULK_IN_DLY, DEFAULT_BULK_IN_DELAY);
++ if (ret < 0)
++ return ret;
++
++ ret = smsc95xx_read_reg(dev, BULK_IN_DLY, &read_buf);
++ if (ret < 0)
++ return ret;
++
++ netif_dbg(dev, ifup, dev->net,
++ "Read Value from BULK_IN_DLY after writing: 0x%08x\n",
++ read_buf);
++
++ ret = smsc95xx_read_reg(dev, HW_CFG, &read_buf);
++ if (ret < 0)
++ return ret;
++
++ netif_dbg(dev, ifup, dev->net, "Read Value from HW_CFG: 0x%08x\n",
++ read_buf);
++
++ if (turbo_mode)
++ read_buf |= (HW_CFG_MEF_ | HW_CFG_BCE_);
++
++ read_buf &= ~HW_CFG_RXDOFF_;
++
++ /* set Rx data offset=2, Make IP header aligns on word boundary. */
++ read_buf |= NET_IP_ALIGN << 9;
++
++ ret = smsc95xx_write_reg(dev, HW_CFG, read_buf);
++ if (ret < 0)
++ return ret;
++
++ ret = smsc95xx_read_reg(dev, HW_CFG, &read_buf);
++ if (ret < 0)
++ return ret;
++
++ netif_dbg(dev, ifup, dev->net,
++ "Read Value from HW_CFG after writing: 0x%08x\n", read_buf);
++
++ ret = smsc95xx_write_reg(dev, INT_STS, INT_STS_CLEAR_ALL_);
++ if (ret < 0)
++ return ret;
++
++ ret = smsc95xx_read_reg(dev, ID_REV, &read_buf);
++ if (ret < 0)
++ return ret;
++ netif_dbg(dev, ifup, dev->net, "ID_REV = 0x%08x\n", read_buf);
++
++ /* Configure GPIO pins as LED outputs */
++ write_buf = LED_GPIO_CFG_SPD_LED | LED_GPIO_CFG_LNK_LED |
++ LED_GPIO_CFG_FDX_LED;
++ ret = smsc95xx_write_reg(dev, LED_GPIO_CFG, write_buf);
++ if (ret < 0)
++ return ret;
++
++ /* Init Tx */
++ ret = smsc95xx_write_reg(dev, FLOW, 0);
++ if (ret < 0)
++ return ret;
++
++ ret = smsc95xx_write_reg(dev, AFC_CFG, AFC_CFG_DEFAULT);
++ if (ret < 0)
++ return ret;
++
++ /* Don't need mac_cr_lock during initialisation */
++ ret = smsc95xx_read_reg(dev, MAC_CR, &pdata->mac_cr);
++ if (ret < 0)
++ return ret;
++
++ /* Init Rx */
++ /* Set Vlan */
++ ret = smsc95xx_write_reg(dev, VLAN1, (u32)ETH_P_8021Q);
++ if (ret < 0)
++ return ret;
++
++ /* Enable or disable checksum offload engines */
++ ret = smsc95xx_set_features(dev->net, dev->net->features);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to set checksum offload features\n");
++ return ret;
++ }
++
++ smsc95xx_set_multicast(dev->net);
++
++ ret = smsc95xx_phy_initialize(dev);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to init PHY\n");
++ return ret;
++ }
++
++ ret = smsc95xx_read_reg(dev, INT_EP_CTL, &read_buf);
++ if (ret < 0)
++ return ret;
++
++ /* enable PHY interrupts */
++ read_buf |= INT_EP_CTL_PHY_INT_;
++
++ ret = smsc95xx_write_reg(dev, INT_EP_CTL, read_buf);
++ if (ret < 0)
++ return ret;
++
++ ret = smsc95xx_start_tx_path(dev);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to start TX path\n");
++ return ret;
++ }
++
++ ret = smsc95xx_start_rx_path(dev, 0);
++ if (ret < 0) {
++ netdev_warn(dev->net, "Failed to start RX path\n");
++ return ret;
++ }
++
++ netif_dbg(dev, ifup, dev->net, "smsc95xx_reset, return 0\n");
++ return 0;
++}
++
++static const struct net_device_ops smsc95xx_netdev_ops = {
++ .ndo_open = usbnet_open,
++ .ndo_stop = usbnet_stop,
++ .ndo_start_xmit = usbnet_start_xmit,
++ .ndo_tx_timeout = usbnet_tx_timeout,
++ .ndo_change_mtu = usbnet_change_mtu,
++ .ndo_set_mac_address = eth_mac_addr,
++ .ndo_validate_addr = eth_validate_addr,
++ .ndo_do_ioctl = smsc95xx_ioctl,
++ .ndo_set_rx_mode = smsc95xx_set_multicast,
++ .ndo_set_features = smsc95xx_set_features,
++};
++
++static int smsc95xx_bind(struct usbnet *dev, struct usb_interface *intf)
++{
++ struct smsc95xx_priv *pdata = NULL;
++ u32 val;
++ int ret;
++
++ printk(KERN_INFO SMSC_CHIPNAME " v" SMSC_DRIVER_VERSION "\n");
++
++ ret = usbnet_get_endpoints(dev, intf);
++ if (ret < 0) {
++ netdev_warn(dev->net, "usbnet_get_endpoints failed: %d\n", ret);
++ return ret;
++ }
++
++ dev->data[0] = (unsigned long)kzalloc(sizeof(struct smsc95xx_priv),
++ GFP_KERNEL);
++
++ pdata = (struct smsc95xx_priv *)(dev->data[0]);
++ if (!pdata)
++ return -ENOMEM;
++
++ spin_lock_init(&pdata->mac_cr_lock);
++
++ if (DEFAULT_TX_CSUM_ENABLE)
++ dev->net->features |= NETIF_F_HW_CSUM;
++ if (DEFAULT_RX_CSUM_ENABLE)
++ dev->net->features |= NETIF_F_RXCSUM;
++
++ dev->net->hw_features = NETIF_F_HW_CSUM | NETIF_F_RXCSUM;
++
++ smsc95xx_init_mac_address(dev);
++
++ /* Init all registers */
++ ret = smsc95xx_reset(dev);
++
++ /* detect device revision as different features may be available */
++ ret = smsc95xx_read_reg(dev, ID_REV, &val);
++ if (ret < 0)
++ return ret;
++ val >>= 16;
++
++ if ((val == ID_REV_CHIP_ID_9500A_) || (val == ID_REV_CHIP_ID_9530_) ||
++ (val == ID_REV_CHIP_ID_89530_) || (val == ID_REV_CHIP_ID_9730_))
++ pdata->features = (FEATURE_8_WAKEUP_FILTERS |
++ FEATURE_PHY_NLP_CROSSOVER |
++ FEATURE_REMOTE_WAKEUP);
++ else if (val == ID_REV_CHIP_ID_9512_)
++ pdata->features = FEATURE_8_WAKEUP_FILTERS;
++
++ dev->net->netdev_ops = &smsc95xx_netdev_ops;
++ dev->net->ethtool_ops = &smsc95xx_ethtool_ops;
++ dev->net->flags |= IFF_MULTICAST;
++ dev->net->hard_header_len += SMSC95XX_TX_OVERHEAD_CSUM;
++ dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len;
++ return 0;
++}
++
++static void smsc95xx_unbind(struct usbnet *dev, struct usb_interface *intf)
++{
++ struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
++ if (pdata) {
++ netif_dbg(dev, ifdown, dev->net, "free pdata\n");
++ kfree(pdata);
++ pdata = NULL;
++ dev->data[0] = 0;
++ }
++}
++
++static u32 smsc_crc(const u8 *buffer, size_t len, int filter)
++{
++ u32 crc = bitrev16(crc16(0xFFFF, buffer, len));
++ return crc << ((filter % 2) * 16);
++}
++
++static int smsc95xx_enable_phy_wakeup_interrupts(struct usbnet *dev, u16 mask)
++{
++ struct mii_if_info *mii = &dev->mii;
++ int ret;
++
++ netdev_dbg(dev->net, "enabling PHY wakeup interrupts\n");
++
++ /* read to clear */
++ ret = smsc95xx_mdio_read_nopm(dev->net, mii->phy_id, PHY_INT_SRC);
++ if (ret < 0)
++ return ret;
++
++ /* enable interrupt source */
++ ret = smsc95xx_mdio_read_nopm(dev->net, mii->phy_id, PHY_INT_MASK);
++ if (ret < 0)
++ return ret;
++
++ ret |= mask;
++
++ smsc95xx_mdio_write_nopm(dev->net, mii->phy_id, PHY_INT_MASK, ret);
++
++ return 0;
++}
++
++static int smsc95xx_link_ok_nopm(struct usbnet *dev)
++{
++ struct mii_if_info *mii = &dev->mii;
++ int ret;
++
++ /* first, a dummy read, needed to latch some MII phys */
++ ret = smsc95xx_mdio_read_nopm(dev->net, mii->phy_id, MII_BMSR);
++ if (ret < 0)
++ return ret;
++
++ ret = smsc95xx_mdio_read_nopm(dev->net, mii->phy_id, MII_BMSR);
++ if (ret < 0)
++ return ret;
++
++ return !!(ret & BMSR_LSTATUS);
++}
++
++static int smsc95xx_enter_suspend0(struct usbnet *dev)
++{
++ struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
++ u32 val;
++ int ret;
++
++ ret = smsc95xx_read_reg_nopm(dev, PM_CTRL, &val);
++ if (ret < 0)
++ return ret;
++
++ val &= (~(PM_CTL_SUS_MODE_ | PM_CTL_WUPS_ | PM_CTL_PHY_RST_));
++ val |= PM_CTL_SUS_MODE_0;
++
++ ret = smsc95xx_write_reg_nopm(dev, PM_CTRL, val);
++ if (ret < 0)
++ return ret;
++
++ /* clear wol status */
++ val &= ~PM_CTL_WUPS_;
++ val |= PM_CTL_WUPS_WOL_;
++
++ /* enable energy detection */
++ if (pdata->wolopts & WAKE_PHY)
++ val |= PM_CTL_WUPS_ED_;
++
++ ret = smsc95xx_write_reg_nopm(dev, PM_CTRL, val);
++ if (ret < 0)
++ return ret;
++
++ /* read back PM_CTRL */
++ ret = smsc95xx_read_reg_nopm(dev, PM_CTRL, &val);
++ if (ret < 0)
++ return ret;
++
++ pdata->suspend_flags |= SUSPEND_SUSPEND0;
++
++ return 0;
++}
++
++static int smsc95xx_enter_suspend1(struct usbnet *dev)
++{
++ struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
++ struct mii_if_info *mii = &dev->mii;
++ u32 val;
++ int ret;
++
++ /* reconfigure link pulse detection timing for
++ * compatibility with non-standard link partners
++ */
++ if (pdata->features & FEATURE_PHY_NLP_CROSSOVER)
++ smsc95xx_mdio_write_nopm(dev->net, mii->phy_id, PHY_EDPD_CONFIG,
++ PHY_EDPD_CONFIG_DEFAULT);
++
++ /* enable energy detect power-down mode */
++ ret = smsc95xx_mdio_read_nopm(dev->net, mii->phy_id, PHY_MODE_CTRL_STS);
++ if (ret < 0)
++ return ret;
++
++ ret |= MODE_CTRL_STS_EDPWRDOWN_;
++
++ smsc95xx_mdio_write_nopm(dev->net, mii->phy_id, PHY_MODE_CTRL_STS, ret);
++
++ /* enter SUSPEND1 mode */
++ ret = smsc95xx_read_reg_nopm(dev, PM_CTRL, &val);
++ if (ret < 0)
++ return ret;
++
++ val &= ~(PM_CTL_SUS_MODE_ | PM_CTL_WUPS_ | PM_CTL_PHY_RST_);
++ val |= PM_CTL_SUS_MODE_1;
++
++ ret = smsc95xx_write_reg_nopm(dev, PM_CTRL, val);
++ if (ret < 0)
++ return ret;
++
++ /* clear wol status, enable energy detection */
++ val &= ~PM_CTL_WUPS_;
++ val |= (PM_CTL_WUPS_ED_ | PM_CTL_ED_EN_);
++
++ ret = smsc95xx_write_reg_nopm(dev, PM_CTRL, val);
++ if (ret < 0)
++ return ret;
++
++ pdata->suspend_flags |= SUSPEND_SUSPEND1;
++
++ return 0;
++}
++
++static int smsc95xx_enter_suspend2(struct usbnet *dev)
++{
++ struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
++ u32 val;
++ int ret;
++
++ ret = smsc95xx_read_reg_nopm(dev, PM_CTRL, &val);
++ if (ret < 0)
++ return ret;
++
++ val &= ~(PM_CTL_SUS_MODE_ | PM_CTL_WUPS_ | PM_CTL_PHY_RST_);
++ val |= PM_CTL_SUS_MODE_2;
++
++ ret = smsc95xx_write_reg_nopm(dev, PM_CTRL, val);
++ if (ret < 0)
++ return ret;
++
++ pdata->suspend_flags |= SUSPEND_SUSPEND2;
++
++ return 0;
++}
++
++static int smsc95xx_enter_suspend3(struct usbnet *dev)
++{
++ struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
++ u32 val;
++ int ret;
++
++ ret = smsc95xx_read_reg_nopm(dev, RX_FIFO_INF, &val);
++ if (ret < 0)
++ return ret;
++
++ if (val & 0xFFFF) {
++ netdev_info(dev->net, "rx fifo not empty in autosuspend\n");
++ return -EBUSY;
++ }
++
++ ret = smsc95xx_read_reg_nopm(dev, PM_CTRL, &val);
++ if (ret < 0)
++ return ret;
++
++ val &= ~(PM_CTL_SUS_MODE_ | PM_CTL_WUPS_ | PM_CTL_PHY_RST_);
++ val |= PM_CTL_SUS_MODE_3 | PM_CTL_RES_CLR_WKP_STS;
++
++ ret = smsc95xx_write_reg_nopm(dev, PM_CTRL, val);
++ if (ret < 0)
++ return ret;
++
++ /* clear wol status */
++ val &= ~PM_CTL_WUPS_;
++ val |= PM_CTL_WUPS_WOL_;
++
++ ret = smsc95xx_write_reg_nopm(dev, PM_CTRL, val);
++ if (ret < 0)
++ return ret;
++
++ pdata->suspend_flags |= SUSPEND_SUSPEND3;
++
++ return 0;
++}
++
++static int smsc95xx_autosuspend(struct usbnet *dev, u32 link_up)
++{
++ struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
++ int ret;
++
++ if (!netif_running(dev->net)) {
++ /* interface is ifconfig down so fully power down hw */
++ netdev_dbg(dev->net, "autosuspend entering SUSPEND2\n");
++ return smsc95xx_enter_suspend2(dev);
++ }
++
++ if (!link_up) {
++ /* link is down so enter EDPD mode, but only if device can
++ * reliably resume from it. This check should be redundant
++ * as current FEATURE_REMOTE_WAKEUP parts also support
++ * FEATURE_PHY_NLP_CROSSOVER but it's included for clarity */
++ if (!(pdata->features & FEATURE_PHY_NLP_CROSSOVER)) {
++ netdev_warn(dev->net, "EDPD not supported\n");
++ return -EBUSY;
++ }
++
++ netdev_dbg(dev->net, "autosuspend entering SUSPEND1\n");
++
++ /* enable PHY wakeup events for if cable is attached */
++ ret = smsc95xx_enable_phy_wakeup_interrupts(dev,
++ PHY_INT_MASK_ANEG_COMP_);
++ if (ret < 0) {
++ netdev_warn(dev->net, "error enabling PHY wakeup ints\n");
++ return ret;
++ }
++
++ netdev_info(dev->net, "entering SUSPEND1 mode\n");
++ return smsc95xx_enter_suspend1(dev);
++ }
++
++ /* enable PHY wakeup events so we remote wakeup if cable is pulled */
++ ret = smsc95xx_enable_phy_wakeup_interrupts(dev,
++ PHY_INT_MASK_LINK_DOWN_);
++ if (ret < 0) {
++ netdev_warn(dev->net, "error enabling PHY wakeup ints\n");
++ return ret;
++ }
++
++ netdev_dbg(dev->net, "autosuspend entering SUSPEND3\n");
++ return smsc95xx_enter_suspend3(dev);
++}
++
++static int smsc95xx_suspend(struct usb_interface *intf, pm_message_t message)
++{
++ struct usbnet *dev = usb_get_intfdata(intf);
++ struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
++ u32 val, link_up;
++ int ret;
++
++ ret = usbnet_suspend(intf, message);
++ if (ret < 0) {
++ netdev_warn(dev->net, "usbnet_suspend error\n");
++ return ret;
++ }
++
++ if (pdata->suspend_flags) {
++ netdev_warn(dev->net, "error during last resume\n");
++ pdata->suspend_flags = 0;
++ }
++
++ /* determine if link is up using only _nopm functions */
++ link_up = smsc95xx_link_ok_nopm(dev);
++
++ if (message.event == PM_EVENT_AUTO_SUSPEND &&
++ (pdata->features & FEATURE_REMOTE_WAKEUP)) {
++ ret = smsc95xx_autosuspend(dev, link_up);
++ goto done;
++ }
++
++ /* if we get this far we're not autosuspending */
++ /* if no wol options set, or if link is down and we're not waking on
++ * PHY activity, enter lowest power SUSPEND2 mode
++ */
++ if (!(pdata->wolopts & SUPPORTED_WAKE) ||
++ !(link_up || (pdata->wolopts & WAKE_PHY))) {
++ netdev_info(dev->net, "entering SUSPEND2 mode\n");
++
++ /* disable energy detect (link up) & wake up events */
++ ret = smsc95xx_read_reg_nopm(dev, WUCSR, &val);
++ if (ret < 0)
++ goto done;
++
++ val &= ~(WUCSR_MPEN_ | WUCSR_WAKE_EN_);
++
++ ret = smsc95xx_write_reg_nopm(dev, WUCSR, val);
++ if (ret < 0)
++ goto done;
++
++ ret = smsc95xx_read_reg_nopm(dev, PM_CTRL, &val);
++ if (ret < 0)
++ goto done;
++
++ val &= ~(PM_CTL_ED_EN_ | PM_CTL_WOL_EN_);
++
++ ret = smsc95xx_write_reg_nopm(dev, PM_CTRL, val);
++ if (ret < 0)
++ goto done;
++
++ ret = smsc95xx_enter_suspend2(dev);
++ goto done;
++ }
++
++ if (pdata->wolopts & WAKE_PHY) {
++ ret = smsc95xx_enable_phy_wakeup_interrupts(dev,
++ (PHY_INT_MASK_ANEG_COMP_ | PHY_INT_MASK_LINK_DOWN_));
++ if (ret < 0) {
++ netdev_warn(dev->net, "error enabling PHY wakeup ints\n");
++ goto done;
++ }
++
++ /* if link is down then configure EDPD and enter SUSPEND1,
++ * otherwise enter SUSPEND0 below
++ */
++ if (!link_up) {
++ netdev_info(dev->net, "entering SUSPEND1 mode\n");
++ ret = smsc95xx_enter_suspend1(dev);
++ goto done;
++ }
++ }
++
++ if (pdata->wolopts & (WAKE_BCAST | WAKE_MCAST | WAKE_ARP | WAKE_UCAST)) {
++ u32 *filter_mask = kzalloc(sizeof(u32) * 32, GFP_KERNEL);
++ u32 command[2];
++ u32 offset[2];
++ u32 crc[4];
++ int wuff_filter_count =
++ (pdata->features & FEATURE_8_WAKEUP_FILTERS) ?
++ LAN9500A_WUFF_NUM : LAN9500_WUFF_NUM;
++ int i, filter = 0;
++
++ if (!filter_mask) {
++ netdev_warn(dev->net, "Unable to allocate filter_mask\n");
++ ret = -ENOMEM;
++ goto done;
++ }
++
++ memset(command, 0, sizeof(command));
++ memset(offset, 0, sizeof(offset));
++ memset(crc, 0, sizeof(crc));
++
++ if (pdata->wolopts & WAKE_BCAST) {
++ const u8 bcast[] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
++ netdev_info(dev->net, "enabling broadcast detection\n");
++ filter_mask[filter * 4] = 0x003F;
++ filter_mask[filter * 4 + 1] = 0x00;
++ filter_mask[filter * 4 + 2] = 0x00;
++ filter_mask[filter * 4 + 3] = 0x00;
++ command[filter/4] |= 0x05UL << ((filter % 4) * 8);
++ offset[filter/4] |= 0x00 << ((filter % 4) * 8);
++ crc[filter/2] |= smsc_crc(bcast, 6, filter);
++ filter++;
++ }
++
++ if (pdata->wolopts & WAKE_MCAST) {
++ const u8 mcast[] = {0x01, 0x00, 0x5E};
++ netdev_info(dev->net, "enabling multicast detection\n");
++ filter_mask[filter * 4] = 0x0007;
++ filter_mask[filter * 4 + 1] = 0x00;
++ filter_mask[filter * 4 + 2] = 0x00;
++ filter_mask[filter * 4 + 3] = 0x00;
++ command[filter/4] |= 0x09UL << ((filter % 4) * 8);
++ offset[filter/4] |= 0x00 << ((filter % 4) * 8);
++ crc[filter/2] |= smsc_crc(mcast, 3, filter);
++ filter++;
++ }
++
++ if (pdata->wolopts & WAKE_ARP) {
++ const u8 arp[] = {0x08, 0x06};
++ netdev_info(dev->net, "enabling ARP detection\n");
++ filter_mask[filter * 4] = 0x0003;
++ filter_mask[filter * 4 + 1] = 0x00;
++ filter_mask[filter * 4 + 2] = 0x00;
++ filter_mask[filter * 4 + 3] = 0x00;
++ command[filter/4] |= 0x05UL << ((filter % 4) * 8);
++ offset[filter/4] |= 0x0C << ((filter % 4) * 8);
++ crc[filter/2] |= smsc_crc(arp, 2, filter);
++ filter++;
++ }
++
++ if (pdata->wolopts & WAKE_UCAST) {
++ netdev_info(dev->net, "enabling unicast detection\n");
++ filter_mask[filter * 4] = 0x003F;
++ filter_mask[filter * 4 + 1] = 0x00;
++ filter_mask[filter * 4 + 2] = 0x00;
++ filter_mask[filter * 4 + 3] = 0x00;
++ command[filter/4] |= 0x01UL << ((filter % 4) * 8);
++ offset[filter/4] |= 0x00 << ((filter % 4) * 8);
++ crc[filter/2] |= smsc_crc(dev->net->dev_addr, ETH_ALEN, filter);
++ filter++;
++ }
++
++ for (i = 0; i < (wuff_filter_count * 4); i++) {
++ ret = smsc95xx_write_reg_nopm(dev, WUFF, filter_mask[i]);
++ if (ret < 0) {
++ kfree(filter_mask);
++ goto done;
++ }
++ }
++ kfree(filter_mask);
++
++ for (i = 0; i < (wuff_filter_count / 4); i++) {
++ ret = smsc95xx_write_reg_nopm(dev, WUFF, command[i]);
++ if (ret < 0)
++ goto done;
++ }
++
++ for (i = 0; i < (wuff_filter_count / 4); i++) {
++ ret = smsc95xx_write_reg_nopm(dev, WUFF, offset[i]);
++ if (ret < 0)
++ goto done;
++ }
++
++ for (i = 0; i < (wuff_filter_count / 2); i++) {
++ ret = smsc95xx_write_reg_nopm(dev, WUFF, crc[i]);
++ if (ret < 0)
++ goto done;
++ }
++
++ /* clear any pending pattern match packet status */
++ ret = smsc95xx_read_reg_nopm(dev, WUCSR, &val);
++ if (ret < 0)
++ goto done;
++
++ val |= WUCSR_WUFR_;
++
++ ret = smsc95xx_write_reg_nopm(dev, WUCSR, val);
++ if (ret < 0)
++ goto done;
++ }
++
++ if (pdata->wolopts & WAKE_MAGIC) {
++ /* clear any pending magic packet status */
++ ret = smsc95xx_read_reg_nopm(dev, WUCSR, &val);
++ if (ret < 0)
++ goto done;
++
++ val |= WUCSR_MPR_;
++
++ ret = smsc95xx_write_reg_nopm(dev, WUCSR, val);
++ if (ret < 0)
++ goto done;
++ }
++
++ /* enable/disable wakeup sources */
++ ret = smsc95xx_read_reg_nopm(dev, WUCSR, &val);
++ if (ret < 0)
++ goto done;
++
++ if (pdata->wolopts & (WAKE_BCAST | WAKE_MCAST | WAKE_ARP | WAKE_UCAST)) {
++ netdev_info(dev->net, "enabling pattern match wakeup\n");
++ val |= WUCSR_WAKE_EN_;
++ } else {
++ netdev_info(dev->net, "disabling pattern match wakeup\n");
++ val &= ~WUCSR_WAKE_EN_;
++ }
++
++ if (pdata->wolopts & WAKE_MAGIC) {
++ netdev_info(dev->net, "enabling magic packet wakeup\n");
++ val |= WUCSR_MPEN_;
++ } else {
++ netdev_info(dev->net, "disabling magic packet wakeup\n");
++ val &= ~WUCSR_MPEN_;
++ }
++
++ ret = smsc95xx_write_reg_nopm(dev, WUCSR, val);
++ if (ret < 0)
++ goto done;
++
++ /* enable wol wakeup source */
++ ret = smsc95xx_read_reg_nopm(dev, PM_CTRL, &val);
++ if (ret < 0)
++ goto done;
++
++ val |= PM_CTL_WOL_EN_;
++
++ /* phy energy detect wakeup source */
++ if (pdata->wolopts & WAKE_PHY)
++ val |= PM_CTL_ED_EN_;
++
++ ret = smsc95xx_write_reg_nopm(dev, PM_CTRL, val);
++ if (ret < 0)
++ goto done;
++
++ /* enable receiver to enable frame reception */
++ smsc95xx_start_rx_path(dev, 1);
++
++ /* some wol options are enabled, so enter SUSPEND0 */
++ netdev_info(dev->net, "entering SUSPEND0 mode\n");
++ ret = smsc95xx_enter_suspend0(dev);
++
++done:
++ /*
++ * TODO: resume() might need to handle the suspend failure
++ * in system sleep
++ */
++ if (ret && PMSG_IS_AUTO(message))
++ usbnet_resume(intf);
++ return ret;
++}
++
++static int smsc95xx_resume(struct usb_interface *intf)
++{
++ struct usbnet *dev = usb_get_intfdata(intf);
++ struct smsc95xx_priv *pdata;
++ u8 suspend_flags;
++ int ret;
++ u32 val;
++
++ BUG_ON(!dev);
++ pdata = (struct smsc95xx_priv *)(dev->data[0]);
++ suspend_flags = pdata->suspend_flags;
++
++ netdev_dbg(dev->net, "resume suspend_flags=0x%02x\n", suspend_flags);
++
++ /* do this first to ensure it's cleared even in error case */
++ pdata->suspend_flags = 0;
++
++ if (suspend_flags & SUSPEND_ALLMODES) {
++ /* clear wake-up sources */
++ ret = smsc95xx_read_reg_nopm(dev, WUCSR, &val);
++ if (ret < 0)
++ return ret;
++
++ val &= ~(WUCSR_WAKE_EN_ | WUCSR_MPEN_);
++
++ ret = smsc95xx_write_reg_nopm(dev, WUCSR, val);
++ if (ret < 0)
++ return ret;
++
++ /* clear wake-up status */
++ ret = smsc95xx_read_reg_nopm(dev, PM_CTRL, &val);
++ if (ret < 0)
++ return ret;
++
++ val &= ~PM_CTL_WOL_EN_;
++ val |= PM_CTL_WUPS_;
++
++ ret = smsc95xx_write_reg_nopm(dev, PM_CTRL, val);
++ if (ret < 0)
++ return ret;
++ }
++
++ ret = usbnet_resume(intf);
++ if (ret < 0)
++ netdev_warn(dev->net, "usbnet_resume error\n");
++
++ return ret;
++}
++
++static int smsc95xx_reset_resume(struct usb_interface *intf)
++{
++ struct usbnet *dev = usb_get_intfdata(intf);
++ int ret;
++
++ ret = smsc95xx_reset(dev);
++ if (ret < 0)
++ return ret;
++
++ return smsc95xx_resume(intf);
++}
++
++static void smsc95xx_rx_csum_offload(struct sk_buff *skb)
++{
++ skb->csum = *(u16 *)(skb_tail_pointer(skb) - 2);
++ skb->ip_summed = CHECKSUM_COMPLETE;
++ skb_trim(skb, skb->len - 2);
++}
++
++static int smsc95xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
++{
++ /* This check is no longer done by usbnet */
++ if (skb->len < dev->net->hard_header_len)
++ return 0;
++
++ while (skb->len > 0) {
++ u32 header, align_count;
++ struct sk_buff *ax_skb;
++ unsigned char *packet;
++ u16 size;
++
++ memcpy(&header, skb->data, sizeof(header));
++ le32_to_cpus(&header);
++ skb_pull(skb, 4 + NET_IP_ALIGN);
++ packet = skb->data;
++
++ /* get the packet length */
++ size = (u16)((header & RX_STS_FL_) >> 16);
++ align_count = (4 - ((size + NET_IP_ALIGN) % 4)) % 4;
++
++ if (unlikely(header & RX_STS_ES_)) {
++ netif_dbg(dev, rx_err, dev->net,
++ "Error header=0x%08x\n", header);
++ dev->net->stats.rx_errors++;
++ dev->net->stats.rx_dropped++;
++
++ if (header & RX_STS_CRC_) {
++ dev->net->stats.rx_crc_errors++;
++ } else {
++ if (header & (RX_STS_TL_ | RX_STS_RF_))
++ dev->net->stats.rx_frame_errors++;
++
++ if ((header & RX_STS_LE_) &&
++ (!(header & RX_STS_FT_)))
++ dev->net->stats.rx_length_errors++;
++ }
++ } else {
++ /* ETH_FRAME_LEN + 4(CRC) + 2(COE) + 4(Vlan) */
++ if (unlikely(size > (ETH_FRAME_LEN + 12))) {
++ netif_dbg(dev, rx_err, dev->net,
++ "size err header=0x%08x\n", header);
++ return 0;
++ }
++
++ /* last frame in this batch */
++ if (skb->len == size) {
++ if (dev->net->features & NETIF_F_RXCSUM)
++ smsc95xx_rx_csum_offload(skb);
++ skb_trim(skb, skb->len - 4); /* remove fcs */
++ skb->truesize = size + sizeof(struct sk_buff);
++
++ return 1;
++ }
++
++ ax_skb = skb_clone(skb, GFP_ATOMIC);
++ if (unlikely(!ax_skb)) {
++ netdev_warn(dev->net, "Error allocating skb\n");
++ return 0;
++ }
++
++ ax_skb->len = size;
++ ax_skb->data = packet;
++ skb_set_tail_pointer(ax_skb, size);
++
++ if (dev->net->features & NETIF_F_RXCSUM)
++ smsc95xx_rx_csum_offload(ax_skb);
++ skb_trim(ax_skb, ax_skb->len - 4); /* remove fcs */
++ ax_skb->truesize = size + sizeof(struct sk_buff);
++
++ usbnet_skb_return(dev, ax_skb);
++ }
++
++ skb_pull(skb, size);
++
++ /* padding bytes before the next frame starts */
++ if (skb->len)
++ skb_pull(skb, align_count);
++ }
++
++ if (unlikely(skb->len < 0)) {
++ netdev_warn(dev->net, "invalid rx length<0 %d\n", skb->len);
++ return 0;
++ }
++
++ return 1;
++}
++
++static u32 smsc95xx_calc_csum_preamble(struct sk_buff *skb)
++{
++ u16 low_16 = (u16)skb_checksum_start_offset(skb);
++ u16 high_16 = low_16 + skb->csum_offset;
++ return (high_16 << 16) | low_16;
++}
++
++static struct sk_buff *smsc95xx_tx_fixup(struct usbnet *dev,
++ struct sk_buff *skb, gfp_t flags)
++{
++ bool csum = skb->ip_summed == CHECKSUM_PARTIAL;
++ int overhead = csum ? SMSC95XX_TX_OVERHEAD_CSUM : SMSC95XX_TX_OVERHEAD;
++ u32 tx_cmd_a, tx_cmd_b;
++
++ /* We do not advertise SG, so skbs should be already linearized */
++ BUG_ON(skb_shinfo(skb)->nr_frags);
++
++ if (skb_headroom(skb) < overhead) {
++ struct sk_buff *skb2 = skb_copy_expand(skb,
++ overhead, 0, flags);
++ dev_kfree_skb_any(skb);
++ skb = skb2;
++ if (!skb)
++ return NULL;
++ }
++
++ if (csum) {
++ if (skb->len <= 45) {
++ /* workaround - hardware tx checksum does not work
++ * properly with extremely small packets */
++ long csstart = skb_checksum_start_offset(skb);
++ __wsum calc = csum_partial(skb->data + csstart,
++ skb->len - csstart, 0);
++ *((__sum16 *)(skb->data + csstart
++ + skb->csum_offset)) = csum_fold(calc);
++
++ csum = false;
++ } else {
++ u32 csum_preamble = smsc95xx_calc_csum_preamble(skb);
++ skb_push(skb, 4);
++ cpu_to_le32s(&csum_preamble);
++ memcpy(skb->data, &csum_preamble, 4);
++ }
++ }
++
++ skb_push(skb, 4);
++ tx_cmd_b = (u32)(skb->len - 4);
++ if (csum)
++ tx_cmd_b |= TX_CMD_B_CSUM_ENABLE;
++ cpu_to_le32s(&tx_cmd_b);
++ memcpy(skb->data, &tx_cmd_b, 4);
++
++ skb_push(skb, 4);
++ tx_cmd_a = (u32)(skb->len - 8) | TX_CMD_A_FIRST_SEG_ |
++ TX_CMD_A_LAST_SEG_;
++ cpu_to_le32s(&tx_cmd_a);
++ memcpy(skb->data, &tx_cmd_a, 4);
++
++ return skb;
++}
++
++static int smsc95xx_manage_power(struct usbnet *dev, int on)
++{
++ struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
++
++ dev->intf->needs_remote_wakeup = on;
++
++ if (pdata->features & FEATURE_REMOTE_WAKEUP)
++ return 0;
++
++ /* this chip revision isn't capable of remote wakeup */
++ netdev_info(dev->net, "hardware isn't capable of remote wakeup\n");
++
++ if (on)
++ usb_autopm_get_interface_no_resume(dev->intf);
++ else
++ usb_autopm_put_interface(dev->intf);
++
++ return 0;
++}
++
++static const struct driver_info smsc95xx_info = {
++ .description = "smsc95xx USB 2.0 Ethernet",
++ .bind = smsc95xx_bind,
++ .unbind = smsc95xx_unbind,
++ .link_reset = smsc95xx_link_reset,
++ .reset = smsc95xx_reset,
++ .rx_fixup = smsc95xx_rx_fixup,
++ .tx_fixup = smsc95xx_tx_fixup,
++ .status = smsc95xx_status,
++ .manage_power = smsc95xx_manage_power,
++ .flags = FLAG_ETHER | FLAG_SEND_ZLP | FLAG_LINK_INTR,
++};
++
++static const struct usb_device_id products[] = {
++ {
++ /* SMSC9500 USB Ethernet Device */
++ USB_DEVICE(0x0424, 0x9500),
++ .driver_info = (unsigned long) &smsc95xx_info,
++ },
++ {
++ /* SMSC9505 USB Ethernet Device */
++ USB_DEVICE(0x0424, 0x9505),
++ .driver_info = (unsigned long) &smsc95xx_info,
++ },
++ {
++ /* SMSC9500A USB Ethernet Device */
++ USB_DEVICE(0x0424, 0x9E00),
++ .driver_info = (unsigned long) &smsc95xx_info,
++ },
++ {
++ /* SMSC9505A USB Ethernet Device */
++ USB_DEVICE(0x0424, 0x9E01),
++ .driver_info = (unsigned long) &smsc95xx_info,
++ },
++ {
++ /* SMSC9512/9514 USB Hub & Ethernet Device */
++ USB_DEVICE(0x0424, 0xec00),
++ .driver_info = (unsigned long) &smsc95xx_info,
++ },
++ {
++ /* SMSC9500 USB Ethernet Device (SAL10) */
++ USB_DEVICE(0x0424, 0x9900),
++ .driver_info = (unsigned long) &smsc95xx_info,
++ },
++ {
++ /* SMSC9505 USB Ethernet Device (SAL10) */
++ USB_DEVICE(0x0424, 0x9901),
++ .driver_info = (unsigned long) &smsc95xx_info,
++ },
++ {
++ /* SMSC9500A USB Ethernet Device (SAL10) */
++ USB_DEVICE(0x0424, 0x9902),
++ .driver_info = (unsigned long) &smsc95xx_info,
++ },
++ {
++ /* SMSC9505A USB Ethernet Device (SAL10) */
++ USB_DEVICE(0x0424, 0x9903),
++ .driver_info = (unsigned long) &smsc95xx_info,
++ },
++ {
++ /* SMSC9512/9514 USB Hub & Ethernet Device (SAL10) */
++ USB_DEVICE(0x0424, 0x9904),
++ .driver_info = (unsigned long) &smsc95xx_info,
++ },
++ {
++ /* SMSC9500A USB Ethernet Device (HAL) */
++ USB_DEVICE(0x0424, 0x9905),
++ .driver_info = (unsigned long) &smsc95xx_info,
++ },
++ {
++ /* SMSC9505A USB Ethernet Device (HAL) */
++ USB_DEVICE(0x0424, 0x9906),
++ .driver_info = (unsigned long) &smsc95xx_info,
++ },
++ {
++ /* SMSC9500 USB Ethernet Device (Alternate ID) */
++ USB_DEVICE(0x0424, 0x9907),
++ .driver_info = (unsigned long) &smsc95xx_info,
++ },
++ {
++ /* SMSC9500A USB Ethernet Device (Alternate ID) */
++ USB_DEVICE(0x0424, 0x9908),
++ .driver_info = (unsigned long) &smsc95xx_info,
++ },
++ {
++ /* SMSC9512/9514 USB Hub & Ethernet Device (Alternate ID) */
++ USB_DEVICE(0x0424, 0x9909),
++ .driver_info = (unsigned long) &smsc95xx_info,
++ },
++ {
++ /* SMSC LAN9530 USB Ethernet Device */
++ USB_DEVICE(0x0424, 0x9530),
++ .driver_info = (unsigned long) &smsc95xx_info,
++ },
++ {
++ /* SMSC LAN9730 USB Ethernet Device */
++ USB_DEVICE(0x0424, 0x9730),
++ .driver_info = (unsigned long) &smsc95xx_info,
++ },
++ {
++ /* SMSC LAN89530 USB Ethernet Device */
++ USB_DEVICE(0x0424, 0x9E08),
++ .driver_info = (unsigned long) &smsc95xx_info,
++ },
++ { }, /* END */
++};
++MODULE_DEVICE_TABLE(usb, products);
++
++static struct usb_driver smsc95xx_driver = {
++ .name = "smsc95xx",
++ .id_table = products,
++ .probe = usbnet_probe,
++ .suspend = smsc95xx_suspend,
++ .resume = smsc95xx_resume,
++ .reset_resume = smsc95xx_reset_resume,
++ .disconnect = usbnet_disconnect,
++ .disable_hub_initiated_lpm = 1,
++ .supports_autosuspend = 1,
++};
++
++module_usb_driver(smsc95xx_driver);
++
++MODULE_AUTHOR("Nancy Lin");
++MODULE_AUTHOR("Steve Glendinning <steve.glendinning(a)shawell.net>");
++MODULE_DESCRIPTION("SMSC95XX USB 2.0 Ethernet Devices");
++MODULE_LICENSE("GPL");
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/smsc95xx.h backports-4.2.6-1/drivers/net/usb/smsc95xx.h
+--- backports-4.2.6-1.org/drivers/net/usb/smsc95xx.h 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/smsc95xx.h 2015-11-09 23:37:56.000000000 +0100
+@@ -0,0 +1,290 @@
++ /***************************************************************************
++ *
++ * Copyright (C) 2007-2008 SMSC
++ *
++ * 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, see <http://www.gnu.org/licenses/>.
++ *
++ *****************************************************************************/
++
++#ifndef _SMSC95XX_H
++#define _SMSC95XX_H
++
++/* Tx command words */
++#define TX_CMD_A_DATA_OFFSET_ (0x001F0000)
++#define TX_CMD_A_FIRST_SEG_ (0x00002000)
++#define TX_CMD_A_LAST_SEG_ (0x00001000)
++#define TX_CMD_A_BUF_SIZE_ (0x000007FF)
++
++#define TX_CMD_B_CSUM_ENABLE (0x00004000)
++#define TX_CMD_B_ADD_CRC_DISABLE_ (0x00002000)
++#define TX_CMD_B_DISABLE_PADDING_ (0x00001000)
++#define TX_CMD_B_PKT_BYTE_LENGTH_ (0x000007FF)
++
++/* Rx status word */
++#define RX_STS_FF_ (0x40000000) /* Filter Fail */
++#define RX_STS_FL_ (0x3FFF0000) /* Frame Length */
++#define RX_STS_ES_ (0x00008000) /* Error Summary */
++#define RX_STS_BF_ (0x00002000) /* Broadcast Frame */
++#define RX_STS_LE_ (0x00001000) /* Length Error */
++#define RX_STS_RF_ (0x00000800) /* Runt Frame */
++#define RX_STS_MF_ (0x00000400) /* Multicast Frame */
++#define RX_STS_TL_ (0x00000080) /* Frame too long */
++#define RX_STS_CS_ (0x00000040) /* Collision Seen */
++#define RX_STS_FT_ (0x00000020) /* Frame Type */
++#define RX_STS_RW_ (0x00000010) /* Receive Watchdog */
++#define RX_STS_ME_ (0x00000008) /* Mii Error */
++#define RX_STS_DB_ (0x00000004) /* Dribbling */
++#define RX_STS_CRC_ (0x00000002) /* CRC Error */
++
++/* SCSRs */
++#define ID_REV (0x00)
++#define ID_REV_CHIP_ID_MASK_ (0xFFFF0000)
++#define ID_REV_CHIP_REV_MASK_ (0x0000FFFF)
++#define ID_REV_CHIP_ID_9500_ (0x9500)
++#define ID_REV_CHIP_ID_9500A_ (0x9E00)
++#define ID_REV_CHIP_ID_9512_ (0xEC00)
++#define ID_REV_CHIP_ID_9530_ (0x9530)
++#define ID_REV_CHIP_ID_89530_ (0x9E08)
++#define ID_REV_CHIP_ID_9730_ (0x9730)
++
++#define INT_STS (0x08)
++#define INT_STS_TX_STOP_ (0x00020000)
++#define INT_STS_RX_STOP_ (0x00010000)
++#define INT_STS_PHY_INT_ (0x00008000)
++#define INT_STS_TXE_ (0x00004000)
++#define INT_STS_TDFU_ (0x00002000)
++#define INT_STS_TDFO_ (0x00001000)
++#define INT_STS_RXDF_ (0x00000800)
++#define INT_STS_GPIOS_ (0x000007FF)
++#define INT_STS_CLEAR_ALL_ (0xFFFFFFFF)
++
++#define RX_CFG (0x0C)
++#define RX_FIFO_FLUSH_ (0x00000001)
++
++#define TX_CFG (0x10)
++#define TX_CFG_ON_ (0x00000004)
++#define TX_CFG_STOP_ (0x00000002)
++#define TX_CFG_FIFO_FLUSH_ (0x00000001)
++
++#define HW_CFG (0x14)
++#define HW_CFG_BIR_ (0x00001000)
++#define HW_CFG_LEDB_ (0x00000800)
++#define HW_CFG_RXDOFF_ (0x00000600)
++#define HW_CFG_DRP_ (0x00000040)
++#define HW_CFG_MEF_ (0x00000020)
++#define HW_CFG_LRST_ (0x00000008)
++#define HW_CFG_PSEL_ (0x00000004)
++#define HW_CFG_BCE_ (0x00000002)
++#define HW_CFG_SRST_ (0x00000001)
++
++#define RX_FIFO_INF (0x18)
++
++#define PM_CTRL (0x20)
++#define PM_CTL_RES_CLR_WKP_STS (0x00000200)
++#define PM_CTL_DEV_RDY_ (0x00000080)
++#define PM_CTL_SUS_MODE_ (0x00000060)
++#define PM_CTL_SUS_MODE_0 (0x00000000)
++#define PM_CTL_SUS_MODE_1 (0x00000020)
++#define PM_CTL_SUS_MODE_2 (0x00000040)
++#define PM_CTL_SUS_MODE_3 (0x00000060)
++#define PM_CTL_PHY_RST_ (0x00000010)
++#define PM_CTL_WOL_EN_ (0x00000008)
++#define PM_CTL_ED_EN_ (0x00000004)
++#define PM_CTL_WUPS_ (0x00000003)
++#define PM_CTL_WUPS_NO_ (0x00000000)
++#define PM_CTL_WUPS_ED_ (0x00000001)
++#define PM_CTL_WUPS_WOL_ (0x00000002)
++#define PM_CTL_WUPS_MULTI_ (0x00000003)
++
++#define LED_GPIO_CFG (0x24)
++#define LED_GPIO_CFG_SPD_LED (0x01000000)
++#define LED_GPIO_CFG_LNK_LED (0x00100000)
++#define LED_GPIO_CFG_FDX_LED (0x00010000)
++
++#define GPIO_CFG (0x28)
++
++#define AFC_CFG (0x2C)
++
++/* Hi watermark = 15.5Kb (~10 mtu pkts) */
++/* low watermark = 3k (~2 mtu pkts) */
++/* backpressure duration = ~ 350us */
++/* Apply FC on any frame. */
++#define AFC_CFG_DEFAULT (0x00F830A1)
++
++#define E2P_CMD (0x30)
++#define E2P_CMD_BUSY_ (0x80000000)
++#define E2P_CMD_MASK_ (0x70000000)
++#define E2P_CMD_READ_ (0x00000000)
++#define E2P_CMD_EWDS_ (0x10000000)
++#define E2P_CMD_EWEN_ (0x20000000)
++#define E2P_CMD_WRITE_ (0x30000000)
++#define E2P_CMD_WRAL_ (0x40000000)
++#define E2P_CMD_ERASE_ (0x50000000)
++#define E2P_CMD_ERAL_ (0x60000000)
++#define E2P_CMD_RELOAD_ (0x70000000)
++#define E2P_CMD_TIMEOUT_ (0x00000400)
++#define E2P_CMD_LOADED_ (0x00000200)
++#define E2P_CMD_ADDR_ (0x000001FF)
++
++#define MAX_EEPROM_SIZE (512)
++
++#define E2P_DATA (0x34)
++#define E2P_DATA_MASK_ (0x000000FF)
++
++#define BURST_CAP (0x38)
++
++#define GPIO_WAKE (0x64)
++
++#define INT_EP_CTL (0x68)
++#define INT_EP_CTL_INTEP_ (0x80000000)
++#define INT_EP_CTL_MACRTO_ (0x00080000)
++#define INT_EP_CTL_TX_STOP_ (0x00020000)
++#define INT_EP_CTL_RX_STOP_ (0x00010000)
++#define INT_EP_CTL_PHY_INT_ (0x00008000)
++#define INT_EP_CTL_TXE_ (0x00004000)
++#define INT_EP_CTL_TDFU_ (0x00002000)
++#define INT_EP_CTL_TDFO_ (0x00001000)
++#define INT_EP_CTL_RXDF_ (0x00000800)
++#define INT_EP_CTL_GPIOS_ (0x000007FF)
++
++#define BULK_IN_DLY (0x6C)
++
++/* MAC CSRs */
++#define MAC_CR (0x100)
++#define MAC_CR_RXALL_ (0x80000000)
++#define MAC_CR_RCVOWN_ (0x00800000)
++#define MAC_CR_LOOPBK_ (0x00200000)
++#define MAC_CR_FDPX_ (0x00100000)
++#define MAC_CR_MCPAS_ (0x00080000)
++#define MAC_CR_PRMS_ (0x00040000)
++#define MAC_CR_INVFILT_ (0x00020000)
++#define MAC_CR_PASSBAD_ (0x00010000)
++#define MAC_CR_HFILT_ (0x00008000)
++#define MAC_CR_HPFILT_ (0x00002000)
++#define MAC_CR_LCOLL_ (0x00001000)
++#define MAC_CR_BCAST_ (0x00000800)
++#define MAC_CR_DISRTY_ (0x00000400)
++#define MAC_CR_PADSTR_ (0x00000100)
++#define MAC_CR_BOLMT_MASK (0x000000C0)
++#define MAC_CR_DFCHK_ (0x00000020)
++#define MAC_CR_TXEN_ (0x00000008)
++#define MAC_CR_RXEN_ (0x00000004)
++
++#define ADDRH (0x104)
++
++#define ADDRL (0x108)
++
++#define HASHH (0x10C)
++
++#define HASHL (0x110)
++
++#define MII_ADDR (0x114)
++#define MII_WRITE_ (0x02)
++#define MII_BUSY_ (0x01)
++#define MII_READ_ (0x00) /* ~of MII Write bit */
++
++#define MII_DATA (0x118)
++
++#define FLOW (0x11C)
++#define FLOW_FCPT_ (0xFFFF0000)
++#define FLOW_FCPASS_ (0x00000004)
++#define FLOW_FCEN_ (0x00000002)
++#define FLOW_FCBSY_ (0x00000001)
++
++#define VLAN1 (0x120)
++
++#define VLAN2 (0x124)
++
++#define WUFF (0x128)
++#define LAN9500_WUFF_NUM (4)
++#define LAN9500A_WUFF_NUM (8)
++
++#define WUCSR (0x12C)
++#define WUCSR_WFF_PTR_RST_ (0x80000000)
++#define WUCSR_GUE_ (0x00000200)
++#define WUCSR_WUFR_ (0x00000040)
++#define WUCSR_MPR_ (0x00000020)
++#define WUCSR_WAKE_EN_ (0x00000004)
++#define WUCSR_MPEN_ (0x00000002)
++
++#define COE_CR (0x130)
++#define Tx_COE_EN_ (0x00010000)
++#define Rx_COE_MODE_ (0x00000002)
++#define Rx_COE_EN_ (0x00000001)
++
++/* Vendor-specific PHY Definitions */
++
++/* EDPD NLP / crossover time configuration (LAN9500A only) */
++#define PHY_EDPD_CONFIG (16)
++#define PHY_EDPD_CONFIG_TX_NLP_EN_ ((u16)0x8000)
++#define PHY_EDPD_CONFIG_TX_NLP_1000_ ((u16)0x0000)
++#define PHY_EDPD_CONFIG_TX_NLP_768_ ((u16)0x2000)
++#define PHY_EDPD_CONFIG_TX_NLP_512_ ((u16)0x4000)
++#define PHY_EDPD_CONFIG_TX_NLP_256_ ((u16)0x6000)
++#define PHY_EDPD_CONFIG_RX_1_NLP_ ((u16)0x1000)
++#define PHY_EDPD_CONFIG_RX_NLP_64_ ((u16)0x0000)
++#define PHY_EDPD_CONFIG_RX_NLP_256_ ((u16)0x0400)
++#define PHY_EDPD_CONFIG_RX_NLP_512_ ((u16)0x0800)
++#define PHY_EDPD_CONFIG_RX_NLP_1000_ ((u16)0x0C00)
++#define PHY_EDPD_CONFIG_EXT_CROSSOVER_ ((u16)0x0001)
++#define PHY_EDPD_CONFIG_DEFAULT (PHY_EDPD_CONFIG_TX_NLP_EN_ | \
++ PHY_EDPD_CONFIG_TX_NLP_768_ | \
++ PHY_EDPD_CONFIG_RX_1_NLP_)
++
++/* Mode Control/Status Register */
++#define PHY_MODE_CTRL_STS (17)
++#define MODE_CTRL_STS_EDPWRDOWN_ ((u16)0x2000)
++#define MODE_CTRL_STS_ENERGYON_ ((u16)0x0002)
++
++#define SPECIAL_CTRL_STS (27)
++#define SPECIAL_CTRL_STS_OVRRD_AMDIX_ ((u16)0x8000)
++#define SPECIAL_CTRL_STS_AMDIX_ENABLE_ ((u16)0x4000)
++#define SPECIAL_CTRL_STS_AMDIX_STATE_ ((u16)0x2000)
++
++#define PHY_INT_SRC (29)
++#define PHY_INT_SRC_ENERGY_ON_ ((u16)0x0080)
++#define PHY_INT_SRC_ANEG_COMP_ ((u16)0x0040)
++#define PHY_INT_SRC_REMOTE_FAULT_ ((u16)0x0020)
++#define PHY_INT_SRC_LINK_DOWN_ ((u16)0x0010)
++
++#define PHY_INT_MASK (30)
++#define PHY_INT_MASK_ENERGY_ON_ ((u16)0x0080)
++#define PHY_INT_MASK_ANEG_COMP_ ((u16)0x0040)
++#define PHY_INT_MASK_REMOTE_FAULT_ ((u16)0x0020)
++#define PHY_INT_MASK_LINK_DOWN_ ((u16)0x0010)
++#define PHY_INT_MASK_DEFAULT_ (PHY_INT_MASK_ANEG_COMP_ | \
++ PHY_INT_MASK_LINK_DOWN_)
++
++#define PHY_SPECIAL (31)
++#define PHY_SPECIAL_SPD_ ((u16)0x001C)
++#define PHY_SPECIAL_SPD_10HALF_ ((u16)0x0004)
++#define PHY_SPECIAL_SPD_10FULL_ ((u16)0x0014)
++#define PHY_SPECIAL_SPD_100HALF_ ((u16)0x0008)
++#define PHY_SPECIAL_SPD_100FULL_ ((u16)0x0018)
++
++/* USB Vendor Requests */
++#define USB_VENDOR_REQUEST_WRITE_REGISTER 0xA0
++#define USB_VENDOR_REQUEST_READ_REGISTER 0xA1
++#define USB_VENDOR_REQUEST_GET_STATS 0xA2
++
++/* Interrupt Endpoint status word bitfields */
++#define INT_ENP_TX_STOP_ ((u32)BIT(17))
++#define INT_ENP_RX_STOP_ ((u32)BIT(16))
++#define INT_ENP_PHY_INT_ ((u32)BIT(15))
++#define INT_ENP_TXE_ ((u32)BIT(14))
++#define INT_ENP_TDFU_ ((u32)BIT(13))
++#define INT_ENP_TDFO_ ((u32)BIT(12))
++#define INT_ENP_RXDF_ ((u32)BIT(11))
++
++#endif /* _SMSC95XX_H */
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/sr9700.c backports-4.2.6-1/drivers/net/usb/sr9700.c
+--- backports-4.2.6-1.org/drivers/net/usb/sr9700.c 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/sr9700.c 2015-11-09 23:37:56.000000000 +0100
+@@ -0,0 +1,559 @@
++/*
++ * CoreChip-sz SR9700 one chip USB 1.1 Ethernet Devices
++ *
++ * Author : Liu Junliang <liujunliang_ljl(a)163.com>
++ *
++ * Based on dm9601.c
++ *
++ * This file is licensed under the terms of the GNU General Public License
++ * version 2. This program is licensed "as is" without any warranty of any
++ * kind, whether express or implied.
++ */
++
++#include <linux/module.h>
++#include <linux/sched.h>
++#include <linux/stddef.h>
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/ethtool.h>
++#include <linux/mii.h>
++#include <linux/usb.h>
++#include <linux/crc32.h>
++#include <linux/usb/usbnet.h>
++
++#include "sr9700.h"
++
++static int sr_read(struct usbnet *dev, u8 reg, u16 length, void *data)
++{
++ int err;
++
++ err = usbnet_read_cmd(dev, SR_RD_REGS, SR_REQ_RD_REG, 0, reg, data,
++ length);
++ if ((err != length) && (err >= 0))
++ err = -EINVAL;
++ return err;
++}
++
++static int sr_write(struct usbnet *dev, u8 reg, u16 length, void *data)
++{
++ int err;
++
++ err = usbnet_write_cmd(dev, SR_WR_REGS, SR_REQ_WR_REG, 0, reg, data,
++ length);
++ if ((err >= 0) && (err < length))
++ err = -EINVAL;
++ return err;
++}
++
++static int sr_read_reg(struct usbnet *dev, u8 reg, u8 *value)
++{
++ return sr_read(dev, reg, 1, value);
++}
++
++static int sr_write_reg(struct usbnet *dev, u8 reg, u8 value)
++{
++ return usbnet_write_cmd(dev, SR_WR_REGS, SR_REQ_WR_REG,
++ value, reg, NULL, 0);
++}
++
++static void sr_write_async(struct usbnet *dev, u8 reg, u16 length, void *data)
++{
++ usbnet_write_cmd_async(dev, SR_WR_REGS, SR_REQ_WR_REG,
++ 0, reg, data, length);
++}
++
++static void sr_write_reg_async(struct usbnet *dev, u8 reg, u8 value)
++{
++ usbnet_write_cmd_async(dev, SR_WR_REGS, SR_REQ_WR_REG,
++ value, reg, NULL, 0);
++}
++
++static int wait_phy_eeprom_ready(struct usbnet *dev, int phy)
++{
++ int i;
++
++ for (i = 0; i < SR_SHARE_TIMEOUT; i++) {
++ u8 tmp = 0;
++ int ret;
++
++ udelay(1);
++ ret = sr_read_reg(dev, SR_EPCR, &tmp);
++ if (ret < 0)
++ return ret;
++
++ /* ready */
++ if (!(tmp & EPCR_ERRE))
++ return 0;
++ }
++
++ netdev_err(dev->net, "%s write timed out!\n", phy ? "phy" : "eeprom");
++
++ return -EIO;
++}
++
++static int sr_share_read_word(struct usbnet *dev, int phy, u8 reg,
++ __le16 *value)
++{
++ int ret;
++
++ mutex_lock(&dev->phy_mutex);
++
++ sr_write_reg(dev, SR_EPAR, phy ? (reg | EPAR_PHY_ADR) : reg);
++ sr_write_reg(dev, SR_EPCR, phy ? (EPCR_EPOS | EPCR_ERPRR) : EPCR_ERPRR);
++
++ ret = wait_phy_eeprom_ready(dev, phy);
++ if (ret < 0)
++ goto out_unlock;
++
++ sr_write_reg(dev, SR_EPCR, 0x0);
++ ret = sr_read(dev, SR_EPDR, 2, value);
++
++ netdev_dbg(dev->net, "read shared %d 0x%02x returned 0x%04x, %d\n",
++ phy, reg, *value, ret);
++
++out_unlock:
++ mutex_unlock(&dev->phy_mutex);
++ return ret;
++}
++
++static int sr_share_write_word(struct usbnet *dev, int phy, u8 reg,
++ __le16 value)
++{
++ int ret;
++
++ mutex_lock(&dev->phy_mutex);
++
++ ret = sr_write(dev, SR_EPDR, 2, &value);
++ if (ret < 0)
++ goto out_unlock;
++
++ sr_write_reg(dev, SR_EPAR, phy ? (reg | EPAR_PHY_ADR) : reg);
++ sr_write_reg(dev, SR_EPCR, phy ? (EPCR_WEP | EPCR_EPOS | EPCR_ERPRW) :
++ (EPCR_WEP | EPCR_ERPRW));
++
++ ret = wait_phy_eeprom_ready(dev, phy);
++ if (ret < 0)
++ goto out_unlock;
++
++ sr_write_reg(dev, SR_EPCR, 0x0);
++
++out_unlock:
++ mutex_unlock(&dev->phy_mutex);
++ return ret;
++}
++
++static int sr_read_eeprom_word(struct usbnet *dev, u8 offset, void *value)
++{
++ return sr_share_read_word(dev, 0, offset, value);
++}
++
++static int sr9700_get_eeprom_len(struct net_device *netdev)
++{
++ return SR_EEPROM_LEN;
++}
++
++static int sr9700_get_eeprom(struct net_device *netdev,
++ struct ethtool_eeprom *eeprom, u8 *data)
++{
++ struct usbnet *dev = netdev_priv(netdev);
++ __le16 *buf = (__le16 *)data;
++ int ret = 0;
++ int i;
++
++ /* access is 16bit */
++ if ((eeprom->offset & 0x01) || (eeprom->len & 0x01))
++ return -EINVAL;
++
++ for (i = 0; i < eeprom->len / 2; i++) {
++ ret = sr_read_eeprom_word(dev, eeprom->offset / 2 + i, buf + i);
++ if (ret < 0)
++ break;
++ }
++
++ return ret;
++}
++
++static int sr_mdio_read(struct net_device *netdev, int phy_id, int loc)
++{
++ struct usbnet *dev = netdev_priv(netdev);
++ __le16 res;
++ int rc = 0;
++
++ if (phy_id) {
++ netdev_dbg(netdev, "Only internal phy supported\n");
++ return 0;
++ }
++
++ /* Access NSR_LINKST bit for link status instead of MII_BMSR */
++ if (loc == MII_BMSR) {
++ u8 value;
++
++ sr_read_reg(dev, SR_NSR, &value);
++ if (value & NSR_LINKST)
++ rc = 1;
++ }
++ sr_share_read_word(dev, 1, loc, &res);
++ if (rc == 1)
++ res = le16_to_cpu(res) | BMSR_LSTATUS;
++ else
++ res = le16_to_cpu(res) & ~BMSR_LSTATUS;
++
++ netdev_dbg(netdev, "sr_mdio_read() phy_id=0x%02x, loc=0x%02x, returns=0x%04x\n",
++ phy_id, loc, res);
++
++ return res;
++}
++
++static void sr_mdio_write(struct net_device *netdev, int phy_id, int loc,
++ int val)
++{
++ struct usbnet *dev = netdev_priv(netdev);
++ __le16 res = cpu_to_le16(val);
++
++ if (phy_id) {
++ netdev_dbg(netdev, "Only internal phy supported\n");
++ return;
++ }
++
++ netdev_dbg(netdev, "sr_mdio_write() phy_id=0x%02x, loc=0x%02x, val=0x%04x\n",
++ phy_id, loc, val);
++
++ sr_share_write_word(dev, 1, loc, res);
++}
++
++static u32 sr9700_get_link(struct net_device *netdev)
++{
++ struct usbnet *dev = netdev_priv(netdev);
++ u8 value = 0;
++ int rc = 0;
++
++ /* Get the Link Status directly */
++ sr_read_reg(dev, SR_NSR, &value);
++ if (value & NSR_LINKST)
++ rc = 1;
++
++ return rc;
++}
++
++static int sr9700_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
++{
++ struct usbnet *dev = netdev_priv(netdev);
++
++ return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
++}
++
++static const struct ethtool_ops sr9700_ethtool_ops = {
++ .get_drvinfo = usbnet_get_drvinfo,
++ .get_link = sr9700_get_link,
++ .get_msglevel = usbnet_get_msglevel,
++ .set_msglevel = usbnet_set_msglevel,
++ .get_eeprom_len = sr9700_get_eeprom_len,
++ .get_eeprom = sr9700_get_eeprom,
++ .get_settings = usbnet_get_settings,
++ .set_settings = usbnet_set_settings,
++ .nway_reset = usbnet_nway_reset,
++};
++
++static void sr9700_set_multicast(struct net_device *netdev)
++{
++ struct usbnet *dev = netdev_priv(netdev);
++ /* We use the 20 byte dev->data for our 8 byte filter buffer
++ * to avoid allocating memory that is tricky to free later
++ */
++ u8 *hashes = (u8 *)&dev->data;
++ /* rx_ctl setting : enable, disable_long, disable_crc */
++ u8 rx_ctl = RCR_RXEN | RCR_DIS_CRC | RCR_DIS_LONG;
++
++ memset(hashes, 0x00, SR_MCAST_SIZE);
++ /* broadcast address */
++ hashes[SR_MCAST_SIZE - 1] |= SR_MCAST_ADDR_FLAG;
++ if (netdev->flags & IFF_PROMISC) {
++ rx_ctl |= RCR_PRMSC;
++ } else if (netdev->flags & IFF_ALLMULTI ||
++ netdev_mc_count(netdev) > SR_MCAST_MAX) {
++ rx_ctl |= RCR_RUNT;
++ } else if (!netdev_mc_empty(netdev)) {
++ struct netdev_hw_addr *ha;
++
++ netdev_for_each_mc_addr(ha, netdev) {
++ u32 crc = ether_crc(ETH_ALEN, ha->addr) >> 26;
++ hashes[crc >> 3] |= 1 << (crc & 0x7);
++ }
++ }
++
++ sr_write_async(dev, SR_MAR, SR_MCAST_SIZE, hashes);
++ sr_write_reg_async(dev, SR_RCR, rx_ctl);
++}
++
++static int sr9700_set_mac_address(struct net_device *netdev, void *p)
++{
++ struct usbnet *dev = netdev_priv(netdev);
++ struct sockaddr *addr = p;
++
++ if (!is_valid_ether_addr(addr->sa_data)) {
++ netdev_err(netdev, "not setting invalid mac address %pM\n",
++ addr->sa_data);
++ return -EINVAL;
++ }
++
++ memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
++ sr_write_async(dev, SR_PAR, 6, netdev->dev_addr);
++
++ return 0;
++}
++
++static const struct net_device_ops sr9700_netdev_ops = {
++ .ndo_open = usbnet_open,
++ .ndo_stop = usbnet_stop,
++ .ndo_start_xmit = usbnet_start_xmit,
++ .ndo_tx_timeout = usbnet_tx_timeout,
++ .ndo_change_mtu = usbnet_change_mtu,
++ .ndo_validate_addr = eth_validate_addr,
++ .ndo_do_ioctl = sr9700_ioctl,
++ .ndo_set_rx_mode = sr9700_set_multicast,
++ .ndo_set_mac_address = sr9700_set_mac_address,
++};
++
++static int sr9700_bind(struct usbnet *dev, struct usb_interface *intf)
++{
++ struct net_device *netdev;
++ struct mii_if_info *mii;
++ int ret;
++
++ ret = usbnet_get_endpoints(dev, intf);
++ if (ret)
++ goto out;
++
++ netdev = dev->net;
++
++ netdev->netdev_ops = &sr9700_netdev_ops;
++ netdev->ethtool_ops = &sr9700_ethtool_ops;
++ netdev->hard_header_len += SR_TX_OVERHEAD;
++ dev->hard_mtu = netdev->mtu + netdev->hard_header_len;
++ /* bulkin buffer is preferably not less than 3K */
++ dev->rx_urb_size = 3072;
++
++ mii = &dev->mii;
++ mii->dev = netdev;
++ mii->mdio_read = sr_mdio_read;
++ mii->mdio_write = sr_mdio_write;
++ mii->phy_id_mask = 0x1f;
++ mii->reg_num_mask = 0x1f;
++
++ sr_write_reg(dev, SR_NCR, NCR_RST);
++ udelay(20);
++
++ /* read MAC
++ * After Chip Power on, the Chip will reload the MAC from
++ * EEPROM automatically to PAR. In case there is no EEPROM externally,
++ * a default MAC address is stored in PAR for making chip work properly.
++ */
++ if (sr_read(dev, SR_PAR, ETH_ALEN, netdev->dev_addr) < 0) {
++ netdev_err(netdev, "Error reading MAC address\n");
++ ret = -ENODEV;
++ goto out;
++ }
++
++ /* power up and reset phy */
++ sr_write_reg(dev, SR_PRR, PRR_PHY_RST);
++ /* at least 10ms, here 20ms for safe */
++ mdelay(20);
++ sr_write_reg(dev, SR_PRR, 0);
++ /* at least 1ms, here 2ms for reading right register */
++ udelay(2 * 1000);
++
++ /* receive broadcast packets */
++ sr9700_set_multicast(netdev);
++
++ sr_mdio_write(netdev, mii->phy_id, MII_BMCR, BMCR_RESET);
++ sr_mdio_write(netdev, mii->phy_id, MII_ADVERTISE, ADVERTISE_ALL |
++ ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP);
++ mii_nway_restart(mii);
++
++out:
++ return ret;
++}
++
++static int sr9700_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
++{
++ struct sk_buff *sr_skb;
++ int len;
++
++ /* skb content (packets) format :
++ * p0 p1 p2 ...... pm
++ * / \
++ * / \
++ * / \
++ * / \
++ * p0b0 p0b1 p0b2 p0b3 ...... p0b(n-4) p0b(n-3)...p0bn
++ *
++ * p0 : packet 0
++ * p0b0 : packet 0 byte 0
++ *
++ * b0: rx status
++ * b1: packet length (incl crc) low
++ * b2: packet length (incl crc) high
++ * b3..n-4: packet data
++ * bn-3..bn: ethernet packet crc
++ */
++ if (unlikely(skb->len < SR_RX_OVERHEAD)) {
++ netdev_err(dev->net, "unexpected tiny rx frame\n");
++ return 0;
++ }
++
++ /* one skb may contains multiple packets */
++ while (skb->len > SR_RX_OVERHEAD) {
++ if (skb->data[0] != 0x40)
++ return 0;
++
++ /* ignore the CRC length */
++ len = (skb->data[1] | (skb->data[2] << 8)) - 4;
++
++ if (len > ETH_FRAME_LEN)
++ return 0;
++
++ /* the last packet of current skb */
++ if (skb->len == (len + SR_RX_OVERHEAD)) {
++ skb_pull(skb, 3);
++ skb->len = len;
++ skb_set_tail_pointer(skb, len);
++ skb->truesize = len + sizeof(struct sk_buff);
++ return 2;
++ }
++
++ /* skb_clone is used for address align */
++ sr_skb = skb_clone(skb, GFP_ATOMIC);
++ if (!sr_skb)
++ return 0;
++
++ sr_skb->len = len;
++ sr_skb->data = skb->data + 3;
++ skb_set_tail_pointer(sr_skb, len);
++ sr_skb->truesize = len + sizeof(struct sk_buff);
++ usbnet_skb_return(dev, sr_skb);
++
++ skb_pull(skb, len + SR_RX_OVERHEAD);
++ };
++
++ return 0;
++}
++
++static struct sk_buff *sr9700_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
++ gfp_t flags)
++{
++ int len;
++
++ /* SR9700 can only send out one ethernet packet at once.
++ *
++ * b0 b1 b2 b3 ...... b(n-4) b(n-3)...bn
++ *
++ * b0: rx status
++ * b1: packet length (incl crc) low
++ * b2: packet length (incl crc) high
++ * b3..n-4: packet data
++ * bn-3..bn: ethernet packet crc
++ */
++
++ len = skb->len;
++
++ if (skb_headroom(skb) < SR_TX_OVERHEAD) {
++ struct sk_buff *skb2;
++
++ skb2 = skb_copy_expand(skb, SR_TX_OVERHEAD, 0, flags);
++ dev_kfree_skb_any(skb);
++ skb = skb2;
++ if (!skb)
++ return NULL;
++ }
++
++ __skb_push(skb, SR_TX_OVERHEAD);
++
++ /* usbnet adds padding if length is a multiple of packet size
++ * if so, adjust length value in header
++ */
++ if ((skb->len % dev->maxpacket) == 0)
++ len++;
++
++ skb->data[0] = len;
++ skb->data[1] = len >> 8;
++
++ return skb;
++}
++
++static void sr9700_status(struct usbnet *dev, struct urb *urb)
++{
++ int link;
++ u8 *buf;
++
++ /* format:
++ b0: net status
++ b1: tx status 1
++ b2: tx status 2
++ b3: rx status
++ b4: rx overflow
++ b5: rx count
++ b6: tx count
++ b7: gpr
++ */
++
++ if (urb->actual_length < 8)
++ return;
++
++ buf = urb->transfer_buffer;
++
++ link = !!(buf[0] & 0x40);
++ if (netif_carrier_ok(dev->net) != link) {
++ usbnet_link_change(dev, link, 1);
++ netdev_dbg(dev->net, "Link Status is: %d\n", link);
++ }
++}
++
++static int sr9700_link_reset(struct usbnet *dev)
++{
++ struct ethtool_cmd ecmd;
++
++ mii_check_media(&dev->mii, 1, 1);
++ mii_ethtool_gset(&dev->mii, &ecmd);
++
++ netdev_dbg(dev->net, "link_reset() speed: %d duplex: %d\n",
++ ecmd.speed, ecmd.duplex);
++
++ return 0;
++}
++
++static const struct driver_info sr9700_driver_info = {
++ .description = "CoreChip SR9700 USB Ethernet",
++ .flags = FLAG_ETHER,
++ .bind = sr9700_bind,
++ .rx_fixup = sr9700_rx_fixup,
++ .tx_fixup = sr9700_tx_fixup,
++ .status = sr9700_status,
++ .link_reset = sr9700_link_reset,
++ .reset = sr9700_link_reset,
++};
++
++static const struct usb_device_id products[] = {
++ {
++ USB_DEVICE(0x0fe6, 0x9700), /* SR9700 device */
++ .driver_info = (unsigned long)&sr9700_driver_info,
++ },
++ {}, /* END */
++};
++
++MODULE_DEVICE_TABLE(usb, products);
++
++static struct usb_driver sr9700_usb_driver = {
++ .name = "sr9700",
++ .id_table = products,
++ .probe = usbnet_probe,
++ .disconnect = usbnet_disconnect,
++ .suspend = usbnet_suspend,
++ .resume = usbnet_resume,
++ .disable_hub_initiated_lpm = 1,
++};
++
++module_usb_driver(sr9700_usb_driver);
++
++MODULE_AUTHOR("liujl <liujunliang_ljl(a)163.com>");
++MODULE_DESCRIPTION("SR9700 one chip USB 1.1 USB to Ethernet device from http://www.corechip-sz.com/");
++MODULE_LICENSE("GPL");
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/sr9700.h backports-4.2.6-1/drivers/net/usb/sr9700.h
+--- backports-4.2.6-1.org/drivers/net/usb/sr9700.h 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/sr9700.h 2015-11-09 23:37:56.000000000 +0100
+@@ -0,0 +1,173 @@
++/*
++ * CoreChip-sz SR9700 one chip USB 1.1 Ethernet Devices
++ *
++ * Author : Liu Junliang <liujunliang_ljl(a)163.com>
++ *
++ * 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 published by the Free Software Foundation.
++ */
++
++#ifndef _SR9700_H
++#define _SR9700_H
++
++/* sr9700 spec. register table on Linux platform */
++
++/* Network Control Reg */
++#define SR_NCR 0x00
++#define NCR_RST (1 << 0)
++#define NCR_LBK (3 << 1)
++#define NCR_FDX (1 << 3)
++#define NCR_WAKEEN (1 << 6)
++/* Network Status Reg */
++#define SR_NSR 0x01
++#define NSR_RXRDY (1 << 0)
++#define NSR_RXOV (1 << 1)
++#define NSR_TX1END (1 << 2)
++#define NSR_TX2END (1 << 3)
++#define NSR_TXFULL (1 << 4)
++#define NSR_WAKEST (1 << 5)
++#define NSR_LINKST (1 << 6)
++#define NSR_SPEED (1 << 7)
++/* Tx Control Reg */
++#define SR_TCR 0x02
++#define TCR_CRC_DIS (1 << 1)
++#define TCR_PAD_DIS (1 << 2)
++#define TCR_LC_CARE (1 << 3)
++#define TCR_CRS_CARE (1 << 4)
++#define TCR_EXCECM (1 << 5)
++#define TCR_LF_EN (1 << 6)
++/* Tx Status Reg for Packet Index 1 */
++#define SR_TSR1 0x03
++#define TSR1_EC (1 << 2)
++#define TSR1_COL (1 << 3)
++#define TSR1_LC (1 << 4)
++#define TSR1_NC (1 << 5)
++#define TSR1_LOC (1 << 6)
++#define TSR1_TLF (1 << 7)
++/* Tx Status Reg for Packet Index 2 */
++#define SR_TSR2 0x04
++#define TSR2_EC (1 << 2)
++#define TSR2_COL (1 << 3)
++#define TSR2_LC (1 << 4)
++#define TSR2_NC (1 << 5)
++#define TSR2_LOC (1 << 6)
++#define TSR2_TLF (1 << 7)
++/* Rx Control Reg*/
++#define SR_RCR 0x05
++#define RCR_RXEN (1 << 0)
++#define RCR_PRMSC (1 << 1)
++#define RCR_RUNT (1 << 2)
++#define RCR_ALL (1 << 3)
++#define RCR_DIS_CRC (1 << 4)
++#define RCR_DIS_LONG (1 << 5)
++/* Rx Status Reg */
++#define SR_RSR 0x06
++#define RSR_AE (1 << 2)
++#define RSR_MF (1 << 6)
++#define RSR_RF (1 << 7)
++/* Rx Overflow Counter Reg */
++#define SR_ROCR 0x07
++#define ROCR_ROC (0x7F << 0)
++#define ROCR_RXFU (1 << 7)
++/* Back Pressure Threshold Reg */
++#define SR_BPTR 0x08
++#define BPTR_JPT (0x0F << 0)
++#define BPTR_BPHW (0x0F << 4)
++/* Flow Control Threshold Reg */
++#define SR_FCTR 0x09
++#define FCTR_LWOT (0x0F << 0)
++#define FCTR_HWOT (0x0F << 4)
++/* rx/tx Flow Control Reg */
++#define SR_FCR 0x0A
++#define FCR_FLCE (1 << 0)
++#define FCR_BKPA (1 << 4)
++#define FCR_TXPEN (1 << 5)
++#define FCR_TXPF (1 << 6)
++#define FCR_TXP0 (1 << 7)
++/* Eeprom & Phy Control Reg */
++#define SR_EPCR 0x0B
++#define EPCR_ERRE (1 << 0)
++#define EPCR_ERPRW (1 << 1)
++#define EPCR_ERPRR (1 << 2)
++#define EPCR_EPOS (1 << 3)
++#define EPCR_WEP (1 << 4)
++/* Eeprom & Phy Address Reg */
++#define SR_EPAR 0x0C
++#define EPAR_EROA (0x3F << 0)
++#define EPAR_PHY_ADR_MASK (0x03 << 6)
++#define EPAR_PHY_ADR (0x01 << 6)
++/* Eeprom & Phy Data Reg */
++#define SR_EPDR 0x0D /* 0x0D ~ 0x0E for Data Reg Low & High */
++/* Wakeup Control Reg */
++#define SR_WCR 0x0F
++#define WCR_MAGICST (1 << 0)
++#define WCR_LINKST (1 << 2)
++#define WCR_MAGICEN (1 << 3)
++#define WCR_LINKEN (1 << 5)
++/* Physical Address Reg */
++#define SR_PAR 0x10 /* 0x10 ~ 0x15 6 bytes for PAR */
++/* Multicast Address Reg */
++#define SR_MAR 0x16 /* 0x16 ~ 0x1D 8 bytes for MAR */
++/* 0x1e unused */
++/* Phy Reset Reg */
++#define SR_PRR 0x1F
++#define PRR_PHY_RST (1 << 0)
++/* Tx sdram Write Pointer Address Low */
++#define SR_TWPAL 0x20
++/* Tx sdram Write Pointer Address High */
++#define SR_TWPAH 0x21
++/* Tx sdram Read Pointer Address Low */
++#define SR_TRPAL 0x22
++/* Tx sdram Read Pointer Address High */
++#define SR_TRPAH 0x23
++/* Rx sdram Write Pointer Address Low */
++#define SR_RWPAL 0x24
++/* Rx sdram Write Pointer Address High */
++#define SR_RWPAH 0x25
++/* Rx sdram Read Pointer Address Low */
++#define SR_RRPAL 0x26
++/* Rx sdram Read Pointer Address High */
++#define SR_RRPAH 0x27
++/* Vendor ID register */
++#define SR_VID 0x28 /* 0x28 ~ 0x29 2 bytes for VID */
++/* Product ID register */
++#define SR_PID 0x2A /* 0x2A ~ 0x2B 2 bytes for PID */
++/* CHIP Revision register */
++#define SR_CHIPR 0x2C
++/* 0x2D --> 0xEF unused */
++/* USB Device Address */
++#define SR_USBDA 0xF0
++#define USBDA_USBFA (0x7F << 0)
++/* RX packet Counter Reg */
++#define SR_RXC 0xF1
++/* Tx packet Counter & USB Status Reg */
++#define SR_TXC_USBS 0xF2
++#define TXC_USBS_TXC0 (1 << 0)
++#define TXC_USBS_TXC1 (1 << 1)
++#define TXC_USBS_TXC2 (1 << 2)
++#define TXC_USBS_EP1RDY (1 << 5)
++#define TXC_USBS_SUSFLAG (1 << 6)
++#define TXC_USBS_RXFAULT (1 << 7)
++/* USB Control register */
++#define SR_USBC 0xF4
++#define USBC_EP3NAK (1 << 4)
++#define USBC_EP3ACK (1 << 5)
++
++/* Register access commands and flags */
++#define SR_RD_REGS 0x00
++#define SR_WR_REGS 0x01
++#define SR_WR_REG 0x03
++#define SR_REQ_RD_REG (USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE)
++#define SR_REQ_WR_REG (USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE)
++
++/* parameters */
++#define SR_SHARE_TIMEOUT 1000
++#define SR_EEPROM_LEN 256
++#define SR_MCAST_SIZE 8
++#define SR_MCAST_ADDR_FLAG 0x80
++#define SR_MCAST_MAX 64
++#define SR_TX_OVERHEAD 2 /* 2bytes header */
++#define SR_RX_OVERHEAD 7 /* 3bytes header + 4crc tail */
++
++#endif /* _SR9700_H */
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/sr9800.c backports-4.2.6-1/drivers/net/usb/sr9800.c
+--- backports-4.2.6-1.org/drivers/net/usb/sr9800.c 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/sr9800.c 2015-11-09 23:37:56.000000000 +0100
+@@ -0,0 +1,875 @@
++/* CoreChip-sz SR9800 one chip USB 2.0 Ethernet Devices
++ *
++ * Author : Liu Junliang <liujunliang_ljl(a)163.com>
++ *
++ * Based on asix_common.c, asix_devices.c
++ *
++ * This file is licensed under the terms of the GNU General Public License
++ * version 2. This program is licensed "as is" without any warranty of any
++ * kind, whether express or implied.*
++ */
++
++#include <linux/module.h>
++#include <linux/kmod.h>
++#include <linux/init.h>
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/ethtool.h>
++#include <linux/workqueue.h>
++#include <linux/mii.h>
++#include <linux/usb.h>
++#include <linux/crc32.h>
++#include <linux/usb/usbnet.h>
++#include <linux/slab.h>
++#include <linux/if_vlan.h>
++
++#include "sr9800.h"
++
++static int sr_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
++ u16 size, void *data)
++{
++ int err;
++
++ err = usbnet_read_cmd(dev, cmd, SR_REQ_RD_REG, value, index,
++ data, size);
++ if ((err != size) && (err >= 0))
++ err = -EINVAL;
++
++ return err;
++}
++
++static int sr_write_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
++ u16 size, void *data)
++{
++ int err;
++
++ err = usbnet_write_cmd(dev, cmd, SR_REQ_WR_REG, value, index,
++ data, size);
++ if ((err != size) && (err >= 0))
++ err = -EINVAL;
++
++ return err;
++}
++
++static void
++sr_write_cmd_async(struct usbnet *dev, u8 cmd, u16 value, u16 index,
++ u16 size, void *data)
++{
++ usbnet_write_cmd_async(dev, cmd, SR_REQ_WR_REG, value, index, data,
++ size);
++}
++
++static int sr_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
++{
++ int offset = 0;
++
++ /* This check is no longer done by usbnet */
++ if (skb->len < dev->net->hard_header_len)
++ return 0;
++
++ while (offset + sizeof(u32) < skb->len) {
++ struct sk_buff *sr_skb;
++ u16 size;
++ u32 header = get_unaligned_le32(skb->data + offset);
++
++ offset += sizeof(u32);
++ /* get the packet length */
++ size = (u16) (header & 0x7ff);
++ if (size != ((~header >> 16) & 0x07ff)) {
++ netdev_err(dev->net, "%s : Bad Header Length\n",
++ __func__);
++ return 0;
++ }
++
++ if ((size > dev->net->mtu + ETH_HLEN + VLAN_HLEN) ||
++ (size + offset > skb->len)) {
++ netdev_err(dev->net, "%s : Bad RX Length %d\n",
++ __func__, size);
++ return 0;
++ }
++ sr_skb = netdev_alloc_skb_ip_align(dev->net, size);
++ if (!sr_skb)
++ return 0;
++
++ skb_put(sr_skb, size);
++ memcpy(sr_skb->data, skb->data + offset, size);
++ usbnet_skb_return(dev, sr_skb);
++
++ offset += (size + 1) & 0xfffe;
++ }
++
++ if (skb->len != offset) {
++ netdev_err(dev->net, "%s : Bad SKB Length %d\n", __func__,
++ skb->len);
++ return 0;
++ }
++
++ return 1;
++}
++
++static struct sk_buff *sr_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
++ gfp_t flags)
++{
++ int headroom = skb_headroom(skb);
++ int tailroom = skb_tailroom(skb);
++ u32 padbytes = 0xffff0000;
++ u32 packet_len;
++ int padlen;
++
++ padlen = ((skb->len + 4) % (dev->maxpacket - 1)) ? 0 : 4;
++
++ if ((!skb_cloned(skb)) && ((headroom + tailroom) >= (4 + padlen))) {
++ if ((headroom < 4) || (tailroom < padlen)) {
++ skb->data = memmove(skb->head + 4, skb->data,
++ skb->len);
++ skb_set_tail_pointer(skb, skb->len);
++ }
++ } else {
++ struct sk_buff *skb2;
++ skb2 = skb_copy_expand(skb, 4, padlen, flags);
++ dev_kfree_skb_any(skb);
++ skb = skb2;
++ if (!skb)
++ return NULL;
++ }
++
++ skb_push(skb, 4);
++ packet_len = (((skb->len - 4) ^ 0x0000ffff) << 16) + (skb->len - 4);
++ cpu_to_le32s(&packet_len);
++ skb_copy_to_linear_data(skb, &packet_len, sizeof(packet_len));
++
++ if (padlen) {
++ cpu_to_le32s(&padbytes);
++ memcpy(skb_tail_pointer(skb), &padbytes, sizeof(padbytes));
++ skb_put(skb, sizeof(padbytes));
++ }
++
++ usbnet_set_skb_tx_stats(skb, 1, 0);
++ return skb;
++}
++
++static void sr_status(struct usbnet *dev, struct urb *urb)
++{
++ struct sr9800_int_data *event;
++ int link;
++
++ if (urb->actual_length < 8)
++ return;
++
++ event = urb->transfer_buffer;
++ link = event->link & 0x01;
++ if (netif_carrier_ok(dev->net) != link) {
++ usbnet_link_change(dev, link, 1);
++ netdev_dbg(dev->net, "Link Status is: %d\n", link);
++ }
++
++ return;
++}
++
++static inline int sr_set_sw_mii(struct usbnet *dev)
++{
++ int ret;
++
++ ret = sr_write_cmd(dev, SR_CMD_SET_SW_MII, 0x0000, 0, 0, NULL);
++ if (ret < 0)
++ netdev_err(dev->net, "Failed to enable software MII access\n");
++ return ret;
++}
++
++static inline int sr_set_hw_mii(struct usbnet *dev)
++{
++ int ret;
++
++ ret = sr_write_cmd(dev, SR_CMD_SET_HW_MII, 0x0000, 0, 0, NULL);
++ if (ret < 0)
++ netdev_err(dev->net, "Failed to enable hardware MII access\n");
++ return ret;
++}
++
++static inline int sr_get_phy_addr(struct usbnet *dev)
++{
++ u8 buf[2];
++ int ret;
++
++ ret = sr_read_cmd(dev, SR_CMD_READ_PHY_ID, 0, 0, 2, buf);
++ if (ret < 0) {
++ netdev_err(dev->net, "%s : Error reading PHYID register:%02x\n",
++ __func__, ret);
++ goto out;
++ }
++ netdev_dbg(dev->net, "%s : returning 0x%04x\n", __func__,
++ *((__le16 *)buf));
++
++ ret = buf[1];
++
++out:
++ return ret;
++}
++
++static int sr_sw_reset(struct usbnet *dev, u8 flags)
++{
++ int ret;
++
++ ret = sr_write_cmd(dev, SR_CMD_SW_RESET, flags, 0, 0, NULL);
++ if (ret < 0)
++ netdev_err(dev->net, "Failed to send software reset:%02x\n",
++ ret);
++
++ return ret;
++}
++
++static u16 sr_read_rx_ctl(struct usbnet *dev)
++{
++ __le16 v;
++ int ret;
++
++ ret = sr_read_cmd(dev, SR_CMD_READ_RX_CTL, 0, 0, 2, &v);
++ if (ret < 0) {
++ netdev_err(dev->net, "Error reading RX_CTL register:%02x\n",
++ ret);
++ goto out;
++ }
++
++ ret = le16_to_cpu(v);
++out:
++ return ret;
++}
++
++static int sr_write_rx_ctl(struct usbnet *dev, u16 mode)
++{
++ int ret;
++
++ netdev_dbg(dev->net, "%s : mode = 0x%04x\n", __func__, mode);
++ ret = sr_write_cmd(dev, SR_CMD_WRITE_RX_CTL, mode, 0, 0, NULL);
++ if (ret < 0)
++ netdev_err(dev->net,
++ "Failed to write RX_CTL mode to 0x%04x:%02x\n",
++ mode, ret);
++
++ return ret;
++}
++
++static u16 sr_read_medium_status(struct usbnet *dev)
++{
++ __le16 v;
++ int ret;
++
++ ret = sr_read_cmd(dev, SR_CMD_READ_MEDIUM_STATUS, 0, 0, 2, &v);
++ if (ret < 0) {
++ netdev_err(dev->net,
++ "Error reading Medium Status register:%02x\n", ret);
++ return ret; /* TODO: callers not checking for error ret */
++ }
++
++ return le16_to_cpu(v);
++}
++
++static int sr_write_medium_mode(struct usbnet *dev, u16 mode)
++{
++ int ret;
++
++ netdev_dbg(dev->net, "%s : mode = 0x%04x\n", __func__, mode);
++ ret = sr_write_cmd(dev, SR_CMD_WRITE_MEDIUM_MODE, mode, 0, 0, NULL);
++ if (ret < 0)
++ netdev_err(dev->net,
++ "Failed to write Medium Mode mode to 0x%04x:%02x\n",
++ mode, ret);
++ return ret;
++}
++
++static int sr_write_gpio(struct usbnet *dev, u16 value, int sleep)
++{
++ int ret;
++
++ netdev_dbg(dev->net, "%s : value = 0x%04x\n", __func__, value);
++ ret = sr_write_cmd(dev, SR_CMD_WRITE_GPIOS, value, 0, 0, NULL);
++ if (ret < 0)
++ netdev_err(dev->net, "Failed to write GPIO value 0x%04x:%02x\n",
++ value, ret);
++ if (sleep)
++ msleep(sleep);
++
++ return ret;
++}
++
++/* SR9800 have a 16-bit RX_CTL value */
++static void sr_set_multicast(struct net_device *net)
++{
++ struct usbnet *dev = netdev_priv(net);
++ struct sr_data *data = (struct sr_data *)&dev->data;
++ u16 rx_ctl = SR_DEFAULT_RX_CTL;
++
++ if (net->flags & IFF_PROMISC) {
++ rx_ctl |= SR_RX_CTL_PRO;
++ } else if (net->flags & IFF_ALLMULTI ||
++ netdev_mc_count(net) > SR_MAX_MCAST) {
++ rx_ctl |= SR_RX_CTL_AMALL;
++ } else if (netdev_mc_empty(net)) {
++ /* just broadcast and directed */
++ } else {
++ /* We use the 20 byte dev->data
++ * for our 8 byte filter buffer
++ * to avoid allocating memory that
++ * is tricky to free later
++ */
++ struct netdev_hw_addr *ha;
++ u32 crc_bits;
++
++ memset(data->multi_filter, 0, SR_MCAST_FILTER_SIZE);
++
++ /* Build the multicast hash filter. */
++ netdev_for_each_mc_addr(ha, net) {
++ crc_bits = ether_crc(ETH_ALEN, ha->addr) >> 26;
++ data->multi_filter[crc_bits >> 3] |=
++ 1 << (crc_bits & 7);
++ }
++
++ sr_write_cmd_async(dev, SR_CMD_WRITE_MULTI_FILTER, 0, 0,
++ SR_MCAST_FILTER_SIZE, data->multi_filter);
++
++ rx_ctl |= SR_RX_CTL_AM;
++ }
++
++ sr_write_cmd_async(dev, SR_CMD_WRITE_RX_CTL, rx_ctl, 0, 0, NULL);
++}
++
++static int sr_mdio_read(struct net_device *net, int phy_id, int loc)
++{
++ struct usbnet *dev = netdev_priv(net);
++ __le16 res;
++
++ mutex_lock(&dev->phy_mutex);
++ sr_set_sw_mii(dev);
++ sr_read_cmd(dev, SR_CMD_READ_MII_REG, phy_id, (__u16)loc, 2, &res);
++ sr_set_hw_mii(dev);
++ mutex_unlock(&dev->phy_mutex);
++
++ netdev_dbg(dev->net,
++ "%s : phy_id=0x%02x, loc=0x%02x, returns=0x%04x\n", __func__,
++ phy_id, loc, le16_to_cpu(res));
++
++ return le16_to_cpu(res);
++}
++
++static void
++sr_mdio_write(struct net_device *net, int phy_id, int loc, int val)
++{
++ struct usbnet *dev = netdev_priv(net);
++ __le16 res = cpu_to_le16(val);
++
++ netdev_dbg(dev->net,
++ "%s : phy_id=0x%02x, loc=0x%02x, val=0x%04x\n", __func__,
++ phy_id, loc, val);
++ mutex_lock(&dev->phy_mutex);
++ sr_set_sw_mii(dev);
++ sr_write_cmd(dev, SR_CMD_WRITE_MII_REG, phy_id, (__u16)loc, 2, &res);
++ sr_set_hw_mii(dev);
++ mutex_unlock(&dev->phy_mutex);
++}
++
++/* Get the PHY Identifier from the PHYSID1 & PHYSID2 MII registers */
++static u32 sr_get_phyid(struct usbnet *dev)
++{
++ int phy_reg;
++ u32 phy_id;
++ int i;
++
++ /* Poll for the rare case the FW or phy isn't ready yet. */
++ for (i = 0; i < 100; i++) {
++ phy_reg = sr_mdio_read(dev->net, dev->mii.phy_id, MII_PHYSID1);
++ if (phy_reg != 0 && phy_reg != 0xFFFF)
++ break;
++ mdelay(1);
++ }
++
++ if (phy_reg <= 0 || phy_reg == 0xFFFF)
++ return 0;
++
++ phy_id = (phy_reg & 0xffff) << 16;
++
++ phy_reg = sr_mdio_read(dev->net, dev->mii.phy_id, MII_PHYSID2);
++ if (phy_reg < 0)
++ return 0;
++
++ phy_id |= (phy_reg & 0xffff);
++
++ return phy_id;
++}
++
++static void
++sr_get_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo)
++{
++ struct usbnet *dev = netdev_priv(net);
++ u8 opt;
++
++ if (sr_read_cmd(dev, SR_CMD_READ_MONITOR_MODE, 0, 0, 1, &opt) < 0) {
++ wolinfo->supported = 0;
++ wolinfo->wolopts = 0;
++ return;
++ }
++ wolinfo->supported = WAKE_PHY | WAKE_MAGIC;
++ wolinfo->wolopts = 0;
++ if (opt & SR_MONITOR_LINK)
++ wolinfo->wolopts |= WAKE_PHY;
++ if (opt & SR_MONITOR_MAGIC)
++ wolinfo->wolopts |= WAKE_MAGIC;
++}
++
++static int
++sr_set_wol(struct net_device *net, struct ethtool_wolinfo *wolinfo)
++{
++ struct usbnet *dev = netdev_priv(net);
++ u8 opt = 0;
++
++ if (wolinfo->wolopts & WAKE_PHY)
++ opt |= SR_MONITOR_LINK;
++ if (wolinfo->wolopts & WAKE_MAGIC)
++ opt |= SR_MONITOR_MAGIC;
++
++ if (sr_write_cmd(dev, SR_CMD_WRITE_MONITOR_MODE,
++ opt, 0, 0, NULL) < 0)
++ return -EINVAL;
++
++ return 0;
++}
++
++static int sr_get_eeprom_len(struct net_device *net)
++{
++ struct usbnet *dev = netdev_priv(net);
++ struct sr_data *data = (struct sr_data *)&dev->data;
++
++ return data->eeprom_len;
++}
++
++static int sr_get_eeprom(struct net_device *net,
++ struct ethtool_eeprom *eeprom, u8 *data)
++{
++ struct usbnet *dev = netdev_priv(net);
++ __le16 *ebuf = (__le16 *)data;
++ int ret;
++ int i;
++
++ /* Crude hack to ensure that we don't overwrite memory
++ * if an odd length is supplied
++ */
++ if (eeprom->len % 2)
++ return -EINVAL;
++
++ eeprom->magic = SR_EEPROM_MAGIC;
++
++ /* sr9800 returns 2 bytes from eeprom on read */
++ for (i = 0; i < eeprom->len / 2; i++) {
++ ret = sr_read_cmd(dev, SR_CMD_READ_EEPROM, eeprom->offset + i,
++ 0, 2, &ebuf[i]);
++ if (ret < 0)
++ return -EINVAL;
++ }
++ return 0;
++}
++
++static void sr_get_drvinfo(struct net_device *net,
++ struct ethtool_drvinfo *info)
++{
++ struct usbnet *dev = netdev_priv(net);
++ struct sr_data *data = (struct sr_data *)&dev->data;
++
++ /* Inherit standard device info */
++ usbnet_get_drvinfo(net, info);
++ strncpy(info->driver, DRIVER_NAME, sizeof(info->driver));
++ strncpy(info->version, DRIVER_VERSION, sizeof(info->version));
++ info->eedump_len = data->eeprom_len;
++}
++
++static u32 sr_get_link(struct net_device *net)
++{
++ struct usbnet *dev = netdev_priv(net);
++
++ return mii_link_ok(&dev->mii);
++}
++
++static int sr_ioctl(struct net_device *net, struct ifreq *rq, int cmd)
++{
++ struct usbnet *dev = netdev_priv(net);
++
++ return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
++}
++
++static int sr_set_mac_address(struct net_device *net, void *p)
++{
++ struct usbnet *dev = netdev_priv(net);
++ struct sr_data *data = (struct sr_data *)&dev->data;
++ struct sockaddr *addr = p;
++
++ if (netif_running(net))
++ return -EBUSY;
++ if (!is_valid_ether_addr(addr->sa_data))
++ return -EADDRNOTAVAIL;
++
++ memcpy(net->dev_addr, addr->sa_data, ETH_ALEN);
++
++ /* We use the 20 byte dev->data
++ * for our 6 byte mac buffer
++ * to avoid allocating memory that
++ * is tricky to free later
++ */
++ memcpy(data->mac_addr, addr->sa_data, ETH_ALEN);
++ sr_write_cmd_async(dev, SR_CMD_WRITE_NODE_ID, 0, 0, ETH_ALEN,
++ data->mac_addr);
++
++ return 0;
++}
++
++static const struct ethtool_ops sr9800_ethtool_ops = {
++ .get_drvinfo = sr_get_drvinfo,
++ .get_link = sr_get_link,
++ .get_msglevel = usbnet_get_msglevel,
++ .set_msglevel = usbnet_set_msglevel,
++ .get_wol = sr_get_wol,
++ .set_wol = sr_set_wol,
++ .get_eeprom_len = sr_get_eeprom_len,
++ .get_eeprom = sr_get_eeprom,
++ .get_settings = usbnet_get_settings,
++ .set_settings = usbnet_set_settings,
++ .nway_reset = usbnet_nway_reset,
++};
++
++static int sr9800_link_reset(struct usbnet *dev)
++{
++ struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET };
++ u16 mode;
++
++ mii_check_media(&dev->mii, 1, 1);
++ mii_ethtool_gset(&dev->mii, &ecmd);
++ mode = SR9800_MEDIUM_DEFAULT;
++
++ if (ethtool_cmd_speed(&ecmd) != SPEED_100)
++ mode &= ~SR_MEDIUM_PS;
++
++ if (ecmd.duplex != DUPLEX_FULL)
++ mode &= ~SR_MEDIUM_FD;
++
++ netdev_dbg(dev->net, "%s : speed: %u duplex: %d mode: 0x%04x\n",
++ __func__, ethtool_cmd_speed(&ecmd), ecmd.duplex, mode);
++
++ sr_write_medium_mode(dev, mode);
++
++ return 0;
++}
++
++
++static int sr9800_set_default_mode(struct usbnet *dev)
++{
++ u16 rx_ctl;
++ int ret;
++
++ sr_mdio_write(dev->net, dev->mii.phy_id, MII_BMCR, BMCR_RESET);
++ sr_mdio_write(dev->net, dev->mii.phy_id, MII_ADVERTISE,
++ ADVERTISE_ALL | ADVERTISE_CSMA);
++ mii_nway_restart(&dev->mii);
++
++ ret = sr_write_medium_mode(dev, SR9800_MEDIUM_DEFAULT);
++ if (ret < 0)
++ goto out;
++
++ ret = sr_write_cmd(dev, SR_CMD_WRITE_IPG012,
++ SR9800_IPG0_DEFAULT | SR9800_IPG1_DEFAULT,
++ SR9800_IPG2_DEFAULT, 0, NULL);
++ if (ret < 0) {
++ netdev_dbg(dev->net, "Write IPG,IPG1,IPG2 failed: %d\n", ret);
++ goto out;
++ }
++
++ /* Set RX_CTL to default values with 2k buffer, and enable cactus */
++ ret = sr_write_rx_ctl(dev, SR_DEFAULT_RX_CTL);
++ if (ret < 0)
++ goto out;
++
++ rx_ctl = sr_read_rx_ctl(dev);
++ netdev_dbg(dev->net, "RX_CTL is 0x%04x after all initializations\n",
++ rx_ctl);
++
++ rx_ctl = sr_read_medium_status(dev);
++ netdev_dbg(dev->net, "Medium Status:0x%04x after all initializations\n",
++ rx_ctl);
++
++ return 0;
++out:
++ return ret;
++}
++
++static int sr9800_reset(struct usbnet *dev)
++{
++ struct sr_data *data = (struct sr_data *)&dev->data;
++ int ret, embd_phy;
++ u16 rx_ctl;
++
++ ret = sr_write_gpio(dev,
++ SR_GPIO_RSE | SR_GPIO_GPO_2 | SR_GPIO_GPO2EN, 5);
++ if (ret < 0)
++ goto out;
++
++ embd_phy = ((sr_get_phy_addr(dev) & 0x1f) == 0x10 ? 1 : 0);
++
++ ret = sr_write_cmd(dev, SR_CMD_SW_PHY_SELECT, embd_phy, 0, 0, NULL);
++ if (ret < 0) {
++ netdev_dbg(dev->net, "Select PHY #1 failed: %d\n", ret);
++ goto out;
++ }
++
++ ret = sr_sw_reset(dev, SR_SWRESET_IPPD | SR_SWRESET_PRL);
++ if (ret < 0)
++ goto out;
++
++ msleep(150);
++
++ ret = sr_sw_reset(dev, SR_SWRESET_CLEAR);
++ if (ret < 0)
++ goto out;
++
++ msleep(150);
++
++ if (embd_phy) {
++ ret = sr_sw_reset(dev, SR_SWRESET_IPRL);
++ if (ret < 0)
++ goto out;
++ } else {
++ ret = sr_sw_reset(dev, SR_SWRESET_PRTE);
++ if (ret < 0)
++ goto out;
++ }
++
++ msleep(150);
++ rx_ctl = sr_read_rx_ctl(dev);
++ netdev_dbg(dev->net, "RX_CTL is 0x%04x after software reset\n", rx_ctl);
++ ret = sr_write_rx_ctl(dev, 0x0000);
++ if (ret < 0)
++ goto out;
++
++ rx_ctl = sr_read_rx_ctl(dev);
++ netdev_dbg(dev->net, "RX_CTL is 0x%04x setting to 0x0000\n", rx_ctl);
++
++ ret = sr_sw_reset(dev, SR_SWRESET_PRL);
++ if (ret < 0)
++ goto out;
++
++ msleep(150);
++
++ ret = sr_sw_reset(dev, SR_SWRESET_IPRL | SR_SWRESET_PRL);
++ if (ret < 0)
++ goto out;
++
++ msleep(150);
++
++ ret = sr9800_set_default_mode(dev);
++ if (ret < 0)
++ goto out;
++
++ /* Rewrite MAC address */
++ memcpy(data->mac_addr, dev->net->dev_addr, ETH_ALEN);
++ ret = sr_write_cmd(dev, SR_CMD_WRITE_NODE_ID, 0, 0, ETH_ALEN,
++ data->mac_addr);
++ if (ret < 0)
++ goto out;
++
++ return 0;
++
++out:
++ return ret;
++}
++
++static const struct net_device_ops sr9800_netdev_ops = {
++ .ndo_open = usbnet_open,
++ .ndo_stop = usbnet_stop,
++ .ndo_start_xmit = usbnet_start_xmit,
++ .ndo_tx_timeout = usbnet_tx_timeout,
++ .ndo_change_mtu = usbnet_change_mtu,
++ .ndo_set_mac_address = sr_set_mac_address,
++ .ndo_validate_addr = eth_validate_addr,
++ .ndo_do_ioctl = sr_ioctl,
++ .ndo_set_rx_mode = sr_set_multicast,
++};
++
++static int sr9800_phy_powerup(struct usbnet *dev)
++{
++ int ret;
++
++ /* set the embedded Ethernet PHY in power-down state */
++ ret = sr_sw_reset(dev, SR_SWRESET_IPPD | SR_SWRESET_IPRL);
++ if (ret < 0) {
++ netdev_err(dev->net, "Failed to power down PHY : %d\n", ret);
++ return ret;
++ }
++ msleep(20);
++
++ /* set the embedded Ethernet PHY in power-up state */
++ ret = sr_sw_reset(dev, SR_SWRESET_IPRL);
++ if (ret < 0) {
++ netdev_err(dev->net, "Failed to reset PHY: %d\n", ret);
++ return ret;
++ }
++ msleep(600);
++
++ /* set the embedded Ethernet PHY in reset state */
++ ret = sr_sw_reset(dev, SR_SWRESET_CLEAR);
++ if (ret < 0) {
++ netdev_err(dev->net, "Failed to power up PHY: %d\n", ret);
++ return ret;
++ }
++ msleep(20);
++
++ /* set the embedded Ethernet PHY in power-up state */
++ ret = sr_sw_reset(dev, SR_SWRESET_IPRL);
++ if (ret < 0) {
++ netdev_err(dev->net, "Failed to reset PHY: %d\n", ret);
++ return ret;
++ }
++
++ return 0;
++}
++
++static int sr9800_bind(struct usbnet *dev, struct usb_interface *intf)
++{
++ struct sr_data *data = (struct sr_data *)&dev->data;
++ u16 led01_mux, led23_mux;
++ int ret, embd_phy;
++ u32 phyid;
++ u16 rx_ctl;
++
++ data->eeprom_len = SR9800_EEPROM_LEN;
++
++ usbnet_get_endpoints(dev, intf);
++
++ /* LED Setting Rule :
++ * AABB:CCDD
++ * AA : MFA0(LED0)
++ * BB : MFA1(LED1)
++ * CC : MFA2(LED2), Reserved for SR9800
++ * DD : MFA3(LED3), Reserved for SR9800
++ */
++ led01_mux = (SR_LED_MUX_LINK_ACTIVE << 8) | SR_LED_MUX_LINK;
++ led23_mux = (SR_LED_MUX_LINK_ACTIVE << 8) | SR_LED_MUX_TX_ACTIVE;
++ ret = sr_write_cmd(dev, SR_CMD_LED_MUX, led01_mux, led23_mux, 0, NULL);
++ if (ret < 0) {
++ netdev_err(dev->net, "set LINK LED failed : %d\n", ret);
++ goto out;
++ }
++
++ /* Get the MAC address */
++ ret = sr_read_cmd(dev, SR_CMD_READ_NODE_ID, 0, 0, ETH_ALEN,
++ dev->net->dev_addr);
++ if (ret < 0) {
++ netdev_dbg(dev->net, "Failed to read MAC address: %d\n", ret);
++ return ret;
++ }
++ netdev_dbg(dev->net, "mac addr : %pM\n", dev->net->dev_addr);
++
++ /* Initialize MII structure */
++ dev->mii.dev = dev->net;
++ dev->mii.mdio_read = sr_mdio_read;
++ dev->mii.mdio_write = sr_mdio_write;
++ dev->mii.phy_id_mask = 0x1f;
++ dev->mii.reg_num_mask = 0x1f;
++ dev->mii.phy_id = sr_get_phy_addr(dev);
++
++ dev->net->netdev_ops = &sr9800_netdev_ops;
++ dev->net->ethtool_ops = &sr9800_ethtool_ops;
++
++ embd_phy = ((dev->mii.phy_id & 0x1f) == 0x10 ? 1 : 0);
++ /* Reset the PHY to normal operation mode */
++ ret = sr_write_cmd(dev, SR_CMD_SW_PHY_SELECT, embd_phy, 0, 0, NULL);
++ if (ret < 0) {
++ netdev_dbg(dev->net, "Select PHY #1 failed: %d\n", ret);
++ return ret;
++ }
++
++ /* Init PHY routine */
++ ret = sr9800_phy_powerup(dev);
++ if (ret < 0)
++ goto out;
++
++ rx_ctl = sr_read_rx_ctl(dev);
++ netdev_dbg(dev->net, "RX_CTL is 0x%04x after software reset\n", rx_ctl);
++ ret = sr_write_rx_ctl(dev, 0x0000);
++ if (ret < 0)
++ goto out;
++
++ rx_ctl = sr_read_rx_ctl(dev);
++ netdev_dbg(dev->net, "RX_CTL is 0x%04x setting to 0x0000\n", rx_ctl);
++
++ /* Read PHYID register *AFTER* the PHY was reset properly */
++ phyid = sr_get_phyid(dev);
++ netdev_dbg(dev->net, "PHYID=0x%08x\n", phyid);
++
++ /* medium mode setting */
++ ret = sr9800_set_default_mode(dev);
++ if (ret < 0)
++ goto out;
++
++ if (dev->udev->speed == USB_SPEED_HIGH) {
++ ret = sr_write_cmd(dev, SR_CMD_BULKIN_SIZE,
++ SR9800_BULKIN_SIZE[SR9800_MAX_BULKIN_4K].byte_cnt,
++ SR9800_BULKIN_SIZE[SR9800_MAX_BULKIN_4K].threshold,
++ 0, NULL);
++ if (ret < 0) {
++ netdev_err(dev->net, "Reset RX_CTL failed: %d\n", ret);
++ goto out;
++ }
++ dev->rx_urb_size =
++ SR9800_BULKIN_SIZE[SR9800_MAX_BULKIN_4K].size;
++ } else {
++ ret = sr_write_cmd(dev, SR_CMD_BULKIN_SIZE,
++ SR9800_BULKIN_SIZE[SR9800_MAX_BULKIN_2K].byte_cnt,
++ SR9800_BULKIN_SIZE[SR9800_MAX_BULKIN_2K].threshold,
++ 0, NULL);
++ if (ret < 0) {
++ netdev_err(dev->net, "Reset RX_CTL failed: %d\n", ret);
++ goto out;
++ }
++ dev->rx_urb_size =
++ SR9800_BULKIN_SIZE[SR9800_MAX_BULKIN_2K].size;
++ }
++ netdev_dbg(dev->net, "%s : setting rx_urb_size with : %zu\n", __func__,
++ dev->rx_urb_size);
++ return 0;
++
++out:
++ return ret;
++}
++
++static const struct driver_info sr9800_driver_info = {
++ .description = "CoreChip SR9800 USB 2.0 Ethernet",
++ .bind = sr9800_bind,
++ .status = sr_status,
++ .link_reset = sr9800_link_reset,
++ .reset = sr9800_reset,
++ .flags = DRIVER_FLAG,
++ .rx_fixup = sr_rx_fixup,
++ .tx_fixup = sr_tx_fixup,
++};
++
++static const struct usb_device_id products[] = {
++ {
++ USB_DEVICE(0x0fe6, 0x9800), /* SR9800 Device */
++ .driver_info = (unsigned long) &sr9800_driver_info,
++ },
++ {}, /* END */
++};
++
++MODULE_DEVICE_TABLE(usb, products);
++
++static struct usb_driver sr_driver = {
++ .name = DRIVER_NAME,
++ .id_table = products,
++ .probe = usbnet_probe,
++ .suspend = usbnet_suspend,
++ .resume = usbnet_resume,
++ .disconnect = usbnet_disconnect,
++ .supports_autosuspend = 1,
++};
++
++module_usb_driver(sr_driver);
++
++MODULE_AUTHOR("Liu Junliang <liujunliang_ljl(a)163.com");
++MODULE_VERSION(DRIVER_VERSION);
++MODULE_DESCRIPTION("SR9800 USB 2.0 USB2NET Dev : http://www.corechip-sz.com");
++MODULE_LICENSE("GPL");
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/sr9800.h backports-4.2.6-1/drivers/net/usb/sr9800.h
+--- backports-4.2.6-1.org/drivers/net/usb/sr9800.h 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/sr9800.h 2015-11-09 23:37:56.000000000 +0100
+@@ -0,0 +1,202 @@
++/* CoreChip-sz SR9800 one chip USB 2.0 Ethernet Devices
++ *
++ * Author : Liu Junliang <liujunliang_ljl(a)163.com>
++ *
++ * This file is licensed under the terms of the GNU General Public License
++ * version 2. This program is licensed "as is" without any warranty of any
++ * kind, whether express or implied.
++ */
++
++#ifndef _SR9800_H
++#define _SR9800_H
++
++/* SR9800 spec. command table on Linux Platform */
++
++/* command : Software Station Management Control Reg */
++#define SR_CMD_SET_SW_MII 0x06
++/* command : PHY Read Reg */
++#define SR_CMD_READ_MII_REG 0x07
++/* command : PHY Write Reg */
++#define SR_CMD_WRITE_MII_REG 0x08
++/* command : Hardware Station Management Control Reg */
++#define SR_CMD_SET_HW_MII 0x0a
++/* command : SROM Read Reg */
++#define SR_CMD_READ_EEPROM 0x0b
++/* command : SROM Write Reg */
++#define SR_CMD_WRITE_EEPROM 0x0c
++/* command : SROM Write Enable Reg */
++#define SR_CMD_WRITE_ENABLE 0x0d
++/* command : SROM Write Disable Reg */
++#define SR_CMD_WRITE_DISABLE 0x0e
++/* command : RX Control Read Reg */
++#define SR_CMD_READ_RX_CTL 0x0f
++#define SR_RX_CTL_PRO (1 << 0)
++#define SR_RX_CTL_AMALL (1 << 1)
++#define SR_RX_CTL_SEP (1 << 2)
++#define SR_RX_CTL_AB (1 << 3)
++#define SR_RX_CTL_AM (1 << 4)
++#define SR_RX_CTL_AP (1 << 5)
++#define SR_RX_CTL_ARP (1 << 6)
++#define SR_RX_CTL_SO (1 << 7)
++#define SR_RX_CTL_RH1M (1 << 8)
++#define SR_RX_CTL_RH2M (1 << 9)
++#define SR_RX_CTL_RH3M (1 << 10)
++/* command : RX Control Write Reg */
++#define SR_CMD_WRITE_RX_CTL 0x10
++/* command : IPG0/IPG1/IPG2 Control Read Reg */
++#define SR_CMD_READ_IPG012 0x11
++/* command : IPG0/IPG1/IPG2 Control Write Reg */
++#define SR_CMD_WRITE_IPG012 0x12
++/* command : Node ID Read Reg */
++#define SR_CMD_READ_NODE_ID 0x13
++/* command : Node ID Write Reg */
++#define SR_CMD_WRITE_NODE_ID 0x14
++/* command : Multicast Filter Array Read Reg */
++#define SR_CMD_READ_MULTI_FILTER 0x15
++/* command : Multicast Filter Array Write Reg */
++#define SR_CMD_WRITE_MULTI_FILTER 0x16
++/* command : Eth/HomePNA PHY Address Reg */
++#define SR_CMD_READ_PHY_ID 0x19
++/* command : Medium Status Read Reg */
++#define SR_CMD_READ_MEDIUM_STATUS 0x1a
++#define SR_MONITOR_LINK (1 << 1)
++#define SR_MONITOR_MAGIC (1 << 2)
++#define SR_MONITOR_HSFS (1 << 4)
++/* command : Medium Status Write Reg */
++#define SR_CMD_WRITE_MEDIUM_MODE 0x1b
++#define SR_MEDIUM_GM (1 << 0)
++#define SR_MEDIUM_FD (1 << 1)
++#define SR_MEDIUM_AC (1 << 2)
++#define SR_MEDIUM_ENCK (1 << 3)
++#define SR_MEDIUM_RFC (1 << 4)
++#define SR_MEDIUM_TFC (1 << 5)
++#define SR_MEDIUM_JFE (1 << 6)
++#define SR_MEDIUM_PF (1 << 7)
++#define SR_MEDIUM_RE (1 << 8)
++#define SR_MEDIUM_PS (1 << 9)
++#define SR_MEDIUM_RSV (1 << 10)
++#define SR_MEDIUM_SBP (1 << 11)
++#define SR_MEDIUM_SM (1 << 12)
++/* command : Monitor Mode Status Read Reg */
++#define SR_CMD_READ_MONITOR_MODE 0x1c
++/* command : Monitor Mode Status Write Reg */
++#define SR_CMD_WRITE_MONITOR_MODE 0x1d
++/* command : GPIO Status Read Reg */
++#define SR_CMD_READ_GPIOS 0x1e
++#define SR_GPIO_GPO0EN (1 << 0) /* GPIO0 Output enable */
++#define SR_GPIO_GPO_0 (1 << 1) /* GPIO0 Output value */
++#define SR_GPIO_GPO1EN (1 << 2) /* GPIO1 Output enable */
++#define SR_GPIO_GPO_1 (1 << 3) /* GPIO1 Output value */
++#define SR_GPIO_GPO2EN (1 << 4) /* GPIO2 Output enable */
++#define SR_GPIO_GPO_2 (1 << 5) /* GPIO2 Output value */
++#define SR_GPIO_RESERVED (1 << 6) /* Reserved */
++#define SR_GPIO_RSE (1 << 7) /* Reload serial EEPROM */
++/* command : GPIO Status Write Reg */
++#define SR_CMD_WRITE_GPIOS 0x1f
++/* command : Eth PHY Power and Reset Control Reg */
++#define SR_CMD_SW_RESET 0x20
++#define SR_SWRESET_CLEAR 0x00
++#define SR_SWRESET_RR (1 << 0)
++#define SR_SWRESET_RT (1 << 1)
++#define SR_SWRESET_PRTE (1 << 2)
++#define SR_SWRESET_PRL (1 << 3)
++#define SR_SWRESET_BZ (1 << 4)
++#define SR_SWRESET_IPRL (1 << 5)
++#define SR_SWRESET_IPPD (1 << 6)
++/* command : Software Interface Selection Status Read Reg */
++#define SR_CMD_SW_PHY_STATUS 0x21
++/* command : Software Interface Selection Status Write Reg */
++#define SR_CMD_SW_PHY_SELECT 0x22
++/* command : BULK in Buffer Size Reg */
++#define SR_CMD_BULKIN_SIZE 0x2A
++/* command : LED_MUX Control Reg */
++#define SR_CMD_LED_MUX 0x70
++#define SR_LED_MUX_TX_ACTIVE (1 << 0)
++#define SR_LED_MUX_RX_ACTIVE (1 << 1)
++#define SR_LED_MUX_COLLISION (1 << 2)
++#define SR_LED_MUX_DUP_COL (1 << 3)
++#define SR_LED_MUX_DUP (1 << 4)
++#define SR_LED_MUX_SPEED (1 << 5)
++#define SR_LED_MUX_LINK_ACTIVE (1 << 6)
++#define SR_LED_MUX_LINK (1 << 7)
++
++/* Register Access Flags */
++#define SR_REQ_RD_REG (USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE)
++#define SR_REQ_WR_REG (USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE)
++
++/* Multicast Filter Array size & Max Number */
++#define SR_MCAST_FILTER_SIZE 8
++#define SR_MAX_MCAST 64
++
++/* IPG0/1/2 Default Value */
++#define SR9800_IPG0_DEFAULT 0x15
++#define SR9800_IPG1_DEFAULT 0x0c
++#define SR9800_IPG2_DEFAULT 0x12
++
++/* Medium Status Default Mode */
++#define SR9800_MEDIUM_DEFAULT \
++ (SR_MEDIUM_FD | SR_MEDIUM_RFC | \
++ SR_MEDIUM_TFC | SR_MEDIUM_PS | \
++ SR_MEDIUM_AC | SR_MEDIUM_RE)
++
++/* RX Control Default Setting */
++#define SR_DEFAULT_RX_CTL \
++ (SR_RX_CTL_SO | SR_RX_CTL_AB | SR_RX_CTL_RH1M)
++
++/* EEPROM Magic Number & EEPROM Size */
++#define SR_EEPROM_MAGIC 0xdeadbeef
++#define SR9800_EEPROM_LEN 0xff
++
++/* SR9800 Driver Version and Driver Name */
++#define DRIVER_VERSION "11-Nov-2013"
++#define DRIVER_NAME "CoreChips"
++#define DRIVER_FLAG \
++ (FLAG_ETHER | FLAG_FRAMING_AX | FLAG_LINK_INTR | FLAG_MULTI_PACKET)
++
++/* SR9800 BULKIN Buffer Size */
++#define SR9800_MAX_BULKIN_2K 0
++#define SR9800_MAX_BULKIN_4K 1
++#define SR9800_MAX_BULKIN_6K 2
++#define SR9800_MAX_BULKIN_8K 3
++#define SR9800_MAX_BULKIN_16K 4
++#define SR9800_MAX_BULKIN_20K 5
++#define SR9800_MAX_BULKIN_24K 6
++#define SR9800_MAX_BULKIN_32K 7
++
++struct {unsigned short size, byte_cnt, threshold; } SR9800_BULKIN_SIZE[] = {
++ /* 2k */
++ {2048, 0x8000, 0x8001},
++ /* 4k */
++ {4096, 0x8100, 0x8147},
++ /* 6k */
++ {6144, 0x8200, 0x81EB},
++ /* 8k */
++ {8192, 0x8300, 0x83D7},
++ /* 16 */
++ {16384, 0x8400, 0x851E},
++ /* 20k */
++ {20480, 0x8500, 0x8666},
++ /* 24k */
++ {24576, 0x8600, 0x87AE},
++ /* 32k */
++ {32768, 0x8700, 0x8A3D},
++};
++
++/* This structure cannot exceed sizeof(unsigned long [5]) AKA 20 bytes */
++struct sr_data {
++ u8 multi_filter[SR_MCAST_FILTER_SIZE];
++ u8 mac_addr[ETH_ALEN];
++ u8 phymode;
++ u8 ledmode;
++ u8 eeprom_len;
++};
++
++struct sr9800_int_data {
++ __le16 res1;
++ u8 link;
++ __le16 res2;
++ u8 status;
++ __le16 res3;
++} __packed;
++
++#endif /* _SR9800_H */
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/zaurus.c backports-4.2.6-1/drivers/net/usb/zaurus.c
+--- backports-4.2.6-1.org/drivers/net/usb/zaurus.c 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/zaurus.c 2015-11-09 23:37:56.000000000 +0100
+@@ -0,0 +1,385 @@
++/*
++ * Copyright (C) 2002 Pavel Machek <pavel(a)ucw.cz>
++ * Copyright (C) 2002-2005 by David Brownell
++ *
++ * 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, see <http://www.gnu.org/licenses/>.
++ */
++
++// #define DEBUG // error path messages, extra info
++// #define VERBOSE // more; success messages
++
++#include <linux/module.h>
++#include <linux/netdevice.h>
++#include <linux/ethtool.h>
++#include <linux/workqueue.h>
++#include <linux/mii.h>
++#include <linux/crc32.h>
++#include <linux/usb.h>
++#include <linux/usb/cdc.h>
++#include <linux/usb/usbnet.h>
++
++
++/*
++ * All known Zaurii lie about their standards conformance. At least
++ * the earliest SA-1100 models lie by saying they support CDC Ethernet.
++ * Some later models (especially PXA-25x and PXA-27x based ones) lie
++ * and say they support CDC MDLM (for access to cell phone modems).
++ *
++ * There are non-Zaurus products that use these same protocols too.
++ *
++ * The annoying thing is that at the same time Sharp was developing
++ * that annoying standards-breaking software, the Linux community had
++ * a simple "CDC Subset" working reliably on the same SA-1100 hardware.
++ * That is, the same functionality but not violating standards.
++ *
++ * The CDC Ethernet nonconformance points are troublesome to hosts
++ * with a true CDC Ethernet implementation:
++ * - Framing appends a CRC, which the spec says drivers "must not" do;
++ * - Transfers data in altsetting zero, instead of altsetting 1;
++ * - All these peripherals use the same ethernet address.
++ *
++ * The CDC MDLM nonconformance is less immediately troublesome, since all
++ * MDLM implementations are quasi-proprietary anyway.
++ */
++
++static struct sk_buff *
++zaurus_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
++{
++ int padlen;
++ struct sk_buff *skb2;
++
++ padlen = 2;
++ if (!skb_cloned(skb)) {
++ int tailroom = skb_tailroom(skb);
++ if ((padlen + 4) <= tailroom)
++ goto done;
++ }
++ skb2 = skb_copy_expand(skb, 0, 4 + padlen, flags);
++ dev_kfree_skb_any(skb);
++ skb = skb2;
++ if (skb) {
++ u32 fcs;
++done:
++ fcs = crc32_le(~0, skb->data, skb->len);
++ fcs = ~fcs;
++
++ *skb_put (skb, 1) = fcs & 0xff;
++ *skb_put (skb, 1) = (fcs>> 8) & 0xff;
++ *skb_put (skb, 1) = (fcs>>16) & 0xff;
++ *skb_put (skb, 1) = (fcs>>24) & 0xff;
++ }
++ return skb;
++}
++
++static int zaurus_bind(struct usbnet *dev, struct usb_interface *intf)
++{
++ /* Belcarra's funky framing has other options; mostly
++ * TRAILERS (!) with 4 bytes CRC, and maybe 2 pad bytes.
++ */
++ dev->net->hard_header_len += 6;
++ dev->rx_urb_size = dev->net->hard_header_len + dev->net->mtu;
++ return usbnet_generic_cdc_bind(dev, intf);
++}
++
++/* PDA style devices are always connected if present */
++static int always_connected (struct usbnet *dev)
++{
++ return 0;
++}
++
++static const struct driver_info zaurus_sl5x00_info = {
++ .description = "Sharp Zaurus SL-5x00",
++ .flags = FLAG_POINTTOPOINT | FLAG_FRAMING_Z,
++ .check_connect = always_connected,
++ .bind = zaurus_bind,
++ .unbind = usbnet_cdc_unbind,
++ .tx_fixup = zaurus_tx_fixup,
++};
++#define ZAURUS_STRONGARM_INFO ((unsigned long)&zaurus_sl5x00_info)
++
++static const struct driver_info zaurus_pxa_info = {
++ .description = "Sharp Zaurus, PXA-2xx based",
++ .flags = FLAG_POINTTOPOINT | FLAG_FRAMING_Z,
++ .check_connect = always_connected,
++ .bind = zaurus_bind,
++ .unbind = usbnet_cdc_unbind,
++ .tx_fixup = zaurus_tx_fixup,
++};
++#define ZAURUS_PXA_INFO ((unsigned long)&zaurus_pxa_info)
++
++static const struct driver_info olympus_mxl_info = {
++ .description = "Olympus R1000",
++ .flags = FLAG_POINTTOPOINT | FLAG_FRAMING_Z,
++ .check_connect = always_connected,
++ .bind = zaurus_bind,
++ .unbind = usbnet_cdc_unbind,
++ .tx_fixup = zaurus_tx_fixup,
++};
++#define OLYMPUS_MXL_INFO ((unsigned long)&olympus_mxl_info)
++
++
++/* Some more recent products using Lineo/Belcarra code will wrongly claim
++ * CDC MDLM conformance. They aren't conformant: data endpoints live
++ * in the control interface, there's no data interface, and it's not used
++ * to talk to a cell phone radio. But at least we can detect these two
++ * pseudo-classes, rather than growing this product list with entries for
++ * each new nonconformant product (sigh).
++ */
++static const u8 safe_guid[16] = {
++ 0x5d, 0x34, 0xcf, 0x66, 0x11, 0x18, 0x11, 0xd6,
++ 0xa2, 0x1a, 0x00, 0x01, 0x02, 0xca, 0x9a, 0x7f,
++};
++static const u8 blan_guid[16] = {
++ 0x74, 0xf0, 0x3d, 0xbd, 0x1e, 0xc1, 0x44, 0x70,
++ 0xa3, 0x67, 0x71, 0x34, 0xc9, 0xf5, 0x54, 0x37,
++};
++
++static int blan_mdlm_bind(struct usbnet *dev, struct usb_interface *intf)
++{
++ u8 *buf = intf->cur_altsetting->extra;
++ int len = intf->cur_altsetting->extralen;
++ struct usb_cdc_mdlm_desc *desc = NULL;
++ struct usb_cdc_mdlm_detail_desc *detail = NULL;
++
++ while (len > 3) {
++ if (buf [1] != USB_DT_CS_INTERFACE)
++ goto next_desc;
++
++ /* use bDescriptorSubType, and just verify that we get a
++ * "BLAN" (or "SAFE") descriptor.
++ */
++ switch (buf [2]) {
++ case USB_CDC_MDLM_TYPE:
++ if (desc) {
++ dev_dbg(&intf->dev, "extra MDLM\n");
++ goto bad_desc;
++ }
++ desc = (void *) buf;
++ if (desc->bLength != sizeof *desc) {
++ dev_dbg(&intf->dev, "MDLM len %u\n",
++ desc->bLength);
++ goto bad_desc;
++ }
++ /* expect bcdVersion 1.0, ignore */
++ if (memcmp(&desc->bGUID, blan_guid, 16) &&
++ memcmp(&desc->bGUID, safe_guid, 16)) {
++ /* hey, this one might _really_ be MDLM! */
++ dev_dbg(&intf->dev, "MDLM guid\n");
++ goto bad_desc;
++ }
++ break;
++ case USB_CDC_MDLM_DETAIL_TYPE:
++ if (detail) {
++ dev_dbg(&intf->dev, "extra MDLM detail\n");
++ goto bad_desc;
++ }
++ detail = (void *) buf;
++ switch (detail->bGuidDescriptorType) {
++ case 0: /* "SAFE" */
++ if (detail->bLength != (sizeof *detail + 2))
++ goto bad_detail;
++ break;
++ case 1: /* "BLAN" */
++ if (detail->bLength != (sizeof *detail + 3))
++ goto bad_detail;
++ break;
++ default:
++ goto bad_detail;
++ }
++
++ /* assuming we either noticed BLAN already, or will
++ * find it soon, there are some data bytes here:
++ * - bmNetworkCapabilities (unused)
++ * - bmDataCapabilities (bits, see below)
++ * - bPad (ignored, for PADAFTER -- BLAN-only)
++ * bits are:
++ * - 0x01 -- Zaurus framing (add CRC)
++ * - 0x02 -- PADBEFORE (CRC includes some padding)
++ * - 0x04 -- PADAFTER (some padding after CRC)
++ * - 0x08 -- "fermat" packet mangling (for hw bugs)
++ * the PADBEFORE appears not to matter; we interop
++ * with devices that use it and those that don't.
++ */
++ if ((detail->bDetailData[1] & ~0x02) != 0x01) {
++ /* bmDataCapabilities == 0 would be fine too,
++ * but framing is minidriver-coupled for now.
++ */
++bad_detail:
++ dev_dbg(&intf->dev,
++ "bad MDLM detail, %d %d %d\n",
++ detail->bLength,
++ detail->bDetailData[0],
++ detail->bDetailData[2]);
++ goto bad_desc;
++ }
++
++ /* same extra framing as for non-BLAN mode */
++ dev->net->hard_header_len += 6;
++ dev->rx_urb_size = dev->net->hard_header_len
++ + dev->net->mtu;
++ break;
++ }
++next_desc:
++ len -= buf [0]; /* bLength */
++ buf += buf [0];
++ }
++
++ if (!desc || !detail) {
++ dev_dbg(&intf->dev, "missing cdc mdlm %s%sdescriptor\n",
++ desc ? "" : "func ",
++ detail ? "" : "detail ");
++ goto bad_desc;
++ }
++
++ /* There's probably a CDC Ethernet descriptor there, but we can't
++ * rely on the Ethernet address it provides since not all vendors
++ * bother to make it unique. Likewise there's no point in tracking
++ * of the CDC event notifications.
++ */
++ return usbnet_get_endpoints(dev, intf);
++
++bad_desc:
++ dev_info(&dev->udev->dev, "unsupported MDLM descriptors\n");
++ return -ENODEV;
++}
++
++static const struct driver_info bogus_mdlm_info = {
++ .description = "pseudo-MDLM (BLAN) device",
++ .flags = FLAG_POINTTOPOINT | FLAG_FRAMING_Z,
++ .check_connect = always_connected,
++ .tx_fixup = zaurus_tx_fixup,
++ .bind = blan_mdlm_bind,
++};
++
++static const struct usb_device_id products [] = {
++#define ZAURUS_MASTER_INTERFACE \
++ .bInterfaceClass = USB_CLASS_COMM, \
++ .bInterfaceSubClass = USB_CDC_SUBCLASS_ETHERNET, \
++ .bInterfaceProtocol = USB_CDC_PROTO_NONE
++
++/* SA-1100 based Sharp Zaurus ("collie"), or compatible. */
++{
++ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
++ | USB_DEVICE_ID_MATCH_DEVICE,
++ .idVendor = 0x04DD,
++ .idProduct = 0x8004,
++ ZAURUS_MASTER_INTERFACE,
++ .driver_info = ZAURUS_STRONGARM_INFO,
++},
++
++/* PXA-2xx based models are also lying-about-cdc. If you add any
++ * more devices that claim to be CDC Ethernet, make sure they get
++ * added to the blacklist in cdc_ether too.
++ *
++ * NOTE: OpenZaurus versions with 2.6 kernels won't use these entries,
++ * unlike the older ones with 2.4 "embedix" kernels.
++ */
++{
++ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
++ | USB_DEVICE_ID_MATCH_DEVICE,
++ .idVendor = 0x04DD,
++ .idProduct = 0x8005, /* A-300 */
++ ZAURUS_MASTER_INTERFACE,
++ .driver_info = ZAURUS_PXA_INFO,
++}, {
++ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
++ | USB_DEVICE_ID_MATCH_DEVICE,
++ .idVendor = 0x04DD,
++ .idProduct = 0x8006, /* B-500/SL-5600 */
++ ZAURUS_MASTER_INTERFACE,
++ .driver_info = ZAURUS_PXA_INFO,
++}, {
++ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
++ | USB_DEVICE_ID_MATCH_DEVICE,
++ .idVendor = 0x04DD,
++ .idProduct = 0x8007, /* C-700 */
++ ZAURUS_MASTER_INTERFACE,
++ .driver_info = ZAURUS_PXA_INFO,
++}, {
++ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
++ | USB_DEVICE_ID_MATCH_DEVICE,
++ .idVendor = 0x04DD,
++ .idProduct = 0x9031, /* C-750 C-760 */
++ ZAURUS_MASTER_INTERFACE,
++ .driver_info = ZAURUS_PXA_INFO,
++}, {
++ /* C-750/C-760/C-860/SL-C3000 PDA in MDLM mode */
++ USB_DEVICE_AND_INTERFACE_INFO(0x04DD, 0x9031, USB_CLASS_COMM,
++ USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
++ .driver_info = (unsigned long) &bogus_mdlm_info,
++}, {
++ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
++ | USB_DEVICE_ID_MATCH_DEVICE,
++ .idVendor = 0x04DD,
++ .idProduct = 0x9032, /* SL-6000 */
++ ZAURUS_MASTER_INTERFACE,
++ .driver_info = ZAURUS_PXA_INFO,
++}, {
++ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
++ | USB_DEVICE_ID_MATCH_DEVICE,
++ .idVendor = 0x04DD,
++ /* reported with some C860 units */
++ .idProduct = 0x9050, /* C-860 */
++ ZAURUS_MASTER_INTERFACE,
++ .driver_info = ZAURUS_PXA_INFO,
++},
++{
++ /* Motorola Rokr E6 */
++ USB_DEVICE_AND_INTERFACE_INFO(0x22b8, 0x6027, USB_CLASS_COMM,
++ USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
++ .driver_info = (unsigned long) &bogus_mdlm_info,
++}, {
++ /* Motorola MOTOMAGX phones */
++ USB_DEVICE_AND_INTERFACE_INFO(0x22b8, 0x6425, USB_CLASS_COMM,
++ USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
++ .driver_info = (unsigned long) &bogus_mdlm_info,
++},
++
++/* Olympus has some models with a Zaurus-compatible option.
++ * R-1000 uses a FreeScale i.MXL cpu (ARMv4T)
++ */
++{
++ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
++ | USB_DEVICE_ID_MATCH_DEVICE,
++ .idVendor = 0x07B4,
++ .idProduct = 0x0F02, /* R-1000 */
++ ZAURUS_MASTER_INTERFACE,
++ .driver_info = OLYMPUS_MXL_INFO,
++},
++
++/* Logitech Harmony 900 - uses the pseudo-MDLM (BLAN) driver */
++{
++ USB_DEVICE_AND_INTERFACE_INFO(0x046d, 0xc11f, USB_CLASS_COMM,
++ USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
++ .driver_info = (unsigned long) &bogus_mdlm_info,
++},
++ { }, // END
++};
++MODULE_DEVICE_TABLE(usb, products);
++
++static struct usb_driver zaurus_driver = {
++ .name = "zaurus",
++ .id_table = products,
++ .probe = usbnet_probe,
++ .disconnect = usbnet_disconnect,
++ .suspend = usbnet_suspend,
++ .resume = usbnet_resume,
++ .disable_hub_initiated_lpm = 1,
++};
++
++module_usb_driver(zaurus_driver);
++
++MODULE_AUTHOR("Pavel Machek, David Brownell");
++MODULE_DESCRIPTION("Sharp Zaurus PDA, and compatible products");
++MODULE_LICENSE("GPL");
diff --git a/src/patches/backports-4.2.6-1-grsecurity.patch b/src/patches/backports-4.2.6-1-grsecurity.patch
new file mode 100644
index 0000000..1a44409
--- /dev/null
+++ b/src/patches/backports-4.2.6-1-grsecurity.patch
@@ -0,0 +1,3995 @@
+diff -Naur backports-4.2.6-1.org/drivers/bluetooth/btwilink.c backports-4.2.6-1/drivers/bluetooth/btwilink.c
+--- backports-4.2.6-1.org/drivers/bluetooth/btwilink.c 2015-11-15 22:19:40.000000000 +0100
++++ backports-4.2.6-1/drivers/bluetooth/btwilink.c 2016-01-27 12:26:16.319959957 +0100
+@@ -288,7 +288,7 @@
+
+ static int bt_ti_probe(struct platform_device *pdev)
+ {
+- static struct ti_st *hst;
++ struct ti_st *hst;
+ struct hci_dev *hdev;
+ int err;
+
+diff -Naur backports-4.2.6-1.org/drivers/media/dvb-core/dvbdev.c backports-4.2.6-1/drivers/media/dvb-core/dvbdev.c
+--- backports-4.2.6-1.org/drivers/media/dvb-core/dvbdev.c 2015-11-15 22:19:39.000000000 +0100
++++ backports-4.2.6-1/drivers/media/dvb-core/dvbdev.c 2016-01-27 12:26:21.266626324 +0100
+@@ -272,7 +272,7 @@
+ const struct dvb_device *template, void *priv, int type)
+ {
+ struct dvb_device *dvbdev;
+- struct file_operations *dvbdevfops;
++ file_operations_no_const *dvbdevfops;
+ struct device *clsdev;
+ int minor;
+ int id;
+diff -Naur backports-4.2.6-1.org/drivers/media/dvb-frontends/af9033.h backports-4.2.6-1/drivers/media/dvb-frontends/af9033.h
+--- backports-4.2.6-1.org/drivers/media/dvb-frontends/af9033.h 2015-11-15 22:19:38.000000000 +0100
++++ backports-4.2.6-1/drivers/media/dvb-frontends/af9033.h 2016-01-27 12:26:21.266626324 +0100
+@@ -96,6 +96,6 @@
+ int (*pid_filter_ctrl)(struct dvb_frontend *fe, int onoff);
+ int (*pid_filter)(struct dvb_frontend *fe, int index, u16 pid,
+ int onoff);
+-};
++} __no_const;
+
+ #endif /* AF9033_H */
+diff -Naur backports-4.2.6-1.org/drivers/media/dvb-frontends/dib3000.h backports-4.2.6-1/drivers/media/dvb-frontends/dib3000.h
+--- backports-4.2.6-1.org/drivers/media/dvb-frontends/dib3000.h 2015-11-15 22:19:38.000000000 +0100
++++ backports-4.2.6-1/drivers/media/dvb-frontends/dib3000.h 2016-01-27 12:26:21.266626324 +0100
+@@ -39,7 +39,7 @@
+ int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
+ int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
+ int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
+-};
++} __no_const;
+
+ #if IS_REACHABLE(CPTCFG_DVB_DIB3000MB)
+ extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
+diff -Naur backports-4.2.6-1.org/drivers/media/dvb-frontends/dib7000p.h backports-4.2.6-1/drivers/media/dvb-frontends/dib7000p.h
+--- backports-4.2.6-1.org/drivers/media/dvb-frontends/dib7000p.h 2015-11-15 22:19:38.000000000 +0100
++++ backports-4.2.6-1/drivers/media/dvb-frontends/dib7000p.h 2016-01-27 12:26:21.266626324 +0100
+@@ -64,7 +64,7 @@
+ int (*get_adc_power)(struct dvb_frontend *fe);
+ int (*slave_reset)(struct dvb_frontend *fe);
+ struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib7000p_config *cfg);
+-};
++} __no_const;
+
+ #if IS_REACHABLE(CPTCFG_DVB_DIB7000P)
+ void *dib7000p_attach(struct dib7000p_ops *ops);
+diff -Naur backports-4.2.6-1.org/drivers/media/dvb-frontends/dib8000.h backports-4.2.6-1/drivers/media/dvb-frontends/dib8000.h
+--- backports-4.2.6-1.org/drivers/media/dvb-frontends/dib8000.h 2015-11-15 22:19:38.000000000 +0100
++++ backports-4.2.6-1/drivers/media/dvb-frontends/dib8000.h 2016-01-27 12:26:21.266626324 +0100
+@@ -61,7 +61,7 @@
+ int (*pid_filter_ctrl)(struct dvb_frontend *fe, u8 onoff);
+ int (*pid_filter)(struct dvb_frontend *fe, u8 id, u16 pid, u8 onoff);
+ struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib8000_config *cfg);
+-};
++} __no_const;
+
+ #if IS_REACHABLE(CPTCFG_DVB_DIB8000)
+ void *dib8000_attach(struct dib8000_ops *ops);
+diff -Naur backports-4.2.6-1.org/drivers/media/pci/cx88/cx88-video.c backports-4.2.6-1/drivers/media/pci/cx88/cx88-video.c
+--- backports-4.2.6-1.org/drivers/media/pci/cx88/cx88-video.c 2015-11-15 22:19:38.000000000 +0100
++++ backports-4.2.6-1/drivers/media/pci/cx88/cx88-video.c 2016-01-27 12:26:21.266626324 +0100
+@@ -50,9 +50,9 @@
+
+ /* ------------------------------------------------------------------ */
+
+-static unsigned int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
+-static unsigned int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
+-static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
++static int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
++static int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
++static int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
+
+ module_param_array(video_nr, int, NULL, 0444);
+ module_param_array(vbi_nr, int, NULL, 0444);
+diff -Naur backports-4.2.6-1.org/drivers/media/pci/ivtv/ivtv-driver.c backports-4.2.6-1/drivers/media/pci/ivtv/ivtv-driver.c
+--- backports-4.2.6-1.org/drivers/media/pci/ivtv/ivtv-driver.c 2015-11-15 22:19:38.000000000 +0100
++++ backports-4.2.6-1/drivers/media/pci/ivtv/ivtv-driver.c 2016-01-27 12:26:21.266626324 +0100
+@@ -83,7 +83,7 @@
+ MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
+
+ /* ivtv instance counter */
+-static atomic_t ivtv_instance = ATOMIC_INIT(0);
++static atomic_unchecked_t ivtv_instance = ATOMIC_INIT(0);
+
+ /* Parameter declarations */
+ static int cardtype[IVTV_MAX_CARDS];
+diff -Naur backports-4.2.6-1.org/drivers/media/pci/solo6x10/solo6x10-core.c backports-4.2.6-1/drivers/media/pci/solo6x10/solo6x10-core.c
+--- backports-4.2.6-1.org/drivers/media/pci/solo6x10/solo6x10-core.c 2015-11-15 22:19:38.000000000 +0100
++++ backports-4.2.6-1/drivers/media/pci/solo6x10/solo6x10-core.c 2016-01-27 12:26:21.266626324 +0100
+@@ -424,7 +424,7 @@
+
+ static int solo_sysfs_init(struct solo_dev *solo_dev)
+ {
+- struct bin_attribute *sdram_attr = &solo_dev->sdram_attr;
++ bin_attribute_no_const *sdram_attr = &solo_dev->sdram_attr;
+ struct device *dev = &solo_dev->dev;
+ const char *driver;
+ int i;
+diff -Naur backports-4.2.6-1.org/drivers/media/pci/solo6x10/solo6x10-g723.c backports-4.2.6-1/drivers/media/pci/solo6x10/solo6x10-g723.c
+--- backports-4.2.6-1.org/drivers/media/pci/solo6x10/solo6x10-g723.c 2015-11-15 22:19:38.000000000 +0100
++++ backports-4.2.6-1/drivers/media/pci/solo6x10/solo6x10-g723.c 2016-01-27 12:26:21.266626324 +0100
+@@ -351,7 +351,7 @@
+
+ int solo_g723_init(struct solo_dev *solo_dev)
+ {
+- static struct snd_device_ops ops = { NULL };
++ static struct snd_device_ops ops = { };
+ struct snd_card *card;
+ struct snd_kcontrol_new kctl;
+ char name[32];
+diff -Naur backports-4.2.6-1.org/drivers/media/pci/solo6x10/solo6x10.h backports-4.2.6-1/drivers/media/pci/solo6x10/solo6x10.h
+--- backports-4.2.6-1.org/drivers/media/pci/solo6x10/solo6x10.h 2015-11-15 22:19:38.000000000 +0100
++++ backports-4.2.6-1/drivers/media/pci/solo6x10/solo6x10.h 2016-01-27 12:26:21.266626324 +0100
+@@ -218,7 +218,7 @@
+
+ /* P2M DMA Engine */
+ struct solo_p2m_dev p2m_dev[SOLO_NR_P2M];
+- atomic_t p2m_count;
++ atomic_unchecked_t p2m_count;
+ int p2m_jiffies;
+ unsigned int p2m_timeouts;
+
+diff -Naur backports-4.2.6-1.org/drivers/media/pci/solo6x10/solo6x10-p2m.c backports-4.2.6-1/drivers/media/pci/solo6x10/solo6x10-p2m.c
+--- backports-4.2.6-1.org/drivers/media/pci/solo6x10/solo6x10-p2m.c 2015-11-15 22:19:38.000000000 +0100
++++ backports-4.2.6-1/drivers/media/pci/solo6x10/solo6x10-p2m.c 2016-01-27 12:26:21.266626324 +0100
+@@ -73,7 +73,7 @@
+
+ /* Get next ID. According to Softlogic, 6110 has problems on !=0 P2M */
+ if (solo_dev->type != SOLO_DEV_6110 && multi_p2m) {
+- p2m_id = atomic_inc_return(&solo_dev->p2m_count) % SOLO_NR_P2M;
++ p2m_id = atomic_inc_return_unchecked(&solo_dev->p2m_count) % SOLO_NR_P2M;
+ if (p2m_id < 0)
+ p2m_id = -p2m_id;
+ }
+diff -Naur backports-4.2.6-1.org/drivers/media/pci/tw68/tw68-core.c backports-4.2.6-1/drivers/media/pci/tw68/tw68-core.c
+--- backports-4.2.6-1.org/drivers/media/pci/tw68/tw68-core.c 2015-11-15 22:19:38.000000000 +0100
++++ backports-4.2.6-1/drivers/media/pci/tw68/tw68-core.c 2016-01-27 12:26:21.266626324 +0100
+@@ -60,7 +60,7 @@
+ module_param_array(card, int, NULL, 0444);
+ MODULE_PARM_DESC(card, "card type");
+
+-static atomic_t tw68_instance = ATOMIC_INIT(0);
++static atomic_unchecked_t tw68_instance = ATOMIC_INIT(0);
+
+ /* ------------------------------------------------------------------ */
+
+diff -Naur backports-4.2.6-1.org/drivers/media/platform/omap/omap_vout.c backports-4.2.6-1/drivers/media/platform/omap/omap_vout.c
+--- backports-4.2.6-1.org/drivers/media/platform/omap/omap_vout.c 2015-11-15 22:19:38.000000000 +0100
++++ backports-4.2.6-1/drivers/media/platform/omap/omap_vout.c 2016-01-27 12:26:21.266626324 +0100
+@@ -63,7 +63,6 @@
+ OMAP_VIDEO2,
+ };
+
+-static struct videobuf_queue_ops video_vbq_ops;
+ /* Variables configurable through module params*/
+ static u32 video1_numbuffers = 3;
+ static u32 video2_numbuffers = 3;
+@@ -1008,6 +1007,12 @@
+ {
+ struct videobuf_queue *q;
+ struct omap_vout_device *vout = NULL;
++ static struct videobuf_queue_ops video_vbq_ops = {
++ .buf_setup = omap_vout_buffer_setup,
++ .buf_prepare = omap_vout_buffer_prepare,
++ .buf_release = omap_vout_buffer_release,
++ .buf_queue = omap_vout_buffer_queue,
++ };
+
+ vout = video_drvdata(file);
+ v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
+@@ -1025,10 +1030,6 @@
+ vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
+
+ q = &vout->vbq;
+- video_vbq_ops.buf_setup = omap_vout_buffer_setup;
+- video_vbq_ops.buf_prepare = omap_vout_buffer_prepare;
+- video_vbq_ops.buf_release = omap_vout_buffer_release;
+- video_vbq_ops.buf_queue = omap_vout_buffer_queue;
+ spin_lock_init(&vout->vbq_lock);
+
+ videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
+diff -Naur backports-4.2.6-1.org/drivers/media/platform/s5p-tv/mixer_grp_layer.c backports-4.2.6-1/drivers/media/platform/s5p-tv/mixer_grp_layer.c
+--- backports-4.2.6-1.org/drivers/media/platform/s5p-tv/mixer_grp_layer.c 2015-11-15 22:19:38.000000000 +0100
++++ backports-4.2.6-1/drivers/media/platform/s5p-tv/mixer_grp_layer.c 2016-01-27 12:26:21.266626324 +0100
+@@ -235,7 +235,7 @@
+ {
+ struct mxr_layer *layer;
+ int ret;
+- struct mxr_layer_ops ops = {
++ static struct mxr_layer_ops ops = {
+ .release = mxr_graph_layer_release,
+ .buffer_set = mxr_graph_buffer_set,
+ .stream_set = mxr_graph_stream_set,
+diff -Naur backports-4.2.6-1.org/drivers/media/platform/s5p-tv/mixer.h backports-4.2.6-1/drivers/media/platform/s5p-tv/mixer.h
+--- backports-4.2.6-1.org/drivers/media/platform/s5p-tv/mixer.h 2015-11-15 22:19:38.000000000 +0100
++++ backports-4.2.6-1/drivers/media/platform/s5p-tv/mixer.h 2016-01-27 12:26:21.266626324 +0100
+@@ -156,7 +156,7 @@
+ /** layer index (unique identifier) */
+ int idx;
+ /** callbacks for layer methods */
+- struct mxr_layer_ops ops;
++ struct mxr_layer_ops *ops;
+ /** format array */
+ const struct mxr_format **fmt_array;
+ /** size of format array */
+diff -Naur backports-4.2.6-1.org/drivers/media/platform/s5p-tv/mixer_reg.c backports-4.2.6-1/drivers/media/platform/s5p-tv/mixer_reg.c
+--- backports-4.2.6-1.org/drivers/media/platform/s5p-tv/mixer_reg.c 2015-11-15 22:19:38.000000000 +0100
++++ backports-4.2.6-1/drivers/media/platform/s5p-tv/mixer_reg.c 2016-01-27 12:26:21.266626324 +0100
+@@ -276,7 +276,7 @@
+ layer->update_buf = next;
+ }
+
+- layer->ops.buffer_set(layer, layer->update_buf);
++ layer->ops->buffer_set(layer, layer->update_buf);
+
+ if (done && done != layer->shadow_buf)
+ vb2_buffer_done(&done->vb, VB2_BUF_STATE_DONE);
+diff -Naur backports-4.2.6-1.org/drivers/media/platform/s5p-tv/mixer_video.c backports-4.2.6-1/drivers/media/platform/s5p-tv/mixer_video.c
+--- backports-4.2.6-1.org/drivers/media/platform/s5p-tv/mixer_video.c 2015-11-15 22:19:38.000000000 +0100
++++ backports-4.2.6-1/drivers/media/platform/s5p-tv/mixer_video.c 2016-01-27 12:26:21.266626324 +0100
+@@ -210,7 +210,7 @@
+ layer->geo.src.height = layer->geo.src.full_height;
+
+ mxr_geometry_dump(mdev, &layer->geo);
+- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
++ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
+ mxr_geometry_dump(mdev, &layer->geo);
+ }
+
+@@ -228,7 +228,7 @@
+ layer->geo.dst.full_width = mbus_fmt.width;
+ layer->geo.dst.full_height = mbus_fmt.height;
+ layer->geo.dst.field = mbus_fmt.field;
+- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
++ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
+
+ mxr_geometry_dump(mdev, &layer->geo);
+ }
+@@ -334,7 +334,7 @@
+ /* set source size to highest accepted value */
+ geo->src.full_width = max(geo->dst.full_width, pix->width);
+ geo->src.full_height = max(geo->dst.full_height, pix->height);
+- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
++ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
+ mxr_geometry_dump(mdev, &layer->geo);
+ /* set cropping to total visible screen */
+ geo->src.width = pix->width;
+@@ -342,12 +342,12 @@
+ geo->src.x_offset = 0;
+ geo->src.y_offset = 0;
+ /* assure consistency of geometry */
+- layer->ops.fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
++ layer->ops->fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
+ mxr_geometry_dump(mdev, &layer->geo);
+ /* set full size to lowest possible value */
+ geo->src.full_width = 0;
+ geo->src.full_height = 0;
+- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
++ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
+ mxr_geometry_dump(mdev, &layer->geo);
+
+ /* returning results */
+@@ -474,7 +474,7 @@
+ target->width = s->r.width;
+ target->height = s->r.height;
+
+- layer->ops.fix_geometry(layer, stage, s->flags);
++ layer->ops->fix_geometry(layer, stage, s->flags);
+
+ /* retrieve update selection rectangle */
+ res.left = target->x_offset;
+@@ -938,13 +938,13 @@
+ mxr_output_get(mdev);
+
+ mxr_layer_update_output(layer);
+- layer->ops.format_set(layer);
++ layer->ops->format_set(layer);
+ /* enabling layer in hardware */
+ spin_lock_irqsave(&layer->enq_slock, flags);
+ layer->state = MXR_LAYER_STREAMING;
+ spin_unlock_irqrestore(&layer->enq_slock, flags);
+
+- layer->ops.stream_set(layer, MXR_ENABLE);
++ layer->ops->stream_set(layer, MXR_ENABLE);
+ mxr_streamer_get(mdev);
+
+ return 0;
+@@ -1014,7 +1014,7 @@
+ spin_unlock_irqrestore(&layer->enq_slock, flags);
+
+ /* disabling layer in hardware */
+- layer->ops.stream_set(layer, MXR_DISABLE);
++ layer->ops->stream_set(layer, MXR_DISABLE);
+ /* remove one streamer */
+ mxr_streamer_put(mdev);
+ /* allow changes in output configuration */
+@@ -1052,8 +1052,8 @@
+
+ void mxr_layer_release(struct mxr_layer *layer)
+ {
+- if (layer->ops.release)
+- layer->ops.release(layer);
++ if (layer->ops->release)
++ layer->ops->release(layer);
+ }
+
+ void mxr_base_layer_release(struct mxr_layer *layer)
+@@ -1079,7 +1079,7 @@
+
+ layer->mdev = mdev;
+ layer->idx = idx;
+- layer->ops = *ops;
++ layer->ops = ops;
+
+ spin_lock_init(&layer->enq_slock);
+ INIT_LIST_HEAD(&layer->enq_list);
+diff -Naur backports-4.2.6-1.org/drivers/media/platform/s5p-tv/mixer_vp_layer.c backports-4.2.6-1/drivers/media/platform/s5p-tv/mixer_vp_layer.c
+--- backports-4.2.6-1.org/drivers/media/platform/s5p-tv/mixer_vp_layer.c 2015-11-15 22:19:38.000000000 +0100
++++ backports-4.2.6-1/drivers/media/platform/s5p-tv/mixer_vp_layer.c 2016-01-27 12:26:21.266626324 +0100
+@@ -206,7 +206,7 @@
+ {
+ struct mxr_layer *layer;
+ int ret;
+- struct mxr_layer_ops ops = {
++ static struct mxr_layer_ops ops = {
+ .release = mxr_vp_layer_release,
+ .buffer_set = mxr_vp_buffer_set,
+ .stream_set = mxr_vp_stream_set,
+diff -Naur backports-4.2.6-1.org/drivers/media/platform/vivid/vivid-osd.c backports-4.2.6-1/drivers/media/platform/vivid/vivid-osd.c
+--- backports-4.2.6-1.org/drivers/media/platform/vivid/vivid-osd.c 2015-11-15 22:19:38.000000000 +0100
++++ backports-4.2.6-1/drivers/media/platform/vivid/vivid-osd.c 2016-01-27 12:26:21.269959657 +0100
+@@ -85,6 +85,7 @@
+ case FBIOGET_VBLANK: {
+ struct fb_vblank vblank;
+
++ memset(&vblank, 0, sizeof(vblank));
+ vblank.flags = FB_VBLANK_HAVE_COUNT | FB_VBLANK_HAVE_VCOUNT |
+ FB_VBLANK_HAVE_VSYNC;
+ vblank.count = 0;
+diff -Naur backports-4.2.6-1.org/drivers/media/radio/radio-cadet.c backports-4.2.6-1/drivers/media/radio/radio-cadet.c
+--- backports-4.2.6-1.org/drivers/media/radio/radio-cadet.c 2015-11-15 22:19:38.000000000 +0100
++++ backports-4.2.6-1/drivers/media/radio/radio-cadet.c 2016-01-27 12:26:21.269959657 +0100
+@@ -333,6 +333,8 @@
+ unsigned char readbuf[RDS_BUFFER];
+ int i = 0;
+
++ if (count > RDS_BUFFER)
++ return -EFAULT;
+ mutex_lock(&dev->lock);
+ if (dev->rdsstat == 0)
+ cadet_start_rds(dev);
+@@ -349,8 +351,9 @@
+ readbuf[i++] = dev->rdsbuf[dev->rdsout++];
+ mutex_unlock(&dev->lock);
+
+- if (i && copy_to_user(data, readbuf, i))
+- return -EFAULT;
++ if (i > sizeof(readbuf) || (i && copy_to_user(data, readbuf, i)))
++ i = -EFAULT;
++
+ return i;
+ }
+
+diff -Naur backports-4.2.6-1.org/drivers/media/radio/radio-maxiradio.c backports-4.2.6-1/drivers/media/radio/radio-maxiradio.c
+--- backports-4.2.6-1.org/drivers/media/radio/radio-maxiradio.c 2015-11-15 22:19:38.000000000 +0100
++++ backports-4.2.6-1/drivers/media/radio/radio-maxiradio.c 2016-01-27 12:26:21.269959657 +0100
+@@ -61,7 +61,7 @@
+ /* TEA5757 pin mappings */
+ static const int clk = 1, data = 2, wren = 4, mo_st = 8, power = 16;
+
+-static atomic_t maxiradio_instance = ATOMIC_INIT(0);
++static atomic_unchecked_t maxiradio_instance = ATOMIC_INIT(0);
+
+ #define PCI_VENDOR_ID_GUILLEMOT 0x5046
+ #define PCI_DEVICE_ID_GUILLEMOT_MAXIRADIO 0x1001
+diff -Naur backports-4.2.6-1.org/drivers/media/radio/radio-shark2.c backports-4.2.6-1/drivers/media/radio/radio-shark2.c
+--- backports-4.2.6-1.org/drivers/media/radio/radio-shark2.c 2015-11-15 22:19:38.000000000 +0100
++++ backports-4.2.6-1/drivers/media/radio/radio-shark2.c 2016-01-27 12:26:21.269959657 +0100
+@@ -74,7 +74,7 @@
+ u8 *transfer_buffer;
+ };
+
+-static atomic_t shark_instance = ATOMIC_INIT(0);
++static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
+
+ static int shark_write_reg(struct radio_tea5777 *tea, u64 reg)
+ {
+diff -Naur backports-4.2.6-1.org/drivers/media/radio/radio-shark.c backports-4.2.6-1/drivers/media/radio/radio-shark.c
+--- backports-4.2.6-1.org/drivers/media/radio/radio-shark.c 2015-11-15 22:19:38.000000000 +0100
++++ backports-4.2.6-1/drivers/media/radio/radio-shark.c 2016-01-27 12:26:21.269959657 +0100
+@@ -79,7 +79,7 @@
+ u32 last_val;
+ };
+
+-static atomic_t shark_instance = ATOMIC_INIT(0);
++static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
+
+ static void shark_write_val(struct snd_tea575x *tea, u32 val)
+ {
+diff -Naur backports-4.2.6-1.org/drivers/media/radio/radio-si476x.c backports-4.2.6-1/drivers/media/radio/radio-si476x.c
+--- backports-4.2.6-1.org/drivers/media/radio/radio-si476x.c 2015-11-15 22:19:38.000000000 +0100
++++ backports-4.2.6-1/drivers/media/radio/radio-si476x.c 2016-01-27 12:26:21.269959657 +0100
+@@ -1445,7 +1445,7 @@
+ struct si476x_radio *radio;
+ struct v4l2_ctrl *ctrl;
+
+- static atomic_t instance = ATOMIC_INIT(0);
++ static atomic_unchecked_t instance = ATOMIC_INIT(0);
+
+ radio = devm_kzalloc(&pdev->dev, sizeof(*radio), GFP_KERNEL);
+ if (!radio)
+diff -Naur backports-4.2.6-1.org/drivers/media/radio/wl128x/fmdrv_common.c backports-4.2.6-1/drivers/media/radio/wl128x/fmdrv_common.c
+--- backports-4.2.6-1.org/drivers/media/radio/wl128x/fmdrv_common.c 2015-11-15 22:19:38.000000000 +0100
++++ backports-4.2.6-1/drivers/media/radio/wl128x/fmdrv_common.c 2016-01-27 12:26:21.269959657 +0100
+@@ -71,7 +71,7 @@
+ MODULE_PARM_DESC(rds_buf, "RDS buffer entries");
+
+ /* Radio Nr */
+-static u32 radio_nr = -1;
++static int radio_nr = -1;
+ module_param(radio_nr, int, 0444);
+ MODULE_PARM_DESC(radio_nr, "Radio Nr");
+
+diff -Naur backports-4.2.6-1.org/drivers/media/usb/dvb-usb/cinergyT2-core.c backports-4.2.6-1/drivers/media/usb/dvb-usb/cinergyT2-core.c
+--- backports-4.2.6-1.org/drivers/media/usb/dvb-usb/cinergyT2-core.c 2015-11-15 22:19:39.000000000 +0100
++++ backports-4.2.6-1/drivers/media/usb/dvb-usb/cinergyT2-core.c 2016-01-27 12:26:21.269959657 +0100
+@@ -50,29 +50,73 @@
+
+ static int cinergyt2_streaming_ctrl(struct dvb_usb_adapter *adap, int enable)
+ {
+- char buf[] = { CINERGYT2_EP1_CONTROL_STREAM_TRANSFER, enable ? 1 : 0 };
+- char result[64];
+- return dvb_usb_generic_rw(adap->dev, buf, sizeof(buf), result,
+- sizeof(result), 0);
++ char *buf;
++ char *result;
++ int retval;
++
++ buf = kmalloc(2, GFP_KERNEL);
++ if (buf == NULL)
++ return -ENOMEM;
++ result = kmalloc(64, GFP_KERNEL);
++ if (result == NULL) {
++ kfree(buf);
++ return -ENOMEM;
++ }
++
++ buf[0] = CINERGYT2_EP1_CONTROL_STREAM_TRANSFER;
++ buf[1] = enable ? 1 : 0;
++
++ retval = dvb_usb_generic_rw(adap->dev, buf, 2, result, 64, 0);
++
++ kfree(buf);
++ kfree(result);
++ return retval;
+ }
+
+ static int cinergyt2_power_ctrl(struct dvb_usb_device *d, int enable)
+ {
+- char buf[] = { CINERGYT2_EP1_SLEEP_MODE, enable ? 0 : 1 };
+- char state[3];
+- return dvb_usb_generic_rw(d, buf, sizeof(buf), state, sizeof(state), 0);
++ char *buf;
++ char *state;
++ int retval;
++
++ buf = kmalloc(2, GFP_KERNEL);
++ if (buf == NULL)
++ return -ENOMEM;
++ state = kmalloc(3, GFP_KERNEL);
++ if (state == NULL) {
++ kfree(buf);
++ return -ENOMEM;
++ }
++
++ buf[0] = CINERGYT2_EP1_SLEEP_MODE;
++ buf[1] = enable ? 1 : 0;
++
++ retval = dvb_usb_generic_rw(d, buf, 2, state, 3, 0);
++
++ kfree(buf);
++ kfree(state);
++ return retval;
+ }
+
+ static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
+ {
+- char query[] = { CINERGYT2_EP1_GET_FIRMWARE_VERSION };
+- char state[3];
++ char *query;
++ char *state;
+ int ret;
++ query = kmalloc(1, GFP_KERNEL);
++ if (query == NULL)
++ return -ENOMEM;
++ state = kmalloc(3, GFP_KERNEL);
++ if (state == NULL) {
++ kfree(query);
++ return -ENOMEM;
++ }
++
++ query[0] = CINERGYT2_EP1_GET_FIRMWARE_VERSION;
+
+ adap->fe_adap[0].fe = cinergyt2_fe_attach(adap->dev);
+
+- ret = dvb_usb_generic_rw(adap->dev, query, sizeof(query), state,
+- sizeof(state), 0);
++ ret = dvb_usb_generic_rw(adap->dev, query, 1, state, 3, 0);
+ if (ret < 0) {
+ deb_rc("cinergyt2_power_ctrl() Failed to retrieve sleep "
+ "state info\n");
+@@ -80,7 +124,8 @@
+
+ /* Copy this pointer as we are gonna need it in the release phase */
+ cinergyt2_usb_device = adap->dev;
+-
++ kfree(query);
++ kfree(state);
+ return 0;
+ }
+
+@@ -141,12 +186,23 @@
+ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
+ {
+ struct cinergyt2_state *st = d->priv;
+- u8 key[5] = {0, 0, 0, 0, 0}, cmd = CINERGYT2_EP1_GET_RC_EVENTS;
++ u8 *key, *cmd;
+ int i;
+
++ cmd = kmalloc(1, GFP_KERNEL);
++ if (cmd == NULL)
++ return -EINVAL;
++ key = kzalloc(5, GFP_KERNEL);
++ if (key == NULL) {
++ kfree(cmd);
++ return -EINVAL;
++ }
++
++ cmd[0] = CINERGYT2_EP1_GET_RC_EVENTS;
++
+ *state = REMOTE_NO_KEY_PRESSED;
+
+- dvb_usb_generic_rw(d, &cmd, 1, key, sizeof(key), 0);
++ dvb_usb_generic_rw(d, cmd, 1, key, 5, 0);
+ if (key[4] == 0xff) {
+ /* key repeat */
+ st->rc_counter++;
+@@ -157,12 +213,12 @@
+ *event = d->last_event;
+ deb_rc("repeat key, event %x\n",
+ *event);
+- return 0;
++ goto out;
+ }
+ }
+ deb_rc("repeated key (non repeatable)\n");
+ }
+- return 0;
++ goto out;
+ }
+
+ /* hack to pass checksum on the custom field */
+@@ -174,6 +230,9 @@
+
+ deb_rc("key: %*ph\n", 5, key);
+ }
++out:
++ kfree(cmd);
++ kfree(key);
+ return 0;
+ }
+
+diff -Naur backports-4.2.6-1.org/drivers/media/usb/dvb-usb/cinergyT2-fe.c backports-4.2.6-1/drivers/media/usb/dvb-usb/cinergyT2-fe.c
+--- backports-4.2.6-1.org/drivers/media/usb/dvb-usb/cinergyT2-fe.c 2015-11-15 22:19:39.000000000 +0100
++++ backports-4.2.6-1/drivers/media/usb/dvb-usb/cinergyT2-fe.c 2016-01-27 12:26:21.269959657 +0100
+@@ -145,103 +145,176 @@
+ enum fe_status *status)
+ {
+ struct cinergyt2_fe_state *state = fe->demodulator_priv;
+- struct dvbt_get_status_msg result;
+- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
++ struct dvbt_get_status_msg *result;
++ u8 *cmd;
+ int ret;
+
+- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&result,
+- sizeof(result), 0);
++ cmd = kmalloc(1, GFP_KERNEL);
++ if (cmd == NULL)
++ return -ENOMEM;
++ result = kmalloc(sizeof(*result), GFP_KERNEL);
++ if (result == NULL) {
++ kfree(cmd);
++ return -ENOMEM;
++ }
++
++ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
++
++ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)result,
++ sizeof(*result), 0);
+ if (ret < 0)
+- return ret;
++ goto out;
+
+ *status = 0;
+
+- if (0xffff - le16_to_cpu(result.gain) > 30)
++ if (0xffff - le16_to_cpu(result->gain) > 30)
+ *status |= FE_HAS_SIGNAL;
+- if (result.lock_bits & (1 << 6))
++ if (result->lock_bits & (1 << 6))
+ *status |= FE_HAS_LOCK;
+- if (result.lock_bits & (1 << 5))
++ if (result->lock_bits & (1 << 5))
+ *status |= FE_HAS_SYNC;
+- if (result.lock_bits & (1 << 4))
++ if (result->lock_bits & (1 << 4))
+ *status |= FE_HAS_CARRIER;
+- if (result.lock_bits & (1 << 1))
++ if (result->lock_bits & (1 << 1))
+ *status |= FE_HAS_VITERBI;
+
+ if ((*status & (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC)) !=
+ (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC))
+ *status &= ~FE_HAS_LOCK;
+
+- return 0;
++out:
++ kfree(cmd);
++ kfree(result);
++ return ret;
+ }
+
+ static int cinergyt2_fe_read_ber(struct dvb_frontend *fe, u32 *ber)
+ {
+ struct cinergyt2_fe_state *state = fe->demodulator_priv;
+- struct dvbt_get_status_msg status;
+- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
++ struct dvbt_get_status_msg *status;
++ char *cmd;
+ int ret;
+
+- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
+- sizeof(status), 0);
++ cmd = kmalloc(1, GFP_KERNEL);
++ if (cmd == NULL)
++ return -ENOMEM;
++ status = kmalloc(sizeof(*status), GFP_KERNEL);
++ if (status == NULL) {
++ kfree(cmd);
++ return -ENOMEM;
++ }
++
++ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
++
++ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
++ sizeof(*status), 0);
+ if (ret < 0)
+- return ret;
++ goto out;
+
+- *ber = le32_to_cpu(status.viterbi_error_rate);
++ *ber = le32_to_cpu(status->viterbi_error_rate);
++out:
++ kfree(cmd);
++ kfree(status);
+ return 0;
+ }
+
+ static int cinergyt2_fe_read_unc_blocks(struct dvb_frontend *fe, u32 *unc)
+ {
+ struct cinergyt2_fe_state *state = fe->demodulator_priv;
+- struct dvbt_get_status_msg status;
+- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
++ struct dvbt_get_status_msg *status;
++ u8 *cmd;
+ int ret;
+
+- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&status,
+- sizeof(status), 0);
++ cmd = kmalloc(1, GFP_KERNEL);
++ if (cmd == NULL)
++ return -ENOMEM;
++ status = kmalloc(sizeof(*status), GFP_KERNEL);
++ if (status == NULL) {
++ kfree(cmd);
++ return -ENOMEM;
++ }
++
++ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
++
++ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)status,
++ sizeof(*status), 0);
+ if (ret < 0) {
+ err("cinergyt2_fe_read_unc_blocks() Failed! (Error=%d)\n",
+ ret);
+- return ret;
++ goto out;
+ }
+- *unc = le32_to_cpu(status.uncorrected_block_count);
+- return 0;
++ *unc = le32_to_cpu(status->uncorrected_block_count);
++
++out:
++ kfree(cmd);
++ kfree(status);
++ return ret;
+ }
+
+ static int cinergyt2_fe_read_signal_strength(struct dvb_frontend *fe,
+ u16 *strength)
+ {
+ struct cinergyt2_fe_state *state = fe->demodulator_priv;
+- struct dvbt_get_status_msg status;
+- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
++ struct dvbt_get_status_msg *status;
++ char *cmd;
+ int ret;
+
+- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
+- sizeof(status), 0);
++ cmd = kmalloc(1, GFP_KERNEL);
++ if (cmd == NULL)
++ return -ENOMEM;
++ status = kmalloc(sizeof(*status), GFP_KERNEL);
++ if (status == NULL) {
++ kfree(cmd);
++ return -ENOMEM;
++ }
++
++ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
++
++ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
++ sizeof(*status), 0);
+ if (ret < 0) {
+ err("cinergyt2_fe_read_signal_strength() Failed!"
+ " (Error=%d)\n", ret);
+- return ret;
++ goto out;
+ }
+- *strength = (0xffff - le16_to_cpu(status.gain));
++ *strength = (0xffff - le16_to_cpu(status->gain));
++
++out:
++ kfree(cmd);
++ kfree(status);
+ return 0;
+ }
+
+ static int cinergyt2_fe_read_snr(struct dvb_frontend *fe, u16 *snr)
+ {
+ struct cinergyt2_fe_state *state = fe->demodulator_priv;
+- struct dvbt_get_status_msg status;
+- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
++ struct dvbt_get_status_msg *status;
++ char *cmd;
+ int ret;
+
+- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
+- sizeof(status), 0);
++ cmd = kmalloc(1, GFP_KERNEL);
++ if (cmd == NULL)
++ return -ENOMEM;
++ status = kmalloc(sizeof(*status), GFP_KERNEL);
++ if (status == NULL) {
++ kfree(cmd);
++ return -ENOMEM;
++ }
++
++ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
++
++ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
++ sizeof(*status), 0);
+ if (ret < 0) {
+ err("cinergyt2_fe_read_snr() Failed! (Error=%d)\n", ret);
+- return ret;
++ goto out;
+ }
+- *snr = (status.snr << 8) | status.snr;
+- return 0;
++ *snr = (status->snr << 8) | status->snr;
++
++out:
++ kfree(cmd);
++ kfree(status);
++ return ret;
+ }
+
+ static int cinergyt2_fe_init(struct dvb_frontend *fe)
+@@ -266,35 +339,46 @@
+ {
+ struct dtv_frontend_properties *fep = &fe->dtv_property_cache;
+ struct cinergyt2_fe_state *state = fe->demodulator_priv;
+- struct dvbt_set_parameters_msg param;
+- char result[2];
++ struct dvbt_set_parameters_msg *param;
++ char *result;
+ int err;
+
+- param.cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
+- param.tps = cpu_to_le16(compute_tps(fep));
+- param.freq = cpu_to_le32(fep->frequency / 1000);
+- param.flags = 0;
++ result = kmalloc(2, GFP_KERNEL);
++ if (result == NULL)
++ return -ENOMEM;
++ param = kmalloc(sizeof(*param), GFP_KERNEL);
++ if (param == NULL) {
++ kfree(result);
++ return -ENOMEM;
++ }
++
++ param->cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
++ param->tps = cpu_to_le16(compute_tps(fep));
++ param->freq = cpu_to_le32(fep->frequency / 1000);
++ param->flags = 0;
+
+ switch (fep->bandwidth_hz) {
+ default:
+ case 8000000:
+- param.bandwidth = 8;
++ param->bandwidth = 8;
+ break;
+ case 7000000:
+- param.bandwidth = 7;
++ param->bandwidth = 7;
+ break;
+ case 6000000:
+- param.bandwidth = 6;
++ param->bandwidth = 6;
+ break;
+ }
+
+ err = dvb_usb_generic_rw(state->d,
+- (char *)¶m, sizeof(param),
+- result, sizeof(result), 0);
++ (char *)param, sizeof(*param),
++ result, 2, 0);
+ if (err < 0)
+ err("cinergyt2_fe_set_frontend() Failed! err=%d\n", err);
+
+- return (err < 0) ? err : 0;
++ kfree(result);
++ kfree(param);
++ return err;
+ }
+
+ static void cinergyt2_fe_release(struct dvb_frontend *fe)
+diff -Naur backports-4.2.6-1.org/drivers/media/usb/dvb-usb/dvb-usb-firmware.c backports-4.2.6-1/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
+--- backports-4.2.6-1.org/drivers/media/usb/dvb-usb/dvb-usb-firmware.c 2015-11-15 22:19:39.000000000 +0100
++++ backports-4.2.6-1/drivers/media/usb/dvb-usb/dvb-usb-firmware.c 2016-01-27 12:26:21.269959657 +0100
+@@ -35,42 +35,57 @@
+
+ int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw, int type)
+ {
+- struct hexline hx;
+- u8 reset;
++ struct hexline *hx;
++ u8 *reset;
+ int ret,pos=0;
+
++ reset = kmalloc(1, GFP_KERNEL);
++ if (reset == NULL)
++ return -ENOMEM;
++
++ hx = kmalloc(sizeof(struct hexline), GFP_KERNEL);
++ if (hx == NULL) {
++ kfree(reset);
++ return -ENOMEM;
++ }
++
+ /* stop the CPU */
+- reset = 1;
+- if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1)) != 1)
++ reset[0] = 1;
++ if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1)) != 1)
+ err("could not stop the USB controller CPU.");
+
+- while ((ret = dvb_usb_get_hexline(fw,&hx,&pos)) > 0) {
+- deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx.addr,hx.len,hx.chk);
+- ret = usb_cypress_writemem(udev,hx.addr,hx.data,hx.len);
++ while ((ret = dvb_usb_get_hexline(fw,hx,&pos)) > 0) {
++ deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx->addr,hx->len,hx->chk);
++ ret = usb_cypress_writemem(udev,hx->addr,hx->data,hx->len);
+
+- if (ret != hx.len) {
++ if (ret != hx->len) {
+ err("error while transferring firmware "
+ "(transferred size: %d, block size: %d)",
+- ret,hx.len);
++ ret,hx->len);
+ ret = -EINVAL;
+ break;
+ }
+ }
+ if (ret < 0) {
+ err("firmware download failed at %d with %d",pos,ret);
++ kfree(reset);
++ kfree(hx);
+ return ret;
+ }
+
+ if (ret == 0) {
+ /* restart the CPU */
+- reset = 0;
+- if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1) != 1) {
++ reset[0] = 0;
++ if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1) != 1) {
+ err("could not restart the USB controller CPU.");
+ ret = -EINVAL;
+ }
+ } else
+ ret = -EIO;
+
++ kfree(reset);
++ kfree(hx);
++
+ return ret;
+ }
+ EXPORT_SYMBOL(usb_cypress_load_firmware);
+diff -Naur backports-4.2.6-1.org/drivers/media/usb/dvb-usb/technisat-usb2.c backports-4.2.6-1/drivers/media/usb/dvb-usb/technisat-usb2.c
+--- backports-4.2.6-1.org/drivers/media/usb/dvb-usb/technisat-usb2.c 2015-11-15 22:19:39.000000000 +0100
++++ backports-4.2.6-1/drivers/media/usb/dvb-usb/technisat-usb2.c 2016-01-27 12:26:21.269959657 +0100
+@@ -87,8 +87,11 @@
+ static int technisat_usb2_i2c_access(struct usb_device *udev,
+ u8 device_addr, u8 *tx, u8 txlen, u8 *rx, u8 rxlen)
+ {
+- u8 b[64];
+- int ret, actual_length;
++ u8 *b = kmalloc(64, GFP_KERNEL);
++ int ret, actual_length, error = 0;
++
++ if (b == NULL)
++ return -ENOMEM;
+
+ deb_i2c("i2c-access: %02x, tx: ", device_addr);
+ debug_dump(tx, txlen, deb_i2c);
+@@ -121,7 +124,8 @@
+
+ if (ret < 0) {
+ err("i2c-error: out failed %02x = %d", device_addr, ret);
+- return -ENODEV;
++ error = -ENODEV;
++ goto out;
+ }
+
+ ret = usb_bulk_msg(udev,
+@@ -129,7 +133,8 @@
+ b, 64, &actual_length, 1000);
+ if (ret < 0) {
+ err("i2c-error: in failed %02x = %d", device_addr, ret);
+- return -ENODEV;
++ error = -ENODEV;
++ goto out;
+ }
+
+ if (b[0] != I2C_STATUS_OK) {
+@@ -137,8 +142,10 @@
+ /* handle tuner-i2c-nak */
+ if (!(b[0] == I2C_STATUS_NAK &&
+ device_addr == 0x60
+- /* && device_is_technisat_usb2 */))
+- return -ENODEV;
++ /* && device_is_technisat_usb2 */)) {
++ error = -ENODEV;
++ goto out;
++ }
+ }
+
+ deb_i2c("status: %d, ", b[0]);
+@@ -152,7 +159,9 @@
+
+ deb_i2c("\n");
+
+- return 0;
++out:
++ kfree(b);
++ return error;
+ }
+
+ static int technisat_usb2_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msg,
+@@ -224,14 +233,16 @@
+ {
+ int ret;
+
+- u8 led[8] = {
+- red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
+- 0
+- };
++ u8 *led = kzalloc(8, GFP_KERNEL);
++
++ if (led == NULL)
++ return -ENOMEM;
+
+ if (disable_led_control && state != TECH_LED_OFF)
+ return 0;
+
++ led[0] = red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST;
++
+ switch (state) {
+ case TECH_LED_ON:
+ led[1] = 0x82;
+@@ -263,16 +274,22 @@
+ red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
+ USB_TYPE_VENDOR | USB_DIR_OUT,
+ 0, 0,
+- led, sizeof(led), 500);
++ led, 8, 500);
+
+ mutex_unlock(&d->i2c_mutex);
++
++ kfree(led);
++
+ return ret;
+ }
+
+ static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 green)
+ {
+ int ret;
+- u8 b = 0;
++ u8 *b = kzalloc(1, GFP_KERNEL);
++
++ if (b == NULL)
++ return -ENOMEM;
+
+ if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
+ return -EAGAIN;
+@@ -281,10 +298,12 @@
+ SET_LED_TIMER_DIVIDER_VENDOR_REQUEST,
+ USB_TYPE_VENDOR | USB_DIR_OUT,
+ (red << 8) | green, 0,
+- &b, 1, 500);
++ b, 1, 500);
+
+ mutex_unlock(&d->i2c_mutex);
+
++ kfree(b);
++
+ return ret;
+ }
+
+@@ -328,7 +347,7 @@
+ struct dvb_usb_device_description **desc, int *cold)
+ {
+ int ret;
+- u8 version[3];
++ u8 *version = kmalloc(3, GFP_KERNEL);
+
+ /* first select the interface */
+ if (usb_set_interface(udev, 0, 1) != 0)
+@@ -338,11 +357,14 @@
+
+ *cold = 0; /* by default do not download a firmware - just in case something is wrong */
+
++ if (version == NULL)
++ return 0;
++
+ ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
+ GET_VERSION_INFO_VENDOR_REQUEST,
+ USB_TYPE_VENDOR | USB_DIR_IN,
+ 0, 0,
+- version, sizeof(version), 500);
++ version, 3, 500);
+
+ if (ret < 0)
+ *cold = 1;
+@@ -351,6 +373,8 @@
+ *cold = 0;
+ }
+
++ kfree(version);
++
+ return 0;
+ }
+
+@@ -594,10 +618,15 @@
+
+ static int technisat_usb2_get_ir(struct dvb_usb_device *d)
+ {
+- u8 buf[62], *b;
++ u8 *buf, *b;
+ int ret;
+ struct ir_raw_event ev;
+
++ buf = kmalloc(62, GFP_KERNEL);
++
++ if (buf == NULL)
++ return -ENOMEM;
++
+ buf[0] = GET_IR_DATA_VENDOR_REQUEST;
+ buf[1] = 0x08;
+ buf[2] = 0x8f;
+@@ -620,16 +649,20 @@
+ GET_IR_DATA_VENDOR_REQUEST,
+ USB_TYPE_VENDOR | USB_DIR_IN,
+ 0x8080, 0,
+- buf, sizeof(buf), 500);
++ buf, 62, 500);
+
+ unlock:
+ mutex_unlock(&d->i2c_mutex);
+
+- if (ret < 0)
++ if (ret < 0) {
++ kfree(buf);
+ return ret;
++ }
+
+- if (ret == 1)
++ if (ret == 1) {
++ kfree(buf);
+ return 0; /* no key pressed */
++ }
+
+ /* decoding */
+ b = buf+1;
+@@ -656,6 +689,8 @@
+
+ ir_raw_event_handle(d->rc_dev);
+
++ kfree(buf);
++
+ return 1;
+ }
+
+diff -Naur backports-4.2.6-1.org/drivers/media/v4l2-core/v4l2-compat-ioctl32.c backports-4.2.6-1/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
+--- backports-4.2.6-1.org/drivers/media/v4l2-core/v4l2-compat-ioctl32.c 2015-11-15 22:19:38.000000000 +0100
++++ backports-4.2.6-1/drivers/media/v4l2-core/v4l2-compat-ioctl32.c 2016-01-27 12:26:21.269959657 +0100
+@@ -429,7 +429,7 @@
+ * by passing a very big num_planes value */
+ uplane = compat_alloc_user_space(num_planes *
+ sizeof(struct v4l2_plane));
+- kp->m.planes = (__force struct v4l2_plane *)uplane;
++ kp->m.planes = (__force_kernel struct v4l2_plane *)uplane;
+
+ while (--num_planes >= 0) {
+ ret = get_v4l2_plane32(uplane, uplane32, kp->memory);
+@@ -500,7 +500,7 @@
+ if (num_planes == 0)
+ return 0;
+
+- uplane = (__force struct v4l2_plane __user *)kp->m.planes;
++ uplane = (struct v4l2_plane __force_user *)kp->m.planes;
+ if (get_user(p, &up->m.planes))
+ return -EFAULT;
+ uplane32 = compat_ptr(p);
+@@ -564,7 +564,7 @@
+ get_user(kp->flags, &up->flags) ||
+ copy_from_user(&kp->fmt, &up->fmt, sizeof(up->fmt)))
+ return -EFAULT;
+- kp->base = (__force void *)compat_ptr(tmp);
++ kp->base = (__force_kernel void *)compat_ptr(tmp);
+ return 0;
+ }
+
+@@ -669,7 +669,7 @@
+ n * sizeof(struct v4l2_ext_control32)))
+ return -EFAULT;
+ kcontrols = compat_alloc_user_space(n * sizeof(struct v4l2_ext_control));
+- kp->controls = (__force struct v4l2_ext_control *)kcontrols;
++ kp->controls = (__force_kernel struct v4l2_ext_control *)kcontrols;
+ while (--n >= 0) {
+ u32 id;
+
+@@ -696,7 +696,7 @@
+ {
+ struct v4l2_ext_control32 __user *ucontrols;
+ struct v4l2_ext_control __user *kcontrols =
+- (__force struct v4l2_ext_control __user *)kp->controls;
++ (struct v4l2_ext_control __force_user *)kp->controls;
+ int n = kp->count;
+ compat_caddr_t p;
+
+@@ -780,7 +780,7 @@
+ get_user(tmp, &up->edid) ||
+ copy_from_user(kp->reserved, up->reserved, sizeof(kp->reserved)))
+ return -EFAULT;
+- kp->edid = (__force u8 *)compat_ptr(tmp);
++ kp->edid = (__force_kernel u8 *)compat_ptr(tmp);
+ return 0;
+ }
+
+diff -Naur backports-4.2.6-1.org/drivers/media/v4l2-core/v4l2-device.c backports-4.2.6-1/drivers/media/v4l2-core/v4l2-device.c
+--- backports-4.2.6-1.org/drivers/media/v4l2-core/v4l2-device.c 2015-11-15 22:19:38.000000000 +0100
++++ backports-4.2.6-1/drivers/media/v4l2-core/v4l2-device.c 2016-01-27 12:26:21.269959657 +0100
+@@ -74,9 +74,9 @@
+ EXPORT_SYMBOL_GPL(v4l2_device_put);
+
+ int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
+- atomic_t *instance)
++ atomic_unchecked_t *instance)
+ {
+- int num = atomic_inc_return(instance) - 1;
++ int num = atomic_inc_return_unchecked(instance) - 1;
+ int len = strlen(basename);
+
+ if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
+diff -Naur backports-4.2.6-1.org/drivers/media/v4l2-core/v4l2-ioctl.c backports-4.2.6-1/drivers/media/v4l2-core/v4l2-ioctl.c
+--- backports-4.2.6-1.org/drivers/media/v4l2-core/v4l2-ioctl.c 2015-11-15 22:19:38.000000000 +0100
++++ backports-4.2.6-1/drivers/media/v4l2-core/v4l2-ioctl.c 2016-01-27 12:26:21.269959657 +0100
+@@ -2341,7 +2341,8 @@
+ struct file *file, void *fh, void *p);
+ } u;
+ void (*debug)(const void *arg, bool write_only);
+-};
++} __do_const;
++typedef struct v4l2_ioctl_info __no_const v4l2_ioctl_info_no_const;
+
+ /* This control needs a priority check */
+ #define INFO_FL_PRIO (1 << 0)
+@@ -2525,7 +2526,7 @@
+ struct video_device *vfd = video_devdata(file);
+ const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops;
+ bool write_only = false;
+- struct v4l2_ioctl_info default_info;
++ v4l2_ioctl_info_no_const default_info;
+ const struct v4l2_ioctl_info *info;
+ void *fh = file->private_data;
+ struct v4l2_fh *vfh = NULL;
+@@ -2616,7 +2617,7 @@
+ ret = -EINVAL;
+ break;
+ }
+- *user_ptr = (void __user *)buf->m.planes;
++ *user_ptr = (void __force_user *)buf->m.planes;
+ *kernel_ptr = (void **)&buf->m.planes;
+ *array_size = sizeof(struct v4l2_plane) * buf->length;
+ ret = 1;
+@@ -2633,7 +2634,7 @@
+ ret = -EINVAL;
+ break;
+ }
+- *user_ptr = (void __user *)edid->edid;
++ *user_ptr = (void __force_user *)edid->edid;
+ *kernel_ptr = (void **)&edid->edid;
+ *array_size = edid->blocks * 128;
+ ret = 1;
+@@ -2651,7 +2652,7 @@
+ ret = -EINVAL;
+ break;
+ }
+- *user_ptr = (void __user *)ctrls->controls;
++ *user_ptr = (void __force_user *)ctrls->controls;
+ *kernel_ptr = (void **)&ctrls->controls;
+ *array_size = sizeof(struct v4l2_ext_control)
+ * ctrls->count;
+@@ -2752,7 +2753,7 @@
+ }
+
+ if (has_array_args) {
+- *kernel_ptr = (void __force *)user_ptr;
++ *kernel_ptr = (void __force_kernel *)user_ptr;
+ if (copy_to_user(user_ptr, mbuf, array_size))
+ err = -EFAULT;
+ goto out_array_args;
+diff -Naur backports-4.2.6-1.org/drivers/net/usb/sierra_net.c backports-4.2.6-1/drivers/net/usb/sierra_net.c
+--- backports-4.2.6-1.org/drivers/net/usb/sierra_net.c 2015-11-15 22:19:39.000000000 +0100
++++ backports-4.2.6-1/drivers/net/usb/sierra_net.c 2016-01-27 12:26:21.283292990 +0100
+@@ -51,7 +51,7 @@
+ /* atomic counter partially included in MAC address to make sure 2 devices
+ * do not end up with the same MAC - concept breaks in case of > 255 ifaces
+ */
+-static atomic_t iface_counter = ATOMIC_INIT(0);
++static atomic_unchecked_t iface_counter = ATOMIC_INIT(0);
+
+ /*
+ * SYNC Timer Delay definition used to set the expiry time
+@@ -697,7 +697,7 @@
+ dev->net->netdev_ops = &sierra_net_device_ops;
+
+ /* change MAC addr to include, ifacenum, and to be unique */
+- dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return(&iface_counter);
++ dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return_unchecked(&iface_counter);
+ dev->net->dev_addr[ETH_ALEN-1] = ifacenum;
+
+ /* we will have to manufacture ethernet headers, prepare template */
+diff -Naur backports-4.2.6-1.org/drivers/net/wireless/airo.c backports-4.2.6-1/drivers/net/wireless/airo.c
+--- backports-4.2.6-1.org/drivers/net/wireless/airo.c 2015-11-15 22:19:39.000000000 +0100
++++ backports-4.2.6-1/drivers/net/wireless/airo.c 2016-01-27 12:26:21.286626323 +0100
+@@ -7846,7 +7846,7 @@
+ struct airo_info *ai = dev->ml_priv;
+ int ridcode;
+ int enabled;
+- static int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
++ int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
+ unsigned char *iobuf;
+
+ /* Only super-user can write RIDs */
+diff -Naur backports-4.2.6-1.org/drivers/net/wireless/at76c50x-usb.c backports-4.2.6-1/drivers/net/wireless/at76c50x-usb.c
+--- backports-4.2.6-1.org/drivers/net/wireless/at76c50x-usb.c 2015-11-15 22:19:39.000000000 +0100
++++ backports-4.2.6-1/drivers/net/wireless/at76c50x-usb.c 2016-01-27 12:26:21.286626323 +0100
+@@ -353,7 +353,7 @@
+ }
+
+ /* Convert timeout from the DFU status to jiffies */
+-static inline unsigned long at76_get_timeout(struct dfu_status *s)
++static inline unsigned long __intentional_overflow(-1) at76_get_timeout(struct dfu_status *s)
+ {
+ return msecs_to_jiffies((s->poll_timeout[2] << 16)
+ | (s->poll_timeout[1] << 8)
+diff -Naur backports-4.2.6-1.org/drivers/net/wireless/ath/ath10k/ce.c backports-4.2.6-1/drivers/net/wireless/ath/ath10k/ce.c
+--- backports-4.2.6-1.org/drivers/net/wireless/ath/ath10k/ce.c 2015-11-15 22:19:40.000000000 +0100
++++ backports-4.2.6-1/drivers/net/wireless/ath/ath10k/ce.c 2016-01-27 12:26:21.286626323 +0100
+@@ -896,12 +896,12 @@
+ return 0;
+ }
+
+-static struct ath10k_ce_ring *
++static struct ath10k_ce_ring * __intentional_overflow(-1)
+ ath10k_ce_alloc_src_ring(struct ath10k *ar, unsigned int ce_id,
+ const struct ce_attr *attr)
+ {
+ struct ath10k_ce_ring *src_ring;
+- u32 nentries = attr->src_nentries;
++ unsigned long nentries = attr->src_nentries;
+ dma_addr_t base_addr;
+
+ nentries = roundup_pow_of_two(nentries);
+@@ -968,7 +968,7 @@
+ const struct ce_attr *attr)
+ {
+ struct ath10k_ce_ring *dest_ring;
+- u32 nentries;
++ unsigned long nentries;
+ dma_addr_t base_addr;
+
+ nentries = roundup_pow_of_two(attr->dest_nentries);
+diff -Naur backports-4.2.6-1.org/drivers/net/wireless/ath/ath10k/htc.c backports-4.2.6-1/drivers/net/wireless/ath/ath10k/htc.c
+--- backports-4.2.6-1.org/drivers/net/wireless/ath/ath10k/htc.c 2015-11-15 22:19:40.000000000 +0100
++++ backports-4.2.6-1/drivers/net/wireless/ath/ath10k/htc.c 2016-01-27 12:26:21.286626323 +0100
+@@ -841,7 +841,10 @@
+ /* registered target arrival callback from the HIF layer */
+ int ath10k_htc_init(struct ath10k *ar)
+ {
+- struct ath10k_hif_cb htc_callbacks;
++ static struct ath10k_hif_cb htc_callbacks = {
++ .rx_completion = ath10k_htc_rx_completion_handler,
++ .tx_completion = ath10k_htc_tx_completion_handler,
++ };
+ struct ath10k_htc_ep *ep = NULL;
+ struct ath10k_htc *htc = &ar->htc;
+
+@@ -850,8 +853,6 @@
+ ath10k_htc_reset_endpoint_states(htc);
+
+ /* setup HIF layer callbacks */
+- htc_callbacks.rx_completion = ath10k_htc_rx_completion_handler;
+- htc_callbacks.tx_completion = ath10k_htc_tx_completion_handler;
+ htc->ar = ar;
+
+ /* Get HIF default pipe for HTC message exchange */
+diff -Naur backports-4.2.6-1.org/drivers/net/wireless/ath/ath10k/htc.h backports-4.2.6-1/drivers/net/wireless/ath/ath10k/htc.h
+--- backports-4.2.6-1.org/drivers/net/wireless/ath/ath10k/htc.h 2015-11-15 22:19:40.000000000 +0100
++++ backports-4.2.6-1/drivers/net/wireless/ath/ath10k/htc.h 2016-01-27 12:26:21.286626323 +0100
+@@ -270,13 +270,13 @@
+
+ struct ath10k_htc_ops {
+ void (*target_send_suspend_complete)(struct ath10k *ar);
+-};
++} __no_const;
+
+ struct ath10k_htc_ep_ops {
+ void (*ep_tx_complete)(struct ath10k *, struct sk_buff *);
+ void (*ep_rx_complete)(struct ath10k *, struct sk_buff *);
+ void (*ep_tx_credits)(struct ath10k *);
+-};
++} __no_const;
+
+ /* service connection information */
+ struct ath10k_htc_svc_conn_req {
+diff -Naur backports-4.2.6-1.org/drivers/net/wireless/ath/ath9k/ar9002_mac.c backports-4.2.6-1/drivers/net/wireless/ath/ath9k/ar9002_mac.c
+--- backports-4.2.6-1.org/drivers/net/wireless/ath/ath9k/ar9002_mac.c 2015-11-15 22:19:39.000000000 +0100
++++ backports-4.2.6-1/drivers/net/wireless/ath/ath9k/ar9002_mac.c 2016-01-27 12:26:21.286626323 +0100
+@@ -220,8 +220,8 @@
+ ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
+ ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
+
+- ACCESS_ONCE(ads->ds_link) = i->link;
+- ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
++ ACCESS_ONCE_RW(ads->ds_link) = i->link;
++ ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
+
+ ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
+ ctl6 = SM(i->keytype, AR_EncrType);
+@@ -235,26 +235,26 @@
+
+ if ((i->is_first || i->is_last) &&
+ i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
+- ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
++ ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
+ | set11nTries(i->rates, 1)
+ | set11nTries(i->rates, 2)
+ | set11nTries(i->rates, 3)
+ | (i->dur_update ? AR_DurUpdateEna : 0)
+ | SM(0, AR_BurstDur);
+
+- ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
++ ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
+ | set11nRate(i->rates, 1)
+ | set11nRate(i->rates, 2)
+ | set11nRate(i->rates, 3);
+ } else {
+- ACCESS_ONCE(ads->ds_ctl2) = 0;
+- ACCESS_ONCE(ads->ds_ctl3) = 0;
++ ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
++ ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
+ }
+
+ if (!i->is_first) {
+- ACCESS_ONCE(ads->ds_ctl0) = 0;
+- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
+- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
++ ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
++ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
++ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
+ return;
+ }
+
+@@ -279,7 +279,7 @@
+ break;
+ }
+
+- ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
++ ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
+ | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
+ | SM(i->txpower[0], AR_XmitPower0)
+ | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
+@@ -289,27 +289,27 @@
+ | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
+ (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
+
+- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
+- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
++ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
++ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
+
+ if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
+ return;
+
+- ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
++ ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
+ | set11nPktDurRTSCTS(i->rates, 1);
+
+- ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
++ ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
+ | set11nPktDurRTSCTS(i->rates, 3);
+
+- ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
++ ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
+ | set11nRateFlags(i->rates, 1)
+ | set11nRateFlags(i->rates, 2)
+ | set11nRateFlags(i->rates, 3)
+ | SM(i->rtscts_rate, AR_RTSCTSRate);
+
+- ACCESS_ONCE(ads->ds_ctl9) = SM(i->txpower[1], AR_XmitPower1);
+- ACCESS_ONCE(ads->ds_ctl10) = SM(i->txpower[2], AR_XmitPower2);
+- ACCESS_ONCE(ads->ds_ctl11) = SM(i->txpower[3], AR_XmitPower3);
++ ACCESS_ONCE_RW(ads->ds_ctl9) = SM(i->txpower[1], AR_XmitPower1);
++ ACCESS_ONCE_RW(ads->ds_ctl10) = SM(i->txpower[2], AR_XmitPower2);
++ ACCESS_ONCE_RW(ads->ds_ctl11) = SM(i->txpower[3], AR_XmitPower3);
+ }
+
+ static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds,
+diff -Naur backports-4.2.6-1.org/drivers/net/wireless/ath/ath9k/ar9003_mac.c backports-4.2.6-1/drivers/net/wireless/ath/ath9k/ar9003_mac.c
+--- backports-4.2.6-1.org/drivers/net/wireless/ath/ath9k/ar9003_mac.c 2015-11-15 22:19:39.000000000 +0100
++++ backports-4.2.6-1/drivers/net/wireless/ath/ath9k/ar9003_mac.c 2016-01-27 12:26:21.286626323 +0100
+@@ -39,47 +39,47 @@
+ (i->qcu << AR_TxQcuNum_S) | desc_len;
+
+ checksum += val;
+- ACCESS_ONCE(ads->info) = val;
++ ACCESS_ONCE_RW(ads->info) = val;
+
+ checksum += i->link;
+- ACCESS_ONCE(ads->link) = i->link;
++ ACCESS_ONCE_RW(ads->link) = i->link;
+
+ checksum += i->buf_addr[0];
+- ACCESS_ONCE(ads->data0) = i->buf_addr[0];
++ ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
+ checksum += i->buf_addr[1];
+- ACCESS_ONCE(ads->data1) = i->buf_addr[1];
++ ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
+ checksum += i->buf_addr[2];
+- ACCESS_ONCE(ads->data2) = i->buf_addr[2];
++ ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
+ checksum += i->buf_addr[3];
+- ACCESS_ONCE(ads->data3) = i->buf_addr[3];
++ ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
+
+ checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
+- ACCESS_ONCE(ads->ctl3) = val;
++ ACCESS_ONCE_RW(ads->ctl3) = val;
+ checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
+- ACCESS_ONCE(ads->ctl5) = val;
++ ACCESS_ONCE_RW(ads->ctl5) = val;
+ checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
+- ACCESS_ONCE(ads->ctl7) = val;
++ ACCESS_ONCE_RW(ads->ctl7) = val;
+ checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
+- ACCESS_ONCE(ads->ctl9) = val;
++ ACCESS_ONCE_RW(ads->ctl9) = val;
+
+ checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
+- ACCESS_ONCE(ads->ctl10) = checksum;
++ ACCESS_ONCE_RW(ads->ctl10) = checksum;
+
+ if (i->is_first || i->is_last) {
+- ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
++ ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
+ | set11nTries(i->rates, 1)
+ | set11nTries(i->rates, 2)
+ | set11nTries(i->rates, 3)
+ | (i->dur_update ? AR_DurUpdateEna : 0)
+ | SM(0, AR_BurstDur);
+
+- ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
++ ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
+ | set11nRate(i->rates, 1)
+ | set11nRate(i->rates, 2)
+ | set11nRate(i->rates, 3);
+ } else {
+- ACCESS_ONCE(ads->ctl13) = 0;
+- ACCESS_ONCE(ads->ctl14) = 0;
++ ACCESS_ONCE_RW(ads->ctl13) = 0;
++ ACCESS_ONCE_RW(ads->ctl14) = 0;
+ }
+
+ ads->ctl20 = 0;
+@@ -89,17 +89,17 @@
+
+ ctl17 = SM(i->keytype, AR_EncrType);
+ if (!i->is_first) {
+- ACCESS_ONCE(ads->ctl11) = 0;
+- ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
+- ACCESS_ONCE(ads->ctl15) = 0;
+- ACCESS_ONCE(ads->ctl16) = 0;
+- ACCESS_ONCE(ads->ctl17) = ctl17;
+- ACCESS_ONCE(ads->ctl18) = 0;
+- ACCESS_ONCE(ads->ctl19) = 0;
++ ACCESS_ONCE_RW(ads->ctl11) = 0;
++ ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
++ ACCESS_ONCE_RW(ads->ctl15) = 0;
++ ACCESS_ONCE_RW(ads->ctl16) = 0;
++ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
++ ACCESS_ONCE_RW(ads->ctl18) = 0;
++ ACCESS_ONCE_RW(ads->ctl19) = 0;
+ return;
+ }
+
+- ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
++ ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
+ | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
+ | SM(i->txpower[0], AR_XmitPower0)
+ | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
+@@ -135,26 +135,26 @@
+ val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
+ ctl12 |= SM(val, AR_PAPRDChainMask);
+
+- ACCESS_ONCE(ads->ctl12) = ctl12;
+- ACCESS_ONCE(ads->ctl17) = ctl17;
++ ACCESS_ONCE_RW(ads->ctl12) = ctl12;
++ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
+
+- ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
++ ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
+ | set11nPktDurRTSCTS(i->rates, 1);
+
+- ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
++ ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
+ | set11nPktDurRTSCTS(i->rates, 3);
+
+- ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
++ ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
+ | set11nRateFlags(i->rates, 1)
+ | set11nRateFlags(i->rates, 2)
+ | set11nRateFlags(i->rates, 3)
+ | SM(i->rtscts_rate, AR_RTSCTSRate);
+
+- ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
++ ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
+
+- ACCESS_ONCE(ads->ctl20) = SM(i->txpower[1], AR_XmitPower1);
+- ACCESS_ONCE(ads->ctl21) = SM(i->txpower[2], AR_XmitPower2);
+- ACCESS_ONCE(ads->ctl22) = SM(i->txpower[3], AR_XmitPower3);
++ ACCESS_ONCE_RW(ads->ctl20) = SM(i->txpower[1], AR_XmitPower1);
++ ACCESS_ONCE_RW(ads->ctl21) = SM(i->txpower[2], AR_XmitPower2);
++ ACCESS_ONCE_RW(ads->ctl22) = SM(i->txpower[3], AR_XmitPower3);
+ }
+
+ static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
+diff -Naur backports-4.2.6-1.org/drivers/net/wireless/ath/ath9k/hw.h backports-4.2.6-1/drivers/net/wireless/ath/ath9k/hw.h
+--- backports-4.2.6-1.org/drivers/net/wireless/ath/ath9k/hw.h 2015-11-15 22:19:39.000000000 +0100
++++ backports-4.2.6-1/drivers/net/wireless/ath/ath9k/hw.h 2016-01-27 12:33:44.649931973 +0100
+@@ -671,7 +671,7 @@
+ #ifdef CPTCFG_ATH9K_BTCOEX_SUPPORT
+ bool (*is_aic_enabled)(struct ath_hw *ah);
+ #endif /* CPTCFG_ATH9K_BTCOEX_SUPPORT */
+-};
++} __no_const;
+
+ /**
+ * struct ath_spec_scan - parameters for Atheros spectral scan
+@@ -747,7 +747,7 @@
+ #ifdef CPTCFG_ATH9K_BTCOEX_SUPPORT
+ void (*set_bt_ant_diversity)(struct ath_hw *hw, bool enable);
+ #endif
+-};
++} __no_const;
+
+ struct ath_nf_limits {
+ s16 max;
+diff -Naur backports-4.2.6-1.org/drivers/net/wireless/ath/ath9k/Kconfig backports-4.2.6-1/drivers/net/wireless/ath/ath9k/Kconfig
+--- backports-4.2.6-1.org/drivers/net/wireless/ath/ath9k/Kconfig 2015-11-15 22:19:40.000000000 +0100
++++ backports-4.2.6-1/drivers/net/wireless/ath/ath9k/Kconfig 2016-01-27 12:34:48.923262299 +0100
+@@ -5,7 +5,6 @@
+ tristate
+ depends on m
+ select ATH_COMMON
+- depends on DEBUG_FS
+ depends on RELAY
+ config ATH9K_DFS_DEBUGFS
+ def_bool y
+diff -Naur backports-4.2.6-1.org/drivers/net/wireless/ath/ath9k/main.c backports-4.2.6-1/drivers/net/wireless/ath/ath9k/main.c
+--- backports-4.2.6-1.org/drivers/net/wireless/ath/ath9k/main.c 2015-11-15 22:19:39.000000000 +0100
++++ backports-4.2.6-1/drivers/net/wireless/ath/ath9k/main.c 2016-01-27 12:26:21.289959656 +0100
+@@ -2574,16 +2574,18 @@
+ if (!ath9k_is_chanctx_enabled())
+ return;
+
+- ath9k_ops.hw_scan = ath9k_hw_scan;
+- ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
+- ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
+- ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
+- ath9k_ops.add_chanctx = ath9k_add_chanctx;
+- ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
+- ath9k_ops.change_chanctx = ath9k_change_chanctx;
+- ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
+- ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
+- ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
++ pax_open_kernel();
++ *(void **)&ath9k_ops.hw_scan = ath9k_hw_scan;
++ *(void **)&ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
++ *(void **)&ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
++ *(void **)&ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
++ *(void **)&ath9k_ops.add_chanctx = ath9k_add_chanctx;
++ *(void **)&ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
++ *(void **)&ath9k_ops.change_chanctx = ath9k_change_chanctx;
++ *(void **)&ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
++ *(void **)&ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
++ *(void **)&ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
++ pax_close_kernel();
+ }
+
+ #endif
+diff -Naur backports-4.2.6-1.org/drivers/net/wireless/b43/phy_lp.c backports-4.2.6-1/drivers/net/wireless/b43/phy_lp.c
+--- backports-4.2.6-1.org/drivers/net/wireless/b43/phy_lp.c 2015-11-15 22:19:39.000000000 +0100
++++ backports-4.2.6-1/drivers/net/wireless/b43/phy_lp.c 2016-01-27 12:26:21.289959656 +0100
+@@ -2502,7 +2502,7 @@
+ {
+ struct ssb_bus *bus = dev->dev->sdev->bus;
+
+- static const struct b206x_channel *chandata = NULL;
++ const struct b206x_channel *chandata = NULL;
+ u32 crystal_freq = bus->chipco.pmu.crystalfreq * 1000;
+ u32 freqref, vco_freq, val1, val2, val3, timeout, timeoutref, count;
+ u16 old_comm15, scale;
+diff -Naur backports-4.2.6-1.org/drivers/net/wireless/iwlegacy/3945-mac.c backports-4.2.6-1/drivers/net/wireless/iwlegacy/3945-mac.c
+--- backports-4.2.6-1.org/drivers/net/wireless/iwlegacy/3945-mac.c 2015-11-15 22:19:40.000000000 +0100
++++ backports-4.2.6-1/drivers/net/wireless/iwlegacy/3945-mac.c 2016-01-27 12:26:21.289959656 +0100
+@@ -3633,7 +3633,9 @@
+ */
+ if (il3945_mod_params.disable_hw_scan) {
+ D_INFO("Disabling hw_scan\n");
+- il3945_mac_ops.hw_scan = NULL;
++ pax_open_kernel();
++ *(void **)&il3945_mac_ops.hw_scan = NULL;
++ pax_close_kernel();
+ }
+
+ D_INFO("*** LOAD DRIVER ***\n");
+diff -Naur backports-4.2.6-1.org/drivers/net/wireless/iwlwifi/dvm/debugfs.c backports-4.2.6-1/drivers/net/wireless/iwlwifi/dvm/debugfs.c
+--- backports-4.2.6-1.org/drivers/net/wireless/iwlwifi/dvm/debugfs.c 2015-11-15 22:19:39.000000000 +0100
++++ backports-4.2.6-1/drivers/net/wireless/iwlwifi/dvm/debugfs.c 2016-01-27 12:26:21.289959656 +0100
+@@ -188,7 +188,7 @@
+ {
+ struct iwl_priv *priv = file->private_data;
+ char buf[64];
+- int buf_size;
++ size_t buf_size;
+ u32 offset, len;
+
+ memset(buf, 0, sizeof(buf));
+@@ -458,7 +458,7 @@
+ struct iwl_priv *priv = file->private_data;
+
+ char buf[8];
+- int buf_size;
++ size_t buf_size;
+ u32 reset_flag;
+
+ memset(buf, 0, sizeof(buf));
+@@ -539,7 +539,7 @@
+ {
+ struct iwl_priv *priv = file->private_data;
+ char buf[8];
+- int buf_size;
++ size_t buf_size;
+ int ht40;
+
+ memset(buf, 0, sizeof(buf));
+@@ -591,7 +591,7 @@
+ {
+ struct iwl_priv *priv = file->private_data;
+ char buf[8];
+- int buf_size;
++ size_t buf_size;
+ int value;
+
+ memset(buf, 0, sizeof(buf));
+@@ -683,10 +683,10 @@
+ DEBUGFS_READ_WRITE_FILE_OPS(sleep_level_override);
+ DEBUGFS_READ_FILE_OPS(current_sleep_command);
+
+-static const char *fmt_value = " %-30s %10u\n";
+-static const char *fmt_hex = " %-30s 0x%02X\n";
+-static const char *fmt_table = " %-30s %10u %10u %10u %10u\n";
+-static const char *fmt_header =
++static const char fmt_value[] = " %-30s %10u\n";
++static const char fmt_hex[] = " %-30s 0x%02X\n";
++static const char fmt_table[] = " %-30s %10u %10u %10u %10u\n";
++static const char fmt_header[] =
+ "%-32s current cumulative delta max\n";
+
+ static int iwl_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)
+@@ -1856,7 +1856,7 @@
+ {
+ struct iwl_priv *priv = file->private_data;
+ char buf[8];
+- int buf_size;
++ size_t buf_size;
+ int clear;
+
+ memset(buf, 0, sizeof(buf));
+@@ -1901,7 +1901,7 @@
+ {
+ struct iwl_priv *priv = file->private_data;
+ char buf[8];
+- int buf_size;
++ size_t buf_size;
+ int trace;
+
+ memset(buf, 0, sizeof(buf));
+@@ -1972,7 +1972,7 @@
+ {
+ struct iwl_priv *priv = file->private_data;
+ char buf[8];
+- int buf_size;
++ size_t buf_size;
+ int missed;
+
+ memset(buf, 0, sizeof(buf));
+@@ -2013,7 +2013,7 @@
+
+ struct iwl_priv *priv = file->private_data;
+ char buf[8];
+- int buf_size;
++ size_t buf_size;
+ int plcp;
+
+ memset(buf, 0, sizeof(buf));
+@@ -2073,7 +2073,7 @@
+
+ struct iwl_priv *priv = file->private_data;
+ char buf[8];
+- int buf_size;
++ size_t buf_size;
+ int flush;
+
+ memset(buf, 0, sizeof(buf));
+@@ -2163,7 +2163,7 @@
+
+ struct iwl_priv *priv = file->private_data;
+ char buf[8];
+- int buf_size;
++ size_t buf_size;
+ int rts;
+
+ if (!priv->cfg->ht_params)
+@@ -2204,7 +2204,7 @@
+ {
+ struct iwl_priv *priv = file->private_data;
+ char buf[8];
+- int buf_size;
++ size_t buf_size;
+
+ memset(buf, 0, sizeof(buf));
+ buf_size = min(count, sizeof(buf) - 1);
+@@ -2238,7 +2238,7 @@
+ struct iwl_priv *priv = file->private_data;
+ u32 event_log_flag;
+ char buf[8];
+- int buf_size;
++ size_t buf_size;
+
+ /* check that the interface is up */
+ if (!iwl_is_ready(priv))
+@@ -2292,7 +2292,7 @@
+ struct iwl_priv *priv = file->private_data;
+ char buf[8];
+ u32 calib_disabled;
+- int buf_size;
++ size_t buf_size;
+
+ memset(buf, 0, sizeof(buf));
+ buf_size = min(count, sizeof(buf) - 1);
+diff -Naur backports-4.2.6-1.org/drivers/net/wireless/iwlwifi/pcie/trans.c backports-4.2.6-1/drivers/net/wireless/iwlwifi/pcie/trans.c
+--- backports-4.2.6-1.org/drivers/net/wireless/iwlwifi/pcie/trans.c 2015-11-15 22:19:39.000000000 +0100
++++ backports-4.2.6-1/drivers/net/wireless/iwlwifi/pcie/trans.c 2016-01-27 12:26:21.289959656 +0100
+@@ -1950,7 +1950,7 @@
+ struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
+
+ char buf[8];
+- int buf_size;
++ size_t buf_size;
+ u32 reset_flag;
+
+ memset(buf, 0, sizeof(buf));
+@@ -1971,7 +1971,7 @@
+ {
+ struct iwl_trans *trans = file->private_data;
+ char buf[8];
+- int buf_size;
++ size_t buf_size;
+ int csr;
+
+ memset(buf, 0, sizeof(buf));
+diff -Naur backports-4.2.6-1.org/drivers/net/wireless/mac80211_hwsim.c backports-4.2.6-1/drivers/net/wireless/mac80211_hwsim.c
+--- backports-4.2.6-1.org/drivers/net/wireless/mac80211_hwsim.c 2015-11-15 22:19:39.000000000 +0100
++++ backports-4.2.6-1/drivers/net/wireless/mac80211_hwsim.c 2016-01-27 12:26:21.289959656 +0100
+@@ -3150,20 +3150,20 @@
+ if (channels < 1)
+ return -EINVAL;
+
+- mac80211_hwsim_mchan_ops = mac80211_hwsim_ops;
+- mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
+- mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
+- mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
+- mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
+- mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
+- mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
+- mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
+- mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
+- mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
+- mac80211_hwsim_mchan_ops.assign_vif_chanctx =
+- mac80211_hwsim_assign_vif_chanctx;
+- mac80211_hwsim_mchan_ops.unassign_vif_chanctx =
+- mac80211_hwsim_unassign_vif_chanctx;
++ pax_open_kernel();
++ memcpy((void *)&mac80211_hwsim_mchan_ops, &mac80211_hwsim_ops, sizeof mac80211_hwsim_mchan_ops);
++ *(void **)&mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
++ *(void **)&mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
++ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
++ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
++ *(void **)&mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
++ *(void **)&mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
++ *(void **)&mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
++ *(void **)&mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
++ *(void **)&mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
++ *(void **)&mac80211_hwsim_mchan_ops.assign_vif_chanctx = mac80211_hwsim_assign_vif_chanctx;
++ *(void **)&mac80211_hwsim_mchan_ops.unassign_vif_chanctx = mac80211_hwsim_unassign_vif_chanctx;
++ pax_close_kernel();
+
+ spin_lock_init(&hwsim_radio_lock);
+ INIT_LIST_HEAD(&hwsim_radios);
+diff -Naur backports-4.2.6-1.org/drivers/net/wireless/rndis_wlan.c backports-4.2.6-1/drivers/net/wireless/rndis_wlan.c
+--- backports-4.2.6-1.org/drivers/net/wireless/rndis_wlan.c 2015-11-15 22:19:39.000000000 +0100
++++ backports-4.2.6-1/drivers/net/wireless/rndis_wlan.c 2016-01-27 12:26:21.293292990 +0100
+@@ -1236,7 +1236,7 @@
+
+ netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
+
+- if (rts_threshold < 0 || rts_threshold > 2347)
++ if (rts_threshold > 2347)
+ rts_threshold = 2347;
+
+ tmp = cpu_to_le32(rts_threshold);
+diff -Naur backports-4.2.6-1.org/drivers/net/wireless/rt2x00/rt2x00.h backports-4.2.6-1/drivers/net/wireless/rt2x00/rt2x00.h
+--- backports-4.2.6-1.org/drivers/net/wireless/rt2x00/rt2x00.h 2015-11-15 22:19:39.000000000 +0100
++++ backports-4.2.6-1/drivers/net/wireless/rt2x00/rt2x00.h 2016-01-27 12:26:21.293292990 +0100
+@@ -375,7 +375,7 @@
+ * for hardware which doesn't support hardware
+ * sequence counting.
+ */
+- atomic_t seqno;
++ atomic_unchecked_t seqno;
+ };
+
+ static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
+diff -Naur backports-4.2.6-1.org/drivers/net/wireless/rt2x00/rt2x00queue.c backports-4.2.6-1/drivers/net/wireless/rt2x00/rt2x00queue.c
+--- backports-4.2.6-1.org/drivers/net/wireless/rt2x00/rt2x00queue.c 2015-11-15 22:19:39.000000000 +0100
++++ backports-4.2.6-1/drivers/net/wireless/rt2x00/rt2x00queue.c 2016-01-27 12:26:21.293292990 +0100
+@@ -224,9 +224,9 @@
+ * sequence counter given by mac80211.
+ */
+ if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags))
+- seqno = atomic_add_return(0x10, &intf->seqno);
++ seqno = atomic_add_return_unchecked(0x10, &intf->seqno);
+ else
+- seqno = atomic_read(&intf->seqno);
++ seqno = atomic_read_unchecked(&intf->seqno);
+
+ hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
+ hdr->seq_ctrl |= cpu_to_le16(seqno);
+diff -Naur backports-4.2.6-1.org/drivers/net/wireless/ti/wl1251/sdio.c backports-4.2.6-1/drivers/net/wireless/ti/wl1251/sdio.c
+--- backports-4.2.6-1.org/drivers/net/wireless/ti/wl1251/sdio.c 2015-11-15 22:19:39.000000000 +0100
++++ backports-4.2.6-1/drivers/net/wireless/ti/wl1251/sdio.c 2016-01-27 12:26:21.293292990 +0100
+@@ -282,13 +282,17 @@
+
+ irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
+
+- wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
+- wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
++ pax_open_kernel();
++ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
++ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
++ pax_close_kernel();
+
+ wl1251_info("using dedicated interrupt line");
+ } else {
+- wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
+- wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
++ pax_open_kernel();
++ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
++ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
++ pax_close_kernel();
+
+ wl1251_info("using SDIO interrupt");
+ }
+diff -Naur backports-4.2.6-1.org/drivers/net/wireless/ti/wl12xx/main.c backports-4.2.6-1/drivers/net/wireless/ti/wl12xx/main.c
+--- backports-4.2.6-1.org/drivers/net/wireless/ti/wl12xx/main.c 2015-11-15 22:19:39.000000000 +0100
++++ backports-4.2.6-1/drivers/net/wireless/ti/wl12xx/main.c 2016-01-27 12:26:21.293292990 +0100
+@@ -655,7 +655,9 @@
+ sizeof(wl->conf.mem));
+
+ /* read data preparation is only needed by wl127x */
+- wl->ops->prepare_read = wl127x_prepare_read;
++ pax_open_kernel();
++ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
++ pax_close_kernel();
+
+ wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
+ WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
+@@ -680,7 +682,9 @@
+ sizeof(wl->conf.mem));
+
+ /* read data preparation is only needed by wl127x */
+- wl->ops->prepare_read = wl127x_prepare_read;
++ pax_open_kernel();
++ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
++ pax_close_kernel();
+
+ wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
+ WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
+diff -Naur backports-4.2.6-1.org/drivers/net/wireless/ti/wl18xx/main.c backports-4.2.6-1/drivers/net/wireless/ti/wl18xx/main.c
+--- backports-4.2.6-1.org/drivers/net/wireless/ti/wl18xx/main.c 2015-11-15 22:19:39.000000000 +0100
++++ backports-4.2.6-1/drivers/net/wireless/ti/wl18xx/main.c 2016-01-27 12:26:21.293292990 +0100
+@@ -1952,8 +1952,10 @@
+ }
+
+ if (!checksum_param) {
+- wl18xx_ops.set_rx_csum = NULL;
+- wl18xx_ops.init_vif = NULL;
++ pax_open_kernel();
++ *(void **)&wl18xx_ops.set_rx_csum = NULL;
++ *(void **)&wl18xx_ops.init_vif = NULL;
++ pax_close_kernel();
+ }
+
+ /* Enable 11a Band only if we have 5G antennas */
+diff -Naur backports-4.2.6-1.org/drivers/net/wireless/zd1211rw/zd_usb.c backports-4.2.6-1/drivers/net/wireless/zd1211rw/zd_usb.c
+--- backports-4.2.6-1.org/drivers/net/wireless/zd1211rw/zd_usb.c 2015-11-15 22:19:39.000000000 +0100
++++ backports-4.2.6-1/drivers/net/wireless/zd1211rw/zd_usb.c 2016-01-27 12:26:21.293292990 +0100
+@@ -385,7 +385,7 @@
+ {
+ struct zd_usb *usb = urb->context;
+ struct zd_usb_interrupt *intr = &usb->intr;
+- int len;
++ unsigned int len;
+ u16 int_num;
+
+ ZD_ASSERT(in_interrupt());
+diff -Naur backports-4.2.6-1.org/drivers/nfc/nfcwilink.c backports-4.2.6-1/drivers/nfc/nfcwilink.c
+--- backports-4.2.6-1.org/drivers/nfc/nfcwilink.c 2015-11-15 22:19:39.000000000 +0100
++++ backports-4.2.6-1/drivers/nfc/nfcwilink.c 2016-01-27 12:26:21.293292990 +0100
+@@ -497,7 +497,7 @@
+
+ static int nfcwilink_probe(struct platform_device *pdev)
+ {
+- static struct nfcwilink *drv;
++ struct nfcwilink *drv;
+ int rc;
+ __u32 protocols;
+
+diff -Naur backports-4.2.6-1.org/include/linux/gracl_compat.h backports-4.2.6-1/include/linux/gracl_compat.h
+--- backports-4.2.6-1.org/include/linux/gracl_compat.h 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/include/linux/gracl_compat.h 2016-01-27 12:26:26.289959354 +0100
+@@ -0,0 +1,156 @@
++#ifndef GR_ACL_COMPAT_H
++#define GR_ACL_COMPAT_H
++
++#include <linux/resource.h>
++#include <asm/resource.h>
++
++struct sprole_pw_compat {
++ compat_uptr_t rolename;
++ unsigned char salt[GR_SALT_LEN];
++ unsigned char sum[GR_SHA_LEN];
++};
++
++struct gr_hash_struct_compat {
++ compat_uptr_t table;
++ compat_uptr_t nametable;
++ compat_uptr_t first;
++ __u32 table_size;
++ __u32 used_size;
++ int type;
++};
++
++struct acl_subject_label_compat {
++ compat_uptr_t filename;
++ compat_u64 inode;
++ __u32 device;
++ __u32 mode;
++ kernel_cap_t cap_mask;
++ kernel_cap_t cap_lower;
++ kernel_cap_t cap_invert_audit;
++
++ struct compat_rlimit res[GR_NLIMITS];
++ __u32 resmask;
++
++ __u8 user_trans_type;
++ __u8 group_trans_type;
++ compat_uptr_t user_transitions;
++ compat_uptr_t group_transitions;
++ __u16 user_trans_num;
++ __u16 group_trans_num;
++
++ __u32 sock_families[2];
++ __u32 ip_proto[8];
++ __u32 ip_type;
++ compat_uptr_t ips;
++ __u32 ip_num;
++ __u32 inaddr_any_override;
++
++ __u32 crashes;
++ compat_ulong_t expires;
++
++ compat_uptr_t parent_subject;
++ compat_uptr_t hash;
++ compat_uptr_t prev;
++ compat_uptr_t next;
++
++ compat_uptr_t obj_hash;
++ __u32 obj_hash_size;
++ __u16 pax_flags;
++};
++
++struct role_allowed_ip_compat {
++ __u32 addr;
++ __u32 netmask;
++
++ compat_uptr_t prev;
++ compat_uptr_t next;
++};
++
++struct role_transition_compat {
++ compat_uptr_t rolename;
++
++ compat_uptr_t prev;
++ compat_uptr_t next;
++};
++
++struct acl_role_label_compat {
++ compat_uptr_t rolename;
++ uid_t uidgid;
++ __u16 roletype;
++
++ __u16 auth_attempts;
++ compat_ulong_t expires;
++
++ compat_uptr_t root_label;
++ compat_uptr_t hash;
++
++ compat_uptr_t prev;
++ compat_uptr_t next;
++
++ compat_uptr_t transitions;
++ compat_uptr_t allowed_ips;
++ compat_uptr_t domain_children;
++ __u16 domain_child_num;
++
++ umode_t umask;
++
++ compat_uptr_t subj_hash;
++ __u32 subj_hash_size;
++};
++
++struct user_acl_role_db_compat {
++ compat_uptr_t r_table;
++ __u32 num_pointers;
++ __u32 num_roles;
++ __u32 num_domain_children;
++ __u32 num_subjects;
++ __u32 num_objects;
++};
++
++struct acl_object_label_compat {
++ compat_uptr_t filename;
++ compat_u64 inode;
++ __u32 device;
++ __u32 mode;
++
++ compat_uptr_t nested;
++ compat_uptr_t globbed;
++
++ compat_uptr_t prev;
++ compat_uptr_t next;
++};
++
++struct acl_ip_label_compat {
++ compat_uptr_t iface;
++ __u32 addr;
++ __u32 netmask;
++ __u16 low, high;
++ __u8 mode;
++ __u32 type;
++ __u32 proto[8];
++
++ compat_uptr_t prev;
++ compat_uptr_t next;
++};
++
++struct gr_arg_compat {
++ struct user_acl_role_db_compat role_db;
++ unsigned char pw[GR_PW_LEN];
++ unsigned char salt[GR_SALT_LEN];
++ unsigned char sum[GR_SHA_LEN];
++ unsigned char sp_role[GR_SPROLE_LEN];
++ compat_uptr_t sprole_pws;
++ __u32 segv_device;
++ compat_u64 segv_inode;
++ uid_t segv_uid;
++ __u16 num_sprole_pws;
++ __u16 mode;
++};
++
++struct gr_arg_wrapper_compat {
++ compat_uptr_t arg;
++ __u32 version;
++ __u32 size;
++};
++
++#endif
+diff -Naur backports-4.2.6-1.org/include/linux/gracl.h backports-4.2.6-1/include/linux/gracl.h
+--- backports-4.2.6-1.org/include/linux/gracl.h 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/include/linux/gracl.h 2016-01-27 12:26:26.289959354 +0100
+@@ -0,0 +1,342 @@
++#ifndef GR_ACL_H
++#define GR_ACL_H
++
++#include <linux/grdefs.h>
++#include <linux/resource.h>
++#include <linux/capability.h>
++#include <linux/dcache.h>
++#include <asm/resource.h>
++
++/* Major status information */
++
++#define GR_VERSION "grsecurity 3.1"
++#define GRSECURITY_VERSION 0x3100
++
++enum {
++ GR_SHUTDOWN = 0,
++ GR_ENABLE = 1,
++ GR_SPROLE = 2,
++ GR_OLDRELOAD = 3,
++ GR_SEGVMOD = 4,
++ GR_STATUS = 5,
++ GR_UNSPROLE = 6,
++ GR_PASSSET = 7,
++ GR_SPROLEPAM = 8,
++ GR_RELOAD = 9,
++};
++
++/* Password setup definitions
++ * kernel/grhash.c */
++enum {
++ GR_PW_LEN = 128,
++ GR_SALT_LEN = 16,
++ GR_SHA_LEN = 32,
++};
++
++enum {
++ GR_SPROLE_LEN = 64,
++};
++
++enum {
++ GR_NO_GLOB = 0,
++ GR_REG_GLOB,
++ GR_CREATE_GLOB
++};
++
++#define GR_NLIMITS 32
++
++/* Begin Data Structures */
++
++struct sprole_pw {
++ unsigned char *rolename;
++ unsigned char salt[GR_SALT_LEN];
++ unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
++};
++
++struct name_entry {
++ __u32 key;
++ u64 inode;
++ dev_t device;
++ char *name;
++ __u16 len;
++ __u8 deleted;
++ struct name_entry *prev;
++ struct name_entry *next;
++};
++
++struct inodev_entry {
++ struct name_entry *nentry;
++ struct inodev_entry *prev;
++ struct inodev_entry *next;
++};
++
++struct acl_role_db {
++ struct acl_role_label **r_hash;
++ __u32 r_size;
++};
++
++struct inodev_db {
++ struct inodev_entry **i_hash;
++ __u32 i_size;
++};
++
++struct name_db {
++ struct name_entry **n_hash;
++ __u32 n_size;
++};
++
++struct crash_uid {
++ uid_t uid;
++ unsigned long expires;
++};
++
++struct gr_hash_struct {
++ void **table;
++ void **nametable;
++ void *first;
++ __u32 table_size;
++ __u32 used_size;
++ int type;
++};
++
++/* Userspace Grsecurity ACL data structures */
++
++struct acl_subject_label {
++ char *filename;
++ u64 inode;
++ dev_t device;
++ __u32 mode;
++ kernel_cap_t cap_mask;
++ kernel_cap_t cap_lower;
++ kernel_cap_t cap_invert_audit;
++
++ struct rlimit res[GR_NLIMITS];
++ __u32 resmask;
++
++ __u8 user_trans_type;
++ __u8 group_trans_type;
++ uid_t *user_transitions;
++ gid_t *group_transitions;
++ __u16 user_trans_num;
++ __u16 group_trans_num;
++
++ __u32 sock_families[2];
++ __u32 ip_proto[8];
++ __u32 ip_type;
++ struct acl_ip_label **ips;
++ __u32 ip_num;
++ __u32 inaddr_any_override;
++
++ __u32 crashes;
++ unsigned long expires;
++
++ struct acl_subject_label *parent_subject;
++ struct gr_hash_struct *hash;
++ struct acl_subject_label *prev;
++ struct acl_subject_label *next;
++
++ struct acl_object_label **obj_hash;
++ __u32 obj_hash_size;
++ __u16 pax_flags;
++};
++
++struct role_allowed_ip {
++ __u32 addr;
++ __u32 netmask;
++
++ struct role_allowed_ip *prev;
++ struct role_allowed_ip *next;
++};
++
++struct role_transition {
++ char *rolename;
++
++ struct role_transition *prev;
++ struct role_transition *next;
++};
++
++struct acl_role_label {
++ char *rolename;
++ uid_t uidgid;
++ __u16 roletype;
++
++ __u16 auth_attempts;
++ unsigned long expires;
++
++ struct acl_subject_label *root_label;
++ struct gr_hash_struct *hash;
++
++ struct acl_role_label *prev;
++ struct acl_role_label *next;
++
++ struct role_transition *transitions;
++ struct role_allowed_ip *allowed_ips;
++ uid_t *domain_children;
++ __u16 domain_child_num;
++
++ umode_t umask;
++
++ struct acl_subject_label **subj_hash;
++ __u32 subj_hash_size;
++};
++
++struct user_acl_role_db {
++ struct acl_role_label **r_table;
++ __u32 num_pointers; /* Number of allocations to track */
++ __u32 num_roles; /* Number of roles */
++ __u32 num_domain_children; /* Number of domain children */
++ __u32 num_subjects; /* Number of subjects */
++ __u32 num_objects; /* Number of objects */
++};
++
++struct acl_object_label {
++ char *filename;
++ u64 inode;
++ dev_t device;
++ __u32 mode;
++
++ struct acl_subject_label *nested;
++ struct acl_object_label *globbed;
++
++ /* next two structures not used */
++
++ struct acl_object_label *prev;
++ struct acl_object_label *next;
++};
++
++struct acl_ip_label {
++ char *iface;
++ __u32 addr;
++ __u32 netmask;
++ __u16 low, high;
++ __u8 mode;
++ __u32 type;
++ __u32 proto[8];
++
++ /* next two structures not used */
++
++ struct acl_ip_label *prev;
++ struct acl_ip_label *next;
++};
++
++struct gr_arg {
++ struct user_acl_role_db role_db;
++ unsigned char pw[GR_PW_LEN];
++ unsigned char salt[GR_SALT_LEN];
++ unsigned char sum[GR_SHA_LEN];
++ unsigned char sp_role[GR_SPROLE_LEN];
++ struct sprole_pw *sprole_pws;
++ dev_t segv_device;
++ u64 segv_inode;
++ uid_t segv_uid;
++ __u16 num_sprole_pws;
++ __u16 mode;
++};
++
++struct gr_arg_wrapper {
++ struct gr_arg *arg;
++ __u32 version;
++ __u32 size;
++};
++
++struct subject_map {
++ struct acl_subject_label *user;
++ struct acl_subject_label *kernel;
++ struct subject_map *prev;
++ struct subject_map *next;
++};
++
++struct acl_subj_map_db {
++ struct subject_map **s_hash;
++ __u32 s_size;
++};
++
++struct gr_policy_state {
++ struct sprole_pw **acl_special_roles;
++ __u16 num_sprole_pws;
++ struct acl_role_label *kernel_role;
++ struct acl_role_label *role_list;
++ struct acl_role_label *default_role;
++ struct acl_role_db acl_role_set;
++ struct acl_subj_map_db subj_map_set;
++ struct name_db name_set;
++ struct inodev_db inodev_set;
++};
++
++struct gr_alloc_state {
++ unsigned long alloc_stack_next;
++ unsigned long alloc_stack_size;
++ void **alloc_stack;
++};
++
++struct gr_reload_state {
++ struct gr_policy_state oldpolicy;
++ struct gr_alloc_state oldalloc;
++ struct gr_policy_state newpolicy;
++ struct gr_alloc_state newalloc;
++ struct gr_policy_state *oldpolicy_ptr;
++ struct gr_alloc_state *oldalloc_ptr;
++ unsigned char oldmode;
++};
++
++/* End Data Structures Section */
++
++/* Hash functions generated by empirical testing by Brad Spengler
++ Makes good use of the low bits of the inode. Generally 0-1 times
++ in loop for successful match. 0-3 for unsuccessful match.
++ Shift/add algorithm with modulus of table size and an XOR*/
++
++static __inline__ unsigned int
++gr_rhash(const uid_t uid, const __u16 type, const unsigned int sz)
++{
++ return ((((uid + type) << (16 + type)) ^ uid) % sz);
++}
++
++ static __inline__ unsigned int
++gr_shash(const struct acl_subject_label *userp, const unsigned int sz)
++{
++ return ((const unsigned long)userp % sz);
++}
++
++static __inline__ unsigned int
++gr_fhash(const u64 ino, const dev_t dev, const unsigned int sz)
++{
++ unsigned int rem;
++ div_u64_rem((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9)), sz, &rem);
++ return rem;
++}
++
++static __inline__ unsigned int
++gr_nhash(const char *name, const __u16 len, const unsigned int sz)
++{
++ return full_name_hash((const unsigned char *)name, len) % sz;
++}
++
++#define FOR_EACH_SUBJECT_START(role,subj,iter) \
++ subj = NULL; \
++ iter = 0; \
++ while (iter < role->subj_hash_size) { \
++ if (subj == NULL) \
++ subj = role->subj_hash[iter]; \
++ if (subj == NULL) { \
++ iter++; \
++ continue; \
++ }
++
++#define FOR_EACH_SUBJECT_END(subj,iter) \
++ subj = subj->next; \
++ if (subj == NULL) \
++ iter++; \
++ }
++
++
++#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
++ subj = role->hash->first; \
++ while (subj != NULL) {
++
++#define FOR_EACH_NESTED_SUBJECT_END(subj) \
++ subj = subj->next; \
++ }
++
++#endif
++
+diff -Naur backports-4.2.6-1.org/include/linux/gralloc.h backports-4.2.6-1/include/linux/gralloc.h
+--- backports-4.2.6-1.org/include/linux/gralloc.h 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/include/linux/gralloc.h 2016-01-27 12:26:26.289959354 +0100
+@@ -0,0 +1,9 @@
++#ifndef __GRALLOC_H
++#define __GRALLOC_H
++
++void acl_free_all(void);
++int acl_alloc_stack_init(unsigned long size);
++void *acl_alloc(unsigned long len);
++void *acl_alloc_num(unsigned long num, unsigned long len);
++
++#endif
+diff -Naur backports-4.2.6-1.org/include/linux/grdefs.h backports-4.2.6-1/include/linux/grdefs.h
+--- backports-4.2.6-1.org/include/linux/grdefs.h 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/include/linux/grdefs.h 2016-01-27 12:26:26.289959354 +0100
+@@ -0,0 +1,140 @@
++#ifndef GRDEFS_H
++#define GRDEFS_H
++
++/* Begin grsecurity status declarations */
++
++enum {
++ GR_READY = 0x01,
++ GR_STATUS_INIT = 0x00 // disabled state
++};
++
++/* Begin ACL declarations */
++
++/* Role flags */
++
++enum {
++ GR_ROLE_USER = 0x0001,
++ GR_ROLE_GROUP = 0x0002,
++ GR_ROLE_DEFAULT = 0x0004,
++ GR_ROLE_SPECIAL = 0x0008,
++ GR_ROLE_AUTH = 0x0010,
++ GR_ROLE_NOPW = 0x0020,
++ GR_ROLE_GOD = 0x0040,
++ GR_ROLE_LEARN = 0x0080,
++ GR_ROLE_TPE = 0x0100,
++ GR_ROLE_DOMAIN = 0x0200,
++ GR_ROLE_PAM = 0x0400,
++ GR_ROLE_PERSIST = 0x0800
++};
++
++/* ACL Subject and Object mode flags */
++enum {
++ GR_DELETED = 0x80000000
++};
++
++/* ACL Object-only mode flags */
++enum {
++ GR_READ = 0x00000001,
++ GR_APPEND = 0x00000002,
++ GR_WRITE = 0x00000004,
++ GR_EXEC = 0x00000008,
++ GR_FIND = 0x00000010,
++ GR_INHERIT = 0x00000020,
++ GR_SETID = 0x00000040,
++ GR_CREATE = 0x00000080,
++ GR_DELETE = 0x00000100,
++ GR_LINK = 0x00000200,
++ GR_AUDIT_READ = 0x00000400,
++ GR_AUDIT_APPEND = 0x00000800,
++ GR_AUDIT_WRITE = 0x00001000,
++ GR_AUDIT_EXEC = 0x00002000,
++ GR_AUDIT_FIND = 0x00004000,
++ GR_AUDIT_INHERIT= 0x00008000,
++ GR_AUDIT_SETID = 0x00010000,
++ GR_AUDIT_CREATE = 0x00020000,
++ GR_AUDIT_DELETE = 0x00040000,
++ GR_AUDIT_LINK = 0x00080000,
++ GR_PTRACERD = 0x00100000,
++ GR_NOPTRACE = 0x00200000,
++ GR_SUPPRESS = 0x00400000,
++ GR_NOLEARN = 0x00800000,
++ GR_INIT_TRANSFER= 0x01000000
++};
++
++#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
++ GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
++ GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
++
++/* ACL subject-only mode flags */
++enum {
++ GR_KILL = 0x00000001,
++ GR_VIEW = 0x00000002,
++ GR_PROTECTED = 0x00000004,
++ GR_LEARN = 0x00000008,
++ GR_OVERRIDE = 0x00000010,
++ /* just a placeholder, this mode is only used in userspace */
++ GR_DUMMY = 0x00000020,
++ GR_PROTSHM = 0x00000040,
++ GR_KILLPROC = 0x00000080,
++ GR_KILLIPPROC = 0x00000100,
++ /* just a placeholder, this mode is only used in userspace */
++ GR_NOTROJAN = 0x00000200,
++ GR_PROTPROCFD = 0x00000400,
++ GR_PROCACCT = 0x00000800,
++ GR_RELAXPTRACE = 0x00001000,
++ //GR_NESTED = 0x00002000,
++ GR_INHERITLEARN = 0x00004000,
++ GR_PROCFIND = 0x00008000,
++ GR_POVERRIDE = 0x00010000,
++ GR_KERNELAUTH = 0x00020000,
++ GR_ATSECURE = 0x00040000,
++ GR_SHMEXEC = 0x00080000
++};
++
++enum {
++ GR_PAX_ENABLE_SEGMEXEC = 0x0001,
++ GR_PAX_ENABLE_PAGEEXEC = 0x0002,
++ GR_PAX_ENABLE_MPROTECT = 0x0004,
++ GR_PAX_ENABLE_RANDMMAP = 0x0008,
++ GR_PAX_ENABLE_EMUTRAMP = 0x0010,
++ GR_PAX_DISABLE_SEGMEXEC = 0x0100,
++ GR_PAX_DISABLE_PAGEEXEC = 0x0200,
++ GR_PAX_DISABLE_MPROTECT = 0x0400,
++ GR_PAX_DISABLE_RANDMMAP = 0x0800,
++ GR_PAX_DISABLE_EMUTRAMP = 0x1000,
++};
++
++enum {
++ GR_ID_USER = 0x01,
++ GR_ID_GROUP = 0x02,
++};
++
++enum {
++ GR_ID_ALLOW = 0x01,
++ GR_ID_DENY = 0x02,
++};
++
++#define GR_CRASH_RES 31
++#define GR_UIDTABLE_MAX 500
++
++/* begin resource learning section */
++enum {
++ GR_RLIM_CPU_BUMP = 60,
++ GR_RLIM_FSIZE_BUMP = 50000,
++ GR_RLIM_DATA_BUMP = 10000,
++ GR_RLIM_STACK_BUMP = 1000,
++ GR_RLIM_CORE_BUMP = 10000,
++ GR_RLIM_RSS_BUMP = 500000,
++ GR_RLIM_NPROC_BUMP = 1,
++ GR_RLIM_NOFILE_BUMP = 5,
++ GR_RLIM_MEMLOCK_BUMP = 50000,
++ GR_RLIM_AS_BUMP = 500000,
++ GR_RLIM_LOCKS_BUMP = 2,
++ GR_RLIM_SIGPENDING_BUMP = 5,
++ GR_RLIM_MSGQUEUE_BUMP = 10000,
++ GR_RLIM_NICE_BUMP = 1,
++ GR_RLIM_RTPRIO_BUMP = 1,
++ GR_RLIM_RTTIME_BUMP = 1000000
++};
++
++#endif
+diff -Naur backports-4.2.6-1.org/include/linux/grinternal.h backports-4.2.6-1/include/linux/grinternal.h
+--- backports-4.2.6-1.org/include/linux/grinternal.h 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/include/linux/grinternal.h 2016-01-27 12:26:26.289959354 +0100
+@@ -0,0 +1,230 @@
++#ifndef __GRINTERNAL_H
++#define __GRINTERNAL_H
++
++#ifdef CONFIG_GRKERNSEC
++
++#include <linux/fs.h>
++#include <linux/mnt_namespace.h>
++#include <linux/nsproxy.h>
++#include <linux/gracl.h>
++#include <linux/grdefs.h>
++#include <linux/grmsg.h>
++
++void gr_add_learn_entry(const char *fmt, ...)
++ __attribute__ ((format (printf, 1, 2)));
++__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
++ const struct vfsmount *mnt);
++__u32 gr_check_create(const struct dentry *new_dentry,
++ const struct dentry *parent,
++ const struct vfsmount *mnt, const __u32 mode);
++int gr_check_protected_task(const struct task_struct *task);
++__u32 to_gr_audit(const __u32 reqmode);
++int gr_set_acls(const int type);
++int gr_acl_is_enabled(void);
++char gr_roletype_to_char(void);
++
++void gr_handle_alertkill(struct task_struct *task);
++char *gr_to_filename(const struct dentry *dentry,
++ const struct vfsmount *mnt);
++char *gr_to_filename1(const struct dentry *dentry,
++ const struct vfsmount *mnt);
++char *gr_to_filename2(const struct dentry *dentry,
++ const struct vfsmount *mnt);
++char *gr_to_filename3(const struct dentry *dentry,
++ const struct vfsmount *mnt);
++
++extern int grsec_enable_ptrace_readexec;
++extern int grsec_enable_harden_ptrace;
++extern int grsec_enable_link;
++extern int grsec_enable_fifo;
++extern int grsec_enable_execve;
++extern int grsec_enable_shm;
++extern int grsec_enable_execlog;
++extern int grsec_enable_signal;
++extern int grsec_enable_audit_ptrace;
++extern int grsec_enable_forkfail;
++extern int grsec_enable_time;
++extern int grsec_enable_rofs;
++extern int grsec_deny_new_usb;
++extern int grsec_enable_chroot_shmat;
++extern int grsec_enable_chroot_mount;
++extern int grsec_enable_chroot_double;
++extern int grsec_enable_chroot_pivot;
++extern int grsec_enable_chroot_chdir;
++extern int grsec_enable_chroot_chmod;
++extern int grsec_enable_chroot_mknod;
++extern int grsec_enable_chroot_fchdir;
++extern int grsec_enable_chroot_nice;
++extern int grsec_enable_chroot_execlog;
++extern int grsec_enable_chroot_caps;
++extern int grsec_enable_chroot_rename;
++extern int grsec_enable_chroot_sysctl;
++extern int grsec_enable_chroot_unix;
++extern int grsec_enable_symlinkown;
++extern kgid_t grsec_symlinkown_gid;
++extern int grsec_enable_tpe;
++extern kgid_t grsec_tpe_gid;
++extern int grsec_enable_tpe_all;
++extern int grsec_enable_tpe_invert;
++extern int grsec_enable_socket_all;
++extern kgid_t grsec_socket_all_gid;
++extern int grsec_enable_socket_client;
++extern kgid_t grsec_socket_client_gid;
++extern int grsec_enable_socket_server;
++extern kgid_t grsec_socket_server_gid;
++extern kgid_t grsec_audit_gid;
++extern int grsec_enable_group;
++extern int grsec_enable_log_rwxmaps;
++extern int grsec_enable_mount;
++extern int grsec_enable_chdir;
++extern int grsec_resource_logging;
++extern int grsec_enable_blackhole;
++extern int grsec_lastack_retries;
++extern int grsec_enable_brute;
++extern int grsec_enable_harden_ipc;
++extern int grsec_lock;
++
++extern spinlock_t grsec_alert_lock;
++extern unsigned long grsec_alert_wtime;
++extern unsigned long grsec_alert_fyet;
++
++extern spinlock_t grsec_audit_lock;
++
++extern rwlock_t grsec_exec_file_lock;
++
++#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
++ gr_to_filename2((tsk)->exec_file->f_path.dentry, \
++ (tsk)->exec_file->f_path.mnt) : "/")
++
++#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
++ gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
++ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
++
++#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
++ gr_to_filename((tsk)->exec_file->f_path.dentry, \
++ (tsk)->exec_file->f_path.mnt) : "/")
++
++#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
++ gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
++ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
++
++#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
++
++#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
++
++static inline bool gr_is_same_file(const struct file *file1, const struct file *file2)
++{
++ if (file1 && file2) {
++ const struct inode *inode1 = file1->f_path.dentry->d_inode;
++ const struct inode *inode2 = file2->f_path.dentry->d_inode;
++ if (inode1->i_ino == inode2->i_ino && inode1->i_sb->s_dev == inode2->i_sb->s_dev)
++ return true;
++ }
++
++ return false;
++}
++
++#define GR_CHROOT_CAPS {{ \
++ CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
++ CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
++ CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
++ CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
++ CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
++ CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
++ CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
++
++#define security_learn(normal_msg,args...) \
++({ \
++ read_lock(&grsec_exec_file_lock); \
++ gr_add_learn_entry(normal_msg "\n", ## args); \
++ read_unlock(&grsec_exec_file_lock); \
++})
++
++enum {
++ GR_DO_AUDIT,
++ GR_DONT_AUDIT,
++ /* used for non-audit messages that we shouldn't kill the task on */
++ GR_DONT_AUDIT_GOOD
++};
++
++enum {
++ GR_TTYSNIFF,
++ GR_RBAC,
++ GR_RBAC_STR,
++ GR_STR_RBAC,
++ GR_RBAC_MODE2,
++ GR_RBAC_MODE3,
++ GR_FILENAME,
++ GR_SYSCTL_HIDDEN,
++ GR_NOARGS,
++ GR_ONE_INT,
++ GR_ONE_INT_TWO_STR,
++ GR_ONE_STR,
++ GR_STR_INT,
++ GR_TWO_STR_INT,
++ GR_TWO_INT,
++ GR_TWO_U64,
++ GR_THREE_INT,
++ GR_FIVE_INT_TWO_STR,
++ GR_TWO_STR,
++ GR_THREE_STR,
++ GR_FOUR_STR,
++ GR_STR_FILENAME,
++ GR_FILENAME_STR,
++ GR_FILENAME_TWO_INT,
++ GR_FILENAME_TWO_INT_STR,
++ GR_TEXTREL,
++ GR_PTRACE,
++ GR_RESOURCE,
++ GR_CAP,
++ GR_SIG,
++ GR_SIG2,
++ GR_CRASH1,
++ GR_CRASH2,
++ GR_PSACCT,
++ GR_RWXMAP,
++ GR_RWXMAPVMA
++};
++
++#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
++#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
++#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
++#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
++#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
++#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
++#define gr_log_fs_rbac_mode3(audit, msg, dentry, mnt, str1, str2, str3) gr_log_varargs(audit, msg, GR_RBAC_MODE3, dentry, mnt, str1, str2, str3)
++#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
++#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
++#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
++#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
++#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
++#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
++#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
++#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
++#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
++#define gr_log_int5_str2(audit, msg, num1, num2, str1, str2) gr_log_varargs(audit, msg, GR_FIVE_INT_TWO_STR, num1, num2, str1, str2)
++#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
++#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
++#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
++#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
++#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
++#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
++#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
++#define gr_log_fs_int2_str(audit, msg, dentry, mnt, num1, num2, str) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT_STR, dentry, mnt, num1, num2, str)
++#define gr_log_textrel_ulong_ulong(audit, msg, str, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, str, file, ulong1, ulong2)
++#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
++#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
++#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
++#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
++#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
++#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
++#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
++#define gr_log_procacct(audit, msg, task, num1, num2, num3, num4, num5, num6, num7, num8, num9) gr_log_varargs(audit, msg, GR_PSACCT, task, num1, num2, num3, num4, num5, num6, num7, num8, num9)
++#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
++#define gr_log_rwxmap_vma(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAPVMA, str)
++
++void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
++
++#endif
++
++#endif
+diff -Naur backports-4.2.6-1.org/include/linux/grmsg.h backports-4.2.6-1/include/linux/grmsg.h
+--- backports-4.2.6-1.org/include/linux/grmsg.h 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/include/linux/grmsg.h 2016-01-27 12:26:26.289959354 +0100
+@@ -0,0 +1,118 @@
++#define DEFAULTSECMSG "%.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u, parent %.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u"
++#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u run time:[%ud %uh %um %us] cpu time:[%ud %uh %um %us] %s with exit code %ld, parent %.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u"
++#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
++#define GR_STOPMOD_MSG "denied modification of module state by "
++#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
++#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
++#define GR_IOPERM_MSG "denied use of ioperm() by "
++#define GR_IOPL_MSG "denied use of iopl() by "
++#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
++#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
++#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
++#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
++#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
++#define GR_LEARN_AUDIT_MSG "%s\t%u\t%u\t%u\t%.4095s\t%.4095s\t%lu\t%lu\t%.4095s\t%lu\t%pI4"
++#define GR_ID_LEARN_MSG "%s\t%u\t%u\t%u\t%.4095s\t%.4095s\t%c\t%d\t%d\t%d\t%pI4"
++#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
++#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
++#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
++#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
++#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
++#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
++#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
++#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
++#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
++#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
++#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
++#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
++#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
++#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
++#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
++#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
++#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
++#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
++#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
++#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
++#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
++#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
++#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
++#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
++#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
++#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
++#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
++#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
++#define GR_CHROOT_RENAME_MSG "denied bad rename of %.950s out of a chroot by "
++#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
++#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
++#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
++#define GR_CHROOT_FHANDLE_MSG "denied use of file handles inside chroot by "
++#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
++#define GR_SETXATTR_ACL_MSG "%s setting extended attribute of %.950s by "
++#define GR_REMOVEXATTR_ACL_MSG "%s removing extended attribute of %.950s by "
++#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
++#define GR_INITF_ACL_MSG "init_variables() failed %s by "
++#define GR_DISABLED_ACL_MSG "Error loading %s, trying to run kernel with acls disabled. To disable acls at startup use <kernel image name> gracl=off from your boot loader"
++#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbage by "
++#define GR_SHUTS_ACL_MSG "shutdown auth success for "
++#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
++#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
++#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
++#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
++#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
++#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
++#define GR_ENABLEF_ACL_MSG "unable to load %s for "
++#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
++#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
++#define GR_RELOADF_ACL_MSG "failed reload of %s for "
++#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
++#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
++#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
++#define GR_SPROLEF_ACL_MSG "special role %s failure for "
++#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
++#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
++#define GR_INVMODE_ACL_MSG "invalid mode %d by "
++#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
++#define GR_FAILFORK_MSG "failed fork with errno %s by "
++#define GR_NICE_CHROOT_MSG "denied priority change by "
++#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
++#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
++#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
++#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
++#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
++#define GR_TIME_MSG "time set by "
++#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
++#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
++#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
++#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
++#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
++#define GR_BIND_MSG "denied bind() by "
++#define GR_CONNECT_MSG "denied connect() by "
++#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
++#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
++#define GR_IP_LEARN_MSG "%s\t%u\t%u\t%u\t%.4095s\t%.4095s\t%pI4\t%u\t%u\t%u\t%u\t%pI4"
++#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
++#define GR_CAP_ACL_MSG "use of %s denied for "
++#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
++#define GR_CAP_ACL_MSG2 "use of %s permitted for "
++#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
++#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
++#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
++#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
++#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
++#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
++#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
++#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
++#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
++#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
++#define GR_TEXTREL_AUDIT_MSG "allowed %s text relocation transition in %.950s, VMA:0x%08lx 0x%08lx by "
++#define GR_PTGNUSTACK_MSG "denied marking stack executable as requested by PT_GNU_STACK marking in %.950s by "
++#define GR_VM86_MSG "denied use of vm86 by "
++#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
++#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
++#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
++#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
++#define GR_SYMLINKOWNER_MSG "denied following symlink %.950s since symlink owner %u does not match target owner %u, by "
++#define GR_BRUTE_DAEMON_MSG "bruteforce prevention initiated for the next 30 minutes or until service restarted, stalling each fork 30 seconds. Please investigate the crash report for "
++#define GR_BRUTE_SUID_MSG "bruteforce prevention initiated due to crash of %.950s against uid %u, banning suid/sgid execs for %u minutes. Please investigate the crash report for "
++#define GR_IPC_DENIED_MSG "denied %s of overly-permissive IPC object with creator uid %u by "
++#define GR_MSRWRITE_MSG "denied write to CPU MSR by "
+diff -Naur backports-4.2.6-1.org/include/linux/grsecurity.h backports-4.2.6-1/include/linux/grsecurity.h
+--- backports-4.2.6-1.org/include/linux/grsecurity.h 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/include/linux/grsecurity.h 2016-01-27 12:26:26.289959354 +0100
+@@ -0,0 +1,255 @@
++#ifndef GR_SECURITY_H
++#define GR_SECURITY_H
++#include <linux/fs.h>
++#include <linux/fs_struct.h>
++#include <linux/binfmts.h>
++#include <linux/gracl.h>
++
++/* notify of brain-dead configs */
++#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_GRKERNSEC_KMEM)
++#error "CONFIG_DEBUG_FS being enabled is a security risk when CONFIG_GRKERNSEC_KMEM is enabled"
++#endif
++#if defined(CONFIG_PROC_PAGE_MONITOR) && defined(CONFIG_GRKERNSEC)
++#error "CONFIG_PROC_PAGE_MONITOR is a security risk"
++#endif
++#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
++#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
++#endif
++#if defined(CONFIG_GRKERNSEC_PROC) && !defined(CONFIG_GRKERNSEC_PROC_USER) && !defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
++#error "CONFIG_GRKERNSEC_PROC enabled, but neither CONFIG_GRKERNSEC_PROC_USER nor CONFIG_GRKERNSEC_PROC_USERGROUP enabled"
++#endif
++#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
++#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
++#endif
++#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
++#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
++#endif
++#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
++#error "CONFIG_PAX enabled, but no PaX options are enabled."
++#endif
++
++int gr_handle_new_usb(void);
++
++void gr_handle_brute_attach(int dumpable);
++void gr_handle_brute_check(void);
++void gr_handle_kernel_exploit(void);
++
++char gr_roletype_to_char(void);
++
++int gr_proc_is_restricted(void);
++
++int gr_acl_enable_at_secure(void);
++
++int gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs);
++int gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs);
++
++int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap);
++
++void gr_del_task_from_ip_table(struct task_struct *p);
++
++int gr_pid_is_chrooted(struct task_struct *p);
++int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
++int gr_handle_chroot_nice(void);
++int gr_handle_chroot_sysctl(const int op);
++int gr_handle_chroot_setpriority(struct task_struct *p,
++ const int niceval);
++int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
++int gr_chroot_fhandle(void);
++int gr_handle_chroot_chroot(const struct dentry *dentry,
++ const struct vfsmount *mnt);
++void gr_handle_chroot_chdir(const struct path *path);
++int gr_handle_chroot_chmod(const struct dentry *dentry,
++ const struct vfsmount *mnt, const int mode);
++int gr_handle_chroot_mknod(const struct dentry *dentry,
++ const struct vfsmount *mnt, const int mode);
++int gr_handle_chroot_mount(const struct dentry *dentry,
++ const struct vfsmount *mnt,
++ const char *dev_name);
++int gr_handle_chroot_pivot(void);
++int gr_handle_chroot_unix(const pid_t pid);
++
++int gr_handle_rawio(const struct inode *inode);
++
++void gr_handle_ioperm(void);
++void gr_handle_iopl(void);
++void gr_handle_msr_write(void);
++
++umode_t gr_acl_umask(void);
++
++int gr_tpe_allow(const struct file *file);
++
++void gr_set_chroot_entries(struct task_struct *task, const struct path *path);
++void gr_clear_chroot_entries(struct task_struct *task);
++
++void gr_log_forkfail(const int retval);
++void gr_log_timechange(void);
++void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
++void gr_log_chdir(const struct dentry *dentry,
++ const struct vfsmount *mnt);
++void gr_log_chroot_exec(const struct dentry *dentry,
++ const struct vfsmount *mnt);
++void gr_log_remount(const char *devname, const int retval);
++void gr_log_unmount(const char *devname, const int retval);
++void gr_log_mount(const char *from, struct path *to, const int retval);
++void gr_log_textrel(struct vm_area_struct *vma, bool is_textrel_rw);
++void gr_log_ptgnustack(struct file *file);
++void gr_log_rwxmmap(struct file *file);
++void gr_log_rwxmprotect(struct vm_area_struct *vma);
++
++int gr_handle_follow_link(const struct dentry *dentry,
++ const struct vfsmount *mnt);
++int gr_handle_fifo(const struct dentry *dentry,
++ const struct vfsmount *mnt,
++ const struct dentry *dir, const int flag,
++ const int acc_mode);
++int gr_handle_hardlink(const struct dentry *dentry,
++ const struct vfsmount *mnt,
++ const struct filename *to);
++
++int gr_is_capable(const int cap);
++int gr_is_capable_nolog(const int cap);
++int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
++int gr_task_is_capable_nolog(const struct task_struct *task, const int cap);
++
++void gr_copy_label(struct task_struct *tsk);
++void gr_handle_crash(struct task_struct *task, const int sig);
++int gr_handle_signal(const struct task_struct *p, const int sig);
++int gr_check_crash_uid(const kuid_t uid);
++int gr_check_protected_task(const struct task_struct *task);
++int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
++int gr_acl_handle_mmap(const struct file *file,
++ const unsigned long prot);
++int gr_acl_handle_mprotect(const struct file *file,
++ const unsigned long prot);
++int gr_check_hidden_task(const struct task_struct *tsk);
++__u32 gr_acl_handle_truncate(const struct dentry *dentry,
++ const struct vfsmount *mnt);
++__u32 gr_acl_handle_utime(const struct dentry *dentry,
++ const struct vfsmount *mnt);
++__u32 gr_acl_handle_access(const struct dentry *dentry,
++ const struct vfsmount *mnt, const int fmode);
++__u32 gr_acl_handle_chmod(const struct dentry *dentry,
++ const struct vfsmount *mnt, umode_t *mode);
++__u32 gr_acl_handle_chown(const struct dentry *dentry,
++ const struct vfsmount *mnt);
++__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
++ const struct vfsmount *mnt);
++__u32 gr_acl_handle_removexattr(const struct dentry *dentry,
++ const struct vfsmount *mnt);
++int gr_handle_ptrace(struct task_struct *task, const long request);
++int gr_handle_proc_ptrace(struct task_struct *task);
++__u32 gr_acl_handle_execve(const struct dentry *dentry,
++ const struct vfsmount *mnt);
++int gr_check_crash_exec(const struct file *filp);
++int gr_acl_is_enabled(void);
++void gr_set_role_label(struct task_struct *task, const kuid_t uid,
++ const kgid_t gid);
++int gr_set_proc_label(const struct dentry *dentry,
++ const struct vfsmount *mnt,
++ const int unsafe_flags);
++__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
++ const struct vfsmount *mnt);
++__u32 gr_acl_handle_open(const struct dentry *dentry,
++ const struct vfsmount *mnt, int acc_mode);
++__u32 gr_acl_handle_creat(const struct dentry *dentry,
++ const struct dentry *p_dentry,
++ const struct vfsmount *p_mnt,
++ int open_flags, int acc_mode, const int imode);
++void gr_handle_create(const struct dentry *dentry,
++ const struct vfsmount *mnt);
++void gr_handle_proc_create(const struct dentry *dentry,
++ const struct inode *inode);
++__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
++ const struct dentry *parent_dentry,
++ const struct vfsmount *parent_mnt,
++ const int mode);
++__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
++ const struct dentry *parent_dentry,
++ const struct vfsmount *parent_mnt);
++__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
++ const struct vfsmount *mnt);
++void gr_handle_delete(const u64 ino, const dev_t dev);
++__u32 gr_acl_handle_unlink(const struct dentry *dentry,
++ const struct vfsmount *mnt);
++__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
++ const struct dentry *parent_dentry,
++ const struct vfsmount *parent_mnt,
++ const struct filename *from);
++__u32 gr_acl_handle_link(const struct dentry *new_dentry,
++ const struct dentry *parent_dentry,
++ const struct vfsmount *parent_mnt,
++ const struct dentry *old_dentry,
++ const struct vfsmount *old_mnt, const struct filename *to);
++int gr_handle_symlink_owner(const struct path *link, const struct inode *target);
++int gr_acl_handle_rename(struct dentry *new_dentry,
++ struct dentry *parent_dentry,
++ const struct vfsmount *parent_mnt,
++ struct dentry *old_dentry,
++ struct inode *old_parent_inode,
++ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags);
++void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
++ struct dentry *old_dentry,
++ struct dentry *new_dentry,
++ struct vfsmount *mnt, const __u8 replace, unsigned int flags);
++__u32 gr_check_link(const struct dentry *new_dentry,
++ const struct dentry *parent_dentry,
++ const struct vfsmount *parent_mnt,
++ const struct dentry *old_dentry,
++ const struct vfsmount *old_mnt);
++int gr_acl_handle_filldir(const struct file *file, const char *name,
++ const unsigned int namelen, const u64 ino);
++
++__u32 gr_acl_handle_unix(const struct dentry *dentry,
++ const struct vfsmount *mnt);
++void gr_acl_handle_exit(void);
++void gr_acl_handle_psacct(struct task_struct *task, const long code);
++int gr_acl_handle_procpidmem(const struct task_struct *task);
++int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
++int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
++void gr_audit_ptrace(struct task_struct *task);
++dev_t gr_get_dev_from_dentry(struct dentry *dentry);
++u64 gr_get_ino_from_dentry(struct dentry *dentry);
++void gr_put_exec_file(struct task_struct *task);
++
++int gr_get_symlinkown_enabled(void);
++
++int gr_ptrace_readexec(struct file *file, int unsafe_flags);
++
++void gr_inc_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt);
++void gr_dec_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt);
++int gr_bad_chroot_rename(struct dentry *olddentry, struct vfsmount *oldmnt,
++ struct dentry *newdentry, struct vfsmount *newmnt);
++
++#ifdef CONFIG_GRKERNSEC_RESLOG
++extern void gr_log_resource(const struct task_struct *task, const int res,
++ const unsigned long wanted, const int gt);
++#else
++static inline void gr_log_resource(const struct task_struct *task, const int res,
++ const unsigned long wanted, const int gt)
++{
++}
++#endif
++
++#ifdef CONFIG_GRKERNSEC
++void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
++void gr_handle_vm86(void);
++void gr_handle_mem_readwrite(u64 from, u64 to);
++
++void gr_log_badprocpid(const char *entry);
++
++extern int grsec_enable_dmesg;
++extern int grsec_disable_privio;
++
++#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
++extern kgid_t grsec_proc_gid;
++#endif
++
++#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
++extern int grsec_enable_chroot_findtask;
++#endif
++#ifdef CONFIG_GRKERNSEC_SETXID
++extern int grsec_enable_setxid;
++#endif
++#endif
++
++#endif
+diff -Naur backports-4.2.6-1.org/include/linux/grsock.h backports-4.2.6-1/include/linux/grsock.h
+--- backports-4.2.6-1.org/include/linux/grsock.h 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/include/linux/grsock.h 2016-01-27 12:26:26.289959354 +0100
+@@ -0,0 +1,19 @@
++#ifndef __GRSOCK_H
++#define __GRSOCK_H
++
++extern void gr_attach_curr_ip(const struct sock *sk);
++extern int gr_handle_sock_all(const int family, const int type,
++ const int protocol);
++extern int gr_handle_sock_server(const struct sockaddr *sck);
++extern int gr_handle_sock_server_other(const struct sock *sck);
++extern int gr_handle_sock_client(const struct sockaddr *sck);
++extern int gr_search_connect(struct socket * sock,
++ struct sockaddr_in * addr);
++extern int gr_search_bind(struct socket * sock,
++ struct sockaddr_in * addr);
++extern int gr_search_listen(struct socket * sock);
++extern int gr_search_accept(struct socket * sock);
++extern int gr_search_socket(const int domain, const int type,
++ const int protocol);
++
++#endif
+diff -Naur backports-4.2.6-1.org/include/linux/netfilter/xt_gradm.h backports-4.2.6-1/include/linux/netfilter/xt_gradm.h
+--- backports-4.2.6-1.org/include/linux/netfilter/xt_gradm.h 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/include/linux/netfilter/xt_gradm.h 2016-01-27 12:26:31.209959056 +0100
+@@ -0,0 +1,9 @@
++#ifndef _LINUX_NETFILTER_XT_GRADM_H
++#define _LINUX_NETFILTER_XT_GRADM_H 1
++
++struct xt_gradm_mtinfo {
++ __u16 flags;
++ __u16 invflags;
++};
++
++#endif
+diff -Naur backports-4.2.6-1.org/include/linux/unaligned/access_ok.h backports-4.2.6-1/include/linux/unaligned/access_ok.h
+--- backports-4.2.6-1.org/include/linux/unaligned/access_ok.h 2015-11-15 22:19:38.000000000 +0100
++++ backports-4.2.6-1/include/linux/unaligned/access_ok.h 2016-01-27 12:26:31.219959057 +0100
+@@ -4,34 +4,34 @@
+ #include <linux/kernel.h>
+ #include <asm/byteorder.h>
+
+-static inline u16 get_unaligned_le16(const void *p)
++static inline u16 __intentional_overflow(-1) get_unaligned_le16(const void *p)
+ {
+- return le16_to_cpup((__le16 *)p);
++ return le16_to_cpup((const __le16 *)p);
+ }
+
+-static inline u32 get_unaligned_le32(const void *p)
++static inline u32 __intentional_overflow(-1) get_unaligned_le32(const void *p)
+ {
+- return le32_to_cpup((__le32 *)p);
++ return le32_to_cpup((const __le32 *)p);
+ }
+
+-static inline u64 get_unaligned_le64(const void *p)
++static inline u64 __intentional_overflow(-1) get_unaligned_le64(const void *p)
+ {
+- return le64_to_cpup((__le64 *)p);
++ return le64_to_cpup((const __le64 *)p);
+ }
+
+-static inline u16 get_unaligned_be16(const void *p)
++static inline u16 __intentional_overflow(-1) get_unaligned_be16(const void *p)
+ {
+- return be16_to_cpup((__be16 *)p);
++ return be16_to_cpup((const __be16 *)p);
+ }
+
+-static inline u32 get_unaligned_be32(const void *p)
++static inline u32 __intentional_overflow(-1) get_unaligned_be32(const void *p)
+ {
+- return be32_to_cpup((__be32 *)p);
++ return be32_to_cpup((const __be32 *)p);
+ }
+
+-static inline u64 get_unaligned_be64(const void *p)
++static inline u64 __intentional_overflow(-1) get_unaligned_be64(const void *p)
+ {
+- return be64_to_cpup((__be64 *)p);
++ return be64_to_cpup((const __be64 *)p);
+ }
+
+ static inline void put_unaligned_le16(u16 val, void *p)
+diff -Naur backports-4.2.6-1.org/include/media/v4l2-dev.h backports-4.2.6-1/include/media/v4l2-dev.h
+--- backports-4.2.6-1.org/include/media/v4l2-dev.h 2015-11-15 22:19:38.000000000 +0100
++++ backports-4.2.6-1/include/media/v4l2-dev.h 2016-01-27 12:26:31.219959057 +0100
+@@ -74,7 +74,7 @@
+ int (*mmap) (struct file *, struct vm_area_struct *);
+ int (*open) (struct file *);
+ int (*release) (struct file *);
+-};
++} __do_const;
+
+ /*
+ * Newer version of video_device, handled by videodev2.c
+diff -Naur backports-4.2.6-1.org/include/media/v4l2-device.h backports-4.2.6-1/include/media/v4l2-device.h
+--- backports-4.2.6-1.org/include/media/v4l2-device.h 2015-11-15 22:19:38.000000000 +0100
++++ backports-4.2.6-1/include/media/v4l2-device.h 2016-01-27 12:26:31.219959057 +0100
+@@ -93,7 +93,7 @@
+ this function returns 0. If the name ends with a digit (e.g. cx18),
+ then the name will be set to cx18-0 since cx180 looks really odd. */
+ int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
+- atomic_t *instance);
++ atomic_unchecked_t *instance);
+
+ /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
+ Since the parent disappears this ensures that v4l2_dev doesn't have an
+diff -Naur backports-4.2.6-1.org/include/net/bluetooth/l2cap.h backports-4.2.6-1/include/net/bluetooth/l2cap.h
+--- backports-4.2.6-1.org/include/net/bluetooth/l2cap.h 2015-11-15 22:19:38.000000000 +0100
++++ backports-4.2.6-1/include/net/bluetooth/l2cap.h 2016-01-27 12:31:52.866600109 +0100
+@@ -615,7 +615,7 @@
+ struct iovec *iov,
+ int len);
+ #endif
+-};
++} __do_const;
+
+ struct l2cap_conn {
+ struct hci_conn *hcon;
+diff -Naur backports-4.2.6-1.org/include/net/mac80211.h backports-4.2.6-1/include/net/mac80211.h
+--- backports-4.2.6-1.org/include/net/mac80211.h 2015-11-15 22:19:38.000000000 +0100
++++ backports-4.2.6-1/include/net/mac80211.h 2016-01-27 12:26:31.223292389 +0100
+@@ -5106,7 +5106,7 @@
+ struct sk_buff *skb;
+ struct ieee80211_tx_rate reported_rate;
+ bool rts, short_preamble;
+- u8 max_rate_idx;
++ s8 max_rate_idx;
+ u32 rate_idx_mask;
+ u8 *rate_idx_mcs_mask;
+ bool bss;
+@@ -5143,7 +5143,7 @@
+ void (*remove_sta_debugfs)(void *priv, void *priv_sta);
+
+ u32 (*get_expected_throughput)(void *priv_sta);
+-};
++} __do_const;
+
+ static inline int rate_supported(struct ieee80211_sta *sta,
+ enum ieee80211_band band,
+diff -Naur backports-4.2.6-1.org/include/trace/events/fs.h backports-4.2.6-1/include/trace/events/fs.h
+--- backports-4.2.6-1.org/include/trace/events/fs.h 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/include/trace/events/fs.h 2016-01-27 12:26:31.226625722 +0100
+@@ -0,0 +1,53 @@
++#undef TRACE_SYSTEM
++#define TRACE_SYSTEM fs
++
++#if !defined(_TRACE_FS_H) || defined(TRACE_HEADER_MULTI_READ)
++#define _TRACE_FS_H
++
++#include <linux/fs.h>
++#include <linux/tracepoint.h>
++
++TRACE_EVENT(do_sys_open,
++
++ TP_PROTO(const char *filename, int flags, int mode),
++
++ TP_ARGS(filename, flags, mode),
++
++ TP_STRUCT__entry(
++ __string( filename, filename )
++ __field( int, flags )
++ __field( int, mode )
++ ),
++
++ TP_fast_assign(
++ __assign_str(filename, filename);
++ __entry->flags = flags;
++ __entry->mode = mode;
++ ),
++
++ TP_printk("\"%s\" %x %o",
++ __get_str(filename), __entry->flags, __entry->mode)
++);
++
++TRACE_EVENT(open_exec,
++
++ TP_PROTO(const char *filename),
++
++ TP_ARGS(filename),
++
++ TP_STRUCT__entry(
++ __string( filename, filename )
++ ),
++
++ TP_fast_assign(
++ __assign_str(filename, filename);
++ ),
++
++ TP_printk("\"%s\"",
++ __get_str(filename))
++);
++
++#endif /* _TRACE_FS_H */
++
++/* This part must be outside protection */
++#include <trace/define_trace.h>
+diff -Naur backports-4.2.6-1.org/net/bluetooth/hci_sock.c backports-4.2.6-1/net/bluetooth/hci_sock.c
+--- backports-4.2.6-1.org/net/bluetooth/hci_sock.c 2015-11-15 22:19:40.000000000 +0100
++++ backports-4.2.6-1/net/bluetooth/hci_sock.c 2016-01-27 12:26:36.269958751 +0100
+@@ -1266,7 +1266,7 @@
+ uf.event_mask[1] = *((u32 *) f->event_mask + 1);
+ }
+
+- len = min_t(unsigned int, len, sizeof(uf));
++ len = min((size_t)len, sizeof(uf));
+ if (copy_from_user(&uf, optval, len)) {
+ err = -EFAULT;
+ break;
+diff -Naur backports-4.2.6-1.org/net/bluetooth/l2cap_core.c backports-4.2.6-1/net/bluetooth/l2cap_core.c
+--- backports-4.2.6-1.org/net/bluetooth/l2cap_core.c 2015-11-15 22:19:40.000000000 +0100
++++ backports-4.2.6-1/net/bluetooth/l2cap_core.c 2016-01-27 12:26:36.269958751 +0100
+@@ -3547,8 +3547,10 @@
+ break;
+
+ case L2CAP_CONF_RFC:
+- if (olen == sizeof(rfc))
+- memcpy(&rfc, (void *)val, olen);
++ if (olen != sizeof(rfc))
++ break;
++
++ memcpy(&rfc, (void *)val, olen);
+
+ if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
+ rfc.mode != chan->mode)
+diff -Naur backports-4.2.6-1.org/net/bluetooth/l2cap_sock.c backports-4.2.6-1/net/bluetooth/l2cap_sock.c
+--- backports-4.2.6-1.org/net/bluetooth/l2cap_sock.c 2015-11-15 22:19:40.000000000 +0100
++++ backports-4.2.6-1/net/bluetooth/l2cap_sock.c 2016-01-27 12:26:36.269958751 +0100
+@@ -633,7 +633,8 @@
+ struct sock *sk = sock->sk;
+ struct l2cap_chan *chan = l2cap_pi(sk)->chan;
+ struct l2cap_options opts;
+- int len, err = 0;
++ int err = 0;
++ size_t len = optlen;
+ u32 opt;
+
+ BT_DBG("sk %p", sk);
+@@ -660,7 +661,7 @@
+ opts.max_tx = chan->max_tx;
+ opts.txwin_size = chan->tx_win;
+
+- len = min_t(unsigned int, sizeof(opts), optlen);
++ len = min(sizeof(opts), len);
+ if (copy_from_user((char *) &opts, optval, len)) {
+ err = -EFAULT;
+ break;
+@@ -747,7 +748,8 @@
+ struct bt_security sec;
+ struct bt_power pwr;
+ struct l2cap_conn *conn;
+- int len, err = 0;
++ int err = 0;
++ size_t len = optlen;
+ u32 opt;
+
+ BT_DBG("sk %p", sk);
+@@ -771,7 +773,7 @@
+
+ sec.level = BT_SECURITY_LOW;
+
+- len = min_t(unsigned int, sizeof(sec), optlen);
++ len = min(sizeof(sec), len);
+ if (copy_from_user((char *) &sec, optval, len)) {
+ err = -EFAULT;
+ break;
+@@ -867,7 +869,7 @@
+
+ pwr.force_active = BT_POWER_FORCE_ACTIVE_ON;
+
+- len = min_t(unsigned int, sizeof(pwr), optlen);
++ len = min(sizeof(pwr), len);
+ if (copy_from_user((char *) &pwr, optval, len)) {
+ err = -EFAULT;
+ break;
+diff -Naur backports-4.2.6-1.org/net/bluetooth/rfcomm/sock.c backports-4.2.6-1/net/bluetooth/rfcomm/sock.c
+--- backports-4.2.6-1.org/net/bluetooth/rfcomm/sock.c 2015-11-15 22:19:40.000000000 +0100
++++ backports-4.2.6-1/net/bluetooth/rfcomm/sock.c 2016-01-27 12:26:36.269958751 +0100
+@@ -713,7 +713,7 @@
+ struct sock *sk = sock->sk;
+ struct bt_security sec;
+ int err = 0;
+- size_t len;
++ size_t len = optlen;
+ u32 opt;
+
+ BT_DBG("sk %p", sk);
+@@ -735,7 +735,7 @@
+
+ sec.level = BT_SECURITY_LOW;
+
+- len = min_t(unsigned int, sizeof(sec), optlen);
++ len = min(sizeof(sec), len);
+ if (copy_from_user((char *) &sec, optval, len)) {
+ err = -EFAULT;
+ break;
+diff -Naur backports-4.2.6-1.org/net/bluetooth/rfcomm/tty.c backports-4.2.6-1/net/bluetooth/rfcomm/tty.c
+--- backports-4.2.6-1.org/net/bluetooth/rfcomm/tty.c 2015-11-15 22:19:40.000000000 +0100
++++ backports-4.2.6-1/net/bluetooth/rfcomm/tty.c 2016-01-27 12:26:36.269958751 +0100
+@@ -752,7 +752,7 @@
+ BT_DBG("tty %p id %d", tty, tty->index);
+
+ BT_DBG("dev %p dst %pMR channel %d opened %d", dev, &dev->dst,
+- dev->channel, dev->port.count);
++ dev->channel, atomic_read(&dev->port.count));
+
+ err = tty_port_open(&dev->port, tty, filp);
+ if (err)
+@@ -775,7 +775,7 @@
+ struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
+
+ BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc,
+- dev->port.count);
++ atomic_read(&dev->port.count));
+
+ tty_port_close(&dev->port, tty, filp);
+ }
+diff -Naur backports-4.2.6-1.org/net/ieee802154/6lowpan/core.c backports-4.2.6-1/net/ieee802154/6lowpan/core.c
+--- backports-4.2.6-1.org/net/ieee802154/6lowpan/core.c 2015-11-15 22:19:40.000000000 +0100
++++ backports-4.2.6-1/net/ieee802154/6lowpan/core.c 2016-01-27 12:26:36.273292083 +0100
+@@ -191,7 +191,7 @@
+ dev_put(real_dev);
+ }
+
+-static struct rtnl_link_ops lowpan_link_ops __read_mostly = {
++static struct rtnl_link_ops lowpan_link_ops = {
+ .kind = "lowpan",
+ .priv_size = sizeof(struct lowpan_dev_info),
+ .setup = lowpan_setup,
+diff -Naur backports-4.2.6-1.org/net/ieee802154/6lowpan/reassembly.c backports-4.2.6-1/net/ieee802154/6lowpan/reassembly.c
+--- backports-4.2.6-1.org/net/ieee802154/6lowpan/reassembly.c 2015-11-15 22:19:40.000000000 +0100
++++ backports-4.2.6-1/net/ieee802154/6lowpan/reassembly.c 2016-01-27 12:26:36.273292083 +0100
+@@ -435,14 +435,13 @@
+
+ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
+ {
+- struct ctl_table *table;
++ ctl_table_no_const *table = NULL;
+ struct ctl_table_header *hdr;
+ struct netns_ieee802154_lowpan *ieee802154_lowpan =
+ net_ieee802154_lowpan(net);
+
+- table = lowpan_frags_ns_ctl_table;
+ if (!net_eq(net, &init_net)) {
+- table = kmemdup(table, sizeof(lowpan_frags_ns_ctl_table),
++ table = kmemdup(lowpan_frags_ns_ctl_table, sizeof(lowpan_frags_ns_ctl_table),
+ GFP_KERNEL);
+ if (table == NULL)
+ goto err_alloc;
+@@ -457,9 +456,9 @@
+ /* Don't export sysctls to unprivileged users */
+ if (net->user_ns != &init_user_ns)
+ table[0].procname = NULL;
+- }
+-
+- hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
++ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
++ } else
++ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", lowpan_frags_ns_ctl_table);
+ if (hdr == NULL)
+ goto err_reg;
+
+@@ -467,8 +466,7 @@
+ return 0;
+
+ err_reg:
+- if (!net_eq(net, &init_net))
+- kfree(table);
++ kfree(table);
+ err_alloc:
+ return -ENOMEM;
+ }
+diff -Naur backports-4.2.6-1.org/net/mac80211/cfg.c backports-4.2.6-1/net/mac80211/cfg.c
+--- backports-4.2.6-1.org/net/mac80211/cfg.c 2015-11-15 22:19:40.000000000 +0100
++++ backports-4.2.6-1/net/mac80211/cfg.c 2016-01-27 12:26:36.286625417 +0100
+@@ -580,7 +580,7 @@
+ ret = ieee80211_vif_use_channel(sdata, chandef,
+ IEEE80211_CHANCTX_EXCLUSIVE);
+ }
+- } else if (local->open_count == local->monitors) {
++ } else if (local_read(&local->open_count) == local->monitors) {
+ local->_oper_chandef = *chandef;
+ ieee80211_hw_config(local, 0);
+ }
+@@ -3488,7 +3488,7 @@
+ else
+ local->probe_req_reg--;
+
+- if (!local->open_count)
++ if (!local_read(&local->open_count))
+ break;
+
+ ieee80211_queue_work(&local->hw, &local->reconfig_filter);
+@@ -3637,8 +3637,8 @@
+ if (chanctx_conf) {
+ *chandef = sdata->vif.bss_conf.chandef;
+ ret = 0;
+- } else if (local->open_count > 0 &&
+- local->open_count == local->monitors &&
++ } else if (local_read(&local->open_count) > 0 &&
++ local_read(&local->open_count) == local->monitors &&
+ sdata->vif.type == NL80211_IFTYPE_MONITOR) {
+ if (local->use_chanctx)
+ *chandef = local->monitor_chandef;
+diff -Naur backports-4.2.6-1.org/net/mac80211/ieee80211_i.h backports-4.2.6-1/net/mac80211/ieee80211_i.h
+--- backports-4.2.6-1.org/net/mac80211/ieee80211_i.h 2015-11-15 22:19:40.000000000 +0100
++++ backports-4.2.6-1/net/mac80211/ieee80211_i.h 2016-01-27 12:26:36.289958749 +0100
+@@ -30,6 +30,7 @@
+ #include <net/ieee80211_radiotap.h>
+ #include <net/cfg80211.h>
+ #include <net/mac80211.h>
++#include <asm/local.h>
+ #include "key.h"
+ #include "sta_info.h"
+ #include "debug.h"
+@@ -1112,7 +1113,7 @@
+ /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
+ spinlock_t queue_stop_reason_lock;
+
+- int open_count;
++ local_t open_count;
+ int monitors, cooked_mntrs;
+ /* number of interfaces with corresponding FIF_ flags */
+ int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
+diff -Naur backports-4.2.6-1.org/net/mac80211/iface.c backports-4.2.6-1/net/mac80211/iface.c
+--- backports-4.2.6-1.org/net/mac80211/iface.c 2015-11-15 22:19:40.000000000 +0100
++++ backports-4.2.6-1/net/mac80211/iface.c 2016-01-27 12:26:36.289958749 +0100
+@@ -550,7 +550,7 @@
+ break;
+ }
+
+- if (local->open_count == 0) {
++ if (local_read(&local->open_count) == 0) {
+ res = drv_start(local);
+ if (res)
+ goto err_del_bss;
+@@ -597,7 +597,7 @@
+ res = drv_add_interface(local, sdata);
+ if (res)
+ goto err_stop;
+- } else if (local->monitors == 0 && local->open_count == 0) {
++ } else if (local->monitors == 0 && local_read(&local->open_count) == 0) {
+ res = ieee80211_add_virtual_monitor(local);
+ if (res)
+ goto err_stop;
+@@ -704,7 +704,7 @@
+ atomic_inc(&local->iff_allmultis);
+
+ if (coming_up)
+- local->open_count++;
++ local_inc(&local->open_count);
+
+ if (hw_reconf_flags)
+ ieee80211_hw_config(local, hw_reconf_flags);
+@@ -742,7 +742,7 @@
+ err_del_interface:
+ drv_remove_interface(local, sdata);
+ err_stop:
+- if (!local->open_count)
++ if (!local_read(&local->open_count))
+ drv_stop(local);
+ err_del_bss:
+ sdata->bss = NULL;
+@@ -909,7 +909,7 @@
+ }
+
+ if (going_down)
+- local->open_count--;
++ local_dec(&local->open_count);
+
+ switch (sdata->vif.type) {
+ case NL80211_IFTYPE_AP_VLAN:
+@@ -978,7 +978,7 @@
+ atomic_set(&sdata->txqs_len[txqi->txq.ac], 0);
+ }
+
+- if (local->open_count == 0)
++ if (local_read(&local->open_count) == 0)
+ ieee80211_clear_tx_pending(local);
+
+ /*
+@@ -1021,7 +1021,7 @@
+ if (cancel_scan)
+ flush_delayed_work(&local->scan_work);
+
+- if (local->open_count == 0) {
++ if (local_read(&local->open_count) == 0) {
+ ieee80211_stop_device(local);
+
+ /* no reconfiguring after stop! */
+@@ -1032,7 +1032,7 @@
+ ieee80211_configure_filter(local);
+ ieee80211_hw_config(local, hw_reconf_flags);
+
+- if (local->monitors == local->open_count)
++ if (local->monitors == local_read(&local->open_count))
+ ieee80211_add_virtual_monitor(local);
+ }
+
+@@ -1905,8 +1905,8 @@
+ */
+ cfg80211_shutdown_all_interfaces(local->hw.wiphy);
+
+- WARN(local->open_count, "%s: open count remains %d\n",
+- wiphy_name(local->hw.wiphy), local->open_count);
++ WARN(local_read(&local->open_count), "%s: open count remains %ld\n",
++ wiphy_name(local->hw.wiphy), local_read(&local->open_count));
+
+ mutex_lock(&local->iflist_mtx);
+ list_for_each_entry_safe(sdata, tmp, &local->interfaces, list) {
+diff -Naur backports-4.2.6-1.org/net/mac80211/main.c backports-4.2.6-1/net/mac80211/main.c
+--- backports-4.2.6-1.org/net/mac80211/main.c 2015-11-15 22:19:40.000000000 +0100
++++ backports-4.2.6-1/net/mac80211/main.c 2016-01-27 12:26:36.289958749 +0100
+@@ -172,7 +172,7 @@
+ changed &= ~(IEEE80211_CONF_CHANGE_CHANNEL |
+ IEEE80211_CONF_CHANGE_POWER);
+
+- if (changed && local->open_count) {
++ if (changed && local_read(&local->open_count)) {
+ ret = drv_config(local, changed);
+ /*
+ * Goal:
+diff -Naur backports-4.2.6-1.org/net/mac80211/pm.c backports-4.2.6-1/net/mac80211/pm.c
+--- backports-4.2.6-1.org/net/mac80211/pm.c 2015-11-15 22:19:40.000000000 +0100
++++ backports-4.2.6-1/net/mac80211/pm.c 2016-01-27 12:26:36.289958749 +0100
+@@ -12,7 +12,7 @@
+ struct ieee80211_sub_if_data *sdata;
+ struct sta_info *sta;
+
+- if (!local->open_count)
++ if (!local_read(&local->open_count))
+ goto suspend;
+
+ ieee80211_scan_cancel(local);
+@@ -166,7 +166,7 @@
+ WARN_ON(!list_empty(&local->chanctx_list));
+
+ /* stop hardware - this must stop RX */
+- if (local->open_count)
++ if (local_read(&local->open_count))
+ ieee80211_stop_device(local);
+
+ suspend:
+diff -Naur backports-4.2.6-1.org/net/mac80211/rate.c backports-4.2.6-1/net/mac80211/rate.c
+--- backports-4.2.6-1.org/net/mac80211/rate.c 2015-11-15 22:19:40.000000000 +0100
++++ backports-4.2.6-1/net/mac80211/rate.c 2016-01-27 12:26:36.289958749 +0100
+@@ -730,7 +730,7 @@
+
+ ASSERT_RTNL();
+
+- if (local->open_count)
++ if (local_read(&local->open_count))
+ return -EBUSY;
+
+ if (ieee80211_hw_check(&local->hw, HAS_RATE_CONTROL)) {
+diff -Naur backports-4.2.6-1.org/net/mac80211/sta_info.c backports-4.2.6-1/net/mac80211/sta_info.c
+--- backports-4.2.6-1.org/net/mac80211/sta_info.c 2015-11-15 22:19:40.000000000 +0100
++++ backports-4.2.6-1/net/mac80211/sta_info.c 2016-01-27 12:26:36.289958749 +0100
+@@ -341,7 +341,7 @@
+ int size = sizeof(struct txq_info) +
+ ALIGN(hw->txq_data_size, sizeof(void *));
+
+- txq_data = kcalloc(ARRAY_SIZE(sta->sta.txq), size, gfp);
++ txq_data = kcalloc(size, ARRAY_SIZE(sta->sta.txq), gfp);
+ if (!txq_data)
+ goto free;
+
+diff -Naur backports-4.2.6-1.org/net/mac80211/util.c backports-4.2.6-1/net/mac80211/util.c
+--- backports-4.2.6-1.org/net/mac80211/util.c 2015-11-15 22:19:40.000000000 +0100
++++ backports-4.2.6-1/net/mac80211/util.c 2016-01-27 12:26:36.289958749 +0100
+@@ -1761,7 +1761,7 @@
+ bool sched_scan_stopped = false;
+
+ /* nothing to do if HW shouldn't run */
+- if (!local->open_count)
++ if (!local_read(&local->open_count))
+ goto wake_up;
+
+ #ifdef CONFIG_PM
+@@ -2033,7 +2033,7 @@
+ local->in_reconfig = false;
+ barrier();
+
+- if (local->monitors == local->open_count && local->monitors > 0)
++ if (local->monitors == local_read(&local->open_count) && local->monitors > 0)
+ ieee80211_add_virtual_monitor(local);
+
+ /*
+@@ -2088,7 +2088,7 @@
+ * If this is for hw restart things are still running.
+ * We may want to change that later, however.
+ */
+- if (local->open_count && (!local->suspended || reconfig_due_to_wowlan))
++ if (local_read(&local->open_count) && (!local->suspended || reconfig_due_to_wowlan))
+ drv_reconfig_complete(local, IEEE80211_RECONFIG_TYPE_RESTART);
+
+ if (!local->suspended)
+@@ -2112,7 +2112,7 @@
+ flush_delayed_work(&local->scan_work);
+ }
+
+- if (local->open_count && !reconfig_due_to_wowlan)
++ if (local_read(&local->open_count) && !reconfig_due_to_wowlan)
+ drv_reconfig_complete(local, IEEE80211_RECONFIG_TYPE_SUSPEND);
+
+ list_for_each_entry(sdata, &local->interfaces, list) {
+diff -Naur backports-4.2.6-1.org/net/wireless/wext-core.c backports-4.2.6-1/net/wireless/wext-core.c
+--- backports-4.2.6-1.org/net/wireless/wext-core.c 2015-11-15 22:19:40.000000000 +0100
++++ backports-4.2.6-1/net/wireless/wext-core.c 2016-01-27 12:26:36.303292082 +0100
+@@ -748,8 +748,7 @@
+ */
+
+ /* Support for very large requests */
+- if ((descr->flags & IW_DESCR_FLAG_NOMAX) &&
+- (user_length > descr->max_tokens)) {
++ if (user_length > descr->max_tokens) {
+ /* Allow userspace to GET more than max so
+ * we can support any size GET requests.
+ * There is still a limit : -ENOMEM.
+@@ -788,22 +787,6 @@
+ }
+ }
+
+- if (IW_IS_GET(cmd) && !(descr->flags & IW_DESCR_FLAG_NOMAX)) {
+- /*
+- * If this is a GET, but not NOMAX, it means that the extra
+- * data is not bounded by userspace, but by max_tokens. Thus
+- * set the length to max_tokens. This matches the extra data
+- * allocation.
+- * The driver should fill it with the number of tokens it
+- * provided, and it may check iwp->length rather than having
+- * knowledge of max_tokens. If the driver doesn't change the
+- * iwp->length, this ioctl just copies back max_token tokens
+- * filled with zeroes. Hopefully the driver isn't claiming
+- * them to be valid data.
+- */
+- iwp->length = descr->max_tokens;
+- }
+-
+ err = handler(dev, info, (union iwreq_data *) iwp, extra);
+
+ iwp->length += essid_compat;
+diff -Naur backports-4.2.6-1.org/scripts/gcc-plugin.sh backports-4.2.6-1/scripts/gcc-plugin.sh
+--- backports-4.2.6-1.org/scripts/gcc-plugin.sh 1970-01-01 01:00:00.000000000 +0100
++++ backports-4.2.6-1/scripts/gcc-plugin.sh 2016-01-27 12:26:36.303292082 +0100
+@@ -0,0 +1,51 @@
++#!/bin/sh
++srctree=$(dirname "$0")
++gccplugins_dir=$($3 -print-file-name=plugin)
++plugincc=$($1 -E -x c++ - -o /dev/null -I"${srctree}"/../tools/gcc -I"${gccplugins_dir}"/include 2>&1 <<EOF
++#include "gcc-common.h"
++#if BUILDING_GCC_VERSION >= 4008 || defined(ENABLE_BUILD_WITH_CXX)
++#warning $2 CXX
++#else
++#warning $1 CC
++#endif
++EOF
++)
++
++if [ $? -ne 0 ]
++then
++ exit 1
++fi
++
++case "$plugincc" in
++ *"$1 CC"*)
++ echo "$1"
++ exit 0
++ ;;
++
++ *"$2 CXX"*)
++ # the c++ compiler needs another test, see below
++ ;;
++
++ *)
++ exit 1
++ ;;
++esac
++
++# we need a c++ compiler that supports the designated initializer GNU extension
++plugincc=$($2 -c -x c++ -std=gnu++98 - -fsyntax-only -I"${srctree}"/../tools/gcc -I"${gccplugins_dir}"/include 2>&1 <<EOF
++#include "gcc-common.h"
++class test {
++public:
++ int test;
++} test = {
++ .test = 1
++};
++EOF
++)
++
++if [ $? -eq 0 ]
++then
++ echo "$2"
++ exit 0
++fi
++exit 1
diff --git a/src/patches/backports-4.2.6-1-mt7601_upstream_fixes.patch b/src/patches/backports-4.2.6-1-mt7601_upstream_fixes.patch
new file mode 100644
index 0000000..9918d65
--- /dev/null
+++ b/src/patches/backports-4.2.6-1-mt7601_upstream_fixes.patch
@@ -0,0 +1,441 @@
+From bed429e1ae8b7ee207e01f3aa60dcc0d06a8ed4d Mon Sep 17 00:00:00 2001
+From: Jakub Kicinski <kubakici(a)wp.pl>
+Date: Fri, 31 Jul 2015 15:04:46 +0200
+Subject: mt7601u: fix dma from stack address
+
+DMA to variables located on the stack is a bad idea.
+For simplicity and to avoid frequent allocations create
+a buffer inside the device structure. Protect this
+buffer with vendor_req_mutex. Don't protect vendor
+requests which don't use this buffer.
+
+Signed-off-by: Jakub Kicinski <kubakici(a)wp.pl>
+Signed-off-by: Kalle Valo <kvalo(a)codeaurora.org>
+---
+ drivers/net/wireless/mediatek/mt7601u/mt7601u.h | 4 +-
+ drivers/net/wireless/mediatek/mt7601u/usb.c | 63 ++++++++++++-------------
+ drivers/net/wireless/mediatek/mt7601u/usb.h | 2 +
+ 3 files changed, 34 insertions(+), 35 deletions(-)
+
+diff --git a/drivers/net/wireless/mediatek/mt7601u/mt7601u.h b/drivers/net/wireless/mediatek/mt7601u/mt7601u.h
+index 9102be6b..6bdfc11 100644
+--- a/drivers/net/wireless/mediatek/mt7601u/mt7601u.h
++++ b/drivers/net/wireless/mediatek/mt7601u/mt7601u.h
+@@ -146,7 +146,7 @@ enum {
+ * @rx_lock: protects @rx_q.
+ * @con_mon_lock: protects @ap_bssid, @bcn_*, @avg_rssi.
+ * @mutex: ensures exclusive access from mac80211 callbacks.
+- * @vendor_req_mutex: ensures atomicity of vendor requests.
++ * @vendor_req_mutex: protects @vend_buf, ensures atomicity of split writes.
+ * @reg_atomic_mutex: ensures atomicity of indirect register accesses
+ * (accesses to RF and BBP).
+ * @hw_atomic_mutex: ensures exclusive access to HW during critical
+@@ -184,6 +184,8 @@ struct mt7601u_dev {
+ struct mt7601u_eeprom_params *ee;
+
+ struct mutex vendor_req_mutex;
++ void *vend_buf;
++
+ struct mutex reg_atomic_mutex;
+ struct mutex hw_atomic_mutex;
+
+diff --git a/drivers/net/wireless/mediatek/mt7601u/usb.c b/drivers/net/wireless/mediatek/mt7601u/usb.c
+index 54dba40..416c604 100644
+--- a/drivers/net/wireless/mediatek/mt7601u/usb.c
++++ b/drivers/net/wireless/mediatek/mt7601u/usb.c
+@@ -92,10 +92,9 @@ void mt7601u_complete_urb(struct urb *urb)
+ complete(cmpl);
+ }
+
+-static int
+-__mt7601u_vendor_request(struct mt7601u_dev *dev, const u8 req,
+- const u8 direction, const u16 val, const u16 offset,
+- void *buf, const size_t buflen)
++int mt7601u_vendor_request(struct mt7601u_dev *dev, const u8 req,
++ const u8 direction, const u16 val, const u16 offset,
++ void *buf, const size_t buflen)
+ {
+ int i, ret;
+ struct usb_device *usb_dev = mt7601u_to_usb_dev(dev);
+@@ -110,6 +109,8 @@ __mt7601u_vendor_request(struct mt7601u_dev *dev, const u8 req,
+ trace_mt_vend_req(dev, pipe, req, req_type, val, offset,
+ buf, buflen, ret);
+
++ if (ret == -ENODEV)
++ set_bit(MT7601U_STATE_REMOVED, &dev->state);
+ if (ret >= 0 || ret == -ENODEV)
+ return ret;
+
+@@ -122,25 +123,6 @@ __mt7601u_vendor_request(struct mt7601u_dev *dev, const u8 req,
+ return ret;
+ }
+
+-int
+-mt7601u_vendor_request(struct mt7601u_dev *dev, const u8 req,
+- const u8 direction, const u16 val, const u16 offset,
+- void *buf, const size_t buflen)
+-{
+- int ret;
+-
+- mutex_lock(&dev->vendor_req_mutex);
+-
+- ret = __mt7601u_vendor_request(dev, req, direction, val, offset,
+- buf, buflen);
+- if (ret == -ENODEV)
+- set_bit(MT7601U_STATE_REMOVED, &dev->state);
+-
+- mutex_unlock(&dev->vendor_req_mutex);
+-
+- return ret;
+-}
+-
+ void mt7601u_vendor_reset(struct mt7601u_dev *dev)
+ {
+ mt7601u_vendor_request(dev, MT_VEND_DEV_MODE, USB_DIR_OUT,
+@@ -150,19 +132,21 @@ void mt7601u_vendor_reset(struct mt7601u_dev *dev)
+ u32 mt7601u_rr(struct mt7601u_dev *dev, u32 offset)
+ {
+ int ret;
+- __le32 reg;
+- u32 val;
++ u32 val = ~0;
+
+ WARN_ONCE(offset > USHRT_MAX, "read high off:%08x", offset);
+
++ mutex_lock(&dev->vendor_req_mutex);
++
+ ret = mt7601u_vendor_request(dev, MT_VEND_MULTI_READ, USB_DIR_IN,
+- 0, offset, ®, sizeof(reg));
+- val = le32_to_cpu(reg);
+- if (ret > 0 && ret != sizeof(reg)) {
++ 0, offset, dev->vend_buf, MT_VEND_BUF);
++ if (ret == MT_VEND_BUF)
++ val = get_unaligned_le32(dev->vend_buf);
++ else if (ret > 0)
+ dev_err(dev->dev, "Error: wrong size read:%d off:%08x\n",
+ ret, offset);
+- val = ~0;
+- }
++
++ mutex_unlock(&dev->vendor_req_mutex);
+
+ trace_reg_read(dev, offset, val);
+ return val;
+@@ -173,12 +157,17 @@ int mt7601u_vendor_single_wr(struct mt7601u_dev *dev, const u8 req,
+ {
+ int ret;
+
++ mutex_lock(&dev->vendor_req_mutex);
++
+ ret = mt7601u_vendor_request(dev, req, USB_DIR_OUT,
+ val & 0xffff, offset, NULL, 0);
+- if (ret)
+- return ret;
+- return mt7601u_vendor_request(dev, req, USB_DIR_OUT,
+- val >> 16, offset + 2, NULL, 0);
++ if (!ret)
++ ret = mt7601u_vendor_request(dev, req, USB_DIR_OUT,
++ val >> 16, offset + 2, NULL, 0);
++
++ mutex_unlock(&dev->vendor_req_mutex);
++
++ return ret;
+ }
+
+ void mt7601u_wr(struct mt7601u_dev *dev, u32 offset, u32 val)
+@@ -275,6 +264,12 @@ static int mt7601u_probe(struct usb_interface *usb_intf,
+
+ usb_set_intfdata(usb_intf, dev);
+
++ dev->vend_buf = devm_kmalloc(dev->dev, MT_VEND_BUF, GFP_KERNEL);
++ if (!dev->vend_buf) {
++ ret = -ENOMEM;
++ goto err;
++ }
++
+ ret = mt7601u_assign_pipes(usb_intf, dev);
+ if (ret)
+ goto err;
+diff --git a/drivers/net/wireless/mediatek/mt7601u/usb.h b/drivers/net/wireless/mediatek/mt7601u/usb.h
+index 49e188f..bc18202 100644
+--- a/drivers/net/wireless/mediatek/mt7601u/usb.h
++++ b/drivers/net/wireless/mediatek/mt7601u/usb.h
+@@ -23,6 +23,8 @@
+
+ #define MT_VEND_DEV_MODE_RESET 1
+
++#define MT_VEND_BUF sizeof(__le32)
++
+ enum mt_vendor_req {
+ MT_VEND_DEV_MODE = 1,
+ MT_VEND_WRITE = 2,
+--
+cgit v0.12
+
+From d9517c0a5d7468a7ea63086057604fcb0fff480e Mon Sep 17 00:00:00 2001
+From: Jakub Kicinski <kubakici(a)wp.pl>
+Date: Fri, 31 Jul 2015 15:04:47 +0200
+Subject: mt7601u: use correct ieee80211_rx variant
+
+Rx is run inside a tasklet so ieee80211_rx() should be used
+instead of ieee80211_rx_ni().
+
+Signed-off-by: Jakub Kicinski <kubakici(a)wp.pl>
+Signed-off-by: Kalle Valo <kvalo(a)codeaurora.org>
+---
+ drivers/net/wireless/mediatek/mt7601u/dma.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/net/wireless/mediatek/mt7601u/dma.c b/drivers/net/wireless/mediatek/mt7601u/dma.c
+index 7217da4..fb183e3 100644
+--- a/drivers/net/wireless/mediatek/mt7601u/dma.c
++++ b/drivers/net/wireless/mediatek/mt7601u/dma.c
+@@ -112,7 +112,7 @@ static void mt7601u_rx_process_seg(struct mt7601u_dev *dev, u8 *data,
+ if (!skb)
+ return;
+
+- ieee80211_rx_ni(dev->hw, skb);
++ ieee80211_rx(dev->hw, skb);
+ }
+
+ static u16 mt7601u_rx_next_seg_len(u8 *data, u32 data_len)
+--
+cgit v0.12
+
+From 4513493d188d5e3052aee68eda85eaaa1a4e41c2 Mon Sep 17 00:00:00 2001
+From: Jakub Kicinski <kubakici(a)wp.pl>
+Date: Fri, 31 Jul 2015 15:04:48 +0200
+Subject: mt7601u: fix tx status reporting contexts
+
+mac80211 requires that rx path does not run concurrently with
+tx status reporting. Since rx path is run in driver tasklet,
+tx status cannot be reported directly from interrupt context
+(there would be no way to lock it out).
+
+Add tasklet for tx and move all possible code from irq handler
+there.
+
+Note: tx tasklet is needed because workqueue is queued very
+ rarely and that kills TCP performance.
+
+Signed-off-by: Jakub Kicinski <kubakici(a)wp.pl>
+Signed-off-by: Kalle Valo <kvalo(a)codeaurora.org>
+---
+ drivers/net/wireless/mediatek/mt7601u/dma.c | 30 +++++++++++++++++++++----
+ drivers/net/wireless/mediatek/mt7601u/init.c | 1 +
+ drivers/net/wireless/mediatek/mt7601u/mac.c | 4 ++++
+ drivers/net/wireless/mediatek/mt7601u/mt7601u.h | 2 ++
+ 4 files changed, 33 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/net/wireless/mediatek/mt7601u/dma.c b/drivers/net/wireless/mediatek/mt7601u/dma.c
+index fb183e3..63c4854 100644
+--- a/drivers/net/wireless/mediatek/mt7601u/dma.c
++++ b/drivers/net/wireless/mediatek/mt7601u/dma.c
+@@ -236,23 +236,42 @@ static void mt7601u_complete_tx(struct urb *urb)
+ skb = q->e[q->start].skb;
+ trace_mt_tx_dma_done(dev, skb);
+
+- mt7601u_tx_status(dev, skb);
++ __skb_queue_tail(&dev->tx_skb_done, skb);
++ tasklet_schedule(&dev->tx_tasklet);
+
+ if (q->used == q->entries - q->entries / 8)
+ ieee80211_wake_queue(dev->hw, skb_get_queue_mapping(skb));
+
+ q->start = (q->start + 1) % q->entries;
+ q->used--;
++out:
++ spin_unlock_irqrestore(&dev->tx_lock, flags);
++}
+
+- if (urb->status)
+- goto out;
++static void mt7601u_tx_tasklet(unsigned long data)
++{
++ struct mt7601u_dev *dev = (struct mt7601u_dev *) data;
++ struct sk_buff_head skbs;
++ unsigned long flags;
++
++ __skb_queue_head_init(&skbs);
++
++ spin_lock_irqsave(&dev->tx_lock, flags);
+
+ set_bit(MT7601U_STATE_MORE_STATS, &dev->state);
+ if (!test_and_set_bit(MT7601U_STATE_READING_STATS, &dev->state))
+ queue_delayed_work(dev->stat_wq, &dev->stat_work,
+ msecs_to_jiffies(10));
+-out:
++
++ skb_queue_splice_init(&dev->tx_skb_done, &skbs);
++
+ spin_unlock_irqrestore(&dev->tx_lock, flags);
++
++ while (!skb_queue_empty(&skbs)) {
++ struct sk_buff *skb = __skb_dequeue(&skbs);
++
++ mt7601u_tx_status(dev, skb);
++ }
+ }
+
+ static int mt7601u_dma_submit_tx(struct mt7601u_dev *dev,
+@@ -475,6 +494,7 @@ int mt7601u_dma_init(struct mt7601u_dev *dev)
+ {
+ int ret = -ENOMEM;
+
++ tasklet_init(&dev->tx_tasklet, mt7601u_tx_tasklet, (unsigned long) dev);
+ tasklet_init(&dev->rx_tasklet, mt7601u_rx_tasklet, (unsigned long) dev);
+
+ ret = mt7601u_alloc_tx(dev);
+@@ -502,4 +522,6 @@ void mt7601u_dma_cleanup(struct mt7601u_dev *dev)
+
+ mt7601u_free_rx(dev);
+ mt7601u_free_tx(dev);
++
++ tasklet_kill(&dev->tx_tasklet);
+ }
+diff --git a/drivers/net/wireless/mediatek/mt7601u/init.c b/drivers/net/wireless/mediatek/mt7601u/init.c
+index df3dd56..38eb20b 100644
+--- a/drivers/net/wireless/mediatek/mt7601u/init.c
++++ b/drivers/net/wireless/mediatek/mt7601u/init.c
+@@ -456,6 +456,7 @@ struct mt7601u_dev *mt7601u_alloc_device(struct device *pdev)
+ spin_lock_init(&dev->lock);
+ spin_lock_init(&dev->con_mon_lock);
+ atomic_set(&dev->avg_ampdu_len, 1);
++ skb_queue_head_init(&dev->tx_skb_done);
+
+ dev->stat_wq = alloc_workqueue("mt7601u", WQ_UNBOUND, 0);
+ if (!dev->stat_wq) {
+diff --git a/drivers/net/wireless/mediatek/mt7601u/mac.c b/drivers/net/wireless/mediatek/mt7601u/mac.c
+index 7514bce..e3928cf 100644
+--- a/drivers/net/wireless/mediatek/mt7601u/mac.c
++++ b/drivers/net/wireless/mediatek/mt7601u/mac.c
+@@ -181,7 +181,11 @@ void mt76_send_tx_status(struct mt7601u_dev *dev, struct mt76_tx_status *stat)
+ }
+
+ mt76_mac_fill_tx_status(dev, &info, stat);
++
++ local_bh_disable();
+ ieee80211_tx_status_noskb(dev->hw, sta, &info);
++ local_bh_enable();
++
+ rcu_read_unlock();
+ }
+
+diff --git a/drivers/net/wireless/mediatek/mt7601u/mt7601u.h b/drivers/net/wireless/mediatek/mt7601u/mt7601u.h
+index 6bdfc11..bc5e294 100644
+--- a/drivers/net/wireless/mediatek/mt7601u/mt7601u.h
++++ b/drivers/net/wireless/mediatek/mt7601u/mt7601u.h
+@@ -199,7 +199,9 @@ struct mt7601u_dev {
+
+ /* TX */
+ spinlock_t tx_lock;
++ struct tasklet_struct tx_tasklet;
+ struct mt7601u_tx_queue *tx_q;
++ struct sk_buff_head tx_skb_done;
+
+ atomic_t avg_ampdu_len;
+
+--
+cgit v0.12
+
+From 78623bfb6f4cbdba3183621e8e0e781611217022 Mon Sep 17 00:00:00 2001
+From: Jakub Kicinski <kubakici(a)wp.pl>
+Date: Fri, 31 Jul 2015 15:04:49 +0200
+Subject: mt7601u: lock out rx path and tx status reporting
+
+mac80211 requires that rx path does not run concurrently with
+tx status reporting. Add a spinlock which will ensure that.
+
+Signed-off-by: Jakub Kicinski <kubakici(a)wp.pl>
+Signed-off-by: Kalle Valo <kvalo(a)codeaurora.org>
+---
+ drivers/net/wireless/mediatek/mt7601u/dma.c | 2 ++
+ drivers/net/wireless/mediatek/mt7601u/init.c | 1 +
+ drivers/net/wireless/mediatek/mt7601u/mac.c | 4 ++--
+ drivers/net/wireless/mediatek/mt7601u/mt7601u.h | 4 +++-
+ drivers/net/wireless/mediatek/mt7601u/tx.c | 3 +++
+ 5 files changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/net/wireless/mediatek/mt7601u/dma.c b/drivers/net/wireless/mediatek/mt7601u/dma.c
+index 63c4854..57a80cf 100644
+--- a/drivers/net/wireless/mediatek/mt7601u/dma.c
++++ b/drivers/net/wireless/mediatek/mt7601u/dma.c
+@@ -112,7 +112,9 @@ static void mt7601u_rx_process_seg(struct mt7601u_dev *dev, u8 *data,
+ if (!skb)
+ return;
+
++ spin_lock(&dev->mac_lock);
+ ieee80211_rx(dev->hw, skb);
++ spin_unlock(&dev->mac_lock);
+ }
+
+ static u16 mt7601u_rx_next_seg_len(u8 *data, u32 data_len)
+diff --git a/drivers/net/wireless/mediatek/mt7601u/init.c b/drivers/net/wireless/mediatek/mt7601u/init.c
+index 38eb20b..26190fd 100644
+--- a/drivers/net/wireless/mediatek/mt7601u/init.c
++++ b/drivers/net/wireless/mediatek/mt7601u/init.c
+@@ -454,6 +454,7 @@ struct mt7601u_dev *mt7601u_alloc_device(struct device *pdev)
+ spin_lock_init(&dev->tx_lock);
+ spin_lock_init(&dev->rx_lock);
+ spin_lock_init(&dev->lock);
++ spin_lock_init(&dev->mac_lock);
+ spin_lock_init(&dev->con_mon_lock);
+ atomic_set(&dev->avg_ampdu_len, 1);
+ skb_queue_head_init(&dev->tx_skb_done);
+diff --git a/drivers/net/wireless/mediatek/mt7601u/mac.c b/drivers/net/wireless/mediatek/mt7601u/mac.c
+index e3928cf..e21c53e 100644
+--- a/drivers/net/wireless/mediatek/mt7601u/mac.c
++++ b/drivers/net/wireless/mediatek/mt7601u/mac.c
+@@ -182,9 +182,9 @@ void mt76_send_tx_status(struct mt7601u_dev *dev, struct mt76_tx_status *stat)
+
+ mt76_mac_fill_tx_status(dev, &info, stat);
+
+- local_bh_disable();
++ spin_lock_bh(&dev->mac_lock);
+ ieee80211_tx_status_noskb(dev->hw, sta, &info);
+- local_bh_enable();
++ spin_unlock_bh(&dev->mac_lock);
+
+ rcu_read_unlock();
+ }
+diff --git a/drivers/net/wireless/mediatek/mt7601u/mt7601u.h b/drivers/net/wireless/mediatek/mt7601u/mt7601u.h
+index bc5e294..428bd2f 100644
+--- a/drivers/net/wireless/mediatek/mt7601u/mt7601u.h
++++ b/drivers/net/wireless/mediatek/mt7601u/mt7601u.h
+@@ -141,8 +141,9 @@ enum {
+ /**
+ * struct mt7601u_dev - adapter structure
+ * @lock: protects @wcid->tx_rate.
++ * @mac_lock: locks out mac80211's tx status and rx paths.
+ * @tx_lock: protects @tx_q and changes of MT7601U_STATE_*_STATS
+- flags in @state.
++ * flags in @state.
+ * @rx_lock: protects @rx_q.
+ * @con_mon_lock: protects @ap_bssid, @bcn_*, @avg_rssi.
+ * @mutex: ensures exclusive access from mac80211 callbacks.
+@@ -177,6 +178,7 @@ struct mt7601u_dev {
+ struct mt76_wcid __rcu *wcid[N_WCIDS];
+
+ spinlock_t lock;
++ spinlock_t mac_lock;
+
+ const u16 *beacon_offsets;
+
+diff --git a/drivers/net/wireless/mediatek/mt7601u/tx.c b/drivers/net/wireless/mediatek/mt7601u/tx.c
+index 0be2080..a0a33dc 100644
+--- a/drivers/net/wireless/mediatek/mt7601u/tx.c
++++ b/drivers/net/wireless/mediatek/mt7601u/tx.c
+@@ -116,7 +116,10 @@ void mt7601u_tx_status(struct mt7601u_dev *dev, struct sk_buff *skb)
+ ieee80211_tx_info_clear_status(info);
+ info->status.rates[0].idx = -1;
+ info->flags |= IEEE80211_TX_STAT_ACK;
++
++ spin_lock(&dev->mac_lock);
+ ieee80211_tx_status(dev->hw, skb);
++ spin_unlock(&dev->mac_lock);
+ }
+
+ static int mt7601u_skb_rooms(struct mt7601u_dev *dev, struct sk_buff *skb)
+--
+cgit v0.12
+
diff --git a/src/patches/linux-3.10-dvb_tevi_s482.patch b/src/patches/linux-3.10-dvb_tevi_s482.patch
deleted file mode 100644
index fed875d..0000000
--- a/src/patches/linux-3.10-dvb_tevi_s482.patch
+++ /dev/null
@@ -1,240 +0,0 @@
-diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
-index 1a3df10..82d35c6 100644
---- a/drivers/media/usb/dvb-usb/dw2102.c
-+++ b/drivers/media/usb/dvb-usb/dw2102.c
-@@ -31,6 +31,9 @@
- #include "m88rs2000.h"
- #include "tda18271.h"
- #include "cxd2820r.h"
-+#include "m88ds3103.h"
-+#include "m88ts2022.h"
-+
-
- /* Max transfer size done by I2C transfer functions */
- #define MAX_XFER_SIZE 64
-@@ -71,6 +74,14 @@
- #define USB_PID_TEVII_S480_2 0xd482
- #endif
-
-+#ifndef USB_PID_TEVII_S482_1
-+#define USB_PID_TEVII_S482_1 0xd483
-+#endif
-+
-+#ifndef USB_PID_TEVII_S482_2
-+#define USB_PID_TEVII_S482_2 0xd484
-+#endif
-+
- #ifndef USB_PID_PROF_1100
- #define USB_PID_PROF_1100 0xb012
- #endif
-@@ -1117,6 +1128,19 @@ static struct tda18271_config tda18271_config = {
- .gate = TDA18271_GATE_DIGITAL,
- };
-
-+static const struct m88ds3103_config s482_m88ds3103_config = {
-+ .i2c_addr = 0x68,
-+ .clock = 27000000,
-+ .i2c_wr_max = 33,
-+ .clock_out = 0,
-+ .ts_mode = M88DS3103_TS_CI,
-+ .ts_clk = 16000,
-+ .ts_clk_pol = 0,
-+ .agc = 0x99,
-+ .lnb_hv_pol = 1,
-+ .lnb_en_pol = 1,
-+ };
-+
- static u8 m88rs2000_inittab[] = {
- DEMOD_WRITE, 0x9a, 0x30,
- DEMOD_WRITE, 0x00, 0x01,
-@@ -1386,6 +1410,83 @@ static int su3000_frontend_attach(struct dvb_usb_adapter *d)
- return -EIO;
- }
-
-+static int m88ds3103_frontend_attach(struct dvb_usb_adapter *d)
-+{
-+ u8 obuf[3] = { 0xe, 0x80, 0 };
-+ u8 ibuf[] = { 0 };
-+
-+ /* demod I2C adapter */
-+ struct i2c_adapter *i2c_adapter;
-+ struct i2c_client *client;
-+ struct i2c_board_info info;
-+ struct m88ts2022_config m88ts2022_config = {
-+ .clock = 27000000,
-+ };
-+ memset(&info, 0, sizeof(struct i2c_board_info));
-+ if (dvb_usb_generic_rw(d->dev, obuf, 3, ibuf, 1, 0) < 0)
-+ err("command 0x0e transfer failed.");
-+
-+ obuf[0] = 0xe;
-+ obuf[1] = 0x02;
-+ obuf[2] = 1;
-+
-+ if (dvb_usb_generic_rw(d->dev, obuf, 3, ibuf, 1, 0) < 0)
-+ err("command 0x0e transfer failed.");
-+ msleep(300);
-+
-+ obuf[0] = 0xe;
-+ obuf[1] = 0x83;
-+ obuf[2] = 0;
-+
-+ if (dvb_usb_generic_rw(d->dev, obuf, 3, ibuf, 1, 0) < 0)
-+ err("command 0x0e transfer failed.");
-+
-+ obuf[0] = 0xe;
-+ obuf[1] = 0x83;
-+ obuf[2] = 1;
-+
-+ if (dvb_usb_generic_rw(d->dev, obuf, 3, ibuf, 1, 0) < 0)
-+ err("command 0x0e transfer failed.");
-+
-+ obuf[0] = 0x51;
-+
-+ if (dvb_usb_generic_rw(d->dev, obuf, 1, ibuf, 1, 0) < 0)
-+ err("command 0x51 transfer failed.");
-+ d->fe_adap[0].fe = dvb_attach(m88ds3103_attach,
-+ &s482_m88ds3103_config,
-+ &d->dev->i2c_adap,
-+ &i2c_adapter);
-+ if (d->fe_adap[0].fe == NULL)
-+ return -EIO;
-+ /* attach tuner */
-+ m88ts2022_config.fe = d->fe_adap[0].fe;
-+ strlcpy(info.type, "m88ts2022", I2C_NAME_SIZE);
-+ info.addr = 0x60;
-+ info.platform_data = &m88ts2022_config;
-+ request_module("m88ts2022");
-+ client = i2c_new_device(i2c_adapter, &info);
-+ if (client == NULL || client->dev.driver == NULL) {
-+ dvb_frontend_detach(d->fe_adap[0].fe);
-+ goto fail_attach;
-+ }
-+ if (!try_module_get(client->dev.driver->owner)) {
-+ i2c_unregister_device(client);
-+ dvb_frontend_detach(d->fe_adap[0].fe);
-+ goto fail_attach;
-+ }
-+ info("attached m88ds3103/m88ts2022!\n");
-+
-+ /* delegate signal strength measurement to tuner */
-+
-+ d->fe_adap[0].fe->ops.read_signal_strength =
-+ d->fe_adap[0].fe->ops.tuner_ops.get_rf_strength;
-+
-+ return 0;
-+fail_attach:
-+ info("Failed to attach m88ds3103/m88ts2022!\n");
-+ return -EIO;
-+}
-+
- static int t220_frontend_attach(struct dvb_usb_adapter *d)
- {
- u8 obuf[3] = { 0xe, 0x87, 0 };
-@@ -1557,6 +1658,8 @@ enum dw2102_table_entry {
- TEVII_S480_2,
- X3M_SPC1400HD,
- TEVII_S421,
-+ TEVII_S482_1,
-+ TEVII_S482_2,
- TEVII_S632,
- TERRATEC_CINERGY_S2_R2,
- GOTVIEW_SAT_HD,
-@@ -1580,7 +1683,9 @@ static struct usb_device_id dw2102_table[] = {
- [TEVII_S480_2] = {USB_DEVICE(0x9022, USB_PID_TEVII_S480_2)},
- [X3M_SPC1400HD] = {USB_DEVICE(0x1f4d, 0x3100)},
- [TEVII_S421] = {USB_DEVICE(0x9022, USB_PID_TEVII_S421)},
-- [TEVII_S632] = {USB_DEVICE(0x9022, USB_PID_TEVII_S632)},
-+ [TEVII_S482_1] = { USB_DEVICE(0x9022, USB_PID_TEVII_S482_1) },
-+ [TEVII_S482_2] = { USB_DEVICE(0x9022, USB_PID_TEVII_S482_2) },
-+ [TEVII_S632] = { USB_DEVICE(0x9022, USB_PID_TEVII_S632) },
- [TERRATEC_CINERGY_S2_R2] = {USB_DEVICE(USB_VID_TERRATEC, 0x00b0)},
- [GOTVIEW_SAT_HD] = {USB_DEVICE(0x1FE1, USB_PID_GOTVIEW_SAT_HD)},
- [GENIATECH_T220] = {USB_DEVICE(0x1f4d, 0xD220)},
-@@ -2012,6 +2117,59 @@ static struct dvb_usb_device_properties su3000_properties = {
- }
- };
-
-+static struct dvb_usb_device_properties m88ds3103_properties = {
-+ .caps = DVB_USB_IS_AN_I2C_ADAPTER,
-+ .usb_ctrl = DEVICE_SPECIFIC,
-+ .size_of_priv = sizeof(struct su3000_state),
-+ .power_ctrl = su3000_power_ctrl,
-+ .num_adapters = 1,
-+ .identify_state = su3000_identify_state,
-+ .i2c_algo = &su3000_i2c_algo,
-+
-+ .rc.core = {
-+ .rc_interval = 150,
-+ .rc_codes = RC_MAP_TEVII_NEC,
-+ .module_name = "dw2102",
-+ .allowed_protos = RC_BIT_NEC,
-+ .rc_query = dw2102_rc_query,
-+ },
-+
-+ .read_mac_address = su3000_read_mac_address,
-+
-+ .generic_bulk_ctrl_endpoint = 0x01,
-+
-+ .adapter = {
-+ {
-+ .num_frontends = 1,
-+ .fe = { {
-+ .streaming_ctrl = su3000_streaming_ctrl,
-+ .frontend_attach = m88ds3103_frontend_attach,
-+ .stream = {
-+ .type = USB_BULK,
-+ .count = 8,
-+ .endpoint = 0x82,
-+ .u = {
-+ .bulk = {
-+ .buffersize = 4096,
-+ }
-+ }
-+ }
-+ } },
-+ }
-+ },
-+ .num_device_descs = 2,
-+ .devices = {
-+ { "TeVii S482.1 USB",
-+ { &dw2102_table[TEVII_S482_1], NULL },
-+ { NULL },
-+ },
-+ { "TeVii S482.2 USB",
-+ { &dw2102_table[TEVII_S482_2], NULL },
-+ { NULL },
-+ },
-+ }
-+};
-+
- static struct dvb_usb_device_properties t220_properties = {
- .caps = DVB_USB_IS_AN_I2C_ADAPTER,
- .usb_ctrl = DEVICE_SPECIFIC,
-@@ -2131,11 +2289,13 @@ static int dw2102_probe(struct usb_interface *intf,
- 0 == dvb_usb_device_init(intf, p7500,
- THIS_MODULE, NULL, adapter_nr) ||
- 0 == dvb_usb_device_init(intf, s421,
-- THIS_MODULE, NULL, adapter_nr) ||
-- 0 == dvb_usb_device_init(intf, &su3000_properties,
-- THIS_MODULE, NULL, adapter_nr) ||
-+ THIS_MODULE, NULL, adapter_nr) ||
- 0 == dvb_usb_device_init(intf, &t220_properties,
-- THIS_MODULE, NULL, adapter_nr))
-+ THIS_MODULE, NULL, adapter_nr) ||
-+ 0 == dvb_usb_device_init(intf, &m88ds3103_properties,
-+ THIS_MODULE, NULL, adapter_nr) ||
-+ 0 == dvb_usb_device_init(intf, &su3000_properties,
-+ THIS_MODULE, NULL, adapter_nr))
- return 0;
-
- return -ENODEV;
-@@ -2153,7 +2313,7 @@ module_usb_driver(dw2102_driver);
- MODULE_AUTHOR("Igor M. Liplianin (c) liplianin(a)me.by");
- MODULE_DESCRIPTION("Driver for DVBWorld DVB-S 2101, 2102, DVB-S2 2104,"
- " DVB-C 3101 USB2.0,"
-- " TeVii S600, S630, S650, S660, S480, S421, S632"
-+ " TeVii S600, S630, S650, S660, S480, S482, S421, S632"
- " Prof 1100, 7500 USB2.0,"
- " Geniatech SU3000, T220 devices");
- MODULE_VERSION("0.1");
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8998dde892d3e515747ee9a2e6e3fdf04ae607b9
by gitï¼ ipfire.org 26 Jan '16
by gitï¼ ipfire.org 26 Jan '16
26 Jan '16
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 8998dde892d3e515747ee9a2e6e3fdf04ae607b9 (commit)
from 00ee4eb13ce2f3cdd7deee08b6487145b46b28bb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8998dde892d3e515747ee9a2e6e3fdf04ae607b9
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Jan 26 18:02:00 2016 +0100
rsync: update to 3.1.2
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
lfs/rsync | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Difference in files:
diff --git a/lfs/rsync b/lfs/rsync
index 8899ec0..ce8c652 100644
--- a/lfs/rsync
+++ b/lfs/rsync
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> #
# #
# 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 #
@@ -24,7 +24,7 @@
include Config
-VER = 3.1.1
+VER = 3.1.2
THISAPP = rsync-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = rsync
-PAK_VER = 9
+PAK_VER = 10
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 43bd6676f0b404326eee2d63be3cdcfe
+$(DL_FILE)_MD5 = 0f758d7e000c0f7f7d3792610fad70cb
install : $(TARGET)
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 00ee4eb13ce2f3cdd7deee08b6487145b46b28bb
by gitï¼ ipfire.org 25 Jan '16
by gitï¼ ipfire.org 25 Jan '16
25 Jan '16
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 00ee4eb13ce2f3cdd7deee08b6487145b46b28bb (commit)
from 02a60a9b9e99f1a8aa20b1deefa2b622ba99a5c6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 00ee4eb13ce2f3cdd7deee08b6487145b46b28bb
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Jan 25 20:15:06 2016 +0100
kernel: update to 3.14.59
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
lfs/linux | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
Difference in files:
diff --git a/lfs/linux b/lfs/linux
index 3fd8d8c..7825322 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> #
# #
# 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 #
@@ -24,10 +24,10 @@
include Config
-VER = 3.14.57
-RPI_PATCHES = 3.14.57-grsec-ipfire1
-A7M_PATCHES = 3.14.57-grsec-ipfire1
-GRS_PATCHES = grsecurity-3.1ipfire-3.14.57-v1.patch.xz
+VER = 3.14.59
+RPI_PATCHES = 3.14.59-grsec-ipfire1
+A7M_PATCHES = 3.14.59-grsec-ipfire1
+GRS_PATCHES = grsecurity-3.1ipfire-3.14.59-v1.patch.xz
THISAPP = linux-$(VER)
@@ -37,7 +37,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
CFLAGS =
CXXFLAGS =
-PAK_VER = 64
+PAK_VER = 65
DEPS = ""
KERNEL_ARCH = $(MACHINE)
@@ -83,10 +83,11 @@ rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).
arm7-multi-patches-$(A7M_PATCHES).patch.xz = $(URL_IPFIRE)/arm7-multi-patches-$(A7M_PATCHES).patch.xz
$(GRS_PATCHES) = $(URL_IPFIRE)/$(GRS_PATCHES)
-$(DL_FILE)_MD5 = b7e254c83a0324852c8ccc4ed1b5377d
-rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 4ab53e184441c895adf318a1c2874d43
-arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = f29bd5c156384b0a4bb7c6e2c973ea06
-$(GRS_PATCHES)_MD5 = de603c5cb2e38ee308f1647ad3bd24cf
+$(DL_FILE)_MD5 = 9e3fbdf5067ffc413c0effc427050112
+rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = ed11c924a484646018be8671935407d0
+arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = eafe3ef25946d9d5169dd5af4d280ba5
+$(GRS_PATCHES)_MD5 = 63721b2131356a614edcb4d00a64e62e
+
install : $(TARGET)
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 23c6a8d710f577b503b5fd14d4067f40eaf508ff
by gitï¼ ipfire.org 23 Jan '16
by gitï¼ ipfire.org 23 Jan '16
23 Jan '16
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
via 23c6a8d710f577b503b5fd14d4067f40eaf508ff (commit)
from c26171b4b4d6606e2e64bb9c4de36223fea0924d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 23c6a8d710f577b503b5fd14d4067f40eaf508ff
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Jan 23 15:19:58 2016 +0100
core96: don't overwrite grub defaults.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/96/exclude | 1 +
1 file changed, 1 insertion(+)
Difference in files:
diff --git a/config/rootfiles/core/96/exclude b/config/rootfiles/core/96/exclude
index d87f175..8e446ce 100644
--- a/config/rootfiles/core/96/exclude
+++ b/config/rootfiles/core/96/exclude
@@ -1,6 +1,7 @@
boot/config.txt
etc/alternatives
etc/collectd.custom
+etc/default/grub
etc/ipsec.conf
etc/ipsec.secrets
etc/ipsec.user.conf
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, core96, updated. 23c6a8d710f577b503b5fd14d4067f40eaf508ff
by gitï¼ ipfire.org 23 Jan '16
by gitï¼ ipfire.org 23 Jan '16
23 Jan '16
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, core96 has been updated
via 23c6a8d710f577b503b5fd14d4067f40eaf508ff (commit)
from c26171b4b4d6606e2e64bb9c4de36223fea0924d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 23c6a8d710f577b503b5fd14d4067f40eaf508ff
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Jan 23 15:19:58 2016 +0100
core96: don't overwrite grub defaults.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/96/exclude | 1 +
1 file changed, 1 insertion(+)
Difference in files:
diff --git a/config/rootfiles/core/96/exclude b/config/rootfiles/core/96/exclude
index d87f175..8e446ce 100644
--- a/config/rootfiles/core/96/exclude
+++ b/config/rootfiles/core/96/exclude
@@ -1,6 +1,7 @@
boot/config.txt
etc/alternatives
etc/collectd.custom
+etc/default/grub
etc/ipsec.conf
etc/ipsec.secrets
etc/ipsec.user.conf
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 02a60a9b9e99f1a8aa20b1deefa2b622ba99a5c6
by gitï¼ ipfire.org 23 Jan '16
by gitï¼ ipfire.org 23 Jan '16
23 Jan '16
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 02a60a9b9e99f1a8aa20b1deefa2b622ba99a5c6 (commit)
from cf82da6b376e4c7456a0690968ad2e879029a70c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 02a60a9b9e99f1a8aa20b1deefa2b622ba99a5c6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Jan 23 01:46:42 2016 +0000
squid: Actually make --with-filedescriptors work
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
.../{oldcore/94 => core/97}/filelists/squid | 0
config/rootfiles/core/97/update.sh | 2 ++
lfs/squid | 4 ++++
.../squid-3.4.14-fix-max-file-descriptors.patch | 21 +++++++++++++++++++++
4 files changed, 27 insertions(+)
copy config/rootfiles/{oldcore/94 => core/97}/filelists/squid (100%)
create mode 100644 src/patches/squid-3.4.14-fix-max-file-descriptors.patch
Difference in files:
diff --git a/config/rootfiles/core/97/filelists/squid b/config/rootfiles/core/97/filelists/squid
new file mode 120000
index 0000000..2dc8372
--- /dev/null
+++ b/config/rootfiles/core/97/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/core/97/update.sh b/config/rootfiles/core/97/update.sh
index 4cd6abe..541c5f8 100644
--- a/config/rootfiles/core/97/update.sh
+++ b/config/rootfiles/core/97/update.sh
@@ -32,6 +32,7 @@ do
done
# Stop services
+/etc/init.d/squid stop
/etc/init.d/dnsmasq stop
# Extract files
@@ -46,6 +47,7 @@ paxctl -mpexs /usr/bin/grub-script-check
# Start services
/etc/init.d/dnsmasq start
/etc/init.d/sshd restart
+/etc/init.d/squid start
# Delete old QoS enabled indicator
rm -f /var/ipfire/qos/enable
diff --git a/lfs/squid b/lfs/squid
index de6c87d..c2b3935 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -71,6 +71,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13228.patch
+ cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4.14-fix-max-file-descriptors.patch
+ cd $(DIR_APP) && autoreconf -vfi
+ cd $(DIR_APP)/libltdl && autoreconf -vfi
+
cd $(DIR_APP) && ./configure \
--prefix=/usr \
--sysconfdir=/etc/squid \
diff --git a/src/patches/squid-3.4.14-fix-max-file-descriptors.patch b/src/patches/squid-3.4.14-fix-max-file-descriptors.patch
new file mode 100644
index 0000000..54275b8
--- /dev/null
+++ b/src/patches/squid-3.4.14-fix-max-file-descriptors.patch
@@ -0,0 +1,21 @@
+--- configure.ac~ 2016-01-23 01:27:44.078013879 +0000
++++ configure.ac 2016-01-23 01:28:19.422179243 +0000
+@@ -2573,6 +2573,9 @@
+ ;;
+ esac
+
++SQUID_CHECK_DEFAULT_FD_SETSIZE
++SQUID_CHECK_MAXFD
++
+ dnl --with-maxfd present for compatibility with Squid-2.
+ dnl undocumented in ./configure --help to encourage using the Squid-3 directive
+ AC_ARG_WITH(maxfd,,
+@@ -2603,8 +2606,6 @@
+ esac
+ ])
+
+-SQUID_CHECK_DEFAULT_FD_SETSIZE
+-SQUID_CHECK_MAXFD
+ if test "x$squid_filedescriptors_num" != "x"; then
+ AC_MSG_NOTICE([Default number of fieldescriptors: $squid_filedescriptors_num])
+ fi
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. cf82da6b376e4c7456a0690968ad2e879029a70c
by gitï¼ ipfire.org 23 Jan '16
by gitï¼ ipfire.org 23 Jan '16
23 Jan '16
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via cf82da6b376e4c7456a0690968ad2e879029a70c (commit)
via c97698a8f4b2520e198521c3d67a25efc3ad3776 (commit)
via 665f79926d025fec413531c397ccd6998583237e (commit)
via 43638be58b2ae99bd07a420c5f340222e2744feb (commit)
via 1b5b6c91dae0316c9453fe7560c1d39fc453ebcb (commit)
via a249e865bd15f8f9041db8e3894cdae4dc4b25ca (commit)
via f97c6774ef3e4bd4cf77b5e6ff1870bc0f7e271b (commit)
via 9877d28d9e2daf49324cbf2120d00ab7169da0d3 (commit)
via c26171b4b4d6606e2e64bb9c4de36223fea0924d (commit)
via 32dd84e81722dfb6b3053b9643deef1e6113e68f (commit)
via 1a781c8a29b2a8e758ec556d4e6f845b6db78dff (commit)
via ff441e4d3fb96d71b4d547fb7b4ab65ef18a51bd (commit)
from 92e4521572f0a5a6411ce74a7a70b9b65dcebb26 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit cf82da6b376e4c7456a0690968ad2e879029a70c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Jan 23 00:41:02 2016 +0000
core97: Ship updated CGI files
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c97698a8f4b2520e198521c3d67a25efc3ad3776
Merge: 665f799 43638be
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Jan 23 00:39:24 2016 +0000
Merge remote-tracking branch 'meitelwein/web-gui-ipv6' into next
commit 665f79926d025fec413531c397ccd6998583237e
Merge: 92e4521 c26171b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Jan 23 00:39:19 2016 +0000
Merge remote-tracking branch 'origin/master' into next
commit 43638be58b2ae99bd07a420c5f340222e2744feb
Author: Michael Eitelwein <michael(a)eitelwein.net>
Date: Sat Jan 9 20:09:58 2016 +0100
No code changes, fixed formatting by replacing spaces with tabs
commit 1b5b6c91dae0316c9453fe7560c1d39fc453ebcb
Author: Michael Eitelwein <michael(a)eitelwein.net>
Date: Thu Jan 7 19:40:24 2016 +0100
Fixed detection of firewall chain when bridge is used for ipv6
Signed-off-by: Michael Eitelwein <michael(a)eitelwein.net>
commit a249e865bd15f8f9041db8e3894cdae4dc4b25ca
Author: Michael Eitelwein <michael(a)eitelwein.net>
Date: Thu Jan 7 16:55:11 2016 +0100
Firewall chain was not extracted correctly when ipv6 uses bridge
Signed-off-by: Michael Eitelwein <michael(a)eitelwein.net>
commit f97c6774ef3e4bd4cf77b5e6ff1870bc0f7e271b
Author: Michael Eitelwein <michael(a)eitelwein.net>
Date: Thu Jan 7 15:24:13 2016 +0100
Fix regex to extract firewall chain for ipv6 in showrequestfrom*.dat
If bridged ipv6 is used, $iface is taken from PHYSIN
In the log line the order of fields is "... IN=XY OUT=XY PHYSIN=XY ..."
Signed-off-by: Michael Eitelwein <michael(a)eitelwein.net>
commit 9877d28d9e2daf49324cbf2120d00ab7169da0d3
Author: Michael Eitelwein <michael(a)eitelwein.net>
Date: Thu Jan 7 14:00:01 2016 +0100
Enable correct display of ipv6 entries in Firewall log pages of web UI.
3 main changes:
- Fill $iface and $out from PHYSIN and PHYSOUT when looking at bridged packets, othwerwise fill from IN and OUT
- Recognize ipv4 and ipv6 address style for $srcaddr and $dstaddr
- Match color coding of tables to pie charts (see seperate patch sent earlier)
I am using the bridged ipv6 setup as proposed in the wiki. I do not think this breaks anything when not using ipv6. So it would be nice to include this even if ipv6 is not officially supported yet. It is quite useful when using the ipv6 setup.
Signed-off-by: Michael Eitelwein <michael(a)eitelwein.net>
---
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/97/filelists/files | 7 +
config/rootfiles/oldcore/96/update.sh | 11 +-
html/cgi-bin/logs.cgi/firewalllog.dat | 492 ++++++++++-----------
html/cgi-bin/logs.cgi/firewalllogcountry.dat | 520 ++++++++++++-----------
html/cgi-bin/logs.cgi/firewalllogip.dat | 435 ++++++++++---------
html/cgi-bin/logs.cgi/firewalllogport.dat | 405 +++++++++---------
html/cgi-bin/logs.cgi/showrequestfromcountry.dat | 378 ++++++++--------
html/cgi-bin/logs.cgi/showrequestfromip.dat | 300 ++++++-------
html/cgi-bin/logs.cgi/showrequestfromport.dat | 302 ++++++-------
9 files changed, 1473 insertions(+), 1377 deletions(-)
Difference in files:
diff --git a/config/rootfiles/core/97/filelists/files b/config/rootfiles/core/97/filelists/files
index 3d9d483..8586e6a 100644
--- a/config/rootfiles/core/97/filelists/files
+++ b/config/rootfiles/core/97/filelists/files
@@ -2,6 +2,13 @@ etc/system-release
etc/issue
etc/rc.d/init.d/firewall
etc/modprobe.d/nf_conntrack.conf
+srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat
+srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat
+srv/web/ipfire/cgi-bin/logs.cgi/firewalllogip.dat
+srv/web/ipfire/cgi-bin/logs.cgi/firewalllogport.dat
+srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat
+srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromip.dat
+srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromport.dat
srv/web/ipfire/cgi-bin/optionsfw.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/qos.cgi
diff --git a/config/rootfiles/oldcore/96/update.sh b/config/rootfiles/oldcore/96/update.sh
index a3cf5cf..fa53cea 100644
--- a/config/rootfiles/oldcore/96/update.sh
+++ b/config/rootfiles/oldcore/96/update.sh
@@ -34,13 +34,13 @@ done
# Stop services
/etc/init.d/fcron stop
/etc/init.d/collectd stop
-qosctrl stop
+/usr/local/bin/qosctrl stop
# Backup RRDs
if [ -d "/var/log/rrd.bak" ]; then
# Umount ramdisk
umount -l "/var/log/rrd"
- rm -f "/var/log/rrd"
+ rm -rf "/var/log/rrd"
mv "/var/log/rrd.bak/vnstat" "/var/log/vnstat"
mv "/var/log/rrd.bak" "/var/log/rrd"
@@ -56,7 +56,10 @@ rm -f /etc/rc.d/init.d/tmpfs \
extract_files
# Update Language cache
-# /usr/local/bin/update-lang-cache
+/usr/local/bin/update-lang-cache
+
+# Remove Ramdisk entry from fstab
+sed -i -e "s|^none\s/var/log/rrd.*||g" /etc/fstab
# Keep (almost) old ramdisk behaviour
if [ ! -e "/etc/sysconfig/ramdisk" ]; then
@@ -83,7 +86,7 @@ fi
/etc/init.d/vnstat start
/etc/init.d/fcron start
/etc/init.d/dnsmasq restart
-qosctrl start
+/usr/local/bin/qosctrl start
# Disable loading of cryptodev
sed -e "s/^cryptodev/# &/g" -i /etc/sysconfig/modules
diff --git a/html/cgi-bin/logs.cgi/firewalllog.dat b/html/cgi-bin/logs.cgi/firewalllog.dat
index 5a584d6..5c9722b 100644
--- a/html/cgi-bin/logs.cgi/firewalllog.dat
+++ b/html/cgi-bin/logs.cgi/firewalllog.dat
@@ -41,11 +41,11 @@ my %logsettings=();
my $errormessage = '';
my @shortmonths = ( 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug',
- 'Sep', 'Oct', 'Nov', 'Dec' );
+ 'Sep', 'Oct', 'Nov', 'Dec' );
my @longmonths = ( $Lang::tr{'january'}, $Lang::tr{'february'}, $Lang::tr{'march'},
- $Lang::tr{'april'}, $Lang::tr{'may'}, $Lang::tr{'june'}, $Lang::tr{'july'}, $Lang::tr{'august'},
- $Lang::tr{'september'}, $Lang::tr{'october'}, $Lang::tr{'november'},
- $Lang::tr{'december'} );
+ $Lang::tr{'april'}, $Lang::tr{'may'}, $Lang::tr{'june'}, $Lang::tr{'july'}, $Lang::tr{'august'},
+ $Lang::tr{'september'}, $Lang::tr{'october'}, $Lang::tr{'november'},
+ $Lang::tr{'december'} );
my @now = localtime();
my $dow = $now[6];
@@ -66,55 +66,55 @@ my $start = ($logsettings{'LOGVIEW_REVERSE'} eq 'on') ? 0x7FFFF000 : 0; #index o
if ($ENV{'QUERY_STRING'} && $cgiparams{'ACTION'} ne $Lang::tr{'update'})
{
- my @temp = split(',',$ENV{'QUERY_STRING'});
- $start = $temp[0];
- $cgiparams{'MONTH'} = $temp[1];
- $cgiparams{'DAY'} = $temp[2];
+ my @temp = split(',',$ENV{'QUERY_STRING'});
+ $start = $temp[0];
+ $cgiparams{'MONTH'} = $temp[1];
+ $cgiparams{'DAY'} = $temp[2];
}
if (!($cgiparams{'MONTH'} =~ /^(0|1|2|3|4|5|6|7|8|9|10|11)$/) ||
- !($cgiparams{'DAY'} =~ /^(0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31)$/))
+ !($cgiparams{'DAY'} =~ /^(0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31)$/))
{
- $cgiparams{'DAY'} = $now[3];
- $cgiparams{'MONTH'} = $now[4];
+ $cgiparams{'DAY'} = $now[3];
+ $cgiparams{'MONTH'} = $now[4];
}
elsif($cgiparams{'ACTION'} eq '>>')
{
- my @temp_then=();
- my @temp_now = localtime(time);
- $temp_now[4] = $cgiparams{'MONTH'};
- $temp_now[3] = $cgiparams{'DAY'};
- if ($cgiparams{'DAY'}) {
- @temp_then = localtime(POSIX::mktime(@temp_now) + 86400);
- ## Retrieve the same time on the next day +
- ## 86400 seconds in a day
- } else {
- $temp_now[3] = 1;
- $temp_now[4] = ($temp_now[4]+1) %12;
- @temp_then = localtime(POSIX::mktime(@temp_now) );
- $temp_then[3] = 0;
- }
- $cgiparams{'MONTH'} = $temp_then[4];
- $cgiparams{'DAY'} = $temp_then[3];
+ my @temp_then=();
+ my @temp_now = localtime(time);
+ $temp_now[4] = $cgiparams{'MONTH'};
+ $temp_now[3] = $cgiparams{'DAY'};
+ if ($cgiparams{'DAY'}) {
+ @temp_then = localtime(POSIX::mktime(@temp_now) + 86400);
+ ## Retrieve the same time on the next day +
+ ## 86400 seconds in a day
+ } else {
+ $temp_now[3] = 1;
+ $temp_now[4] = ($temp_now[4]+1) %12;
+ @temp_then = localtime(POSIX::mktime(@temp_now) );
+ $temp_then[3] = 0;
+ }
+ $cgiparams{'MONTH'} = $temp_then[4];
+ $cgiparams{'DAY'} = $temp_then[3];
}
elsif($cgiparams{'ACTION'} eq '<<')
{
- my @temp_then=();
- my @temp_now = localtime(time);
- $temp_now[4] = $cgiparams{'MONTH'};
- $temp_now[3] = $cgiparams{'DAY'};
- if ($cgiparams{'DAY'}) {
- @temp_then = localtime(POSIX::mktime(@temp_now) - 86400);
- ## Retrieve the same time on the next day -
- ## 86400 seconds in a day
- } else {
- $temp_now[3] = 1;
- $temp_now[4] = ($temp_now[4]-1) %12;
- @temp_then = localtime(POSIX::mktime(@temp_now) );
- $temp_then[3] = 0;
- }
- $cgiparams{'MONTH'} = $temp_then[4];
- $cgiparams{'DAY'} = $temp_then[3];
+ my @temp_then=();
+ my @temp_now = localtime(time);
+ $temp_now[4] = $cgiparams{'MONTH'};
+ $temp_now[3] = $cgiparams{'DAY'};
+ if ($cgiparams{'DAY'}) {
+ @temp_then = localtime(POSIX::mktime(@temp_now) - 86400);
+ ## Retrieve the same time on the next day -
+ ## 86400 seconds in a day
+ } else {
+ $temp_now[3] = 1;
+ $temp_now[4] = ($temp_now[4]-1) %12;
+ @temp_then = localtime(POSIX::mktime(@temp_now) );
+ $temp_then[3] = 0;
+ }
+ $cgiparams{'MONTH'} = $temp_then[4];
+ $cgiparams{'DAY'} = $temp_then[3];
}
# Find in which file.gz is the log. Can be calculated because WEEKLY ROTATING of access.log
@@ -122,104 +122,104 @@ my $gzindex;
my $date = $cgiparams{'DAY'} == 0 ? '' : $cgiparams{'DAY'} <= 9 ? "0$cgiparams{'DAY'}" : "$cgiparams{'DAY'}";
{
- my $xday;
-
- # Calculate time. If future date, calculate for past year !!!
- if (( $cgiparams{'MONTH'} eq $now[4]) && ($cgiparams{'DAY'} > $now[3]) ||
- ( $cgiparams{'MONTH'} > $now[4] ) ) {
- $xday = POSIX::mktime( 0, 0, 0, $cgiparams{'DAY'}, $cgiparams{'MONTH'}, $year - 1901 );
- $date = "$longmonths[$cgiparams{'MONTH'}] $date, ". int($year-1);
- } else {
- $xday = POSIX::mktime( 0, 0, 0, $cgiparams{'DAY'}, $cgiparams{'MONTH'}, $year - 1900 );
- $date = "$longmonths[$cgiparams{'MONTH'}] $date, $year";
- }
-
- # calculate end of active week (saturday 23H59)
- my @then = ();
- @then = localtime(time());
- my $sunday = POSIX::mktime( 0, 0, 0, @then[3], @then[4], @then[5]);
- $sunday += (6-$then[6]) * 86400;
-
- # Convert delta in second to full weeks
- $gzindex = int (($sunday-$xday)/604800 );
+ my $xday;
+
+ # Calculate time. If future date, calculate for past year !!!
+ if (( $cgiparams{'MONTH'} eq $now[4]) && ($cgiparams{'DAY'} > $now[3]) ||
+ ( $cgiparams{'MONTH'} > $now[4] ) ) {
+ $xday = POSIX::mktime( 0, 0, 0, $cgiparams{'DAY'}, $cgiparams{'MONTH'}, $year - 1901 );
+ $date = "$longmonths[$cgiparams{'MONTH'}] $date, ". int($year-1);
+ } else {
+ $xday = POSIX::mktime( 0, 0, 0, $cgiparams{'DAY'}, $cgiparams{'MONTH'}, $year - 1900 );
+ $date = "$longmonths[$cgiparams{'MONTH'}] $date, $year";
+ }
+
+ # calculate end of active week (saturday 23H59)
+ my @then = ();
+ @then = localtime(time());
+ my $sunday = POSIX::mktime( 0, 0, 0, @then[3], @then[4], @then[5]);
+ $sunday += (6-$then[6]) * 86400;
+
+ # Convert delta in second to full weeks
+ $gzindex = int (($sunday-$xday)/604800 );
}
-
+
my $monthstr = $shortmonths[$cgiparams{'MONTH'}];
my $daystr = $cgiparams{'DAY'} == 0 ? '..' : $cgiparams{'DAY'} <= 9 ? " $cgiparams{'DAY'}" : "$cgiparams{'DAY'}";
-
+
my $lines = 0;
my @log=();
my $loop = 1;
my $filestr = 0;
-my $lastdatetime; # for debug
+my $lastdatetime; # for debug
my $search_for_end = 0;
-
+
while ($gzindex >=0 && $loop) {
- # calculate file name
- if ($gzindex == 0) {
- $filestr = "/var/log/messages";
- } else {
- $filestr = "/var/log/messages.$gzindex";
- $filestr = "$filestr.gz" if -f "$filestr.gz";
- }
- # now read file if existing
- if (open (FILE,($filestr =~ /.gz$/ ? "gzip -dc $filestr |" : $filestr))) {
- #&General::log("reading $filestr");
- READ:while (<FILE>) {
- my $line = $_;
- if ($line =~ /^${monthstr} ${daystr} ..:..:.. [\w\-]+ kernel:.*IN=.*$/) {
- # when standart viewing, just keep in memory the correct slice
- # it starts a '$start' and size is $viewport
- # If export, then keep all lines...
- if ($cgiparams{'ACTION'} eq $Lang::tr{'export'}){
- $log[$lines++] = "$line";
- } else {
- if ($lines++ < ($start + $Header::viewsize)) {
- push(@log,"$line");
- if (@log > $Header::viewsize) {
- shift (@log);
- }
- #} else { dont do this optimisation, need to count lines !
- # $datetime = $maxtime; # we have read viewsize lines, stop main loop
- # last READ; # exit read file
- }
- }
- $search_for_end = 1; # we find the start of slice, can look for end now
- } else {
- if ($search_for_end == 1) {
- #finish read files when date is over (test month equality only)
- $line =~ /^(...) (..) ..:..:..*$/;
- $loop = 0 if ( ($1 ne $monthstr) || ( ($daystr ne '..') && ($daystr ne $2) ) );
- }
- }
- }
- close (FILE);
- }
- $gzindex--; # will try next gz file eg 40,39,38,.... because it may have holes when ipcop stopped
- # for a long time
+ # calculate file name
+ if ($gzindex == 0) {
+ $filestr = "/var/log/messages";
+ } else {
+ $filestr = "/var/log/messages.$gzindex";
+ $filestr = "$filestr.gz" if -f "$filestr.gz";
+ }
+ # now read file if existing
+ if (open (FILE,($filestr =~ /.gz$/ ? "gzip -dc $filestr |" : $filestr))) {
+ #&General::log("reading $filestr");
+ READ:while (<FILE>) {
+ my $line = $_;
+ if ($line =~ /^${monthstr} ${daystr} ..:..:.. [\w\-]+ kernel:.*IN=.*$/) {
+ # when standart viewing, just keep in memory the correct slice
+ # it starts a '$start' and size is $viewport
+ # If export, then keep all lines...
+ if ($cgiparams{'ACTION'} eq $Lang::tr{'export'}){
+ $log[$lines++] = "$line";
+ } else {
+ if ($lines++ < ($start + $Header::viewsize)) {
+ push(@log,"$line");
+ if (@log > $Header::viewsize) {
+ shift (@log);
+ }
+ #} else { dont do this optimisation, need to count lines !
+ # $datetime = $maxtime; # we have read viewsize lines, stop main loop
+ # last READ; # exit read file
+ }
+ }
+ $search_for_end = 1; # we find the start of slice, can look for end now
+ } else {
+ if ($search_for_end == 1) {
+ #finish read files when date is over (test month equality only)
+ $line =~ /^(...) (..) ..:..:..*$/;
+ $loop = 0 if ( ($1 ne $monthstr) || ( ($daystr ne '..') && ($daystr ne $2) ) );
+ }
+ }
+ }
+ close (FILE);
+ }
+ $gzindex--; # will try next gz file eg 40,39,38,.... because it may have holes when ipcop stopped
+ # for a long time
}# while
# $errormessage = "$Lang::tr{'date not in logs'}: $filestr $Lang::tr{'could not be opened'}";
if ($cgiparams{'ACTION'} eq $Lang::tr{'export'})
{
- print "Content-type: text/plain\n\n";
- print "IPFire firewall log\r\n";
- print "$Lang::{'date'}: $date\r\n\r\n";
-
- if ($logsettings{'LOGVIEW_REVERSE'} eq 'on') { @log = reverse @log; }
-
- foreach $_ (@log)
- {
- /^... (..) (..:..:..) [\w\-]+ kernel:.*(IN=.*)$/;
- my $day = $1;
- $day =~ tr / /0/;
- my $time = $cgiparams{'DAY'} ? "$2" : "$day/$2" ;
- print "$time $3\r\n";
-
- }
- exit 0;
+ print "Content-type: text/plain\n\n";
+ print "IPFire firewall log\r\n";
+ print "$Lang::{'date'}: $date\r\n\r\n";
+
+ if ($logsettings{'LOGVIEW_REVERSE'} eq 'on') { @log = reverse @log; }
+
+ foreach $_ (@log)
+ {
+ /^... (..) (..:..:..) [\w\-]+ kernel:.*(IN=.*)$/;
+ my $day = $1;
+ $day =~ tr / /0/;
+ my $time = $cgiparams{'DAY'} ? "$2" : "$day/$2" ;
+ print "$time $3\r\n";
+
+ }
+ exit 0;
}
&Header::showhttpheaders();
@@ -229,9 +229,9 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'export'})
&Header::openbigbox('100%', 'left', '', $errormessage);
if ($errormessage) {
- &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
- print "<font class='base'>$errormessage </font>\n";
- &Header::closebox();
+ &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
+ print "<font class='base'>$errormessage </font>\n";
+ &Header::closebox();
}
&Header::openbox('100%', 'left', "$Lang::tr{'settings'}");
@@ -240,33 +240,35 @@ print <<END
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<table width='100%'>
<tr>
- <td width='10%' class='base'>$Lang::tr{'month'}: </td>
- <td width='10%'>
- <select name='MONTH'>
+ <td width='10%' class='base'>$Lang::tr{'month'}: </td>
+ <td width='10%'>
+ <select name='MONTH'>
END
;
for (my $month = 0; $month < 12; $month++)
{
- print "\t<option ";
- if ($month == $cgiparams{'MONTH'}) {
- print "selected='selected' "; }
- print "value='$month'>$longmonths[$month]</option>\n";
+ print "\t<option ";
+ if ($month == $cgiparams{'MONTH'}) {
+ print "selected='selected' ";
+ }
+ print "value='$month'>$longmonths[$month]</option>\n";
}
print <<END
- </select>
- </td>
- <td width='10%' class='base' align='right'> $Lang::tr{'day'}: </td>
- <td width='40%'>
- <select name='DAY'>
+ </select>
+ </td>
+ <td width='10%' class='base' align='right'> $Lang::tr{'day'}: </td>
+ <td width='40%'>
+ <select name='DAY'>
END
;
print "<option value='0'>$Lang::tr{'all'}</option>\n";
for (my $day = 1; $day <= 31; $day++)
{
- print "\t<option ";
- if ($day == $cgiparams{'DAY'}) {
- print "selected='selected' "; }
- print "value='$day'>$day</option>\n";
+ print "\t<option ";
+ if ($day == $cgiparams{'DAY'}) {
+ print "selected='selected' ";
+ }
+ print "value='$day'>$day</option>\n";
}
print <<END
</select>
@@ -291,20 +293,20 @@ $start = $lastPageIndex if ($start >= $lastPageIndex);
$start = 0 if ($start < 0);
my $prev;
- if ($start == 0) {
- $prev = -1;
- } else {
- $prev = $start - ${Header::viewsize};
- $prev = 0 if ( $prev < 0);
- }
-
+if ($start == 0) {
+ $prev = -1;
+} else {
+ $prev = $start - ${Header::viewsize};
+ $prev = 0 if ( $prev < 0);
+}
+
my $next;
- if ($start == $lastPageIndex) {
- $next = -1;
- } else {
- $next = $start + ${Header::viewsize};
- $next = $lines - ${Header::viewsize} if ($next >= $lines - ${Header::viewsize});
- }
+if ($start == $lastPageIndex) {
+ $next = -1;
+} else {
+ $next = $start + ${Header::viewsize};
+ $next = $lines - ${Header::viewsize} if ($next >= $lines - ${Header::viewsize});
+}
if ($logsettings{'LOGVIEW_REVERSE'} eq 'on') { @log = reverse @log; }
if ($lines != 0) { &oldernewer(); }
@@ -312,14 +314,14 @@ if ($lines != 0) { &oldernewer(); }
print <<END
<table width='100%' class='tbl'>
<tr>
- <th align='center' class='boldbase'><b>$Lang::tr{'time'}</b></th>
- <th align='center' class='boldbase'><b>$Lang::tr{'chain'}</b></th>
- <th align='center' class='boldbase'><b>$Lang::tr{'iface'}</b></th>
- <th align='center' class='boldbase'><b>$Lang::tr{'proto'}</b></th>
- <th align='center' class='boldbase'><b>$Lang::tr{'source'}<br/>$Lang::tr{'destination'}</b></th>
- <th align='center' class='boldbase'><b>$Lang::tr{'src port'}<br />$Lang::tr{'dst port'}</b></th>
- <th align='center' class='boldbase'><b>$Lang::tr{'country'}</b></th>
- <th align='center' class='boldbase'><b>$Lang::tr{'mac address'}</b></th>
+ <th align='center' class='boldbase'><b>$Lang::tr{'time'}</b></th>
+ <th align='center' class='boldbase'><b>$Lang::tr{'chain'}</b></th>
+ <th align='center' class='boldbase'><b>$Lang::tr{'iface'}</b></th>
+ <th align='center' class='boldbase'><b>$Lang::tr{'proto'}</b></th>
+ <th align='center' class='boldbase'><b>$Lang::tr{'source'}<br/>$Lang::tr{'destination'}</b></th>
+ <th align='center' class='boldbase'><b>$Lang::tr{'src port'}<br />$Lang::tr{'dst port'}</b></th>
+ <th align='center' class='boldbase'><b>$Lang::tr{'country'}</b></th>
+ <th align='center' class='boldbase'><b>$Lang::tr{'mac address'}</b></th>
</tr>
END
;
@@ -328,66 +330,76 @@ END
$lines = 0;
foreach $_ (@log)
{
- /^... (..) (..:..:..) [\w\-]+ kernel:(.*)(IN=.*)$/;
- my $day = $1;
- $day =~ tr / /0/;
- my $time = $cgiparams{'DAY'} ? "$2" : "$day/$2" ;
- my $comment = $3;
- my $packet = $4;
-
- my ($iface, $srcaddr, $dstaddr, $macaddr, $proto, $srcport, $dstport);
- $iface=$1 if $packet =~ /IN=(\w+)/;
- $srcaddr=$1 if $packet =~ /SRC=([\d\.]+)/;
- $dstaddr=$1 if $packet =~ /DST=([\d\.]+)/;
- $macaddr=$1 if $packet =~ /MAC=([\w+\:]+)/;
- $proto=$1 if $packet =~ /PROTO=(\w+)/;
- $srcport=$1 if $packet =~ /SPT=(\d+)/;
- $dstport=$1 if $packet =~ /DPT=(\d+)/;
-
- my $gi = Geo::IP::PurePerl->new();
- my $ccode = $gi->country_code_by_name($srcaddr);
- my $fcode = lc($ccode);
-
- my $servi = uc(getservbyport($srcport, lc($proto)));
- if ($servi ne '' && $srcport < 1024) {
- $srcport = "$srcport($servi)"; }
- $servi = uc(getservbyport($dstport, lc($proto)));
- if ($servi ne '' && $dstport < 1024) {
- $dstport = "$dstport($servi)";}
- my @mactemp = split(/:/,$macaddr);
- $macaddr = "$mactemp[6]:$mactemp[7]:$mactemp[8]:$mactemp[9]:$mactemp[10]:$mactemp[11]";
- my $col="";
- if ($lines % 2) {
- print "<tr>";
- $col="bgcolor='$color{'color20'}'"; }
- else {
- print "<tr>";
- $col="bgcolor='$color{'color22'}'"; }
- print <<END
-
- <td align='center' $col>$time</td>
- <td align='center' $col>$comment</td>
- <td align='center' $col>$iface</td>
- <td align='center' $col>$proto</td>
- <td align='center' $col><a href='/cgi-bin/ipinfo.cgi?ip=$srcaddr'>$srcaddr</a><br /><a href='/cgi-bin/ipinfo.cgi?ip=$dstaddr'>$dstaddr</a></td>
- <td align='center' $col>$srcport<br/>$dstport</td>
+ # If ipv6 uses a bridge, PHYSIN= contains the relevant iface information
+ # otherwise use IN=
+ my $packet = '';
+ if ($_ =~ /^... (..) (..:..:..) [\w\-]+ kernel:(.*)(IN=.*)(PHYSIN=.*)$/) { $packet = $5; }
+ elsif ($_ =~ /^... (..) (..:..:..) [\w\-]+ kernel:(.*)(IN=.*)$/) { $packet = $4; }
+ my $day = $1;
+ $day =~ tr / /0/;
+ my $time = $cgiparams{'DAY'} ? "$2" : "$day/$2" ;
+ my $chain = $3;
+
+ my ($iface, $srcaddr, $dstaddr, $macaddr, $proto, $srcport, $dstport);
+ if ($packet =~ /PHYSIN=(\w+)/) { $iface=$1; } elsif ($packet =~ /IN=(\w+)/) { $iface = $1; }
+ # Identify whether ipv4 or ipv6. Both are mutally exclusive.
+ if ($packet =~ /SRC\=(([\d]{1,3})(\.([\d]{1,3})){3})/) { $srcaddr=$1; }
+ if ($packet =~ /SRC\=(([0-9a-fA-F]{0,4})(\:([0-9a-fA-F]{0,4})){2,7})/) { $srcaddr=$1; }
+ if ($packet =~ /DST\=(([\d]{1,3})(\.([\d]{1,3})){3})/) { $dstaddr=$1; }
+ if ($packet =~ /DST\=(([0-9a-fA-F]{0,4})(\:([0-9a-fA-F]{0,4})){2,7})/) { $dstaddr=$1; }
+ $macaddr=$1 if $packet =~ /MAC=([\w+\:]+)/;
+ $proto=$1 if $packet =~ /PROTO=(\w+)/;
+ $srcport=$1 if $packet =~ /SPT=(\d+)/;
+ $dstport=$1 if $packet =~ /DPT=(\d+)/;
+
+ my $gi = Geo::IP::PurePerl->new();
+ my $ccode = $gi->country_code_by_name($srcaddr);
+ my $fcode = lc($ccode);
+
+ my $servi = uc(getservbyport($srcport, lc($proto)));
+ if ($servi ne '' && $srcport < 1024) {
+ $srcport = "$srcport($servi)";
+ }
+ $servi = uc(getservbyport($dstport, lc($proto)));
+ if ($servi ne '' && $dstport < 1024) {
+ $dstport = "$dstport($servi)";
+ }
+ my @mactemp = split(/:/,$macaddr);
+ $macaddr = "$mactemp[6]:$mactemp[7]:$mactemp[8]:$mactemp[9]:$mactemp[10]:$mactemp[11]";
+ my $col="";
+ if ($lines % 2) {
+ print "<tr>";
+ $col="bgcolor='$color{'color20'}'";
+ }
+ else {
+ print "<tr>";
+ $col="bgcolor='$color{'color22'}'";
+ }
+ print <<END
+
+ <td align='center' $col>$time</td>
+ <td align='center' $col>$chain</td>
+ <td align='center' $col>$iface</td>
+ <td align='center' $col>$proto</td>
+ <td align='center' $col><a href='/cgi-bin/ipinfo.cgi?ip=$srcaddr'>$srcaddr</a><br /><a href='/cgi-bin/ipinfo.cgi?ip=$dstaddr'>$dstaddr</a></td>
+ <td align='center' $col>$srcport<br/>$dstport</td>
END
-;
+ ;
# Get flag icon for of the country.
my $flag_icon = &GeoIP::get_flag_icon($fcode);
- if ( $flag_icon) {
+ if ( $flag_icon) {
print "<td align='center' $col><a href='../country.cgi#$fcode'><img src='$flag_icon' border='0' align='absmiddle' alt='$ccode'></a></td>";
} else {
print "<td align='center' $col></td>";
}
- print <<END
- <td align='center' $col>$macaddr</td>
-</tr>
+ print <<END
+ <td align='center' $col>$macaddr</td>
+ </tr>
END
- ;
- $lines++;
+ ;
+ $lines++;
}
print "</table>";
@@ -402,32 +414,36 @@ print "</table>";
sub oldernewer
{
-print <<END
-<table width='100%'>
-<tr>
+ print <<END
+ <table width='100%'>
+ <tr>
END
-;
+ ;
-print "<td align='center' width='50%'>";
-if ($prev != -1) {
- print "<a href='/cgi-bin/logs.cgi/firewalllog.dat?0,$cgiparams{'MONTH'},$cgiparams{'DAY'}'>$Lang::tr{'first'}</a> ";
- print "<a href='/cgi-bin/logs.cgi/firewalllog.dat?$prev,$cgiparams{'MONTH'},$cgiparams{'DAY'}'>$Lang::tr{'older'}</a>"; }
-else {
- print "$Lang::tr{'first'} $Lang::tr{'older'}"; }
-print "</td>\n";
-
-print "<td align='center' width='50%'>";
-if ($next >= 0) {
- print "<a href='/cgi-bin/logs.cgi/firewalllog.dat?$next,$cgiparams{'MONTH'},$cgiparams{'DAY'}'>$Lang::tr{'newer'}</a> ";
- print "<a href='/cgi-bin/logs.cgi/firewalllog.dat?$lastPageIndex,$cgiparams{'MONTH'},$cgiparams{'DAY'}'>$Lang::tr{'last'}</a>"; }
-else {
- print "$Lang::tr{'newer'} $Lang::tr{'last'} "; }
-print "</td>\n";
+ print "<td align='center' width='50%'>";
+ if ($prev != -1) {
+ print "<a href='/cgi-bin/logs.cgi/firewalllog.dat?0,$cgiparams{'MONTH'},$cgiparams{'DAY'}'>$Lang::tr{'first'}</a> ";
+ print "<a href='/cgi-bin/logs.cgi/firewalllog.dat?$prev,$cgiparams{'MONTH'},$cgiparams{'DAY'}'>$Lang::tr{'older'}</a>";
+ }
+ else {
+ print "$Lang::tr{'first'} $Lang::tr{'older'}";
+ }
+ print "</td>\n";
-print <<END
-</tr>
-</table>
+ print "<td align='center' width='50%'>";
+ if ($next >= 0) {
+ print "<a href='/cgi-bin/logs.cgi/firewalllog.dat?$next,$cgiparams{'MONTH'},$cgiparams{'DAY'}'>$Lang::tr{'newer'}</a> ";
+ print "<a href='/cgi-bin/logs.cgi/firewalllog.dat?$lastPageIndex,$cgiparams{'MONTH'},$cgiparams{'DAY'}'>$Lang::tr{'last'}</a>";
+ }
+ else {
+ print "$Lang::tr{'newer'} $Lang::tr{'last'} ";
+ }
+ print "</td>\n";
+
+ print <<END
+ </tr>
+ </table>
END
-;
+ ;
}
diff --git a/html/cgi-bin/logs.cgi/firewalllogcountry.dat b/html/cgi-bin/logs.cgi/firewalllogcountry.dat
index f998a62..26920b5 100644
--- a/html/cgi-bin/logs.cgi/firewalllogcountry.dat
+++ b/html/cgi-bin/logs.cgi/firewalllogcountry.dat
@@ -8,7 +8,7 @@
# page inspired from the initial firewalllog.dat
#
# Modified for IPFire by Christian Schmidt
-# and Michael Tremer (www.ipfire.org)
+# and Michael Tremer (www.ipfire.org)
use strict;
use Geo::IP::PurePerl;
@@ -39,11 +39,11 @@ $cgiparams{'showpie'} = 1;
$cgiparams{'sortcolumn'} = 1;
my @shortmonths = ( 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug',
- 'Sep', 'Oct', 'Nov', 'Dec' );
+ 'Sep', 'Oct', 'Nov', 'Dec' );
my @longmonths = ( $Lang::tr{'january'}, $Lang::tr{'february'}, $Lang::tr{'march'},
- $Lang::tr{'april'}, $Lang::tr{'may'}, $Lang::tr{'june'}, $Lang::tr{'july'}, $Lang::tr{'august'},
- $Lang::tr{'september'}, $Lang::tr{'october'}, $Lang::tr{'november'},
- $Lang::tr{'december'} );
+ $Lang::tr{'april'}, $Lang::tr{'may'}, $Lang::tr{'june'}, $Lang::tr{'july'}, $Lang::tr{'august'},
+ $Lang::tr{'september'}, $Lang::tr{'october'}, $Lang::tr{'november'},
+ $Lang::tr{'december'} );
my @now = localtime();
my $dow = $now[6];
@@ -69,81 +69,81 @@ if ($cgiparams{'sortcolumn'} != 0) { $settings{'sortcolumn'} = $cgiparams{'sortc
if ($cgiparams{'ACTION'} eq $Lang::tr{'save'})
{
- &General::writehash("${General::swroot}/fwlogs/ipsettings", \%settings);
+ &General::writehash("${General::swroot}/fwlogs/ipsettings", \%settings);
}
my $start = -1;
if ($ENV{'QUERY_STRING'} && $cgiparams{'ACTION'} ne $Lang::tr{'update'})
{
- my @temp = split(',',$ENV{'QUERY_STRING'});
- $start = $temp[0];
- $cgiparams{'MONTH'} = $temp[1];
- $cgiparams{'DAY'} = $temp[2];
+ my @temp = split(',',$ENV{'QUERY_STRING'});
+ $start = $temp[0];
+ $cgiparams{'MONTH'} = $temp[1];
+ $cgiparams{'DAY'} = $temp[2];
}
if (!($cgiparams{'MONTH'} =~ /^(0|1|2|3|4|5|6|7|8|9|10|11)$/) ||
!($cgiparams{'DAY'} =~ /^(1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31)$/))
{
- $cgiparams{'DAY'} = $now[3];
- $cgiparams{'MONTH'} = $now[4];
+ $cgiparams{'DAY'} = $now[3];
+ $cgiparams{'MONTH'} = $now[4];
}
elsif($cgiparams{'ACTION'} eq '>>')
{
- my @temp_then=();
- my @temp_now = localtime(time);
- $temp_now[4] = $cgiparams{'MONTH'};
- $temp_now[3] = $cgiparams{'DAY'};
- @temp_then = localtime(POSIX::mktime(@temp_now) + 86400);
- ## Retrieve the same time on the next day -
- ## 86400 seconds in a day
- $cgiparams{'MONTH'} = $temp_then[4];
- $cgiparams{'DAY'} = $temp_then[3];
+ my @temp_then=();
+ my @temp_now = localtime(time);
+ $temp_now[4] = $cgiparams{'MONTH'};
+ $temp_now[3] = $cgiparams{'DAY'};
+ @temp_then = localtime(POSIX::mktime(@temp_now) + 86400);
+ ## Retrieve the same time on the next day -
+ ## 86400 seconds in a day
+ $cgiparams{'MONTH'} = $temp_then[4];
+ $cgiparams{'DAY'} = $temp_then[3];
}
elsif($cgiparams{'ACTION'} eq '<<')
{
- my @temp_then=();
- my @temp_now = localtime(time);
- $temp_now[4] = $cgiparams{'MONTH'};
- $temp_now[3] = $cgiparams{'DAY'};
- @temp_then = localtime(POSIX::mktime(@temp_now) - 86400);
- ## Retrieve the same time on the previous day -
- ## 86400 seconds in a day
- $cgiparams{'MONTH'} = $temp_then[4];
- $cgiparams{'DAY'} = $temp_then[3];
+ my @temp_then=();
+ my @temp_now = localtime(time);
+ $temp_now[4] = $cgiparams{'MONTH'};
+ $temp_now[3] = $cgiparams{'DAY'};
+ @temp_then = localtime(POSIX::mktime(@temp_now) - 86400);
+ ## Retrieve the same time on the previous day -
+ ## 86400 seconds in a day
+ $cgiparams{'MONTH'} = $temp_then[4];
+ $cgiparams{'DAY'} = $temp_then[3];
}
if (($cgiparams{'DAY'} ne $now[3]) || ($cgiparams{'MONTH'} ne $now[4]))
{
- my @then = ();
- if ( ( $cgiparams{'MONTH'} eq $now[4]) && ($cgiparams{'DAY'} > $now[3]) ||
- ( $cgiparams{'MONTH'} > $now[4] ) ) {
- @then = localtime(POSIX::mktime( 0, 0, 0, $cgiparams{'DAY'}, $cgiparams{'MONTH'}, $year - 1901 ));
- } else {
- @then = localtime(POSIX::mktime( 0, 0, 0, $cgiparams{'DAY'}, $cgiparams{'MONTH'}, $year - 1900 ));
- }
- $tdoy = $then[7];
- my $lastleap=($year-1)%4;
- if ($tdoy>$doy) {
- if ($lastleap == 0 && $tdoy < 60) {
- $doy=$tdoy+366;
- } else {
- $doy=$doy+365;
- }
- }
+ my @then = ();
+ if ( ( $cgiparams{'MONTH'} eq $now[4]) && ($cgiparams{'DAY'} > $now[3]) ||
+ ( $cgiparams{'MONTH'} > $now[4] ) ) {
+ @then = localtime(POSIX::mktime( 0, 0, 0, $cgiparams{'DAY'}, $cgiparams{'MONTH'}, $year - 1901 ));
+ } else {
+ @then = localtime(POSIX::mktime( 0, 0, 0, $cgiparams{'DAY'}, $cgiparams{'MONTH'}, $year - 1900 ));
+ }
+ $tdoy = $then[7];
+ my $lastleap=($year-1)%4;
+ if ($tdoy>$doy) {
+ if ($lastleap == 0 && $tdoy < 60) {
+ $doy=$tdoy+366;
+ } else {
+ $doy=$doy+365;
+ }
+ }
}
my $datediff=0;
my $dowd=0;
my $multifile=0;
if ($tdoy ne $doy) {
- $datediff=int(($doy-$tdoy)/7);
- $dowd=($doy-$tdoy)%7;
- if (($dow-$dowd)<1) {
- $datediff=$datediff+1;
- }
- if (($dow-$dowd)==0) {
- $multifile=1;
- }
+ $datediff=int(($doy-$tdoy)/7);
+ $dowd=($doy-$tdoy)%7;
+ if (($dow-$dowd)<1) {
+ $datediff=$datediff+1;
+ }
+ if (($dow-$dowd)==0) {
+ $multifile=1;
+ }
}
my $monthstr = $shortmonths[$cgiparams{'MONTH'}];
@@ -151,62 +151,63 @@ my $longmonthstr = $longmonths[$cgiparams{'MONTH'}];
my $day = $cgiparams{'DAY'};
my $daystr='';
if ($day <= 9) {
- $daystr = " $day"; }
+ $daystr = " $day";
+}
else {
- $daystr = $day;
+ $daystr = $day;
}
my $skip=0;
my $filestr='';
if ($datediff==0) {
- $filestr="/var/log/messages";
+ $filestr="/var/log/messages";
} else {
- $filestr="/var/log/messages.$datediff";
- $filestr = "$filestr.gz" if -f "$filestr.gz";
+ $filestr="/var/log/messages.$datediff";
+ $filestr = "$filestr.gz" if -f "$filestr.gz";
}
if (!(open (FILE,($filestr =~ /.gz$/ ? "gzip -dc $filestr |" : $filestr)))) {
- $errormessage = "$Lang::tr{'date not in logs'}: $filestr $Lang::tr{'could not be opened'}";
- $skip=1;
- # Note: This is in case the log does not exist for that date
+ $errormessage = "$Lang::tr{'date not in logs'}: $filestr $Lang::tr{'could not be opened'}";
+ $skip=1;
+ # Note: This is in case the log does not exist for that date
}
my $lines = 0;
my @log=();
if (!$skip)
{
- while (<FILE>)
- {
- if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ kernel:.*(IN=.*)$/) {
- $log[$lines] = $_;
- $lines++;
- }
- }
- close (FILE);
+ while (<FILE>)
+ {
+ if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ kernel:.*(IN=.*)$/) {
+ $log[$lines] = $_;
+ $lines++;
+ }
+ }
+ close (FILE);
}
$skip=0;
if ($multifile) {
- $datediff=$datediff-1;
- if ($datediff==0) {
- $filestr="/var/log/messages";
- } else {
- $filestr="/var/log/messages.$datediff";
- $filestr = "$filestr.gz" if -f "$filestr.gz";
- }
- if (!(open (FILE,($filestr =~ /.gz$/ ? "gzip -dc $filestr |" : $filestr)))) {
- $errormessage="$Lang::tr{'date not in logs'}: $filestr $Lang::tr{'could not be opened'}";
- $skip=1;
- }
- if (!$skip) {
- while (<FILE>) {
- if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ kernel:.*(IN=.*)$/) {
- $log[$lines] = $_;
- $lines++;
- }
- }
- close (FILE);
- }
+ $datediff=$datediff-1;
+ if ($datediff==0) {
+ $filestr="/var/log/messages";
+ } else {
+ $filestr="/var/log/messages.$datediff";
+ $filestr = "$filestr.gz" if -f "$filestr.gz";
+ }
+ if (!(open (FILE,($filestr =~ /.gz$/ ? "gzip -dc $filestr |" : $filestr)))) {
+ $errormessage="$Lang::tr{'date not in logs'}: $filestr $Lang::tr{'could not be opened'}";
+ $skip=1;
+ }
+ if (!$skip) {
+ while (<FILE>) {
+ if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ kernel:.*(IN=.*)$/) {
+ $log[$lines] = $_;
+ $lines++;
+ }
+ }
+ close (FILE);
+ }
}
my $MODNAME="fwlogs";
@@ -217,9 +218,9 @@ my $MODNAME="fwlogs";
if ($errormessage) {
- &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
- print "<font class='base'>$errormessage </font>\n";
- &Header::closebox();
+ &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
+ print "<font class='base'>$errormessage </font>\n";
+ &Header::closebox();
}
&Header::openbox('100%', 'left', "$Lang::tr{'settings'}");
@@ -228,40 +229,39 @@ print <<END
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<table width='100%'>
<tr>
- <td width='10%' class='base'>$Lang::tr{'month'}: </td>
- <td width='10%'>
- <select name='MONTH'>
+ <td width='10%' class='base'>$Lang::tr{'month'}: </td>
+ <td width='10%'>
+ <select name='MONTH'>
END
;
my $month;
for ($month = 0; $month < 12; $month++)
{
- print "\t<option ";
- if ($month == $cgiparams{'MONTH'}) {
- print "selected='selected' "; }
- print "value='$month'>$longmonths[$month]</option>\n";
+ print "\t<option ";
+ if ($month == $cgiparams{'MONTH'}) {
+ print "selected='selected' "; }
+ print "value='$month'>$longmonths[$month]</option>\n";
}
print <<END
- </select>
- </td>
- <td width='10%' class='base' align='right'> $Lang::tr{'day'}: </td>
- <td width='40%'>
- <select name='DAY'>
+ </select>
+ </td>
+ <td width='10%' class='base' align='right'> $Lang::tr{'day'}: </td>
+ <td width='40%'>
+ <select name='DAY'>
END
;
for ($day = 1; $day <= 31; $day++)
{
- print "\t<option ";
- if ($day == $cgiparams{'DAY'}) {
- print "selected='selected' "; }
- print "value='$day'>$day</option>\n";
+ print "\t<option ";
+ if ($day == $cgiparams{'DAY'}) {
+ print "selected='selected' "; }
+ print "value='$day'>$day</option>\n";
}
if( $cgiparams{'pienumber'} != 0){$pienumber=$cgiparams{'pienumber'};}
if( $cgiparams{'otherspie'} != 0){$otherspie=$cgiparams{'otherspie'};}
if( $cgiparams{'showpie'} != 0){$showpie=$cgiparams{'showpie'};}
if( $cgiparams{'sortcolumn'} != 0){$sortcolumn=$cgiparams{'sortcolumn'};}
-
print <<END
</select>
</td>
@@ -294,29 +294,43 @@ $lines = 0;
foreach $_ (@log)
{
- /^... (..) (..:..:..) [\w\-]+ kernel:(.*)(IN=.*)$/;
- my $packet = $4;
- $packet =~ /IN=(\w+)/; my $iface=$1; if ( $1 =~ /2./ ){ $iface="";}
- $packet =~ /SRC=([\d\.]+)/; my $srcaddr=$1;
-
- if($iface eq $red_interface) {
- if($srcaddr ne '') {
- my $ccode = $gi->country_code_by_name($srcaddr);
- if( $ccode eq '') {
- $ccode = 'unknown';
- }
- $tabjc{$ccode} = $tabjc{$ccode} + 1 ;
- if(($tabjc{$ccode} == 1) && ($lines < $pienumber)) { $lines = $lines + 1; }
- $linesjc++;
- }
- }
- else {
- if($iface ne '') {
- $tabjc{$iface} = $tabjc{$iface} + 1 ;
- if(($tabjc{$iface} == 1) && ($lines < $pienumber)) { $lines = $lines + 1; }
- $linesjc++;
- }
- }
+ # If ipv6 uses bridge, use PHYSIN for iface, otherwise IN
+ if (/^... (..) (..:..:..) [\w\-]+ kernel:(.*)(PHYSIN=.*)$/) {}
+ elsif (/^... (..) (..:..:..) [\w\-]+ kernel:(.*)(IN=.*)$/) {}
+ my $packet = $4;
+ my $iface = '';
+ if ($packet =~ /PHYSIN=(\w+)/) { $iface = $1; } elsif ($packet =~ /IN=(\w+)/) { $iface = $1; }
+ if ( $1 =~ /2./ ) { $iface=''; }
+ my $srcaddr = '';
+ # Find ipv4 and ipv6 addresses
+ if ($packet =~ /SRC\=(([\d]{1,3})(\.([\d]{1,3})){3})/) { $srcaddr = $1; }
+ elsif ($packet =~ /SRC\=(([0-9a-fA-F]{0,4})(\:([0-9a-fA-F]{0,4})){2,7})/) { $srcaddr = $1; }
+
+ if($iface eq $red_interface) {
+ # Traffic from red
+ if($srcaddr ne '') {
+ # srcaddr is set
+ my $ccode = $gi->country_code_by_name($srcaddr);
+ if ($ccode eq '') {
+ $ccode = 'unknown';
+ }
+ $tabjc{$ccode} = $tabjc{$ccode} + 1;
+ if(($tabjc{$ccode} == 1) && ($lines < $pienumber)) { $lines = $lines + 1; }
+ $linesjc++;
+ }
+ }
+ else {
+ # Traffic not from red
+ if($iface ne '') {
+ $tabjc{$iface} = $tabjc{$iface} + 1 ;
+ if(($tabjc{$iface} == 1) && ($lines < $pienumber)) { $lines = $lines + 1; }
+ $linesjc++;
+ }
+ else {
+ # What to do with empty iface lines?
+ # This probably is traffic from ipfire itself (IN= OUT=XY)?
+ }
+ }
}
$pienumber = $lines;
@@ -336,13 +350,11 @@ my @value;
my $indice=0;
my @tabjc2;
-if ($sortcolumn == 1)
-{
- @tabjc2 = sort { $b <=> $a } values (%tabjc);
+if ($sortcolumn == 1) {
+ @tabjc2 = sort { $b <=> $a } values (%tabjc);
}
-else
-{
- @tabjc2 = sort { $a <=> $b } keys (%tabjc);
+else {
+ @tabjc2 = sort { $a <=> $b } keys (%tabjc);
}
my $colour=1;
@@ -354,19 +366,17 @@ use GD::Graph::colour;
#ips sort by hits number
my $v;
-if ($sortcolumn == 1)
-{
- for ($v=0;$v<$pienumber;$v++){
- findkey($tabjc2[$v]);
- }
+if ($sortcolumn == 1) {
+ for ($v=0;$v<$pienumber;$v++){
+ findkey($tabjc2[$v]);
+ }
}
-else
-{
- foreach $v (@tabjc2) {
- $key[$indice] = $v;
- $value[$indice] = $tabjc{$v};
- $indice++;
- }
+else {
+ foreach $v (@tabjc2) {
+ $key[$indice] = $v;
+ $value[$indice] = $tabjc{$v};
+ $indice++;
+ }
}
my @ips;
@@ -379,15 +389,15 @@ my $o;
if($cgiparams{'otherspie'} == 2 ){}
else{
- my $numothers;
- for($o=0;$o<$pienumber;$o++){
- $numothers = $numothers + $numb[$o];
- }
- $numothers = $linesjc - $numothers;
- if ($numothers > 0) {
- $ips[$pienumber]="$Lang::tr{'otherip'}";
- $numb[$pienumber] = $numothers;
- }
+ my $numothers;
+ for($o=0;$o<$pienumber;$o++){
+ $numothers = $numothers + $numb[$o];
+ }
+ $numothers = $linesjc - $numothers;
+ if ($numothers > 0) {
+ $ips[$pienumber]="$Lang::tr{'otherip'}";
+ $numb[$pienumber] = $numothers;
+ }
}
my @data = (\@ips,\@numb);
@@ -400,30 +410,29 @@ my %mainsettings = ();
&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
if ($showpie != 2 && $pienumber <= 50 && $pienumber != 0) {
- my $mygraph = GD::Graph::pie->new(500, 350);
- $mygraph->set(
- 'title' => '',
- 'pie_height' => 50,
- 'start_angle' => 89
- ) or warn $mygraph->error;
-
- $mygraph->set_value_font(GD::gdMediumBoldFont);
- $mygraph->set( dclrs => [ "$color{'color1'}" , "$color{'color2'}" , "$color{'color3'}" , "$color{'color4'}" , "$color{'color5'}" , "$color{'color6'}" , "$color{'color7'}" , "$color{'color8'}" , "$color{'color9'}" , "$color{'color10'}" ] );
- my $myimage = $mygraph->plot(\@data) or die $mygraph->error;
-
- my @filenames = glob("/srv/web/ipfire/html/graphs/fwlog-country*.png");
- unlink(@filenames);
- my $imagerandom = rand(1000000);
- my $imagename = "/srv/web/ipfire/html/graphs/fwlog-country$imagerandom.png";
- open(FILE,">$imagename");
- print FILE $myimage->png;
- close(FILE);
- #####################################################
- print "<div style='text-align:center;'>";
- print "<img src='/graphs/fwlog-country$imagerandom.png'>";
- print "</div>";
+ my $mygraph = GD::Graph::pie->new(500, 350);
+ $mygraph->set(
+ 'title' => '',
+ 'pie_height' => 50,
+ 'start_angle' => 89
+ ) or warn $mygraph->error;
+
+ $mygraph->set_value_font(GD::gdMediumBoldFont);
+ $mygraph->set( dclrs => [ "$color{'color1'}" , "$color{'color2'}" , "$color{'color3'}" , "$color{'color4'}" , "$color{'color5'}" , "$color{'color6'}" , "$color{'color7'}" , "$color{'color8'}" , "$color{'color9'}" , "$color{'color10'}" ] );
+ my $myimage = $mygraph->plot(\@data) or die $mygraph->error;
+
+ my @filenames = glob("/srv/web/ipfire/html/graphs/fwlog-country*.png");
+ unlink(@filenames);
+ my $imagerandom = rand(1000000);
+ my $imagename = "/srv/web/ipfire/html/graphs/fwlog-country$imagerandom.png";
+ open(FILE,">$imagename");
+ print FILE $myimage->png;
+ close(FILE);
+ #####################################################
+ print "<div style='text-align:center;'>";
+ print "<img src='/graphs/fwlog-country$imagerandom.png'>";
+ print "</div>";
}
-
print <<END
<table width='100%' class='tbl'>
<tr>
@@ -444,73 +453,72 @@ my $col="";
for($s=0;$s<$lines;$s++)
{
- $show++;
- $percent = $value[$s] * 100 / $linesjc;
- $percent = sprintf("%.f", $percent);
- $total = $total + $value[$s];
- my $colorIndex = $color % 10;
- if($colorIndex == 0) {
- $colorIndex = 10;
- }
- $col="bgcolor='$color{\"color$colorIndex\"}'";
- $color++;
- print "<tr>";
-
- print "<td align='center' $col>";
-
- # Dont show details button for "unknown" location.
- if ($key[$s] ne 'unknown') {
- print"<form method='post' action='showrequestfromcountry.dat'>";
- print"<input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'>";
- print"<input type='hidden' name='DAY' value='$cgiparams{'DAY'}'>";
- print"<input type='hidden' name='country' value='$key[$s]'>";
- print"<input type='submit' value='details'></form>";
- }
-
- if($key[$s] eq 'blue0' || $key[$s] eq 'green0' || $key[$s] eq 'orange0') {
- print "<td align='center' $col>$key[$s]</td>";
- }
- else {
- my $fcode = lc($key[$s]);
-
- # Get flag icon for of the country.
- my $flag_icon = &GeoIP::get_flag_icon($fcode);
-
- if($flag_icon) {
- print "<td align='center' $col><a href='/cgi-bin/country.cgi#$fcode'><img src='$flag_icon' border='0' align='absmiddle' alt='$key[$s]' title='$key[$s]'></a></td>";
- } else {
+ $show++;
+ $percent = $value[$s] * 100 / $linesjc;
+ $percent = sprintf("%.f", $percent);
+ $total = $total + $value[$s];
+ # colors are numbered 1 to 10
+ my $colorIndex = ($color % 10) + 1;
+ $col="bgcolor='$color{\"color$colorIndex\"}'";
+ $color++;
+ print "<tr>";
+
+ print "<td align='center' $col>";
+
+ # Dont show details button for "unknown" location.
+ if ($key[$s] ne 'unknown') {
+ print"<form method='post' action='showrequestfromcountry.dat'>";
+ print"<input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'>";
+ print"<input type='hidden' name='DAY' value='$cgiparams{'DAY'}'>";
+ print"<input type='hidden' name='country' value='$key[$s]'>";
+ print"<input type='submit' value='details'></form>";
+ }
+ elsif ($key[$s] eq 'unknown') {
+ print "unknown";
+ }
+ # Looks dangerous to use hardcoded interface names here. Probably needs fixing.
+ if ($key[$s] eq 'blue0' || $key[$s] eq 'green0' || $key[$s] eq 'orange0' ) {
print "<td align='center' $col>$key[$s]</td>";
- }
- }
- print "<td align='center' $col>$value[$s]</td>";
- print "<td align='center' $col>$percent</td>";
- print "</tr>";
+ }
+ else {
+ my $fcode = lc($key[$s]);
+
+ # Get flag icon for of the country.
+ my $flag_icon = &GeoIP::get_flag_icon($fcode);
+
+ if($flag_icon) {
+ print "<td align='center' $col><a href='/cgi-bin/country.cgi#$fcode'><img src='$flag_icon' border='0' align='absmiddle' alt='$key[$s]' title='$key[$s]'></a></td>";
+ } else {
+ print "<td align='center' $col>$key[$s]</td>";
+ }
+ }
+ print "<td align='center' $col>$value[$s]</td>";
+ print "<td align='center' $col>$percent</td>";
+ print "</tr>";
}
if($cgiparams{'otherspie'} == 2 ){}
else{
- my $colorIndex = $color % 10;
- if($colorIndex == 0) {
- $colorIndex = 10;
- }
- $col="bgcolor='$color{\"color$colorIndex\"}'";
- print "<tr>";
-
-if ( $linesjc ne "0")
-{
-my $dif;
-$dif = $linesjc - $total;
-$percent = $dif * 100 / $linesjc;
-$percent = sprintf("%.f", $percent);
-print <<END
-<td align='center' $col></TD>
-<td align='center' $col>$Lang::tr{'other countries'}</td>
-<td align='center' $col>$dif</TD>
-<td align='center' $col>$percent</TD>
-</tr>
+ # colors are numbered 1 to 10
+ my $colorIndex = ($color % 10) + 1;
+ $col="bgcolor='$color{\"color$colorIndex\"}'";
+ print "<tr>";
+
+ if ( $linesjc ne "0")
+ {
+ my $dif;
+ $dif = $linesjc - $total;
+ $percent = $dif * 100 / $linesjc;
+ $percent = sprintf("%.f", $percent);
+ print <<END
+ <td align='center' $col></TD>
+ <td align='center' $col>$Lang::tr{'other countries'}</td>
+ <td align='center' $col>$dif</TD>
+ <td align='center' $col>$percent</TD>
+ </tr>
END
-;
-}
+ ;
+ }
}
print <<END
</TABLE>
@@ -522,19 +530,19 @@ END
&Header::closepage();
sub findkey {
- my $v;
- foreach $v (@keytabjc) {
- if ($tabjc{$v} eq $_[0]) {
- delete $tabjc{$v};
- $key[$indice] = "$v";
- $value[$indice] = $_[0];
- $indice++;
- last;
- }
- }
+ my $v;
+ foreach $v (@keytabjc) {
+ if ($tabjc{$v} eq $_[0]) {
+ delete $tabjc{$v};
+ $key[$indice] = "$v";
+ $value[$indice] = $_[0];
+ $indice++;
+ last;
+ }
+ }
}
sub checkversion {
- #Automatic Updates is disabled
- return "0","0";
+ #Automatic Updates is disabled
+ return "0","0";
}
diff --git a/html/cgi-bin/logs.cgi/firewalllogip.dat b/html/cgi-bin/logs.cgi/firewalllogip.dat
index 7d82d20..08ef1c4 100644
--- a/html/cgi-bin/logs.cgi/firewalllogip.dat
+++ b/html/cgi-bin/logs.cgi/firewalllogip.dat
@@ -8,7 +8,7 @@
# page inspired from the initial firewalllog.dat
#
# Modified for IPFire by Christian Schmidt
-# and Michael Tremer (www.ipfire.org)
+# and Michael Tremer (www.ipfire.org)
use strict;
use Geo::IP::PurePerl;
@@ -39,11 +39,11 @@ $cgiparams{'showpie'} = 1;
$cgiparams{'sortcolumn'} = 1;
my @shortmonths = ( 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug',
- 'Sep', 'Oct', 'Nov', 'Dec' );
+ 'Sep', 'Oct', 'Nov', 'Dec' );
my @longmonths = ( $Lang::tr{'january'}, $Lang::tr{'february'}, $Lang::tr{'march'},
- $Lang::tr{'april'}, $Lang::tr{'may'}, $Lang::tr{'june'}, $Lang::tr{'july'}, $Lang::tr{'august'},
- $Lang::tr{'september'}, $Lang::tr{'october'}, $Lang::tr{'november'},
- $Lang::tr{'december'} );
+ $Lang::tr{'april'}, $Lang::tr{'may'}, $Lang::tr{'june'}, $Lang::tr{'july'}, $Lang::tr{'august'},
+ $Lang::tr{'september'}, $Lang::tr{'october'}, $Lang::tr{'november'},
+ $Lang::tr{'december'} );
my @now = localtime();
my $dow = $now[6];
@@ -69,81 +69,81 @@ if ($cgiparams{'sortcolumn'} != 0) { $settings{'sortcolumn'} = $cgiparams{'sortc
if ($cgiparams{'ACTION'} eq $Lang::tr{'save'})
{
- &General::writehash("${General::swroot}/fwlogs/ipsettings", \%settings);
+ &General::writehash("${General::swroot}/fwlogs/ipsettings", \%settings);
}
my $start = -1;
if ($ENV{'QUERY_STRING'} && $cgiparams{'ACTION'} ne $Lang::tr{'update'})
{
- my @temp = split(',',$ENV{'QUERY_STRING'});
- $start = $temp[0];
- $cgiparams{'MONTH'} = $temp[1];
- $cgiparams{'DAY'} = $temp[2];
+ my @temp = split(',',$ENV{'QUERY_STRING'});
+ $start = $temp[0];
+ $cgiparams{'MONTH'} = $temp[1];
+ $cgiparams{'DAY'} = $temp[2];
}
if (!($cgiparams{'MONTH'} =~ /^(0|1|2|3|4|5|6|7|8|9|10|11)$/) ||
!($cgiparams{'DAY'} =~ /^(1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31)$/))
{
- $cgiparams{'DAY'} = $now[3];
- $cgiparams{'MONTH'} = $now[4];
+ $cgiparams{'DAY'} = $now[3];
+ $cgiparams{'MONTH'} = $now[4];
}
elsif($cgiparams{'ACTION'} eq '>>')
{
- my @temp_then=();
- my @temp_now = localtime(time);
- $temp_now[4] = $cgiparams{'MONTH'};
- $temp_now[3] = $cgiparams{'DAY'};
- @temp_then = localtime(POSIX::mktime(@temp_now) + 86400);
- ## Retrieve the same time on the next day -
- ## 86400 seconds in a day
- $cgiparams{'MONTH'} = $temp_then[4];
- $cgiparams{'DAY'} = $temp_then[3];
+ my @temp_then=();
+ my @temp_now = localtime(time);
+ $temp_now[4] = $cgiparams{'MONTH'};
+ $temp_now[3] = $cgiparams{'DAY'};
+ @temp_then = localtime(POSIX::mktime(@temp_now) + 86400);
+ ## Retrieve the same time on the next day -
+ ## 86400 seconds in a day
+ $cgiparams{'MONTH'} = $temp_then[4];
+ $cgiparams{'DAY'} = $temp_then[3];
}
elsif($cgiparams{'ACTION'} eq '<<')
{
- my @temp_then=();
- my @temp_now = localtime(time);
- $temp_now[4] = $cgiparams{'MONTH'};
- $temp_now[3] = $cgiparams{'DAY'};
- @temp_then = localtime(POSIX::mktime(@temp_now) - 86400);
- ## Retrieve the same time on the previous day -
- ## 86400 seconds in a day
- $cgiparams{'MONTH'} = $temp_then[4];
- $cgiparams{'DAY'} = $temp_then[3];
+ my @temp_then=();
+ my @temp_now = localtime(time);
+ $temp_now[4] = $cgiparams{'MONTH'};
+ $temp_now[3] = $cgiparams{'DAY'};
+ @temp_then = localtime(POSIX::mktime(@temp_now) - 86400);
+ ## Retrieve the same time on the previous day -
+ ## 86400 seconds in a day
+ $cgiparams{'MONTH'} = $temp_then[4];
+ $cgiparams{'DAY'} = $temp_then[3];
}
if (($cgiparams{'DAY'} ne $now[3]) || ($cgiparams{'MONTH'} ne $now[4]))
{
- my @then = ();
- if ( ( $cgiparams{'MONTH'} eq $now[4]) && ($cgiparams{'DAY'} > $now[3]) ||
- ( $cgiparams{'MONTH'} > $now[4] ) ) {
- @then = localtime(POSIX::mktime( 0, 0, 0, $cgiparams{'DAY'}, $cgiparams{'MONTH'}, $year - 1901 ));
- } else {
- @then = localtime(POSIX::mktime( 0, 0, 0, $cgiparams{'DAY'}, $cgiparams{'MONTH'}, $year - 1900 ));
- }
- $tdoy = $then[7];
- my $lastleap=($year-1)%4;
- if ($tdoy>$doy) {
- if ($lastleap == 0 && $tdoy < 60) {
- $doy=$tdoy+366;
- } else {
- $doy=$doy+365;
- }
- }
+ my @then = ();
+ if ( ( $cgiparams{'MONTH'} eq $now[4]) && ($cgiparams{'DAY'} > $now[3]) ||
+ ( $cgiparams{'MONTH'} > $now[4] ) ) {
+ @then = localtime(POSIX::mktime( 0, 0, 0, $cgiparams{'DAY'}, $cgiparams{'MONTH'}, $year - 1901 ));
+ } else {
+ @then = localtime(POSIX::mktime( 0, 0, 0, $cgiparams{'DAY'}, $cgiparams{'MONTH'}, $year - 1900 ));
+ }
+ $tdoy = $then[7];
+ my $lastleap=($year-1)%4;
+ if ($tdoy>$doy) {
+ if ($lastleap == 0 && $tdoy < 60) {
+ $doy=$tdoy+366;
+ } else {
+ $doy=$doy+365;
+ }
+ }
}
my $datediff=0;
my $dowd=0;
my $multifile=0;
if ($tdoy ne $doy) {
- $datediff=int(($doy-$tdoy)/7);
- $dowd=($doy-$tdoy)%7;
- if (($dow-$dowd)<1) {
- $datediff=$datediff+1;
- }
- if (($dow-$dowd)==0) {
- $multifile=1;
- }
+ $datediff=int(($doy-$tdoy)/7);
+ $dowd=($doy-$tdoy)%7;
+ if (($dow-$dowd)<1) {
+ $datediff=$datediff+1;
+ }
+ if (($dow-$dowd)==0) {
+ $multifile=1;
+ }
}
my $monthstr = $shortmonths[$cgiparams{'MONTH'}];
@@ -151,62 +151,62 @@ my $longmonthstr = $longmonths[$cgiparams{'MONTH'}];
my $day = $cgiparams{'DAY'};
my $daystr='';
if ($day <= 9) {
- $daystr = " $day"; }
+ $daystr = " $day"; }
else {
- $daystr = $day;
+ $daystr = $day;
}
my $skip=0;
my $filestr='';
if ($datediff==0) {
- $filestr="/var/log/messages";
+ $filestr="/var/log/messages";
} else {
$filestr="/var/log/messages.$datediff";
$filestr = "$filestr.gz" if -f "$filestr.gz";
}
if (!(open (FILE,($filestr =~ /.gz$/ ? "gzip -dc $filestr |" : $filestr)))) {
- $errormessage = "$Lang::tr{'date not in logs'}: $filestr $Lang::tr{'could not be opened'}";
- $skip=1;
- # Note: This is in case the log does not exist for that date
+ $errormessage = "$Lang::tr{'date not in logs'}: $filestr $Lang::tr{'could not be opened'}";
+ $skip=1;
+ # Note: This is in case the log does not exist for that date
}
my $lines = 0;
my @log=();
if (!$skip)
{
- while (<FILE>)
- {
- if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ kernel:.*(IN=.*)$/) {
- $log[$lines] = $_;
- $lines++;
- }
- }
- close (FILE);
+ while (<FILE>)
+ {
+ if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ kernel:.*(IN=.*)$/) {
+ $log[$lines] = $_;
+ $lines++;
+ }
+ }
+ close (FILE);
}
$skip=0;
if ($multifile) {
- $datediff=$datediff-1;
- if ($datediff==0) {
- $filestr="/var/log/messages";
- } else {
- $filestr="/var/log/messages.$datediff";
- $filestr = "$filestr.gz" if -f "$filestr.gz";
- }
- if (!(open (FILE,($filestr =~ /.gz$/ ? "gzip -dc $filestr |" : $filestr)))) {
- $errormessage="$Lang::tr{'date not in logs'}: $filestr $Lang::tr{'could not be opened'}";
- $skip=1;
- }
- if (!$skip) {
- while (<FILE>) {
- if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ kernel:.*(IN=.*)$/) {
- $log[$lines] = $_;
- $lines++;
- }
- }
- close (FILE);
- }
+ $datediff=$datediff-1;
+ if ($datediff==0) {
+ $filestr="/var/log/messages";
+ } else {
+ $filestr="/var/log/messages.$datediff";
+ $filestr = "$filestr.gz" if -f "$filestr.gz";
+ }
+ if (!(open (FILE,($filestr =~ /.gz$/ ? "gzip -dc $filestr |" : $filestr)))) {
+ $errormessage="$Lang::tr{'date not in logs'}: $filestr $Lang::tr{'could not be opened'}";
+ $skip=1;
+ }
+ if (!$skip) {
+ while (<FILE>) {
+ if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ kernel:.*(IN=.*)$/) {
+ $log[$lines] = $_;
+ $lines++;
+ }
+ }
+ close (FILE);
+ }
}
my $MODNAME="fwlogs";
@@ -217,9 +217,9 @@ my $MODNAME="fwlogs";
if ($errormessage) {
- &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
- print "<font class='base'>$errormessage </font>\n";
- &Header::closebox();
+ &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
+ print "<font class='base'>$errormessage </font>\n";
+ &Header::closebox();
}
&Header::openbox('100%', 'left', "$Lang::tr{'settings'}");
@@ -228,33 +228,35 @@ print <<END
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<table width='100%'>
<tr>
- <td width='10%' class='base'>$Lang::tr{'month'}: </td>
- <td width='10%'>
- <select name='MONTH'>
+ <td width='10%' class='base'>$Lang::tr{'month'}: </td>
+ <td width='10%'>
+ <select name='MONTH'>
END
;
my $month;
for ($month = 0; $month < 12; $month++)
{
- print "\t<option ";
- if ($month == $cgiparams{'MONTH'}) {
- print "selected='selected' "; }
- print "value='$month'>$longmonths[$month]</option>\n";
+ print "\t<option ";
+ if ($month == $cgiparams{'MONTH'}) {
+ print "selected='selected' ";
+ }
+ print "value='$month'>$longmonths[$month]</option>\n";
}
print <<END
- </select>
- </td>
- <td width='10%' class='base' align='right'> $Lang::tr{'day'}: </td>
- <td width='40%'>
- <select name='DAY'>
+ </select>
+ </td>
+ <td width='10%' class='base' align='right'> $Lang::tr{'day'}: </td>
+ <td width='40%'>
+ <select name='DAY'>
END
;
for ($day = 1; $day <= 31; $day++)
{
- print "\t<option ";
- if ($day == $cgiparams{'DAY'}) {
- print "selected='selected' "; }
- print "value='$day'>$day</option>\n";
+ print "\t<option ";
+ if ($day == $cgiparams{'DAY'}) {
+ print "selected='selected' ";
+ }
+ print "value='$day'>$day</option>\n";
}
if( $cgiparams{'pienumber'} != 0){$pienumber=$cgiparams{'pienumber'};}
@@ -291,11 +293,12 @@ if ($pienumber == -1 || $pienumber > $lines || $sortcolumn == 2) { $pienumber =
$lines = 0;
foreach $_ (@log)
{
- if($_ =~ /SRC\=([\d\.]+)/){
- $tabjc{$1} = $tabjc{$1} + 1 ;
- if(($tabjc{$1} == 1) && ($lines < $pienumber)) { $lines = $lines + 1; }
- $linesjc++;
- }
+ # Extract ipv4 or ipv6 address
+ if (($_ =~ /SRC\=(([\d]{1,3})(\.([\d]{1,3})){3})/) or ($_ =~ /SRC\=(([0-9a-fA-F]{0,4})(\:([0-9a-fA-F]{0,4})){2,7})/)) {
+ $tabjc{$1} = $tabjc{$1} + 1 ;
+ if(($tabjc{$1} == 1) && ($lines < $pienumber)) { $lines = $lines + 1; }
+ $linesjc++;
+ }
}
$pienumber = $lines;
@@ -317,11 +320,11 @@ my @tabjc2;
if ($sortcolumn == 1)
{
- @tabjc2 = sort { $b <=> $a } values (%tabjc);
+ @tabjc2 = sort { $b <=> $a } values (%tabjc);
}
else
{
- @tabjc2 = sort { $a <=> $b } keys (%tabjc);
+ @tabjc2 = sort { $a <=> $b } keys (%tabjc);
}
my $colour=1;
@@ -335,17 +338,17 @@ my $v;
if ($sortcolumn == 1)
{
- for ($v=0;$v<$pienumber;$v++){
- findkey($tabjc2[$v]);
- }
+ for ($v=0;$v<$pienumber;$v++){
+ findkey($tabjc2[$v]);
+ }
}
else
{
- foreach $v (@tabjc2) {
- $key[$indice] = $v;
- $value[$indice] = $tabjc{$v};
- $indice++;
- }
+ foreach $v (@tabjc2) {
+ $key[$indice] = $v;
+ $value[$indice] = $tabjc{$v};
+ $indice++;
+ }
}
my @ips;
@@ -358,15 +361,15 @@ my $o;
if($cgiparams{'otherspie'} == 2 ){}
else{
- my $numothers;
- for($o=0;$o<$pienumber;$o++){
- $numothers = $numothers + $numb[$o];
- }
- $numothers = $linesjc - $numothers;
- if ($numothers > 0) {
- $ips[$pienumber]="$Lang::tr{'otherip'}";
- $numb[$pienumber] = $numothers;
- }
+ my $numothers;
+ for($o=0;$o<$pienumber;$o++){
+ $numothers = $numothers + $numb[$o];
+ }
+ $numothers = $linesjc - $numothers;
+ if ($numothers > 0) {
+ $ips[$pienumber]="$Lang::tr{'otherip'}";
+ $numb[$pienumber] = $numothers;
+ }
}
my @data = (\@ips,\@numb);
@@ -379,28 +382,28 @@ my %mainsettings = ();
&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
if ($showpie != 2 && $pienumber <= 50 && $pienumber != 0) {
- my $mygraph = GD::Graph::pie->new(500, 350);
- $mygraph->set(
- 'title' => '',
- 'pie_height' => 50,
- 'start_angle' => 89
- ) or warn $mygraph->error;
-
- $mygraph->set_value_font(GD::gdMediumBoldFont);
- $mygraph->set( dclrs => [ "$color{'color1'}" , "$color{'color2'}" , "$color{'color3'}" , "$color{'color4'}" , "$color{'color5'}" , "$color{'color6'}" , "$color{'color7'}" , "$color{'color8'}" , "$color{'color9'}" , "$color{'color10'}" ] );
- my $myimage = $mygraph->plot(\@data) or die $mygraph->error;
-
- my @filenames = glob("/srv/web/ipfire/html/graphs/fwlog-ip*.png");
- unlink(@filenames);
- my $imagerandom = rand(1000000);
- my $imagename = "/srv/web/ipfire/html/graphs/fwlog-ip$imagerandom.png";
- open(FILE,">$imagename");
- print FILE $myimage->png;
- close(FILE);
- #####################################################
- print "<div style='text-align:center'>";
- print "<img src='/graphs/fwlog-ip$imagerandom.png'>";
- print "</div>";
+ my $mygraph = GD::Graph::pie->new(500, 350);
+ $mygraph->set(
+ 'title' => '',
+ 'pie_height' => 50,
+ 'start_angle' => 89
+ ) or warn $mygraph->error;
+
+ $mygraph->set_value_font(GD::gdMediumBoldFont);
+ $mygraph->set( dclrs => [ "$color{'color1'}" , "$color{'color2'}" , "$color{'color3'}" , "$color{'color4'}" , "$color{'color5'}" , "$color{'color6'}" , "$color{'color7'}" , "$color{'color8'}" , "$color{'color9'}" , "$color{'color10'}" ] );
+ my $myimage = $mygraph->plot(\@data) or die $mygraph->error;
+
+ my @filenames = glob("/srv/web/ipfire/html/graphs/fwlog-ip*.png");
+ unlink(@filenames);
+ my $imagerandom = rand(1000000);
+ my $imagename = "/srv/web/ipfire/html/graphs/fwlog-ip$imagerandom.png";
+ open(FILE,">$imagename");
+ print FILE $myimage->png;
+ close(FILE);
+ #####################################################
+ print "<div style='text-align:center'>";
+ print "<img src='/graphs/fwlog-ip$imagerandom.png'>";
+ print "</div>";
}
print <<END
@@ -424,64 +427,60 @@ my $col="";
for($s=0;$s<$lines;$s++)
{
- $show++;
- $percent = $value[$s] * 100 / $linesjc;
- $percent = sprintf("%.f", $percent);
- $total = $total + $value[$s];
- my $colorIndex = $color % 10;
- if($colorIndex == 0) {
- $colorIndex = 10;
- }
- $col="bgcolor='$color{\"color$colorIndex\"}'";
- print "<tr>";
+ $show++;
+ $percent = $value[$s] * 100 / $linesjc;
+ $percent = sprintf("%.f", $percent);
+ $total = $total + $value[$s];
+ # colors are numbered 1 to 10
+ my $colorIndex = ($color % 10) + 1;
+ $col="bgcolor='$color{\"color$colorIndex\"}'";
+ print "<tr>";
+
+ my $gi = Geo::IP::PurePerl->new();
+ my $ccode = $gi->country_code_by_name($key[$s]);
+ my $fcode = lc($ccode);
- my $gi = Geo::IP::PurePerl->new();
- my $ccode = $gi->country_code_by_name($key[$s]);
- my $fcode = lc($ccode);
-
- $color++;
- print "<td align='center' $col><form method='post' action='showrequestfromip.dat'><input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY' value='$cgiparams{'DAY'}'> <input type='hidden' name='ip' value='$key[$s]'> <input type='submit' value='$Lang::tr{'details'}'></form></td>";
- print "<td align='center' $col><a href='/cgi-bin/ipinfo.cgi?ip=$key[$s]'>$key[$s]</a></td>";
-
- # Get flag icon for of the country.
- my $flag_icon = &GeoIP::get_flag_icon($ccode);
-
- if ( $flag_icon ) {
- print "<td align='center' $col><a href='/cgi-bin/country.cgi#$fcode'><img src='$flag_icon' border='0' align='absmiddle' alt='$ccode' title='$ccode'></a></td>";
- } else {
- print "<td align='center' $col></td>";
- }
-
- print "<td align='center' $col>$value[$s]</td>";
- print "<td align='center' $col>$percent</td>";
- print "</tr>";
- }
+ $color++;
+ print "<td align='center' $col><form method='post' action='showrequestfromip.dat'><input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY' value='$cgiparams{'DAY'}'> <input type='hidden' name='ip' value='$key[$s]'> <input type='submit' value='$Lang::tr{'details'}'></form></td>";
+ print "<td align='center' $col><a href='/cgi-bin/ipinfo.cgi?ip=$key[$s]'>$key[$s]</a></td>";
+
+ # Get flag icon for of the country.
+ my $flag_icon = &GeoIP::get_flag_icon($ccode);
+
+ if ( $flag_icon ) {
+ print "<td align='center' $col><a href='/cgi-bin/country.cgi#$fcode'><img src='$flag_icon' border='0' align='absmiddle' alt='$ccode' title='$ccode'></a></td>";
+ } else {
+ print "<td align='center' $col></td>";
+ }
+
+ print "<td align='center' $col>$value[$s]</td>";
+ print "<td align='center' $col>$percent</td>";
+ print "</tr>";
+}
if($cgiparams{'otherspie'} == 2 ){}
else{
- my $colorIndex = $color % 10;
- if($colorIndex == 0) {
- $colorIndex = 10;
- }
- $col="bgcolor='$color{\"color$colorIndex\"}'";
- print "<tr>";
-
-if ( $linesjc ne "0")
-{
-my $dif;
-$dif = $linesjc - $total;
-$percent = $dif * 100 / $linesjc;
-$percent = sprintf("%.f", $percent);
-print <<END
-<td align='center' $col></td>
-<td align='center' $col>$Lang::tr{'otherip'}</td>
-<td align='center' $col></td>
-<td align='center' $col>$dif</td>
-<td align='center' $col>$percent</td>
-</tr>
+ # colors are numbered 1 to 10
+ my $colorIndex = ($color % 10) + 1;
+ $col="bgcolor='$color{\"color$colorIndex\"}'";
+ print "<tr>";
+
+ if ( $linesjc ne "0")
+ {
+ my $dif;
+ $dif = $linesjc - $total;
+ $percent = $dif * 100 / $linesjc;
+ $percent = sprintf("%.f", $percent);
+ print <<END
+ <td align='center' $col></td>
+ <td align='center' $col>$Lang::tr{'otherip'}</td>
+ <td align='center' $col></td>
+ <td align='center' $col>$dif</td>
+ <td align='center' $col>$percent</td>
+ </tr>
END
-;
-}
+ ;
+ }
}
print <<END
</table>
@@ -493,20 +492,20 @@ END
&Header::closepage();
sub findkey {
- my $v;
- foreach $v (@keytabjc) {
- if ($tabjc{$v} eq $_[0]) {
- delete $tabjc{$v};
- $key[$indice] = "$v";
- $value[$indice] = $_[0];
- $indice++;
- last;
- }
- }
+ my $v;
+ foreach $v (@keytabjc) {
+ if ($tabjc{$v} eq $_[0]) {
+ delete $tabjc{$v};
+ $key[$indice] = "$v";
+ $value[$indice] = $_[0];
+ $indice++;
+ last;
+ }
+ }
}
sub checkversion {
- #Automatic Updates is disabled
- return "0","0";
+ #Automatic Updates is disabled
+ return "0","0";
}
diff --git a/html/cgi-bin/logs.cgi/firewalllogport.dat b/html/cgi-bin/logs.cgi/firewalllogport.dat
index 5b0db62..fbc92e4 100644
--- a/html/cgi-bin/logs.cgi/firewalllogport.dat
+++ b/html/cgi-bin/logs.cgi/firewalllogport.dat
@@ -8,7 +8,7 @@
# page inspired from the initial firewalllog.dat
#
# Modified for IPFire by Christian Schmidt
-# and Michael Tremer (www.ipfire.org)
+# and Michael Tremer (www.ipfire.org)
use strict;
@@ -40,11 +40,11 @@ $cgiparams{'showpie'} = 1;
$cgiparams{'sortcolumn'} = 1;
my @shortmonths = ( 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug',
- 'Sep', 'Oct', 'Nov', 'Dec' );
+ 'Sep', 'Oct', 'Nov', 'Dec' );
my @longmonths = ( $Lang::tr{'january'}, $Lang::tr{'february'}, $Lang::tr{'march'},
- $Lang::tr{'april'}, $Lang::tr{'may'}, $Lang::tr{'june'}, $Lang::tr{'july'}, $Lang::tr{'august'},
- $Lang::tr{'september'}, $Lang::tr{'october'}, $Lang::tr{'november'},
- $Lang::tr{'december'} );
+ $Lang::tr{'april'}, $Lang::tr{'may'}, $Lang::tr{'june'}, $Lang::tr{'july'}, $Lang::tr{'august'},
+ $Lang::tr{'september'}, $Lang::tr{'october'}, $Lang::tr{'november'},
+ $Lang::tr{'december'} );
my @now = localtime();
my $dow = $now[6];
@@ -70,81 +70,81 @@ if ($cgiparams{'sortcolumn'} != 0) { $settings{'sortcolumn'} = $cgiparams{'sortc
if ($cgiparams{'ACTION'} eq $Lang::tr{'save'})
{
- &General::writehash("${General::swroot}/fwlogs/portsettings", \%settings);
+ &General::writehash("${General::swroot}/fwlogs/portsettings", \%settings);
}
my $start = -1;
if ($ENV{'QUERY_STRING'} && $cgiparams{'ACTION'} ne $Lang::tr{'update'})
{
- my @temp = split(',',$ENV{'QUERY_STRING'});
- $start = $temp[0];
- $cgiparams{'MONTH'} = $temp[1];
- $cgiparams{'DAY'} = $temp[2];
+ my @temp = split(',',$ENV{'QUERY_STRING'});
+ $start = $temp[0];
+ $cgiparams{'MONTH'} = $temp[1];
+ $cgiparams{'DAY'} = $temp[2];
}
if (!($cgiparams{'MONTH'} =~ /^(0|1|2|3|4|5|6|7|8|9|10|11)$/) ||
!($cgiparams{'DAY'} =~ /^(1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31)$/))
{
- $cgiparams{'DAY'} = $now[3];
- $cgiparams{'MONTH'} = $now[4];
+ $cgiparams{'DAY'} = $now[3];
+ $cgiparams{'MONTH'} = $now[4];
}
elsif($cgiparams{'ACTION'} eq '>>')
{
- my @temp_then=();
- my @temp_now = localtime(time);
- $temp_now[4] = $cgiparams{'MONTH'};
- $temp_now[3] = $cgiparams{'DAY'};
- @temp_then = localtime(POSIX::mktime(@temp_now) + 86400);
- ## Retrieve the same time on the next day -
- ## 86400 seconds in a day
- $cgiparams{'MONTH'} = $temp_then[4];
- $cgiparams{'DAY'} = $temp_then[3];
+ my @temp_then=();
+ my @temp_now = localtime(time);
+ $temp_now[4] = $cgiparams{'MONTH'};
+ $temp_now[3] = $cgiparams{'DAY'};
+ @temp_then = localtime(POSIX::mktime(@temp_now) + 86400);
+ ## Retrieve the same time on the next day -
+ ## 86400 seconds in a day
+ $cgiparams{'MONTH'} = $temp_then[4];
+ $cgiparams{'DAY'} = $temp_then[3];
}
elsif($cgiparams{'ACTION'} eq '<<')
{
- my @temp_then=();
- my @temp_now = localtime(time);
- $temp_now[4] = $cgiparams{'MONTH'};
- $temp_now[3] = $cgiparams{'DAY'};
- @temp_then = localtime(POSIX::mktime(@temp_now) - 86400);
- ## Retrieve the same time on the previous day -
- ## 86400 seconds in a day
- $cgiparams{'MONTH'} = $temp_then[4];
- $cgiparams{'DAY'} = $temp_then[3];
+ my @temp_then=();
+ my @temp_now = localtime(time);
+ $temp_now[4] = $cgiparams{'MONTH'};
+ $temp_now[3] = $cgiparams{'DAY'};
+ @temp_then = localtime(POSIX::mktime(@temp_now) - 86400);
+ ## Retrieve the same time on the previous day -
+ ## 86400 seconds in a day
+ $cgiparams{'MONTH'} = $temp_then[4];
+ $cgiparams{'DAY'} = $temp_then[3];
}
if (($cgiparams{'DAY'} ne $now[3]) || ($cgiparams{'MONTH'} ne $now[4]))
{
- my @then = ();
- if ( ( $cgiparams{'MONTH'} eq $now[4]) && ($cgiparams{'DAY'} > $now[3]) ||
- ( $cgiparams{'MONTH'} > $now[4] ) ) {
- @then = localtime(POSIX::mktime( 0, 0, 0, $cgiparams{'DAY'}, $cgiparams{'MONTH'}, $year - 1901 ));
- } else {
- @then = localtime(POSIX::mktime( 0, 0, 0, $cgiparams{'DAY'}, $cgiparams{'MONTH'}, $year - 1900 ));
- }
- $tdoy = $then[7];
- my $lastleap=($year-1)%4;
- if ($tdoy>$doy) {
- if ($lastleap == 0 && $tdoy < 60) {
- $doy=$tdoy+366;
- } else {
- $doy=$doy+365;
- }
- }
+ my @then = ();
+ if ( ( $cgiparams{'MONTH'} eq $now[4]) && ($cgiparams{'DAY'} > $now[3]) ||
+ ( $cgiparams{'MONTH'} > $now[4] ) ) {
+ @then = localtime(POSIX::mktime( 0, 0, 0, $cgiparams{'DAY'}, $cgiparams{'MONTH'}, $year - 1901 ));
+ } else {
+ @then = localtime(POSIX::mktime( 0, 0, 0, $cgiparams{'DAY'}, $cgiparams{'MONTH'}, $year - 1900 ));
+ }
+ $tdoy = $then[7];
+ my $lastleap=($year-1)%4;
+ if ($tdoy>$doy) {
+ if ($lastleap == 0 && $tdoy < 60) {
+ $doy=$tdoy+366;
+ } else {
+ $doy=$doy+365;
+ }
+ }
}
my $datediff=0;
my $dowd=0;
my $multifile=0;
if ($tdoy ne $doy) {
- $datediff=int(($doy-$tdoy)/7);
- $dowd=($doy-$tdoy)%7;
- if (($dow-$dowd)<1) {
- $datediff=$datediff+1;
- }
- if (($dow-$dowd)==0) {
- $multifile=1;
- }
+ $datediff=int(($doy-$tdoy)/7);
+ $dowd=($doy-$tdoy)%7;
+ if (($dow-$dowd)<1) {
+ $datediff=$datediff+1;
+ }
+ if (($dow-$dowd)==0) {
+ $multifile=1;
+ }
}
my $monthstr = $shortmonths[$cgiparams{'MONTH'}];
@@ -152,62 +152,62 @@ my $longmonthstr = $longmonths[$cgiparams{'MONTH'}];
my $day = $cgiparams{'DAY'};
my $daystr='';
if ($day <= 9) {
- $daystr = " $day"; }
+ $daystr = " $day"; }
else {
- $daystr = $day;
+ $daystr = $day;
}
my $skip=0;
my $filestr='';
if ($datediff==0) {
- $filestr="/var/log/messages";
+ $filestr="/var/log/messages";
} else {
- $filestr="/var/log/messages.$datediff";
- $filestr = "$filestr.gz" if -f "$filestr.gz";
+ $filestr="/var/log/messages.$datediff";
+ $filestr = "$filestr.gz" if -f "$filestr.gz";
}
if (!(open (FILE,($filestr =~ /.gz$/ ? "gzip -dc $filestr |" : $filestr)))) {
- $errormessage = "$Lang::tr{'date not in logs'}: $filestr $Lang::tr{'could not be opened'}";
- $skip=1;
- # Note: This is in case the log does not exist for that date
+ $errormessage = "$Lang::tr{'date not in logs'}: $filestr $Lang::tr{'could not be opened'}";
+ $skip=1;
+ # Note: This is in case the log does not exist for that date
}
my $lines = 0;
my @log=();
if (!$skip)
{
- while (<FILE>)
- {
- if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ kernel:.*(IN=.*)$/) {
- $log[$lines] = $_;
- $lines++;
- }
- }
- close (FILE);
+ while (<FILE>)
+ {
+ if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ kernel:.*(IN=.*)$/) {
+ $log[$lines] = $_;
+ $lines++;
+ }
+ }
+ close (FILE);
}
$skip=0;
if ($multifile) {
- $datediff=$datediff-1;
- if ($datediff==0) {
- $filestr="/var/log/messages";
- } else {
- $filestr="/var/log/messages.$datediff";
- $filestr = "$filestr.gz" if -f "$filestr.gz";
- }
- if (!(open (FILE,($filestr =~ /.gz$/ ? "gzip -dc $filestr |" : $filestr)))) {
- $errormessage="$Lang::tr{'date not in logs'}: $filestr $Lang::tr{'could not be opened'}";
- $skip=1;
- }
- if (!$skip) {
- while (<FILE>) {
- if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ kernel:.*(IN=.*)$/) {
- $log[$lines] = $_;
- $lines++;
- }
- }
- close (FILE);
- }
+ $datediff=$datediff-1;
+ if ($datediff==0) {
+ $filestr="/var/log/messages";
+ } else {
+ $filestr="/var/log/messages.$datediff";
+ $filestr = "$filestr.gz" if -f "$filestr.gz";
+ }
+ if (!(open (FILE,($filestr =~ /.gz$/ ? "gzip -dc $filestr |" : $filestr)))) {
+ $errormessage="$Lang::tr{'date not in logs'}: $filestr $Lang::tr{'could not be opened'}";
+ $skip=1;
+ }
+ if (!$skip) {
+ while (<FILE>) {
+ if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ kernel:.*(IN=.*)$/) {
+ $log[$lines] = $_;
+ $lines++;
+ }
+ }
+ close (FILE);
+ }
}
my $MODNAME="fwlogs";
@@ -217,9 +217,9 @@ my $MODNAME="fwlogs";
&Header::openbigbox('100%', 'left', '', $errormessage);
if ($errormessage) {
- &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
- print "<font class='base'>$errormessage </font>\n";
- &Header::closebox();
+ &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
+ print "<font class='base'>$errormessage </font>\n";
+ &Header::closebox();
}
&Header::openbox('100%', 'left', "$Lang::tr{'settings'}");
@@ -228,33 +228,33 @@ print <<END
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<table width='100%'>
<tr>
- <td width='10%' class='base'>$Lang::tr{'month'}: </td>
- <td width='10%'>
- <select name='MONTH'>
+ <td width='10%' class='base'>$Lang::tr{'month'}: </td>
+ <td width='10%'>
+ <select name='MONTH'>
END
;
my $month;
for ($month = 0; $month < 12; $month++)
{
- print "\t<option ";
- if ($month == $cgiparams{'MONTH'}) {
- print "selected='selected' "; }
- print "value='$month'>$longmonths[$month]</option>\n";
+ print "\t<option ";
+ if ($month == $cgiparams{'MONTH'}) {
+ print "selected='selected' "; }
+ print "value='$month'>$longmonths[$month]</option>\n";
}
print <<END
- </select>
- </td>
- <td width='10%' class='base' align='right'> $Lang::tr{'day'}: </td>
- <td width='40%'>
- <select name='DAY'>
+ </select>
+ </td>
+ <td width='10%' class='base' align='right'> $Lang::tr{'day'}: </td>
+ <td width='40%'>
+ <select name='DAY'>
END
;
for ($day = 1; $day <= 31; $day++)
{
- print "\t<option ";
- if ($day == $cgiparams{'DAY'}) {
- print "selected='selected' "; }
- print "value='$day'>$day</option>\n";
+ print "\t<option ";
+ if ($day == $cgiparams{'DAY'}) {
+ print "selected='selected' "; }
+ print "value='$day'>$day</option>\n";
}
if( $cgiparams{'pienumber'} != 0){$pienumber=$cgiparams{'pienumber'};}
@@ -291,11 +291,11 @@ if ($pienumber == -1 || $pienumber > $lines || $sortcolumn == 2) { $pienumber =
$lines = 0;
foreach $_ (@log)
{
- if($_ =~ /DPT\=([\d\.]+)/){
- $tabjc{$1} = $tabjc{$1} + 1 ;
- if(($tabjc{$1} == 1) && ($lines < $pienumber)) { $lines = $lines + 1; }
- $linesjc++;
- }
+ if($_ =~ /DPT\=([\d\.]+)/){
+ $tabjc{$1} = $tabjc{$1} + 1 ;
+ if(($tabjc{$1} == 1) && ($lines < $pienumber)) { $lines = $lines + 1; }
+ $linesjc++;
+ }
}
$pienumber = $lines;
@@ -317,11 +317,11 @@ my @tabjc2;
if ($sortcolumn == 1)
{
- @tabjc2 = sort { $b <=> $a } values (%tabjc);
+ @tabjc2 = sort { $b <=> $a } values (%tabjc);
}
else
{
- @tabjc2 = sort { $a <=> $b } keys (%tabjc);
+ @tabjc2 = sort { $a <=> $b } keys (%tabjc);
}
my $color=10;
@@ -338,17 +338,17 @@ my $v;
if ($sortcolumn == 1)
{
- for ($v=0;$v<$pienumber;$v++){
- findkey($tabjc2[$v]);
- }
+ for ($v=0;$v<$pienumber;$v++){
+ findkey($tabjc2[$v]);
+ }
}
else
{
- foreach $v (@tabjc2) {
- $key[$indice] = $v;
- $value[$indice] = $tabjc{$v};
- $indice++;
- }
+ foreach $v (@tabjc2) {
+ $key[$indice] = $v;
+ $value[$indice] = $tabjc{$v};
+ $indice++;
+ }
}
my @ports;
@@ -361,15 +361,15 @@ my $o;
if($cgiparams{'otherspie'} == 2 ){}
else{
- my $numothers;
- for($o=0;$o<$pienumber;$o++){
- $numothers = $numothers + $numb[$o];
- }
- $numothers = $linesjc - $numothers;
- if ($numothers > 0) {
- $ports[$pienumber]="$Lang::tr{'otherport'}";
- $numb[$pienumber] = $numothers;
- }
+ my $numothers;
+ for($o=0;$o<$pienumber;$o++){
+ $numothers = $numothers + $numb[$o];
+ }
+ $numothers = $linesjc - $numothers;
+ if ($numothers > 0) {
+ $ports[$pienumber]="$Lang::tr{'otherport'}";
+ $numb[$pienumber] = $numothers;
+ }
}
my @data = (\@ports,\@numb);
@@ -381,28 +381,28 @@ my %mainsettings = ();
&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
if ($showpie != 2 && $pienumber <= 50 && $pienumber != 0) {
- my $mygraph = GD::Graph::pie->new(500, 350);
- $mygraph->set(
- 'title' => '',
- 'pie_height' => 50,
- 'start_angle' => 89
- ) or warn $mygraph->error;
-
- $mygraph->set_value_font(GD::gdMediumBoldFont);
- $mygraph->set( dclrs => [ "$color{'color1'}" , "$color{'color2'}" , "$color{'color3'}" , "$color{'color4'}" , "$color{'color5'}" , "$color{'color6'}" , "$color{'color7'}" , "$color{'color8'}" , "$color{'color9'}" , "$color{'color10'}" ] );
- my $myimage = $mygraph->plot(\@data) or die $mygraph->error;
-
- my @filenames = glob("/srv/web/ipfire/html/graphs/fwlog-port*.png");
- unlink(@filenames);
- my $imagerandom = rand(1000000);
- my $imagename = "/srv/web/ipfire/html/graphs/fwlog-port$imagerandom.png";
- open(FILE,">$imagename");
- print FILE $myimage->png;
- close(FILE);
- #####################################################
- print "<div style='text-align:center'>";
- print "<img src='/graphs/fwlog-port$imagerandom.png'>";
- print "</div>";
+ my $mygraph = GD::Graph::pie->new(500, 350);
+ $mygraph->set(
+ 'title' => '',
+ 'pie_height' => 50,
+ 'start_angle' => 89
+ ) or warn $mygraph->error;
+
+ $mygraph->set_value_font(GD::gdMediumBoldFont);
+ $mygraph->set( dclrs => [ "$color{'color1'}" , "$color{'color2'}" , "$color{'color3'}" , "$color{'color4'}" , "$color{'color5'}" , "$color{'color6'}" , "$color{'color7'}" , "$color{'color8'}" , "$color{'color9'}" , "$color{'color10'}" ] );
+ my $myimage = $mygraph->plot(\@data) or die $mygraph->error;
+
+ my @filenames = glob("/srv/web/ipfire/html/graphs/fwlog-port*.png");
+ unlink(@filenames);
+ my $imagerandom = rand(1000000);
+ my $imagename = "/srv/web/ipfire/html/graphs/fwlog-port$imagerandom.png";
+ open(FILE,">$imagename");
+ print FILE $myimage->png;
+ close(FILE);
+ #####################################################
+ print "<div style='text-align:center'>";
+ print "<img src='/graphs/fwlog-port$imagerandom.png'>";
+ print "</div>";
}
print <<END
@@ -425,49 +425,44 @@ my $col="";
for($s=0;$s<$lines;$s++)
{
- $show++;
- $percent = $value[$s] * 100 / $linesjc;
- $percent = sprintf("%.f", $percent);
- $total = $total + $value[$s];
- my $colorIndex = $color % 10;
- if($colorIndex == 0) {
- $colorIndex = 10;
- }
- $col="bgcolor='$color{\"color$colorIndex\"}'";
- print "<tr>";
-
- $color++;
- print "<td align='center' $col><form method='post' action='showrequestfromport.dat'><input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY' value='$cgiparams{'DAY'}'> <input type='hidden' name='port' value='$key[$s]'> <input type='submit' value='$Lang::tr{'details'}'></form></td>";
- print "<td align='center' $col>$key[$s]</td>";
- print "<td align='center' $col>$value[$s]</td>";
- print "<td align='center' $col>$percent</td>";
- print "</tr>";
+ $show++;
+ $percent = $value[$s] * 100 / $linesjc;
+ $percent = sprintf("%.f", $percent);
+ $total = $total + $value[$s];
+ # colors are numbered 1 to 10
+ my $colorIndex = ($color % 10) + 1;
+ $col="bgcolor='$color{\"color$colorIndex\"}'";
+ print "<tr>";
+
+ $color++;
+ print "<td align='center' $col><form method='post' action='showrequestfromport.dat'><input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY' value='$cgiparams{'DAY'}'> <input type='hidden' name='port' value='$key[$s]'> <input type='submit' value='$Lang::tr{'details'}'></form></td>";
+ print "<td align='center' $col>$key[$s]</td>";
+ print "<td align='center' $col>$value[$s]</td>";
+ print "<td align='center' $col>$percent</td>";
+ print "</tr>";
}
if($cgiparams{'otherspie'} == 2 ){}
else{
- my $colorIndex = $color % 10;
- if($colorIndex == 0) {
- $colorIndex = 10;
- }
- $col="bgcolor='$color{\"color$colorIndex\"}'";
- print "<tr>";
-
-if ( $linesjc ne "0")
-{
-my $dif;
-$dif = $linesjc - $total;
-$percent = $dif * 100 / $linesjc;
-$percent = sprintf("%.f", $percent);
-print <<END
-<td align='center' $col></td>
-<td align='center' $col>$Lang::tr{'otherport'}</td>
-<td align='center' $col>$dif</td>
-<td align='center' $col>$percent</td>
-</tr>
+ # colors are numbered 1 to 10
+ my $colorIndex = ($color % 10) + 1;
+ $col="bgcolor='$color{\"color$colorIndex\"}'";
+ print "<tr>";
+
+ if ( $linesjc ne "0") {
+ my $dif;
+ $dif = $linesjc - $total;
+ $percent = $dif * 100 / $linesjc;
+ $percent = sprintf("%.f", $percent);
+ print <<END
+ <td align='center' $col></td>
+ <td align='center' $col>$Lang::tr{'otherport'}</td>
+ <td align='center' $col>$dif</td>
+ <td align='center' $col>$percent</td>
+ </tr>
END
-;
-}
+ ;
+ }
}
print <<END
</table>
@@ -479,20 +474,20 @@ END
&Header::closepage();
sub findkey {
- my $v;
- foreach $v (@keytabjc) {
- if ($tabjc{$v} eq $_[0]) {
- delete $tabjc{$v};
- $key[$indice] = "$v";
- $value[$indice] = $_[0];
- $indice++;
- last;
- }
- }
+ my $v;
+ foreach $v (@keytabjc) {
+ if ($tabjc{$v} eq $_[0]) {
+ delete $tabjc{$v};
+ $key[$indice] = "$v";
+ $value[$indice] = $_[0];
+ $indice++;
+ last;
+ }
+ }
}
sub checkversion {
- #Automatic Updates is disabled
- return "0","0";
+ #Automatic Updates is disabled
+ return "0","0";
}
diff --git a/html/cgi-bin/logs.cgi/showrequestfromcountry.dat b/html/cgi-bin/logs.cgi/showrequestfromcountry.dat
index 5283c42..cd97f87 100644
--- a/html/cgi-bin/logs.cgi/showrequestfromcountry.dat
+++ b/html/cgi-bin/logs.cgi/showrequestfromcountry.dat
@@ -69,60 +69,60 @@ if (!($cgiparams{'MONTH'} =~ /^(0|1|2|3|4|5|6|7|8|9|10|11)$/) ||
}
elsif($cgiparams{'ACTION'} eq '>>')
{
- my @temp_then=();
- my @temp_now = localtime(time);
- $temp_now[4] = $cgiparams{'MONTH'};
- $temp_now[3] = $cgiparams{'DAY'};
- @temp_then = localtime(POSIX::mktime(@temp_now) + 86400);
- ## Retrieve the same time on the next day -
- ## 86400 seconds in a day
- $cgiparams{'MONTH'} = $temp_then[4];
- $cgiparams{'DAY'} = $temp_then[3];
+ my @temp_then=();
+ my @temp_now = localtime(time);
+ $temp_now[4] = $cgiparams{'MONTH'};
+ $temp_now[3] = $cgiparams{'DAY'};
+ @temp_then = localtime(POSIX::mktime(@temp_now) + 86400);
+ ## Retrieve the same time on the next day -
+ ## 86400 seconds in a day
+ $cgiparams{'MONTH'} = $temp_then[4];
+ $cgiparams{'DAY'} = $temp_then[3];
}
elsif($cgiparams{'ACTION'} eq '<<')
{
- my @temp_then=();
- my @temp_now = localtime(time);
- $temp_now[4] = $cgiparams{'MONTH'};
- $temp_now[3] = $cgiparams{'DAY'};
- @temp_then = localtime(POSIX::mktime(@temp_now) - 86400);
- ## Retrieve the same time on the previous day -
- ## 86400 seconds in a day
- $cgiparams{'MONTH'} = $temp_then[4];
- $cgiparams{'DAY'} = $temp_then[3];
+ my @temp_then=();
+ my @temp_now = localtime(time);
+ $temp_now[4] = $cgiparams{'MONTH'};
+ $temp_now[3] = $cgiparams{'DAY'};
+ @temp_then = localtime(POSIX::mktime(@temp_now) - 86400);
+ ## Retrieve the same time on the previous day -
+ ## 86400 seconds in a day
+ $cgiparams{'MONTH'} = $temp_then[4];
+ $cgiparams{'DAY'} = $temp_then[3];
}
if (($cgiparams{'DAY'} ne $now[3]) || ($cgiparams{'MONTH'} ne $now[4]))
{
- my @then = ();
- if ( ( $cgiparams{'MONTH'} eq $now[4]) && ($cgiparams{'DAY'} > $now[3]) ||
- ( $cgiparams{'MONTH'} > $now[4] ) ) {
- @then = localtime(POSIX::mktime( 0, 0, 0, $cgiparams{'DAY'}, $cgiparams{'MONTH'}, $year - 1901 ));
- } else {
- @then = localtime(POSIX::mktime( 0, 0, 0, $cgiparams{'DAY'}, $cgiparams{'MONTH'}, $year - 1900 ));
- }
- $tdoy = $then[7];
- my $lastleap=($year-1)%4;
- if ($tdoy>$doy) {
- if ($lastleap == 0 && $tdoy < 60) {
- $doy=$tdoy+366;
- } else {
- $doy=$doy+365;
- }
- }
+ my @then = ();
+ if ( ( $cgiparams{'MONTH'} eq $now[4]) && ($cgiparams{'DAY'} > $now[3]) ||
+ ( $cgiparams{'MONTH'} > $now[4] ) ) {
+ @then = localtime(POSIX::mktime( 0, 0, 0, $cgiparams{'DAY'}, $cgiparams{'MONTH'}, $year - 1901 ));
+ } else {
+ @then = localtime(POSIX::mktime( 0, 0, 0, $cgiparams{'DAY'}, $cgiparams{'MONTH'}, $year - 1900 ));
+ }
+ $tdoy = $then[7];
+ my $lastleap=($year-1)%4;
+ if ($tdoy>$doy) {
+ if ($lastleap == 0 && $tdoy < 60) {
+ $doy=$tdoy+366;
+ } else {
+ $doy=$doy+365;
+ }
+ }
}
my $datediff=0;
my $dowd=0;
my $multifile=0;
if ($tdoy ne $doy) {
- $datediff=int(($doy-$tdoy)/7);
- $dowd=($doy-$tdoy)%7;
- if (($dow-$dowd)<1) {
- $datediff=$datediff+1;
- }
- if (($dow-$dowd)==0) {
- $multifile=1;
- }
+ $datediff=int(($doy-$tdoy)/7);
+ $dowd=($doy-$tdoy)%7;
+ if (($dow-$dowd)<1) {
+ $datediff=$datediff+1;
+ }
+ if (($dow-$dowd)==0) {
+ $multifile=1;
+ }
}
my $monthstr = $shortmonths[$cgiparams{'MONTH'}];
@@ -138,16 +138,16 @@ else {
my $skip=0;
my $filestr='';
if ($datediff==0) {
- $filestr="/var/log/messages";
+ $filestr="/var/log/messages";
} else {
- $filestr="/var/log/messages.$datediff";
- $filestr = "$filestr.gz" if -f "$filestr.gz";
+ $filestr="/var/log/messages.$datediff";
+ $filestr = "$filestr.gz" if -f "$filestr.gz";
}
if (!(open (FILE,($filestr =~ /.gz$/ ? "gzip -dc $filestr |" : $filestr)))) {
- $errormessage = "$Lang::tr{'date not in logs'}: $filestr $Lang::tr{'could not be opened'}";
- $skip=1;
- # Note: This is in case the log does not exist for that date
+ $errormessage = "$Lang::tr{'date not in logs'}: $filestr $Lang::tr{'could not be opened'}";
+ $skip=1;
+ # Note: This is in case the log does not exist for that date
}
my $lines = 0;
my @log=();
@@ -156,24 +156,35 @@ my $gi = Geo::IP::PurePerl->new();
if (!$skip)
{
- while (<FILE>)
- {
- if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ kernel:.*(IN=.*)$/) {
- my $packet = $2;
- $packet =~ /IN=(\w+)/; my $iface=$1; if ( $1 =~ /2./ ){ $iface="";}
- $packet =~ /SRC=([\d\.]+)/; my $srcaddr=$1;
-
- if($iface eq $country) {
- $log[$lines] = $_;
- $lines++;
- }
- elsif($srcaddr ne '') {
- my $ccode = $gi->country_code_by_name($srcaddr);
- if($ccode eq $country){
- $log[$lines] = $_;
- $lines++;
- }
- }
+ while (<FILE>) {
+ # First check whether valid log line (date, day)
+ if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ kernel:.*(IN=.*)$/) {
+ # If ipv6 uses bridge, then use PHYSIN otherwise use IN
+ if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ kernel:.*(PHYSIN=.*)$/) {}
+ elsif (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ kernel:.*(IN=.*)$/) {}
+ my $packet = $2;
+ my $iface = '';
+ my $srcaddr = '';
+ # If ipv6 uses bridge, use PHYSIN otherwise IN
+ if ($packet =~ /PHYSIN=(\w+)/) { $iface = $1; } elsif ($packet =~ /IN=(\w+)/) { $iface = $1; }
+ # Extract ipv4 and ipv6 addresses
+ if (($packet =~ /SRC\=(([\d]{1,3})(\.([\d]{1,3})){3})/) or ($packet =~ /SRC\=(([0-9a-fA-F]{0,4})(\:([0-9a-fA-F]{0,4})){2,7})/)) {
+ $srcaddr = $1;
+ }
+
+ if($iface eq $country) {
+ # iface matches country code
+ $log[$lines] = $_;
+ $lines++;
+ }
+ elsif($srcaddr ne '') {
+ # or srcaddr matches country code
+ my $ccode = $gi->country_code_by_name($srcaddr);
+ if($ccode eq uc($country)){
+ $log[$lines] = $_;
+ $lines++;
+ }
+ }
}
}
close (FILE);
@@ -181,28 +192,40 @@ if (!$skip)
$skip=0;
if ($multifile) {
- $datediff=$datediff-1;
- if ($datediff==0) {
- $filestr="/var/log/messages";
- } else {
- $filestr="/var/log/messages.$datediff";
- $filestr = "$filestr.gz" if -f "$filestr.gz";
- }
- if (!(open (FILE,($filestr =~ /.gz$/ ? "gzip -dc $filestr |" : $filestr)))) {
- $errormessage="$Lang::tr{'date not in logs'}: $filestr $Lang::tr{'could not be opened'}";
- $skip=1;
- }
- if (!$skip) {
+ $datediff=$datediff-1;
+ if ($datediff==0) {
+ $filestr="/var/log/messages";
+ } else {
+ $filestr="/var/log/messages.$datediff";
+ $filestr = "$filestr.gz" if -f "$filestr.gz";
+ }
+ if (!(open (FILE,($filestr =~ /.gz$/ ? "gzip -dc $filestr |" : $filestr)))) {
+ $errormessage="$Lang::tr{'date not in logs'}: $filestr $Lang::tr{'could not be opened'}";
+ $skip=1;
+ }
+ if (!$skip) {
while (<FILE>) {
- if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ kernel:.*(IN=.*)$/) {
- if($_ =~ /SRC\=([\d\.]+)/){
- my $srcaddr=$1;
- my $ccode = $gi->country_code_by_name($srcaddr);
- if($ccode eq $country){
- $log[$lines] = $_;
- $lines++;
- }
- }
+ # Check if valid log line (date, day)
+ if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ kernel:.*(IN=.*)$/) {
+ my $iface = '';
+ # If ipv6 uses bridge, then use PHYSIN otherwise IN
+ if ($_ =~ /PHYSIN=(\w+)/) { $iface = $1; } elsif ($_ =~ /IN=(\w+)/) { $iface = $1; }
+
+ if($iface eq $country) {
+ # iface matches country code
+ $log[$lines] = $_;
+ $lines++;
+ }
+ # extract ipv4 and ipv6 address
+ elsif (($_ =~ /SRC\=(([\d]{1,3})(\.([\d]{1,3})){3})/) or ($_ =~ /SRC\=(([0-9a-fA-F]{0,4})(\:([0-9a-fA-F]{0,4})){2,7})/)) {
+ my $srcaddr=$1;
+ my $ccode = $gi->country_code_by_name($srcaddr);
+ if($ccode eq uc($country)){
+ # or srcaddr matches country code
+ $log[$lines] = $_;
+ $lines++;
+ }
+ }
}
}
close (FILE);
@@ -235,7 +258,8 @@ for ($month = 0; $month < 12; $month++)
{
print "\t<option ";
if ($month == $cgiparams{'MONTH'}) {
- print "selected='selected' "; }
+ print "selected='selected' ";
+ }
print "value='$month'>$longmonths[$month]</option>\n";
}
print <<END
@@ -272,7 +296,8 @@ END
print "<p><b>$Lang::tr{'firewall hits'} $longmonthstr $daystr: $lines</b></p>";
if ($start == -1) {
- $start = $lines - ${Header::viewsize}; }
+ $start = $lines - ${Header::viewsize};
+}
if ($start >= $lines - ${Header::viewsize}) { $start = $lines - ${Header::viewsize}; };
if ($start < 0) { $start = 0; }
@@ -307,65 +332,80 @@ if ($logsettings{'LOGVIEW_REVERSE'} eq 'on') { @slice = reverse @slice; }
$lines = 0;
foreach $_ (@slice)
{
- $a = $_;
- /^... (..) (..:..:..) [\w\-]+ kernel:(.*)(IN=.*)$/;
- my $packet = $4;
- $packet =~ /IN=(\w+)/; my $iface=$1; if ( $1 =~ /2./ ){ $iface="";}
- $packet =~ /SRC=([\d\.]+)/; my $srcaddr=$1;
-
- if($iface eq $country || $srcaddr ne '') {
- my $ccode;
- if($iface ne $country) {
- $ccode = $gi->country_code_by_name($srcaddr);
- }
- if($iface eq $country || $ccode eq $country) {
- my $chain = '';
- my $in = '-'; my $out = '-';
- my $srcaddr = ''; my $dstaddr = '';
- my $protostr = '';
- my $srcport = ''; my $dstport = '';
-
- $_ =~ /(^.* ..:..:..) [\w\-]+ kernel:(.*)(IN=.*)$/;
- my $timestamp = $1; my $chain = $2; my $packet = $3;
- $timestamp =~ /(...) (..) (..:..:..)/;
- my $month = $1; my $day = $2; my $time = $3;
-
- if ($a =~ /IN\=(\w+)/) { $iface = $1; }
- if ($a =~ /OUT\=(\w+)/) { $out = $1; }
- if ($a =~ /SRC\=([\d\.]+)/) { $srcaddr = $1; }
- if ($a =~ /DST\=([\d\.]+)/) { $dstaddr = $1; }
- if ($a =~ /PROTO\=(\w+)/) { $protostr = $1; }
- my $protostrlc = lc($protostr);
- if ($a =~ /SPT\=([\d\.]+)/){ $srcport = $1; }
- if ($a =~ /DPT\=([\d\.]+)/){ $dstport = $1; }
-
- if ($lines % 2) {
- print "<tr bgcolor='${Header::table1colour}'>\n"; }
- else {
- print "<tr bgcolor='${Header::table2colour}'>\n"; }
- print <<END
- <td align='center'>$time</td>
- <td align='center'>$chain</td>
- <td align='center'>$iface</td>
- <td align='center'>$protostr</td>
- <td align='center'>
- <table width='100%' cellpadding='0' cellspacing='0'><tr>
- <td align='center'><a href='/cgi-bin/ipinfo.cgi?ip=$srcaddr'>$srcaddr</a></td>
- </tr></table>
- </td>
- <td align='center'>$srcport</td>
- <td align='center'>
- <table width='100%' cellpadding='0' cellspacing='0'><tr>
- <td align='center'><a href='/cgi-bin/ipinfo.cgi?ip=$dstaddr'>$dstaddr</a></td>
- </tr></table>
- </td>
- <td align='center'>$dstport</td>
- </tr>
+ $a = $_;
+ # If ipv6 uses bridge, use PHYSIN otherwise use IN
+ if (/^... (..) (..:..:..) [\w\-]+ kernel:(.*)(PHYSIN=.*)$/) {}
+ elsif (/^... (..) (..:..:..) [\w\-]+ kernel:(.*)(IN=.*)$/) {};
+ my $packet = $4;
+ my $iface = '';
+ # If ipv6 uses bridge, use PHYSIN otherwise use IN
+ if ($packet =~ /PHYSIN=(\w+)/) { $iface = $1; } elsif ($packet =~ /IN=(\w+)/) { $iface = $1; }
+ if ( $1 =~ /2./ ){ $iface=""; }
+ my $srcaddr = '';
+ # Extract ipv4 and ipv6 addresses
+ if (($packet =~ /SRC\=(([\d]{1,3})(\.([\d]{1,3})){3})/) or ($packet =~ /SRC\=(([0-9a-fA-F]{0,4})(\:([0-9a-fA-F]{0,4})){2,7})/)) {
+ $srcaddr = $1;
+ };
+
+ if($iface eq $country || $srcaddr ne '') {
+ my $ccode='';
+ if($iface ne $country) {
+ $ccode = $gi->country_code_by_name($srcaddr);
+ }
+ if($iface eq $country || $ccode eq uc($country)) {
+ my $chain = '';
+ my $in = '-'; my $out = '-';
+ my $srcaddr = ''; my $dstaddr = '';
+ my $protostr = '';
+ my $srcport = ''; my $dstport = '';
+
+ # If ipv6 uses bridge, the use PHYSIN otherwise use IN
+ if ($_ =~ /(^.* ..:..:..) [\w\-]+ kernel:(.*)(IN=.*)(PHYSIN=.*)$/) {}
+ elsif ($_ =~ /(^.* ..:..:..) [\w\-]+ kernel:(.*)(IN=.*)$/) {}
+ my $timestamp = $1; my $chain = $2; my $packet = $3;
+ $timestamp =~ /(...) (..) (..:..:..)/;
+ my $month = $1; my $day = $2; my $time = $3;
+
+ # If ipv6 uses bridge, use PHYSIN and PHYSOUT, otherwise use IN and OUT
+ if ($a =~ /PHYSIN=(\w+)/) { $iface = $1; } elsif ($a =~ /IN=(\w+)/) { $iface = $1; }
+ if ($a =~ /PHYSOUT=(\w+)/) { $out = $1; } elsif ($a =~ /OUT=(\w+)/) { $out = $1; }
+ # Extract ipv4 and ipv6 addresses
+ if (($a =~ /SRC\=(([\d]{1,3})(\.([\d]{1,3})){3})/) or ($a =~ /SRC\=(([0-9a-fA-F]{0,4})(\:([0-9a-fA-F]{0,4})){2,7})/)) { $srcaddr = $1; }
+ if (($a =~ /DST\=(([\d]{1,3})(\.([\d]{1,3})){3})/) or ($a =~ /DST\=(([0-9a-fA-F]{0,4})(\:([0-9a-fA-F]{0,4})){2,7})/)) { $dstaddr = $1; }
+ if ($a =~ /PROTO\=(\w+)/) { $protostr = $1; }
+ my $protostrlc = lc($protostr);
+ if ($a =~ /SPT\=([\d\.]+)/){ $srcport = $1; }
+ if ($a =~ /DPT\=([\d\.]+)/){ $dstport = $1; }
+
+ if ($lines % 2) {
+ print "<tr bgcolor='${Header::table1colour}'>\n";
+ }
+ else {
+ print "<tr bgcolor='${Header::table2colour}'>\n";
+ }
+ print <<END
+ <td align='center'>$time</td>
+ <td align='center'>$chain</td>
+ <td align='center'>$iface</td>
+ <td align='center'>$protostr</td>
+ <td align='center'>
+ <table width='100%' cellpadding='0' cellspacing='0'><tr>
+ <td align='center'><a href='/cgi-bin/ipinfo.cgi?ip=$srcaddr'>$srcaddr</a></td>
+ </tr></table>
+ </td>
+ <td align='center'>$srcport</td>
+ <td align='center'>
+ <table width='100%' cellpadding='0' cellspacing='0'><tr>
+ <td align='center'><a href='/cgi-bin/ipinfo.cgi?ip=$dstaddr'>$dstaddr</a></td>
+ </tr></table>
+ </td>
+ <td align='center'>$dstport</td>
+ </tr>
END
- ;
- $lines++;
- }
- }
+ ;
+ $lines++;
+ }
+ }
}
print <<END
@@ -383,30 +423,34 @@ END
sub oldernewer
{
- print <<END
- <table width='100%'>
- <tr>
+ print <<END
+ <table width='100%'>
+ <tr>
END
-;
+ ;
- print "<td align='center' width='50%'>";
- if ($prev != -1) {
- print "<a href='/cgi-bin/logs.cgi/showrequestfromcountry.dat?$prev,$cgiparams{'MONTH'},$cgiparams{'DAY'},$cgiparams{country}'>$Lang::tr{'older'}</a>"; }
- else {
- print "$Lang::tr{'older'}"; }
- print "</td>\n";
+ print "<td align='center' width='50%'>";
+ if ($prev != -1) {
+ print "<a href='/cgi-bin/logs.cgi/showrequestfromcountry.dat?$prev,$cgiparams{'MONTH'},$cgiparams{'DAY'},$cgiparams{country}'>$Lang::tr{'older'}</a>";
+ }
+ else {
+ print "$Lang::tr{'older'}";
+ }
+ print "</td>\n";
- print "<td align='center' width='50%'>";
- if ($next != -1) {
- print "<a href='/cgi-bin/logs.cgi/showrequestfromcountry.dat?$next,$cgiparams{'MONTH'},$cgiparams{'DAY'},$cgiparams{country}'>$Lang::tr{'newer'}</a>"; }
- else {
- print "$Lang::tr{'newer'}"; }
- print "</td>\n";
+ print "<td align='center' width='50%'>";
+ if ($next != -1) {
+ print "<a href='/cgi-bin/logs.cgi/showrequestfromcountry.dat?$next,$cgiparams{'MONTH'},$cgiparams{'DAY'},$cgiparams{country}'>$Lang::tr{'newer'}</a>";
+ }
+ else {
+ print "$Lang::tr{'newer'}";
+ }
-print <<END
- </tr>
- </table>
+ print "</td>\n";
+ print <<END
+ </tr>
+ </table>
END
-;
+ ;
}
diff --git a/html/cgi-bin/logs.cgi/showrequestfromip.dat b/html/cgi-bin/logs.cgi/showrequestfromip.dat
index 09a60b5..154fa40 100644
--- a/html/cgi-bin/logs.cgi/showrequestfromip.dat
+++ b/html/cgi-bin/logs.cgi/showrequestfromip.dat
@@ -66,60 +66,60 @@ if (!($cgiparams{'MONTH'} =~ /^(0|1|2|3|4|5|6|7|8|9|10|11)$/) ||
}
elsif($cgiparams{'ACTION'} eq '>>')
{
- my @temp_then=();
- my @temp_now = localtime(time);
- $temp_now[4] = $cgiparams{'MONTH'};
- $temp_now[3] = $cgiparams{'DAY'};
- @temp_then = localtime(POSIX::mktime(@temp_now) + 86400);
- ## Retrieve the same time on the next day -
- ## 86400 seconds in a day
- $cgiparams{'MONTH'} = $temp_then[4];
- $cgiparams{'DAY'} = $temp_then[3];
+ my @temp_then=();
+ my @temp_now = localtime(time);
+ $temp_now[4] = $cgiparams{'MONTH'};
+ $temp_now[3] = $cgiparams{'DAY'};
+ @temp_then = localtime(POSIX::mktime(@temp_now) + 86400);
+ ## Retrieve the same time on the next day -
+ ## 86400 seconds in a day
+ $cgiparams{'MONTH'} = $temp_then[4];
+ $cgiparams{'DAY'} = $temp_then[3];
}
elsif($cgiparams{'ACTION'} eq '<<')
{
- my @temp_then=();
- my @temp_now = localtime(time);
- $temp_now[4] = $cgiparams{'MONTH'};
- $temp_now[3] = $cgiparams{'DAY'};
- @temp_then = localtime(POSIX::mktime(@temp_now) - 86400);
- ## Retrieve the same time on the previous day -
- ## 86400 seconds in a day
- $cgiparams{'MONTH'} = $temp_then[4];
- $cgiparams{'DAY'} = $temp_then[3];
+ my @temp_then=();
+ my @temp_now = localtime(time);
+ $temp_now[4] = $cgiparams{'MONTH'};
+ $temp_now[3] = $cgiparams{'DAY'};
+ @temp_then = localtime(POSIX::mktime(@temp_now) - 86400);
+ ## Retrieve the same time on the previous day -
+ ## 86400 seconds in a day
+ $cgiparams{'MONTH'} = $temp_then[4];
+ $cgiparams{'DAY'} = $temp_then[3];
}
if (($cgiparams{'DAY'} ne $now[3]) || ($cgiparams{'MONTH'} ne $now[4]))
{
- my @then = ();
- if ( ( $cgiparams{'MONTH'} eq $now[4]) && ($cgiparams{'DAY'} > $now[3]) ||
- ( $cgiparams{'MONTH'} > $now[4] ) ) {
- @then = localtime(POSIX::mktime( 0, 0, 0, $cgiparams{'DAY'}, $cgiparams{'MONTH'}, $year - 1901 ));
- } else {
- @then = localtime(POSIX::mktime( 0, 0, 0, $cgiparams{'DAY'}, $cgiparams{'MONTH'}, $year - 1900 ));
- }
- $tdoy = $then[7];
- my $lastleap=($year-1)%4;
- if ($tdoy>$doy) {
- if ($lastleap == 0 && $tdoy < 60) {
- $doy=$tdoy+366;
- } else {
- $doy=$doy+365;
- }
- }
+ my @then = ();
+ if ( ( $cgiparams{'MONTH'} eq $now[4]) && ($cgiparams{'DAY'} > $now[3]) ||
+ ( $cgiparams{'MONTH'} > $now[4] ) ) {
+ @then = localtime(POSIX::mktime( 0, 0, 0, $cgiparams{'DAY'}, $cgiparams{'MONTH'}, $year - 1901 ));
+ } else {
+ @then = localtime(POSIX::mktime( 0, 0, 0, $cgiparams{'DAY'}, $cgiparams{'MONTH'}, $year - 1900 ));
+ }
+ $tdoy = $then[7];
+ my $lastleap=($year-1)%4;
+ if ($tdoy>$doy) {
+ if ($lastleap == 0 && $tdoy < 60) {
+ $doy=$tdoy+366;
+ } else {
+ $doy=$doy+365;
+ }
+ }
}
my $datediff=0;
my $dowd=0;
my $multifile=0;
if ($tdoy ne $doy) {
- $datediff=int(($doy-$tdoy)/7);
- $dowd=($doy-$tdoy)%7;
- if (($dow-$dowd)<1) {
- $datediff=$datediff+1;
- }
- if (($dow-$dowd)==0) {
- $multifile=1;
- }
+ $datediff=int(($doy-$tdoy)/7);
+ $dowd=($doy-$tdoy)%7;
+ if (($dow-$dowd)<1) {
+ $datediff=$datediff+1;
+ }
+ if (($dow-$dowd)==0) {
+ $multifile=1;
+ }
}
my $monthstr = $shortmonths[$cgiparams{'MONTH'}];
@@ -135,16 +135,16 @@ else {
my $skip=0;
my $filestr='';
if ($datediff==0) {
- $filestr="/var/log/messages";
+ $filestr="/var/log/messages";
} else {
$filestr="/var/log/messages.$datediff";
$filestr = "$filestr.gz" if -f "$filestr.gz";
}
if (!(open (FILE,($filestr =~ /.gz$/ ? "gzip -dc $filestr |" : $filestr)))) {
- $errormessage = "$Lang::tr{'date not in logs'}: $filestr $Lang::tr{'could not be opened'}";
- $skip=1;
- # Note: This is in case the log does not exist for that date
+ $errormessage = "$Lang::tr{'date not in logs'}: $filestr $Lang::tr{'could not be opened'}";
+ $skip=1;
+ # Note: This is in case the log does not exist for that date
}
my $lines = 0;
my @log=();
@@ -152,15 +152,14 @@ my $ip = $cgiparams{ip};
if (!$skip)
{
- while (<FILE>)
- {
+ while (<FILE>) {
if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ kernel:.*(IN=.*)$/) {
- if($_ =~ /SRC\=([\d\.]+)/){
- if($1 eq $ip){
- $log[$lines] = $_;
- $lines++;
- }
- }
+ if (($_ =~ /SRC\=(([\d]{1,3})(\.([\d]{1,3})){3})/) or ($_ =~ /SRC\=(([0-9a-fA-F]{0,4})(\:([0-9a-fA-F]{0,4})){2,7})/)) {
+ if($1 eq $ip){
+ $log[$lines] = $_;
+ $lines++;
+ }
+ }
}
}
close (FILE);
@@ -168,26 +167,26 @@ if (!$skip)
$skip=0;
if ($multifile) {
- $datediff=$datediff-1;
- if ($datediff==0) {
- $filestr="/var/log/messages";
- } else {
- $filestr="/var/log/messages.$datediff";
- $filestr = "$filestr.gz" if -f "$filestr.gz";
- }
- if (!(open (FILE,($filestr =~ /.gz$/ ? "gzip -dc $filestr |" : $filestr)))) {
- $errormessage="$Lang::tr{'date not in logs'}: $filestr $Lang::tr{'could not be opened'}";
- $skip=1;
- }
- if (!$skip) {
+ $datediff=$datediff-1;
+ if ($datediff==0) {
+ $filestr="/var/log/messages";
+ } else {
+ $filestr="/var/log/messages.$datediff";
+ $filestr = "$filestr.gz" if -f "$filestr.gz";
+ }
+ if (!(open (FILE,($filestr =~ /.gz$/ ? "gzip -dc $filestr |" : $filestr)))) {
+ $errormessage="$Lang::tr{'date not in logs'}: $filestr $Lang::tr{'could not be opened'}";
+ $skip=1;
+ }
+ if (!$skip) {
while (<FILE>) {
- if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ kernel:.*(IN=.*)$/) {
- if($_ =~ /SRC\=([\d\.]+)/){
- if($1 eq $ip){
- $log[$lines] = $_;
- $lines++;
- }
- }
+ if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ kernel:.*(IN=.*)$/) {
+ if (($_ =~ /SRC\=(([\d]{1,3})(\.([\d]{1,3})){3})/) or ($_ =~ /SRC\=(([0-9a-fA-F]{0,4})(\:([0-9a-fA-F]{0,4})){2,7})/)) {
+ if($1 eq $ip){
+ $log[$lines] = $_;
+ $lines++;
+ }
+ }
}
}
close (FILE);
@@ -257,7 +256,8 @@ END
print "<p><b>$Lang::tr{'firewall hits'} $longmonthstr $daystr: $lines</b></p>";
if ($start == -1) {
- $start = $lines - ${Header::viewsize}; }
+ $start = $lines - ${Header::viewsize};
+}
if ($start >= $lines - ${Header::viewsize}) { $start = $lines - ${Header::viewsize}; };
if ($start < 0) { $start = 0; }
@@ -290,58 +290,64 @@ my @slice = splice(@log, $start, ${Header::viewsize});
if ($logsettings{'LOGVIEW_REVERSE'} eq 'on') { @slice = reverse @slice; }
$lines = 0;
-foreach $_ (@slice)
-{
- $a = $_;
- if($_ =~ /SRC\=([\d\.]+)/){
- if($1 eq $ip){
- my $chain = '';
- my $in = '-'; my $out = '-';
- my $srcaddr = ''; my $dstaddr = '';
- my $protostr = '';
- my $srcport = ''; my $dstport = '';
-
- $_ =~ /(^.* ..:..:..) [\w\-]+ kernel:(.*)(IN=.*)$/;
- my $timestamp = $1; my $chain = $2; my $packet = $3;
- $timestamp =~ /(...) (..) (..:..:..)/;
- my $month = $1; my $day = $2; my $time = $3;
-
- if ($a =~ /IN\=(\w+)/) { $iface = $1; }
- if ($a =~ /OUT\=(\w+)/) { $out = $1; }
- if ($a =~ /SRC\=([\d\.]+)/) { $srcaddr = $1; }
- if ($a =~ /DST\=([\d\.]+)/) { $dstaddr = $1; }
- if ($a =~ /PROTO\=(\w+)/) { $protostr = $1; }
- my $protostrlc = lc($protostr);
- if ($a =~ /SPT\=([\d\.]+)/){ $srcport = $1; }
- if ($a =~ /DPT\=([\d\.]+)/){ $dstport = $1; }
-
- if ($lines % 2) {
- print "<tr bgcolor='${Header::table1colour}'>\n"; }
- else {
- print "<tr bgcolor='${Header::table2colour}'>\n"; }
- print <<END
- <td align='center'>$time</td>
- <td align='center'>$chain</td>
- <td align='center'>$iface</td>
- <td align='center'>$protostr</td>
- <td align='center'>
- <table width='100%' cellpadding='0' cellspacing='0'><tr>
- <td align='center'><a href='/cgi-bin/ipinfo.cgi?ip=$srcaddr'>$srcaddr</a></td>
- </tr></table>
- </td>
- <td align='center'>$srcport</td>
- <td align='center'>
- <table width='100%' cellpadding='0' cellspacing='0'><tr>
- <td align='center'><a href='/cgi-bin/ipinfo.cgi?ip=$dstaddr'>$dstaddr</a></td>
- </tr></table>
- </td>
- <td align='center'>$dstport</td>
-</tr>
+foreach $_ (@slice) {
+ $a = $_;
+ # Check whether valid ipv4 or ipv6 address
+ if (($_ =~ /SRC\=(([\d]{1,3})(\.([\d]{1,3})){3})/) or ($_ =~ /SRC\=(([0-9a-fA-F]{0,4})(\:([0-9a-fA-F]{0,4})){2,7})/)) {
+ if($1 eq $ip) {
+ my $chain = '';
+ my $in = '-'; my $out = '-';
+ my $srcaddr = ''; my $dstaddr = '';
+ my $protostr = '';
+ my $srcport = ''; my $dstport = '';
+
+ # If ipv6 uses bridge, the use PHYSIN, otherwise use IN
+ if ($_ =~ /(^.* ..:..:..) [\w\-]+ kernel:(.*)(IN=.*)(PHYSIN=.*)$/) {}
+ elsif ($_ =~ /(^.* ..:..:..) [\w\-]+ kernel:(.*)(IN=.*)$/) {}
+ my $timestamp = $1; my $chain = $2; my $packet = $3;
+ $timestamp =~ /(...) (..) (..:..:..)/;
+ my $month = $1; my $day = $2; my $time = $3;
+
+ # If ipv6 uses bridge, the use PHYSIN and PHYSOUT, otherwise use IN and OUT
+ if ($a =~ /PHYSIN=(\w+)/) { $iface = $1; } elsif ($a =~ /IN=(\w+)/) { $iface = $1; }
+ if ($a =~ /PHYSOUT=(\w+)/) { $out = $1; } elsif ($a =~ /OUT=(\w+)/) { $out = $1; }
+ # Detect ipv4 and ipv6 addresses
+ if (($a =~ /SRC\=(([\d]{1,3})(\.([\d]{1,3})){3})/) or ($a =~ /SRC\=(([0-9a-fA-F]{0,4})(\:([0-9a-fA-F]{0,4})){2,7})/)) { $srcaddr = $1; }
+ if (($a =~ /DST\=(([\d]{1,3})(\.([\d]{1,3})){3})/) or ($a =~ /DST\=(([0-9a-fA-F]{0,4})(\:([0-9a-fA-F]{0,4})){2,7})/)) { $dstaddr = $1; }
+ if ($a =~ /PROTO\=(\w+)/) { $protostr = $1; }
+ my $protostrlc = lc($protostr);
+ if ($a =~ /SPT\=([\d\.]+)/){ $srcport = $1; }
+ if ($a =~ /DPT\=([\d\.]+)/){ $dstport = $1; }
+
+ if ($lines % 2) {
+ print "<tr bgcolor='${Header::table1colour}'>\n";
+ }
+ else {
+ print "<tr bgcolor='${Header::table2colour}'>\n";
+ }
+ print <<END
+ <td align='center'>$time</td>
+ <td align='center'>$chain</td>
+ <td align='center'>$iface</td>
+ <td align='center'>$protostr</td>
+ <td align='center'>
+ <table width='100%' cellpadding='0' cellspacing='0'><tr>
+ <td align='center'><a href='/cgi-bin/ipinfo.cgi?ip=$srcaddr'>$srcaddr</a></td>
+ </tr></table>
+ </td>
+ <td align='center'>$srcport</td>
+ <td align='center'>
+ <table width='100%' cellpadding='0' cellspacing='0'><tr>
+ <td align='center'><a href='/cgi-bin/ipinfo.cgi?ip=$dstaddr'>$dstaddr</a></td>
+ </tr></table>
+ </td>
+ <td align='center'>$dstport</td>
+ </tr>
END
- ;
- $lines++;
- }
- }
+ ;
+ $lines++;
+ }
+ }
}
print <<END
@@ -359,29 +365,33 @@ END
sub oldernewer
{
-print <<END
-<table width='100%'>
-<tr>
+ print <<END
+ <table width='100%'>
+ <tr>
END
-;
+ ;
-print "<td align='center' width='50%'>";
-if ($prev != -1) {
- print "<a href='/cgi-bin/logs.cgi/showrequestfromip.dat?$prev,$cgiparams{'MONTH'},$cgiparams{'DAY'},$cgiparams{ip}'>$Lang::tr{'older'}</a>"; }
-else {
- print "$Lang::tr{'older'}"; }
-print "</td>\n";
+ print "<td align='center' width='50%'>";
+ if ($prev != -1) {
+ print "<a href='/cgi-bin/logs.cgi/showrequestfromip.dat?$prev,$cgiparams{'MONTH'},$cgiparams{'DAY'},$cgiparams{ip}'>$Lang::tr{'older'}</a>";
+ }
+ else {
+ print "$Lang::tr{'older'}";
+ }
+ print "</td>\n";
-print "<td align='center' width='50%'>";
-if ($next != -1) {
- print "<a href='/cgi-bin/logs.cgi/showrequestfromip.dat?$next,$cgiparams{'MONTH'},$cgiparams{'DAY'},$cgiparams{ip}'>$Lang::tr{'newer'}</a>"; }
-else {
- print "$Lang::tr{'newer'}"; }
-print "</td>\n";
+ print "<td align='center' width='50%'>";
+ if ($next != -1) {
+ print "<a href='/cgi-bin/logs.cgi/showrequestfromip.dat?$next,$cgiparams{'MONTH'},$cgiparams{'DAY'},$cgiparams{ip}'>$Lang::tr{'newer'}</a>";
+ }
+ else {
+ print "$Lang::tr{'newer'}";
+ }
+ print "</td>\n";
-print <<END
-</tr>
-</table>
+ print <<END
+ </tr>
+ </table>
END
-;
+ ;
}
diff --git a/html/cgi-bin/logs.cgi/showrequestfromport.dat b/html/cgi-bin/logs.cgi/showrequestfromport.dat
index ad9823c..e1f00ae 100644
--- a/html/cgi-bin/logs.cgi/showrequestfromport.dat
+++ b/html/cgi-bin/logs.cgi/showrequestfromport.dat
@@ -73,60 +73,60 @@ if (!($cgiparams{'MONTH'} =~ /^(0|1|2|3|4|5|6|7|8|9|10|11)$/) ||
}
elsif($cgiparams{'ACTION'} eq '>>')
{
- my @temp_then=();
- my @temp_now = localtime(time);
- $temp_now[4] = $cgiparams{'MONTH'};
- $temp_now[3] = $cgiparams{'DAY'};
- @temp_then = localtime(POSIX::mktime(@temp_now) + 86400);
- ## Retrieve the same time on the next day -
- ## 86400 seconds in a day
- $cgiparams{'MONTH'} = $temp_then[4];
- $cgiparams{'DAY'} = $temp_then[3];
+ my @temp_then=();
+ my @temp_now = localtime(time);
+ $temp_now[4] = $cgiparams{'MONTH'};
+ $temp_now[3] = $cgiparams{'DAY'};
+ @temp_then = localtime(POSIX::mktime(@temp_now) + 86400);
+ ## Retrieve the same time on the next day -
+ ## 86400 seconds in a day
+ $cgiparams{'MONTH'} = $temp_then[4];
+ $cgiparams{'DAY'} = $temp_then[3];
}
elsif($cgiparams{'ACTION'} eq '<<')
{
- my @temp_then=();
- my @temp_now = localtime(time);
- $temp_now[4] = $cgiparams{'MONTH'};
- $temp_now[3] = $cgiparams{'DAY'};
- @temp_then = localtime(POSIX::mktime(@temp_now) - 86400);
- ## Retrieve the same time on the previous day -
- ## 86400 seconds in a day
- $cgiparams{'MONTH'} = $temp_then[4];
- $cgiparams{'DAY'} = $temp_then[3];
+ my @temp_then=();
+ my @temp_now = localtime(time);
+ $temp_now[4] = $cgiparams{'MONTH'};
+ $temp_now[3] = $cgiparams{'DAY'};
+ @temp_then = localtime(POSIX::mktime(@temp_now) - 86400);
+ ## Retrieve the same time on the previous day -
+ ## 86400 seconds in a day
+ $cgiparams{'MONTH'} = $temp_then[4];
+ $cgiparams{'DAY'} = $temp_then[3];
}
if (($cgiparams{'DAY'} ne $now[3]) || ($cgiparams{'MONTH'} ne $now[4]))
{
- my @then = ();
- if ( ( $cgiparams{'MONTH'} eq $now[4]) && ($cgiparams{'DAY'} > $now[3]) ||
- ( $cgiparams{'MONTH'} > $now[4] ) ) {
- @then = localtime(POSIX::mktime( 0, 0, 0, $cgiparams{'DAY'}, $cgiparams{'MONTH'}, $year - 1901 ));
- } else {
- @then = localtime(POSIX::mktime( 0, 0, 0, $cgiparams{'DAY'}, $cgiparams{'MONTH'}, $year - 1900 ));
- }
- $tdoy = $then[7];
- my $lastleap=($year-1)%4;
- if ($tdoy>$doy) {
- if ($lastleap == 0 && $tdoy < 60) {
- $doy=$tdoy+366;
- } else {
- $doy=$doy+365;
- }
- }
+ my @then = ();
+ if ( ( $cgiparams{'MONTH'} eq $now[4]) && ($cgiparams{'DAY'} > $now[3]) ||
+ ( $cgiparams{'MONTH'} > $now[4] ) ) {
+ @then = localtime(POSIX::mktime( 0, 0, 0, $cgiparams{'DAY'}, $cgiparams{'MONTH'}, $year - 1901 ));
+ } else {
+ @then = localtime(POSIX::mktime( 0, 0, 0, $cgiparams{'DAY'}, $cgiparams{'MONTH'}, $year - 1900 ));
+ }
+ $tdoy = $then[7];
+ my $lastleap=($year-1)%4;
+ if ($tdoy>$doy) {
+ if ($lastleap == 0 && $tdoy < 60) {
+ $doy=$tdoy+366;
+ } else {
+ $doy=$doy+365;
+ }
+ }
}
my $datediff=0;
my $dowd=0;
my $multifile=0;
if ($tdoy ne $doy) {
- $datediff=int(($doy-$tdoy)/7);
- $dowd=($doy-$tdoy)%7;
- if (($dow-$dowd)<1) {
- $datediff=$datediff+1;
- }
- if (($dow-$dowd)==0) {
- $multifile=1;
- }
+ $datediff=int(($doy-$tdoy)/7);
+ $dowd=($doy-$tdoy)%7;
+ if (($dow-$dowd)<1) {
+ $datediff=$datediff+1;
+ }
+ if (($dow-$dowd)==0) {
+ $multifile=1;
+ }
}
my $monthstr = $shortmonths[$cgiparams{'MONTH'}];
@@ -142,16 +142,16 @@ else {
my $skip=0;
my $filestr='';
if ($datediff==0) {
- $filestr="/var/log/messages";
+ $filestr="/var/log/messages";
} else {
$filestr="/var/log/messages.$datediff";
$filestr = "$filestr.gz" if -f "$filestr.gz";
}
if (!(open (FILE,($filestr =~ /.gz$/ ? "gzip -dc $filestr |" : $filestr)))) {
- $errormessage = "$Lang::tr{'date not in logs'}: $filestr $Lang::tr{'could not be opened'}";
- $skip=1;
- # Note: This is in case the log does not exist for that date
+ $errormessage = "$Lang::tr{'date not in logs'}: $filestr $Lang::tr{'could not be opened'}";
+ $skip=1;
+ # Note: This is in case the log does not exist for that date
}
my $lines = 0;
my @log=();
@@ -159,15 +159,15 @@ my $port = $cgiparams{port};
if (!$skip)
{
- while (<FILE>)
- {
- if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ kernel:.*(IN=.*)$/) {
- if($_ =~ /DPT\=([\d\.]+)/){
- if($1 eq $port){
- $log[$lines] = $_;
- $lines++;
- }
- }
+ while (<FILE>)
+ {
+ if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ kernel:.*(IN=.*)$/) {
+ if($_ =~ /DPT\=([\d\.]+)/){
+ if($1 eq $port){
+ $log[$lines] = $_;
+ $lines++;
+ }
+ }
}
}
close (FILE);
@@ -175,26 +175,26 @@ if (!$skip)
$skip=0;
if ($multifile) {
- $datediff=$datediff-1;
- if ($datediff==0) {
- $filestr="/var/log/messages";
- } else {
- $filestr="/var/log/messages.$datediff";
- $filestr = "$filestr.gz" if -f "$filestr.gz";
- }
- if (!(open (FILE,($filestr =~ /.gz$/ ? "gzip -dc $filestr |" : $filestr)))) {
- $errormessage="$Lang::tr{'date not in logs'}: $filestr $Lang::tr{'could not be opened'}";
- $skip=1;
- }
- if (!$skip) {
+ $datediff=$datediff-1;
+ if ($datediff==0) {
+ $filestr="/var/log/messages";
+ } else {
+ $filestr="/var/log/messages.$datediff";
+ $filestr = "$filestr.gz" if -f "$filestr.gz";
+ }
+ if (!(open (FILE,($filestr =~ /.gz$/ ? "gzip -dc $filestr |" : $filestr)))) {
+ $errormessage="$Lang::tr{'date not in logs'}: $filestr $Lang::tr{'could not be opened'}";
+ $skip=1;
+ }
+ if (!$skip) {
while (<FILE>) {
- if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ kernel:.*(IN=.*)$/) {
- if($_ =~ /DPT\=([\d\.]+)/){
- if($1 eq $port){
- $log[$lines] = $_;
- $lines++;
- }
- }
+ if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ kernel:.*(IN=.*)$/) {
+ if($_ =~ /DPT\=([\d\.]+)/){
+ if($1 eq $port){
+ $log[$lines] = $_;
+ $lines++;
+ }
+ }
}
}
close (FILE);
@@ -264,7 +264,8 @@ END
print "<p><b>$Lang::tr{'firewall hits'} $longmonthstr $daystr: $lines</b></p>";
if ($start == -1) {
- $start = $lines - ${Header::viewsize}; }
+ $start = $lines - ${Header::viewsize};
+}
if ($start >= $lines - ${Header::viewsize}) { $start = $lines - ${Header::viewsize}; };
if ($start < 0) { $start = 0; }
@@ -298,56 +299,65 @@ if ($logsettings{'LOGVIEW_REVERSE'} eq 'on') { @slice = reverse @slice; }
$lines = 0;
foreach $_ (@slice)
{
- $a = $_;
- if($_ =~ /DPT\=([\d\.]+)/){
- if($1 eq $port){
- my $chain = '';
- my $in = '-'; my $out = '-';
- my $srcaddr = ''; my $dstaddr = '';
- my $protostr = '';
- my $srcport = ''; my $dstport = '';
-
- $_ =~ /(^.* ..:..:..) [\w\-]+ kernel:(.*)(IN=.*)$/;
- my $timestamp = $1; my $chain = $2; my $packet = $3;
- $timestamp =~ /(...) (..) (..:..:..)/;
- my $month = $1; my $day = $2; my $time = $3; my $iface;
-
- if ($a =~ /IN\=(\w+)/) { $iface = $1; }
- if ($a =~ /OUT\=(\w+)/) { $out = $1; }
- if ($a =~ /SRC\=([\d\.]+)/) { $srcaddr = $1; }
- if ($a =~ /DST\=([\d\.]+)/) { $dstaddr = $1; }
- if ($a =~ /PROTO\=(\w+)/) { $protostr = $1; }
- my $protostrlc = lc($protostr);
- if ($a =~ /SPT\=([\d\.]+)/){ $srcport = $1; }
- if ($a =~ /DPT\=([\d\.]+)/){ $dstport = $1; }
-
- if ($lines % 2) {
- print "<tr bgcolor='${Header::table1colour}'>\n"; }
- else {
- print "<tr bgcolor='${Header::table2colour}'>\n"; }
- print <<END
- <td align='center'>$time</td>
- <td align='center'>$chain</td>
- <td align='center'>$iface</td>
- <td align='center'>$protostr</td>
- <td align='center'>
- <table width='100%' cellpadding='0' cellspacing='0'><tr>
- <td align='center'><a href='/cgi-bin/ipinfo.cgi?ip=$srcaddr'>$srcaddr</a></td>
- </tr></table>
- </td>
- <td align='center'>$srcport</td>
- <td align='center'>
- <table width='100%' cellpadding='0' cellspacing='0'><tr>
- <td align='center'><a href='/cgi-bin/ipinfo.cgi?ip=$dstaddr'>$dstaddr</a></td>
- </tr></table>
- </td>
- <td align='center'>$dstport</td>
-</tr>
+ $a = $_;
+ if($_ =~ /DPT\=([\d\.]+)/){
+ if($1 eq $port){
+ my $chain = '';
+ my $in = '-';
+ my $out = '-';
+ my $srcaddr = '';
+ my $dstaddr = '';
+ my $protostr = '';
+ my $srcport = '';
+ my $dstport = '';
+
+ # If ipv6 uses bridge, the use PHYSIN, otherwise use IN
+ if ($_ =~ /(^.* ..:..:..) [\w\-]+ kernel:(.*)(IN=.*)(PHYSIN=.*)$/) {}
+ elsif ($_ =~ /(^.* ..:..:..) [\w\-]+ kernel:(.*)(IN=.*)$/) {}
+ my $timestamp = $1; my $chain = $2; my $packet = $3;
+ $timestamp =~ /(...) (..) (..:..:..)/;
+ my $month = $1; my $day = $2; my $time = $3; my $iface;
+
+ # If ipv6 uses bridge, the use PHYSIN and PHYSOUT, otherwise use IN and OUT
+ if ($a =~ /PHYSIN\=(\w+)/) { $iface = $1; } elsif ($a =~ /IN\=(\w+)/) { $iface = $1; }
+ if ($a =~ /PHYSOUT\=(\w+)/) { $out = $1; } elsif ($a =~ /OUT\=(\w+)/) { $out = $1; }
+ # Detect ipv4 and ipv6 addresses
+ if (($a =~ /SRC\=(([\d]{1,3})(\.([\d]{1,3})){3})/) or ($a =~ /SRC\=(([0-9a-fA-F]{0,4})(\:([0-9a-fA-F]{0,4})){2,7})/)) { $srcaddr = $1; }
+ if (($a =~ /DST\=(([\d]{1,3})(\.([\d]{1,3})){3})/) or ($a =~ /DST\=(([0-9a-fA-F]{0,4})(\:([0-9a-fA-F]{0,4})){2,7})/)) { $dstaddr = $1; }
+ if ($a =~ /PROTO\=(\w+)/) { $protostr = $1; }
+ my $protostrlc = lc($protostr);
+ if ($a =~ /SPT\=([\d\.]+)/){ $srcport = $1; }
+ if ($a =~ /DPT\=([\d\.]+)/){ $dstport = $1; }
+
+ if ($lines % 2) {
+ print "<tr bgcolor='${Header::table1colour}'>\n";
+ }
+ else {
+ print "<tr bgcolor='${Header::table2colour}'>\n";
+ }
+ print <<END
+ <td align='center'>$time</td>
+ <td align='center'>$chain</td>
+ <td align='center'>$iface</td>
+ <td align='center'>$protostr</td>
+ <td align='center'>
+ <table width='100%' cellpadding='0' cellspacing='0'><tr>
+ <td align='center'><a href='/cgi-bin/ipinfo.cgi?ip=$srcaddr'>$srcaddr</a></td>
+ </tr></table>
+ </td>
+ <td align='center'>$srcport</td>
+ <td align='center'>
+ <table width='100%' cellpadding='0' cellspacing='0'><tr>
+ <td align='center'><a href='/cgi-bin/ipinfo.cgi?ip=$dstaddr'>$dstaddr</a></td>
+ </tr></table>
+ </td>
+ <td align='center'>$dstport</td>
+ </tr>
END
- ;
- $lines++;
- }
- }
+ ;
+ $lines++;
+ }
+ }
}
print <<END
@@ -365,30 +375,34 @@ END
sub oldernewer
{
-print <<END
-<table width='100%'>
-<tr>
+ print <<END
+ <table width='100%'>
+ <tr>
END
-;
+ ;
-print "<td align='center' width='50%'>";
-if ($prev != -1) {
- print "<a href='/cgi-bin/logs.cgi/showrequestfromport.dat?$prev,$cgiparams{'MONTH'},$cgiparams{'DAY'},$cgiparams{port}'>$Lang::tr{'older'}</a>"; }
-else {
- print "$Lang::tr{'older'}"; }
-print "</td>\n";
+ print "<td align='center' width='50%'>";
+ if ($prev != -1) {
+ print "<a href='/cgi-bin/logs.cgi/showrequestfromport.dat?$prev,$cgiparams{'MONTH'},$cgiparams{'DAY'},$cgiparams{port}'>$Lang::tr{'older'}</a>";
+ }
+ else {
+ print "$Lang::tr{'older'}";
+ }
+ print "</td>\n";
-print "<td align='center' width='50%'>";
-if ($next != -1) {
- print "<a href='/cgi-bin/logs.cgi/showrequestfromport.dat?$next,$cgiparams{'MONTH'},$cgiparams{'DAY'},$cgiparams{port}'>$Lang::tr{'newer'}</a>"; }
-else {
- print "$Lang::tr{'newer'}"; }
-print "</td>\n";
+ print "<td align='center' width='50%'>";
+ if ($next != -1) {
+ print "<a href='/cgi-bin/logs.cgi/showrequestfromport.dat?$next,$cgiparams{'MONTH'},$cgiparams{'DAY'},$cgiparams{port}'>$Lang::tr{'newer'}</a>";
+ }
+ else {
+ print "$Lang::tr{'newer'}";
+ }
+ print "</td>\n";
-print <<END
-</tr>
-</table>
+ print <<END
+ </tr>
+ </table>
END
-;
+ ;
}
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 92e4521572f0a5a6411ce74a7a70b9b65dcebb26
by gitï¼ ipfire.org 22 Jan '16
by gitï¼ ipfire.org 22 Jan '16
22 Jan '16
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 92e4521572f0a5a6411ce74a7a70b9b65dcebb26 (commit)
from 20b27af8634b88fa400b1779415fc92888fbb1d8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 92e4521572f0a5a6411ce74a7a70b9b65dcebb26
Author: Daniel Weismüller <daniel.weismueller(a)ipfire.org>
Date: Fri Jan 22 12:10:19 2016 +0100
cmake: Disable parallelism
Building cmake uses a high amount of memory (>2G) and
fails to build on my system. Using less processes reduces
memory usage and lets the build succeed.
Signed-off-by: Daniel Weismüller <daniel.weismueller(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
lfs/cmake | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
Difference in files:
diff --git a/lfs/cmake b/lfs/cmake
index e3d2119..a9ada50 100644
--- a/lfs/cmake
+++ b/lfs/cmake
@@ -32,9 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
-ifeq "$(MACHINE)" "armv5tel"
- MAKETUNING = -j2
-endif
+MAKETUNING = -j2
###############################################################################
# Top-level Rules
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 20b27af8634b88fa400b1779415fc92888fbb1d8
by gitï¼ ipfire.org 22 Jan '16
by gitï¼ ipfire.org 22 Jan '16
22 Jan '16
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 20b27af8634b88fa400b1779415fc92888fbb1d8 (commit)
via 2775ab9cc63708ea0370d5220d5ee13a4f94142b (commit)
via 8a1a3bf3934c8a92c605135ee13db466ea3dcbf4 (commit)
via 41410d197b3dbf75dfd05376ed623857adac8977 (commit)
via a7b0967db425d27b349d436bf83e4a18143f6fe3 (commit)
via 6b86307cac1ed49a3d88836fc5fa90eef98a33ca (commit)
via 63fd135400da8e15a1a0519f377c20bad67a6d0e (commit)
via 53a6b00c4fc7e863b8a1b22cc01f90b016184363 (commit)
via 2c4b9c5004f0db606612eba3965846d4a2623296 (commit)
via e2c723627c587275e274948d026ac41a80a1705a (commit)
via c8f8bf328f4dd6567513f942c9c1db1dcf73ef93 (commit)
via 50354ffe3a946f314b5bf4f8648fa14d14c14667 (commit)
via a93bf696170d32a45ccc76b29f68ca9b4df9ddb3 (commit)
via d57c6162cb2d00fd4a4989fa3fe6924db528bce1 (commit)
via 4071b2d61bdf3e284395d80a06189d5ae7752c5b (commit)
via 0f5350608ed5790101caf94c19bf08a0a0c2118f (commit)
via a235f229527896f76ffa9404f6b8fb75f19d522b (commit)
via b1109b8af5f0a5e3ab7f0b68211d63ab0594c0ac (commit)
from 22a504c69cb578f6e34928f3d862beac635e5224 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 20b27af8634b88fa400b1779415fc92888fbb1d8
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Jan 22 00:55:46 2016 +0000
Update translations
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2775ab9cc63708ea0370d5220d5ee13a4f94142b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Jan 22 00:55:25 2016 +0000
core97: Ship iptables conntrack changes
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8a1a3bf3934c8a92c605135ee13db466ea3dcbf4
Merge: 41410d1 6b86307
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Jan 22 00:54:14 2016 +0000
Merge remote-tracking branch 'ms/iptables-conntrack' into next
commit 41410d197b3dbf75dfd05376ed623857adac8977
Merge: 22a504c a7b0967
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Jan 22 00:49:15 2016 +0000
Merge branch 'hyper-v-fixes' into next
commit a7b0967db425d27b349d436bf83e4a18143f6fe3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 15 18:30:56 2015 +0000
linux: Backport Hyper-V network driver
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 6b86307cac1ed49a3d88836fc5fa90eef98a33ca
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Aug 20 23:05:40 2015 +0100
firewall options: Fix translation and spelling of new ALG section
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 63fd135400da8e15a1a0519f377c20bad67a6d0e
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date: Thu Aug 20 10:56:54 2015 +0200
BUG10844 add new options to firewalloptions for conntrack
simple changes, so far no languagefile changes because of simple
protocol names. should be clear in all languages.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 53a6b00c4fc7e863b8a1b22cc01f90b016184363
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Aug 12 12:46:07 2015 +0100
firewall: Disable the PPTP and AMANDA conntrack helpers by default
These do not seem to work at the moment.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2c4b9c5004f0db606612eba3965846d4a2623296
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Aug 12 12:44:26 2015 +0100
firewall: Fix amanda helper
This helper requires setting a layer 4 protocol.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e2c723627c587275e274948d026ac41a80a1705a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Aug 12 12:18:18 2015 +0100
firewall: Fix H.323 helpers
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c8f8bf328f4dd6567513f942c9c1db1dcf73ef93
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue May 12 13:33:08 2015 +0200
firewall: Add H.323 to the conntrack helpers
commit 50354ffe3a946f314b5bf4f8648fa14d14c14667
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue May 12 13:27:24 2015 +0200
firewall: Add IRC to the conntrack helpers
commit a93bf696170d32a45ccc76b29f68ca9b4df9ddb3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue May 12 13:25:04 2015 +0200
firewall: Add amanda to the conntrack helpers
commit d57c6162cb2d00fd4a4989fa3fe6924db528bce1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue May 12 13:16:40 2015 +0200
firewall: Make conntrack helpers configurable
commit 4071b2d61bdf3e284395d80a06189d5ae7752c5b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon May 11 13:04:14 2015 +0200
firewall: iptables will load the conntrack modules automatically
commit 0f5350608ed5790101caf94c19bf08a0a0c2118f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon May 11 13:00:34 2015 +0200
firewall: Accept related ICMP packets again
This rule is required to forward ICMP error messages for
aborted TCP connections and the like.
commit a235f229527896f76ffa9404f6b8fb75f19d522b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Apr 22 18:13:56 2015 +0200
firewall: Remove option to disable the SIP ALG
commit b1109b8af5f0a5e3ab7f0b68211d63ab0594c0ac
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Apr 22 18:10:59 2015 +0200
Enhance the security of the netfilter conntrack helpers
This is suggested here
https://home.regit.org/netfilter-en/secure-use-of-helpers/
and deprecated in the kernel (#10665).
-----------------------------------------------------------------------
Summary of changes:
config/etc/modprobe.d/nf_conntrack.conf | 2 +
config/rootfiles/common/stage2 | 1 +
config/rootfiles/core/97/filelists/files | 3 +
doc/language_issues.de | 2 -
doc/language_issues.en | 2 -
doc/language_issues.es | 3 +-
doc/language_issues.fr | 3 +-
doc/language_issues.it | 3 +-
doc/language_issues.nl | 3 +-
doc/language_issues.pl | 3 +-
doc/language_issues.ru | 3 +-
doc/language_issues.tr | 3 +-
doc/language_missings | 4 +
html/cgi-bin/optionsfw.cgi | 32 +-
langs/de/cgi-bin/de.pl | 1 +
langs/en/cgi-bin/en.pl | 1 +
lfs/configroot | 10 +
lfs/linux | 28 +-
src/initscripts/init.d/firewall | 85 +-
...-hyperv-Get-rid-of-the-rndis_filter_packe.patch | 129 +++
...support-for-virtual-Receive-Side-Scaling-.patch | 917 +++++++++++++++++++++
...ivers-net-hyperv-Cleanup-the-receive-path.patch | 112 +++
...0002-hyperv-Remove-recv_pkt_list-and-lock.patch | 384 +++++++++
...-hyperv-Cleanup-the-netvsc-receive-callba.patch | 101 +++
...rv-Simplify-the-send_completion-variables.patch | 105 +++
...latest-NetVSP-versions-to-auto-negotiatio.patch | 171 ++++
...Enable-sendbuf-mechanism-on-the-send-path.patch | 407 +++++++++
...-for-netvsc-build-without-CONFIG_SYSFS-fl.patch | 42 +
...vers-net-hyperv-Enable-scatter-gather-I-O.patch | 212 +++++
...-Drivers-net-hyperv-Cleanup-the-send-path.patch | 266 ++++++
.../0006-net-get-rid-of-SET_ETHTOOL_OPS.patch | 44 +
...rs-net-hyperv-Enable-offloads-on-the-host.patch | 196 +++++
...Add-hash-value-into-RNDIS-Per-packet-info.patch | 93 +++
...-hyperv-Enable-receive-side-IP-checksum-o.patch | 147 ++++
...apparent-cut-n-paste-error-in-send-path-t.patch | 32 +
...-hyperv-Enable-send-side-checksum-offload.patch | 140 ++++
...-Fix-error-return-code-in-netvsc_init_buf.patch | 34 +
...vers-net-hyperv-Enable-large-send-offload.patch | 153 ++++
...010-hyperv-Fix-a-bug-in-netvsc_start_xmit.patch | 47 ++
...e-the-receive-buffer-size-for-legacy-hos.patch} | 14 +-
.../0011-hyperv-Fix-a-bug-in-netvsc_send.patch | 68 ++
...-hyperv-Allocate-memory-for-all-possible-.patch | 34 +
...-hyperv-Negotiate-suitable-ndis-version-f.patch | 32 +
...rs-net-hyperv-Address-UDP-checksum-issues.patch | 111 +++
...5-hyperv-Properly-handle-checksum-offload.patch | 42 +
...support-for-virtual-Receive-Side-Scaling-.patch | 917 +++++++++++++++++++++
...0017-hyperv-Remove-recv_pkt_list-and-lock.patch | 384 +++++++++
...rv-Simplify-the-send_completion-variables.patch | 105 +++
...Enable-sendbuf-mechanism-on-the-send-path.patch | 407 +++++++++
...-for-netvsc-build-without-CONFIG_SYSFS-fl.patch | 42 +
...Add-hash-value-into-RNDIS-Per-packet-info.patch | 93 +++
...apparent-cut-n-paste-error-in-send-path-t.patch | 32 +
...-Fix-error-return-code-in-netvsc_init_buf.patch | 34 +
.../0024-hyperv-Fix-a-bug-in-netvsc_send.patch | 68 ++
...hv-vmbus-Support-per-channel-driver-state.patch | 51 ++
55 files changed, 6312 insertions(+), 46 deletions(-)
create mode 100644 config/etc/modprobe.d/nf_conntrack.conf
create mode 100644 src/patches/linux/0001-Drivers-net-hyperv-Get-rid-of-the-rndis_filter_packe.patch
create mode 100644 src/patches/linux/0001-hyperv-Add-support-for-virtual-Receive-Side-Scaling-.patch
create mode 100644 src/patches/linux/0002-Drivers-net-hyperv-Cleanup-the-receive-path.patch
create mode 100644 src/patches/linux/0002-hyperv-Remove-recv_pkt_list-and-lock.patch
create mode 100644 src/patches/linux/0003-Drivers-net-hyperv-Cleanup-the-netvsc-receive-callba.patch
create mode 100644 src/patches/linux/0003-hyperv-Simplify-the-send_completion-variables.patch
create mode 100644 src/patches/linux/0004-hyperv-Add-latest-NetVSP-versions-to-auto-negotiatio.patch
create mode 100644 src/patches/linux/0004-hyperv-Enable-sendbuf-mechanism-on-the-send-path.patch
create mode 100644 src/patches/linux/0005-Add-support-for-netvsc-build-without-CONFIG_SYSFS-fl.patch
create mode 100644 src/patches/linux/0005-Drivers-net-hyperv-Enable-scatter-gather-I-O.patch
create mode 100644 src/patches/linux/0006-Drivers-net-hyperv-Cleanup-the-send-path.patch
create mode 100644 src/patches/linux/0006-net-get-rid-of-SET_ETHTOOL_OPS.patch
create mode 100644 src/patches/linux/0007-Drivers-net-hyperv-Enable-offloads-on-the-host.patch
create mode 100644 src/patches/linux/0007-hyperv-Add-hash-value-into-RNDIS-Per-packet-info.patch
create mode 100644 src/patches/linux/0008-Drivers-net-hyperv-Enable-receive-side-IP-checksum-o.patch
create mode 100644 src/patches/linux/0008-hyperv-fix-apparent-cut-n-paste-error-in-send-path-t.patch
create mode 100644 src/patches/linux/0009-Drivers-net-hyperv-Enable-send-side-checksum-offload.patch
create mode 100644 src/patches/linux/0009-hyperv-Fix-error-return-code-in-netvsc_init_buf.patch
create mode 100644 src/patches/linux/0010-Drivers-net-hyperv-Enable-large-send-offload.patch
create mode 100644 src/patches/linux/0010-hyperv-Fix-a-bug-in-netvsc_start_xmit.patch
rename src/patches/{linux-3.14.x-hyperv-2008-fix.patch => linux/0011-hyperv-Change-the-receive-buffer-size-for-legacy-hos.patch} (81%)
create mode 100644 src/patches/linux/0011-hyperv-Fix-a-bug-in-netvsc_send.patch
create mode 100644 src/patches/linux/0012-Drivers-net-hyperv-Allocate-memory-for-all-possible-.patch
create mode 100644 src/patches/linux/0013-Drivers-net-hyperv-Negotiate-suitable-ndis-version-f.patch
create mode 100644 src/patches/linux/0014-Drivers-net-hyperv-Address-UDP-checksum-issues.patch
create mode 100644 src/patches/linux/0015-hyperv-Properly-handle-checksum-offload.patch
create mode 100644 src/patches/linux/0016-hyperv-Add-support-for-virtual-Receive-Side-Scaling-.patch
create mode 100644 src/patches/linux/0017-hyperv-Remove-recv_pkt_list-and-lock.patch
create mode 100644 src/patches/linux/0018-hyperv-Simplify-the-send_completion-variables.patch
create mode 100644 src/patches/linux/0019-hyperv-Enable-sendbuf-mechanism-on-the-send-path.patch
create mode 100644 src/patches/linux/0020-Add-support-for-netvsc-build-without-CONFIG_SYSFS-fl.patch
create mode 100644 src/patches/linux/0021-hyperv-Add-hash-value-into-RNDIS-Per-packet-info.patch
create mode 100644 src/patches/linux/0022-hyperv-fix-apparent-cut-n-paste-error-in-send-path-t.patch
create mode 100644 src/patches/linux/0023-hyperv-Fix-error-return-code-in-netvsc_init_buf.patch
create mode 100644 src/patches/linux/0024-hyperv-Fix-a-bug-in-netvsc_send.patch
create mode 100644 src/patches/linux/0025-Drivers-hv-vmbus-Support-per-channel-driver-state.patch
Difference in files:
diff --git a/config/etc/modprobe.d/nf_conntrack.conf b/config/etc/modprobe.d/nf_conntrack.conf
new file mode 100644
index 0000000..d5a1813
--- /dev/null
+++ b/config/etc/modprobe.d/nf_conntrack.conf
@@ -0,0 +1,2 @@
+# Disable automatic conntrack helper assignment
+options nf_conntrack nf_conntrack_helper=0
diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2
index 5b763fd..07446b7 100644
--- a/config/rootfiles/common/stage2
+++ b/config/rootfiles/common/stage2
@@ -22,6 +22,7 @@ etc/mime.types
etc/modprobe.d
etc/modprobe.d/btmrvl_sdio.conf
etc/modprobe.d/cfg80211.conf
+etc/modprobe.d/nf_conntrack.conf
etc/modprobe.d/pcspeaker.conf
etc/modules.conf
etc/mtab
diff --git a/config/rootfiles/core/97/filelists/files b/config/rootfiles/core/97/filelists/files
index 40bbbcf..3d9d483 100644
--- a/config/rootfiles/core/97/filelists/files
+++ b/config/rootfiles/core/97/filelists/files
@@ -1,5 +1,8 @@
etc/system-release
etc/issue
+etc/rc.d/init.d/firewall
+etc/modprobe.d/nf_conntrack.conf
+srv/web/ipfire/cgi-bin/optionsfw.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/qos.cgi
srv/web/ipfire/cgi-bin/webaccess.cgi
diff --git a/doc/language_issues.de b/doc/language_issues.de
index 3660356..421c40e 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -34,13 +34,11 @@ WARNING: translation string unused: advproxy chgwebpwd new password
WARNING: translation string unused: advproxy chgwebpwd new password confirm
WARNING: translation string unused: advproxy chgwebpwd old password
WARNING: translation string unused: advproxy chgwebpwd username
-WARNING: translation string unused: advproxy cre disabled
WARNING: translation string unused: advproxy errmsg change fail
WARNING: translation string unused: advproxy errmsg change success
WARNING: translation string unused: advproxy errmsg invalid user
WARNING: translation string unused: advproxy errmsg no password
WARNING: translation string unused: advproxy errmsg password incorrect
-WARNING: translation string unused: advproxy no cre groups
WARNING: translation string unused: advproxy ssadvanced proxy
WARNING: translation string unused: advproxy update notification
WARNING: translation string unused: again
diff --git a/doc/language_issues.en b/doc/language_issues.en
index a419afa..0a1756f 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -33,13 +33,11 @@ WARNING: translation string unused: advproxy chgwebpwd new password
WARNING: translation string unused: advproxy chgwebpwd new password confirm
WARNING: translation string unused: advproxy chgwebpwd old password
WARNING: translation string unused: advproxy chgwebpwd username
-WARNING: translation string unused: advproxy cre disabled
WARNING: translation string unused: advproxy errmsg change fail
WARNING: translation string unused: advproxy errmsg change success
WARNING: translation string unused: advproxy errmsg invalid user
WARNING: translation string unused: advproxy errmsg no password
WARNING: translation string unused: advproxy errmsg password incorrect
-WARNING: translation string unused: advproxy no cre groups
WARNING: translation string unused: advproxy ssadvanced proxy
WARNING: translation string unused: advproxy update information
WARNING: translation string unused: advproxy update notification
diff --git a/doc/language_issues.es b/doc/language_issues.es
index d375f69..17347f6 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -33,13 +33,11 @@ WARNING: translation string unused: advproxy chgwebpwd new password
WARNING: translation string unused: advproxy chgwebpwd new password confirm
WARNING: translation string unused: advproxy chgwebpwd old password
WARNING: translation string unused: advproxy chgwebpwd username
-WARNING: translation string unused: advproxy cre disabled
WARNING: translation string unused: advproxy errmsg change fail
WARNING: translation string unused: advproxy errmsg change success
WARNING: translation string unused: advproxy errmsg invalid user
WARNING: translation string unused: advproxy errmsg no password
WARNING: translation string unused: advproxy errmsg password incorrect
-WARNING: translation string unused: advproxy no cre groups
WARNING: translation string unused: advproxy ssadvanced proxy
WARNING: translation string unused: advproxy update information
WARNING: translation string unused: advproxy update notification
@@ -640,6 +638,7 @@ WARNING: untranslated string: advproxy group access control
WARNING: untranslated string: advproxy group required
WARNING: untranslated string: advproxy proxy port transparent
WARNING: untranslated string: age second
+WARNING: untranslated string: application layer gateways
WARNING: untranslated string: atm device
WARNING: untranslated string: attention
WARNING: untranslated string: bit
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index f0f5ec4..a93453f 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -33,13 +33,11 @@ WARNING: translation string unused: advproxy chgwebpwd new password
WARNING: translation string unused: advproxy chgwebpwd new password confirm
WARNING: translation string unused: advproxy chgwebpwd old password
WARNING: translation string unused: advproxy chgwebpwd username
-WARNING: translation string unused: advproxy cre disabled
WARNING: translation string unused: advproxy errmsg change fail
WARNING: translation string unused: advproxy errmsg change success
WARNING: translation string unused: advproxy errmsg invalid user
WARNING: translation string unused: advproxy errmsg no password
WARNING: translation string unused: advproxy errmsg password incorrect
-WARNING: translation string unused: advproxy no cre groups
WARNING: translation string unused: advproxy ssadvanced proxy
WARNING: translation string unused: advproxy update information
WARNING: translation string unused: advproxy update notification
@@ -647,6 +645,7 @@ WARNING: untranslated string: advproxy group access control
WARNING: untranslated string: advproxy group required
WARNING: untranslated string: advproxy proxy port transparent
WARNING: untranslated string: age second
+WARNING: untranslated string: application layer gateways
WARNING: untranslated string: atm device
WARNING: untranslated string: attention
WARNING: untranslated string: bit
diff --git a/doc/language_issues.it b/doc/language_issues.it
index 65643e8..776b932 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -33,13 +33,11 @@ WARNING: translation string unused: advproxy chgwebpwd new password
WARNING: translation string unused: advproxy chgwebpwd new password confirm
WARNING: translation string unused: advproxy chgwebpwd old password
WARNING: translation string unused: advproxy chgwebpwd username
-WARNING: translation string unused: advproxy cre disabled
WARNING: translation string unused: advproxy errmsg change fail
WARNING: translation string unused: advproxy errmsg change success
WARNING: translation string unused: advproxy errmsg invalid user
WARNING: translation string unused: advproxy errmsg no password
WARNING: translation string unused: advproxy errmsg password incorrect
-WARNING: translation string unused: advproxy no cre groups
WARNING: translation string unused: advproxy ssadvanced proxy
WARNING: translation string unused: advproxy update information
WARNING: translation string unused: advproxy update notification
@@ -700,6 +698,7 @@ WARNING: untranslated string: advproxy AUTH method ntlm auth
WARNING: untranslated string: advproxy basic authentication
WARNING: untranslated string: advproxy group access control
WARNING: untranslated string: advproxy group required
+WARNING: untranslated string: application layer gateways
WARNING: untranslated string: bytes
WARNING: untranslated string: check all
WARNING: untranslated string: dhcp dns enable update
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 3b57bdf..77fa1f5 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -33,13 +33,11 @@ WARNING: translation string unused: advproxy chgwebpwd new password
WARNING: translation string unused: advproxy chgwebpwd new password confirm
WARNING: translation string unused: advproxy chgwebpwd old password
WARNING: translation string unused: advproxy chgwebpwd username
-WARNING: translation string unused: advproxy cre disabled
WARNING: translation string unused: advproxy errmsg change fail
WARNING: translation string unused: advproxy errmsg change success
WARNING: translation string unused: advproxy errmsg invalid user
WARNING: translation string unused: advproxy errmsg no password
WARNING: translation string unused: advproxy errmsg password incorrect
-WARNING: translation string unused: advproxy no cre groups
WARNING: translation string unused: advproxy ssadvanced proxy
WARNING: translation string unused: advproxy update information
WARNING: translation string unused: advproxy update notification
@@ -697,6 +695,7 @@ WARNING: untranslated string: advproxy AUTH method ntlm auth
WARNING: untranslated string: advproxy basic authentication
WARNING: untranslated string: advproxy group access control
WARNING: untranslated string: advproxy group required
+WARNING: untranslated string: application layer gateways
WARNING: untranslated string: atm device
WARNING: untranslated string: bytes
WARNING: untranslated string: capabilities
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index d375f69..17347f6 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -33,13 +33,11 @@ WARNING: translation string unused: advproxy chgwebpwd new password
WARNING: translation string unused: advproxy chgwebpwd new password confirm
WARNING: translation string unused: advproxy chgwebpwd old password
WARNING: translation string unused: advproxy chgwebpwd username
-WARNING: translation string unused: advproxy cre disabled
WARNING: translation string unused: advproxy errmsg change fail
WARNING: translation string unused: advproxy errmsg change success
WARNING: translation string unused: advproxy errmsg invalid user
WARNING: translation string unused: advproxy errmsg no password
WARNING: translation string unused: advproxy errmsg password incorrect
-WARNING: translation string unused: advproxy no cre groups
WARNING: translation string unused: advproxy ssadvanced proxy
WARNING: translation string unused: advproxy update information
WARNING: translation string unused: advproxy update notification
@@ -640,6 +638,7 @@ WARNING: untranslated string: advproxy group access control
WARNING: untranslated string: advproxy group required
WARNING: untranslated string: advproxy proxy port transparent
WARNING: untranslated string: age second
+WARNING: untranslated string: application layer gateways
WARNING: untranslated string: atm device
WARNING: untranslated string: attention
WARNING: untranslated string: bit
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 05d9e91..6446a74 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -33,13 +33,11 @@ WARNING: translation string unused: advproxy chgwebpwd new password
WARNING: translation string unused: advproxy chgwebpwd new password confirm
WARNING: translation string unused: advproxy chgwebpwd old password
WARNING: translation string unused: advproxy chgwebpwd username
-WARNING: translation string unused: advproxy cre disabled
WARNING: translation string unused: advproxy errmsg change fail
WARNING: translation string unused: advproxy errmsg change success
WARNING: translation string unused: advproxy errmsg invalid user
WARNING: translation string unused: advproxy errmsg no password
WARNING: translation string unused: advproxy errmsg password incorrect
-WARNING: translation string unused: advproxy no cre groups
WARNING: translation string unused: advproxy ssadvanced proxy
WARNING: translation string unused: advproxy update information
WARNING: translation string unused: advproxy update notification
@@ -640,6 +638,7 @@ WARNING: untranslated string: advproxy group access control
WARNING: untranslated string: advproxy group required
WARNING: untranslated string: advproxy proxy port transparent
WARNING: untranslated string: age second
+WARNING: untranslated string: application layer gateways
WARNING: untranslated string: atm device
WARNING: untranslated string: attention
WARNING: untranslated string: bit
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index a419afa..5479859 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -33,13 +33,11 @@ WARNING: translation string unused: advproxy chgwebpwd new password
WARNING: translation string unused: advproxy chgwebpwd new password confirm
WARNING: translation string unused: advproxy chgwebpwd old password
WARNING: translation string unused: advproxy chgwebpwd username
-WARNING: translation string unused: advproxy cre disabled
WARNING: translation string unused: advproxy errmsg change fail
WARNING: translation string unused: advproxy errmsg change success
WARNING: translation string unused: advproxy errmsg invalid user
WARNING: translation string unused: advproxy errmsg no password
WARNING: translation string unused: advproxy errmsg password incorrect
-WARNING: translation string unused: advproxy no cre groups
WARNING: translation string unused: advproxy ssadvanced proxy
WARNING: translation string unused: advproxy update information
WARNING: translation string unused: advproxy update notification
@@ -703,6 +701,7 @@ WARNING: translation string unused: xtaccess bad transfert
WARNING: translation string unused: year-graph
WARNING: translation string unused: yearly firewallhits
WARNING: untranslated string: Scan for Songs
+WARNING: untranslated string: application layer gateways
WARNING: untranslated string: bytes
WARNING: untranslated string: fwhost cust geoipgrp
WARNING: untranslated string: fwhost err hostip
diff --git a/doc/language_missings b/doc/language_missings
index c490f2d..32e1e48 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -26,6 +26,7 @@
< age shour
< age sminute
< age ssecond
+< application layer gateways
< atm device
< attention
< bit
@@ -636,6 +637,7 @@
< age shour
< age sminute
< age ssecond
+< application layer gateways
< Async logging enabled
< atm device
< attention
@@ -1229,6 +1231,7 @@
< age shour
< age sminute
< age ssecond
+< application layer gateways
< atm device
< attention
< bit
@@ -1808,6 +1811,7 @@
< age shour
< age sminute
< age ssecond
+< application layer gateways
< atm device
< attention
< bit
diff --git a/html/cgi-bin/optionsfw.cgi b/html/cgi-bin/optionsfw.cgi
index 34e0cdc..7a0e8e0 100644
--- a/html/cgi-bin/optionsfw.cgi
+++ b/html/cgi-bin/optionsfw.cgi
@@ -120,6 +120,21 @@ $checked{'SHOWTABLES'}{$settings{'SHOWTABLES'}} = "checked='checked'";
$checked{'SHOWDROPDOWN'}{'off'} = '';
$checked{'SHOWDROPDOWN'}{'on'} = '';
$checked{'SHOWDROPDOWN'}{$settings{'SHOWDROPDOWN'}} = "checked='checked'";
+$checked{'CONNTRACK_FTP'}{'off'} = '';
+$checked{'CONNTRACK_FTP'}{'on'} = '';
+$checked{'CONNTRACK_FTP'}{$settings{'CONNTRACK_FTP'}} = "checked='checked'";
+$checked{'CONNTRACK_H323'}{'off'} = '';
+$checked{'CONNTRACK_H323'}{'on'} = '';
+$checked{'CONNTRACK_H323'}{$settings{'CONNTRACK_H323'}} = "checked='checked'";
+$checked{'CONNTRACK_IRC'}{'off'} = '';
+$checked{'CONNTRACK_IRC'}{'on'} = '';
+$checked{'CONNTRACK_IRC'}{$settings{'CONNTRACK_IRC'}} = "checked='checked'";
+$checked{'CONNTRACK_SIP'}{'off'} = '';
+$checked{'CONNTRACK_SIP'}{'on'} = '';
+$checked{'CONNTRACK_SIP'}{$settings{'CONNTRACK_SIP'}} = "checked='checked'";
+$checked{'CONNTRACK_TFTP'}{'off'} = '';
+$checked{'CONNTRACK_TFTP'}{'on'} = '';
+$checked{'CONNTRACK_TFTP'}{$settings{'CONNTRACK_TFTP'}} = "checked='checked'";
$selected{'FWPOLICY'}{$settings{'FWPOLICY'}}= 'selected';
$selected{'FWPOLICY1'}{$settings{'FWPOLICY1'}}= 'selected';
$selected{'FWPOLICY2'}{$settings{'FWPOLICY2'}}= 'selected';
@@ -223,7 +238,22 @@ END
<input type='radio' name='SHOWTABLES' value='off' $checked{'SHOWTABLES'}{'off'} /> off</td></tr>
<tr><td align='left' width='60%'>$Lang::tr{'fw settings dropdown'}</td><td align='left'>on <input type='radio' name='SHOWDROPDOWN' value='on' $checked{'SHOWDROPDOWN'}{'on'} />/
<input type='radio' name='SHOWDROPDOWN' value='off' $checked{'SHOWDROPDOWN'}{'off'} /> off</td></tr>
-</table>
+</table>
+<br />
+<table width='95%' cellspacing='0'>
+<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'application layer gateways'}</b></td></tr>
+<tr><td align='left' width='60%'>FTP</td><td align='left'>on <input type='radio' name='CONNTRACK_FTP' value='on' $checked{'CONNTRACK_FTP'}{'on'} />/
+ <input type='radio' name='CONNTRACK_FTP' value='off' $checked{'CONNTRACK_FTP'}{'off'} /> off</td></tr>
+<tr><td align='left' width='60%'>H.323</td><td align='left'>on <input type='radio' name='CONNTRACK_H323' value='on' $checked{'CONNTRACK_H323'}{'on'} />/
+ <input type='radio' name='CONNTRACK_H323' value='off' $checked{'CONNTRACK_H323'}{'off'} /> off</td></tr>
+<tr><td align='left' width='60%'>IRC</td><td align='left'>on <input type='radio' name='CONNTRACK_IRC' value='on' $checked{'CONNTRACK_IRC'}{'on'} />/
+ <input type='radio' name='CONNTRACK_IRC' value='off' $checked{'CONNTRACK_IRC'}{'off'} /> off</td></tr>
+<tr><td align='left' width='60%'>SIP</td><td align='left'>on <input type='radio' name='CONNTRACK_SIP' value='on' $checked{'CONNTRACK_SIP'}{'on'} />/
+ <input type='radio' name='CONNTRACK_SIP' value='off' $checked{'CONNTRACK_SIP'}{'off'} /> off</td></tr>
+<tr><td align='left' width='60%'>TFTP</td><td align='left'>on <input type='radio' name='CONNTRACK_TFTP' value='on' $checked{'CONNTRACK_TFTP'}{'on'} />/
+ <input type='radio' name='CONNTRACK_TFTP' value='off' $checked{'CONNTRACK_TFTP'}{'off'} /> off</td></tr>
+
+</table>
<br />
<table width='95%' cellspacing='0'>
<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'fw default drop'}</b></td></tr>
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 2bca854..7c330bb 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -367,6 +367,7 @@
'alt vpn' => 'VPNs',
'and' => 'Und',
'apcupsd' => 'APC-UPS Status',
+'application layer gateways' => 'Application-Layer-Gateways',
'apply' => 'Jetzt anwenden',
'april' => 'April',
'archive not exist' => 'Konfigurationsarchiv existiert nicht',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 4c52392..23f6310 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -369,6 +369,7 @@
'and' => 'And',
'ansi t1.483' => 'TO BE REMOVED',
'apcupsd' => 'APC-UPS status',
+'application layer gateways' => 'Application Layer Gateways',
'apply' => 'Apply now',
'april' => 'April',
'archive not exist' => 'Configuration archive does not exist',
diff --git a/lfs/configroot b/lfs/configroot
index cb74996..f8e9ce4 100644
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -135,6 +135,16 @@ $(TARGET) :
echo "POLICY=MODE2" >> $(CONFIG_ROOT)/firewall/settings
echo "POLICY1=MODE2" >> $(CONFIG_ROOT)/firewall/settings
+ # Add conntrack helper default settings
+ for proto in FTP H323 IRC SIP TFTP; do \
+ echo "CONNTRACK_$${proto}=on" >> $(CONFIG_ROOT)/optionsfw/settings; \
+ done
+
+ # Do not enable these by default because these are broken
+ for proto in AMANDA PPTP; do \
+ echo "CONNTRACK_$${proto}=off" >> $(CONFIG_ROOT)/optionsfw/settings; \
+ done
+
# set converters executable
chmod 755 /usr/sbin/convert-*
diff --git a/lfs/linux b/lfs/linux
index 1a0ae10..3fd8d8c 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -170,8 +170,32 @@ endif
# update the queued trim blacklist from kernel 4.2rc1
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.43_new_qtrim_blacklist.patch
- # HyperV 2008 patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.x-hyperv-2008-fix.patch
+ # Hyper-V patches
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0001-Drivers-net-hyperv-Get-rid-of-the-rndis_filter_packe.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0002-Drivers-net-hyperv-Cleanup-the-receive-path.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0003-Drivers-net-hyperv-Cleanup-the-netvsc-receive-callba.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0004-hyperv-Add-latest-NetVSP-versions-to-auto-negotiatio.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0005-Drivers-net-hyperv-Enable-scatter-gather-I-O.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0006-Drivers-net-hyperv-Cleanup-the-send-path.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0007-Drivers-net-hyperv-Enable-offloads-on-the-host.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0008-Drivers-net-hyperv-Enable-receive-side-IP-checksum-o.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0009-Drivers-net-hyperv-Enable-send-side-checksum-offload.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0010-Drivers-net-hyperv-Enable-large-send-offload.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0011-hyperv-Change-the-receive-buffer-size-for-legacy-hos.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0012-Drivers-net-hyperv-Allocate-memory-for-all-possible-.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0013-Drivers-net-hyperv-Negotiate-suitable-ndis-version-f.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0014-Drivers-net-hyperv-Address-UDP-checksum-issues.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0015-hyperv-Properly-handle-checksum-offload.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0016-hyperv-Add-support-for-virtual-Receive-Side-Scaling-.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0017-hyperv-Remove-recv_pkt_list-and-lock.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0018-hyperv-Simplify-the-send_completion-variables.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0019-hyperv-Enable-sendbuf-mechanism-on-the-send-path.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0020-Add-support-for-netvsc-build-without-CONFIG_SYSFS-fl.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0021-hyperv-Add-hash-value-into-RNDIS-Per-packet-info.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0022-hyperv-fix-apparent-cut-n-paste-error-in-send-path-t.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0023-hyperv-Fix-error-return-code-in-netvsc_init_buf.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0024-hyperv-Fix-a-bug-in-netvsc_send.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0025-Drivers-hv-vmbus-Support-per-channel-driver-state.patch
# fix empty symbol crc's
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-genksyms_fix_typeof_handling.patch
diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index 6622071..cb52670 100644
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -21,9 +21,11 @@ iptables_init() {
iptables -F
iptables -t nat -F
iptables -t mangle -F
+ iptables -t raw -F
iptables -X
iptables -t nat -X
iptables -t mangle -X
+ iptables -t raw -X
# Set up policies
iptables -P INPUT DROP
@@ -84,10 +86,71 @@ iptables_init() {
iptables -A INPUT -p tcp -j BADTCP
iptables -A FORWARD -p tcp -j BADTCP
- # Connection tracking chain
+ # Connection tracking chains
iptables -N CONNTRACK
- iptables -A CONNTRACK -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT
+ iptables -A CONNTRACK -m conntrack --ctstate ESTABLISHED -j ACCEPT
iptables -A CONNTRACK -m conntrack --ctstate INVALID -j DROP
+ iptables -A CONNTRACK -p icmp -m conntrack --ctstate RELATED -j ACCEPT
+ iptables -t raw -N CONNTRACK
+ iptables -t raw -A PREROUTING -j CONNTRACK
+
+ # Conntrack helpers (https://home.regit.org/netfilter-en/secure-use-of-helpers/)
+
+ # SIP
+ if [ "${CONNTRACK_SIP}" = "on" ]; then
+ iptables -A CONNTRACK -m conntrack --ctstate RELATED \
+ -m helper --helper sip -j ACCEPT
+ for proto in udp tcp; do
+ iptables -t raw -A CONNTRACK -p "${proto}" --dport 5060 -j CT --helper sip
+ done
+ fi
+
+ # H.323
+ if [ "${CONNTRACK_H323}" = "on" ]; then
+ iptables -A CONNTRACK -m conntrack --ctstate RELATED \
+ -m helper --helper h323 -j ACCEPT
+
+ # Gatekeeper RAS
+ iptables -t raw -A CONNTRACK -p udp --dport 1719 -j CT --helper RAS
+
+ # Q.931
+ iptables -t raw -A CONNTRACK -p tcp --dport 1720 -j CT --helper Q.931
+ fi
+
+ # FTP
+ if [ "${CONNTRACK_FTP}" = "on" ]; then
+ iptables -A CONNTRACK -m conntrack --ctstate RELATED \
+ -m helper --helper ftp -p tcp --dport 1024: -j ACCEPT
+ iptables -t raw -A CONNTRACK -p tcp --dport 21 -j CT --helper ftp
+ fi
+
+ # PPTP
+ if [ "${CONNTRACK_PPTP}" = "on" ]; then
+ iptables -A CONNTRACK -m conntrack --ctstate RELATED \
+ -m helper --helper pptp -j ACCEPT
+ iptables -t raw -A CONNTRACK -p udp --dport 1723 -j CT --helper pptp
+ fi
+
+ # TFTP
+ if [ "${CONNTRACK_TFTP}" = "on" ]; then
+ iptables -A CONNTRACK -m conntrack --ctstate RELATED \
+ -m helper --helper tftp -j ACCEPT
+ iptables -t raw -A CONNTRACK -p udp --dport 69 -j CT --helper tftp
+ fi
+
+ # IRC
+ if [ "${CONNTRACK_IRC}" = "on" ]; then
+ iptables -A CONNTRACK -m conntrack --ctstate RELATED \
+ -m helper --helper irc -j ACCEPT
+ iptables -t raw -A CONNTRACK -p tcp --dport 6667 -j CT --helper irc
+ fi
+
+ # Amanda
+ if [ "${CONNTRACK_AMANDA}" = "on" ]; then
+ iptables -A CONNTRACK -m conntrack --ctstate RELATED \
+ -m helper --helper amanda -j ACCEPT
+ iptables -t raw -A CONNTRACK -p tcp -j CT --helper amanda
+ fi
# Fix for braindead ISP's
iptables -A FORWARD -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu
@@ -400,24 +463,6 @@ iptables_red_down() {
# See how we were called.
case "$1" in
start)
- boot_mesg "Loading firewall modules into the kernel"
- modprobe iptable_nat || failed=1
- for i in $(find /lib/modules/$(uname -r) -name nf_conntrack*); do
- modprobe $(basename $i | cut -d. -f1) || failed=1
- done
- for i in $(find /lib/modules/$(uname -r) -name nf_nat*); do
- modprobe $(basename $i | cut -d. -f1) || failed=1
- done
- (exit ${failed})
- evaluate_retval
-
- if [ -e /var/ipfire/main/disable_nf_sip ]; then
- rmmod nf_nat_sip
- rmmod nf_conntrack_sip
- rmmod nf_nat_h323
- rmmod nf_conntrack_h323
- fi
-
boot_mesg "Setting up firewall"
iptables_init
evaluate_retval
diff --git a/src/patches/linux-3.14.x-hyperv-2008-fix.patch b/src/patches/linux-3.14.x-hyperv-2008-fix.patch
deleted file mode 100644
index e538e08..0000000
--- a/src/patches/linux-3.14.x-hyperv-2008-fix.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 99d3016de4f2a29635f5382b0e9bd0e5f2151487 Mon Sep 17 00:00:00 2001
-From: Haiyang Zhang <haiyangz(a)microsoft.com>
-Date: Sun, 9 Mar 2014 16:10:59 -0700
-Subject: hyperv: Change the receive buffer size for legacy hosts
-
-Due to a bug in the Hyper-V host verion 2008R2, we need to use a slightly smaller
-receive buffer size, otherwise the buffer will not be accepted by the legacy hosts.
-
-Signed-off-by: Haiyang Zhang <haiyangz(a)microsoft.com>
-Signed-off-by: David S. Miller <davem(a)davemloft.net>
-
-diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
-index 7d06b49..13010b4 100644
---- a/drivers/net/hyperv/hyperv_net.h
-+++ b/drivers/net/hyperv/hyperv_net.h
-@@ -513,6 +513,7 @@ struct nvsp_message {
- #define NETVSC_MTU 65536
-
- #define NETVSC_RECEIVE_BUFFER_SIZE (1024*1024*16) /* 16MB */
-+#define NETVSC_RECEIVE_BUFFER_SIZE_LEGACY (1024*1024*15) /* 15MB */
-
- #define NETVSC_RECEIVE_BUFFER_ID 0xcafe
-
-diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
-index 1a0280d..daddea2 100644
---- a/drivers/net/hyperv/netvsc.c
-+++ b/drivers/net/hyperv/netvsc.c
-@@ -365,6 +365,11 @@ static int netvsc_connect_vsp(struct hv_device *device)
- goto cleanup;
-
- /* Post the big receive buffer to NetVSP */
-+ if (net_device->nvsp_version <= NVSP_PROTOCOL_VERSION_2)
-+ net_device->recv_buf_size = NETVSC_RECEIVE_BUFFER_SIZE_LEGACY;
-+ else
-+ net_device->recv_buf_size = NETVSC_RECEIVE_BUFFER_SIZE;
-+
- ret = netvsc_init_recv_buf(device);
-
- cleanup:
-@@ -898,7 +903,6 @@ int netvsc_device_add(struct hv_device *device, void *additional_info)
- ndev = net_device->ndev;
-
- /* Initialize the NetVSC channel extension */
-- net_device->recv_buf_size = NETVSC_RECEIVE_BUFFER_SIZE;
- spin_lock_init(&net_device->recv_pkt_list_lock);
-
- INIT_LIST_HEAD(&net_device->recv_pkt_list);
---
-cgit v0.10.2
-
diff --git a/src/patches/linux/0001-Drivers-net-hyperv-Get-rid-of-the-rndis_filter_packe.patch b/src/patches/linux/0001-Drivers-net-hyperv-Get-rid-of-the-rndis_filter_packe.patch
new file mode 100644
index 0000000..2e00392
--- /dev/null
+++ b/src/patches/linux/0001-Drivers-net-hyperv-Get-rid-of-the-rndis_filter_packe.patch
@@ -0,0 +1,129 @@
+From f3f885fa684ff18fa4d223dc22b782f5e5d32560 Mon Sep 17 00:00:00 2001
+From: KY Srinivasan <kys(a)microsoft.com>
+Date: Sun, 16 Feb 2014 16:38:43 -0800
+Subject: [PATCH 01/25] Drivers: net: hyperv: Get rid of the
+ rndis_filter_packet structure
+
+This structure is redundant; get rid of it make the code little more efficient -
+get rid of the unnecessary indirection.
+
+Signed-off-by: K. Y. Srinivasan <kys(a)microsoft.com>
+Reviewed-by: Haiyang Zhang <haiyangz(a)microsoft.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+---
+ drivers/net/hyperv/hyperv_net.h | 6 ------
+ drivers/net/hyperv/netvsc_drv.c | 2 +-
+ drivers/net/hyperv/rndis_filter.c | 41 +++------------------------------------
+ 3 files changed, 4 insertions(+), 45 deletions(-)
+
+diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
+index 7b594ce3f21d..7645ba38bde8 100644
+--- a/drivers/net/hyperv/hyperv_net.h
++++ b/drivers/net/hyperv/hyperv_net.h
+@@ -846,12 +846,6 @@ struct rndis_message {
+ };
+
+
+-struct rndis_filter_packet {
+- void *completion_ctx;
+- void (*completion)(void *context);
+- struct rndis_message msg;
+-};
+-
+ /* Handy macros */
+
+ /* get the size of an RNDIS message. Pass in the message type, */
+diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
+index 3c1c33ceffba..28020f83ba6f 100644
+--- a/drivers/net/hyperv/netvsc_drv.c
++++ b/drivers/net/hyperv/netvsc_drv.c
+@@ -156,7 +156,7 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
+ /* Allocate a netvsc packet based on # of frags. */
+ packet = kzalloc(sizeof(struct hv_netvsc_packet) +
+ (num_pages * sizeof(struct hv_page_buffer)) +
+- sizeof(struct rndis_filter_packet) +
++ sizeof(struct rndis_message) +
+ NDIS_VLAN_PPI_SIZE, GFP_ATOMIC);
+ if (!packet) {
+ /* out of memory, drop packet */
+diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
+index b54fd257652b..6a9f6021f09c 100644
+--- a/drivers/net/hyperv/rndis_filter.c
++++ b/drivers/net/hyperv/rndis_filter.c
+@@ -58,9 +58,6 @@ struct rndis_request {
+ u8 request_ext[RNDIS_EXT_LEN];
+ };
+
+-static void rndis_filter_send_completion(void *ctx);
+-
+-
+ static struct rndis_device *get_rndis_device(void)
+ {
+ struct rndis_device *device;
+@@ -297,7 +294,7 @@ static void rndis_filter_receive_response(struct rndis_device *dev,
+ "rndis response buffer overflow "
+ "detected (size %u max %zu)\n",
+ resp->msg_len,
+- sizeof(struct rndis_filter_packet));
++ sizeof(struct rndis_message));
+
+ if (resp->ndis_msg_type ==
+ RNDIS_MSG_RESET_C) {
+@@ -917,17 +914,14 @@ int rndis_filter_close(struct hv_device *dev)
+ int rndis_filter_send(struct hv_device *dev,
+ struct hv_netvsc_packet *pkt)
+ {
+- int ret;
+- struct rndis_filter_packet *filter_pkt;
+ struct rndis_message *rndis_msg;
+ struct rndis_packet *rndis_pkt;
+ u32 rndis_msg_size;
+ bool isvlan = pkt->vlan_tci & VLAN_TAG_PRESENT;
+
+ /* Add the rndis header */
+- filter_pkt = (struct rndis_filter_packet *)pkt->extension;
++ rndis_msg = (struct rndis_message *)pkt->extension;
+
+- rndis_msg = &filter_pkt->msg;
+ rndis_msg_size = RNDIS_MESSAGE_SIZE(struct rndis_packet);
+ if (isvlan)
+ rndis_msg_size += NDIS_VLAN_PPI_SIZE;
+@@ -980,34 +974,5 @@ int rndis_filter_send(struct hv_device *dev,
+ pkt->page_buf[1].len = rndis_msg_size - pkt->page_buf[0].len;
+ }
+
+- /* Save the packet send completion and context */
+- filter_pkt->completion = pkt->completion.send.send_completion;
+- filter_pkt->completion_ctx =
+- pkt->completion.send.send_completion_ctx;
+-
+- /* Use ours */
+- pkt->completion.send.send_completion = rndis_filter_send_completion;
+- pkt->completion.send.send_completion_ctx = filter_pkt;
+-
+- ret = netvsc_send(dev, pkt);
+- if (ret != 0) {
+- /*
+- * Reset the completion to originals to allow retries from
+- * above
+- */
+- pkt->completion.send.send_completion =
+- filter_pkt->completion;
+- pkt->completion.send.send_completion_ctx =
+- filter_pkt->completion_ctx;
+- }
+-
+- return ret;
+-}
+-
+-static void rndis_filter_send_completion(void *ctx)
+-{
+- struct rndis_filter_packet *filter_pkt = ctx;
+-
+- /* Pass it back to the original handler */
+- filter_pkt->completion(filter_pkt->completion_ctx);
++ return netvsc_send(dev, pkt);
+ }
+--
+2.4.3
+
diff --git a/src/patches/linux/0001-hyperv-Add-support-for-virtual-Receive-Side-Scaling-.patch b/src/patches/linux/0001-hyperv-Add-support-for-virtual-Receive-Side-Scaling-.patch
new file mode 100644
index 0000000..52c4da6
--- /dev/null
+++ b/src/patches/linux/0001-hyperv-Add-support-for-virtual-Receive-Side-Scaling-.patch
@@ -0,0 +1,917 @@
+From 5b54dac856cb5bd6f33f4159012773e4a33704f7 Mon Sep 17 00:00:00 2001
+From: Haiyang Zhang <haiyangz(a)microsoft.com>
+Date: Mon, 21 Apr 2014 10:20:28 -0700
+Subject: [PATCH 01/11] hyperv: Add support for virtual Receive Side Scaling
+ (vRSS)
+
+This feature allows multiple channels to be used by each virtual NIC.
+It is available on Hyper-V host 2012 R2.
+
+Signed-off-by: Haiyang Zhang <haiyangz(a)microsoft.com>
+Reviewed-by: K. Y. Srinivasan <kys(a)microsoft.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+---
+ drivers/net/hyperv/hyperv_net.h | 110 +++++++++++++++++++++-
+ drivers/net/hyperv/netvsc.c | 136 +++++++++++++++++++++------
+ drivers/net/hyperv/netvsc_drv.c | 103 ++++++++++++++++++++-
+ drivers/net/hyperv/rndis_filter.c | 189 +++++++++++++++++++++++++++++++++++++-
+ 4 files changed, 504 insertions(+), 34 deletions(-)
+
+diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
+index d18f711d0b0c..57eb3f906d64 100644
+--- a/drivers/net/hyperv/hyperv_net.h
++++ b/drivers/net/hyperv/hyperv_net.h
+@@ -28,6 +28,96 @@
+ #include <linux/hyperv.h>
+ #include <linux/rndis.h>
+
++/* RSS related */
++#define OID_GEN_RECEIVE_SCALE_CAPABILITIES 0x00010203 /* query only */
++#define OID_GEN_RECEIVE_SCALE_PARAMETERS 0x00010204 /* query and set */
++
++#define NDIS_OBJECT_TYPE_RSS_CAPABILITIES 0x88
++#define NDIS_OBJECT_TYPE_RSS_PARAMETERS 0x89
++
++#define NDIS_RECEIVE_SCALE_CAPABILITIES_REVISION_2 2
++#define NDIS_RECEIVE_SCALE_PARAMETERS_REVISION_2 2
++
++struct ndis_obj_header {
++ u8 type;
++ u8 rev;
++ u16 size;
++} __packed;
++
++/* ndis_recv_scale_cap/cap_flag */
++#define NDIS_RSS_CAPS_MESSAGE_SIGNALED_INTERRUPTS 0x01000000
++#define NDIS_RSS_CAPS_CLASSIFICATION_AT_ISR 0x02000000
++#define NDIS_RSS_CAPS_CLASSIFICATION_AT_DPC 0x04000000
++#define NDIS_RSS_CAPS_USING_MSI_X 0x08000000
++#define NDIS_RSS_CAPS_RSS_AVAILABLE_ON_PORTS 0x10000000
++#define NDIS_RSS_CAPS_SUPPORTS_MSI_X 0x20000000
++#define NDIS_RSS_CAPS_HASH_TYPE_TCP_IPV4 0x00000100
++#define NDIS_RSS_CAPS_HASH_TYPE_TCP_IPV6 0x00000200
++#define NDIS_RSS_CAPS_HASH_TYPE_TCP_IPV6_EX 0x00000400
++
++struct ndis_recv_scale_cap { /* NDIS_RECEIVE_SCALE_CAPABILITIES */
++ struct ndis_obj_header hdr;
++ u32 cap_flag;
++ u32 num_int_msg;
++ u32 num_recv_que;
++ u16 num_indirect_tabent;
++} __packed;
++
++
++/* ndis_recv_scale_param flags */
++#define NDIS_RSS_PARAM_FLAG_BASE_CPU_UNCHANGED 0x0001
++#define NDIS_RSS_PARAM_FLAG_HASH_INFO_UNCHANGED 0x0002
++#define NDIS_RSS_PARAM_FLAG_ITABLE_UNCHANGED 0x0004
++#define NDIS_RSS_PARAM_FLAG_HASH_KEY_UNCHANGED 0x0008
++#define NDIS_RSS_PARAM_FLAG_DISABLE_RSS 0x0010
++
++/* Hash info bits */
++#define NDIS_HASH_FUNC_TOEPLITZ 0x00000001
++#define NDIS_HASH_IPV4 0x00000100
++#define NDIS_HASH_TCP_IPV4 0x00000200
++#define NDIS_HASH_IPV6 0x00000400
++#define NDIS_HASH_IPV6_EX 0x00000800
++#define NDIS_HASH_TCP_IPV6 0x00001000
++#define NDIS_HASH_TCP_IPV6_EX 0x00002000
++
++#define NDIS_RSS_INDIRECTION_TABLE_MAX_SIZE_REVISION_2 (128 * 4)
++#define NDIS_RSS_HASH_SECRET_KEY_MAX_SIZE_REVISION_2 40
++
++#define ITAB_NUM 128
++#define HASH_KEYLEN NDIS_RSS_HASH_SECRET_KEY_MAX_SIZE_REVISION_2
++extern u8 netvsc_hash_key[];
++
++struct ndis_recv_scale_param { /* NDIS_RECEIVE_SCALE_PARAMETERS */
++ struct ndis_obj_header hdr;
++
++ /* Qualifies the rest of the information */
++ u16 flag;
++
++ /* The base CPU number to do receive processing. not used */
++ u16 base_cpu_number;
++
++ /* This describes the hash function and type being enabled */
++ u32 hashinfo;
++
++ /* The size of indirection table array */
++ u16 indirect_tabsize;
++
++ /* The offset of the indirection table from the beginning of this
++ * structure
++ */
++ u32 indirect_taboffset;
++
++ /* The size of the hash secret key */
++ u16 hashkey_size;
++
++ /* The offset of the secret key from the beginning of this structure */
++ u32 kashkey_offset;
++
++ u32 processor_masks_offset;
++ u32 num_processor_masks;
++ u32 processor_masks_entry_size;
++};
++
+ /* Fwd declaration */
+ struct hv_netvsc_packet;
+ struct ndis_tcp_ip_checksum_info;
+@@ -39,6 +129,8 @@ struct xferpage_packet {
+
+ /* # of netvsc packets this xfer packet contains */
+ u32 count;
++
++ struct vmbus_channel *channel;
+ };
+
+ /*
+@@ -54,6 +146,9 @@ struct hv_netvsc_packet {
+ bool is_data_pkt;
+ u16 vlan_tci;
+
++ u16 q_idx;
++ struct vmbus_channel *channel;
++
+ /*
+ * Valid only for receives when we break a xfer page packet
+ * into multiple netvsc packets
+@@ -120,6 +215,7 @@ void netvsc_linkstatus_callback(struct hv_device *device_obj,
+ int netvsc_recv_callback(struct hv_device *device_obj,
+ struct hv_netvsc_packet *packet,
+ struct ndis_tcp_ip_checksum_info *csum_info);
++void netvsc_channel_cb(void *context);
+ int rndis_filter_open(struct hv_device *dev);
+ int rndis_filter_close(struct hv_device *dev);
+ int rndis_filter_device_add(struct hv_device *dev,
+@@ -522,6 +618,8 @@ struct nvsp_message {
+
+ #define NETVSC_PACKET_SIZE 2048
+
++#define VRSS_SEND_TAB_SIZE 16
++
+ /* Per netvsc channel-specific */
+ struct netvsc_device {
+ struct hv_device *dev;
+@@ -555,10 +653,20 @@ struct netvsc_device {
+
+ struct net_device *ndev;
+
++ struct vmbus_channel *chn_table[NR_CPUS];
++ u32 send_table[VRSS_SEND_TAB_SIZE];
++ u32 num_chn;
++ atomic_t queue_sends[NR_CPUS];
++
+ /* Holds rndis device info */
+ void *extension;
+- /* The recive buffer for this device */
++
++ int ring_size;
++
++ /* The primary channel callback buffer */
+ unsigned char cb_buffer[NETVSC_PACKET_SIZE];
++ /* The sub channel callback buffer */
++ unsigned char *sub_cb_buf;
+ };
+
+ /* NdisInitialize message */
+diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
+index f7629ecefa84..e7e77f12bc38 100644
+--- a/drivers/net/hyperv/netvsc.c
++++ b/drivers/net/hyperv/netvsc.c
+@@ -422,6 +422,9 @@ int netvsc_device_remove(struct hv_device *device)
+ kfree(netvsc_packet);
+ }
+
++ if (net_device->sub_cb_buf)
++ vfree(net_device->sub_cb_buf);
++
+ kfree(net_device);
+ return 0;
+ }
+@@ -461,7 +464,9 @@ static void netvsc_send_completion(struct netvsc_device *net_device,
+ (nvsp_packet->hdr.msg_type ==
+ NVSP_MSG1_TYPE_SEND_RECV_BUF_COMPLETE) ||
+ (nvsp_packet->hdr.msg_type ==
+- NVSP_MSG1_TYPE_SEND_SEND_BUF_COMPLETE)) {
++ NVSP_MSG1_TYPE_SEND_SEND_BUF_COMPLETE) ||
++ (nvsp_packet->hdr.msg_type ==
++ NVSP_MSG5_TYPE_SUBCHANNEL)) {
+ /* Copy the response back */
+ memcpy(&net_device->channel_init_pkt, nvsp_packet,
+ sizeof(struct nvsp_message));
+@@ -469,28 +474,37 @@ static void netvsc_send_completion(struct netvsc_device *net_device,
+ } else if (nvsp_packet->hdr.msg_type ==
+ NVSP_MSG1_TYPE_SEND_RNDIS_PKT_COMPLETE) {
+ int num_outstanding_sends;
++ u16 q_idx = 0;
++ struct vmbus_channel *channel = device->channel;
++ int queue_sends;
+
+ /* Get the send context */
+ nvsc_packet = (struct hv_netvsc_packet *)(unsigned long)
+ packet->trans_id;
+
+ /* Notify the layer above us */
+- if (nvsc_packet)
++ if (nvsc_packet) {
++ q_idx = nvsc_packet->q_idx;
++ channel = nvsc_packet->channel;
+ nvsc_packet->completion.send.send_completion(
+ nvsc_packet->completion.send.
+ send_completion_ctx);
++ }
+
+ num_outstanding_sends =
+ atomic_dec_return(&net_device->num_outstanding_sends);
++ queue_sends = atomic_dec_return(&net_device->
++ queue_sends[q_idx]);
+
+ if (net_device->destroy && num_outstanding_sends == 0)
+ wake_up(&net_device->wait_drain);
+
+- if (netif_queue_stopped(ndev) && !net_device->start_remove &&
+- (hv_ringbuf_avail_percent(&device->channel->outbound)
+- > RING_AVAIL_PERCENT_HIWATER ||
+- num_outstanding_sends < 1))
+- netif_wake_queue(ndev);
++ if (netif_tx_queue_stopped(netdev_get_tx_queue(ndev, q_idx)) &&
++ !net_device->start_remove &&
++ (hv_ringbuf_avail_percent(&channel->outbound) >
++ RING_AVAIL_PERCENT_HIWATER || queue_sends < 1))
++ netif_tx_wake_queue(netdev_get_tx_queue(
++ ndev, q_idx));
+ } else {
+ netdev_err(ndev, "Unknown send completion packet type- "
+ "%d received!!\n", nvsp_packet->hdr.msg_type);
+@@ -505,6 +519,7 @@ int netvsc_send(struct hv_device *device,
+ int ret = 0;
+ struct nvsp_message sendMessage;
+ struct net_device *ndev;
++ struct vmbus_channel *out_channel = NULL;
+ u64 req_id;
+
+ net_device = get_outbound_net_device(device);
+@@ -531,15 +546,20 @@ int netvsc_send(struct hv_device *device,
+ else
+ req_id = 0;
+
++ out_channel = net_device->chn_table[packet->q_idx];
++ if (out_channel == NULL)
++ out_channel = device->channel;
++ packet->channel = out_channel;
++
+ if (packet->page_buf_cnt) {
+- ret = vmbus_sendpacket_pagebuffer(device->channel,
++ ret = vmbus_sendpacket_pagebuffer(out_channel,
+ packet->page_buf,
+ packet->page_buf_cnt,
+ &sendMessage,
+ sizeof(struct nvsp_message),
+ req_id);
+ } else {
+- ret = vmbus_sendpacket(device->channel, &sendMessage,
++ ret = vmbus_sendpacket(out_channel, &sendMessage,
+ sizeof(struct nvsp_message),
+ req_id,
+ VM_PKT_DATA_INBAND,
+@@ -548,17 +568,24 @@ int netvsc_send(struct hv_device *device,
+
+ if (ret == 0) {
+ atomic_inc(&net_device->num_outstanding_sends);
+- if (hv_ringbuf_avail_percent(&device->channel->outbound) <
++ atomic_inc(&net_device->queue_sends[packet->q_idx]);
++
++ if (hv_ringbuf_avail_percent(&out_channel->outbound) <
+ RING_AVAIL_PERCENT_LOWATER) {
+- netif_stop_queue(ndev);
++ netif_tx_stop_queue(netdev_get_tx_queue(
++ ndev, packet->q_idx));
++
+ if (atomic_read(&net_device->
+- num_outstanding_sends) < 1)
+- netif_wake_queue(ndev);
++ queue_sends[packet->q_idx]) < 1)
++ netif_tx_wake_queue(netdev_get_tx_queue(
++ ndev, packet->q_idx));
+ }
+ } else if (ret == -EAGAIN) {
+- netif_stop_queue(ndev);
+- if (atomic_read(&net_device->num_outstanding_sends) < 1) {
+- netif_wake_queue(ndev);
++ netif_tx_stop_queue(netdev_get_tx_queue(
++ ndev, packet->q_idx));
++ if (atomic_read(&net_device->queue_sends[packet->q_idx]) < 1) {
++ netif_tx_wake_queue(netdev_get_tx_queue(
++ ndev, packet->q_idx));
+ ret = -ENOSPC;
+ }
+ } else {
+@@ -570,6 +597,7 @@ int netvsc_send(struct hv_device *device,
+ }
+
+ static void netvsc_send_recv_completion(struct hv_device *device,
++ struct vmbus_channel *channel,
+ struct netvsc_device *net_device,
+ u64 transaction_id, u32 status)
+ {
+@@ -587,7 +615,7 @@ static void netvsc_send_recv_completion(struct hv_device *device,
+
+ retry_send_cmplt:
+ /* Send the completion */
+- ret = vmbus_sendpacket(device->channel, &recvcompMessage,
++ ret = vmbus_sendpacket(channel, &recvcompMessage,
+ sizeof(struct nvsp_message), transaction_id,
+ VM_PKT_COMP, 0);
+ if (ret == 0) {
+@@ -618,6 +646,7 @@ static void netvsc_receive_completion(void *context)
+ {
+ struct hv_netvsc_packet *packet = context;
+ struct hv_device *device = packet->device;
++ struct vmbus_channel *channel;
+ struct netvsc_device *net_device;
+ u64 transaction_id = 0;
+ bool fsend_receive_comp = false;
+@@ -649,6 +678,7 @@ static void netvsc_receive_completion(void *context)
+ */
+ if (packet->xfer_page_pkt->count == 0) {
+ fsend_receive_comp = true;
++ channel = packet->xfer_page_pkt->channel;
+ transaction_id = packet->completion.recv.recv_completion_tid;
+ status = packet->xfer_page_pkt->status;
+ list_add_tail(&packet->xfer_page_pkt->list_ent,
+@@ -662,12 +692,13 @@ static void netvsc_receive_completion(void *context)
+
+ /* Send a receive completion for the xfer page packet */
+ if (fsend_receive_comp)
+- netvsc_send_recv_completion(device, net_device, transaction_id,
+- status);
++ netvsc_send_recv_completion(device, channel, net_device,
++ transaction_id, status);
+
+ }
+
+ static void netvsc_receive(struct netvsc_device *net_device,
++ struct vmbus_channel *channel,
+ struct hv_device *device,
+ struct vmpacket_descriptor *packet)
+ {
+@@ -748,7 +779,7 @@ static void netvsc_receive(struct netvsc_device *net_device,
+ spin_unlock_irqrestore(&net_device->recv_pkt_list_lock,
+ flags);
+
+- netvsc_send_recv_completion(device, net_device,
++ netvsc_send_recv_completion(device, channel, net_device,
+ vmxferpage_packet->d.trans_id,
+ NVSP_STAT_FAIL);
+
+@@ -759,6 +790,7 @@ static void netvsc_receive(struct netvsc_device *net_device,
+ xferpage_packet = (struct xferpage_packet *)listHead.next;
+ list_del(&xferpage_packet->list_ent);
+ xferpage_packet->status = NVSP_STAT_SUCCESS;
++ xferpage_packet->channel = channel;
+
+ /* This is how much we can satisfy */
+ xferpage_packet->count = count - 1;
+@@ -800,10 +832,45 @@ static void netvsc_receive(struct netvsc_device *net_device,
+
+ }
+
+-static void netvsc_channel_cb(void *context)
++
++static void netvsc_send_table(struct hv_device *hdev,
++ struct vmpacket_descriptor *vmpkt)
++{
++ struct netvsc_device *nvscdev;
++ struct net_device *ndev;
++ struct nvsp_message *nvmsg;
++ int i;
++ u32 count, *tab;
++
++ nvscdev = get_outbound_net_device(hdev);
++ if (!nvscdev)
++ return;
++ ndev = nvscdev->ndev;
++
++ nvmsg = (struct nvsp_message *)((unsigned long)vmpkt +
++ (vmpkt->offset8 << 3));
++
++ if (nvmsg->hdr.msg_type != NVSP_MSG5_TYPE_SEND_INDIRECTION_TABLE)
++ return;
++
++ count = nvmsg->msg.v5_msg.send_table.count;
++ if (count != VRSS_SEND_TAB_SIZE) {
++ netdev_err(ndev, "Received wrong send-table size:%u\n", count);
++ return;
++ }
++
++ tab = (u32 *)((unsigned long)&nvmsg->msg.v5_msg.send_table +
++ nvmsg->msg.v5_msg.send_table.offset);
++
++ for (i = 0; i < count; i++)
++ nvscdev->send_table[i] = tab[i];
++}
++
++void netvsc_channel_cb(void *context)
+ {
+ int ret;
+- struct hv_device *device = context;
++ struct vmbus_channel *channel = (struct vmbus_channel *)context;
++ struct hv_device *device;
+ struct netvsc_device *net_device;
+ u32 bytes_recvd;
+ u64 request_id;
+@@ -812,14 +879,19 @@ static void netvsc_channel_cb(void *context)
+ int bufferlen = NETVSC_PACKET_SIZE;
+ struct net_device *ndev;
+
++ if (channel->primary_channel != NULL)
++ device = channel->primary_channel->device_obj;
++ else
++ device = channel->device_obj;
++
+ net_device = get_inbound_net_device(device);
+ if (!net_device)
+ return;
+ ndev = net_device->ndev;
+- buffer = net_device->cb_buffer;
++ buffer = get_per_channel_state(channel);
+
+ do {
+- ret = vmbus_recvpacket_raw(device->channel, buffer, bufferlen,
++ ret = vmbus_recvpacket_raw(channel, buffer, bufferlen,
+ &bytes_recvd, &request_id);
+ if (ret == 0) {
+ if (bytes_recvd > 0) {
+@@ -831,8 +903,12 @@ static void netvsc_channel_cb(void *context)
+ break;
+
+ case VM_PKT_DATA_USING_XFER_PAGES:
+- netvsc_receive(net_device,
+- device, desc);
++ netvsc_receive(net_device, channel,
++ device, desc);
++ break;
++
++ case VM_PKT_DATA_INBAND:
++ netvsc_send_table(device, desc);
+ break;
+
+ default:
+@@ -893,6 +969,8 @@ int netvsc_device_add(struct hv_device *device, void *additional_info)
+ goto cleanup;
+ }
+
++ net_device->ring_size = ring_size;
++
+ /*
+ * Coming into this function, struct net_device * is
+ * registered as the driver private data.
+@@ -917,10 +995,12 @@ int netvsc_device_add(struct hv_device *device, void *additional_info)
+ }
+ init_completion(&net_device->channel_init_wait);
+
++ set_per_channel_state(device->channel, net_device->cb_buffer);
++
+ /* Open the channel */
+ ret = vmbus_open(device->channel, ring_size * PAGE_SIZE,
+ ring_size * PAGE_SIZE, NULL, 0,
+- netvsc_channel_cb, device);
++ netvsc_channel_cb, device->channel);
+
+ if (ret != 0) {
+ netdev_err(ndev, "unable to open channel: %d\n", ret);
+@@ -930,6 +1010,8 @@ int netvsc_device_add(struct hv_device *device, void *additional_info)
+ /* Channel is opened */
+ pr_info("hv_netvsc channel opened successfully\n");
+
++ net_device->chn_table[0] = device->channel;
++
+ /* Connect with the NetVsp */
+ ret = netvsc_connect_vsp(device);
+ if (ret != 0) {
+diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
+index 31e55fba7cad..093cf3fc46b8 100644
+--- a/drivers/net/hyperv/netvsc_drv.c
++++ b/drivers/net/hyperv/netvsc_drv.c
+@@ -101,7 +101,7 @@ static int netvsc_open(struct net_device *net)
+ return ret;
+ }
+
+- netif_start_queue(net);
++ netif_tx_start_all_queues(net);
+
+ nvdev = hv_get_drvdata(device_obj);
+ rdev = nvdev->extension;
+@@ -149,6 +149,88 @@ static void *init_ppi_data(struct rndis_message *msg, u32 ppi_size,
+ return ppi;
+ }
+
++union sub_key {
++ u64 k;
++ struct {
++ u8 pad[3];
++ u8 kb;
++ u32 ka;
++ };
++};
++
++/* Toeplitz hash function
++ * data: network byte order
++ * return: host byte order
++ */
++static u32 comp_hash(u8 *key, int klen, u8 *data, int dlen)
++{
++ union sub_key subk;
++ int k_next = 4;
++ u8 dt;
++ int i, j;
++ u32 ret = 0;
++
++ subk.k = 0;
++ subk.ka = ntohl(*(u32 *)key);
++
++ for (i = 0; i < dlen; i++) {
++ subk.kb = key[k_next];
++ k_next = (k_next + 1) % klen;
++ dt = data[i];
++ for (j = 0; j < 8; j++) {
++ if (dt & 0x80)
++ ret ^= subk.ka;
++ dt <<= 1;
++ subk.k <<= 1;
++ }
++ }
++
++ return ret;
++}
++
++static bool netvsc_set_hash(u32 *hash, struct sk_buff *skb)
++{
++ struct iphdr *iphdr;
++ int data_len;
++ bool ret = false;
++
++ if (eth_hdr(skb)->h_proto != htons(ETH_P_IP))
++ return false;
++
++ iphdr = ip_hdr(skb);
++
++ if (iphdr->version == 4) {
++ if (iphdr->protocol == IPPROTO_TCP)
++ data_len = 12;
++ else
++ data_len = 8;
++ *hash = comp_hash(netvsc_hash_key, HASH_KEYLEN,
++ (u8 *)&iphdr->saddr, data_len);
++ ret = true;
++ }
++
++ return ret;
++}
++
++static u16 netvsc_select_queue(struct net_device *ndev, struct sk_buff *skb,
++ void *accel_priv, select_queue_fallback_t fallback)
++{
++ struct net_device_context *net_device_ctx = netdev_priv(ndev);
++ struct hv_device *hdev = net_device_ctx->device_ctx;
++ struct netvsc_device *nvsc_dev = hv_get_drvdata(hdev);
++ u32 hash;
++ u16 q_idx = 0;
++
++ if (nvsc_dev == NULL || ndev->real_num_tx_queues <= 1)
++ return 0;
++
++ if (netvsc_set_hash(&hash, skb))
++ q_idx = nvsc_dev->send_table[hash % VRSS_SEND_TAB_SIZE] %
++ ndev->real_num_tx_queues;
++
++ return q_idx;
++}
++
+ static void netvsc_xmit_completion(void *context)
+ {
+ struct hv_netvsc_packet *packet = (struct hv_netvsc_packet *)context;
+@@ -333,6 +415,8 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
+
+ packet->vlan_tci = skb->vlan_tci;
+
++ packet->q_idx = skb_get_queue_mapping(skb);
++
+ packet->is_data_pkt = true;
+ packet->total_data_buflen = skb->len;
+
+@@ -554,6 +638,10 @@ int netvsc_recv_callback(struct hv_device *device_obj,
+ __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),
+ packet->vlan_tci);
+
++ skb_record_rx_queue(skb, packet->xfer_page_pkt->channel->
++ offermsg.offer.sub_channel_index %
++ net->real_num_rx_queues);
++
+ net->stats.rx_packets++;
+ net->stats.rx_bytes += packet->total_data_buflen;
+
+@@ -602,7 +690,7 @@ static int netvsc_change_mtu(struct net_device *ndev, int mtu)
+ hv_set_drvdata(hdev, ndev);
+ device_info.ring_size = ring_size;
+ rndis_filter_device_add(hdev, &device_info);
+- netif_wake_queue(ndev);
++ netif_tx_wake_all_queues(ndev);
+
+ return 0;
+ }
+@@ -648,6 +736,7 @@ static const struct net_device_ops device_ops = {
+ .ndo_change_mtu = netvsc_change_mtu,
+ .ndo_validate_addr = eth_validate_addr,
+ .ndo_set_mac_address = netvsc_set_mac_addr,
++ .ndo_select_queue = netvsc_select_queue,
+ };
+
+ /*
+@@ -694,9 +783,11 @@ static int netvsc_probe(struct hv_device *dev,
+ struct net_device *net = NULL;
+ struct net_device_context *net_device_ctx;
+ struct netvsc_device_info device_info;
++ struct netvsc_device *nvdev;
+ int ret;
+
+- net = alloc_etherdev(sizeof(struct net_device_context));
++ net = alloc_etherdev_mq(sizeof(struct net_device_context),
++ num_online_cpus());
+ if (!net)
+ return -ENOMEM;
+
+@@ -729,6 +820,12 @@ static int netvsc_probe(struct hv_device *dev,
+ }
+ memcpy(net->dev_addr, device_info.mac_adr, ETH_ALEN);
+
++ nvdev = hv_get_drvdata(dev);
++ netif_set_real_num_tx_queues(net, nvdev->num_chn);
++ netif_set_real_num_rx_queues(net, nvdev->num_chn);
++ dev_info(&dev->device, "real num tx,rx queues:%u, %u\n",
++ net->real_num_tx_queues, net->real_num_rx_queues);
++
+ ret = register_netdev(net);
+ if (ret != 0) {
+ pr_err("Unable to register netdev.\n");
+diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
+index 143a98caf618..d92cfbe43410 100644
+--- a/drivers/net/hyperv/rndis_filter.c
++++ b/drivers/net/hyperv/rndis_filter.c
+@@ -31,7 +31,7 @@
+ #include "hyperv_net.h"
+
+
+-#define RNDIS_EXT_LEN 100
++#define RNDIS_EXT_LEN PAGE_SIZE
+ struct rndis_request {
+ struct list_head list_ent;
+ struct completion wait_event;
+@@ -94,6 +94,8 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
+ rndis_msg->ndis_msg_type = msg_type;
+ rndis_msg->msg_len = msg_len;
+
++ request->pkt.q_idx = 0;
++
+ /*
+ * Set the request id. This field is always after the rndis header for
+ * request/response packet types so we just used the SetRequest as a
+@@ -509,6 +511,19 @@ static int rndis_filter_query_device(struct rndis_device *dev, u32 oid,
+ query->info_buflen = 0;
+ query->dev_vc_handle = 0;
+
++ if (oid == OID_GEN_RECEIVE_SCALE_CAPABILITIES) {
++ struct ndis_recv_scale_cap *cap;
++
++ request->request_msg.msg_len +=
++ sizeof(struct ndis_recv_scale_cap);
++ query->info_buflen = sizeof(struct ndis_recv_scale_cap);
++ cap = (struct ndis_recv_scale_cap *)((unsigned long)query +
++ query->info_buf_offset);
++ cap->hdr.type = NDIS_OBJECT_TYPE_RSS_CAPABILITIES;
++ cap->hdr.rev = NDIS_RECEIVE_SCALE_CAPABILITIES_REVISION_2;
++ cap->hdr.size = sizeof(struct ndis_recv_scale_cap);
++ }
++
+ ret = rndis_filter_send_request(dev, request);
+ if (ret != 0)
+ goto cleanup;
+@@ -695,6 +710,89 @@ cleanup:
+ return ret;
+ }
+
++u8 netvsc_hash_key[HASH_KEYLEN] = {
++ 0x6d, 0x5a, 0x56, 0xda, 0x25, 0x5b, 0x0e, 0xc2,
++ 0x41, 0x67, 0x25, 0x3d, 0x43, 0xa3, 0x8f, 0xb0,
++ 0xd0, 0xca, 0x2b, 0xcb, 0xae, 0x7b, 0x30, 0xb4,
++ 0x77, 0xcb, 0x2d, 0xa3, 0x80, 0x30, 0xf2, 0x0c,
++ 0x6a, 0x42, 0xb7, 0x3b, 0xbe, 0xac, 0x01, 0xfa
++};
++
++int rndis_filter_set_rss_param(struct rndis_device *rdev, int num_queue)
++{
++ struct net_device *ndev = rdev->net_dev->ndev;
++ struct rndis_request *request;
++ struct rndis_set_request *set;
++ struct rndis_set_complete *set_complete;
++ u32 extlen = sizeof(struct ndis_recv_scale_param) +
++ 4*ITAB_NUM + HASH_KEYLEN;
++ struct ndis_recv_scale_param *rssp;
++ u32 *itab;
++ u8 *keyp;
++ int i, t, ret;
++
++ request = get_rndis_request(
++ rdev, RNDIS_MSG_SET,
++ RNDIS_MESSAGE_SIZE(struct rndis_set_request) + extlen);
++ if (!request)
++ return -ENOMEM;
++
++ set = &request->request_msg.msg.set_req;
++ set->oid = OID_GEN_RECEIVE_SCALE_PARAMETERS;
++ set->info_buflen = extlen;
++ set->info_buf_offset = sizeof(struct rndis_set_request);
++ set->dev_vc_handle = 0;
++
++ rssp = (struct ndis_recv_scale_param *)(set + 1);
++ rssp->hdr.type = NDIS_OBJECT_TYPE_RSS_PARAMETERS;
++ rssp->hdr.rev = NDIS_RECEIVE_SCALE_PARAMETERS_REVISION_2;
++ rssp->hdr.size = sizeof(struct ndis_recv_scale_param);
++ rssp->flag = 0;
++ rssp->hashinfo = NDIS_HASH_FUNC_TOEPLITZ | NDIS_HASH_IPV4 |
++ NDIS_HASH_TCP_IPV4;
++ rssp->indirect_tabsize = 4*ITAB_NUM;
++ rssp->indirect_taboffset = sizeof(struct ndis_recv_scale_param);
++ rssp->hashkey_size = HASH_KEYLEN;
++ rssp->kashkey_offset = rssp->indirect_taboffset +
++ rssp->indirect_tabsize;
++
++ /* Set indirection table entries */
++ itab = (u32 *)(rssp + 1);
++ for (i = 0; i < ITAB_NUM; i++)
++ itab[i] = i % num_queue;
++
++ /* Set hask key values */
++ keyp = (u8 *)((unsigned long)rssp + rssp->kashkey_offset);
++ for (i = 0; i < HASH_KEYLEN; i++)
++ keyp[i] = netvsc_hash_key[i];
++
++
++ ret = rndis_filter_send_request(rdev, request);
++ if (ret != 0)
++ goto cleanup;
++
++ t = wait_for_completion_timeout(&request->wait_event, 5*HZ);
++ if (t == 0) {
++ netdev_err(ndev, "timeout before we got a set response...\n");
++ /* can't put_rndis_request, since we may still receive a
++ * send-completion.
++ */
++ return -ETIMEDOUT;
++ } else {
++ set_complete = &request->response_msg.msg.set_complete;
++ if (set_complete->status != RNDIS_STATUS_SUCCESS) {
++ netdev_err(ndev, "Fail to set RSS parameters:0x%x\n",
++ set_complete->status);
++ ret = -EINVAL;
++ }
++ }
++
++cleanup:
++ put_rndis_request(rdev, request);
++ return ret;
++}
++
++
+ static int rndis_filter_query_device_link_status(struct rndis_device *dev)
+ {
+ u32 size = sizeof(u32);
+@@ -886,6 +984,28 @@ static int rndis_filter_close_device(struct rndis_device *dev)
+ return ret;
+ }
+
++static void netvsc_sc_open(struct vmbus_channel *new_sc)
++{
++ struct netvsc_device *nvscdev;
++ u16 chn_index = new_sc->offermsg.offer.sub_channel_index;
++ int ret;
++
++ nvscdev = hv_get_drvdata(new_sc->primary_channel->device_obj);
++
++ if (chn_index >= nvscdev->num_chn)
++ return;
++
++ set_per_channel_state(new_sc, nvscdev->sub_cb_buf + (chn_index - 1) *
++ NETVSC_PACKET_SIZE);
++
++ ret = vmbus_open(new_sc, nvscdev->ring_size * PAGE_SIZE,
++ nvscdev->ring_size * PAGE_SIZE, NULL, 0,
++ netvsc_channel_cb, new_sc);
++
++ if (ret == 0)
++ nvscdev->chn_table[chn_index] = new_sc;
++}
++
+ int rndis_filter_device_add(struct hv_device *dev,
+ void *additional_info)
+ {
+@@ -894,6 +1014,10 @@ int rndis_filter_device_add(struct hv_device *dev,
+ struct rndis_device *rndis_device;
+ struct netvsc_device_info *device_info = additional_info;
+ struct ndis_offload_params offloads;
++ struct nvsp_message *init_packet;
++ int t;
++ struct ndis_recv_scale_cap rsscap;
++ u32 rsscap_size = sizeof(struct ndis_recv_scale_cap);
+
+ rndis_device = get_rndis_device();
+ if (!rndis_device)
+@@ -913,6 +1037,7 @@ int rndis_filter_device_add(struct hv_device *dev,
+
+ /* Initialize the rndis device */
+ net_device = hv_get_drvdata(dev);
++ net_device->num_chn = 1;
+
+ net_device->extension = rndis_device;
+ rndis_device->net_dev = net_device;
+@@ -952,7 +1077,6 @@ int rndis_filter_device_add(struct hv_device *dev,
+ if (ret)
+ goto err_dev_remv;
+
+-
+ rndis_filter_query_device_link_status(rndis_device);
+
+ device_info->link_state = rndis_device->link_state;
+@@ -961,7 +1085,66 @@ int rndis_filter_device_add(struct hv_device *dev,
+ rndis_device->hw_mac_adr,
+ device_info->link_state ? "down" : "up");
+
+- return ret;
++ if (net_device->nvsp_version < NVSP_PROTOCOL_VERSION_5)
++ return 0;
++
++ /* vRSS setup */
++ memset(&rsscap, 0, rsscap_size);
++ ret = rndis_filter_query_device(rndis_device,
++ OID_GEN_RECEIVE_SCALE_CAPABILITIES,
++ &rsscap, &rsscap_size);
++ if (ret || rsscap.num_recv_que < 2)
++ goto out;
++
++ net_device->num_chn = (num_online_cpus() < rsscap.num_recv_que) ?
++ num_online_cpus() : rsscap.num_recv_que;
++ if (net_device->num_chn == 1)
++ goto out;
++
++ net_device->sub_cb_buf = vzalloc((net_device->num_chn - 1) *
++ NETVSC_PACKET_SIZE);
++ if (!net_device->sub_cb_buf) {
++ net_device->num_chn = 1;
++ dev_info(&dev->device, "No memory for subchannels.\n");
++ goto out;
++ }
++
++ vmbus_set_sc_create_callback(dev->channel, netvsc_sc_open);
++
++ init_packet = &net_device->channel_init_pkt;
++ memset(init_packet, 0, sizeof(struct nvsp_message));
++ init_packet->hdr.msg_type = NVSP_MSG5_TYPE_SUBCHANNEL;
++ init_packet->msg.v5_msg.subchn_req.op = NVSP_SUBCHANNEL_ALLOCATE;
++ init_packet->msg.v5_msg.subchn_req.num_subchannels =
++ net_device->num_chn - 1;
++ ret = vmbus_sendpacket(dev->channel, init_packet,
++ sizeof(struct nvsp_message),
++ (unsigned long)init_packet,
++ VM_PKT_DATA_INBAND,
++ VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
++ if (ret)
++ goto out;
++ t = wait_for_completion_timeout(&net_device->channel_init_wait, 5*HZ);
++ if (t == 0) {
++ ret = -ETIMEDOUT;
++ goto out;
++ }
++ if (init_packet->msg.v5_msg.subchn_comp.status !=
++ NVSP_STAT_SUCCESS) {
++ ret = -ENODEV;
++ goto out;
++ }
++ net_device->num_chn = 1 +
++ init_packet->msg.v5_msg.subchn_comp.num_subchannels;
++
++ vmbus_are_subchannels_present(dev->channel);
++
++ ret = rndis_filter_set_rss_param(rndis_device, net_device->num_chn);
++
++out:
++ if (ret)
++ net_device->num_chn = 1;
++ return 0; /* return 0 because primary channel can be used alone */
+
+ err_dev_remv:
+ rndis_filter_device_remove(dev);
+--
+2.4.3
+
diff --git a/src/patches/linux/0002-Drivers-net-hyperv-Cleanup-the-receive-path.patch b/src/patches/linux/0002-Drivers-net-hyperv-Cleanup-the-receive-path.patch
new file mode 100644
index 0000000..79485b3
--- /dev/null
+++ b/src/patches/linux/0002-Drivers-net-hyperv-Cleanup-the-receive-path.patch
@@ -0,0 +1,112 @@
+From 348a5d691d84759dda8cdd3cbf9f071115c1240e Mon Sep 17 00:00:00 2001
+From: KY Srinivasan <kys(a)microsoft.com>
+Date: Sun, 16 Feb 2014 16:38:44 -0800
+Subject: [PATCH 02/25] Drivers: net: hyperv: Cleanup the receive path
+
+Make the receive path a little more efficient by parameterizing the
+required state rather than re-establishing that state.
+
+Signed-off-by: K. Y. Srinivasan <kys(a)microsoft.com>
+Reviewed-by: Haiyang Zhang <haiyangz(a)microsoft.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+---
+ drivers/net/hyperv/netvsc.c | 29 +++++++++++++----------------
+ 1 file changed, 13 insertions(+), 16 deletions(-)
+
+diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
+index 03a2c6e17158..7fa2bbade327 100644
+--- a/drivers/net/hyperv/netvsc.c
++++ b/drivers/net/hyperv/netvsc.c
+@@ -432,17 +432,14 @@ static inline u32 hv_ringbuf_avail_percent(
+ return avail_write * 100 / ring_info->ring_datasize;
+ }
+
+-static void netvsc_send_completion(struct hv_device *device,
++static void netvsc_send_completion(struct netvsc_device *net_device,
++ struct hv_device *device,
+ struct vmpacket_descriptor *packet)
+ {
+- struct netvsc_device *net_device;
+ struct nvsp_message *nvsp_packet;
+ struct hv_netvsc_packet *nvsc_packet;
+ struct net_device *ndev;
+
+- net_device = get_inbound_net_device(device);
+- if (!net_device)
+- return;
+ ndev = net_device->ndev;
+
+ nvsp_packet = (struct nvsp_message *)((unsigned long)packet +
+@@ -561,13 +558,13 @@ int netvsc_send(struct hv_device *device,
+ }
+
+ static void netvsc_send_recv_completion(struct hv_device *device,
++ struct netvsc_device *net_device,
+ u64 transaction_id, u32 status)
+ {
+ struct nvsp_message recvcompMessage;
+ int retries = 0;
+ int ret;
+ struct net_device *ndev;
+- struct netvsc_device *net_device = hv_get_drvdata(device);
+
+ ndev = net_device->ndev;
+
+@@ -653,14 +650,15 @@ static void netvsc_receive_completion(void *context)
+
+ /* Send a receive completion for the xfer page packet */
+ if (fsend_receive_comp)
+- netvsc_send_recv_completion(device, transaction_id, status);
++ netvsc_send_recv_completion(device, net_device, transaction_id,
++ status);
+
+ }
+
+-static void netvsc_receive(struct hv_device *device,
+- struct vmpacket_descriptor *packet)
++static void netvsc_receive(struct netvsc_device *net_device,
++ struct hv_device *device,
++ struct vmpacket_descriptor *packet)
+ {
+- struct netvsc_device *net_device;
+ struct vmtransfer_page_packet_header *vmxferpage_packet;
+ struct nvsp_message *nvsp_packet;
+ struct hv_netvsc_packet *netvsc_packet = NULL;
+@@ -673,9 +671,6 @@ static void netvsc_receive(struct hv_device *device,
+
+ LIST_HEAD(listHead);
+
+- net_device = get_inbound_net_device(device);
+- if (!net_device)
+- return;
+ ndev = net_device->ndev;
+
+ /*
+@@ -741,7 +736,7 @@ static void netvsc_receive(struct hv_device *device,
+ spin_unlock_irqrestore(&net_device->recv_pkt_list_lock,
+ flags);
+
+- netvsc_send_recv_completion(device,
++ netvsc_send_recv_completion(device, net_device,
+ vmxferpage_packet->d.trans_id,
+ NVSP_STAT_FAIL);
+
+@@ -825,11 +820,13 @@ static void netvsc_channel_cb(void *context)
+ desc = (struct vmpacket_descriptor *)buffer;
+ switch (desc->type) {
+ case VM_PKT_COMP:
+- netvsc_send_completion(device, desc);
++ netvsc_send_completion(net_device,
++ device, desc);
+ break;
+
+ case VM_PKT_DATA_USING_XFER_PAGES:
+- netvsc_receive(device, desc);
++ netvsc_receive(net_device,
++ device, desc);
+ break;
+
+ default:
+--
+2.4.3
+
diff --git a/src/patches/linux/0002-hyperv-Remove-recv_pkt_list-and-lock.patch b/src/patches/linux/0002-hyperv-Remove-recv_pkt_list-and-lock.patch
new file mode 100644
index 0000000..bbe0e52
--- /dev/null
+++ b/src/patches/linux/0002-hyperv-Remove-recv_pkt_list-and-lock.patch
@@ -0,0 +1,384 @@
+From 4baab26129e0540746744232022110dbe9e011e7 Mon Sep 17 00:00:00 2001
+From: Haiyang Zhang <haiyangz(a)microsoft.com>
+Date: Mon, 21 Apr 2014 14:54:43 -0700
+Subject: [PATCH 02/11] hyperv: Remove recv_pkt_list and lock
+
+Removed recv_pkt_list and lock, and updated related code, so that
+the locking overhead is reduced especially when multiple channels
+are in use.
+
+The recv_pkt_list isn't actually necessary because the packets are
+processed sequentially in each channel. It has been replaced by a
+local variable, and the related lock for this list is also removed.
+The is_data_pkt field is not used in receive path, so its assignment
+is cleaned up.
+
+Signed-off-by: Haiyang Zhang <haiyangz(a)microsoft.com>
+Reviewed-by: K. Y. Srinivasan <kys(a)microsoft.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+---
+ drivers/net/hyperv/hyperv_net.h | 33 --------
+ drivers/net/hyperv/netvsc.c | 174 +++-----------------------------------
+ drivers/net/hyperv/netvsc_drv.c | 2 +-
+ drivers/net/hyperv/rndis_filter.c | 2 -
+ 4 files changed, 13 insertions(+), 198 deletions(-)
+
+diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
+index 57eb3f906d64..a1af0f7711e2 100644
+--- a/drivers/net/hyperv/hyperv_net.h
++++ b/drivers/net/hyperv/hyperv_net.h
+@@ -119,27 +119,14 @@ struct ndis_recv_scale_param { /* NDIS_RECEIVE_SCALE_PARAMETERS */
+ };
+
+ /* Fwd declaration */
+-struct hv_netvsc_packet;
+ struct ndis_tcp_ip_checksum_info;
+
+-/* Represent the xfer page packet which contains 1 or more netvsc packet */
+-struct xferpage_packet {
+- struct list_head list_ent;
+- u32 status;
+-
+- /* # of netvsc packets this xfer packet contains */
+- u32 count;
+-
+- struct vmbus_channel *channel;
+-};
+-
+ /*
+ * Represent netvsc packet which contains 1 RNDIS and 1 ethernet frame
+ * within the RNDIS
+ */
+ struct hv_netvsc_packet {
+ /* Bookkeeping stuff */
+- struct list_head list_ent;
+ u32 status;
+
+ struct hv_device *device;
+@@ -149,19 +136,8 @@ struct hv_netvsc_packet {
+ u16 q_idx;
+ struct vmbus_channel *channel;
+
+- /*
+- * Valid only for receives when we break a xfer page packet
+- * into multiple netvsc packets
+- */
+- struct xferpage_packet *xfer_page_pkt;
+-
+ union {
+ struct {
+- u64 recv_completion_tid;
+- void *recv_completion_ctx;
+- void (*recv_completion)(void *context);
+- } recv;
+- struct {
+ u64 send_completion_tid;
+ void *send_completion_ctx;
+ void (*send_completion)(void *context);
+@@ -613,9 +589,6 @@ struct nvsp_message {
+
+ #define NETVSC_RECEIVE_BUFFER_ID 0xcafe
+
+-/* Preallocated receive packets */
+-#define NETVSC_RECEIVE_PACKETLIST_COUNT 256
+-
+ #define NETVSC_PACKET_SIZE 2048
+
+ #define VRSS_SEND_TAB_SIZE 16
+@@ -630,12 +603,6 @@ struct netvsc_device {
+ wait_queue_head_t wait_drain;
+ bool start_remove;
+ bool destroy;
+- /*
+- * List of free preallocated hv_netvsc_packet to represent receive
+- * packet
+- */
+- struct list_head recv_pkt_list;
+- spinlock_t recv_pkt_list_lock;
+
+ /* Receive buffer allocated by us but manages by NetVSP */
+ void *recv_buf;
+diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
+index e7e77f12bc38..b10334773b32 100644
+--- a/drivers/net/hyperv/netvsc.c
++++ b/drivers/net/hyperv/netvsc.c
+@@ -387,7 +387,6 @@ static void netvsc_disconnect_vsp(struct netvsc_device *net_device)
+ int netvsc_device_remove(struct hv_device *device)
+ {
+ struct netvsc_device *net_device;
+- struct hv_netvsc_packet *netvsc_packet, *pos;
+ unsigned long flags;
+
+ net_device = hv_get_drvdata(device);
+@@ -416,12 +415,6 @@ int netvsc_device_remove(struct hv_device *device)
+ vmbus_close(device->channel);
+
+ /* Release all resources */
+- list_for_each_entry_safe(netvsc_packet, pos,
+- &net_device->recv_pkt_list, list_ent) {
+- list_del(&netvsc_packet->list_ent);
+- kfree(netvsc_packet);
+- }
+-
+ if (net_device->sub_cb_buf)
+ vfree(net_device->sub_cb_buf);
+
+@@ -641,62 +634,6 @@ retry_send_cmplt:
+ }
+ }
+
+-/* Send a receive completion packet to RNDIS device (ie NetVsp) */
+-static void netvsc_receive_completion(void *context)
+-{
+- struct hv_netvsc_packet *packet = context;
+- struct hv_device *device = packet->device;
+- struct vmbus_channel *channel;
+- struct netvsc_device *net_device;
+- u64 transaction_id = 0;
+- bool fsend_receive_comp = false;
+- unsigned long flags;
+- struct net_device *ndev;
+- u32 status = NVSP_STAT_NONE;
+-
+- /*
+- * Even though it seems logical to do a GetOutboundNetDevice() here to
+- * send out receive completion, we are using GetInboundNetDevice()
+- * since we may have disable outbound traffic already.
+- */
+- net_device = get_inbound_net_device(device);
+- if (!net_device)
+- return;
+- ndev = net_device->ndev;
+-
+- /* Overloading use of the lock. */
+- spin_lock_irqsave(&net_device->recv_pkt_list_lock, flags);
+-
+- if (packet->status != NVSP_STAT_SUCCESS)
+- packet->xfer_page_pkt->status = NVSP_STAT_FAIL;
+-
+- packet->xfer_page_pkt->count--;
+-
+- /*
+- * Last one in the line that represent 1 xfer page packet.
+- * Return the xfer page packet itself to the freelist
+- */
+- if (packet->xfer_page_pkt->count == 0) {
+- fsend_receive_comp = true;
+- channel = packet->xfer_page_pkt->channel;
+- transaction_id = packet->completion.recv.recv_completion_tid;
+- status = packet->xfer_page_pkt->status;
+- list_add_tail(&packet->xfer_page_pkt->list_ent,
+- &net_device->recv_pkt_list);
+-
+- }
+-
+- /* Put the packet back */
+- list_add_tail(&packet->list_ent, &net_device->recv_pkt_list);
+- spin_unlock_irqrestore(&net_device->recv_pkt_list_lock, flags);
+-
+- /* Send a receive completion for the xfer page packet */
+- if (fsend_receive_comp)
+- netvsc_send_recv_completion(device, channel, net_device,
+- transaction_id, status);
+-
+-}
+-
+ static void netvsc_receive(struct netvsc_device *net_device,
+ struct vmbus_channel *channel,
+ struct hv_device *device,
+@@ -704,16 +641,13 @@ static void netvsc_receive(struct netvsc_device *net_device,
+ {
+ struct vmtransfer_page_packet_header *vmxferpage_packet;
+ struct nvsp_message *nvsp_packet;
+- struct hv_netvsc_packet *netvsc_packet = NULL;
+- /* struct netvsc_driver *netvscDriver; */
+- struct xferpage_packet *xferpage_packet = NULL;
++ struct hv_netvsc_packet nv_pkt;
++ struct hv_netvsc_packet *netvsc_packet = &nv_pkt;
++ u32 status = NVSP_STAT_SUCCESS;
+ int i;
+ int count = 0;
+- unsigned long flags;
+ struct net_device *ndev;
+
+- LIST_HEAD(listHead);
+-
+ ndev = net_device->ndev;
+
+ /*
+@@ -746,78 +680,14 @@ static void netvsc_receive(struct netvsc_device *net_device,
+ return;
+ }
+
+- /*
+- * Grab free packets (range count + 1) to represent this xfer
+- * page packet. +1 to represent the xfer page packet itself.
+- * We grab it here so that we know exactly how many we can
+- * fulfil
+- */
+- spin_lock_irqsave(&net_device->recv_pkt_list_lock, flags);
+- while (!list_empty(&net_device->recv_pkt_list)) {
+- list_move_tail(net_device->recv_pkt_list.next, &listHead);
+- if (++count == vmxferpage_packet->range_cnt + 1)
+- break;
+- }
+- spin_unlock_irqrestore(&net_device->recv_pkt_list_lock, flags);
+-
+- /*
+- * We need at least 2 netvsc pkts (1 to represent the xfer
+- * page and at least 1 for the range) i.e. we can handled
+- * some of the xfer page packet ranges...
+- */
+- if (count < 2) {
+- netdev_err(ndev, "Got only %d netvsc pkt...needed "
+- "%d pkts. Dropping this xfer page packet completely!\n",
+- count, vmxferpage_packet->range_cnt + 1);
+-
+- /* Return it to the freelist */
+- spin_lock_irqsave(&net_device->recv_pkt_list_lock, flags);
+- for (i = count; i != 0; i--) {
+- list_move_tail(listHead.next,
+- &net_device->recv_pkt_list);
+- }
+- spin_unlock_irqrestore(&net_device->recv_pkt_list_lock,
+- flags);
+-
+- netvsc_send_recv_completion(device, channel, net_device,
+- vmxferpage_packet->d.trans_id,
+- NVSP_STAT_FAIL);
+-
+- return;
+- }
+-
+- /* Remove the 1st packet to represent the xfer page packet itself */
+- xferpage_packet = (struct xferpage_packet *)listHead.next;
+- list_del(&xferpage_packet->list_ent);
+- xferpage_packet->status = NVSP_STAT_SUCCESS;
+- xferpage_packet->channel = channel;
+-
+- /* This is how much we can satisfy */
+- xferpage_packet->count = count - 1;
+-
+- if (xferpage_packet->count != vmxferpage_packet->range_cnt) {
+- netdev_err(ndev, "Needed %d netvsc pkts to satisfy "
+- "this xfer page...got %d\n",
+- vmxferpage_packet->range_cnt, xferpage_packet->count);
+- }
++ count = vmxferpage_packet->range_cnt;
++ netvsc_packet->device = device;
++ netvsc_packet->channel = channel;
+
+ /* Each range represents 1 RNDIS pkt that contains 1 ethernet frame */
+- for (i = 0; i < (count - 1); i++) {
+- netvsc_packet = (struct hv_netvsc_packet *)listHead.next;
+- list_del(&netvsc_packet->list_ent);
+-
++ for (i = 0; i < count; i++) {
+ /* Initialize the netvsc packet */
+ netvsc_packet->status = NVSP_STAT_SUCCESS;
+- netvsc_packet->xfer_page_pkt = xferpage_packet;
+- netvsc_packet->completion.recv.recv_completion =
+- netvsc_receive_completion;
+- netvsc_packet->completion.recv.recv_completion_ctx =
+- netvsc_packet;
+- netvsc_packet->device = device;
+- /* Save this so that we can send it back */
+- netvsc_packet->completion.recv.recv_completion_tid =
+- vmxferpage_packet->d.trans_id;
+-
+ netvsc_packet->data = (void *)((unsigned long)net_device->
+ recv_buf + vmxferpage_packet->ranges[i].byte_offset);
+ netvsc_packet->total_data_buflen =
+@@ -826,10 +696,12 @@ static void netvsc_receive(struct netvsc_device *net_device,
+ /* Pass it to the upper layer */
+ rndis_filter_receive(device, netvsc_packet);
+
+- netvsc_receive_completion(netvsc_packet->
+- completion.recv.recv_completion_ctx);
++ if (netvsc_packet->status != NVSP_STAT_SUCCESS)
++ status = NVSP_STAT_FAIL;
+ }
+
++ netvsc_send_recv_completion(device, channel, net_device,
++ vmxferpage_packet->d.trans_id, status);
+ }
+
+
+@@ -956,11 +828,9 @@ void netvsc_channel_cb(void *context)
+ int netvsc_device_add(struct hv_device *device, void *additional_info)
+ {
+ int ret = 0;
+- int i;
+ int ring_size =
+ ((struct netvsc_device_info *)additional_info)->ring_size;
+ struct netvsc_device *net_device;
+- struct hv_netvsc_packet *packet, *pos;
+ struct net_device *ndev;
+
+ net_device = alloc_net_device(device);
+@@ -981,18 +851,6 @@ int netvsc_device_add(struct hv_device *device, void *additional_info)
+ ndev = net_device->ndev;
+
+ /* Initialize the NetVSC channel extension */
+- spin_lock_init(&net_device->recv_pkt_list_lock);
+-
+- INIT_LIST_HEAD(&net_device->recv_pkt_list);
+-
+- for (i = 0; i < NETVSC_RECEIVE_PACKETLIST_COUNT; i++) {
+- packet = kzalloc(sizeof(struct hv_netvsc_packet), GFP_KERNEL);
+- if (!packet)
+- break;
+-
+- list_add_tail(&packet->list_ent,
+- &net_device->recv_pkt_list);
+- }
+ init_completion(&net_device->channel_init_wait);
+
+ set_per_channel_state(device->channel, net_device->cb_buffer);
+@@ -1028,16 +886,8 @@ close:
+
+ cleanup:
+
+- if (net_device) {
+- list_for_each_entry_safe(packet, pos,
+- &net_device->recv_pkt_list,
+- list_ent) {
+- list_del(&packet->list_ent);
+- kfree(packet);
+- }
+-
++ if (net_device)
+ kfree(net_device);
+- }
+
+ return ret;
+ }
+diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
+index 093cf3fc46b8..8f6d53a2ed95 100644
+--- a/drivers/net/hyperv/netvsc_drv.c
++++ b/drivers/net/hyperv/netvsc_drv.c
+@@ -638,7 +638,7 @@ int netvsc_recv_callback(struct hv_device *device_obj,
+ __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),
+ packet->vlan_tci);
+
+- skb_record_rx_queue(skb, packet->xfer_page_pkt->channel->
++ skb_record_rx_queue(skb, packet->channel->
+ offermsg.offer.sub_channel_index %
+ net->real_num_rx_queues);
+
+diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
+index d92cfbe43410..48f5a0fbd674 100644
+--- a/drivers/net/hyperv/rndis_filter.c
++++ b/drivers/net/hyperv/rndis_filter.c
+@@ -401,8 +401,6 @@ static void rndis_filter_receive_data(struct rndis_device *dev,
+ pkt->total_data_buflen = rndis_pkt->data_len;
+ pkt->data = (void *)((unsigned long)pkt->data + data_offset);
+
+- pkt->is_data_pkt = true;
+-
+ vlan = rndis_get_ppi(rndis_pkt, IEEE_8021Q_INFO);
+ if (vlan) {
+ pkt->vlan_tci = VLAN_TAG_PRESENT | vlan->vlanid |
+--
+2.4.3
+
diff --git a/src/patches/linux/0003-Drivers-net-hyperv-Cleanup-the-netvsc-receive-callba.patch b/src/patches/linux/0003-Drivers-net-hyperv-Cleanup-the-netvsc-receive-callba.patch
new file mode 100644
index 0000000..e0b82ea
--- /dev/null
+++ b/src/patches/linux/0003-Drivers-net-hyperv-Cleanup-the-netvsc-receive-callba.patch
@@ -0,0 +1,101 @@
+From c9f2db35ac4f789930522d9d36200cb71b442bed Mon Sep 17 00:00:00 2001
+From: KY Srinivasan <kys(a)microsoft.com>
+Date: Sun, 16 Feb 2014 16:38:45 -0800
+Subject: [PATCH 03/25] Drivers: net: hyperv: Cleanup the netvsc receive
+ callback functio
+
+Get rid of the buffer allocation in the receive path for normal packets.
+
+Signed-off-by: K. Y. Srinivasan <kys(a)microsoft.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+---
+ drivers/net/hyperv/hyperv_net.h | 2 ++
+ drivers/net/hyperv/netvsc.c | 33 ++++++++++-----------------------
+ 2 files changed, 12 insertions(+), 23 deletions(-)
+
+diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
+index 7645ba38bde8..01a16ea77a5a 100644
+--- a/drivers/net/hyperv/hyperv_net.h
++++ b/drivers/net/hyperv/hyperv_net.h
+@@ -506,6 +506,8 @@ struct netvsc_device {
+
+ /* Holds rndis device info */
+ void *extension;
++ /* The recive buffer for this device */
++ unsigned char cb_buffer[NETVSC_PACKET_SIZE];
+ };
+
+ /* NdisInitialize message */
+diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
+index 7fa2bbade327..9a0e9c6f1414 100644
+--- a/drivers/net/hyperv/netvsc.c
++++ b/drivers/net/hyperv/netvsc.c
+@@ -795,22 +795,16 @@ static void netvsc_channel_cb(void *context)
+ struct netvsc_device *net_device;
+ u32 bytes_recvd;
+ u64 request_id;
+- unsigned char *packet;
+ struct vmpacket_descriptor *desc;
+ unsigned char *buffer;
+ int bufferlen = NETVSC_PACKET_SIZE;
+ struct net_device *ndev;
+
+- packet = kzalloc(NETVSC_PACKET_SIZE * sizeof(unsigned char),
+- GFP_ATOMIC);
+- if (!packet)
+- return;
+- buffer = packet;
+-
+ net_device = get_inbound_net_device(device);
+ if (!net_device)
+- goto out;
++ return;
+ ndev = net_device->ndev;
++ buffer = net_device->cb_buffer;
+
+ do {
+ ret = vmbus_recvpacket_raw(device->channel, buffer, bufferlen,
+@@ -838,23 +832,16 @@ static void netvsc_channel_cb(void *context)
+ break;
+ }
+
+- /* reset */
+- if (bufferlen > NETVSC_PACKET_SIZE) {
+- kfree(buffer);
+- buffer = packet;
+- bufferlen = NETVSC_PACKET_SIZE;
+- }
+ } else {
+- /* reset */
+- if (bufferlen > NETVSC_PACKET_SIZE) {
+- kfree(buffer);
+- buffer = packet;
+- bufferlen = NETVSC_PACKET_SIZE;
+- }
+-
++ /*
++ * We are done for this pass.
++ */
+ break;
+ }
++
+ } else if (ret == -ENOBUFS) {
++ if (bufferlen > NETVSC_PACKET_SIZE)
++ kfree(buffer);
+ /* Handle large packet */
+ buffer = kmalloc(bytes_recvd, GFP_ATOMIC);
+ if (buffer == NULL) {
+@@ -869,8 +856,8 @@ static void netvsc_channel_cb(void *context)
+ }
+ } while (1);
+
+-out:
+- kfree(buffer);
++ if (bufferlen > NETVSC_PACKET_SIZE)
++ kfree(buffer);
+ return;
+ }
+
+--
+2.4.3
+
diff --git a/src/patches/linux/0003-hyperv-Simplify-the-send_completion-variables.patch b/src/patches/linux/0003-hyperv-Simplify-the-send_completion-variables.patch
new file mode 100644
index 0000000..dcab56f
--- /dev/null
+++ b/src/patches/linux/0003-hyperv-Simplify-the-send_completion-variables.patch
@@ -0,0 +1,105 @@
+From 893f66277799cd46bdf97429cc5d16a815a51273 Mon Sep 17 00:00:00 2001
+From: Haiyang Zhang <haiyangz(a)microsoft.com>
+Date: Mon, 21 Apr 2014 14:54:44 -0700
+Subject: [PATCH 03/11] hyperv: Simplify the send_completion variables
+
+The union contains only one member now, so we use the variables in it directly.
+
+Signed-off-by: Haiyang Zhang <haiyangz(a)microsoft.com>
+Reviewed-by: K. Y. Srinivasan <kys(a)microsoft.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+---
+ drivers/net/hyperv/hyperv_net.h | 10 +++-------
+ drivers/net/hyperv/netvsc.c | 7 +++----
+ drivers/net/hyperv/netvsc_drv.c | 8 ++++----
+ drivers/net/hyperv/rndis_filter.c | 2 +-
+ 4 files changed, 11 insertions(+), 16 deletions(-)
+
+diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
+index a1af0f7711e2..d1f7826aa75f 100644
+--- a/drivers/net/hyperv/hyperv_net.h
++++ b/drivers/net/hyperv/hyperv_net.h
+@@ -136,13 +136,9 @@ struct hv_netvsc_packet {
+ u16 q_idx;
+ struct vmbus_channel *channel;
+
+- union {
+- struct {
+- u64 send_completion_tid;
+- void *send_completion_ctx;
+- void (*send_completion)(void *context);
+- } send;
+- } completion;
++ u64 send_completion_tid;
++ void *send_completion_ctx;
++ void (*send_completion)(void *context);
+
+ /* This points to the memory after page_buf */
+ struct rndis_message *rndis_msg;
+diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
+index b10334773b32..bbee44635035 100644
+--- a/drivers/net/hyperv/netvsc.c
++++ b/drivers/net/hyperv/netvsc.c
+@@ -479,9 +479,8 @@ static void netvsc_send_completion(struct netvsc_device *net_device,
+ if (nvsc_packet) {
+ q_idx = nvsc_packet->q_idx;
+ channel = nvsc_packet->channel;
+- nvsc_packet->completion.send.send_completion(
+- nvsc_packet->completion.send.
+- send_completion_ctx);
++ nvsc_packet->send_completion(nvsc_packet->
++ send_completion_ctx);
+ }
+
+ num_outstanding_sends =
+@@ -534,7 +533,7 @@ int netvsc_send(struct hv_device *device,
+ 0xFFFFFFFF;
+ sendMessage.msg.v1_msg.send_rndis_pkt.send_buf_section_size = 0;
+
+- if (packet->completion.send.send_completion)
++ if (packet->send_completion)
+ req_id = (ulong)packet;
+ else
+ req_id = 0;
+diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
+index 8f6d53a2ed95..c76b66515e92 100644
+--- a/drivers/net/hyperv/netvsc_drv.c
++++ b/drivers/net/hyperv/netvsc_drv.c
+@@ -235,7 +235,7 @@ static void netvsc_xmit_completion(void *context)
+ {
+ struct hv_netvsc_packet *packet = (struct hv_netvsc_packet *)context;
+ struct sk_buff *skb = (struct sk_buff *)
+- (unsigned long)packet->completion.send.send_completion_tid;
++ (unsigned long)packet->send_completion_tid;
+
+ kfree(packet);
+
+@@ -425,9 +425,9 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
+ (num_data_pgs * sizeof(struct hv_page_buffer)));
+
+ /* Set the completion routine */
+- packet->completion.send.send_completion = netvsc_xmit_completion;
+- packet->completion.send.send_completion_ctx = packet;
+- packet->completion.send.send_completion_tid = (unsigned long)skb;
++ packet->send_completion = netvsc_xmit_completion;
++ packet->send_completion_ctx = packet;
++ packet->send_completion_tid = (unsigned long)skb;
+
+ isvlan = packet->vlan_tci & VLAN_TAG_PRESENT;
+
+diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
+index 48f5a0fbd674..99c527adae5b 100644
+--- a/drivers/net/hyperv/rndis_filter.c
++++ b/drivers/net/hyperv/rndis_filter.c
+@@ -236,7 +236,7 @@ static int rndis_filter_send_request(struct rndis_device *dev,
+ packet->page_buf[0].len;
+ }
+
+- packet->completion.send.send_completion = NULL;
++ packet->send_completion = NULL;
+
+ ret = netvsc_send(dev->net_dev->dev, packet);
+ return ret;
+--
+2.4.3
+
diff --git a/src/patches/linux/0004-hyperv-Add-latest-NetVSP-versions-to-auto-negotiatio.patch b/src/patches/linux/0004-hyperv-Add-latest-NetVSP-versions-to-auto-negotiatio.patch
new file mode 100644
index 0000000..f9cd827
--- /dev/null
+++ b/src/patches/linux/0004-hyperv-Add-latest-NetVSP-versions-to-auto-negotiatio.patch
@@ -0,0 +1,171 @@
+From 3c2a271d9681cc017947c5e027acc64707c30dee Mon Sep 17 00:00:00 2001
+From: Haiyang Zhang <haiyangz(a)microsoft.com>
+Date: Wed, 19 Feb 2014 15:49:45 -0800
+Subject: [PATCH 04/25] hyperv: Add latest NetVSP versions to auto negotiation
+
+It auto negotiates the highest NetVSP version supported by both guest and host.
+
+Signed-off-by: Haiyang Zhang <haiyangz(a)microsoft.com>
+Reviewed-by: K. Y. Srinivasan <kys(a)microsoft.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+---
+ drivers/net/hyperv/hyperv_net.h | 53 +++++++++++++++++++++++++++++++++++++++++
+ drivers/net/hyperv/netvsc.c | 25 ++++++++++++-------
+ drivers/net/hyperv/netvsc_drv.c | 2 +-
+ 3 files changed, 70 insertions(+), 10 deletions(-)
+
+diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
+index 01a16ea77a5a..39fc230f5c20 100644
+--- a/drivers/net/hyperv/hyperv_net.h
++++ b/drivers/net/hyperv/hyperv_net.h
+@@ -139,6 +139,8 @@ int rndis_filter_set_device_mac(struct hv_device *hdev, char *mac);
+
+ #define NVSP_PROTOCOL_VERSION_1 2
+ #define NVSP_PROTOCOL_VERSION_2 0x30002
++#define NVSP_PROTOCOL_VERSION_4 0x40000
++#define NVSP_PROTOCOL_VERSION_5 0x50000
+
+ enum {
+ NVSP_MSG_TYPE_NONE = 0,
+@@ -193,6 +195,23 @@ enum {
+
+ NVSP_MSG2_TYPE_ALLOC_CHIMNEY_HANDLE,
+ NVSP_MSG2_TYPE_ALLOC_CHIMNEY_HANDLE_COMP,
++
++ NVSP_MSG2_MAX = NVSP_MSG2_TYPE_ALLOC_CHIMNEY_HANDLE_COMP,
++
++ /* Version 4 messages */
++ NVSP_MSG4_TYPE_SEND_VF_ASSOCIATION,
++ NVSP_MSG4_TYPE_SWITCH_DATA_PATH,
++ NVSP_MSG4_TYPE_UPLINK_CONNECT_STATE_DEPRECATED,
++
++ NVSP_MSG4_MAX = NVSP_MSG4_TYPE_UPLINK_CONNECT_STATE_DEPRECATED,
++
++ /* Version 5 messages */
++ NVSP_MSG5_TYPE_OID_QUERY_EX,
++ NVSP_MSG5_TYPE_OID_QUERY_EX_COMP,
++ NVSP_MSG5_TYPE_SUBCHANNEL,
++ NVSP_MSG5_TYPE_SEND_INDIRECTION_TABLE,
++
++ NVSP_MSG5_MAX = NVSP_MSG5_TYPE_SEND_INDIRECTION_TABLE,
+ };
+
+ enum {
+@@ -447,10 +466,44 @@ union nvsp_2_message_uber {
+ struct nvsp_2_free_rxbuf free_rxbuf;
+ } __packed;
+
++enum nvsp_subchannel_operation {
++ NVSP_SUBCHANNEL_NONE = 0,
++ NVSP_SUBCHANNEL_ALLOCATE,
++ NVSP_SUBCHANNEL_MAX
++};
++
++struct nvsp_5_subchannel_request {
++ u32 op;
++ u32 num_subchannels;
++} __packed;
++
++struct nvsp_5_subchannel_complete {
++ u32 status;
++ u32 num_subchannels; /* Actual number of subchannels allocated */
++} __packed;
++
++struct nvsp_5_send_indirect_table {
++ /* The number of entries in the send indirection table */
++ u32 count;
++
++ /* The offset of the send indireciton table from top of this struct.
++ * The send indirection table tells which channel to put the send
++ * traffic on. Each entry is a channel number.
++ */
++ u32 offset;
++} __packed;
++
++union nvsp_5_message_uber {
++ struct nvsp_5_subchannel_request subchn_req;
++ struct nvsp_5_subchannel_complete subchn_comp;
++ struct nvsp_5_send_indirect_table send_table;
++} __packed;
++
+ union nvsp_all_messages {
+ union nvsp_message_init_uber init_msg;
+ union nvsp_1_message_uber v1_msg;
+ union nvsp_2_message_uber v2_msg;
++ union nvsp_5_message_uber v5_msg;
+ } __packed;
+
+ /* ALL Messages */
+diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
+index 9a0e9c6f1414..1a0280dcba7e 100644
+--- a/drivers/net/hyperv/netvsc.c
++++ b/drivers/net/hyperv/netvsc.c
+@@ -290,7 +290,7 @@ static int negotiate_nvsp_ver(struct hv_device *device,
+ NVSP_STAT_SUCCESS)
+ return -EINVAL;
+
+- if (nvsp_ver != NVSP_PROTOCOL_VERSION_2)
++ if (nvsp_ver == NVSP_PROTOCOL_VERSION_1)
+ return 0;
+
+ /* NVSPv2 only: Send NDIS config */
+@@ -314,6 +314,9 @@ static int netvsc_connect_vsp(struct hv_device *device)
+ struct nvsp_message *init_packet;
+ int ndis_version;
+ struct net_device *ndev;
++ u32 ver_list[] = { NVSP_PROTOCOL_VERSION_1, NVSP_PROTOCOL_VERSION_2,
++ NVSP_PROTOCOL_VERSION_4, NVSP_PROTOCOL_VERSION_5 };
++ int i, num_ver = 4; /* number of different NVSP versions */
+
+ net_device = get_outbound_net_device(device);
+ if (!net_device)
+@@ -323,13 +326,14 @@ static int netvsc_connect_vsp(struct hv_device *device)
+ init_packet = &net_device->channel_init_pkt;
+
+ /* Negotiate the latest NVSP protocol supported */
+- if (negotiate_nvsp_ver(device, net_device, init_packet,
+- NVSP_PROTOCOL_VERSION_2) == 0) {
+- net_device->nvsp_version = NVSP_PROTOCOL_VERSION_2;
+- } else if (negotiate_nvsp_ver(device, net_device, init_packet,
+- NVSP_PROTOCOL_VERSION_1) == 0) {
+- net_device->nvsp_version = NVSP_PROTOCOL_VERSION_1;
+- } else {
++ for (i = num_ver - 1; i >= 0; i--)
++ if (negotiate_nvsp_ver(device, net_device, init_packet,
++ ver_list[i]) == 0) {
++ net_device->nvsp_version = ver_list[i];
++ break;
++ }
++
++ if (i < 0) {
+ ret = -EPROTO;
+ goto cleanup;
+ }
+@@ -339,7 +343,10 @@ static int netvsc_connect_vsp(struct hv_device *device)
+ /* Send the ndis version */
+ memset(init_packet, 0, sizeof(struct nvsp_message));
+
+- ndis_version = 0x00050001;
++ if (net_device->nvsp_version <= NVSP_PROTOCOL_VERSION_4)
++ ndis_version = 0x00050001;
++ else
++ ndis_version = 0x0006001e;
+
+ init_packet->hdr.msg_type = NVSP_MSG1_TYPE_SEND_NDIS_VER;
+ init_packet->msg.v1_msg.
+diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
+index 28020f83ba6f..8e3a0b00099b 100644
+--- a/drivers/net/hyperv/netvsc_drv.c
++++ b/drivers/net/hyperv/netvsc_drv.c
+@@ -328,7 +328,7 @@ static int netvsc_change_mtu(struct net_device *ndev, int mtu)
+ if (nvdev == NULL || nvdev->destroy)
+ return -ENODEV;
+
+- if (nvdev->nvsp_version == NVSP_PROTOCOL_VERSION_2)
++ if (nvdev->nvsp_version >= NVSP_PROTOCOL_VERSION_2)
+ limit = NETVSC_MTU;
+
+ if (mtu < 68 || mtu > limit)
+--
+2.4.3
+
diff --git a/src/patches/linux/0004-hyperv-Enable-sendbuf-mechanism-on-the-send-path.patch b/src/patches/linux/0004-hyperv-Enable-sendbuf-mechanism-on-the-send-path.patch
new file mode 100644
index 0000000..bc09122
--- /dev/null
+++ b/src/patches/linux/0004-hyperv-Enable-sendbuf-mechanism-on-the-send-path.patch
@@ -0,0 +1,407 @@
+From c25aaf814a63f9d9c4e45416f13d70ef0aa0be2e Mon Sep 17 00:00:00 2001
+From: KY Srinivasan <kys(a)microsoft.com>
+Date: Wed, 30 Apr 2014 10:14:31 -0700
+Subject: [PATCH 04/11] hyperv: Enable sendbuf mechanism on the send path
+
+We send packets using a copy-free mechanism (this is the Guest to Host transport
+via VMBUS). While this is obviously optimal for large packets,
+it may not be optimal for small packets. Hyper-V host supports
+a second mechanism for sending packets that is "copy based". We implement that
+mechanism in this patch.
+
+In this version of the patch I have addressed a comment from David Miller.
+
+With this patch (and all of the other offload and VRSS patches), we are now able
+to almost saturate a 10G interface between Linux VMs on Hyper-V
+on different hosts - close to 9 Gbps as measured via iperf.
+
+Signed-off-by: K. Y. Srinivasan <kys(a)microsoft.com>
+Reviewed-by: Haiyang Zhang <haiyangz(a)microsoft.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+---
+ drivers/net/hyperv/hyperv_net.h | 14 +++
+ drivers/net/hyperv/netvsc.c | 226 ++++++++++++++++++++++++++++++++++++++--
+ drivers/net/hyperv/netvsc_drv.c | 3 +-
+ 3 files changed, 234 insertions(+), 9 deletions(-)
+
+diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
+index d1f7826aa75f..4b7df5a5c966 100644
+--- a/drivers/net/hyperv/hyperv_net.h
++++ b/drivers/net/hyperv/hyperv_net.h
+@@ -140,6 +140,8 @@ struct hv_netvsc_packet {
+ void *send_completion_ctx;
+ void (*send_completion)(void *context);
+
++ u32 send_buf_index;
++
+ /* This points to the memory after page_buf */
+ struct rndis_message *rndis_msg;
+
+@@ -582,6 +584,9 @@ struct nvsp_message {
+
+ #define NETVSC_RECEIVE_BUFFER_SIZE (1024*1024*16) /* 16MB */
+ #define NETVSC_RECEIVE_BUFFER_SIZE_LEGACY (1024*1024*15) /* 15MB */
++#define NETVSC_SEND_BUFFER_SIZE (1024 * 1024) /* 1MB */
++#define NETVSC_INVALID_INDEX -1
++
+
+ #define NETVSC_RECEIVE_BUFFER_ID 0xcafe
+
+@@ -607,6 +612,15 @@ struct netvsc_device {
+ u32 recv_section_cnt;
+ struct nvsp_1_receive_buffer_section *recv_section;
+
++ /* Send buffer allocated by us */
++ void *send_buf;
++ u32 send_buf_size;
++ u32 send_buf_gpadl_handle;
++ u32 send_section_cnt;
++ u32 send_section_size;
++ unsigned long *send_section_map;
++ int map_words;
++
+ /* Used for NetVSP initialization protocol */
+ struct completion channel_init_wait;
+ struct nvsp_message channel_init_pkt;
+diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
+index bbee44635035..c041f63a6d30 100644
+--- a/drivers/net/hyperv/netvsc.c
++++ b/drivers/net/hyperv/netvsc.c
+@@ -28,6 +28,7 @@
+ #include <linux/slab.h>
+ #include <linux/netdevice.h>
+ #include <linux/if_ether.h>
++#include <asm/sync_bitops.h>
+
+ #include "hyperv_net.h"
+
+@@ -80,7 +81,7 @@ get_in_err:
+ }
+
+
+-static int netvsc_destroy_recv_buf(struct netvsc_device *net_device)
++static int netvsc_destroy_buf(struct netvsc_device *net_device)
+ {
+ struct nvsp_message *revoke_packet;
+ int ret = 0;
+@@ -146,10 +147,62 @@ static int netvsc_destroy_recv_buf(struct netvsc_device *net_device)
+ net_device->recv_section = NULL;
+ }
+
++ /* Deal with the send buffer we may have setup.
++ * If we got a send section size, it means we received a
++ * SendsendBufferComplete msg (ie sent
++ * NvspMessage1TypeSendReceiveBuffer msg) therefore, we need
++ * to send a revoke msg here
++ */
++ if (net_device->send_section_size) {
++ /* Send the revoke receive buffer */
++ revoke_packet = &net_device->revoke_packet;
++ memset(revoke_packet, 0, sizeof(struct nvsp_message));
++
++ revoke_packet->hdr.msg_type =
++ NVSP_MSG1_TYPE_REVOKE_SEND_BUF;
++ revoke_packet->msg.v1_msg.revoke_recv_buf.id = 0;
++
++ ret = vmbus_sendpacket(net_device->dev->channel,
++ revoke_packet,
++ sizeof(struct nvsp_message),
++ (unsigned long)revoke_packet,
++ VM_PKT_DATA_INBAND, 0);
++ /* If we failed here, we might as well return and
++ * have a leak rather than continue and a bugchk
++ */
++ if (ret != 0) {
++ netdev_err(ndev, "unable to send "
++ "revoke send buffer to netvsp\n");
++ return ret;
++ }
++ }
++ /* Teardown the gpadl on the vsp end */
++ if (net_device->send_buf_gpadl_handle) {
++ ret = vmbus_teardown_gpadl(net_device->dev->channel,
++ net_device->send_buf_gpadl_handle);
++
++ /* If we failed here, we might as well return and have a leak
++ * rather than continue and a bugchk
++ */
++ if (ret != 0) {
++ netdev_err(ndev,
++ "unable to teardown send buffer's gpadl\n");
++ return ret;
++ }
++ net_device->recv_buf_gpadl_handle = 0;
++ }
++ if (net_device->send_buf) {
++ /* Free up the receive buffer */
++ free_pages((unsigned long)net_device->send_buf,
++ get_order(net_device->send_buf_size));
++ net_device->send_buf = NULL;
++ }
++ kfree(net_device->send_section_map);
++
+ return ret;
+ }
+
+-static int netvsc_init_recv_buf(struct hv_device *device)
++static int netvsc_init_buf(struct hv_device *device)
+ {
+ int ret = 0;
+ int t;
+@@ -248,10 +301,90 @@ static int netvsc_init_recv_buf(struct hv_device *device)
+ goto cleanup;
+ }
+
++ /* Now setup the send buffer.
++ */
++ net_device->send_buf =
++ (void *)__get_free_pages(GFP_KERNEL|__GFP_ZERO,
++ get_order(net_device->send_buf_size));
++ if (!net_device->send_buf) {
++ netdev_err(ndev, "unable to allocate send "
++ "buffer of size %d\n", net_device->send_buf_size);
++ ret = -ENOMEM;
++ goto cleanup;
++ }
++
++ /* Establish the gpadl handle for this buffer on this
++ * channel. Note: This call uses the vmbus connection rather
++ * than the channel to establish the gpadl handle.
++ */
++ ret = vmbus_establish_gpadl(device->channel, net_device->send_buf,
++ net_device->send_buf_size,
++ &net_device->send_buf_gpadl_handle);
++ if (ret != 0) {
++ netdev_err(ndev,
++ "unable to establish send buffer's gpadl\n");
++ goto cleanup;
++ }
++
++ /* Notify the NetVsp of the gpadl handle */
++ init_packet = &net_device->channel_init_pkt;
++ memset(init_packet, 0, sizeof(struct nvsp_message));
++ init_packet->hdr.msg_type = NVSP_MSG1_TYPE_SEND_SEND_BUF;
++ init_packet->msg.v1_msg.send_recv_buf.gpadl_handle =
++ net_device->send_buf_gpadl_handle;
++ init_packet->msg.v1_msg.send_recv_buf.id = 0;
++
++ /* Send the gpadl notification request */
++ ret = vmbus_sendpacket(device->channel, init_packet,
++ sizeof(struct nvsp_message),
++ (unsigned long)init_packet,
++ VM_PKT_DATA_INBAND,
++ VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
++ if (ret != 0) {
++ netdev_err(ndev,
++ "unable to send send buffer's gpadl to netvsp\n");
++ goto cleanup;
++ }
++
++ t = wait_for_completion_timeout(&net_device->channel_init_wait, 5*HZ);
++ BUG_ON(t == 0);
++
++ /* Check the response */
++ if (init_packet->msg.v1_msg.
++ send_send_buf_complete.status != NVSP_STAT_SUCCESS) {
++ netdev_err(ndev, "Unable to complete send buffer "
++ "initialization with NetVsp - status %d\n",
++ init_packet->msg.v1_msg.
++ send_recv_buf_complete.status);
++ ret = -EINVAL;
++ goto cleanup;
++ }
++
++ /* Parse the response */
++ net_device->send_section_size = init_packet->msg.
++ v1_msg.send_send_buf_complete.section_size;
++
++ /* Section count is simply the size divided by the section size.
++ */
++ net_device->send_section_cnt =
++ net_device->send_buf_size/net_device->send_section_size;
++
++ dev_info(&device->device, "Send section size: %d, Section count:%d\n",
++ net_device->send_section_size, net_device->send_section_cnt);
++
++ /* Setup state for managing the send buffer. */
++ net_device->map_words = DIV_ROUND_UP(net_device->send_section_cnt,
++ BITS_PER_LONG);
++
++ net_device->send_section_map =
++ kzalloc(net_device->map_words * sizeof(ulong), GFP_KERNEL);
++ if (net_device->send_section_map == NULL)
++ goto cleanup;
++
+ goto exit;
+
+ cleanup:
+- netvsc_destroy_recv_buf(net_device);
++ netvsc_destroy_buf(net_device);
+
+ exit:
+ return ret;
+@@ -369,8 +502,9 @@ static int netvsc_connect_vsp(struct hv_device *device)
+ net_device->recv_buf_size = NETVSC_RECEIVE_BUFFER_SIZE_LEGACY;
+ else
+ net_device->recv_buf_size = NETVSC_RECEIVE_BUFFER_SIZE;
++ net_device->send_buf_size = NETVSC_SEND_BUFFER_SIZE;
+
+- ret = netvsc_init_recv_buf(device);
++ ret = netvsc_init_buf(device);
+
+ cleanup:
+ return ret;
+@@ -378,7 +512,7 @@ cleanup:
+
+ static void netvsc_disconnect_vsp(struct netvsc_device *net_device)
+ {
+- netvsc_destroy_recv_buf(net_device);
++ netvsc_destroy_buf(net_device);
+ }
+
+ /*
+@@ -440,6 +574,12 @@ static inline u32 hv_ringbuf_avail_percent(
+ return avail_write * 100 / ring_info->ring_datasize;
+ }
+
++static inline void netvsc_free_send_slot(struct netvsc_device *net_device,
++ u32 index)
++{
++ sync_change_bit(index, net_device->send_section_map);
++}
++
+ static void netvsc_send_completion(struct netvsc_device *net_device,
+ struct hv_device *device,
+ struct vmpacket_descriptor *packet)
+@@ -447,6 +587,7 @@ static void netvsc_send_completion(struct netvsc_device *net_device,
+ struct nvsp_message *nvsp_packet;
+ struct hv_netvsc_packet *nvsc_packet;
+ struct net_device *ndev;
++ u32 send_index;
+
+ ndev = net_device->ndev;
+
+@@ -477,6 +618,9 @@ static void netvsc_send_completion(struct netvsc_device *net_device,
+
+ /* Notify the layer above us */
+ if (nvsc_packet) {
++ send_index = nvsc_packet->send_buf_index;
++ if (send_index != NETVSC_INVALID_INDEX)
++ netvsc_free_send_slot(net_device, send_index);
+ q_idx = nvsc_packet->q_idx;
+ channel = nvsc_packet->channel;
+ nvsc_packet->send_completion(nvsc_packet->
+@@ -504,6 +648,52 @@ static void netvsc_send_completion(struct netvsc_device *net_device,
+
+ }
+
++static u32 netvsc_get_next_send_section(struct netvsc_device *net_device)
++{
++ unsigned long index;
++ u32 max_words = net_device->map_words;
++ unsigned long *map_addr = (unsigned long *)net_device->send_section_map;
++ u32 section_cnt = net_device->send_section_cnt;
++ int ret_val = NETVSC_INVALID_INDEX;
++ int i;
++ int prev_val;
++
++ for (i = 0; i < max_words; i++) {
++ if (!~(map_addr[i]))
++ continue;
++ index = ffz(map_addr[i]);
++ prev_val = sync_test_and_set_bit(index, &map_addr[i]);
++ if (prev_val)
++ continue;
++ if ((index + (i * BITS_PER_LONG)) >= section_cnt)
++ break;
++ ret_val = (index + (i * BITS_PER_LONG));
++ break;
++ }
++ return ret_val;
++}
++
++u32 netvsc_copy_to_send_buf(struct netvsc_device *net_device,
++ unsigned int section_index,
++ struct hv_netvsc_packet *packet)
++{
++ char *start = net_device->send_buf;
++ char *dest = (start + (section_index * net_device->send_section_size));
++ int i;
++ u32 msg_size = 0;
++
++ for (i = 0; i < packet->page_buf_cnt; i++) {
++ char *src = phys_to_virt(packet->page_buf[i].pfn << PAGE_SHIFT);
++ u32 offset = packet->page_buf[i].offset;
++ u32 len = packet->page_buf[i].len;
++
++ memcpy(dest, (src + offset), len);
++ msg_size += len;
++ dest += len;
++ }
++ return msg_size;
++}
++
+ int netvsc_send(struct hv_device *device,
+ struct hv_netvsc_packet *packet)
+ {
+@@ -513,6 +703,10 @@ int netvsc_send(struct hv_device *device,
+ struct net_device *ndev;
+ struct vmbus_channel *out_channel = NULL;
+ u64 req_id;
++ unsigned int section_index = NETVSC_INVALID_INDEX;
++ u32 msg_size = 0;
++ struct sk_buff *skb;
++
+
+ net_device = get_outbound_net_device(device);
+ if (!net_device)
+@@ -528,10 +722,26 @@ int netvsc_send(struct hv_device *device,
+ sendMessage.msg.v1_msg.send_rndis_pkt.channel_type = 1;
+ }
+
+- /* Not using send buffer section */
++ /* Attempt to send via sendbuf */
++ if (packet->total_data_buflen < net_device->send_section_size) {
++ section_index = netvsc_get_next_send_section(net_device);
++ if (section_index != NETVSC_INVALID_INDEX) {
++ msg_size = netvsc_copy_to_send_buf(net_device,
++ section_index,
++ packet);
++ skb = (struct sk_buff *)
++ (unsigned long)packet->send_completion_tid;
++ if (skb)
++ dev_kfree_skb_any(skb);
++ packet->page_buf_cnt = 0;
++ }
++ }
++ packet->send_buf_index = section_index;
++
++
+ sendMessage.msg.v1_msg.send_rndis_pkt.send_buf_section_index =
+- 0xFFFFFFFF;
+- sendMessage.msg.v1_msg.send_rndis_pkt.send_buf_section_size = 0;
++ section_index;
++ sendMessage.msg.v1_msg.send_rndis_pkt.send_buf_section_size = msg_size;
+
+ if (packet->send_completion)
+ req_id = (ulong)packet;
+diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
+index c76b66515e92..939e3af60ec4 100644
+--- a/drivers/net/hyperv/netvsc_drv.c
++++ b/drivers/net/hyperv/netvsc_drv.c
+@@ -236,10 +236,11 @@ static void netvsc_xmit_completion(void *context)
+ struct hv_netvsc_packet *packet = (struct hv_netvsc_packet *)context;
+ struct sk_buff *skb = (struct sk_buff *)
+ (unsigned long)packet->send_completion_tid;
++ u32 index = packet->send_buf_index;
+
+ kfree(packet);
+
+- if (skb)
++ if (skb && (index == NETVSC_INVALID_INDEX))
+ dev_kfree_skb_any(skb);
+ }
+
+--
+2.4.3
+
diff --git a/src/patches/linux/0005-Add-support-for-netvsc-build-without-CONFIG_SYSFS-fl.patch b/src/patches/linux/0005-Add-support-for-netvsc-build-without-CONFIG_SYSFS-fl.patch
new file mode 100644
index 0000000..4d00ad2
--- /dev/null
+++ b/src/patches/linux/0005-Add-support-for-netvsc-build-without-CONFIG_SYSFS-fl.patch
@@ -0,0 +1,42 @@
+From e565e803d437b36c4fb4ced5e346827981183284 Mon Sep 17 00:00:00 2001
+From: Haiyang Zhang <haiyangz(a)microsoft.com>
+Date: Thu, 8 May 2014 15:14:10 -0700
+Subject: [PATCH 05/11] Add support for netvsc build without CONFIG_SYSFS flag
+
+This change ensures the driver can be built successfully without the
+CONFIG_SYSFS flag.
+MS-TFS: 182270
+
+Signed-off-by: Haiyang Zhang <haiyangz(a)microsoft.com>
+Reviewed-by: K. Y. Srinivasan <kys(a)microsoft.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+---
+ drivers/net/hyperv/netvsc_drv.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
+index 939e3af60ec4..083d084396d3 100644
+--- a/drivers/net/hyperv/netvsc_drv.c
++++ b/drivers/net/hyperv/netvsc_drv.c
+@@ -640,8 +640,7 @@ int netvsc_recv_callback(struct hv_device *device_obj,
+ packet->vlan_tci);
+
+ skb_record_rx_queue(skb, packet->channel->
+- offermsg.offer.sub_channel_index %
+- net->real_num_rx_queues);
++ offermsg.offer.sub_channel_index);
+
+ net->stats.rx_packets++;
+ net->stats.rx_bytes += packet->total_data_buflen;
+@@ -824,8 +823,6 @@ static int netvsc_probe(struct hv_device *dev,
+ nvdev = hv_get_drvdata(dev);
+ netif_set_real_num_tx_queues(net, nvdev->num_chn);
+ netif_set_real_num_rx_queues(net, nvdev->num_chn);
+- dev_info(&dev->device, "real num tx,rx queues:%u, %u\n",
+- net->real_num_tx_queues, net->real_num_rx_queues);
+
+ ret = register_netdev(net);
+ if (ret != 0) {
+--
+2.4.3
+
diff --git a/src/patches/linux/0005-Drivers-net-hyperv-Enable-scatter-gather-I-O.patch b/src/patches/linux/0005-Drivers-net-hyperv-Enable-scatter-gather-I-O.patch
new file mode 100644
index 0000000..27fb2d9
--- /dev/null
+++ b/src/patches/linux/0005-Drivers-net-hyperv-Enable-scatter-gather-I-O.patch
@@ -0,0 +1,212 @@
+From 4c06034001e20ff9f6e2a1a3dfa155bf3f31440c Mon Sep 17 00:00:00 2001
+From: KY Srinivasan <kys(a)microsoft.com>
+Date: Sat, 8 Mar 2014 19:23:13 -0800
+Subject: [PATCH 05/25] Drivers: net: hyperv: Enable scatter gather I/O
+
+Cleanup the code and enable scatter gather I/O.
+
+Signed-off-by: K. Y. Srinivasan <kys(a)microsoft.com>
+Reviewed-by: Haiyang Zhang <haiyangz(a)microsoft.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+---
+ drivers/net/hyperv/netvsc_drv.c | 153 ++++++++++++++++++++++++++++++----------
+ 1 file changed, 114 insertions(+), 39 deletions(-)
+
+diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
+index 8e3a0b00099b..72961741be54 100644
+--- a/drivers/net/hyperv/netvsc_drv.c
++++ b/drivers/net/hyperv/netvsc_drv.c
+@@ -140,22 +140,124 @@ static void netvsc_xmit_completion(void *context)
+ dev_kfree_skb_any(skb);
+ }
+
++static u32 fill_pg_buf(struct page *page, u32 offset, u32 len,
++ struct hv_page_buffer *pb)
++{
++ int j = 0;
++
++ /* Deal with compund pages by ignoring unused part
++ * of the page.
++ */
++ page += (offset >> PAGE_SHIFT);
++ offset &= ~PAGE_MASK;
++
++ while (len > 0) {
++ unsigned long bytes;
++
++ bytes = PAGE_SIZE - offset;
++ if (bytes > len)
++ bytes = len;
++ pb[j].pfn = page_to_pfn(page);
++ pb[j].offset = offset;
++ pb[j].len = bytes;
++
++ offset += bytes;
++ len -= bytes;
++
++ if (offset == PAGE_SIZE && len) {
++ page++;
++ offset = 0;
++ j++;
++ }
++ }
++
++ return j + 1;
++}
++
++static void init_page_array(void *hdr, u32 len, struct sk_buff *skb,
++ struct hv_page_buffer *pb)
++{
++ u32 slots_used = 0;
++ char *data = skb->data;
++ int frags = skb_shinfo(skb)->nr_frags;
++ int i;
++
++ /* The packet is laid out thus:
++ * 1. hdr
++ * 2. skb linear data
++ * 3. skb fragment data
++ */
++ if (hdr != NULL)
++ slots_used += fill_pg_buf(virt_to_page(hdr),
++ offset_in_page(hdr),
++ len, &pb[slots_used]);
++
++ slots_used += fill_pg_buf(virt_to_page(data),
++ offset_in_page(data),
++ skb_headlen(skb), &pb[slots_used]);
++
++ for (i = 0; i < frags; i++) {
++ skb_frag_t *frag = skb_shinfo(skb)->frags + i;
++
++ slots_used += fill_pg_buf(skb_frag_page(frag),
++ frag->page_offset,
++ skb_frag_size(frag), &pb[slots_used]);
++ }
++}
++
++static int count_skb_frag_slots(struct sk_buff *skb)
++{
++ int i, frags = skb_shinfo(skb)->nr_frags;
++ int pages = 0;
++
++ for (i = 0; i < frags; i++) {
++ skb_frag_t *frag = skb_shinfo(skb)->frags + i;
++ unsigned long size = skb_frag_size(frag);
++ unsigned long offset = frag->page_offset;
++
++ /* Skip unused frames from start of page */
++ offset &= ~PAGE_MASK;
++ pages += PFN_UP(offset + size);
++ }
++ return pages;
++}
++
++static int netvsc_get_slots(struct sk_buff *skb)
++{
++ char *data = skb->data;
++ unsigned int offset = offset_in_page(data);
++ unsigned int len = skb_headlen(skb);
++ int slots;
++ int frag_slots;
++
++ slots = DIV_ROUND_UP(offset + len, PAGE_SIZE);
++ frag_slots = count_skb_frag_slots(skb);
++ return slots + frag_slots;
++}
++
+ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
+ {
+ struct net_device_context *net_device_ctx = netdev_priv(net);
+ struct hv_netvsc_packet *packet;
+ int ret;
+- unsigned int i, num_pages, npg_data;
++ unsigned int num_data_pages;
+ u32 skb_length = skb->len;
+
+- /* Add multipages for skb->data and additional 2 for RNDIS */
+- npg_data = (((unsigned long)skb->data + skb_headlen(skb) - 1)
+- >> PAGE_SHIFT) - ((unsigned long)skb->data >> PAGE_SHIFT) + 1;
+- num_pages = skb_shinfo(skb)->nr_frags + npg_data + 2;
++ /* We will atmost need two pages to describe the rndis
++ * header. We can only transmit MAX_PAGE_BUFFER_COUNT number
++ * of pages in a single packet.
++ */
++ num_data_pages = netvsc_get_slots(skb) + 2;
++ if (num_data_pages > MAX_PAGE_BUFFER_COUNT) {
++ netdev_err(net, "Packet too big: %u\n", skb->len);
++ dev_kfree_skb(skb);
++ net->stats.tx_dropped++;
++ return NETDEV_TX_OK;
++ }
+
+ /* Allocate a netvsc packet based on # of frags. */
+ packet = kzalloc(sizeof(struct hv_netvsc_packet) +
+- (num_pages * sizeof(struct hv_page_buffer)) +
++ (num_data_pages * sizeof(struct hv_page_buffer)) +
+ sizeof(struct rndis_message) +
+ NDIS_VLAN_PPI_SIZE, GFP_ATOMIC);
+ if (!packet) {
+@@ -170,44 +272,17 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
+ packet->vlan_tci = skb->vlan_tci;
+
+ packet->extension = (void *)(unsigned long)packet +
+- sizeof(struct hv_netvsc_packet) +
+- (num_pages * sizeof(struct hv_page_buffer));
++ sizeof(struct hv_netvsc_packet) +
++ (num_data_pages * sizeof(struct hv_page_buffer));
+
+ /* If the rndis msg goes beyond 1 page, we will add 1 later */
+- packet->page_buf_cnt = num_pages - 1;
++ packet->page_buf_cnt = num_data_pages - 1;
+
+ /* Initialize it from the skb */
+ packet->total_data_buflen = skb->len;
+
+ /* Start filling in the page buffers starting after RNDIS buffer. */
+- packet->page_buf[1].pfn = virt_to_phys(skb->data) >> PAGE_SHIFT;
+- packet->page_buf[1].offset
+- = (unsigned long)skb->data & (PAGE_SIZE - 1);
+- if (npg_data == 1)
+- packet->page_buf[1].len = skb_headlen(skb);
+- else
+- packet->page_buf[1].len = PAGE_SIZE
+- - packet->page_buf[1].offset;
+-
+- for (i = 2; i <= npg_data; i++) {
+- packet->page_buf[i].pfn = virt_to_phys(skb->data
+- + PAGE_SIZE * (i-1)) >> PAGE_SHIFT;
+- packet->page_buf[i].offset = 0;
+- packet->page_buf[i].len = PAGE_SIZE;
+- }
+- if (npg_data > 1)
+- packet->page_buf[npg_data].len = (((unsigned long)skb->data
+- + skb_headlen(skb) - 1) & (PAGE_SIZE - 1)) + 1;
+-
+- /* Additional fragments are after SKB data */
+- for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
+- const skb_frag_t *f = &skb_shinfo(skb)->frags[i];
+-
+- packet->page_buf[i+npg_data+1].pfn =
+- page_to_pfn(skb_frag_page(f));
+- packet->page_buf[i+npg_data+1].offset = f->page_offset;
+- packet->page_buf[i+npg_data+1].len = skb_frag_size(f);
+- }
++ init_page_array(NULL, 0, skb, &packet->page_buf[1]);
+
+ /* Set the completion routine */
+ packet->completion.send.send_completion = netvsc_xmit_completion;
+@@ -454,8 +529,8 @@ static int netvsc_probe(struct hv_device *dev,
+ net->netdev_ops = &device_ops;
+
+ /* TODO: Add GSO and Checksum offload */
+- net->hw_features = 0;
+- net->features = NETIF_F_HW_VLAN_CTAG_TX;
++ net->hw_features = NETIF_F_SG;
++ net->features = NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_SG;
+
+ SET_ETHTOOL_OPS(net, ðtool_ops);
+ SET_NETDEV_DEV(net, &dev->device);
+--
+2.4.3
+
diff --git a/src/patches/linux/0006-Drivers-net-hyperv-Cleanup-the-send-path.patch b/src/patches/linux/0006-Drivers-net-hyperv-Cleanup-the-send-path.patch
new file mode 100644
index 0000000..20fcb3f
--- /dev/null
+++ b/src/patches/linux/0006-Drivers-net-hyperv-Cleanup-the-send-path.patch
@@ -0,0 +1,266 @@
+From d972eb71fb95660fe74616901b55b0d7a336daed Mon Sep 17 00:00:00 2001
+From: KY Srinivasan <kys(a)microsoft.com>
+Date: Sat, 8 Mar 2014 19:23:14 -0800
+Subject: [PATCH 06/25] Drivers: net: hyperv: Cleanup the send path
+
+In preparation for enabling offloads, cleanup the send path.
+
+Signed-off-by: K. Y. Srinivasan <kys(a)microsoft.com>
+Reviewed-by: Haiyang Zhang <haiyangz(a)microsoft.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+---
+ drivers/net/hyperv/hyperv_net.h | 7 +---
+ drivers/net/hyperv/netvsc_drv.c | 88 +++++++++++++++++++++++++++++++--------
+ drivers/net/hyperv/rndis_filter.c | 66 -----------------------------
+ 3 files changed, 71 insertions(+), 90 deletions(-)
+
+diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
+index 39fc230f5c20..694bf7cada90 100644
+--- a/drivers/net/hyperv/hyperv_net.h
++++ b/drivers/net/hyperv/hyperv_net.h
+@@ -73,7 +73,7 @@ struct hv_netvsc_packet {
+ } completion;
+
+ /* This points to the memory after page_buf */
+- void *extension;
++ struct rndis_message *rndis_msg;
+
+ u32 total_data_buflen;
+ /* Points to the send/receive buffer where the ethernet frame is */
+@@ -126,11 +126,6 @@ void rndis_filter_device_remove(struct hv_device *dev);
+ int rndis_filter_receive(struct hv_device *dev,
+ struct hv_netvsc_packet *pkt);
+
+-
+-
+-int rndis_filter_send(struct hv_device *dev,
+- struct hv_netvsc_packet *pkt);
+-
+ int rndis_filter_set_packet_filter(struct rndis_device *dev, u32 new_filter);
+ int rndis_filter_set_device_mac(struct hv_device *hdev, char *mac);
+
+diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
+index 72961741be54..87293a15e470 100644
+--- a/drivers/net/hyperv/netvsc_drv.c
++++ b/drivers/net/hyperv/netvsc_drv.c
+@@ -128,6 +128,27 @@ static int netvsc_close(struct net_device *net)
+ return ret;
+ }
+
++static void *init_ppi_data(struct rndis_message *msg, u32 ppi_size,
++ int pkt_type)
++{
++ struct rndis_packet *rndis_pkt;
++ struct rndis_per_packet_info *ppi;
++
++ rndis_pkt = &msg->msg.pkt;
++ rndis_pkt->data_offset += ppi_size;
++
++ ppi = (struct rndis_per_packet_info *)((void *)rndis_pkt +
++ rndis_pkt->per_pkt_info_offset + rndis_pkt->per_pkt_info_len);
++
++ ppi->size = ppi_size;
++ ppi->type = pkt_type;
++ ppi->ppi_offset = sizeof(struct rndis_per_packet_info);
++
++ rndis_pkt->per_pkt_info_len += ppi_size;
++
++ return ppi;
++}
++
+ static void netvsc_xmit_completion(void *context)
+ {
+ struct hv_netvsc_packet *packet = (struct hv_netvsc_packet *)context;
+@@ -174,8 +195,8 @@ static u32 fill_pg_buf(struct page *page, u32 offset, u32 len,
+ return j + 1;
+ }
+
+-static void init_page_array(void *hdr, u32 len, struct sk_buff *skb,
+- struct hv_page_buffer *pb)
++static u32 init_page_array(void *hdr, u32 len, struct sk_buff *skb,
++ struct hv_page_buffer *pb)
+ {
+ u32 slots_used = 0;
+ char *data = skb->data;
+@@ -203,6 +224,7 @@ static void init_page_array(void *hdr, u32 len, struct sk_buff *skb,
+ frag->page_offset,
+ skb_frag_size(frag), &pb[slots_used]);
+ }
++ return slots_used;
+ }
+
+ static int count_skb_frag_slots(struct sk_buff *skb)
+@@ -240,15 +262,20 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
+ struct net_device_context *net_device_ctx = netdev_priv(net);
+ struct hv_netvsc_packet *packet;
+ int ret;
+- unsigned int num_data_pages;
+ u32 skb_length = skb->len;
++ unsigned int num_data_pgs;
++ struct rndis_message *rndis_msg;
++ struct rndis_packet *rndis_pkt;
++ u32 rndis_msg_size;
++ bool isvlan;
++ struct rndis_per_packet_info *ppi;
+
+ /* We will atmost need two pages to describe the rndis
+ * header. We can only transmit MAX_PAGE_BUFFER_COUNT number
+ * of pages in a single packet.
+ */
+- num_data_pages = netvsc_get_slots(skb) + 2;
+- if (num_data_pages > MAX_PAGE_BUFFER_COUNT) {
++ num_data_pgs = netvsc_get_slots(skb) + 2;
++ if (num_data_pgs > MAX_PAGE_BUFFER_COUNT) {
+ netdev_err(net, "Packet too big: %u\n", skb->len);
+ dev_kfree_skb(skb);
+ net->stats.tx_dropped++;
+@@ -257,7 +284,7 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
+
+ /* Allocate a netvsc packet based on # of frags. */
+ packet = kzalloc(sizeof(struct hv_netvsc_packet) +
+- (num_data_pages * sizeof(struct hv_page_buffer)) +
++ (num_data_pgs * sizeof(struct hv_page_buffer)) +
+ sizeof(struct rndis_message) +
+ NDIS_VLAN_PPI_SIZE, GFP_ATOMIC);
+ if (!packet) {
+@@ -271,26 +298,51 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
+
+ packet->vlan_tci = skb->vlan_tci;
+
+- packet->extension = (void *)(unsigned long)packet +
+- sizeof(struct hv_netvsc_packet) +
+- (num_data_pages * sizeof(struct hv_page_buffer));
+-
+- /* If the rndis msg goes beyond 1 page, we will add 1 later */
+- packet->page_buf_cnt = num_data_pages - 1;
+-
+- /* Initialize it from the skb */
++ packet->is_data_pkt = true;
+ packet->total_data_buflen = skb->len;
+
+- /* Start filling in the page buffers starting after RNDIS buffer. */
+- init_page_array(NULL, 0, skb, &packet->page_buf[1]);
++ packet->rndis_msg = (struct rndis_message *)((unsigned long)packet +
++ sizeof(struct hv_netvsc_packet) +
++ (num_data_pgs * sizeof(struct hv_page_buffer)));
+
+ /* Set the completion routine */
+ packet->completion.send.send_completion = netvsc_xmit_completion;
+ packet->completion.send.send_completion_ctx = packet;
+ packet->completion.send.send_completion_tid = (unsigned long)skb;
+
+- ret = rndis_filter_send(net_device_ctx->device_ctx,
+- packet);
++ isvlan = packet->vlan_tci & VLAN_TAG_PRESENT;
++
++ /* Add the rndis header */
++ rndis_msg = packet->rndis_msg;
++ rndis_msg->ndis_msg_type = RNDIS_MSG_PACKET;
++ rndis_msg->msg_len = packet->total_data_buflen;
++ rndis_pkt = &rndis_msg->msg.pkt;
++ rndis_pkt->data_offset = sizeof(struct rndis_packet);
++ rndis_pkt->data_len = packet->total_data_buflen;
++ rndis_pkt->per_pkt_info_offset = sizeof(struct rndis_packet);
++
++ rndis_msg_size = RNDIS_MESSAGE_SIZE(struct rndis_packet);
++
++ if (isvlan) {
++ struct ndis_pkt_8021q_info *vlan;
++
++ rndis_msg_size += NDIS_VLAN_PPI_SIZE;
++ ppi = init_ppi_data(rndis_msg, NDIS_VLAN_PPI_SIZE,
++ IEEE_8021Q_INFO);
++ vlan = (struct ndis_pkt_8021q_info *)((void *)ppi +
++ ppi->ppi_offset);
++ vlan->vlanid = packet->vlan_tci & VLAN_VID_MASK;
++ vlan->pri = (packet->vlan_tci & VLAN_PRIO_MASK) >>
++ VLAN_PRIO_SHIFT;
++ }
++
++ /* Start filling in the page buffers with the rndis hdr */
++ rndis_msg->msg_len += rndis_msg_size;
++ packet->page_buf_cnt = init_page_array(rndis_msg, rndis_msg_size,
++ skb, &packet->page_buf[0]);
++
++ ret = netvsc_send(net_device_ctx->device_ctx, packet);
++
+ if (ret == 0) {
+ net->stats.tx_bytes += skb_length;
+ net->stats.tx_packets++;
+diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
+index 6a9f6021f09c..dcbf144ea7da 100644
+--- a/drivers/net/hyperv/rndis_filter.c
++++ b/drivers/net/hyperv/rndis_filter.c
+@@ -910,69 +910,3 @@ int rndis_filter_close(struct hv_device *dev)
+
+ return rndis_filter_close_device(nvdev->extension);
+ }
+-
+-int rndis_filter_send(struct hv_device *dev,
+- struct hv_netvsc_packet *pkt)
+-{
+- struct rndis_message *rndis_msg;
+- struct rndis_packet *rndis_pkt;
+- u32 rndis_msg_size;
+- bool isvlan = pkt->vlan_tci & VLAN_TAG_PRESENT;
+-
+- /* Add the rndis header */
+- rndis_msg = (struct rndis_message *)pkt->extension;
+-
+- rndis_msg_size = RNDIS_MESSAGE_SIZE(struct rndis_packet);
+- if (isvlan)
+- rndis_msg_size += NDIS_VLAN_PPI_SIZE;
+-
+- rndis_msg->ndis_msg_type = RNDIS_MSG_PACKET;
+- rndis_msg->msg_len = pkt->total_data_buflen +
+- rndis_msg_size;
+-
+- rndis_pkt = &rndis_msg->msg.pkt;
+- rndis_pkt->data_offset = sizeof(struct rndis_packet);
+- if (isvlan)
+- rndis_pkt->data_offset += NDIS_VLAN_PPI_SIZE;
+- rndis_pkt->data_len = pkt->total_data_buflen;
+-
+- if (isvlan) {
+- struct rndis_per_packet_info *ppi;
+- struct ndis_pkt_8021q_info *vlan;
+-
+- rndis_pkt->per_pkt_info_offset = sizeof(struct rndis_packet);
+- rndis_pkt->per_pkt_info_len = NDIS_VLAN_PPI_SIZE;
+-
+- ppi = (struct rndis_per_packet_info *)((ulong)rndis_pkt +
+- rndis_pkt->per_pkt_info_offset);
+- ppi->size = NDIS_VLAN_PPI_SIZE;
+- ppi->type = IEEE_8021Q_INFO;
+- ppi->ppi_offset = sizeof(struct rndis_per_packet_info);
+-
+- vlan = (struct ndis_pkt_8021q_info *)((ulong)ppi +
+- ppi->ppi_offset);
+- vlan->vlanid = pkt->vlan_tci & VLAN_VID_MASK;
+- vlan->pri = (pkt->vlan_tci & VLAN_PRIO_MASK) >> VLAN_PRIO_SHIFT;
+- }
+-
+- pkt->is_data_pkt = true;
+- pkt->page_buf[0].pfn = virt_to_phys(rndis_msg) >> PAGE_SHIFT;
+- pkt->page_buf[0].offset =
+- (unsigned long)rndis_msg & (PAGE_SIZE-1);
+- pkt->page_buf[0].len = rndis_msg_size;
+-
+- /* Add one page_buf if the rndis msg goes beyond page boundary */
+- if (pkt->page_buf[0].offset + rndis_msg_size > PAGE_SIZE) {
+- int i;
+- for (i = pkt->page_buf_cnt; i > 1; i--)
+- pkt->page_buf[i] = pkt->page_buf[i-1];
+- pkt->page_buf_cnt++;
+- pkt->page_buf[0].len = PAGE_SIZE - pkt->page_buf[0].offset;
+- pkt->page_buf[1].pfn = virt_to_phys((void *)((ulong)
+- rndis_msg + pkt->page_buf[0].len)) >> PAGE_SHIFT;
+- pkt->page_buf[1].offset = 0;
+- pkt->page_buf[1].len = rndis_msg_size - pkt->page_buf[0].len;
+- }
+-
+- return netvsc_send(dev, pkt);
+-}
+--
+2.4.3
+
diff --git a/src/patches/linux/0006-net-get-rid-of-SET_ETHTOOL_OPS.patch b/src/patches/linux/0006-net-get-rid-of-SET_ETHTOOL_OPS.patch
new file mode 100644
index 0000000..e4a7a46
--- /dev/null
+++ b/src/patches/linux/0006-net-get-rid-of-SET_ETHTOOL_OPS.patch
@@ -0,0 +1,44 @@
+From 7ad24ea4bf620a32631d7b3069c3e30c078b0c3e Mon Sep 17 00:00:00 2001
+From: Wilfried Klaebe <w-lkml(a)lebenslange-mailadresse.de>
+Date: Sun, 11 May 2014 00:12:32 +0000
+Subject: [PATCH 06/11] net: get rid of SET_ETHTOOL_OPS
+
+net: get rid of SET_ETHTOOL_OPS
+
+Dave Miller mentioned he'd like to see SET_ETHTOOL_OPS gone.
+This does that.
+
+Mostly done via coccinelle script:
+@@
+struct ethtool_ops *ops;
+struct net_device *dev;
+@@
+- SET_ETHTOOL_OPS(dev, ops);
++ dev->ethtool_ops = ops;
+
+Compile tested only, but I'd seriously wonder if this broke anything.
+
+Suggested-by: Dave Miller <davem(a)davemloft.net>
+Signed-off-by: Wilfried Klaebe <w-lkml(a)lebenslange-mailadresse.de>
+Acked-by: Felipe Balbi <balbi(a)ti.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+---
+ drivers/net/hyperv/netvsc_drv.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
+index 1de3ef5dd5d2..2e967a7bdb33 100644
+--- a/drivers/net/hyperv/netvsc_drv.c
++++ b/drivers/net/hyperv/netvsc_drv.c
+@@ -810,7 +810,7 @@ static int netvsc_probe(struct hv_device *dev,
+ net->features = NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_SG | NETIF_F_RXCSUM |
+ NETIF_F_IP_CSUM | NETIF_F_TSO;
+
+- SET_ETHTOOL_OPS(net, ðtool_ops);
++ net->ethtool_ops = ðtool_ops;
+ SET_NETDEV_DEV(net, &dev->device);
+
+ /* Notify the netvsc driver of the new device */
+--
+2.4.3
+
diff --git a/src/patches/linux/0007-Drivers-net-hyperv-Enable-offloads-on-the-host.patch b/src/patches/linux/0007-Drivers-net-hyperv-Enable-offloads-on-the-host.patch
new file mode 100644
index 0000000..a109f04
--- /dev/null
+++ b/src/patches/linux/0007-Drivers-net-hyperv-Enable-offloads-on-the-host.patch
@@ -0,0 +1,196 @@
+From 6b15b5f37e976a5f3840c7ea59560e10c6251250 Mon Sep 17 00:00:00 2001
+From: KY Srinivasan <kys(a)microsoft.com>
+Date: Sat, 8 Mar 2014 19:23:15 -0800
+Subject: [PATCH 07/25] Drivers: net: hyperv: Enable offloads on the host
+
+Prior to enabling guest side offloads, enable the offloads on the host.
+
+Signed-off-by: K. Y. Srinivasan <kys(a)microsoft.com>
+Reviewed-by: Haiyang Zhang <haiyangz(a)microsoft.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+---
+ drivers/net/hyperv/hyperv_net.h | 55 +++++++++++++++++++++++++++
+ drivers/net/hyperv/rndis_filter.c | 80 +++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 135 insertions(+)
+
+diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
+index 694bf7cada90..8bc4e766589b 100644
+--- a/drivers/net/hyperv/hyperv_net.h
++++ b/drivers/net/hyperv/hyperv_net.h
+@@ -721,6 +721,61 @@ struct ndis_pkt_8021q_info {
+ };
+ };
+
++struct ndis_oject_header {
++ u8 type;
++ u8 revision;
++ u16 size;
++};
++
++#define NDIS_OBJECT_TYPE_DEFAULT 0x80
++#define NDIS_OFFLOAD_PARAMETERS_REVISION_3 3
++#define NDIS_OFFLOAD_PARAMETERS_NO_CHANGE 0
++#define NDIS_OFFLOAD_PARAMETERS_LSOV2_DISABLED 1
++#define NDIS_OFFLOAD_PARAMETERS_LSOV2_ENABLED 2
++#define NDIS_OFFLOAD_PARAMETERS_LSOV1_ENABLED 2
++#define NDIS_OFFLOAD_PARAMETERS_RSC_DISABLED 1
++#define NDIS_OFFLOAD_PARAMETERS_RSC_ENABLED 2
++#define NDIS_OFFLOAD_PARAMETERS_TX_RX_DISABLED 1
++#define NDIS_OFFLOAD_PARAMETERS_TX_ENABLED_RX_DISABLED 2
++#define NDIS_OFFLOAD_PARAMETERS_RX_ENABLED_TX_DISABLED 3
++#define NDIS_OFFLOAD_PARAMETERS_TX_RX_ENABLED 4
++
++/*
++ * New offload OIDs for NDIS 6
++ */
++#define OID_TCP_OFFLOAD_CURRENT_CONFIG 0xFC01020B /* query only */
++#define OID_TCP_OFFLOAD_PARAMETERS 0xFC01020C /* set only */
++#define OID_TCP_OFFLOAD_HARDWARE_CAPABILITIES 0xFC01020D/* query only */
++#define OID_TCP_CONNECTION_OFFLOAD_CURRENT_CONFIG 0xFC01020E /* query only */
++#define OID_TCP_CONNECTION_OFFLOAD_HARDWARE_CAPABILITIES 0xFC01020F /* query */
++#define OID_OFFLOAD_ENCAPSULATION 0x0101010A /* set/query */
++
++struct ndis_offload_params {
++ struct ndis_oject_header header;
++ u8 ip_v4_csum;
++ u8 tcp_ip_v4_csum;
++ u8 udp_ip_v4_csum;
++ u8 tcp_ip_v6_csum;
++ u8 udp_ip_v6_csum;
++ u8 lso_v1;
++ u8 ip_sec_v1;
++ u8 lso_v2_ipv4;
++ u8 lso_v2_ipv6;
++ u8 tcp_connection_ip_v4;
++ u8 tcp_connection_ip_v6;
++ u32 flags;
++ u8 ip_sec_v2;
++ u8 ip_sec_v2_ip_v4;
++ struct {
++ u8 rsc_ip_v4;
++ u8 rsc_ip_v6;
++ };
++ struct {
++ u8 encapsulated_packet_task_offload;
++ u8 encapsulation_types;
++ };
++};
++
+ #define NDIS_VLAN_PPI_SIZE (sizeof(struct rndis_per_packet_info) + \
+ sizeof(struct ndis_pkt_8021q_info))
+
+diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
+index dcbf144ea7da..9b02f21097a7 100644
+--- a/drivers/net/hyperv/rndis_filter.c
++++ b/drivers/net/hyperv/rndis_filter.c
+@@ -627,6 +627,61 @@ cleanup:
+ return ret;
+ }
+
++int rndis_filter_set_offload_params(struct hv_device *hdev,
++ struct ndis_offload_params *req_offloads)
++{
++ struct netvsc_device *nvdev = hv_get_drvdata(hdev);
++ struct rndis_device *rdev = nvdev->extension;
++ struct net_device *ndev = nvdev->ndev;
++ struct rndis_request *request;
++ struct rndis_set_request *set;
++ struct ndis_offload_params *offload_params;
++ struct rndis_set_complete *set_complete;
++ u32 extlen = sizeof(struct ndis_offload_params);
++ int ret, t;
++
++ request = get_rndis_request(rdev, RNDIS_MSG_SET,
++ RNDIS_MESSAGE_SIZE(struct rndis_set_request) + extlen);
++ if (!request)
++ return -ENOMEM;
++
++ set = &request->request_msg.msg.set_req;
++ set->oid = OID_TCP_OFFLOAD_PARAMETERS;
++ set->info_buflen = extlen;
++ set->info_buf_offset = sizeof(struct rndis_set_request);
++ set->dev_vc_handle = 0;
++
++ offload_params = (struct ndis_offload_params *)((ulong)set +
++ set->info_buf_offset);
++ *offload_params = *req_offloads;
++ offload_params->header.type = NDIS_OBJECT_TYPE_DEFAULT;
++ offload_params->header.revision = NDIS_OFFLOAD_PARAMETERS_REVISION_3;
++ offload_params->header.size = extlen;
++
++ ret = rndis_filter_send_request(rdev, request);
++ if (ret != 0)
++ goto cleanup;
++
++ t = wait_for_completion_timeout(&request->wait_event, 5*HZ);
++ if (t == 0) {
++ netdev_err(ndev, "timeout before we got aOFFLOAD set response...\n");
++ /* can't put_rndis_request, since we may still receive a
++ * send-completion.
++ */
++ return -EBUSY;
++ } else {
++ set_complete = &request->response_msg.msg.set_complete;
++ if (set_complete->status != RNDIS_STATUS_SUCCESS) {
++ netdev_err(ndev, "Fail to set MAC on host side:0x%x\n",
++ set_complete->status);
++ ret = -EINVAL;
++ }
++ }
++
++cleanup:
++ put_rndis_request(rdev, request);
++ return ret;
++}
+
+ static int rndis_filter_query_device_link_status(struct rndis_device *dev)
+ {
+@@ -826,6 +881,7 @@ int rndis_filter_device_add(struct hv_device *dev,
+ struct netvsc_device *net_device;
+ struct rndis_device *rndis_device;
+ struct netvsc_device_info *device_info = additional_info;
++ struct ndis_offload_params offloads;
+
+ rndis_device = get_rndis_device();
+ if (!rndis_device)
+@@ -865,6 +921,26 @@ int rndis_filter_device_add(struct hv_device *dev,
+
+ memcpy(device_info->mac_adr, rndis_device->hw_mac_adr, ETH_ALEN);
+
++ /* Turn on the offloads; the host supports all of the relevant
++ * offloads.
++ */
++ memset(&offloads, 0, sizeof(struct ndis_offload_params));
++ /* A value of zero means "no change"; now turn on what we
++ * want.
++ */
++ offloads.ip_v4_csum = NDIS_OFFLOAD_PARAMETERS_TX_RX_ENABLED;
++ offloads.tcp_ip_v4_csum = NDIS_OFFLOAD_PARAMETERS_TX_RX_ENABLED;
++ offloads.udp_ip_v4_csum = NDIS_OFFLOAD_PARAMETERS_TX_RX_ENABLED;
++ offloads.tcp_ip_v6_csum = NDIS_OFFLOAD_PARAMETERS_TX_RX_ENABLED;
++ offloads.udp_ip_v6_csum = NDIS_OFFLOAD_PARAMETERS_TX_RX_ENABLED;
++ offloads.lso_v2_ipv4 = NDIS_OFFLOAD_PARAMETERS_LSOV2_ENABLED;
++
++
++ ret = rndis_filter_set_offload_params(dev, &offloads);
++ if (ret)
++ goto err_dev_remv;
++
++
+ rndis_filter_query_device_link_status(rndis_device);
+
+ device_info->link_state = rndis_device->link_state;
+@@ -874,6 +950,10 @@ int rndis_filter_device_add(struct hv_device *dev,
+ device_info->link_state ? "down" : "up");
+
+ return ret;
++
++err_dev_remv:
++ rndis_filter_device_remove(dev);
++ return ret;
+ }
+
+ void rndis_filter_device_remove(struct hv_device *dev)
+--
+2.4.3
+
diff --git a/src/patches/linux/0007-hyperv-Add-hash-value-into-RNDIS-Per-packet-info.patch b/src/patches/linux/0007-hyperv-Add-hash-value-into-RNDIS-Per-packet-info.patch
new file mode 100644
index 0000000..0db5f72
--- /dev/null
+++ b/src/patches/linux/0007-hyperv-Add-hash-value-into-RNDIS-Per-packet-info.patch
@@ -0,0 +1,93 @@
+From 307f099520b66504cf6c5638f3f404c48b9fb45b Mon Sep 17 00:00:00 2001
+From: Haiyang Zhang <haiyangz(a)microsoft.com>
+Date: Wed, 21 May 2014 12:55:39 -0700
+Subject: [PATCH 07/11] hyperv: Add hash value into RNDIS Per-packet info
+
+It passes the hash value as the RNDIS Per-packet info to the Hyper-V host,
+so that the send completion notices can be spread across multiple channels.
+MS-TFS: 140273
+
+Signed-off-by: Haiyang Zhang <haiyangz(a)microsoft.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+---
+ drivers/net/hyperv/hyperv_net.h | 4 ++++
+ drivers/net/hyperv/netvsc_drv.c | 18 ++++++++++++++----
+ 2 files changed, 18 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
+index 4b7df5a5c966..6cc37c15e0bf 100644
+--- a/drivers/net/hyperv/hyperv_net.h
++++ b/drivers/net/hyperv/hyperv_net.h
+@@ -791,6 +791,7 @@ enum ndis_per_pkt_info_type {
+ IEEE_8021Q_INFO,
+ ORIGINAL_PKTINFO,
+ PACKET_CANCEL_ID,
++ NBL_HASH_VALUE = PACKET_CANCEL_ID,
+ ORIGINAL_NET_BUFLIST,
+ CACHED_NET_BUFLIST,
+ SHORT_PKT_PADINFO,
+@@ -937,6 +938,9 @@ struct ndis_tcp_lso_info {
+ #define NDIS_LSO_PPI_SIZE (sizeof(struct rndis_per_packet_info) + \
+ sizeof(struct ndis_tcp_lso_info))
+
++#define NDIS_HASH_PPI_SIZE (sizeof(struct rndis_per_packet_info) + \
++ sizeof(u32))
++
+ /* Format of Information buffer passed in a SetRequest for the OID */
+ /* OID_GEN_RNDIS_CONFIG_PARAMETER. */
+ struct rndis_config_parameter_info {
+diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
+index 2e967a7bdb33..4fd71b75e666 100644
+--- a/drivers/net/hyperv/netvsc_drv.c
++++ b/drivers/net/hyperv/netvsc_drv.c
+@@ -224,9 +224,11 @@ static u16 netvsc_select_queue(struct net_device *ndev, struct sk_buff *skb,
+ if (nvsc_dev == NULL || ndev->real_num_tx_queues <= 1)
+ return 0;
+
+- if (netvsc_set_hash(&hash, skb))
++ if (netvsc_set_hash(&hash, skb)) {
+ q_idx = nvsc_dev->send_table[hash % VRSS_SEND_TAB_SIZE] %
+ ndev->real_num_tx_queues;
++ skb_set_hash(skb, hash, PKT_HASH_TYPE_L3);
++ }
+
+ return q_idx;
+ }
+@@ -384,6 +386,7 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
+ struct ndis_tcp_lso_info *lso_info;
+ int hdr_offset;
+ u32 net_trans_info;
++ u32 hash;
+
+
+ /* We will atmost need two pages to describe the rndis
+@@ -402,9 +405,8 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
+ packet = kzalloc(sizeof(struct hv_netvsc_packet) +
+ (num_data_pgs * sizeof(struct hv_page_buffer)) +
+ sizeof(struct rndis_message) +
+- NDIS_VLAN_PPI_SIZE +
+- NDIS_CSUM_PPI_SIZE +
+- NDIS_LSO_PPI_SIZE, GFP_ATOMIC);
++ NDIS_VLAN_PPI_SIZE + NDIS_CSUM_PPI_SIZE +
++ NDIS_LSO_PPI_SIZE + NDIS_HASH_PPI_SIZE, GFP_ATOMIC);
+ if (!packet) {
+ /* out of memory, drop packet */
+ netdev_err(net, "unable to allocate hv_netvsc_packet\n");
+@@ -443,6 +445,14 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
+
+ rndis_msg_size = RNDIS_MESSAGE_SIZE(struct rndis_packet);
+
++ hash = skb_get_hash_raw(skb);
++ if (hash != 0 && net->real_num_tx_queues > 1) {
++ rndis_msg_size += NDIS_HASH_PPI_SIZE;
++ ppi = init_ppi_data(rndis_msg, NDIS_HASH_PPI_SIZE,
++ NBL_HASH_VALUE);
++ *(u32 *)((void *)ppi + ppi->ppi_offset) = hash;
++ }
++
+ if (isvlan) {
+ struct ndis_pkt_8021q_info *vlan;
+
+--
+2.4.3
+
diff --git a/src/patches/linux/0008-Drivers-net-hyperv-Enable-receive-side-IP-checksum-o.patch b/src/patches/linux/0008-Drivers-net-hyperv-Enable-receive-side-IP-checksum-o.patch
new file mode 100644
index 0000000..e77e9f2
--- /dev/null
+++ b/src/patches/linux/0008-Drivers-net-hyperv-Enable-receive-side-IP-checksum-o.patch
@@ -0,0 +1,147 @@
+From 59e0c70c618668522a9431686f7e3a69ef396dff Mon Sep 17 00:00:00 2001
+From: KY Srinivasan <kys(a)microsoft.com>
+Date: Sat, 8 Mar 2014 19:23:16 -0800
+Subject: [PATCH 08/25] Drivers: net: hyperv: Enable receive side IP checksum
+ offload
+
+Enable receive side checksum offload.
+
+Signed-off-by: K. Y. Srinivasan <kys(a)microsoft.com>
+Reviewed-by: Haiyang Zhang <haiyangz(a)microsoft.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+---
+ drivers/net/hyperv/hyperv_net.h | 33 ++++++++++++++++++++++++++++++++-
+ drivers/net/hyperv/netvsc_drv.c | 19 +++++++++++++++----
+ drivers/net/hyperv/rndis_filter.c | 4 +++-
+ 3 files changed, 50 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
+index 8bc4e766589b..faeb74623fbd 100644
+--- a/drivers/net/hyperv/hyperv_net.h
++++ b/drivers/net/hyperv/hyperv_net.h
+@@ -30,6 +30,7 @@
+
+ /* Fwd declaration */
+ struct hv_netvsc_packet;
++struct ndis_tcp_ip_checksum_info;
+
+ /* Represent the xfer page packet which contains 1 or more netvsc packet */
+ struct xferpage_packet {
+@@ -117,7 +118,8 @@ int netvsc_send(struct hv_device *device,
+ void netvsc_linkstatus_callback(struct hv_device *device_obj,
+ unsigned int status);
+ int netvsc_recv_callback(struct hv_device *device_obj,
+- struct hv_netvsc_packet *packet);
++ struct hv_netvsc_packet *packet,
++ struct ndis_tcp_ip_checksum_info *csum_info);
+ int rndis_filter_open(struct hv_device *dev);
+ int rndis_filter_close(struct hv_device *dev);
+ int rndis_filter_device_add(struct hv_device *dev,
+@@ -776,9 +778,38 @@ struct ndis_offload_params {
+ };
+ };
+
++struct ndis_tcp_ip_checksum_info {
++ union {
++ struct {
++ u32 is_ipv4:1;
++ u32 is_ipv6:1;
++ u32 tcp_checksum:1;
++ u32 udp_checksum:1;
++ u32 ip_header_checksum:1;
++ u32 reserved:11;
++ u32 tcp_header_offset:10;
++ } transmit;
++ struct {
++ u32 tcp_checksum_failed:1;
++ u32 udp_checksum_failed:1;
++ u32 ip_checksum_failed:1;
++ u32 tcp_checksum_succeeded:1;
++ u32 udp_checksum_succeeded:1;
++ u32 ip_checksum_succeeded:1;
++ u32 loopback:1;
++ u32 tcp_checksum_value_invalid:1;
++ u32 ip_checksum_value_invalid:1;
++ } receive;
++ u32 value;
++ };
++};
++
+ #define NDIS_VLAN_PPI_SIZE (sizeof(struct rndis_per_packet_info) + \
+ sizeof(struct ndis_pkt_8021q_info))
+
++#define NDIS_CSUM_PPI_SIZE (sizeof(struct rndis_per_packet_info) + \
++ sizeof(struct ndis_tcp_ip_checksum_info))
++
+ /* Format of Information buffer passed in a SetRequest for the OID */
+ /* OID_GEN_RNDIS_CONFIG_PARAMETER. */
+ struct rndis_config_parameter_info {
+diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
+index 87293a15e470..7438360b7a02 100644
+--- a/drivers/net/hyperv/netvsc_drv.c
++++ b/drivers/net/hyperv/netvsc_drv.c
+@@ -392,7 +392,8 @@ void netvsc_linkstatus_callback(struct hv_device *device_obj,
+ * "wire" on the specified device.
+ */
+ int netvsc_recv_callback(struct hv_device *device_obj,
+- struct hv_netvsc_packet *packet)
++ struct hv_netvsc_packet *packet,
++ struct ndis_tcp_ip_checksum_info *csum_info)
+ {
+ struct net_device *net;
+ struct sk_buff *skb;
+@@ -419,7 +420,17 @@ int netvsc_recv_callback(struct hv_device *device_obj,
+ packet->total_data_buflen);
+
+ skb->protocol = eth_type_trans(skb, net);
+- skb->ip_summed = CHECKSUM_NONE;
++ if (csum_info) {
++ /* We only look at the IP checksum here.
++ * Should we be dropping the packet if checksum
++ * failed? How do we deal with other checksums - TCP/UDP?
++ */
++ if (csum_info->receive.ip_checksum_succeeded)
++ skb->ip_summed = CHECKSUM_UNNECESSARY;
++ else
++ skb->ip_summed = CHECKSUM_NONE;
++ }
++
+ if (packet->vlan_tci & VLAN_TAG_PRESENT)
+ __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),
+ packet->vlan_tci);
+@@ -581,8 +592,8 @@ static int netvsc_probe(struct hv_device *dev,
+ net->netdev_ops = &device_ops;
+
+ /* TODO: Add GSO and Checksum offload */
+- net->hw_features = NETIF_F_SG;
+- net->features = NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_SG;
++ net->hw_features = NETIF_F_RXCSUM | NETIF_F_SG;
++ net->features = NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_SG | NETIF_F_RXCSUM;
+
+ SET_ETHTOOL_OPS(net, ðtool_ops);
+ SET_NETDEV_DEV(net, &dev->device);
+diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
+index 9b02f21097a7..4a37e3db9e32 100644
+--- a/drivers/net/hyperv/rndis_filter.c
++++ b/drivers/net/hyperv/rndis_filter.c
+@@ -370,6 +370,7 @@ static void rndis_filter_receive_data(struct rndis_device *dev,
+ struct rndis_packet *rndis_pkt;
+ u32 data_offset;
+ struct ndis_pkt_8021q_info *vlan;
++ struct ndis_tcp_ip_checksum_info *csum_info;
+
+ rndis_pkt = &msg->msg.pkt;
+
+@@ -408,7 +409,8 @@ static void rndis_filter_receive_data(struct rndis_device *dev,
+ pkt->vlan_tci = 0;
+ }
+
+- netvsc_recv_callback(dev->net_dev->dev, pkt);
++ csum_info = rndis_get_ppi(rndis_pkt, TCPIP_CHKSUM_PKTINFO);
++ netvsc_recv_callback(dev->net_dev->dev, pkt, csum_info);
+ }
+
+ int rndis_filter_receive(struct hv_device *dev,
+--
+2.4.3
+
diff --git a/src/patches/linux/0008-hyperv-fix-apparent-cut-n-paste-error-in-send-path-t.patch b/src/patches/linux/0008-hyperv-fix-apparent-cut-n-paste-error-in-send-path-t.patch
new file mode 100644
index 0000000..b774f81
--- /dev/null
+++ b/src/patches/linux/0008-hyperv-fix-apparent-cut-n-paste-error-in-send-path-t.patch
@@ -0,0 +1,32 @@
+From 2f18423d7ebf8044a9edaca840be5ae199fb32f6 Mon Sep 17 00:00:00 2001
+From: Dave Jones <davej(a)redhat.com>
+Date: Mon, 16 Jun 2014 16:59:02 -0400
+Subject: [PATCH 08/11] hyperv: fix apparent cut-n-paste error in send path
+ teardown
+
+c25aaf814a63: "hyperv: Enable sendbuf mechanism on the send path" added
+some teardown code that looks like it was copied from the recieve path
+above, but missed a variable name replacement.
+
+Signed-off-by: Dave Jones <davej(a)redhat.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+---
+ drivers/net/hyperv/netvsc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
+index c041f63a6d30..4ed38eaecea8 100644
+--- a/drivers/net/hyperv/netvsc.c
++++ b/drivers/net/hyperv/netvsc.c
+@@ -189,7 +189,7 @@ static int netvsc_destroy_buf(struct netvsc_device *net_device)
+ "unable to teardown send buffer's gpadl\n");
+ return ret;
+ }
+- net_device->recv_buf_gpadl_handle = 0;
++ net_device->send_buf_gpadl_handle = 0;
+ }
+ if (net_device->send_buf) {
+ /* Free up the receive buffer */
+--
+2.4.3
+
diff --git a/src/patches/linux/0009-Drivers-net-hyperv-Enable-send-side-checksum-offload.patch b/src/patches/linux/0009-Drivers-net-hyperv-Enable-send-side-checksum-offload.patch
new file mode 100644
index 0000000..db42108
--- /dev/null
+++ b/src/patches/linux/0009-Drivers-net-hyperv-Enable-send-side-checksum-offload.patch
@@ -0,0 +1,140 @@
+From d2a0be7f4263eb669af84240c5424a72cce4cdb4 Mon Sep 17 00:00:00 2001
+From: KY Srinivasan <kys(a)microsoft.com>
+Date: Sat, 8 Mar 2014 19:23:17 -0800
+Subject: [PATCH 09/25] Drivers: net: hyperv: Enable send side checksum offload
+
+Enable send side checksum offload.
+
+Signed-off-by: K. Y. Srinivasan <kys(a)microsoft.com>
+Reviewed-by: Haiyang Zhang <haiyangz(a)microsoft.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+---
+ drivers/net/hyperv/hyperv_net.h | 10 ++++++
+ drivers/net/hyperv/netvsc_drv.c | 69 +++++++++++++++++++++++++++++++++++++++--
+ 2 files changed, 77 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
+index faeb74623fbd..4cf238234321 100644
+--- a/drivers/net/hyperv/hyperv_net.h
++++ b/drivers/net/hyperv/hyperv_net.h
+@@ -1035,6 +1035,16 @@ struct rndis_message {
+ #define NDIS_PACKET_TYPE_FUNCTIONAL 0x00000400
+ #define NDIS_PACKET_TYPE_MAC_FRAME 0x00000800
+
++#define INFO_IPV4 2
++#define INFO_IPV6 4
++#define INFO_TCP 2
++#define INFO_UDP 4
++
++#define TRANSPORT_INFO_NOT_IP 0
++#define TRANSPORT_INFO_IPV4_TCP ((INFO_IPV4 << 16) | INFO_TCP)
++#define TRANSPORT_INFO_IPV4_UDP ((INFO_IPV4 << 16) | INFO_UDP)
++#define TRANSPORT_INFO_IPV6_TCP ((INFO_IPV6 << 16) | INFO_TCP)
++#define TRANSPORT_INFO_IPV6_UDP ((INFO_IPV6 << 16) | INFO_UDP)
+
+
+ #endif /* _HYPERV_NET_H */
+diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
+index 7438360b7a02..2fab69ac61ef 100644
+--- a/drivers/net/hyperv/netvsc_drv.c
++++ b/drivers/net/hyperv/netvsc_drv.c
+@@ -257,6 +257,35 @@ static int netvsc_get_slots(struct sk_buff *skb)
+ return slots + frag_slots;
+ }
+
++static u32 get_net_transport_info(struct sk_buff *skb, u32 *trans_off)
++{
++ u32 ret_val = TRANSPORT_INFO_NOT_IP;
++
++ if ((eth_hdr(skb)->h_proto != htons(ETH_P_IP)) &&
++ (eth_hdr(skb)->h_proto != htons(ETH_P_IPV6))) {
++ goto not_ip;
++ }
++
++ *trans_off = skb_transport_offset(skb);
++
++ if ((eth_hdr(skb)->h_proto == htons(ETH_P_IP))) {
++ struct iphdr *iphdr = ip_hdr(skb);
++
++ if (iphdr->protocol == IPPROTO_TCP)
++ ret_val = TRANSPORT_INFO_IPV4_TCP;
++ else if (iphdr->protocol == IPPROTO_UDP)
++ ret_val = TRANSPORT_INFO_IPV4_UDP;
++ } else {
++ if (ipv6_hdr(skb)->nexthdr == IPPROTO_TCP)
++ ret_val = TRANSPORT_INFO_IPV6_TCP;
++ else if (ipv6_hdr(skb)->nexthdr == IPPROTO_UDP)
++ ret_val = TRANSPORT_INFO_IPV6_UDP;
++ }
++
++not_ip:
++ return ret_val;
++}
++
+ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
+ {
+ struct net_device_context *net_device_ctx = netdev_priv(net);
+@@ -269,6 +298,10 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
+ u32 rndis_msg_size;
+ bool isvlan;
+ struct rndis_per_packet_info *ppi;
++ struct ndis_tcp_ip_checksum_info *csum_info;
++ int hdr_offset;
++ u32 net_trans_info;
++
+
+ /* We will atmost need two pages to describe the rndis
+ * header. We can only transmit MAX_PAGE_BUFFER_COUNT number
+@@ -336,6 +369,37 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
+ VLAN_PRIO_SHIFT;
+ }
+
++ net_trans_info = get_net_transport_info(skb, &hdr_offset);
++ if (net_trans_info == TRANSPORT_INFO_NOT_IP)
++ goto do_send;
++
++ /*
++ * Setup the sendside checksum offload only if this is not a
++ * GSO packet.
++ */
++ if (skb_is_gso(skb))
++ goto do_send;
++
++ rndis_msg_size += NDIS_CSUM_PPI_SIZE;
++ ppi = init_ppi_data(rndis_msg, NDIS_CSUM_PPI_SIZE,
++ TCPIP_CHKSUM_PKTINFO);
++
++ csum_info = (struct ndis_tcp_ip_checksum_info *)((void *)ppi +
++ ppi->ppi_offset);
++
++ if (net_trans_info & (INFO_IPV4 << 16))
++ csum_info->transmit.is_ipv4 = 1;
++ else
++ csum_info->transmit.is_ipv6 = 1;
++
++ if (net_trans_info & INFO_TCP) {
++ csum_info->transmit.tcp_checksum = 1;
++ csum_info->transmit.tcp_header_offset = hdr_offset;
++ } else if (net_trans_info & INFO_UDP) {
++ csum_info->transmit.udp_checksum = 1;
++ }
++
++do_send:
+ /* Start filling in the page buffers with the rndis hdr */
+ rndis_msg->msg_len += rndis_msg_size;
+ packet->page_buf_cnt = init_page_array(rndis_msg, rndis_msg_size,
+@@ -592,8 +656,9 @@ static int netvsc_probe(struct hv_device *dev,
+ net->netdev_ops = &device_ops;
+
+ /* TODO: Add GSO and Checksum offload */
+- net->hw_features = NETIF_F_RXCSUM | NETIF_F_SG;
+- net->features = NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_SG | NETIF_F_RXCSUM;
++ net->hw_features = NETIF_F_RXCSUM | NETIF_F_SG | NETIF_F_IP_CSUM;
++ net->features = NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_SG | NETIF_F_RXCSUM |
++ NETIF_F_IP_CSUM;
+
+ SET_ETHTOOL_OPS(net, ðtool_ops);
+ SET_NETDEV_DEV(net, &dev->device);
+--
+2.4.3
+
diff --git a/src/patches/linux/0009-hyperv-Fix-error-return-code-in-netvsc_init_buf.patch b/src/patches/linux/0009-hyperv-Fix-error-return-code-in-netvsc_init_buf.patch
new file mode 100644
index 0000000..fcae531
--- /dev/null
+++ b/src/patches/linux/0009-hyperv-Fix-error-return-code-in-netvsc_init_buf.patch
@@ -0,0 +1,34 @@
+From dd1d3f8f9920926aa426589e542eed6bf58b7354 Mon Sep 17 00:00:00 2001
+From: Wei Yongjun <yongjun_wei(a)trendmicro.com.cn>
+Date: Wed, 23 Jul 2014 09:00:35 +0800
+Subject: [PATCH 09/11] hyperv: Fix error return code in netvsc_init_buf()
+
+Fix to return -ENOMEM from the kalloc error handling
+case instead of 0.
+
+Signed-off-by: Wei Yongjun <yongjun_wei(a)trendmicro.com.cn>
+Reviewed-by: Haiyang Zhang <haiyangz(a)microsoft.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+---
+ drivers/net/hyperv/netvsc.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
+index 4ed38eaecea8..d97d5f39a04e 100644
+--- a/drivers/net/hyperv/netvsc.c
++++ b/drivers/net/hyperv/netvsc.c
+@@ -378,8 +378,10 @@ static int netvsc_init_buf(struct hv_device *device)
+
+ net_device->send_section_map =
+ kzalloc(net_device->map_words * sizeof(ulong), GFP_KERNEL);
+- if (net_device->send_section_map == NULL)
++ if (net_device->send_section_map == NULL) {
++ ret = -ENOMEM;
+ goto cleanup;
++ }
+
+ goto exit;
+
+--
+2.4.3
+
diff --git a/src/patches/linux/0010-Drivers-net-hyperv-Enable-large-send-offload.patch b/src/patches/linux/0010-Drivers-net-hyperv-Enable-large-send-offload.patch
new file mode 100644
index 0000000..36be2a8
--- /dev/null
+++ b/src/patches/linux/0010-Drivers-net-hyperv-Enable-large-send-offload.patch
@@ -0,0 +1,153 @@
+From a4ec4f58017b456281ee17c35fb82dfe4eab2193 Mon Sep 17 00:00:00 2001
+From: KY Srinivasan <kys(a)microsoft.com>
+Date: Sat, 8 Mar 2014 19:23:18 -0800
+Subject: [PATCH 10/25] Drivers: net: hyperv: Enable large send offload
+
+Enable segmentation offload.
+
+Signed-off-by: K. Y. Srinivasan <kys(a)microsoft.com>
+Reviewed-by: Haiyang Zhang <haiyangz(a)microsoft.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+---
+ drivers/net/hyperv/hyperv_net.h | 40 ++++++++++++++++++++++++++++++++++++++++
+ drivers/net/hyperv/netvsc_drv.c | 38 ++++++++++++++++++++++++++++++++++----
+ 2 files changed, 74 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
+index 4cf238234321..7d06b4959383 100644
+--- a/drivers/net/hyperv/hyperv_net.h
++++ b/drivers/net/hyperv/hyperv_net.h
+@@ -742,6 +742,10 @@ struct ndis_oject_header {
+ #define NDIS_OFFLOAD_PARAMETERS_RX_ENABLED_TX_DISABLED 3
+ #define NDIS_OFFLOAD_PARAMETERS_TX_RX_ENABLED 4
+
++#define NDIS_TCP_LARGE_SEND_OFFLOAD_V2_TYPE 1
++#define NDIS_TCP_LARGE_SEND_OFFLOAD_IPV4 0
++#define NDIS_TCP_LARGE_SEND_OFFLOAD_IPV6 1
++
+ /*
+ * New offload OIDs for NDIS 6
+ */
+@@ -804,12 +808,48 @@ struct ndis_tcp_ip_checksum_info {
+ };
+ };
+
++struct ndis_tcp_lso_info {
++ union {
++ struct {
++ u32 unused:30;
++ u32 type:1;
++ u32 reserved2:1;
++ } transmit;
++ struct {
++ u32 mss:20;
++ u32 tcp_header_offset:10;
++ u32 type:1;
++ u32 reserved2:1;
++ } lso_v1_transmit;
++ struct {
++ u32 tcp_payload:30;
++ u32 type:1;
++ u32 reserved2:1;
++ } lso_v1_transmit_complete;
++ struct {
++ u32 mss:20;
++ u32 tcp_header_offset:10;
++ u32 type:1;
++ u32 ip_version:1;
++ } lso_v2_transmit;
++ struct {
++ u32 reserved:30;
++ u32 type:1;
++ u32 reserved2:1;
++ } lso_v2_transmit_complete;
++ u32 value;
++ };
++};
++
+ #define NDIS_VLAN_PPI_SIZE (sizeof(struct rndis_per_packet_info) + \
+ sizeof(struct ndis_pkt_8021q_info))
+
+ #define NDIS_CSUM_PPI_SIZE (sizeof(struct rndis_per_packet_info) + \
+ sizeof(struct ndis_tcp_ip_checksum_info))
+
++#define NDIS_LSO_PPI_SIZE (sizeof(struct rndis_per_packet_info) + \
++ sizeof(struct ndis_tcp_lso_info))
++
+ /* Format of Information buffer passed in a SetRequest for the OID */
+ /* OID_GEN_RNDIS_CONFIG_PARAMETER. */
+ struct rndis_config_parameter_info {
+diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
+index 2fab69ac61ef..5baa1fa7e692 100644
+--- a/drivers/net/hyperv/netvsc_drv.c
++++ b/drivers/net/hyperv/netvsc_drv.c
+@@ -299,6 +299,7 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
+ bool isvlan;
+ struct rndis_per_packet_info *ppi;
+ struct ndis_tcp_ip_checksum_info *csum_info;
++ struct ndis_tcp_lso_info *lso_info;
+ int hdr_offset;
+ u32 net_trans_info;
+
+@@ -378,7 +379,7 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
+ * GSO packet.
+ */
+ if (skb_is_gso(skb))
+- goto do_send;
++ goto do_lso;
+
+ rndis_msg_size += NDIS_CSUM_PPI_SIZE;
+ ppi = init_ppi_data(rndis_msg, NDIS_CSUM_PPI_SIZE,
+@@ -398,6 +399,35 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
+ } else if (net_trans_info & INFO_UDP) {
+ csum_info->transmit.udp_checksum = 1;
+ }
++ goto do_send;
++
++do_lso:
++ rndis_msg_size += NDIS_LSO_PPI_SIZE;
++ ppi = init_ppi_data(rndis_msg, NDIS_LSO_PPI_SIZE,
++ TCP_LARGESEND_PKTINFO);
++
++ lso_info = (struct ndis_tcp_lso_info *)((void *)ppi +
++ ppi->ppi_offset);
++
++ lso_info->lso_v2_transmit.type = NDIS_TCP_LARGE_SEND_OFFLOAD_V2_TYPE;
++ if (net_trans_info & (INFO_IPV4 << 16)) {
++ lso_info->lso_v2_transmit.ip_version =
++ NDIS_TCP_LARGE_SEND_OFFLOAD_IPV4;
++ ip_hdr(skb)->tot_len = 0;
++ ip_hdr(skb)->check = 0;
++ tcp_hdr(skb)->check =
++ ~csum_tcpudp_magic(ip_hdr(skb)->saddr,
++ ip_hdr(skb)->daddr, 0, IPPROTO_TCP, 0);
++ } else {
++ lso_info->lso_v2_transmit.ip_version =
++ NDIS_TCP_LARGE_SEND_OFFLOAD_IPV6;
++ ipv6_hdr(skb)->payload_len = 0;
++ tcp_hdr(skb)->check =
++ ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
++ &ipv6_hdr(skb)->daddr, 0, IPPROTO_TCP, 0);
++ }
++ lso_info->lso_v2_transmit.tcp_header_offset = hdr_offset;
++ lso_info->lso_v2_transmit.mss = skb_shinfo(skb)->gso_size;
+
+ do_send:
+ /* Start filling in the page buffers with the rndis hdr */
+@@ -655,10 +685,10 @@ static int netvsc_probe(struct hv_device *dev,
+
+ net->netdev_ops = &device_ops;
+
+- /* TODO: Add GSO and Checksum offload */
+- net->hw_features = NETIF_F_RXCSUM | NETIF_F_SG | NETIF_F_IP_CSUM;
++ net->hw_features = NETIF_F_RXCSUM | NETIF_F_SG | NETIF_F_IP_CSUM |
++ NETIF_F_TSO;
+ net->features = NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_SG | NETIF_F_RXCSUM |
+- NETIF_F_IP_CSUM;
++ NETIF_F_IP_CSUM | NETIF_F_TSO;
+
+ SET_ETHTOOL_OPS(net, ðtool_ops);
+ SET_NETDEV_DEV(net, &dev->device);
+--
+2.4.3
+
diff --git a/src/patches/linux/0010-hyperv-Fix-a-bug-in-netvsc_start_xmit.patch b/src/patches/linux/0010-hyperv-Fix-a-bug-in-netvsc_start_xmit.patch
new file mode 100644
index 0000000..5e08805
--- /dev/null
+++ b/src/patches/linux/0010-hyperv-Fix-a-bug-in-netvsc_start_xmit.patch
@@ -0,0 +1,47 @@
+From b3e774263908a834c1c0d5abf3a7658280e42fc7 Mon Sep 17 00:00:00 2001
+From: KY Srinivasan <kys(a)microsoft.com>
+Date: Sun, 28 Sep 2014 22:16:43 -0700
+Subject: [PATCH 10/11] hyperv: Fix a bug in netvsc_start_xmit()
+
+[ Upstream commit dedb845ded56ded1c62f5398a94ffa8615d4592d ]
+
+After the packet is successfully sent, we should not touch the skb
+as it may have been freed. This patch is based on the work done by
+Long Li <longli(a)microsoft.com>.
+
+In this version of the patch I have fixed issues pointed out by David.
+David, please queue this up for stable.
+
+Signed-off-by: K. Y. Srinivasan <kys(a)microsoft.com>
+Tested-by: Long Li <longli(a)microsoft.com>
+Tested-by: Sitsofe Wheeler <sitsofe(a)yahoo.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
+---
+ drivers/net/hyperv/netvsc_drv.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
+index 4fd71b75e666..f15297201777 100644
+--- a/drivers/net/hyperv/netvsc_drv.c
++++ b/drivers/net/hyperv/netvsc_drv.c
+@@ -387,6 +387,7 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
+ int hdr_offset;
+ u32 net_trans_info;
+ u32 hash;
++ u32 skb_length = skb->len;
+
+
+ /* We will atmost need two pages to describe the rndis
+@@ -562,7 +563,7 @@ do_send:
+
+ drop:
+ if (ret == 0) {
+- net->stats.tx_bytes += skb->len;
++ net->stats.tx_bytes += skb_length;
+ net->stats.tx_packets++;
+ } else {
+ kfree(packet);
+--
+2.4.3
+
diff --git a/src/patches/linux/0011-hyperv-Change-the-receive-buffer-size-for-legacy-hos.patch b/src/patches/linux/0011-hyperv-Change-the-receive-buffer-size-for-legacy-hos.patch
new file mode 100644
index 0000000..e3ee8cb
--- /dev/null
+++ b/src/patches/linux/0011-hyperv-Change-the-receive-buffer-size-for-legacy-hos.patch
@@ -0,0 +1,54 @@
+From 56b3f72d3fed7f9b8d17dcf5d81455fa1b4327d7 Mon Sep 17 00:00:00 2001
+From: Haiyang Zhang <haiyangz(a)microsoft.com>
+Date: Sun, 9 Mar 2014 16:10:59 -0700
+Subject: [PATCH 11/25] hyperv: Change the receive buffer size for legacy hosts
+
+Due to a bug in the Hyper-V host verion 2008R2, we need to use a slightly smaller
+receive buffer size, otherwise the buffer will not be accepted by the legacy hosts.
+
+Signed-off-by: Haiyang Zhang <haiyangz(a)microsoft.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+---
+ drivers/net/hyperv/hyperv_net.h | 1 +
+ drivers/net/hyperv/netvsc.c | 6 +++++-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
+index 7d06b4959383..13010b4dae5b 100644
+--- a/drivers/net/hyperv/hyperv_net.h
++++ b/drivers/net/hyperv/hyperv_net.h
+@@ -513,6 +513,7 @@ struct nvsp_message {
+ #define NETVSC_MTU 65536
+
+ #define NETVSC_RECEIVE_BUFFER_SIZE (1024*1024*16) /* 16MB */
++#define NETVSC_RECEIVE_BUFFER_SIZE_LEGACY (1024*1024*15) /* 15MB */
+
+ #define NETVSC_RECEIVE_BUFFER_ID 0xcafe
+
+diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
+index 1a0280dcba7e..daddea2654ce 100644
+--- a/drivers/net/hyperv/netvsc.c
++++ b/drivers/net/hyperv/netvsc.c
+@@ -365,6 +365,11 @@ static int netvsc_connect_vsp(struct hv_device *device)
+ goto cleanup;
+
+ /* Post the big receive buffer to NetVSP */
++ if (net_device->nvsp_version <= NVSP_PROTOCOL_VERSION_2)
++ net_device->recv_buf_size = NETVSC_RECEIVE_BUFFER_SIZE_LEGACY;
++ else
++ net_device->recv_buf_size = NETVSC_RECEIVE_BUFFER_SIZE;
++
+ ret = netvsc_init_recv_buf(device);
+
+ cleanup:
+@@ -898,7 +903,6 @@ int netvsc_device_add(struct hv_device *device, void *additional_info)
+ ndev = net_device->ndev;
+
+ /* Initialize the NetVSC channel extension */
+- net_device->recv_buf_size = NETVSC_RECEIVE_BUFFER_SIZE;
+ spin_lock_init(&net_device->recv_pkt_list_lock);
+
+ INIT_LIST_HEAD(&net_device->recv_pkt_list);
+--
+2.4.3
+
diff --git a/src/patches/linux/0011-hyperv-Fix-a-bug-in-netvsc_send.patch b/src/patches/linux/0011-hyperv-Fix-a-bug-in-netvsc_send.patch
new file mode 100644
index 0000000..00f9c5d
--- /dev/null
+++ b/src/patches/linux/0011-hyperv-Fix-a-bug-in-netvsc_send.patch
@@ -0,0 +1,68 @@
+From 26875bba869bd91a1d8fef9229a56a1e6d9fef2b Mon Sep 17 00:00:00 2001
+From: KY Srinivasan <kys(a)microsoft.com>
+Date: Sun, 5 Oct 2014 10:42:51 -0700
+Subject: [PATCH 11/11] hyperv: Fix a bug in netvsc_send()
+
+[ Upstream commit 3a67c9ccad926a168d8b7891537a452018368a5b ]
+
+After the packet is successfully sent, we should not touch the packet
+as it may have been freed. This patch is based on the work done by
+Long Li <longli(a)microsoft.com>.
+
+David, please queue this up for stable.
+
+Signed-off-by: K. Y. Srinivasan <kys(a)microsoft.com>
+Reported-by: Sitsofe Wheeler <sitsofe(a)yahoo.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
+---
+ drivers/net/hyperv/netvsc.c | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
+index d97d5f39a04e..7edf976ecfa0 100644
+--- a/drivers/net/hyperv/netvsc.c
++++ b/drivers/net/hyperv/netvsc.c
+@@ -708,6 +708,7 @@ int netvsc_send(struct hv_device *device,
+ unsigned int section_index = NETVSC_INVALID_INDEX;
+ u32 msg_size = 0;
+ struct sk_buff *skb;
++ u16 q_idx = packet->q_idx;
+
+
+ net_device = get_outbound_net_device(device);
+@@ -772,24 +773,24 @@ int netvsc_send(struct hv_device *device,
+
+ if (ret == 0) {
+ atomic_inc(&net_device->num_outstanding_sends);
+- atomic_inc(&net_device->queue_sends[packet->q_idx]);
++ atomic_inc(&net_device->queue_sends[q_idx]);
+
+ if (hv_ringbuf_avail_percent(&out_channel->outbound) <
+ RING_AVAIL_PERCENT_LOWATER) {
+ netif_tx_stop_queue(netdev_get_tx_queue(
+- ndev, packet->q_idx));
++ ndev, q_idx));
+
+ if (atomic_read(&net_device->
+- queue_sends[packet->q_idx]) < 1)
++ queue_sends[q_idx]) < 1)
+ netif_tx_wake_queue(netdev_get_tx_queue(
+- ndev, packet->q_idx));
++ ndev, q_idx));
+ }
+ } else if (ret == -EAGAIN) {
+ netif_tx_stop_queue(netdev_get_tx_queue(
+- ndev, packet->q_idx));
+- if (atomic_read(&net_device->queue_sends[packet->q_idx]) < 1) {
++ ndev, q_idx));
++ if (atomic_read(&net_device->queue_sends[q_idx]) < 1) {
+ netif_tx_wake_queue(netdev_get_tx_queue(
+- ndev, packet->q_idx));
++ ndev, q_idx));
+ ret = -ENOSPC;
+ }
+ } else {
+--
+2.4.3
+
diff --git a/src/patches/linux/0012-Drivers-net-hyperv-Allocate-memory-for-all-possible-.patch b/src/patches/linux/0012-Drivers-net-hyperv-Allocate-memory-for-all-possible-.patch
new file mode 100644
index 0000000..c626bb0
--- /dev/null
+++ b/src/patches/linux/0012-Drivers-net-hyperv-Allocate-memory-for-all-possible-.patch
@@ -0,0 +1,34 @@
+From e0f6906eb7e5b395370da9499189d13b59020382 Mon Sep 17 00:00:00 2001
+From: KY Srinivasan <kys(a)microsoft.com>
+Date: Wed, 9 Apr 2014 15:00:45 -0700
+Subject: [PATCH 12/25] Drivers: net: hyperv: Allocate memory for all possible
+ per-pecket information
+
+An outgoing packet can potentially need per-packet information for
+all the offloads and VLAN tagging. Fix this issue.
+
+Signed-off-by: K. Y. Srinivasan <kys(a)microsoft.com>
+Reviewed-by: Haiyang Zhang <haiyangz(a)microsoft.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+---
+ drivers/net/hyperv/netvsc_drv.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
+index 5baa1fa7e692..c76c85176644 100644
+--- a/drivers/net/hyperv/netvsc_drv.c
++++ b/drivers/net/hyperv/netvsc_drv.c
+@@ -320,7 +320,9 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
+ packet = kzalloc(sizeof(struct hv_netvsc_packet) +
+ (num_data_pgs * sizeof(struct hv_page_buffer)) +
+ sizeof(struct rndis_message) +
+- NDIS_VLAN_PPI_SIZE, GFP_ATOMIC);
++ NDIS_VLAN_PPI_SIZE +
++ NDIS_CSUM_PPI_SIZE +
++ NDIS_LSO_PPI_SIZE, GFP_ATOMIC);
+ if (!packet) {
+ /* out of memory, drop packet */
+ netdev_err(net, "unable to allocate hv_netvsc_packet\n");
+--
+2.4.3
+
diff --git a/src/patches/linux/0013-Drivers-net-hyperv-Negotiate-suitable-ndis-version-f.patch b/src/patches/linux/0013-Drivers-net-hyperv-Negotiate-suitable-ndis-version-f.patch
new file mode 100644
index 0000000..7044c52
--- /dev/null
+++ b/src/patches/linux/0013-Drivers-net-hyperv-Negotiate-suitable-ndis-version-f.patch
@@ -0,0 +1,32 @@
+From 8a7882bada78e7d7355aafc0ca3c5696d25eb443 Mon Sep 17 00:00:00 2001
+From: KY Srinivasan <kys(a)microsoft.com>
+Date: Wed, 9 Apr 2014 15:00:46 -0700
+Subject: [PATCH 13/25] Drivers: net: hyperv: Negotiate suitable ndis version
+ for offload support
+
+Ws2008R2 supports ndis_version 6.1 and 6.1 is the minimal version required
+for various offloads. Negotiate ndis_version 6.1 when on ws2008r2.
+
+Signed-off-by: K. Y. Srinivasan <kys(a)microsoft.com>
+Reviewed-by: Haiyang Zhang <haiyangz(a)microsoft.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+---
+ drivers/net/hyperv/netvsc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
+index daddea2654ce..f7629ecefa84 100644
+--- a/drivers/net/hyperv/netvsc.c
++++ b/drivers/net/hyperv/netvsc.c
+@@ -344,7 +344,7 @@ static int netvsc_connect_vsp(struct hv_device *device)
+ memset(init_packet, 0, sizeof(struct nvsp_message));
+
+ if (net_device->nvsp_version <= NVSP_PROTOCOL_VERSION_4)
+- ndis_version = 0x00050001;
++ ndis_version = 0x00060001;
+ else
+ ndis_version = 0x0006001e;
+
+--
+2.4.3
+
diff --git a/src/patches/linux/0014-Drivers-net-hyperv-Address-UDP-checksum-issues.patch b/src/patches/linux/0014-Drivers-net-hyperv-Address-UDP-checksum-issues.patch
new file mode 100644
index 0000000..eaf343e
--- /dev/null
+++ b/src/patches/linux/0014-Drivers-net-hyperv-Address-UDP-checksum-issues.patch
@@ -0,0 +1,111 @@
+From b822ee7a17efd1bc8c7584da5d0a2c042e9ca5b6 Mon Sep 17 00:00:00 2001
+From: KY Srinivasan <kys(a)microsoft.com>
+Date: Wed, 9 Apr 2014 15:00:47 -0700
+Subject: [PATCH 14/25] Drivers: net: hyperv: Address UDP checksum issues
+
+ws2008r2 does not support UDP checksum offload. Thus, we cannnot turn on
+UDP offload in the host. Also, on ws2012 and ws2012 r2, there appear to be
+an issue with UDP checksum offload.
+Fix this issue by computing the UDP checksum in the Hyper-V driver.
+
+Based on Dave Miller's comments, in this version, I have COWed the skb
+before modifying the UDP header (the checksum field).
+
+Signed-off-by: K. Y. Srinivasan <kys(a)microsoft.com>
+Reviewed-by: Haiyang Zhang <haiyangz(a)microsoft.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+---
+ drivers/net/hyperv/hyperv_net.h | 1 +
+ drivers/net/hyperv/netvsc_drv.c | 26 +++++++++++++++++++++++++-
+ drivers/net/hyperv/rndis_filter.c | 12 +++++++++++-
+ 3 files changed, 37 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
+index 13010b4dae5b..d18f711d0b0c 100644
+--- a/drivers/net/hyperv/hyperv_net.h
++++ b/drivers/net/hyperv/hyperv_net.h
+@@ -747,6 +747,7 @@ struct ndis_oject_header {
+ #define NDIS_TCP_LARGE_SEND_OFFLOAD_IPV4 0
+ #define NDIS_TCP_LARGE_SEND_OFFLOAD_IPV6 1
+
++#define VERSION_4_OFFLOAD_SIZE 22
+ /*
+ * New offload OIDs for NDIS 6
+ */
+diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
+index c76c85176644..0d898876689e 100644
+--- a/drivers/net/hyperv/netvsc_drv.c
++++ b/drivers/net/hyperv/netvsc_drv.c
+@@ -399,7 +399,30 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
+ csum_info->transmit.tcp_checksum = 1;
+ csum_info->transmit.tcp_header_offset = hdr_offset;
+ } else if (net_trans_info & INFO_UDP) {
+- csum_info->transmit.udp_checksum = 1;
++ /* UDP checksum offload is not supported on ws2008r2.
++ * Furthermore, on ws2012 and ws2012r2, there are some
++ * issues with udp checksum offload from Linux guests.
++ * (these are host issues).
++ * For now compute the checksum here.
++ */
++ struct udphdr *uh;
++ u16 udp_len;
++
++ ret = skb_cow_head(skb, 0);
++ if (ret)
++ goto drop;
++
++ uh = udp_hdr(skb);
++ udp_len = ntohs(uh->len);
++ uh->check = 0;
++ uh->check = csum_tcpudp_magic(ip_hdr(skb)->saddr,
++ ip_hdr(skb)->daddr,
++ udp_len, IPPROTO_UDP,
++ csum_partial(uh, udp_len, 0));
++ if (uh->check == 0)
++ uh->check = CSUM_MANGLED_0;
++
++ csum_info->transmit.udp_checksum = 0;
+ }
+ goto do_send;
+
+@@ -439,6 +462,7 @@ do_send:
+
+ ret = netvsc_send(net_device_ctx->device_ctx, packet);
+
++drop:
+ if (ret == 0) {
+ net->stats.tx_bytes += skb_length;
+ net->stats.tx_packets++;
+diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
+index 4a37e3db9e32..143a98caf618 100644
+--- a/drivers/net/hyperv/rndis_filter.c
++++ b/drivers/net/hyperv/rndis_filter.c
+@@ -641,6 +641,16 @@ int rndis_filter_set_offload_params(struct hv_device *hdev,
+ struct rndis_set_complete *set_complete;
+ u32 extlen = sizeof(struct ndis_offload_params);
+ int ret, t;
++ u32 vsp_version = nvdev->nvsp_version;
++
++ if (vsp_version <= NVSP_PROTOCOL_VERSION_4) {
++ extlen = VERSION_4_OFFLOAD_SIZE;
++ /* On NVSP_PROTOCOL_VERSION_4 and below, we do not support
++ * UDP checksum offload.
++ */
++ req_offloads->udp_ip_v4_csum = 0;
++ req_offloads->udp_ip_v6_csum = 0;
++ }
+
+ request = get_rndis_request(rdev, RNDIS_MSG_SET,
+ RNDIS_MESSAGE_SIZE(struct rndis_set_request) + extlen);
+@@ -674,7 +684,7 @@ int rndis_filter_set_offload_params(struct hv_device *hdev,
+ } else {
+ set_complete = &request->response_msg.msg.set_complete;
+ if (set_complete->status != RNDIS_STATUS_SUCCESS) {
+- netdev_err(ndev, "Fail to set MAC on host side:0x%x\n",
++ netdev_err(ndev, "Fail to set offload on host side:0x%x\n",
+ set_complete->status);
+ ret = -EINVAL;
+ }
+--
+2.4.3
+
diff --git a/src/patches/linux/0015-hyperv-Properly-handle-checksum-offload.patch b/src/patches/linux/0015-hyperv-Properly-handle-checksum-offload.patch
new file mode 100644
index 0000000..0760833
--- /dev/null
+++ b/src/patches/linux/0015-hyperv-Properly-handle-checksum-offload.patch
@@ -0,0 +1,42 @@
+From 540360773bad2b81f14c38ca92b62797fa32cbc6 Mon Sep 17 00:00:00 2001
+From: KY Srinivasan <kys(a)microsoft.com>
+Date: Wed, 30 Apr 2014 11:58:25 -0700
+Subject: [PATCH 15/25] hyperv: Properly handle checksum offload
+
+Do checksum offload only if the client of the driver wants checksum to be
+offloaded.
+
+In V1 version of this patch, I addressed comments from
+Stephen Hemminger <stephen(a)networkplumber.org> and
+Eric Dumazet <eric.dumazet(a)gmail.com>.
+
+In this version of the patch I have addressed comments from
+David Miller.
+
+This patch fixes a bug that is exposed in gateway scenarios.
+
+Signed-off-by: K. Y. Srinivasan <kys(a)microsoft.com>
+Reviewed-by: Haiyang Zhang <haiyangz(a)microsoft.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+---
+ drivers/net/hyperv/netvsc_drv.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
+index 0d898876689e..ce6d870dd7ae 100644
+--- a/drivers/net/hyperv/netvsc_drv.c
++++ b/drivers/net/hyperv/netvsc_drv.c
+@@ -383,6 +383,10 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
+ if (skb_is_gso(skb))
+ goto do_lso;
+
++ if ((skb->ip_summed == CHECKSUM_NONE) ||
++ (skb->ip_summed == CHECKSUM_UNNECESSARY))
++ goto do_send;
++
+ rndis_msg_size += NDIS_CSUM_PPI_SIZE;
+ ppi = init_ppi_data(rndis_msg, NDIS_CSUM_PPI_SIZE,
+ TCPIP_CHKSUM_PKTINFO);
+--
+2.4.3
+
diff --git a/src/patches/linux/0016-hyperv-Add-support-for-virtual-Receive-Side-Scaling-.patch b/src/patches/linux/0016-hyperv-Add-support-for-virtual-Receive-Side-Scaling-.patch
new file mode 100644
index 0000000..d01a428
--- /dev/null
+++ b/src/patches/linux/0016-hyperv-Add-support-for-virtual-Receive-Side-Scaling-.patch
@@ -0,0 +1,917 @@
+From 44559a96c6864eb6e95db0ae896c621b82e605f3 Mon Sep 17 00:00:00 2001
+From: Haiyang Zhang <haiyangz(a)microsoft.com>
+Date: Mon, 21 Apr 2014 10:20:28 -0700
+Subject: [PATCH 16/25] hyperv: Add support for virtual Receive Side Scaling
+ (vRSS)
+
+This feature allows multiple channels to be used by each virtual NIC.
+It is available on Hyper-V host 2012 R2.
+
+Signed-off-by: Haiyang Zhang <haiyangz(a)microsoft.com>
+Reviewed-by: K. Y. Srinivasan <kys(a)microsoft.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+---
+ drivers/net/hyperv/hyperv_net.h | 110 +++++++++++++++++++++-
+ drivers/net/hyperv/netvsc.c | 136 +++++++++++++++++++++------
+ drivers/net/hyperv/netvsc_drv.c | 103 ++++++++++++++++++++-
+ drivers/net/hyperv/rndis_filter.c | 189 +++++++++++++++++++++++++++++++++++++-
+ 4 files changed, 504 insertions(+), 34 deletions(-)
+
+diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
+index d18f711d0b0c..57eb3f906d64 100644
+--- a/drivers/net/hyperv/hyperv_net.h
++++ b/drivers/net/hyperv/hyperv_net.h
+@@ -28,6 +28,96 @@
+ #include <linux/hyperv.h>
+ #include <linux/rndis.h>
+
++/* RSS related */
++#define OID_GEN_RECEIVE_SCALE_CAPABILITIES 0x00010203 /* query only */
++#define OID_GEN_RECEIVE_SCALE_PARAMETERS 0x00010204 /* query and set */
++
++#define NDIS_OBJECT_TYPE_RSS_CAPABILITIES 0x88
++#define NDIS_OBJECT_TYPE_RSS_PARAMETERS 0x89
++
++#define NDIS_RECEIVE_SCALE_CAPABILITIES_REVISION_2 2
++#define NDIS_RECEIVE_SCALE_PARAMETERS_REVISION_2 2
++
++struct ndis_obj_header {
++ u8 type;
++ u8 rev;
++ u16 size;
++} __packed;
++
++/* ndis_recv_scale_cap/cap_flag */
++#define NDIS_RSS_CAPS_MESSAGE_SIGNALED_INTERRUPTS 0x01000000
++#define NDIS_RSS_CAPS_CLASSIFICATION_AT_ISR 0x02000000
++#define NDIS_RSS_CAPS_CLASSIFICATION_AT_DPC 0x04000000
++#define NDIS_RSS_CAPS_USING_MSI_X 0x08000000
++#define NDIS_RSS_CAPS_RSS_AVAILABLE_ON_PORTS 0x10000000
++#define NDIS_RSS_CAPS_SUPPORTS_MSI_X 0x20000000
++#define NDIS_RSS_CAPS_HASH_TYPE_TCP_IPV4 0x00000100
++#define NDIS_RSS_CAPS_HASH_TYPE_TCP_IPV6 0x00000200
++#define NDIS_RSS_CAPS_HASH_TYPE_TCP_IPV6_EX 0x00000400
++
++struct ndis_recv_scale_cap { /* NDIS_RECEIVE_SCALE_CAPABILITIES */
++ struct ndis_obj_header hdr;
++ u32 cap_flag;
++ u32 num_int_msg;
++ u32 num_recv_que;
++ u16 num_indirect_tabent;
++} __packed;
++
++
++/* ndis_recv_scale_param flags */
++#define NDIS_RSS_PARAM_FLAG_BASE_CPU_UNCHANGED 0x0001
++#define NDIS_RSS_PARAM_FLAG_HASH_INFO_UNCHANGED 0x0002
++#define NDIS_RSS_PARAM_FLAG_ITABLE_UNCHANGED 0x0004
++#define NDIS_RSS_PARAM_FLAG_HASH_KEY_UNCHANGED 0x0008
++#define NDIS_RSS_PARAM_FLAG_DISABLE_RSS 0x0010
++
++/* Hash info bits */
++#define NDIS_HASH_FUNC_TOEPLITZ 0x00000001
++#define NDIS_HASH_IPV4 0x00000100
++#define NDIS_HASH_TCP_IPV4 0x00000200
++#define NDIS_HASH_IPV6 0x00000400
++#define NDIS_HASH_IPV6_EX 0x00000800
++#define NDIS_HASH_TCP_IPV6 0x00001000
++#define NDIS_HASH_TCP_IPV6_EX 0x00002000
++
++#define NDIS_RSS_INDIRECTION_TABLE_MAX_SIZE_REVISION_2 (128 * 4)
++#define NDIS_RSS_HASH_SECRET_KEY_MAX_SIZE_REVISION_2 40
++
++#define ITAB_NUM 128
++#define HASH_KEYLEN NDIS_RSS_HASH_SECRET_KEY_MAX_SIZE_REVISION_2
++extern u8 netvsc_hash_key[];
++
++struct ndis_recv_scale_param { /* NDIS_RECEIVE_SCALE_PARAMETERS */
++ struct ndis_obj_header hdr;
++
++ /* Qualifies the rest of the information */
++ u16 flag;
++
++ /* The base CPU number to do receive processing. not used */
++ u16 base_cpu_number;
++
++ /* This describes the hash function and type being enabled */
++ u32 hashinfo;
++
++ /* The size of indirection table array */
++ u16 indirect_tabsize;
++
++ /* The offset of the indirection table from the beginning of this
++ * structure
++ */
++ u32 indirect_taboffset;
++
++ /* The size of the hash secret key */
++ u16 hashkey_size;
++
++ /* The offset of the secret key from the beginning of this structure */
++ u32 kashkey_offset;
++
++ u32 processor_masks_offset;
++ u32 num_processor_masks;
++ u32 processor_masks_entry_size;
++};
++
+ /* Fwd declaration */
+ struct hv_netvsc_packet;
+ struct ndis_tcp_ip_checksum_info;
+@@ -39,6 +129,8 @@ struct xferpage_packet {
+
+ /* # of netvsc packets this xfer packet contains */
+ u32 count;
++
++ struct vmbus_channel *channel;
+ };
+
+ /*
+@@ -54,6 +146,9 @@ struct hv_netvsc_packet {
+ bool is_data_pkt;
+ u16 vlan_tci;
+
++ u16 q_idx;
++ struct vmbus_channel *channel;
++
+ /*
+ * Valid only for receives when we break a xfer page packet
+ * into multiple netvsc packets
+@@ -120,6 +215,7 @@ void netvsc_linkstatus_callback(struct hv_device *device_obj,
+ int netvsc_recv_callback(struct hv_device *device_obj,
+ struct hv_netvsc_packet *packet,
+ struct ndis_tcp_ip_checksum_info *csum_info);
++void netvsc_channel_cb(void *context);
+ int rndis_filter_open(struct hv_device *dev);
+ int rndis_filter_close(struct hv_device *dev);
+ int rndis_filter_device_add(struct hv_device *dev,
+@@ -522,6 +618,8 @@ struct nvsp_message {
+
+ #define NETVSC_PACKET_SIZE 2048
+
++#define VRSS_SEND_TAB_SIZE 16
++
+ /* Per netvsc channel-specific */
+ struct netvsc_device {
+ struct hv_device *dev;
+@@ -555,10 +653,20 @@ struct netvsc_device {
+
+ struct net_device *ndev;
+
++ struct vmbus_channel *chn_table[NR_CPUS];
++ u32 send_table[VRSS_SEND_TAB_SIZE];
++ u32 num_chn;
++ atomic_t queue_sends[NR_CPUS];
++
+ /* Holds rndis device info */
+ void *extension;
+- /* The recive buffer for this device */
++
++ int ring_size;
++
++ /* The primary channel callback buffer */
+ unsigned char cb_buffer[NETVSC_PACKET_SIZE];
++ /* The sub channel callback buffer */
++ unsigned char *sub_cb_buf;
+ };
+
+ /* NdisInitialize message */
+diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
+index f7629ecefa84..e7e77f12bc38 100644
+--- a/drivers/net/hyperv/netvsc.c
++++ b/drivers/net/hyperv/netvsc.c
+@@ -422,6 +422,9 @@ int netvsc_device_remove(struct hv_device *device)
+ kfree(netvsc_packet);
+ }
+
++ if (net_device->sub_cb_buf)
++ vfree(net_device->sub_cb_buf);
++
+ kfree(net_device);
+ return 0;
+ }
+@@ -461,7 +464,9 @@ static void netvsc_send_completion(struct netvsc_device *net_device,
+ (nvsp_packet->hdr.msg_type ==
+ NVSP_MSG1_TYPE_SEND_RECV_BUF_COMPLETE) ||
+ (nvsp_packet->hdr.msg_type ==
+- NVSP_MSG1_TYPE_SEND_SEND_BUF_COMPLETE)) {
++ NVSP_MSG1_TYPE_SEND_SEND_BUF_COMPLETE) ||
++ (nvsp_packet->hdr.msg_type ==
++ NVSP_MSG5_TYPE_SUBCHANNEL)) {
+ /* Copy the response back */
+ memcpy(&net_device->channel_init_pkt, nvsp_packet,
+ sizeof(struct nvsp_message));
+@@ -469,28 +474,37 @@ static void netvsc_send_completion(struct netvsc_device *net_device,
+ } else if (nvsp_packet->hdr.msg_type ==
+ NVSP_MSG1_TYPE_SEND_RNDIS_PKT_COMPLETE) {
+ int num_outstanding_sends;
++ u16 q_idx = 0;
++ struct vmbus_channel *channel = device->channel;
++ int queue_sends;
+
+ /* Get the send context */
+ nvsc_packet = (struct hv_netvsc_packet *)(unsigned long)
+ packet->trans_id;
+
+ /* Notify the layer above us */
+- if (nvsc_packet)
++ if (nvsc_packet) {
++ q_idx = nvsc_packet->q_idx;
++ channel = nvsc_packet->channel;
+ nvsc_packet->completion.send.send_completion(
+ nvsc_packet->completion.send.
+ send_completion_ctx);
++ }
+
+ num_outstanding_sends =
+ atomic_dec_return(&net_device->num_outstanding_sends);
++ queue_sends = atomic_dec_return(&net_device->
++ queue_sends[q_idx]);
+
+ if (net_device->destroy && num_outstanding_sends == 0)
+ wake_up(&net_device->wait_drain);
+
+- if (netif_queue_stopped(ndev) && !net_device->start_remove &&
+- (hv_ringbuf_avail_percent(&device->channel->outbound)
+- > RING_AVAIL_PERCENT_HIWATER ||
+- num_outstanding_sends < 1))
+- netif_wake_queue(ndev);
++ if (netif_tx_queue_stopped(netdev_get_tx_queue(ndev, q_idx)) &&
++ !net_device->start_remove &&
++ (hv_ringbuf_avail_percent(&channel->outbound) >
++ RING_AVAIL_PERCENT_HIWATER || queue_sends < 1))
++ netif_tx_wake_queue(netdev_get_tx_queue(
++ ndev, q_idx));
+ } else {
+ netdev_err(ndev, "Unknown send completion packet type- "
+ "%d received!!\n", nvsp_packet->hdr.msg_type);
+@@ -505,6 +519,7 @@ int netvsc_send(struct hv_device *device,
+ int ret = 0;
+ struct nvsp_message sendMessage;
+ struct net_device *ndev;
++ struct vmbus_channel *out_channel = NULL;
+ u64 req_id;
+
+ net_device = get_outbound_net_device(device);
+@@ -531,15 +546,20 @@ int netvsc_send(struct hv_device *device,
+ else
+ req_id = 0;
+
++ out_channel = net_device->chn_table[packet->q_idx];
++ if (out_channel == NULL)
++ out_channel = device->channel;
++ packet->channel = out_channel;
++
+ if (packet->page_buf_cnt) {
+- ret = vmbus_sendpacket_pagebuffer(device->channel,
++ ret = vmbus_sendpacket_pagebuffer(out_channel,
+ packet->page_buf,
+ packet->page_buf_cnt,
+ &sendMessage,
+ sizeof(struct nvsp_message),
+ req_id);
+ } else {
+- ret = vmbus_sendpacket(device->channel, &sendMessage,
++ ret = vmbus_sendpacket(out_channel, &sendMessage,
+ sizeof(struct nvsp_message),
+ req_id,
+ VM_PKT_DATA_INBAND,
+@@ -548,17 +568,24 @@ int netvsc_send(struct hv_device *device,
+
+ if (ret == 0) {
+ atomic_inc(&net_device->num_outstanding_sends);
+- if (hv_ringbuf_avail_percent(&device->channel->outbound) <
++ atomic_inc(&net_device->queue_sends[packet->q_idx]);
++
++ if (hv_ringbuf_avail_percent(&out_channel->outbound) <
+ RING_AVAIL_PERCENT_LOWATER) {
+- netif_stop_queue(ndev);
++ netif_tx_stop_queue(netdev_get_tx_queue(
++ ndev, packet->q_idx));
++
+ if (atomic_read(&net_device->
+- num_outstanding_sends) < 1)
+- netif_wake_queue(ndev);
++ queue_sends[packet->q_idx]) < 1)
++ netif_tx_wake_queue(netdev_get_tx_queue(
++ ndev, packet->q_idx));
+ }
+ } else if (ret == -EAGAIN) {
+- netif_stop_queue(ndev);
+- if (atomic_read(&net_device->num_outstanding_sends) < 1) {
+- netif_wake_queue(ndev);
++ netif_tx_stop_queue(netdev_get_tx_queue(
++ ndev, packet->q_idx));
++ if (atomic_read(&net_device->queue_sends[packet->q_idx]) < 1) {
++ netif_tx_wake_queue(netdev_get_tx_queue(
++ ndev, packet->q_idx));
+ ret = -ENOSPC;
+ }
+ } else {
+@@ -570,6 +597,7 @@ int netvsc_send(struct hv_device *device,
+ }
+
+ static void netvsc_send_recv_completion(struct hv_device *device,
++ struct vmbus_channel *channel,
+ struct netvsc_device *net_device,
+ u64 transaction_id, u32 status)
+ {
+@@ -587,7 +615,7 @@ static void netvsc_send_recv_completion(struct hv_device *device,
+
+ retry_send_cmplt:
+ /* Send the completion */
+- ret = vmbus_sendpacket(device->channel, &recvcompMessage,
++ ret = vmbus_sendpacket(channel, &recvcompMessage,
+ sizeof(struct nvsp_message), transaction_id,
+ VM_PKT_COMP, 0);
+ if (ret == 0) {
+@@ -618,6 +646,7 @@ static void netvsc_receive_completion(void *context)
+ {
+ struct hv_netvsc_packet *packet = context;
+ struct hv_device *device = packet->device;
++ struct vmbus_channel *channel;
+ struct netvsc_device *net_device;
+ u64 transaction_id = 0;
+ bool fsend_receive_comp = false;
+@@ -649,6 +678,7 @@ static void netvsc_receive_completion(void *context)
+ */
+ if (packet->xfer_page_pkt->count == 0) {
+ fsend_receive_comp = true;
++ channel = packet->xfer_page_pkt->channel;
+ transaction_id = packet->completion.recv.recv_completion_tid;
+ status = packet->xfer_page_pkt->status;
+ list_add_tail(&packet->xfer_page_pkt->list_ent,
+@@ -662,12 +692,13 @@ static void netvsc_receive_completion(void *context)
+
+ /* Send a receive completion for the xfer page packet */
+ if (fsend_receive_comp)
+- netvsc_send_recv_completion(device, net_device, transaction_id,
+- status);
++ netvsc_send_recv_completion(device, channel, net_device,
++ transaction_id, status);
+
+ }
+
+ static void netvsc_receive(struct netvsc_device *net_device,
++ struct vmbus_channel *channel,
+ struct hv_device *device,
+ struct vmpacket_descriptor *packet)
+ {
+@@ -748,7 +779,7 @@ static void netvsc_receive(struct netvsc_device *net_device,
+ spin_unlock_irqrestore(&net_device->recv_pkt_list_lock,
+ flags);
+
+- netvsc_send_recv_completion(device, net_device,
++ netvsc_send_recv_completion(device, channel, net_device,
+ vmxferpage_packet->d.trans_id,
+ NVSP_STAT_FAIL);
+
+@@ -759,6 +790,7 @@ static void netvsc_receive(struct netvsc_device *net_device,
+ xferpage_packet = (struct xferpage_packet *)listHead.next;
+ list_del(&xferpage_packet->list_ent);
+ xferpage_packet->status = NVSP_STAT_SUCCESS;
++ xferpage_packet->channel = channel;
+
+ /* This is how much we can satisfy */
+ xferpage_packet->count = count - 1;
+@@ -800,10 +832,45 @@ static void netvsc_receive(struct netvsc_device *net_device,
+
+ }
+
+-static void netvsc_channel_cb(void *context)
++
++static void netvsc_send_table(struct hv_device *hdev,
++ struct vmpacket_descriptor *vmpkt)
++{
++ struct netvsc_device *nvscdev;
++ struct net_device *ndev;
++ struct nvsp_message *nvmsg;
++ int i;
++ u32 count, *tab;
++
++ nvscdev = get_outbound_net_device(hdev);
++ if (!nvscdev)
++ return;
++ ndev = nvscdev->ndev;
++
++ nvmsg = (struct nvsp_message *)((unsigned long)vmpkt +
++ (vmpkt->offset8 << 3));
++
++ if (nvmsg->hdr.msg_type != NVSP_MSG5_TYPE_SEND_INDIRECTION_TABLE)
++ return;
++
++ count = nvmsg->msg.v5_msg.send_table.count;
++ if (count != VRSS_SEND_TAB_SIZE) {
++ netdev_err(ndev, "Received wrong send-table size:%u\n", count);
++ return;
++ }
++
++ tab = (u32 *)((unsigned long)&nvmsg->msg.v5_msg.send_table +
++ nvmsg->msg.v5_msg.send_table.offset);
++
++ for (i = 0; i < count; i++)
++ nvscdev->send_table[i] = tab[i];
++}
++
++void netvsc_channel_cb(void *context)
+ {
+ int ret;
+- struct hv_device *device = context;
++ struct vmbus_channel *channel = (struct vmbus_channel *)context;
++ struct hv_device *device;
+ struct netvsc_device *net_device;
+ u32 bytes_recvd;
+ u64 request_id;
+@@ -812,14 +879,19 @@ static void netvsc_channel_cb(void *context)
+ int bufferlen = NETVSC_PACKET_SIZE;
+ struct net_device *ndev;
+
++ if (channel->primary_channel != NULL)
++ device = channel->primary_channel->device_obj;
++ else
++ device = channel->device_obj;
++
+ net_device = get_inbound_net_device(device);
+ if (!net_device)
+ return;
+ ndev = net_device->ndev;
+- buffer = net_device->cb_buffer;
++ buffer = get_per_channel_state(channel);
+
+ do {
+- ret = vmbus_recvpacket_raw(device->channel, buffer, bufferlen,
++ ret = vmbus_recvpacket_raw(channel, buffer, bufferlen,
+ &bytes_recvd, &request_id);
+ if (ret == 0) {
+ if (bytes_recvd > 0) {
+@@ -831,8 +903,12 @@ static void netvsc_channel_cb(void *context)
+ break;
+
+ case VM_PKT_DATA_USING_XFER_PAGES:
+- netvsc_receive(net_device,
+- device, desc);
++ netvsc_receive(net_device, channel,
++ device, desc);
++ break;
++
++ case VM_PKT_DATA_INBAND:
++ netvsc_send_table(device, desc);
+ break;
+
+ default:
+@@ -893,6 +969,8 @@ int netvsc_device_add(struct hv_device *device, void *additional_info)
+ goto cleanup;
+ }
+
++ net_device->ring_size = ring_size;
++
+ /*
+ * Coming into this function, struct net_device * is
+ * registered as the driver private data.
+@@ -917,10 +995,12 @@ int netvsc_device_add(struct hv_device *device, void *additional_info)
+ }
+ init_completion(&net_device->channel_init_wait);
+
++ set_per_channel_state(device->channel, net_device->cb_buffer);
++
+ /* Open the channel */
+ ret = vmbus_open(device->channel, ring_size * PAGE_SIZE,
+ ring_size * PAGE_SIZE, NULL, 0,
+- netvsc_channel_cb, device);
++ netvsc_channel_cb, device->channel);
+
+ if (ret != 0) {
+ netdev_err(ndev, "unable to open channel: %d\n", ret);
+@@ -930,6 +1010,8 @@ int netvsc_device_add(struct hv_device *device, void *additional_info)
+ /* Channel is opened */
+ pr_info("hv_netvsc channel opened successfully\n");
+
++ net_device->chn_table[0] = device->channel;
++
+ /* Connect with the NetVsp */
+ ret = netvsc_connect_vsp(device);
+ if (ret != 0) {
+diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
+index ce6d870dd7ae..e486dbd33f61 100644
+--- a/drivers/net/hyperv/netvsc_drv.c
++++ b/drivers/net/hyperv/netvsc_drv.c
+@@ -101,7 +101,7 @@ static int netvsc_open(struct net_device *net)
+ return ret;
+ }
+
+- netif_start_queue(net);
++ netif_tx_start_all_queues(net);
+
+ nvdev = hv_get_drvdata(device_obj);
+ rdev = nvdev->extension;
+@@ -149,6 +149,88 @@ static void *init_ppi_data(struct rndis_message *msg, u32 ppi_size,
+ return ppi;
+ }
+
++union sub_key {
++ u64 k;
++ struct {
++ u8 pad[3];
++ u8 kb;
++ u32 ka;
++ };
++};
++
++/* Toeplitz hash function
++ * data: network byte order
++ * return: host byte order
++ */
++static u32 comp_hash(u8 *key, int klen, u8 *data, int dlen)
++{
++ union sub_key subk;
++ int k_next = 4;
++ u8 dt;
++ int i, j;
++ u32 ret = 0;
++
++ subk.k = 0;
++ subk.ka = ntohl(*(u32 *)key);
++
++ for (i = 0; i < dlen; i++) {
++ subk.kb = key[k_next];
++ k_next = (k_next + 1) % klen;
++ dt = data[i];
++ for (j = 0; j < 8; j++) {
++ if (dt & 0x80)
++ ret ^= subk.ka;
++ dt <<= 1;
++ subk.k <<= 1;
++ }
++ }
++
++ return ret;
++}
++
++static bool netvsc_set_hash(u32 *hash, struct sk_buff *skb)
++{
++ struct iphdr *iphdr;
++ int data_len;
++ bool ret = false;
++
++ if (eth_hdr(skb)->h_proto != htons(ETH_P_IP))
++ return false;
++
++ iphdr = ip_hdr(skb);
++
++ if (iphdr->version == 4) {
++ if (iphdr->protocol == IPPROTO_TCP)
++ data_len = 12;
++ else
++ data_len = 8;
++ *hash = comp_hash(netvsc_hash_key, HASH_KEYLEN,
++ (u8 *)&iphdr->saddr, data_len);
++ ret = true;
++ }
++
++ return ret;
++}
++
++static u16 netvsc_select_queue(struct net_device *ndev, struct sk_buff *skb,
++ void *accel_priv, select_queue_fallback_t fallback)
++{
++ struct net_device_context *net_device_ctx = netdev_priv(ndev);
++ struct hv_device *hdev = net_device_ctx->device_ctx;
++ struct netvsc_device *nvsc_dev = hv_get_drvdata(hdev);
++ u32 hash;
++ u16 q_idx = 0;
++
++ if (nvsc_dev == NULL || ndev->real_num_tx_queues <= 1)
++ return 0;
++
++ if (netvsc_set_hash(&hash, skb))
++ q_idx = nvsc_dev->send_table[hash % VRSS_SEND_TAB_SIZE] %
++ ndev->real_num_tx_queues;
++
++ return q_idx;
++}
++
+ static void netvsc_xmit_completion(void *context)
+ {
+ struct hv_netvsc_packet *packet = (struct hv_netvsc_packet *)context;
+@@ -334,6 +416,8 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
+
+ packet->vlan_tci = skb->vlan_tci;
+
++ packet->q_idx = skb_get_queue_mapping(skb);
++
+ packet->is_data_pkt = true;
+ packet->total_data_buflen = skb->len;
+
+@@ -559,6 +643,10 @@ int netvsc_recv_callback(struct hv_device *device_obj,
+ __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),
+ packet->vlan_tci);
+
++ skb_record_rx_queue(skb, packet->xfer_page_pkt->channel->
++ offermsg.offer.sub_channel_index %
++ net->real_num_rx_queues);
++
+ net->stats.rx_packets++;
+ net->stats.rx_bytes += packet->total_data_buflen;
+
+@@ -607,7 +695,7 @@ static int netvsc_change_mtu(struct net_device *ndev, int mtu)
+ hv_set_drvdata(hdev, ndev);
+ device_info.ring_size = ring_size;
+ rndis_filter_device_add(hdev, &device_info);
+- netif_wake_queue(ndev);
++ netif_tx_wake_all_queues(ndev);
+
+ return 0;
+ }
+@@ -653,6 +741,7 @@ static const struct net_device_ops device_ops = {
+ .ndo_change_mtu = netvsc_change_mtu,
+ .ndo_validate_addr = eth_validate_addr,
+ .ndo_set_mac_address = netvsc_set_mac_addr,
++ .ndo_select_queue = netvsc_select_queue,
+ };
+
+ /*
+@@ -699,9 +788,11 @@ static int netvsc_probe(struct hv_device *dev,
+ struct net_device *net = NULL;
+ struct net_device_context *net_device_ctx;
+ struct netvsc_device_info device_info;
++ struct netvsc_device *nvdev;
+ int ret;
+
+- net = alloc_etherdev(sizeof(struct net_device_context));
++ net = alloc_etherdev_mq(sizeof(struct net_device_context),
++ num_online_cpus());
+ if (!net)
+ return -ENOMEM;
+
+@@ -734,6 +825,12 @@ static int netvsc_probe(struct hv_device *dev,
+ }
+ memcpy(net->dev_addr, device_info.mac_adr, ETH_ALEN);
+
++ nvdev = hv_get_drvdata(dev);
++ netif_set_real_num_tx_queues(net, nvdev->num_chn);
++ netif_set_real_num_rx_queues(net, nvdev->num_chn);
++ dev_info(&dev->device, "real num tx,rx queues:%u, %u\n",
++ net->real_num_tx_queues, net->real_num_rx_queues);
++
+ ret = register_netdev(net);
+ if (ret != 0) {
+ pr_err("Unable to register netdev.\n");
+diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
+index 143a98caf618..d92cfbe43410 100644
+--- a/drivers/net/hyperv/rndis_filter.c
++++ b/drivers/net/hyperv/rndis_filter.c
+@@ -31,7 +31,7 @@
+ #include "hyperv_net.h"
+
+
+-#define RNDIS_EXT_LEN 100
++#define RNDIS_EXT_LEN PAGE_SIZE
+ struct rndis_request {
+ struct list_head list_ent;
+ struct completion wait_event;
+@@ -94,6 +94,8 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
+ rndis_msg->ndis_msg_type = msg_type;
+ rndis_msg->msg_len = msg_len;
+
++ request->pkt.q_idx = 0;
++
+ /*
+ * Set the request id. This field is always after the rndis header for
+ * request/response packet types so we just used the SetRequest as a
+@@ -509,6 +511,19 @@ static int rndis_filter_query_device(struct rndis_device *dev, u32 oid,
+ query->info_buflen = 0;
+ query->dev_vc_handle = 0;
+
++ if (oid == OID_GEN_RECEIVE_SCALE_CAPABILITIES) {
++ struct ndis_recv_scale_cap *cap;
++
++ request->request_msg.msg_len +=
++ sizeof(struct ndis_recv_scale_cap);
++ query->info_buflen = sizeof(struct ndis_recv_scale_cap);
++ cap = (struct ndis_recv_scale_cap *)((unsigned long)query +
++ query->info_buf_offset);
++ cap->hdr.type = NDIS_OBJECT_TYPE_RSS_CAPABILITIES;
++ cap->hdr.rev = NDIS_RECEIVE_SCALE_CAPABILITIES_REVISION_2;
++ cap->hdr.size = sizeof(struct ndis_recv_scale_cap);
++ }
++
+ ret = rndis_filter_send_request(dev, request);
+ if (ret != 0)
+ goto cleanup;
+@@ -695,6 +710,89 @@ cleanup:
+ return ret;
+ }
+
++u8 netvsc_hash_key[HASH_KEYLEN] = {
++ 0x6d, 0x5a, 0x56, 0xda, 0x25, 0x5b, 0x0e, 0xc2,
++ 0x41, 0x67, 0x25, 0x3d, 0x43, 0xa3, 0x8f, 0xb0,
++ 0xd0, 0xca, 0x2b, 0xcb, 0xae, 0x7b, 0x30, 0xb4,
++ 0x77, 0xcb, 0x2d, 0xa3, 0x80, 0x30, 0xf2, 0x0c,
++ 0x6a, 0x42, 0xb7, 0x3b, 0xbe, 0xac, 0x01, 0xfa
++};
++
++int rndis_filter_set_rss_param(struct rndis_device *rdev, int num_queue)
++{
++ struct net_device *ndev = rdev->net_dev->ndev;
++ struct rndis_request *request;
++ struct rndis_set_request *set;
++ struct rndis_set_complete *set_complete;
++ u32 extlen = sizeof(struct ndis_recv_scale_param) +
++ 4*ITAB_NUM + HASH_KEYLEN;
++ struct ndis_recv_scale_param *rssp;
++ u32 *itab;
++ u8 *keyp;
++ int i, t, ret;
++
++ request = get_rndis_request(
++ rdev, RNDIS_MSG_SET,
++ RNDIS_MESSAGE_SIZE(struct rndis_set_request) + extlen);
++ if (!request)
++ return -ENOMEM;
++
++ set = &request->request_msg.msg.set_req;
++ set->oid = OID_GEN_RECEIVE_SCALE_PARAMETERS;
++ set->info_buflen = extlen;
++ set->info_buf_offset = sizeof(struct rndis_set_request);
++ set->dev_vc_handle = 0;
++
++ rssp = (struct ndis_recv_scale_param *)(set + 1);
++ rssp->hdr.type = NDIS_OBJECT_TYPE_RSS_PARAMETERS;
++ rssp->hdr.rev = NDIS_RECEIVE_SCALE_PARAMETERS_REVISION_2;
++ rssp->hdr.size = sizeof(struct ndis_recv_scale_param);
++ rssp->flag = 0;
++ rssp->hashinfo = NDIS_HASH_FUNC_TOEPLITZ | NDIS_HASH_IPV4 |
++ NDIS_HASH_TCP_IPV4;
++ rssp->indirect_tabsize = 4*ITAB_NUM;
++ rssp->indirect_taboffset = sizeof(struct ndis_recv_scale_param);
++ rssp->hashkey_size = HASH_KEYLEN;
++ rssp->kashkey_offset = rssp->indirect_taboffset +
++ rssp->indirect_tabsize;
++
++ /* Set indirection table entries */
++ itab = (u32 *)(rssp + 1);
++ for (i = 0; i < ITAB_NUM; i++)
++ itab[i] = i % num_queue;
++
++ /* Set hask key values */
++ keyp = (u8 *)((unsigned long)rssp + rssp->kashkey_offset);
++ for (i = 0; i < HASH_KEYLEN; i++)
++ keyp[i] = netvsc_hash_key[i];
++
++
++ ret = rndis_filter_send_request(rdev, request);
++ if (ret != 0)
++ goto cleanup;
++
++ t = wait_for_completion_timeout(&request->wait_event, 5*HZ);
++ if (t == 0) {
++ netdev_err(ndev, "timeout before we got a set response...\n");
++ /* can't put_rndis_request, since we may still receive a
++ * send-completion.
++ */
++ return -ETIMEDOUT;
++ } else {
++ set_complete = &request->response_msg.msg.set_complete;
++ if (set_complete->status != RNDIS_STATUS_SUCCESS) {
++ netdev_err(ndev, "Fail to set RSS parameters:0x%x\n",
++ set_complete->status);
++ ret = -EINVAL;
++ }
++ }
++
++cleanup:
++ put_rndis_request(rdev, request);
++ return ret;
++}
++
++
+ static int rndis_filter_query_device_link_status(struct rndis_device *dev)
+ {
+ u32 size = sizeof(u32);
+@@ -886,6 +984,28 @@ static int rndis_filter_close_device(struct rndis_device *dev)
+ return ret;
+ }
+
++static void netvsc_sc_open(struct vmbus_channel *new_sc)
++{
++ struct netvsc_device *nvscdev;
++ u16 chn_index = new_sc->offermsg.offer.sub_channel_index;
++ int ret;
++
++ nvscdev = hv_get_drvdata(new_sc->primary_channel->device_obj);
++
++ if (chn_index >= nvscdev->num_chn)
++ return;
++
++ set_per_channel_state(new_sc, nvscdev->sub_cb_buf + (chn_index - 1) *
++ NETVSC_PACKET_SIZE);
++
++ ret = vmbus_open(new_sc, nvscdev->ring_size * PAGE_SIZE,
++ nvscdev->ring_size * PAGE_SIZE, NULL, 0,
++ netvsc_channel_cb, new_sc);
++
++ if (ret == 0)
++ nvscdev->chn_table[chn_index] = new_sc;
++}
++
+ int rndis_filter_device_add(struct hv_device *dev,
+ void *additional_info)
+ {
+@@ -894,6 +1014,10 @@ int rndis_filter_device_add(struct hv_device *dev,
+ struct rndis_device *rndis_device;
+ struct netvsc_device_info *device_info = additional_info;
+ struct ndis_offload_params offloads;
++ struct nvsp_message *init_packet;
++ int t;
++ struct ndis_recv_scale_cap rsscap;
++ u32 rsscap_size = sizeof(struct ndis_recv_scale_cap);
+
+ rndis_device = get_rndis_device();
+ if (!rndis_device)
+@@ -913,6 +1037,7 @@ int rndis_filter_device_add(struct hv_device *dev,
+
+ /* Initialize the rndis device */
+ net_device = hv_get_drvdata(dev);
++ net_device->num_chn = 1;
+
+ net_device->extension = rndis_device;
+ rndis_device->net_dev = net_device;
+@@ -952,7 +1077,6 @@ int rndis_filter_device_add(struct hv_device *dev,
+ if (ret)
+ goto err_dev_remv;
+
+-
+ rndis_filter_query_device_link_status(rndis_device);
+
+ device_info->link_state = rndis_device->link_state;
+@@ -961,7 +1085,66 @@ int rndis_filter_device_add(struct hv_device *dev,
+ rndis_device->hw_mac_adr,
+ device_info->link_state ? "down" : "up");
+
+- return ret;
++ if (net_device->nvsp_version < NVSP_PROTOCOL_VERSION_5)
++ return 0;
++
++ /* vRSS setup */
++ memset(&rsscap, 0, rsscap_size);
++ ret = rndis_filter_query_device(rndis_device,
++ OID_GEN_RECEIVE_SCALE_CAPABILITIES,
++ &rsscap, &rsscap_size);
++ if (ret || rsscap.num_recv_que < 2)
++ goto out;
++
++ net_device->num_chn = (num_online_cpus() < rsscap.num_recv_que) ?
++ num_online_cpus() : rsscap.num_recv_que;
++ if (net_device->num_chn == 1)
++ goto out;
++
++ net_device->sub_cb_buf = vzalloc((net_device->num_chn - 1) *
++ NETVSC_PACKET_SIZE);
++ if (!net_device->sub_cb_buf) {
++ net_device->num_chn = 1;
++ dev_info(&dev->device, "No memory for subchannels.\n");
++ goto out;
++ }
++
++ vmbus_set_sc_create_callback(dev->channel, netvsc_sc_open);
++
++ init_packet = &net_device->channel_init_pkt;
++ memset(init_packet, 0, sizeof(struct nvsp_message));
++ init_packet->hdr.msg_type = NVSP_MSG5_TYPE_SUBCHANNEL;
++ init_packet->msg.v5_msg.subchn_req.op = NVSP_SUBCHANNEL_ALLOCATE;
++ init_packet->msg.v5_msg.subchn_req.num_subchannels =
++ net_device->num_chn - 1;
++ ret = vmbus_sendpacket(dev->channel, init_packet,
++ sizeof(struct nvsp_message),
++ (unsigned long)init_packet,
++ VM_PKT_DATA_INBAND,
++ VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
++ if (ret)
++ goto out;
++ t = wait_for_completion_timeout(&net_device->channel_init_wait, 5*HZ);
++ if (t == 0) {
++ ret = -ETIMEDOUT;
++ goto out;
++ }
++ if (init_packet->msg.v5_msg.subchn_comp.status !=
++ NVSP_STAT_SUCCESS) {
++ ret = -ENODEV;
++ goto out;
++ }
++ net_device->num_chn = 1 +
++ init_packet->msg.v5_msg.subchn_comp.num_subchannels;
++
++ vmbus_are_subchannels_present(dev->channel);
++
++ ret = rndis_filter_set_rss_param(rndis_device, net_device->num_chn);
++
++out:
++ if (ret)
++ net_device->num_chn = 1;
++ return 0; /* return 0 because primary channel can be used alone */
+
+ err_dev_remv:
+ rndis_filter_device_remove(dev);
+--
+2.4.3
+
diff --git a/src/patches/linux/0017-hyperv-Remove-recv_pkt_list-and-lock.patch b/src/patches/linux/0017-hyperv-Remove-recv_pkt_list-and-lock.patch
new file mode 100644
index 0000000..31465a1
--- /dev/null
+++ b/src/patches/linux/0017-hyperv-Remove-recv_pkt_list-and-lock.patch
@@ -0,0 +1,384 @@
+From d6bf5567c1438b4f3b1bcff1a1525ddb1754df19 Mon Sep 17 00:00:00 2001
+From: Haiyang Zhang <haiyangz(a)microsoft.com>
+Date: Mon, 21 Apr 2014 14:54:43 -0700
+Subject: [PATCH 17/25] hyperv: Remove recv_pkt_list and lock
+
+Removed recv_pkt_list and lock, and updated related code, so that
+the locking overhead is reduced especially when multiple channels
+are in use.
+
+The recv_pkt_list isn't actually necessary because the packets are
+processed sequentially in each channel. It has been replaced by a
+local variable, and the related lock for this list is also removed.
+The is_data_pkt field is not used in receive path, so its assignment
+is cleaned up.
+
+Signed-off-by: Haiyang Zhang <haiyangz(a)microsoft.com>
+Reviewed-by: K. Y. Srinivasan <kys(a)microsoft.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+---
+ drivers/net/hyperv/hyperv_net.h | 33 --------
+ drivers/net/hyperv/netvsc.c | 174 +++-----------------------------------
+ drivers/net/hyperv/netvsc_drv.c | 2 +-
+ drivers/net/hyperv/rndis_filter.c | 2 -
+ 4 files changed, 13 insertions(+), 198 deletions(-)
+
+diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
+index 57eb3f906d64..a1af0f7711e2 100644
+--- a/drivers/net/hyperv/hyperv_net.h
++++ b/drivers/net/hyperv/hyperv_net.h
+@@ -119,27 +119,14 @@ struct ndis_recv_scale_param { /* NDIS_RECEIVE_SCALE_PARAMETERS */
+ };
+
+ /* Fwd declaration */
+-struct hv_netvsc_packet;
+ struct ndis_tcp_ip_checksum_info;
+
+-/* Represent the xfer page packet which contains 1 or more netvsc packet */
+-struct xferpage_packet {
+- struct list_head list_ent;
+- u32 status;
+-
+- /* # of netvsc packets this xfer packet contains */
+- u32 count;
+-
+- struct vmbus_channel *channel;
+-};
+-
+ /*
+ * Represent netvsc packet which contains 1 RNDIS and 1 ethernet frame
+ * within the RNDIS
+ */
+ struct hv_netvsc_packet {
+ /* Bookkeeping stuff */
+- struct list_head list_ent;
+ u32 status;
+
+ struct hv_device *device;
+@@ -149,19 +136,8 @@ struct hv_netvsc_packet {
+ u16 q_idx;
+ struct vmbus_channel *channel;
+
+- /*
+- * Valid only for receives when we break a xfer page packet
+- * into multiple netvsc packets
+- */
+- struct xferpage_packet *xfer_page_pkt;
+-
+ union {
+ struct {
+- u64 recv_completion_tid;
+- void *recv_completion_ctx;
+- void (*recv_completion)(void *context);
+- } recv;
+- struct {
+ u64 send_completion_tid;
+ void *send_completion_ctx;
+ void (*send_completion)(void *context);
+@@ -613,9 +589,6 @@ struct nvsp_message {
+
+ #define NETVSC_RECEIVE_BUFFER_ID 0xcafe
+
+-/* Preallocated receive packets */
+-#define NETVSC_RECEIVE_PACKETLIST_COUNT 256
+-
+ #define NETVSC_PACKET_SIZE 2048
+
+ #define VRSS_SEND_TAB_SIZE 16
+@@ -630,12 +603,6 @@ struct netvsc_device {
+ wait_queue_head_t wait_drain;
+ bool start_remove;
+ bool destroy;
+- /*
+- * List of free preallocated hv_netvsc_packet to represent receive
+- * packet
+- */
+- struct list_head recv_pkt_list;
+- spinlock_t recv_pkt_list_lock;
+
+ /* Receive buffer allocated by us but manages by NetVSP */
+ void *recv_buf;
+diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
+index e7e77f12bc38..b10334773b32 100644
+--- a/drivers/net/hyperv/netvsc.c
++++ b/drivers/net/hyperv/netvsc.c
+@@ -387,7 +387,6 @@ static void netvsc_disconnect_vsp(struct netvsc_device *net_device)
+ int netvsc_device_remove(struct hv_device *device)
+ {
+ struct netvsc_device *net_device;
+- struct hv_netvsc_packet *netvsc_packet, *pos;
+ unsigned long flags;
+
+ net_device = hv_get_drvdata(device);
+@@ -416,12 +415,6 @@ int netvsc_device_remove(struct hv_device *device)
+ vmbus_close(device->channel);
+
+ /* Release all resources */
+- list_for_each_entry_safe(netvsc_packet, pos,
+- &net_device->recv_pkt_list, list_ent) {
+- list_del(&netvsc_packet->list_ent);
+- kfree(netvsc_packet);
+- }
+-
+ if (net_device->sub_cb_buf)
+ vfree(net_device->sub_cb_buf);
+
+@@ -641,62 +634,6 @@ retry_send_cmplt:
+ }
+ }
+
+-/* Send a receive completion packet to RNDIS device (ie NetVsp) */
+-static void netvsc_receive_completion(void *context)
+-{
+- struct hv_netvsc_packet *packet = context;
+- struct hv_device *device = packet->device;
+- struct vmbus_channel *channel;
+- struct netvsc_device *net_device;
+- u64 transaction_id = 0;
+- bool fsend_receive_comp = false;
+- unsigned long flags;
+- struct net_device *ndev;
+- u32 status = NVSP_STAT_NONE;
+-
+- /*
+- * Even though it seems logical to do a GetOutboundNetDevice() here to
+- * send out receive completion, we are using GetInboundNetDevice()
+- * since we may have disable outbound traffic already.
+- */
+- net_device = get_inbound_net_device(device);
+- if (!net_device)
+- return;
+- ndev = net_device->ndev;
+-
+- /* Overloading use of the lock. */
+- spin_lock_irqsave(&net_device->recv_pkt_list_lock, flags);
+-
+- if (packet->status != NVSP_STAT_SUCCESS)
+- packet->xfer_page_pkt->status = NVSP_STAT_FAIL;
+-
+- packet->xfer_page_pkt->count--;
+-
+- /*
+- * Last one in the line that represent 1 xfer page packet.
+- * Return the xfer page packet itself to the freelist
+- */
+- if (packet->xfer_page_pkt->count == 0) {
+- fsend_receive_comp = true;
+- channel = packet->xfer_page_pkt->channel;
+- transaction_id = packet->completion.recv.recv_completion_tid;
+- status = packet->xfer_page_pkt->status;
+- list_add_tail(&packet->xfer_page_pkt->list_ent,
+- &net_device->recv_pkt_list);
+-
+- }
+-
+- /* Put the packet back */
+- list_add_tail(&packet->list_ent, &net_device->recv_pkt_list);
+- spin_unlock_irqrestore(&net_device->recv_pkt_list_lock, flags);
+-
+- /* Send a receive completion for the xfer page packet */
+- if (fsend_receive_comp)
+- netvsc_send_recv_completion(device, channel, net_device,
+- transaction_id, status);
+-
+-}
+-
+ static void netvsc_receive(struct netvsc_device *net_device,
+ struct vmbus_channel *channel,
+ struct hv_device *device,
+@@ -704,16 +641,13 @@ static void netvsc_receive(struct netvsc_device *net_device,
+ {
+ struct vmtransfer_page_packet_header *vmxferpage_packet;
+ struct nvsp_message *nvsp_packet;
+- struct hv_netvsc_packet *netvsc_packet = NULL;
+- /* struct netvsc_driver *netvscDriver; */
+- struct xferpage_packet *xferpage_packet = NULL;
++ struct hv_netvsc_packet nv_pkt;
++ struct hv_netvsc_packet *netvsc_packet = &nv_pkt;
++ u32 status = NVSP_STAT_SUCCESS;
+ int i;
+ int count = 0;
+- unsigned long flags;
+ struct net_device *ndev;
+
+- LIST_HEAD(listHead);
+-
+ ndev = net_device->ndev;
+
+ /*
+@@ -746,78 +680,14 @@ static void netvsc_receive(struct netvsc_device *net_device,
+ return;
+ }
+
+- /*
+- * Grab free packets (range count + 1) to represent this xfer
+- * page packet. +1 to represent the xfer page packet itself.
+- * We grab it here so that we know exactly how many we can
+- * fulfil
+- */
+- spin_lock_irqsave(&net_device->recv_pkt_list_lock, flags);
+- while (!list_empty(&net_device->recv_pkt_list)) {
+- list_move_tail(net_device->recv_pkt_list.next, &listHead);
+- if (++count == vmxferpage_packet->range_cnt + 1)
+- break;
+- }
+- spin_unlock_irqrestore(&net_device->recv_pkt_list_lock, flags);
+-
+- /*
+- * We need at least 2 netvsc pkts (1 to represent the xfer
+- * page and at least 1 for the range) i.e. we can handled
+- * some of the xfer page packet ranges...
+- */
+- if (count < 2) {
+- netdev_err(ndev, "Got only %d netvsc pkt...needed "
+- "%d pkts. Dropping this xfer page packet completely!\n",
+- count, vmxferpage_packet->range_cnt + 1);
+-
+- /* Return it to the freelist */
+- spin_lock_irqsave(&net_device->recv_pkt_list_lock, flags);
+- for (i = count; i != 0; i--) {
+- list_move_tail(listHead.next,
+- &net_device->recv_pkt_list);
+- }
+- spin_unlock_irqrestore(&net_device->recv_pkt_list_lock,
+- flags);
+-
+- netvsc_send_recv_completion(device, channel, net_device,
+- vmxferpage_packet->d.trans_id,
+- NVSP_STAT_FAIL);
+-
+- return;
+- }
+-
+- /* Remove the 1st packet to represent the xfer page packet itself */
+- xferpage_packet = (struct xferpage_packet *)listHead.next;
+- list_del(&xferpage_packet->list_ent);
+- xferpage_packet->status = NVSP_STAT_SUCCESS;
+- xferpage_packet->channel = channel;
+-
+- /* This is how much we can satisfy */
+- xferpage_packet->count = count - 1;
+-
+- if (xferpage_packet->count != vmxferpage_packet->range_cnt) {
+- netdev_err(ndev, "Needed %d netvsc pkts to satisfy "
+- "this xfer page...got %d\n",
+- vmxferpage_packet->range_cnt, xferpage_packet->count);
+- }
++ count = vmxferpage_packet->range_cnt;
++ netvsc_packet->device = device;
++ netvsc_packet->channel = channel;
+
+ /* Each range represents 1 RNDIS pkt that contains 1 ethernet frame */
+- for (i = 0; i < (count - 1); i++) {
+- netvsc_packet = (struct hv_netvsc_packet *)listHead.next;
+- list_del(&netvsc_packet->list_ent);
+-
++ for (i = 0; i < count; i++) {
+ /* Initialize the netvsc packet */
+ netvsc_packet->status = NVSP_STAT_SUCCESS;
+- netvsc_packet->xfer_page_pkt = xferpage_packet;
+- netvsc_packet->completion.recv.recv_completion =
+- netvsc_receive_completion;
+- netvsc_packet->completion.recv.recv_completion_ctx =
+- netvsc_packet;
+- netvsc_packet->device = device;
+- /* Save this so that we can send it back */
+- netvsc_packet->completion.recv.recv_completion_tid =
+- vmxferpage_packet->d.trans_id;
+-
+ netvsc_packet->data = (void *)((unsigned long)net_device->
+ recv_buf + vmxferpage_packet->ranges[i].byte_offset);
+ netvsc_packet->total_data_buflen =
+@@ -826,10 +696,12 @@ static void netvsc_receive(struct netvsc_device *net_device,
+ /* Pass it to the upper layer */
+ rndis_filter_receive(device, netvsc_packet);
+
+- netvsc_receive_completion(netvsc_packet->
+- completion.recv.recv_completion_ctx);
++ if (netvsc_packet->status != NVSP_STAT_SUCCESS)
++ status = NVSP_STAT_FAIL;
+ }
+
++ netvsc_send_recv_completion(device, channel, net_device,
++ vmxferpage_packet->d.trans_id, status);
+ }
+
+
+@@ -956,11 +828,9 @@ void netvsc_channel_cb(void *context)
+ int netvsc_device_add(struct hv_device *device, void *additional_info)
+ {
+ int ret = 0;
+- int i;
+ int ring_size =
+ ((struct netvsc_device_info *)additional_info)->ring_size;
+ struct netvsc_device *net_device;
+- struct hv_netvsc_packet *packet, *pos;
+ struct net_device *ndev;
+
+ net_device = alloc_net_device(device);
+@@ -981,18 +851,6 @@ int netvsc_device_add(struct hv_device *device, void *additional_info)
+ ndev = net_device->ndev;
+
+ /* Initialize the NetVSC channel extension */
+- spin_lock_init(&net_device->recv_pkt_list_lock);
+-
+- INIT_LIST_HEAD(&net_device->recv_pkt_list);
+-
+- for (i = 0; i < NETVSC_RECEIVE_PACKETLIST_COUNT; i++) {
+- packet = kzalloc(sizeof(struct hv_netvsc_packet), GFP_KERNEL);
+- if (!packet)
+- break;
+-
+- list_add_tail(&packet->list_ent,
+- &net_device->recv_pkt_list);
+- }
+ init_completion(&net_device->channel_init_wait);
+
+ set_per_channel_state(device->channel, net_device->cb_buffer);
+@@ -1028,16 +886,8 @@ close:
+
+ cleanup:
+
+- if (net_device) {
+- list_for_each_entry_safe(packet, pos,
+- &net_device->recv_pkt_list,
+- list_ent) {
+- list_del(&packet->list_ent);
+- kfree(packet);
+- }
+-
++ if (net_device)
+ kfree(net_device);
+- }
+
+ return ret;
+ }
+diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
+index e486dbd33f61..6cc4db064fec 100644
+--- a/drivers/net/hyperv/netvsc_drv.c
++++ b/drivers/net/hyperv/netvsc_drv.c
+@@ -643,7 +643,7 @@ int netvsc_recv_callback(struct hv_device *device_obj,
+ __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),
+ packet->vlan_tci);
+
+- skb_record_rx_queue(skb, packet->xfer_page_pkt->channel->
++ skb_record_rx_queue(skb, packet->channel->
+ offermsg.offer.sub_channel_index %
+ net->real_num_rx_queues);
+
+diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
+index d92cfbe43410..48f5a0fbd674 100644
+--- a/drivers/net/hyperv/rndis_filter.c
++++ b/drivers/net/hyperv/rndis_filter.c
+@@ -401,8 +401,6 @@ static void rndis_filter_receive_data(struct rndis_device *dev,
+ pkt->total_data_buflen = rndis_pkt->data_len;
+ pkt->data = (void *)((unsigned long)pkt->data + data_offset);
+
+- pkt->is_data_pkt = true;
+-
+ vlan = rndis_get_ppi(rndis_pkt, IEEE_8021Q_INFO);
+ if (vlan) {
+ pkt->vlan_tci = VLAN_TAG_PRESENT | vlan->vlanid |
+--
+2.4.3
+
diff --git a/src/patches/linux/0018-hyperv-Simplify-the-send_completion-variables.patch b/src/patches/linux/0018-hyperv-Simplify-the-send_completion-variables.patch
new file mode 100644
index 0000000..82b742b
--- /dev/null
+++ b/src/patches/linux/0018-hyperv-Simplify-the-send_completion-variables.patch
@@ -0,0 +1,105 @@
+From d6eeeb452c1e6e7cf14f4a581a8f2ea2c50ec17a Mon Sep 17 00:00:00 2001
+From: Haiyang Zhang <haiyangz(a)microsoft.com>
+Date: Mon, 21 Apr 2014 14:54:44 -0700
+Subject: [PATCH 18/25] hyperv: Simplify the send_completion variables
+
+The union contains only one member now, so we use the variables in it directly.
+
+Signed-off-by: Haiyang Zhang <haiyangz(a)microsoft.com>
+Reviewed-by: K. Y. Srinivasan <kys(a)microsoft.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+---
+ drivers/net/hyperv/hyperv_net.h | 10 +++-------
+ drivers/net/hyperv/netvsc.c | 7 +++----
+ drivers/net/hyperv/netvsc_drv.c | 8 ++++----
+ drivers/net/hyperv/rndis_filter.c | 2 +-
+ 4 files changed, 11 insertions(+), 16 deletions(-)
+
+diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
+index a1af0f7711e2..d1f7826aa75f 100644
+--- a/drivers/net/hyperv/hyperv_net.h
++++ b/drivers/net/hyperv/hyperv_net.h
+@@ -136,13 +136,9 @@ struct hv_netvsc_packet {
+ u16 q_idx;
+ struct vmbus_channel *channel;
+
+- union {
+- struct {
+- u64 send_completion_tid;
+- void *send_completion_ctx;
+- void (*send_completion)(void *context);
+- } send;
+- } completion;
++ u64 send_completion_tid;
++ void *send_completion_ctx;
++ void (*send_completion)(void *context);
+
+ /* This points to the memory after page_buf */
+ struct rndis_message *rndis_msg;
+diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
+index b10334773b32..bbee44635035 100644
+--- a/drivers/net/hyperv/netvsc.c
++++ b/drivers/net/hyperv/netvsc.c
+@@ -479,9 +479,8 @@ static void netvsc_send_completion(struct netvsc_device *net_device,
+ if (nvsc_packet) {
+ q_idx = nvsc_packet->q_idx;
+ channel = nvsc_packet->channel;
+- nvsc_packet->completion.send.send_completion(
+- nvsc_packet->completion.send.
+- send_completion_ctx);
++ nvsc_packet->send_completion(nvsc_packet->
++ send_completion_ctx);
+ }
+
+ num_outstanding_sends =
+@@ -534,7 +533,7 @@ int netvsc_send(struct hv_device *device,
+ 0xFFFFFFFF;
+ sendMessage.msg.v1_msg.send_rndis_pkt.send_buf_section_size = 0;
+
+- if (packet->completion.send.send_completion)
++ if (packet->send_completion)
+ req_id = (ulong)packet;
+ else
+ req_id = 0;
+diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
+index 6cc4db064fec..f3d3525ed42d 100644
+--- a/drivers/net/hyperv/netvsc_drv.c
++++ b/drivers/net/hyperv/netvsc_drv.c
+@@ -235,7 +235,7 @@ static void netvsc_xmit_completion(void *context)
+ {
+ struct hv_netvsc_packet *packet = (struct hv_netvsc_packet *)context;
+ struct sk_buff *skb = (struct sk_buff *)
+- (unsigned long)packet->completion.send.send_completion_tid;
++ (unsigned long)packet->send_completion_tid;
+
+ kfree(packet);
+
+@@ -426,9 +426,9 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
+ (num_data_pgs * sizeof(struct hv_page_buffer)));
+
+ /* Set the completion routine */
+- packet->completion.send.send_completion = netvsc_xmit_completion;
+- packet->completion.send.send_completion_ctx = packet;
+- packet->completion.send.send_completion_tid = (unsigned long)skb;
++ packet->send_completion = netvsc_xmit_completion;
++ packet->send_completion_ctx = packet;
++ packet->send_completion_tid = (unsigned long)skb;
+
+ isvlan = packet->vlan_tci & VLAN_TAG_PRESENT;
+
+diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
+index 48f5a0fbd674..99c527adae5b 100644
+--- a/drivers/net/hyperv/rndis_filter.c
++++ b/drivers/net/hyperv/rndis_filter.c
+@@ -236,7 +236,7 @@ static int rndis_filter_send_request(struct rndis_device *dev,
+ packet->page_buf[0].len;
+ }
+
+- packet->completion.send.send_completion = NULL;
++ packet->send_completion = NULL;
+
+ ret = netvsc_send(dev->net_dev->dev, packet);
+ return ret;
+--
+2.4.3
+
diff --git a/src/patches/linux/0019-hyperv-Enable-sendbuf-mechanism-on-the-send-path.patch b/src/patches/linux/0019-hyperv-Enable-sendbuf-mechanism-on-the-send-path.patch
new file mode 100644
index 0000000..3940865
--- /dev/null
+++ b/src/patches/linux/0019-hyperv-Enable-sendbuf-mechanism-on-the-send-path.patch
@@ -0,0 +1,407 @@
+From 4685e50349d5dc5fe485c898ca3ce539e93a0118 Mon Sep 17 00:00:00 2001
+From: KY Srinivasan <kys(a)microsoft.com>
+Date: Wed, 30 Apr 2014 10:14:31 -0700
+Subject: [PATCH 19/25] hyperv: Enable sendbuf mechanism on the send path
+
+We send packets using a copy-free mechanism (this is the Guest to Host transport
+via VMBUS). While this is obviously optimal for large packets,
+it may not be optimal for small packets. Hyper-V host supports
+a second mechanism for sending packets that is "copy based". We implement that
+mechanism in this patch.
+
+In this version of the patch I have addressed a comment from David Miller.
+
+With this patch (and all of the other offload and VRSS patches), we are now able
+to almost saturate a 10G interface between Linux VMs on Hyper-V
+on different hosts - close to 9 Gbps as measured via iperf.
+
+Signed-off-by: K. Y. Srinivasan <kys(a)microsoft.com>
+Reviewed-by: Haiyang Zhang <haiyangz(a)microsoft.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+---
+ drivers/net/hyperv/hyperv_net.h | 14 +++
+ drivers/net/hyperv/netvsc.c | 226 ++++++++++++++++++++++++++++++++++++++--
+ drivers/net/hyperv/netvsc_drv.c | 3 +-
+ 3 files changed, 234 insertions(+), 9 deletions(-)
+
+diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
+index d1f7826aa75f..4b7df5a5c966 100644
+--- a/drivers/net/hyperv/hyperv_net.h
++++ b/drivers/net/hyperv/hyperv_net.h
+@@ -140,6 +140,8 @@ struct hv_netvsc_packet {
+ void *send_completion_ctx;
+ void (*send_completion)(void *context);
+
++ u32 send_buf_index;
++
+ /* This points to the memory after page_buf */
+ struct rndis_message *rndis_msg;
+
+@@ -582,6 +584,9 @@ struct nvsp_message {
+
+ #define NETVSC_RECEIVE_BUFFER_SIZE (1024*1024*16) /* 16MB */
+ #define NETVSC_RECEIVE_BUFFER_SIZE_LEGACY (1024*1024*15) /* 15MB */
++#define NETVSC_SEND_BUFFER_SIZE (1024 * 1024) /* 1MB */
++#define NETVSC_INVALID_INDEX -1
++
+
+ #define NETVSC_RECEIVE_BUFFER_ID 0xcafe
+
+@@ -607,6 +612,15 @@ struct netvsc_device {
+ u32 recv_section_cnt;
+ struct nvsp_1_receive_buffer_section *recv_section;
+
++ /* Send buffer allocated by us */
++ void *send_buf;
++ u32 send_buf_size;
++ u32 send_buf_gpadl_handle;
++ u32 send_section_cnt;
++ u32 send_section_size;
++ unsigned long *send_section_map;
++ int map_words;
++
+ /* Used for NetVSP initialization protocol */
+ struct completion channel_init_wait;
+ struct nvsp_message channel_init_pkt;
+diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
+index bbee44635035..c041f63a6d30 100644
+--- a/drivers/net/hyperv/netvsc.c
++++ b/drivers/net/hyperv/netvsc.c
+@@ -28,6 +28,7 @@
+ #include <linux/slab.h>
+ #include <linux/netdevice.h>
+ #include <linux/if_ether.h>
++#include <asm/sync_bitops.h>
+
+ #include "hyperv_net.h"
+
+@@ -80,7 +81,7 @@ get_in_err:
+ }
+
+
+-static int netvsc_destroy_recv_buf(struct netvsc_device *net_device)
++static int netvsc_destroy_buf(struct netvsc_device *net_device)
+ {
+ struct nvsp_message *revoke_packet;
+ int ret = 0;
+@@ -146,10 +147,62 @@ static int netvsc_destroy_recv_buf(struct netvsc_device *net_device)
+ net_device->recv_section = NULL;
+ }
+
++ /* Deal with the send buffer we may have setup.
++ * If we got a send section size, it means we received a
++ * SendsendBufferComplete msg (ie sent
++ * NvspMessage1TypeSendReceiveBuffer msg) therefore, we need
++ * to send a revoke msg here
++ */
++ if (net_device->send_section_size) {
++ /* Send the revoke receive buffer */
++ revoke_packet = &net_device->revoke_packet;
++ memset(revoke_packet, 0, sizeof(struct nvsp_message));
++
++ revoke_packet->hdr.msg_type =
++ NVSP_MSG1_TYPE_REVOKE_SEND_BUF;
++ revoke_packet->msg.v1_msg.revoke_recv_buf.id = 0;
++
++ ret = vmbus_sendpacket(net_device->dev->channel,
++ revoke_packet,
++ sizeof(struct nvsp_message),
++ (unsigned long)revoke_packet,
++ VM_PKT_DATA_INBAND, 0);
++ /* If we failed here, we might as well return and
++ * have a leak rather than continue and a bugchk
++ */
++ if (ret != 0) {
++ netdev_err(ndev, "unable to send "
++ "revoke send buffer to netvsp\n");
++ return ret;
++ }
++ }
++ /* Teardown the gpadl on the vsp end */
++ if (net_device->send_buf_gpadl_handle) {
++ ret = vmbus_teardown_gpadl(net_device->dev->channel,
++ net_device->send_buf_gpadl_handle);
++
++ /* If we failed here, we might as well return and have a leak
++ * rather than continue and a bugchk
++ */
++ if (ret != 0) {
++ netdev_err(ndev,
++ "unable to teardown send buffer's gpadl\n");
++ return ret;
++ }
++ net_device->recv_buf_gpadl_handle = 0;
++ }
++ if (net_device->send_buf) {
++ /* Free up the receive buffer */
++ free_pages((unsigned long)net_device->send_buf,
++ get_order(net_device->send_buf_size));
++ net_device->send_buf = NULL;
++ }
++ kfree(net_device->send_section_map);
++
+ return ret;
+ }
+
+-static int netvsc_init_recv_buf(struct hv_device *device)
++static int netvsc_init_buf(struct hv_device *device)
+ {
+ int ret = 0;
+ int t;
+@@ -248,10 +301,90 @@ static int netvsc_init_recv_buf(struct hv_device *device)
+ goto cleanup;
+ }
+
++ /* Now setup the send buffer.
++ */
++ net_device->send_buf =
++ (void *)__get_free_pages(GFP_KERNEL|__GFP_ZERO,
++ get_order(net_device->send_buf_size));
++ if (!net_device->send_buf) {
++ netdev_err(ndev, "unable to allocate send "
++ "buffer of size %d\n", net_device->send_buf_size);
++ ret = -ENOMEM;
++ goto cleanup;
++ }
++
++ /* Establish the gpadl handle for this buffer on this
++ * channel. Note: This call uses the vmbus connection rather
++ * than the channel to establish the gpadl handle.
++ */
++ ret = vmbus_establish_gpadl(device->channel, net_device->send_buf,
++ net_device->send_buf_size,
++ &net_device->send_buf_gpadl_handle);
++ if (ret != 0) {
++ netdev_err(ndev,
++ "unable to establish send buffer's gpadl\n");
++ goto cleanup;
++ }
++
++ /* Notify the NetVsp of the gpadl handle */
++ init_packet = &net_device->channel_init_pkt;
++ memset(init_packet, 0, sizeof(struct nvsp_message));
++ init_packet->hdr.msg_type = NVSP_MSG1_TYPE_SEND_SEND_BUF;
++ init_packet->msg.v1_msg.send_recv_buf.gpadl_handle =
++ net_device->send_buf_gpadl_handle;
++ init_packet->msg.v1_msg.send_recv_buf.id = 0;
++
++ /* Send the gpadl notification request */
++ ret = vmbus_sendpacket(device->channel, init_packet,
++ sizeof(struct nvsp_message),
++ (unsigned long)init_packet,
++ VM_PKT_DATA_INBAND,
++ VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
++ if (ret != 0) {
++ netdev_err(ndev,
++ "unable to send send buffer's gpadl to netvsp\n");
++ goto cleanup;
++ }
++
++ t = wait_for_completion_timeout(&net_device->channel_init_wait, 5*HZ);
++ BUG_ON(t == 0);
++
++ /* Check the response */
++ if (init_packet->msg.v1_msg.
++ send_send_buf_complete.status != NVSP_STAT_SUCCESS) {
++ netdev_err(ndev, "Unable to complete send buffer "
++ "initialization with NetVsp - status %d\n",
++ init_packet->msg.v1_msg.
++ send_recv_buf_complete.status);
++ ret = -EINVAL;
++ goto cleanup;
++ }
++
++ /* Parse the response */
++ net_device->send_section_size = init_packet->msg.
++ v1_msg.send_send_buf_complete.section_size;
++
++ /* Section count is simply the size divided by the section size.
++ */
++ net_device->send_section_cnt =
++ net_device->send_buf_size/net_device->send_section_size;
++
++ dev_info(&device->device, "Send section size: %d, Section count:%d\n",
++ net_device->send_section_size, net_device->send_section_cnt);
++
++ /* Setup state for managing the send buffer. */
++ net_device->map_words = DIV_ROUND_UP(net_device->send_section_cnt,
++ BITS_PER_LONG);
++
++ net_device->send_section_map =
++ kzalloc(net_device->map_words * sizeof(ulong), GFP_KERNEL);
++ if (net_device->send_section_map == NULL)
++ goto cleanup;
++
+ goto exit;
+
+ cleanup:
+- netvsc_destroy_recv_buf(net_device);
++ netvsc_destroy_buf(net_device);
+
+ exit:
+ return ret;
+@@ -369,8 +502,9 @@ static int netvsc_connect_vsp(struct hv_device *device)
+ net_device->recv_buf_size = NETVSC_RECEIVE_BUFFER_SIZE_LEGACY;
+ else
+ net_device->recv_buf_size = NETVSC_RECEIVE_BUFFER_SIZE;
++ net_device->send_buf_size = NETVSC_SEND_BUFFER_SIZE;
+
+- ret = netvsc_init_recv_buf(device);
++ ret = netvsc_init_buf(device);
+
+ cleanup:
+ return ret;
+@@ -378,7 +512,7 @@ cleanup:
+
+ static void netvsc_disconnect_vsp(struct netvsc_device *net_device)
+ {
+- netvsc_destroy_recv_buf(net_device);
++ netvsc_destroy_buf(net_device);
+ }
+
+ /*
+@@ -440,6 +574,12 @@ static inline u32 hv_ringbuf_avail_percent(
+ return avail_write * 100 / ring_info->ring_datasize;
+ }
+
++static inline void netvsc_free_send_slot(struct netvsc_device *net_device,
++ u32 index)
++{
++ sync_change_bit(index, net_device->send_section_map);
++}
++
+ static void netvsc_send_completion(struct netvsc_device *net_device,
+ struct hv_device *device,
+ struct vmpacket_descriptor *packet)
+@@ -447,6 +587,7 @@ static void netvsc_send_completion(struct netvsc_device *net_device,
+ struct nvsp_message *nvsp_packet;
+ struct hv_netvsc_packet *nvsc_packet;
+ struct net_device *ndev;
++ u32 send_index;
+
+ ndev = net_device->ndev;
+
+@@ -477,6 +618,9 @@ static void netvsc_send_completion(struct netvsc_device *net_device,
+
+ /* Notify the layer above us */
+ if (nvsc_packet) {
++ send_index = nvsc_packet->send_buf_index;
++ if (send_index != NETVSC_INVALID_INDEX)
++ netvsc_free_send_slot(net_device, send_index);
+ q_idx = nvsc_packet->q_idx;
+ channel = nvsc_packet->channel;
+ nvsc_packet->send_completion(nvsc_packet->
+@@ -504,6 +648,52 @@ static void netvsc_send_completion(struct netvsc_device *net_device,
+
+ }
+
++static u32 netvsc_get_next_send_section(struct netvsc_device *net_device)
++{
++ unsigned long index;
++ u32 max_words = net_device->map_words;
++ unsigned long *map_addr = (unsigned long *)net_device->send_section_map;
++ u32 section_cnt = net_device->send_section_cnt;
++ int ret_val = NETVSC_INVALID_INDEX;
++ int i;
++ int prev_val;
++
++ for (i = 0; i < max_words; i++) {
++ if (!~(map_addr[i]))
++ continue;
++ index = ffz(map_addr[i]);
++ prev_val = sync_test_and_set_bit(index, &map_addr[i]);
++ if (prev_val)
++ continue;
++ if ((index + (i * BITS_PER_LONG)) >= section_cnt)
++ break;
++ ret_val = (index + (i * BITS_PER_LONG));
++ break;
++ }
++ return ret_val;
++}
++
++u32 netvsc_copy_to_send_buf(struct netvsc_device *net_device,
++ unsigned int section_index,
++ struct hv_netvsc_packet *packet)
++{
++ char *start = net_device->send_buf;
++ char *dest = (start + (section_index * net_device->send_section_size));
++ int i;
++ u32 msg_size = 0;
++
++ for (i = 0; i < packet->page_buf_cnt; i++) {
++ char *src = phys_to_virt(packet->page_buf[i].pfn << PAGE_SHIFT);
++ u32 offset = packet->page_buf[i].offset;
++ u32 len = packet->page_buf[i].len;
++
++ memcpy(dest, (src + offset), len);
++ msg_size += len;
++ dest += len;
++ }
++ return msg_size;
++}
++
+ int netvsc_send(struct hv_device *device,
+ struct hv_netvsc_packet *packet)
+ {
+@@ -513,6 +703,10 @@ int netvsc_send(struct hv_device *device,
+ struct net_device *ndev;
+ struct vmbus_channel *out_channel = NULL;
+ u64 req_id;
++ unsigned int section_index = NETVSC_INVALID_INDEX;
++ u32 msg_size = 0;
++ struct sk_buff *skb;
++
+
+ net_device = get_outbound_net_device(device);
+ if (!net_device)
+@@ -528,10 +722,26 @@ int netvsc_send(struct hv_device *device,
+ sendMessage.msg.v1_msg.send_rndis_pkt.channel_type = 1;
+ }
+
+- /* Not using send buffer section */
++ /* Attempt to send via sendbuf */
++ if (packet->total_data_buflen < net_device->send_section_size) {
++ section_index = netvsc_get_next_send_section(net_device);
++ if (section_index != NETVSC_INVALID_INDEX) {
++ msg_size = netvsc_copy_to_send_buf(net_device,
++ section_index,
++ packet);
++ skb = (struct sk_buff *)
++ (unsigned long)packet->send_completion_tid;
++ if (skb)
++ dev_kfree_skb_any(skb);
++ packet->page_buf_cnt = 0;
++ }
++ }
++ packet->send_buf_index = section_index;
++
++
+ sendMessage.msg.v1_msg.send_rndis_pkt.send_buf_section_index =
+- 0xFFFFFFFF;
+- sendMessage.msg.v1_msg.send_rndis_pkt.send_buf_section_size = 0;
++ section_index;
++ sendMessage.msg.v1_msg.send_rndis_pkt.send_buf_section_size = msg_size;
+
+ if (packet->send_completion)
+ req_id = (ulong)packet;
+diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
+index f3d3525ed42d..9a19aa5672e6 100644
+--- a/drivers/net/hyperv/netvsc_drv.c
++++ b/drivers/net/hyperv/netvsc_drv.c
+@@ -236,10 +236,11 @@ static void netvsc_xmit_completion(void *context)
+ struct hv_netvsc_packet *packet = (struct hv_netvsc_packet *)context;
+ struct sk_buff *skb = (struct sk_buff *)
+ (unsigned long)packet->send_completion_tid;
++ u32 index = packet->send_buf_index;
+
+ kfree(packet);
+
+- if (skb)
++ if (skb && (index == NETVSC_INVALID_INDEX))
+ dev_kfree_skb_any(skb);
+ }
+
+--
+2.4.3
+
diff --git a/src/patches/linux/0020-Add-support-for-netvsc-build-without-CONFIG_SYSFS-fl.patch b/src/patches/linux/0020-Add-support-for-netvsc-build-without-CONFIG_SYSFS-fl.patch
new file mode 100644
index 0000000..b610b54
--- /dev/null
+++ b/src/patches/linux/0020-Add-support-for-netvsc-build-without-CONFIG_SYSFS-fl.patch
@@ -0,0 +1,42 @@
+From 3f0b77385356301cf4718a94f76a4068588ecb8e Mon Sep 17 00:00:00 2001
+From: Haiyang Zhang <haiyangz(a)microsoft.com>
+Date: Thu, 8 May 2014 15:14:10 -0700
+Subject: [PATCH 20/25] Add support for netvsc build without CONFIG_SYSFS flag
+
+This change ensures the driver can be built successfully without the
+CONFIG_SYSFS flag.
+MS-TFS: 182270
+
+Signed-off-by: Haiyang Zhang <haiyangz(a)microsoft.com>
+Reviewed-by: K. Y. Srinivasan <kys(a)microsoft.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+---
+ drivers/net/hyperv/netvsc_drv.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
+index 9a19aa5672e6..346f1aeb9c24 100644
+--- a/drivers/net/hyperv/netvsc_drv.c
++++ b/drivers/net/hyperv/netvsc_drv.c
+@@ -645,8 +645,7 @@ int netvsc_recv_callback(struct hv_device *device_obj,
+ packet->vlan_tci);
+
+ skb_record_rx_queue(skb, packet->channel->
+- offermsg.offer.sub_channel_index %
+- net->real_num_rx_queues);
++ offermsg.offer.sub_channel_index);
+
+ net->stats.rx_packets++;
+ net->stats.rx_bytes += packet->total_data_buflen;
+@@ -829,8 +828,6 @@ static int netvsc_probe(struct hv_device *dev,
+ nvdev = hv_get_drvdata(dev);
+ netif_set_real_num_tx_queues(net, nvdev->num_chn);
+ netif_set_real_num_rx_queues(net, nvdev->num_chn);
+- dev_info(&dev->device, "real num tx,rx queues:%u, %u\n",
+- net->real_num_tx_queues, net->real_num_rx_queues);
+
+ ret = register_netdev(net);
+ if (ret != 0) {
+--
+2.4.3
+
diff --git a/src/patches/linux/0021-hyperv-Add-hash-value-into-RNDIS-Per-packet-info.patch b/src/patches/linux/0021-hyperv-Add-hash-value-into-RNDIS-Per-packet-info.patch
new file mode 100644
index 0000000..c522d28
--- /dev/null
+++ b/src/patches/linux/0021-hyperv-Add-hash-value-into-RNDIS-Per-packet-info.patch
@@ -0,0 +1,93 @@
+From 1267d9b235e7612f8cdfa842a0433bb82e75f7fb Mon Sep 17 00:00:00 2001
+From: Haiyang Zhang <haiyangz(a)microsoft.com>
+Date: Wed, 21 May 2014 12:55:39 -0700
+Subject: [PATCH 21/25] hyperv: Add hash value into RNDIS Per-packet info
+
+It passes the hash value as the RNDIS Per-packet info to the Hyper-V host,
+so that the send completion notices can be spread across multiple channels.
+MS-TFS: 140273
+
+Signed-off-by: Haiyang Zhang <haiyangz(a)microsoft.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+---
+ drivers/net/hyperv/hyperv_net.h | 4 ++++
+ drivers/net/hyperv/netvsc_drv.c | 18 ++++++++++++++----
+ 2 files changed, 18 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
+index 4b7df5a5c966..6cc37c15e0bf 100644
+--- a/drivers/net/hyperv/hyperv_net.h
++++ b/drivers/net/hyperv/hyperv_net.h
+@@ -791,6 +791,7 @@ enum ndis_per_pkt_info_type {
+ IEEE_8021Q_INFO,
+ ORIGINAL_PKTINFO,
+ PACKET_CANCEL_ID,
++ NBL_HASH_VALUE = PACKET_CANCEL_ID,
+ ORIGINAL_NET_BUFLIST,
+ CACHED_NET_BUFLIST,
+ SHORT_PKT_PADINFO,
+@@ -937,6 +938,9 @@ struct ndis_tcp_lso_info {
+ #define NDIS_LSO_PPI_SIZE (sizeof(struct rndis_per_packet_info) + \
+ sizeof(struct ndis_tcp_lso_info))
+
++#define NDIS_HASH_PPI_SIZE (sizeof(struct rndis_per_packet_info) + \
++ sizeof(u32))
++
+ /* Format of Information buffer passed in a SetRequest for the OID */
+ /* OID_GEN_RNDIS_CONFIG_PARAMETER. */
+ struct rndis_config_parameter_info {
+diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
+index 346f1aeb9c24..bd3b3acd04dc 100644
+--- a/drivers/net/hyperv/netvsc_drv.c
++++ b/drivers/net/hyperv/netvsc_drv.c
+@@ -224,9 +224,11 @@ static u16 netvsc_select_queue(struct net_device *ndev, struct sk_buff *skb,
+ if (nvsc_dev == NULL || ndev->real_num_tx_queues <= 1)
+ return 0;
+
+- if (netvsc_set_hash(&hash, skb))
++ if (netvsc_set_hash(&hash, skb)) {
+ q_idx = nvsc_dev->send_table[hash % VRSS_SEND_TAB_SIZE] %
+ ndev->real_num_tx_queues;
++ skb_set_hash(skb, hash, PKT_HASH_TYPE_L3);
++ }
+
+ return q_idx;
+ }
+@@ -385,6 +387,7 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
+ struct ndis_tcp_lso_info *lso_info;
+ int hdr_offset;
+ u32 net_trans_info;
++ u32 hash;
+
+
+ /* We will atmost need two pages to describe the rndis
+@@ -403,9 +406,8 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
+ packet = kzalloc(sizeof(struct hv_netvsc_packet) +
+ (num_data_pgs * sizeof(struct hv_page_buffer)) +
+ sizeof(struct rndis_message) +
+- NDIS_VLAN_PPI_SIZE +
+- NDIS_CSUM_PPI_SIZE +
+- NDIS_LSO_PPI_SIZE, GFP_ATOMIC);
++ NDIS_VLAN_PPI_SIZE + NDIS_CSUM_PPI_SIZE +
++ NDIS_LSO_PPI_SIZE + NDIS_HASH_PPI_SIZE, GFP_ATOMIC);
+ if (!packet) {
+ /* out of memory, drop packet */
+ netdev_err(net, "unable to allocate hv_netvsc_packet\n");
+@@ -444,6 +446,14 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
+
+ rndis_msg_size = RNDIS_MESSAGE_SIZE(struct rndis_packet);
+
++ hash = skb_get_hash_raw(skb);
++ if (hash != 0 && net->real_num_tx_queues > 1) {
++ rndis_msg_size += NDIS_HASH_PPI_SIZE;
++ ppi = init_ppi_data(rndis_msg, NDIS_HASH_PPI_SIZE,
++ NBL_HASH_VALUE);
++ *(u32 *)((void *)ppi + ppi->ppi_offset) = hash;
++ }
++
+ if (isvlan) {
+ struct ndis_pkt_8021q_info *vlan;
+
+--
+2.4.3
+
diff --git a/src/patches/linux/0022-hyperv-fix-apparent-cut-n-paste-error-in-send-path-t.patch b/src/patches/linux/0022-hyperv-fix-apparent-cut-n-paste-error-in-send-path-t.patch
new file mode 100644
index 0000000..d849ebb
--- /dev/null
+++ b/src/patches/linux/0022-hyperv-fix-apparent-cut-n-paste-error-in-send-path-t.patch
@@ -0,0 +1,32 @@
+From ee99150c7f34737e4382e7199d2ffe3dfbb54a5c Mon Sep 17 00:00:00 2001
+From: Dave Jones <davej(a)redhat.com>
+Date: Mon, 16 Jun 2014 16:59:02 -0400
+Subject: [PATCH 22/25] hyperv: fix apparent cut-n-paste error in send path
+ teardown
+
+c25aaf814a63: "hyperv: Enable sendbuf mechanism on the send path" added
+some teardown code that looks like it was copied from the recieve path
+above, but missed a variable name replacement.
+
+Signed-off-by: Dave Jones <davej(a)redhat.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+---
+ drivers/net/hyperv/netvsc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
+index c041f63a6d30..4ed38eaecea8 100644
+--- a/drivers/net/hyperv/netvsc.c
++++ b/drivers/net/hyperv/netvsc.c
+@@ -189,7 +189,7 @@ static int netvsc_destroy_buf(struct netvsc_device *net_device)
+ "unable to teardown send buffer's gpadl\n");
+ return ret;
+ }
+- net_device->recv_buf_gpadl_handle = 0;
++ net_device->send_buf_gpadl_handle = 0;
+ }
+ if (net_device->send_buf) {
+ /* Free up the receive buffer */
+--
+2.4.3
+
diff --git a/src/patches/linux/0023-hyperv-Fix-error-return-code-in-netvsc_init_buf.patch b/src/patches/linux/0023-hyperv-Fix-error-return-code-in-netvsc_init_buf.patch
new file mode 100644
index 0000000..ab0960d
--- /dev/null
+++ b/src/patches/linux/0023-hyperv-Fix-error-return-code-in-netvsc_init_buf.patch
@@ -0,0 +1,34 @@
+From f1009dfec7c439a958bd9ed8893dd6aa692c61f5 Mon Sep 17 00:00:00 2001
+From: Wei Yongjun <yongjun_wei(a)trendmicro.com.cn>
+Date: Wed, 23 Jul 2014 09:00:35 +0800
+Subject: [PATCH 23/25] hyperv: Fix error return code in netvsc_init_buf()
+
+Fix to return -ENOMEM from the kalloc error handling
+case instead of 0.
+
+Signed-off-by: Wei Yongjun <yongjun_wei(a)trendmicro.com.cn>
+Reviewed-by: Haiyang Zhang <haiyangz(a)microsoft.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+---
+ drivers/net/hyperv/netvsc.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
+index 4ed38eaecea8..d97d5f39a04e 100644
+--- a/drivers/net/hyperv/netvsc.c
++++ b/drivers/net/hyperv/netvsc.c
+@@ -378,8 +378,10 @@ static int netvsc_init_buf(struct hv_device *device)
+
+ net_device->send_section_map =
+ kzalloc(net_device->map_words * sizeof(ulong), GFP_KERNEL);
+- if (net_device->send_section_map == NULL)
++ if (net_device->send_section_map == NULL) {
++ ret = -ENOMEM;
+ goto cleanup;
++ }
+
+ goto exit;
+
+--
+2.4.3
+
diff --git a/src/patches/linux/0024-hyperv-Fix-a-bug-in-netvsc_send.patch b/src/patches/linux/0024-hyperv-Fix-a-bug-in-netvsc_send.patch
new file mode 100644
index 0000000..8495fa2
--- /dev/null
+++ b/src/patches/linux/0024-hyperv-Fix-a-bug-in-netvsc_send.patch
@@ -0,0 +1,68 @@
+From 38bca2d5bd6fdaa0b8e1e415f79d89322c6825a8 Mon Sep 17 00:00:00 2001
+From: KY Srinivasan <kys(a)microsoft.com>
+Date: Sun, 5 Oct 2014 10:42:51 -0700
+Subject: [PATCH 24/25] hyperv: Fix a bug in netvsc_send()
+
+[ Upstream commit 3a67c9ccad926a168d8b7891537a452018368a5b ]
+
+After the packet is successfully sent, we should not touch the packet
+as it may have been freed. This patch is based on the work done by
+Long Li <longli(a)microsoft.com>.
+
+David, please queue this up for stable.
+
+Signed-off-by: K. Y. Srinivasan <kys(a)microsoft.com>
+Reported-by: Sitsofe Wheeler <sitsofe(a)yahoo.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
+---
+ drivers/net/hyperv/netvsc.c | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
+index d97d5f39a04e..7edf976ecfa0 100644
+--- a/drivers/net/hyperv/netvsc.c
++++ b/drivers/net/hyperv/netvsc.c
+@@ -708,6 +708,7 @@ int netvsc_send(struct hv_device *device,
+ unsigned int section_index = NETVSC_INVALID_INDEX;
+ u32 msg_size = 0;
+ struct sk_buff *skb;
++ u16 q_idx = packet->q_idx;
+
+
+ net_device = get_outbound_net_device(device);
+@@ -772,24 +773,24 @@ int netvsc_send(struct hv_device *device,
+
+ if (ret == 0) {
+ atomic_inc(&net_device->num_outstanding_sends);
+- atomic_inc(&net_device->queue_sends[packet->q_idx]);
++ atomic_inc(&net_device->queue_sends[q_idx]);
+
+ if (hv_ringbuf_avail_percent(&out_channel->outbound) <
+ RING_AVAIL_PERCENT_LOWATER) {
+ netif_tx_stop_queue(netdev_get_tx_queue(
+- ndev, packet->q_idx));
++ ndev, q_idx));
+
+ if (atomic_read(&net_device->
+- queue_sends[packet->q_idx]) < 1)
++ queue_sends[q_idx]) < 1)
+ netif_tx_wake_queue(netdev_get_tx_queue(
+- ndev, packet->q_idx));
++ ndev, q_idx));
+ }
+ } else if (ret == -EAGAIN) {
+ netif_tx_stop_queue(netdev_get_tx_queue(
+- ndev, packet->q_idx));
+- if (atomic_read(&net_device->queue_sends[packet->q_idx]) < 1) {
++ ndev, q_idx));
++ if (atomic_read(&net_device->queue_sends[q_idx]) < 1) {
+ netif_tx_wake_queue(netdev_get_tx_queue(
+- ndev, packet->q_idx));
++ ndev, q_idx));
+ ret = -ENOSPC;
+ }
+ } else {
+--
+2.4.3
+
diff --git a/src/patches/linux/0025-Drivers-hv-vmbus-Support-per-channel-driver-state.patch b/src/patches/linux/0025-Drivers-hv-vmbus-Support-per-channel-driver-state.patch
new file mode 100644
index 0000000..47037be
--- /dev/null
+++ b/src/patches/linux/0025-Drivers-hv-vmbus-Support-per-channel-driver-state.patch
@@ -0,0 +1,51 @@
+From 4b71288758aa1d510402b84ca93b1ef566575d22 Mon Sep 17 00:00:00 2001
+From: "K. Y. Srinivasan" <kys(a)microsoft.com>
+Date: Mon, 3 Feb 2014 12:42:45 -0800
+Subject: [PATCH 25/25] Drivers: hv: vmbus: Support per-channel driver state
+
+As we implement Virtual Receive Side Scaling on the networking side
+(the VRSS patches are currently under review), it will be useful to have
+per-channel state that vmbus drivers can manage. Add support for
+managing per-channel state.
+
+Signed-off-by: K. Y. Srinivasan <kys(a)microsoft.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
+---
+ include/linux/hyperv.h | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h
+index 6088058a3e00..732dc7e37e96 100644
+--- a/include/linux/hyperv.h
++++ b/include/linux/hyperv.h
+@@ -1045,6 +1045,10 @@ struct vmbus_channel {
+ * This will be NULL for the primary channel.
+ */
+ struct vmbus_channel *primary_channel;
++ /*
++ * Support per-channel state for use by vmbus drivers.
++ */
++ void *per_channel_state;
+ };
+
+ static inline void set_channel_read_state(struct vmbus_channel *c, bool state)
+@@ -1052,6 +1056,16 @@ static inline void set_channel_read_state(struct vmbus_channel *c, bool state)
+ c->batched_reading = state;
+ }
+
++static inline void set_per_channel_state(struct vmbus_channel *c, void *s)
++{
++ c->per_channel_state = s;
++}
++
++static inline void *get_per_channel_state(struct vmbus_channel *c)
++{
++ return c->per_channel_state;
++}
++
+ void vmbus_onmessage(void *context);
+
+ int vmbus_request_offers(void);
+--
+2.4.3
+
hooks/post-receive
--
IPFire 2.x development tree
1
0