summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* net/smc: cancel tx worker in case of socket abortsUrsula Braun2018-01-251-3/+9
* Merge branch 'sfc-support-PTP-on-8000-and-X2000-series-NICs'David S. Miller2018-01-257-120/+489
|\
| * sfc: support Medford2 frequency adjustment formatLaurence Evans2018-01-251-14/+31
| * sfc: support second + quarter ns time format for receive datapathEdward Cree2018-01-251-33/+106
| * sfc: support separate PTP and general timestampingLaurence Evans2018-01-251-15/+43
| * sfc: simplify RX datapath timestampingLaurence Evans2018-01-251-8/+5
| * sfc: only advertise TX timestamping if we have the license for itMartin Habets2018-01-252-1/+16
| * sfc: on 8000 series use TX queues for TX timestampsEdward Cree2018-01-256-13/+54
| * sfc: MAC TX timestamp handling on the 8000 seriesMartin Habets2018-01-252-2/+46
| * sfc: only enable TX timestamping if the adapter is licensed for itMartin Habets2018-01-252-0/+29
| * sfc: use main datapath for HW timestamps if availableMartin Habets2018-01-252-15/+42
| * sfc: add function to determine which TX timestamping method to useMartin Habets2018-01-252-0/+11
| * sfc: handle TX timestamps in the normal data pathMartin Habets2018-01-255-9/+119
| * sfc: remove tx and MCDI handling from NAPI budget considerationBert Kenward2018-01-252-30/+7
|/
* net: Move net:netns_ids destruction out of rtnl_lock() and document locking s...Kirill Tkhai2018-01-251-18/+44
* Merge branch 'rebased-net-ioctl' of git://git.kernel.org/pub/scm/linux/kernel...David S. Miller2018-01-2412-399/+173
|\
| * kill kernel_sock_ioctl()Al Viro2018-01-242-14/+0
| * dev_ioctl(): move copyin/copyout to callersAl Viro2018-01-243-108/+71
| * ipconfig: use dev_set_mtu()Al Viro2018-01-241-14/+3
| * lift handling of SIOCIW... out of dev_ioctl()Al Viro2018-01-244-25/+12
| * kill dev_ifname32()Al Viro2018-01-241-21/+1
| * kill bond_ioctl()Al Viro2018-01-241-32/+4
| * kill dev_ifsioc()Al Viro2018-01-241-38/+0
| * ip_rt_ioctl(): take copyin to callerAl Viro2018-01-244-20/+10
| * devinet_ioctl(): take copyin/copyout to callerAl Viro2018-01-244-46/+35
| * net: separate SIOCGIFCONF handling from dev_ioctl()Al Viro2018-01-244-86/+42
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2018-01-2431-123/+274
|\ \ | |/ |/|
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2018-01-2419-49/+90
| |\
| | * net/ibm/emac: wrong bit is used for STA control register writeIvan Mikhaylov2018-01-241-1/+1
| | * net/ibm/emac: add 8192 rx/tx fifo sizeIvan Mikhaylov2018-01-242-0/+8
| | * vhost: do not try to access device IOTLB when not initializedJason Wang2018-01-241-0/+4
| | * vhost: use mutex_lock_nested() in vhost_dev_lock_vqs()Jason Wang2018-01-241-1/+1
| | * i40e: flower: check if TC offload is enabled on a netdevJakub Kicinski2018-01-241-0/+2
| | * Merge branch 'qed-rdma-bug-fixes'David S. Miller2018-01-241-14/+17
| | |\
| | | * qed: Free reserved MR tidMichal Kalderon2018-01-241-11/+17
| | | * qed: Remove reserveration of dpi for kernelMichal Kalderon2018-01-241-3/+0
| | |/
| | * Merge branch 'kcm-fix-two-syzcaller-issues'David S. Miller2018-01-241-4/+21
| | |\
| | | * kcm: Check if sk_user_data already set in kcm_attachTom Herbert2018-01-241-2/+14
| | | * kcm: Only allow TCP sockets to be attached to a KCM muxTom Herbert2018-01-241-2/+7
| | |/
| | * net: sched: fix TCF_LAYER_LINK case in tcf_get_base_ptrWolfgang Bumiller2018-01-241-1/+1
| | * net: sched: em_nbyte: don't add the data offset twiceWolfgang Bumiller2018-01-241-1/+1
| | * mlxsw: spectrum_router: Don't log an error on missing neighborYuval Mintz2018-01-241-8/+2
| | * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klasse...David S. Miller2018-01-245-11/+22
| | |\
| | | * xfrm: fix boolean assignment in xfrm_get_type_offloadGustavo A. R. Silva2018-01-231-1/+1
| | | * xfrm: Fix eth_hdr(skb)->h_proto to reflect inner IP versionYossi Kuperman2018-01-232-0/+2
| | | * xfrm: fix error flow in case of add state failsAviad Yehezkel2018-01-191-0/+1
| | | * xfrm: Add SA to hardware at the end of xfrm_state_construct()Yossi Kuperman2018-01-182-10/+18
| | * | vmxnet3: repair memory leakNeil Horman2018-01-231-1/+1
| | * | ipv6: Fix getsockopt() for sockets with default IPV6_AUTOFLOWLABELBen Hutchings2018-01-233-2/+3
| | * | pppoe: take ->needed_headroom of lower device into account on xmitGuillaume Nault2018-01-231-5/+6