David S. Miller 3118e6e19d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

The UDP offload conflict is dealt with by simply taking what is
in net-next where we have removed all of the UFO handling code
entirely.

The TCP conflict was a case of local variables in a function
being removed from both net and net-next.

In netvsc we had an assignment right next to where a missing
set of u64 stats sync object inits were added.

Signed-off-by: David S. Miller <davem@davemloft.net>

2017-08-09 16:28:45 -07:00

..

asix_common.c

asix: Fix small memory leak in ax88772_unbind()

2017-08-07 10:10:19 -07:00

asix_devices.c

asix: Fix small memory leak in ax88772_unbind()

2017-08-07 10:10:19 -07:00

asix.h

asix: Fix small memory leak in ax88772_unbind()

2017-08-07 10:10:19 -07:00

ax88172a.c

net: usbnet: support 64bit stats

2017-04-03 19:09:40 -07:00

ax88179_178a.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-06-30 12:43:08 -04:00

catc.c

net: usb: catc: constify usb_device_id and fix space before '[' error

2017-08-08 17:47:58 -07:00

cdc_eem.c

drivers/net: delete non-required instances of include <linux/init.h>

2014-01-16 11:53:26 -08:00

cdc_ether.c

cdc-ether: divorce initialisation with a filter reset and a generic method

2017-05-23 11:01:28 -04:00

cdc_mbim.c

net: cdc_mbim: apply "NDP to end" quirk to HP lt4132

2017-07-03 02:19:36 -07:00

cdc_ncm.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-07-21 03:38:43 +01:00

cdc_subset.c

cdc_subset: deal with a device that needs reset for timeout

2014-08-02 15:44:18 -07:00

cdc-phonet.c

net: usb: cdc-phonet: constify usb_device_id

2017-08-08 17:47:58 -07:00

ch9200.c

net: ch9200: add missing USB-descriptor endianness conversions

2017-05-12 12:15:46 -04:00

cx82310_eth.c

cx82310_eth: use skb_cow_head() to deal with cloned skbs

2017-04-21 13:24:05 -04:00

dm9601.c

net: usbnet: support 64bit stats

2017-04-03 19:09:40 -07:00

gl620a.c

networking: make skb_push & __skb_push return void pointers

2017-06-16 11:48:40 -04:00

hso.c

net: manual clean code which call skb_put_[data:zero]

2017-06-20 13:30:15 -04:00

huawei_cdc_ncm.c

cdc_ncm: Set NTB format again after altsetting switch for Huawei devices

2017-07-14 08:15:05 -07:00

int51x1.c

net: introduce __skb_put_[zero, data, u8]

2017-06-20 13:30:14 -04:00

ipheth.c

net: usb: ipheth: constify usb_device_id

2017-08-08 17:47:58 -07:00

kalmia.c

networking: convert many more places to skb_put_zero()

2017-06-16 11:48:35 -04:00

kaweth.c

net: usb: kaweth: constify usb_device_id

2017-08-08 17:47:59 -07:00

Kconfig

usb: plusb: Add support for PL-27A1

2017-04-25 10:08:16 -04:00

lan78xx.c

lan78xx: Fix to handle hard_header_len update

2017-08-02 10:39:58 -07:00

lan78xx.h

lan78xx: add LAN7801 MAC only support

2016-12-08 14:21:47 -05:00

lg-vl600.c

networking: make skb_push & __skb_push return void pointers

2017-06-16 11:48:40 -04:00

Makefile

USB: cdc_subset: only build when one driver is enabled

2016-02-18 15:59:45 -05:00

mcs7830.c

net: usbnet: support 64bit stats

2017-04-03 19:09:40 -07:00

net1080.c

networking: add and use skb_put_u8()

2017-06-16 11:48:40 -04:00

pegasus.c

usbnet: pegasus: Use net_device_stats from struct net_device

2017-04-07 07:03:33 -07:00

pegasus.h

usbnet: pegasus: Use net_device_stats from struct net_device

2017-04-07 07:03:33 -07:00

plusb.c

usb: plusb: Add support for PL-27A1

2017-04-25 10:08:16 -04:00

qmi_wwan.c

qmi_wwan: fix NULL deref on disconnect

2017-08-08 21:14:16 -07:00

r8152.c

net: usb: r8152: constify usb_device_id

2017-08-08 17:47:59 -07:00

rndis_host.c

networking: make skb_push & __skb_push return void pointers

2017-06-16 11:48:40 -04:00

rtl8150.c

net: usb: rtl8150: constify usb_device_id

2017-08-08 17:47:59 -07:00

sierra_net.c

net: usbnet: support 64bit stats

2017-04-03 19:09:40 -07:00

smsc75xx.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-04-21 20:23:53 -07:00

smsc75xx.h

usb: Fix FSF address in file headers

2013-12-06 12:37:55 -05:00

smsc95xx.c

smsc95xx: use ethtool_op_get_ts_info()

2017-07-14 08:54:03 -07:00

smsc95xx.h

smsc95xx: Add comments to the registers definition

2017-04-17 13:04:52 -04:00

sr9700.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-04-21 20:23:53 -07:00

sr9700.h

net: usb: sr9700: Use 'SR_' prefix for the common register macros

2015-02-04 13:53:02 -08:00

sr9800.c

net: usbnet: support 64bit stats

2017-04-03 19:09:40 -07:00

sr9800.h

USB2NET : SR9800 : One chip USB2.0 USB2NET SR9800 Device Driver Support

2014-02-10 16:53:06 -08:00

usbnet.c

net/{mii, smsc}: Make mii_ethtool_get_link_ksettings and smc_netdev_get_ecmd return void

2017-06-05 11:00:42 -04:00

zaurus.c

networking: add and use skb_put_u8()

2017-06-16 11:48:40 -04:00