summaryrefslogtreecommitdiffstats
path: root/net/ipv4
Commit message (Expand)AuthorAgeFilesLines
* bonding: remove entries for master_ip and vlan_ip and query devices insteadAndy Gospodarek2012-03-221-0/+1
* netfilter: remove forward module param confusion.Rusty Russell2012-03-221-7/+2
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2012-03-2042-1030/+697
|\
| * tcp: reduce out_of_order memory useEric Dumazet2012-03-192-1/+19
| * tcp: introduce tcp_data_queue_ofoEric Dumazet2012-03-191-99/+115
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-03-182-17/+23
| |\
| * | arp: allow arp processing to honor per interface arp_accept sysctlNeil Horman2012-03-161-1/+1
| * | net: ipv4: Standardize prefixes for message loggingJoe Perches2012-03-1219-48/+79
| * | net: Convert printks to pr_<level>Joe Perches2012-03-1125-181/+163
| * | ipv4: Make ip_rcv_options() return bool.David S. Miller2012-03-091-3/+3
| * | ipv4: Make ip_call_ra_chain() return bool.David S. Miller2012-03-091-4/+4
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-03-093-11/+86
| |\ \
| * \ \ Merge branch 'master' of git://1984.lsi.us.es/net-nextDavid S. Miller2012-03-077-529/+86
| |\ \ \
| | * | | netfilter: add cttimeout infrastructure for fine timeout tuningPablo Neira Ayuso2012-03-071-0/+47
| | * | | netfilter: nf_conntrack: pass timeout array to l4->new and l4->packetPablo Neira Ayuso2012-03-071-3/+10
| | * | | netfilter: merge ipt_LOG and ip6_LOG into xt_LOGRichard Weinberger2012-03-073-526/+0
| | * | | netfilter: ctnetlink: allow to set expectfn for expectationsPablo Neira Ayuso2012-03-073-0/+29
| * | | | tcp: md5: correct a RCU lockdep splatEric Dumazet2012-03-071-1/+2
| |/ / /
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-03-051-0/+1
| |\ \ \
| * \ \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-03-011-8/+10
| |\ \ \ \
| * \ \ \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-02-265-15/+12
| |\ \ \ \ \
| * | | | | | netlink: add netlink_dump_control structure for netlink_dump_start()Pablo Neira Ayuso2012-02-261-6/+12
| * | | | | | datagram: Add offset argument to __skb_recv_datagramPavel Emelyanov2012-02-211-2/+2
| * | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-02-191-16/+29
| |\ \ \ \ \ \
| * | | | | | | ipv4: Eliminate spurious argument to __ipv4_neigh_lookupDavid S. Miller2012-02-151-1/+1
| * | | | | | | net: replace random_ether_addr() with eth_hw_addr_random()Danny Kukawka2012-02-151-1/+1
| * | | | | | | net: implement IP_RECVTOS for IP_PKTOPTIONSJiri Benc2012-02-133-0/+6
| * | | | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-02-104-3/+9
| |\ \ \ \ \ \ \
| * | | | | | | | ipv4: Implement IP_UNICAST_IF socket option.Erich E. Hoover2012-02-084-3/+39
| * | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-02-046-22/+40
| |\ \ \ \ \ \ \ \
| * | | | | | | | | tcp: md5: RST: getting md5 key from listenerShawn Lu2012-02-011-3/+42
| * | | | | | | | | tcp: md5: protects md5sig_info with RCUEric Dumazet2012-02-011-12/+20
| * | | | | | | | | tcp: md5: use sock_kmalloc() to limit md5 keysEric Dumazet2012-01-311-2/+4
| * | | | | | | | | tcp: md5: rcu conversionEric Dumazet2012-01-312-140/+99
| * | | | | | | | | tcp: md5: remove obsolete md5_add() methodEric Dumazet2012-01-311-8/+0
| * | | | | | | | | ipv4: ip_gre: Convert to dst_neigh_lookup()David S. Miller2012-01-271-3/+10
| * | | | | | | | | ipv4/ipv6: Prepare for new route gateway semantics.David S. Miller2012-01-261-0/+5
| * | | | | | | | | tcp: add LINUX_MIB_TCPRETRANSFAIL counterEric Dumazet2012-01-262-1/+4
| * | | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-01-245-36/+29
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | ip_gre: Fix bug added to ipgre_tunnel_xmit().David S. Miller2012-01-241-1/+3
| * | | | | | | | | | ipip: Fix bug added to ipip_tunnel_xmit().David S. Miller2012-01-241-0/+1
| * | | | | | | | | | ipv4: Remove bogus checks of rt_gateway being zero.David S. Miller2012-01-242-7/+3
* | | | | | | | | | | Merge branch 'for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cg...Linus Torvalds2012-03-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | cgroup: remove cgroup_subsys argument from callbacksLi Zefan2012-02-021-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2012-03-201-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'perf/urgent' into perf/coreIngo Molnar2012-03-123-19/+97
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'perf/urgent' into perf/coreIngo Molnar2012-03-0512-50/+68
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| * | | | | | | | | | | static keys: Introduce 'struct static_key', static_key_true()/false() and sta...Ingo Molnar2012-02-241-3/+3
* | | | | | | | | | | | Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2012-03-202-14/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paul...Ingo Molnar2012-02-282-14/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |