summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'listener-sock-const'David S. Miller2015-09-2524-106/+149
|\
| * inet: constify inet_rtx_syn_ack() sock argumentEric Dumazet2015-09-252-2/+2
| * tcp/dccp: constify rtx_synack() and friendsEric Dumazet2015-09-255-5/+5
| * dccp: constify dccp_make_response() socket argumentEric Dumazet2015-09-252-7/+12
| * tcp: constify tcp_v{4|6}_send_synack() socket argumentEric Dumazet2015-09-253-3/+3
| * ipv6: constify ip6_xmit() sock argumentEric Dumazet2015-09-253-9/+21
| * tcp: constify tcp_make_synack() socket argumentEric Dumazet2015-09-252-10/+16
| * tcp: remove tcp_ecn_make_synack() socket argumentEric Dumazet2015-09-252-9/+13
| * tcp: remove tcp_synack_options() socket argumentEric Dumazet2015-09-251-8/+7
| * ip: constify ip_build_and_send_pkt() socket argumentEric Dumazet2015-09-252-7/+9
| * tcp: md5: constify tcp_md5_do_lookup() socket argumentEric Dumazet2015-09-253-10/+10
| * inet: constify ip_dont_fragment() argumentsEric Dumazet2015-09-251-3/+5
| * ipv6: constify inet6_csk_route_req() socket argumentEric Dumazet2015-09-252-2/+2
| * ipv6: constify ip6_dst_lookup_{flow|tail}() sock argumentsEric Dumazet2015-09-252-3/+3
| * inet: constify inet_csk_route_req() socket argumentEric Dumazet2015-09-252-2/+2
| * inet: constify ip_route_output_flow() socket argumentEric Dumazet2015-09-254-9/+10
| * tcp: constify tcp_openreq_init_rwin()Eric Dumazet2015-09-252-11/+20
| * tcp: constify listener socket in tcp_v[46]_init_req()Eric Dumazet2015-09-253-6/+9
|/
* net: remove unused argument of __netdev_find_adj()Michal Kubeček2015-09-251-8/+7
* Merge branch 'l2tp-module-autoloading'David S. Miller2015-09-257-5/+16
|\
| * l2tp: remove references to modprobe in documentationstephen hemminger2015-09-251-5/+2
| * l2tp: auto load IP modulesstephen hemminger2015-09-252-0/+2
| * l2tp: auto load type modulesstephen hemminger2015-09-254-0/+12
|/
* net: dsa: Set a "dsa" device_typeFlorian Fainelli2015-09-251-0/+5
* Merge branch 'switchdev-transaction-item-queue'David S. Miller2015-09-245-227/+296
|\
| * switchdev: reduce transaction phase enum down to a booleanJiri Pirko2015-09-242-12/+7
| * dsa: use prepare/commit switchdev transaction helpersJiri Pirko2015-09-241-10/+5
| * switchdev: remove "ABORT" transaction phaseJiri Pirko2015-09-242-9/+2
| * switchdev: remove "NONE" transaction phaseJiri Pirko2015-09-241-1/+0
| * rocker: use switchdev transaction queue for allocated memoryJiri Pirko2015-09-241-46/+7
| * rocker: push struct switchdev_trans down through rocker codeJiri Pirko2015-09-241-237/+225
| * switchdev: add switchdev_trans_ph_prepare/commit helpersJiri Pirko2015-09-241-0/+10
| * switchdev: move transaction phase enum under transaction structureJiri Pirko2015-09-244-24/+26
| * switchdev: introduce transaction item queue for attr_set and obj_addJiri Pirko2015-09-245-20/+146
| * switchdev: rename "trans" to "trans_ph".Jiri Pirko2015-09-244-204/+204
|/
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsh...David S. Miller2015-09-2411-278/+855
|\
| * ixgbe: Advance version to 4.2.1Mark Rustad2015-09-231-1/+1
| * ixgbe: X540 thermal warning interrupt not a GPIMark Rustad2015-09-231-3/+0
| * ixgbe: Fix FCRTH value in VM-to-VM loopback modeMark Rustad2015-09-232-4/+11
| * ixgbe: Only clear adapter_stopped if ixgbe_setup_fc succeededMark Rustad2015-09-231-3/+3
| * ixgbe: Correct several flaws with with DCA setupMark Rustad2015-09-231-14/+26
| * ixgbe: Add new X550EM SFP+ device IDMark Rustad2015-09-231-0/+1
| * ixgbe: Update ixgbe_disable_pcie_master flow for X550*Mark Rustad2015-09-231-0/+3
| * ixgbe: Add small packet padding support for X550Mark Rustad2015-09-232-0/+4
| * ixgbe: Correct setting of RDRXCTL register for X550* devicesMark Rustad2015-09-231-2/+2
| * ixgbe: Correct error path in semaphore handlingMark Rustad2015-09-231-0/+5
| * ixgbe: Add I2C bus mux supportMark Rustad2015-09-233-39/+122
| * ixgbe: Limit SFP polling rateMark Rustad2015-09-232-0/+10
| * ixgbe: Allow SFP+ on more than 82598 and 82599Mark Rustad2015-09-231-1/+1
| * ixgbe: Add logic to reset CS4227 when neededMark Rustad2015-09-232-1/+293
OpenPOWER on IntegriCloud