linux.git/drivers/net/usb, branch v4.5-rc2 Linux kernel source tree Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-01-12T04:55:43+00:00 David S. Miller davem@davemloft.net 2016-01-12T04:55:43+00:00 9d367eddf363553c7668ba92c3b9d187ec4f71f7 Conflicts: drivers/net/bonding/bond_main.c drivers/net/ethernet/mellanox/mlxsw/spectrum.h drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c The bond_main.c and mellanox switch conflicts were cases of overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net> 
Conflicts:
	drivers/net/bonding/bond_main.c
	drivers/net/ethernet/mellanox/mlxsw/spectrum.h
	drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c

The bond_main.c and mellanox switch conflicts were cases of
overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
net: qmi_wwan: Add SIMCom 7230E 2016-01-10T22:55:34+00:00 Kristian Evensen kristian.evensen@gmail.com 2016-01-07T15:41:33+00:00 18715b261541f35ccede9b8686ee3ebaac697d38 SIMCom 7230E is a QMI LTE module with support for most "normal" bands. Manual testing has showed that only interface five works. Cc: Bjørn Mork <bjorn@mork.no> Signed-off-by: Kristian Evensen <kristian.evensen@gmail.com> Acked-by: Bjørn Mork <bjorn@mork.no> Signed-off-by: David S. Miller <davem@davemloft.net> 
SIMCom 7230E is a QMI LTE module with support for most "normal" bands.
Manual testing has showed that only interface five works.

Cc: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Kristian Evensen <kristian.evensen@gmail.com>
Acked-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: David S. Miller <davem@davemloft.net>
cdc-acm: fix NULL pointer reference 2016-01-10T02:00:24+00:00 Oliver Neukum oneukum@suse.com 2016-01-07T10:01:00+00:00 29c6dd591bbd592472247441de9fa694acdabae8 The union descriptor must be checked. Its usage was conditional before the parser was introduced. This is important, because many RNDIS device, which also use the common parser, have bogus extra descriptors. Signed-off-by: Oliver Neukum <oneukum@suse.com> Tested-by: Vasily Galkin <galkin-vv@yandex.ru> Signed-off-by: David S. Miller <davem@davemloft.net> 
The union descriptor must be checked. Its usage was conditional
before the parser was introduced. This is important, because
many RNDIS device, which also use the common parser, have
bogus extra descriptors.

Signed-off-by: Oliver Neukum <oneukum@suse.com>
Tested-by: Vasily Galkin <galkin-vv@yandex.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
r8152: adjust ALDPS function 2016-01-09T02:57:17+00:00 hayeswang hayeswang@realtek.com 2016-01-07T09:51:12+00:00 cda9fb01dc3cafd718b2865b447e869bf6624ddd Replace disable_aldps() and enable_aldps() with aldps_en(). Signed-off-by: Hayes Wang <hayeswang@realtek.com> Signed-off-by: David S. Miller <davem@davemloft.net> 
Replace disable_aldps() and enable_aldps() with aldps_en().

Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
r8152: use test_and_clear_bit 2016-01-09T02:57:17+00:00 hayeswang hayeswang@realtek.com 2016-01-07T09:51:11+00:00 216a8349d3a0dd1bc2afbcc821e374c8f929bd62 Replace test_bit() followed by clear_bit() with test_and_clear_bit(). Signed-off-by: Hayes Wang <hayeswang@realtek.com> Signed-off-by: David S. Miller <davem@davemloft.net> 
Replace test_bit() followed by clear_bit() with test_and_clear_bit().

Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
r8152: fix the wake event 2016-01-09T02:50:18+00:00 hayeswang hayeswang@realtek.com 2016-01-07T09:12:17+00:00 5ee3c60c8d3b88cab6496c9b7d49a01576dd9cf9 When the autosuspend is enabled and occurs before system suspend, we should wake the device before running system syspend. Then, we could change the wake event for system suspend. Otherwise, the device would resume the system when receiving any packet. Signed-off-by: Hayes Wang <hayeswang@realtek.com> Signed-off-by: David S. Miller <davem@davemloft.net> 
When the autosuspend is enabled and occurs before system suspend, we should
wake the device before running system syspend. Then, we could change the wake
event for system suspend. Otherwise, the device would resume the system when
receiving any packet.

Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net: lan78xx: Fix to write to OTP(One Time Programmable) per magic number. 2016-01-07T21:39:34+00:00 Woojung.Huh@microchip.com Woojung.Huh@microchip.com 2016-01-05T17:29:59+00:00 9fb6066d0de0353622ee572e2b0e979bd62bb657 This patch fixes a bug writing to EEPROM in lan78xx_ethtool_set_eeprom() when asked to write to OTP. Signed-off-by: Woojung Huh <woojung.huh@microchip.com> Signed-off-by: David S. Miller <davem@davemloft.net> 
This patch fixes a bug writing to EEPROM in lan78xx_ethtool_set_eeprom()
when asked to write to OTP.

Signed-off-by: Woojung Huh <woojung.huh@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
mdio: Move allocation of interrupts into core 2016-01-07T19:31:26+00:00 Andrew Lunn andrew@lunn.ch 2016-01-06T19:11:15+00:00 e7f4dc3536a40097f95103ddf98dd55b3a980f5b Have mdio_alloc() create the array of interrupt numbers, and initialize it to POLLING. This is what most MDIO drivers want, so allowing code to be removed from the drivers. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> 
Have mdio_alloc() create the array of interrupt numbers, and
initialize it to POLLING. This is what most MDIO drivers want, so
allowing code to be removed from the drivers.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-01-07T03:54:18+00:00 David S. Miller davem@davemloft.net 2016-01-07T03:54:18+00:00 9e0efaf6b41bf22c2eb81258fc2a6f1538a643e5 






net: qmi_wwan: Add WeTelecom-WPD600N
2016-01-06T20:50:00+00:00

Kristian Evensen
kristian.evensen@gmail.com

2016-01-06T13:15:50+00:00

e439bd4a4fdeb29488f48f14845ad35607e6302c

The WeTelecom-WPD600N is an LTE module that, in addition to supporting most
"normal" bands, also supports LTE over 450MHz. Manual testing showed that
only interface number three replies to QMI messages.

Cc: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Kristian Evensen <kristian.evensen@gmail.com>
Acked-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: David S. Miller <davem@davemloft.net>





The WeTelecom-WPD600N is an LTE module that, in addition to supporting most
"normal" bands, also supports LTE over 450MHz. Manual testing showed that
only interface number three replies to QMI messages.

Cc: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Kristian Evensen <kristian.evensen@gmail.com>
Acked-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: David S. Miller <davem@davemloft.net>