summaryrefslogtreecommitdiffstats
path: root/include/net
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2014-10-312-0/+20
|\
| * netfilter: nf_reject_ipv6: split nf_send_reset6() in smaller functionsPablo Neira Ayuso2014-10-311-0/+10
| * netfilter: nf_reject_ipv4: split nf_send_reset() in smaller functionsPablo Neira Ayuso2014-10-311-0/+10
* | drivers/net, ipv6: Select IPv6 fragment idents for virtio UFO packetsBen Hutchings2014-10-311-0/+2
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2014-10-202-0/+6
|\
| * netfilter: nf_tables: restrict nat/masq expressions to nat chain typePablo Neira Ayuso2014-10-132-0/+6
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2014-10-191-0/+2
|\ \
| * | tcp: fix build error if IPv6 is not enabledEric Dumazet2014-10-181-0/+2
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2014-10-187-9/+43
|\| |
| * | net: dsa: add includes for ethtool and phy_fixed definitionsFlorian Fainelli2014-10-181-0/+1
| * | ipv6: introduce tcp_v6_iif()Eric Dumazet2014-10-182-2/+12
| * | ipv4: clean up cookie_v4_check()Cong Wang2014-10-171-3/+2Star
| * | ipv4: share tcp_v4_save_options() with cookie_v4_check()Cong Wang2014-10-171-0/+20
| * | netlink: fix description of portidNicolas Dichtel2014-10-161-1/+1
| * | ipv6: remove aca_lock spinlock from struct ifacaddr6Li RongQing2014-10-141-1/+0Star
| * | net: sctp: fix panic on duplicate ASCONF chunksDaniel Borkmann2014-10-141-0/+5
| * | net: sctp: fix skb_over_panic when receiving malformed ASCONF chunksDaniel Borkmann2014-10-141-3/+3
| |/
* | Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/...Linus Torvalds2014-10-152-4/+4
|\ \
| * | net: Replace get_cpu_var through this_cpu_ptrChristoph Lameter2014-08-262-4/+4
* | | lib80211: remove unused print_ssid()Andy Shevchenko2014-10-141-5/+0Star
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2014-10-121-155/+2Star
|\ \ \ | | |/ | |/|
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2014-10-101-155/+2Star
| |\ \
| | * | netfilter: kill nf_send_reset6() from include/net/netfilter/ipv6/nf_reject.hPablo Neira Ayuso2014-10-071-155/+2Star
* | | | Merge branch 'for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/p...Linus Torvalds2014-10-102-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/axb...Tejun Heo2014-09-2410-8/+44
| |\ \ \
| * | | | percpu_counter: add @gfp to percpu_counter_init()Tejun Heo2014-09-082-2/+2
| | |_|/ | |/| |
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2014-10-0952-453/+984
|\ \ \ \
| * \ \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-10-081-1/+1
| |\ \ \ \
| | * | | | sctp: handle association restarts when the socket is closed.Vlad Yasevich2014-10-061-1/+1
| * | | | | openvswitch: fix a compilation error when CONFIG_INET is not setW!Andy Zhou2014-10-071-15/+21
| * | | | | ipv6: make fib6 serial number per namespaceHannes Frederic Sowa2014-10-071-1/+1
| * | | | | ipv6: make rt_sernum atomic and serial number fields ordinary intsHannes Frederic Sowa2014-10-071-1/+1
| * | | | | ipv6: minor fib6 cleanups like type safety, bool conversion, inline removalHannes Frederic Sowa2014-10-071-4/+14
| * | | | | net: sched: remove tcf_proto from ematch callsJohn Fastabend2014-10-071-5/+5
| | |_|_|/ | |/| | |
| * | | | net: sched: avoid costly atomic operation in fq_dequeue()Eric Dumazet2014-10-061-2/+2
| * | | | openvswitch: Add support for Geneve tunneling.Jesse Gross2014-10-061-10/+11
| * | | | net: Add Geneve tunneling protocol driverAndy Zhou2014-10-062-0/+93
| * | | | Merge tag 'master-2014-10-02' of git://git.kernel.org/pub/scm/linux/kernel/gi...David S. Miller2014-10-065-10/+22
| |\ \ \ \
| | * \ \ \ Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-09-263-3/+4
| | |\ \ \ \
| | | * | | | Bluetooth: Fix reason code used for rejecting SCO connectionsJohan Hedberg2014-09-241-0/+1
| | | * | | | Bluetooth: Convert bt_<level> logging functions to return voidJoe Perches2014-09-241-2/+2
| | | * | | | Bluetooth: Remove exported hci_recv_fragment functionMarcel Holtmann2014-09-171-1/+0Star
| | | * | | | Bluetooth: Provide HCI command opcode information to driverMarcel Holtmann2014-09-151-0/+1
| | * | | | | Merge tag 'nfc-next-3.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-09-262-7/+18
| | |\ \ \ \ \
| | | * | | | | NFC: nci: Add support for proprietary RF ProtocolsChristophe Ricard2014-09-241-4/+5
| | | * | | | | NFC: NCI: Add support of ISO15693Vincent Cuissard2014-09-011-3/+13
| * | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2014-10-064-263/+85Star
| |\ \ \ \ \ \ \
| | * | | | | | | ipvs: Clean up comment style in ip_vs.hSimon Horman2014-10-021-139/+75Star
| | * | | | | | | netfilter: explicit module dependency between br_netfilter and physdevPablo Neira Ayuso2014-10-021-0/+6
| | * | | | | | | netfilter: move nf_send_resetX() code to nf_reject_ipvX modulesPablo Neira Ayuso2014-10-021-117/+1Star