summaryrefslogtreecommitdiffstats
path: root/net/netfilter
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-07-034-3/+6
|\
| * netfilter: ctnetlink: send event when conntrack label was modifiedFlorian Westphal2013-06-242-1/+2
| * netfilter: nf_nat_sip: fix manglingBalazs Peter Odor2013-06-241-1/+2
| * ipvs: SCTP ports should be writable in ICMP packetsJulian Anastasov2013-06-191-1/+2
* | netfilter: nf_queue: add NFQA_SKB_CSUM_NOTVERIFIED info flagFlorian Westphal2013-06-301-2/+14
* | ipvs: add sync_persist_mode flagJulian Anastasov2013-06-262-0/+19
* | ipvs: SH fallback and L4 hashingAlexander Frolkin2013-06-261-15/+85
* | ipvs: drop SCTP connections depending on stateJulian Anastasov2013-06-261-0/+12
* | ipvs: replace the SCTP state machineJulian Anastasov2013-06-262-704/+157
* | ipvs: sloppy TCP and SCTPAlexander Frolkin2013-06-263-14/+32
* | ipvs: provide iph to schedulersJulian Anastasov2013-06-2611-34/+32
* | netfilter: xt_socket: add XT_SOCKET_NOWILDCARD flagEric Dumazet2013-06-201-8/+62
* | netfilter: nf_conntrack: avoid large timeout for mid-stream pickupFlorian Westphal2013-06-201-0/+6
* | netfilter: check return code from nla_parse_testedDaniel Borkmann2013-06-203-13/+39
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-06-196-12/+38
|\|
| * netfilter: xt_TCPMSS: Fix missing fragmentation handlingPhil Oester2013-06-121-0/+4
| * netfilter: xt_TCPMSS: Fix IPv6 default MSS tooPhil Oester2013-06-121-7/+14
| * netfilter: xt_TCPOPTSTRIP: don't use tcp_hdr()Pablo Neira Ayuso2013-06-111-2/+4
| * ipvs: info leak in __ip_vs_get_dest_entries()Dan Carpenter2013-06-101-0/+1
| * netfilter: nfnetlink_queue: fix missing HW protocolPablo Neira Ayuso2013-06-071-3/+3
| * netfilter: xt_TCPMSS: Fix violation of RFC879 in absence of MSS optionPhil Oester2013-06-051-0/+6
| * netfilter: nfnetlink_cttimeout: fix incomplete dumping of objectsPablo Neira Ayuso2013-06-051-2/+5
| * netfilter: nfnetlink_acct: fix incomplete dumping of objectsPablo Neira Ayuso2013-06-051-2/+5
* | net: Convert uses of typedef ctl_table to struct ctl_tableJoe Perches2013-06-135-9/+9
* | net_sched: add 64bit rate estimatorsEric Dumazet2013-06-111-1/+1
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/...David S. Miller2013-06-068-74/+116
|\ \
| * | netfilter: nfnetlink_queue: only add CAP_LEN attr when neededFlorian Westphal2013-06-051-1/+2
| * | netfilter: nfnetlink_queue: cleanup copy_range usageFlorian Westphal2013-06-051-10/+12
| * | netfilter: Implement RFC 1123 for FTP conntrackJeff Mahoney2013-05-271-19/+54
| * | netfilter: nfnetlink_queue: avoid peer_portid testFlorian Westphal2013-05-261-4/+0
| * | ipvs: change type of netns_ipvs->sysctl_sync_qlen_maxZhang Yanfei2013-05-261-2/+2
| * | ipvs: use cond_resched_rcu() helper when walking connectionsSimon Horman2013-05-231-15/+8
| * | netfilter: don't panic on error while walking through the init pathPablo Neira Ayuso2013-05-232-10/+16
| * | netfilter: xt_socket: use IP early demuxEric Dumazet2013-05-231-10/+16
| * | netfilter: xt_CT: optimize XT_CT_NOTRACKEric Dumazet2013-05-231-4/+6
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-06-055-13/+55
|\ \ \ | | |/ | |/|
| * | ipvs: ip_vs_sh: fix buildJan Beulich2013-05-291-1/+1
| * | netfilter: xt_LOG: fix mark logging for IPv6 packetsMichal Kubeček2013-05-291-1/+1
| * | ipvs: Fix reuse connection if real server is deadGrzegorz Lyczba2013-05-271-0/+35
| * | netfilter: add nf_ipv6_ops hook to fix xt_addrtype with IPv6Florian Westphal2013-05-232-11/+18
* | | netfilter: Correct calculation using skb->tail and skb-network_headerSimon Horman2013-05-311-1/+1
* | | net: pass info struct via netdevice notifierJiri Pirko2013-05-283-4/+4
|/ /
* | netfilter: xt_TCPOPTSTRIP: fix possible mangling beyond packet boundaryPablo Neira Ayuso2013-05-161-3/+14
* | netfilter: log: netns NULL ptr bug when calling from conntrackHans Schillstrom2013-05-154-10/+12
* | netfilter: nf_{log,queue}: fix compilation without CONFIG_PROC_FSPablo Neira Ayuso2013-05-063-1/+8
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2013-05-013-13/+18
|\
| * proc: Supply PDE attribute setting accessor functionsDavid Howells2013-05-011-2/+1
| * xt_hashlimit: allocate a copy of name explicitly, don't rely on procfs gutsAl Viro2013-04-291-3/+11
| * procfs: new helper - PDE_DATA(inode)Al Viro2013-04-093-8/+6
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2013-05-0176-5286/+5835
|\ \