summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* geneve: Rename support library as geneve_coreJohn W. Linville2015-05-134-4/+4
* geneve: move definition of geneve_hdr() to geneve.hJohn W. Linville2015-05-133-10/+5
* geneve: remove MODULE_ALIAS_RTNL_LINK from net/ipv4/geneve.cJohn W. Linville2015-05-131-1/+0
* net: kill useless net_*_ingress_queue() definitions when NET_CLS_ACT is unsetPablo Neira2015-05-131-8/+0
* Merge branch 'packet_rollover'David S. Miller2015-05-133-28/+163
|\
| * packet: rollover statisticsWillem de Bruijn2015-05-133-1/+28
| * packet: rollover huge flows before small flowsWillem de Bruijn2015-05-132-3/+24
| * packet: rollover lock contention avoidanceWillem de Bruijn2015-05-132-7/+32
| * packet: rollover only to socket with headroomWillem de Bruijn2015-05-131-17/+59
| * packet: rollover prepare: per-socket stateWillem de Bruijn2015-05-132-4/+23
| * packet: rollover prepare: move code out of callsitesWillem de Bruijn2015-05-131-9/+10
|/
* ipv4: __ip_local_out_sk() is staticEric Dumazet2015-05-131-1/+1
* tcp/dccp: tw_timer_handler() is staticEric Dumazet2015-05-131-1/+1
* Merge branch 'cls_flower'David S. Miller2015-05-1320-298/+1285
|\
| * tc: introduce Flower classifierJiri Pirko2015-05-134-0/+729
| * flow_dissector: change port array into src, dst tupleJiri Pirko2015-05-137-15/+18
| * flow_dissector: introduce support for Ethernet addressesJiri Pirko2015-05-132-0/+25
| * flow_dissector: introduce support for ipv6 addresssesJiri Pirko2015-05-132-8/+34
| * flow_dissector: add missing header includesJiri Pirko2015-05-131-0/+3
| * flow_dissect: use programable dissector in skb_flow_dissect and friendsJiri Pirko2015-05-1312-146/+229
| * flow_dissector: introduce programable flow_dissectorJiri Pirko2015-05-132-0/+109
| * flow_dissector: fix doc for skb_get_poffJiri Pirko2015-05-131-2/+6
| * net: move netdev_pick_tx and dependencies to net/core/dev.cJiri Pirko2015-05-132-78/+78
| * net: move __skb_tx_hash to dev.cJiri Pirko2015-05-134-31/+31
| * net: move __skb_get_hash function declaration to flow_dissector.hJiri Pirko2015-05-132-1/+1
| * flow_dissector: fix doc for __skb_get_hash and remove couple of empty linesJiri Pirko2015-05-131-5/+5
| * net: move *skb_get_poff declarations into correct headerJiri Pirko2015-05-134-4/+5
| * flow_dissector: remove unused function flow_get_hlen declarationJiri Pirko2015-05-131-3/+0
| * net: change name of flow_dissector header to match the .c file nameJiri Pirko2015-05-139-12/+19
|/
* Merge branch 'sfc-next'David S. Miller2015-05-131-12/+22
|\
| * sfc: suppress some MCDI error messages in PTPEdward Cree2015-05-131-11/+16
| * sfc: nicer log message on PTP probe failEdward Cree2015-05-131-1/+6
|/
* net: sched: use counter to break reclassify loopsFlorian Westphal2015-05-135-30/+5
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2015-05-13410-4555/+5358
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2015-05-12102-645/+1838
| |\
| | * net: Remove remaining remnants of pm_qos from netdevice.hDavid Ahern2015-05-121-3/+0
| | * e1000e: Add pm_qos headerDavid Ahern2015-05-121-0/+1
| | * net: phy: micrel: Fix regression in kszphy_probeNiklas Cassel2015-05-121-1/+2
| | * net: ll_temac: Fix DMA map size bugMichal Simek2015-05-121-2/+2
| | * x86: bpf_jit: fix FROM_BE16 and FROM_LE16/32 instructionsAlexei Starovoitov2015-05-121-0/+28
| | * netns: return RTM_NEWNSID instead of RTM_GETNSID on a getNicolas Dichtel2015-05-121-1/+1
| | * Update be2net maintainers' email addressesSathya Perla2015-05-121-4/+5
| | * net_sched: gred: use correct backlog value in WRED modeDavid Ward2015-05-111-2/+2
| | * pppoe: drop pppoe device in pppoe_unbind_sock_workFelix Fietkau2015-05-111-0/+4
| | * net: qca_spi: Fix possible race during probeStefan Wahren2015-05-111-2/+2
| | * net: mdio-gpio: Allow for unspecified bus idBert Vermeulen2015-05-101-1/+4
| | * af_packet / TX_RING not fully non-blocking (w/ MSG_DONTWAIT).Kretschmer, Mathias2015-05-101-3/+6
| | * bnx2x: limit fw delay in kdump to 5s after bootMichal Schmidt2015-05-101-2/+7
| | * ARM: net: delegate filter to kernel interpreter when imm_offset() return valu...Nicolas Schichan2015-05-101-1/+26
| | * ARM: net fix emit_udiv() for BPF_ALU | BPF_DIV | BPF_K intruction.Nicolas Schichan2015-05-101-2/+13