summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tcp-eor'David S. Miller2016-04-284-3/+29
|\
| * tcp: Handle eor bit when fragmenting a skbMartin KaFai Lau2016-04-281-0/+9
| * tcp: Handle eor bit when coalescing skbMartin KaFai Lau2016-04-282-0/+8
| * tcp: Make use of MSG_EOR in tcp_sendmsgMartin KaFai Lau2016-04-282-3/+12
|/
* Merge branch 'tcp-redundant-checks'David S. Miller2016-04-285-19/+17
|\
| * tcp: remove SKBTX_ACK_TSTAMP since it is redundantSoheil Hassas Yeganeh2016-04-285-18/+16
| * tcp: remove an unnecessary check in tcp_tx_timestampSoheil Hassas Yeganeh2016-04-281-1/+1
|/
* net: snmp: fix 64bit stats on 32bit archesEric Dumazet2016-04-281-4/+4
* Merge branch 'socket-space-optimizations'David S. Miller2016-04-281-0/+8
|\
| * net: SOCKWQ_ASYNC_WAITDATA optimizationsEric Dumazet2016-04-281-2/+4
| * net: SOCKWQ_ASYNC_NOSPACE optimizationsEric Dumazet2016-04-281-0/+6
|/
* Merge branch 'snmp-stats-update'David S. Miller2016-04-2854-531/+512
|\
| * net: snmp: kill STATS_BH macrosEric Dumazet2016-04-288-45/+45
| * ipv6: kill ICMP6MSGIN_INC_STATS_BH()Eric Dumazet2016-04-282-4/+2
| * ipv6: rename IP6_UPD_PO_STATS_BH()Eric Dumazet2016-04-282-3/+3
| * ipv6: rename IP6_INC_STATS_BH()Eric Dumazet2016-04-287-91/+91
| * net: rename NET_{ADD|INC}_STATS_BH()Eric Dumazet2016-04-2825-149/+153
| * net: rename IP_UPD_PO_STATS_BH()Eric Dumazet2016-04-282-4/+4
| * net: rename IP_ADD_STATS_BH()Eric Dumazet2016-04-283-5/+5
| * net: rename ICMP6_INC_STATS_BH()Eric Dumazet2016-04-286-15/+15
| * net: rename IP_INC_STATS_BH()Eric Dumazet2016-04-288-29/+29
| * net: sctp: rename SCTP_INC_STATS_BH()Eric Dumazet2016-04-282-7/+7
| * net: icmp: rename ICMPMSGIN_INC_STATS_BH()Eric Dumazet2016-04-282-2/+2
| * net: tcp: rename TCP_INC_STATS_BHEric Dumazet2016-04-287-25/+25
| * net: xfrm: kill XFRM_INC_STATS_BH()Eric Dumazet2016-04-281-2/+0
| * net: udp: rename UDP_INC_STATS_BH()Eric Dumazet2016-04-285-52/+52
| * net: rename ICMP_INC_STATS_BH()Eric Dumazet2016-04-286-14/+14
| * dccp: rename DCCP_INC_STATS_BH()Eric Dumazet2016-04-287-16/+16
| * net: snmp: kill various STATS_USER() helpersEric Dumazet2016-04-2810-78/+59
|/
* Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirshe...David S. Miller2016-04-2821-407/+947
|\
| * i40evf: Add driver support for promiscuous modeAnjali Singhai Jain2016-04-274-7/+40
| * i40e: Add VF promiscuous mode driver supportAnjali Singhai Jain2016-04-272-6/+149
| * i40e: Add promiscuous on VLAN supportGreg Rose2016-04-272-0/+78
| * i40e/i40evf: Only offload VLAN tag if enabledJesse Brandeburg2016-04-272-2/+4
| * i40e: Remove zero checkGreg Rose2016-04-271-4/+1
| * i40e: Add DeviceID for X722 QSFP+Kamil Krawczyk2016-04-274-0/+4
| * i40e: Add device capability which defines if update is availableMichal Kosiarz2016-04-275-0/+18
| * i40evf: Allow PF driver to configure RSSMitch Williams2016-04-264-284/+294
| * i40e: Specify AQ event opcode to wait forShannon Nelson2016-04-263-7/+44
| * i40e: Code cleanup in i40e_add_fdir_ethtoolShannon Nelson2016-04-261-5/+7
| * i40evf: Don't PanicMitch Williams2016-04-261-2/+4
| * i40e: Add support for configuring VF RSSMitch Williams2016-04-263-12/+217
| * i40e/i40evf: Add support for IPIP and SIT offloadsAlexander Duyck2016-04-264-16/+36
| * i40e/i40evf: Clean up feature flagsAlexander Duyck2016-04-262-69/+58
* | net-rfs: fix false sharing accessing sd->input_queue_headEric Dumazet2016-04-281-2/+6
* | net: w5100: support W5500Akinobu Mita2016-04-284-85/+365
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2016-04-27137-698/+1416
|\ \
| * \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2016-04-2727-218/+351
| |\ \
| | * | bpf: fix double-fdput in replace_map_fd_with_map_ptr()Jann Horn2016-04-261-1/+0
| | * | net: ipv6: Delete host routes on an ifdownDavid Ahern2016-04-261-33/+15