summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'timers/core' into sched/hrtimersThomas Gleixner2015-06-192-6/+1
|\
| * Merge branch 'linus' into timers/coreThomas Gleixner2015-05-1989-1052/+2259
| |\
| * | net: core: pktgen: Remove bogus hrtimer_active() checkThomas Gleixner2015-04-221-2/+0
| * | net: sched: Use hrtimer_resolution instead of hrtimer_get_res()Thomas Gleixner2015-04-221-4/+1
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2015-06-011-4/+0
|\ \ \
| * | | Revert "netfilter: ensure number of counters is >0 in do_replace()"Bernhard Thaler2015-06-011-4/+0
* | | | vti6: Add pmtu handling to vti6_xmit.Steffen Klassert2015-06-011-0/+14
* | | | Revert "net: core: 'ethtool' issue with querying phy settings"David S. Miller2015-06-011-9/+1
* | | | net: dsa: Properly propagate errors from dsa_switch_setup_oneFlorian Fainelli2015-05-311-2/+2
* | | | tcp: fix child sockets to use system default congestion control if not setNeal Cardwell2015-05-312-2/+8
* | | | udp: fix behavior of wrong checksumsEric Dumazet2015-05-312-8/+4
* | | | bridge: fix br_multicast_query_expired() bugEric Dumazet2015-05-301-1/+1
* | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klasse...David S. Miller2015-05-287-11/+43
|\ \ \ \
| * | | | ip_vti/ip6_vti: Preserve skb->mark after rcv_cb callAlexander Duyck2015-05-282-4/+14
| * | | | xfrm: Override skb->mark with tunnel->parm.i_key in xfrm_inputAlexander Duyck2015-05-281-1/+16
| * | | | ip_vti/ip6_vti: Do not touch skb->mark on xmitAlexander Duyck2015-05-282-3/+6
| * | | | xfrm: Always zero high-order sequence number bitsHerbert Xu2015-05-211-0/+2
| * | | | esp6: Use high-order sequence number bits for IV generationHerbert Xu2015-05-131-1/+2
| * | | | esp4: Use high-order sequence number bits for IV generationHerbert Xu2015-05-131-1/+2
| * | | | xfrm: fix a race in xfrm_state_lookup_byspiLi RongQing2015-04-291-1/+1
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2015-05-2710-69/+122
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | net_sched: invoke ->attach() after setting dev->qdiscWANG Cong2015-05-271-4/+6
| * | | | unix/caif: sk_socket can disappear when state is unlockedMark Salyzyn2015-05-262-0/+16
| * | | | Merge tag 'mac80211-for-davem-2015-05-26' of git://git.kernel.org/pub/scm/lin...David S. Miller2015-05-267-65/+100
| |\ \ \ \
| | * | | | mac80211: fix AP_VLAN crypto tailroom calculationMichal Kazior2015-05-204-9/+83
| | * | | | mac80211: don't split remain-on-channel for coalescingJohannes Berg2015-05-202-54/+11
| | * | | | mac80211: don't use napi_gro_receive() outside NAPI contextJohannes Berg2015-05-192-2/+6
* | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag...Linus Torvalds2015-05-231-13/+20
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Revert "libceph: clear r_req_lru_item in __unregister_linger_request()"Ilya Dryomov2015-05-201-2/+0
| * | | | | libceph: request a new osdmap if lingering request maps to no osdIlya Dryomov2015-05-201-11/+20
| | |_|_|/ | |/| | |
* | | | | bridge: fix lockdep splatEric Dumazet2015-05-221-0/+2
* | | | | net: core: 'ethtool' issue with querying phy settingsArun Parameswaran2015-05-221-1/+9
* | | | | bridge: fix parsing of MLDv2 reportsThadeu Lima de Souza Cascardo2015-05-221-1/+1
* | | | | ipv4: fill in table id when replacing a routeMichal Kubeček2015-05-221-0/+1
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2015-05-227-36/+50
|\ \ \ \ \
| * | | | | Revert "netfilter: bridge: query conntrack about skb dnat"Florian Westphal2015-05-201-18/+9
| * | | | | netfilter: ensure number of counters is >0 in do_replace()Dave Jones2015-05-204-0/+22
| * | | | | netfilter: nfnetlink_{log,queue}: Register pernet in first placeFrancesco Ruggeri2015-05-202-18/+19
* | | | | | ipv4: Avoid crashing in ip_errorEric W. Biederman2015-05-221-0/+4
* | | | | | tcp: fix a potential deadlock in tcp_get_info()Eric Dumazet2015-05-223-4/+15
* | | | | | net: sched: fix call_rcu() race on classifier module unloadsDaniel Borkmann2015-05-211-0/+5
* | | | | | ipv6: fix ECMP route replacementMichal Kubeček2015-05-202-6/+44
* | | | | | ipv6: do not delete previously existing ECMP routes if add failsMichal Kubeček2015-05-201-1/+2
* | | | | | Merge tag 'mac80211-for-davem-2015-05-19' of git://git.kernel.org/pub/scm/lin...David S. Miller2015-05-191-2/+4
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | mac80211: move WEP tailroom size checkJanusz Dziedzic2015-05-111-2/+4
* | | | | | tcp: don't over-send F-RTO probesYuchung Cheng2015-05-191-3/+3
* | | | | | tcp: only undo on partial ACKs in CA_LossYuchung Cheng2015-05-191-3/+6
* | | | | | net/ipv6/udp: Fix ipv6 multicast socket filter regressionHenning Rogge2015-05-191-1/+3
| |/ / / / |/| | | |
* | | | | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...David S. Miller2015-05-181-2/+4
|\ \ \ \ \
| * | | | | Bluetooth: Fix remote name event return directly.Wesley Kuo2015-05-141-2/+4
| | |/ / / | |/| | |