This repository has been archived on 2026-03-14. You can view files and clone it, but cannot push or open issues or pull requests.

Linus Torvalds 69eebed240 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2006-01-13 15:28:10 -08:00

..

bluetooth

…

irda

…

netfilter

[NET]: Use NIP6_FMT in kernel.h

2006-01-13 14:29:07 -08:00

sctp

[NET]: Use NIP6_FMT in kernel.h

2006-01-13 14:29:07 -08:00

tc_act

…

tipc

[TIPC] More updates of file headers

2006-01-12 14:06:39 -08:00

act_api.h

[PKT_SCHED]: Convert tc action functions to single skb pointers

2006-01-09 14:16:08 -08:00

act_generic.h

…

addrconf.h

…

af_unix.h

[AF_UNIX]: Convert to use a spinlock instead of rwlock

2006-01-03 14:10:46 -08:00

ah.h

…

arp.h

…

atmclip.h

[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h

2006-01-03 13:11:21 -08:00

ax25.h

…

checksum.h

…

compat.h

…

datalink.h

…

dn_dev.h

[PATCH] Eliminate __attribute__ ((packed)) warnings for gcc-4.1

2006-01-08 20:14:07 -08:00

dn_fib.h

…

dn_neigh.h

…

dn_nsp.h

[PATCH] Eliminate __attribute__ ((packed)) warnings for gcc-4.1

2006-01-08 20:14:07 -08:00

dn_route.h

…

dn.h

…

dsfield.h

…

dst.h

[XFRM]: Netfilter IPsec output hooks

2006-01-07 12:57:28 -08:00

esp.h

…

flow.h

[LSM-IPSec]: Security association restriction.

2006-01-03 13:10:24 -08:00

gen_stats.h

…

genetlink.h

[PATCH] genetlink: don't touch module ref count

2006-01-13 13:06:40 -08:00

icmp.h

[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h

2006-01-03 13:11:21 -08:00

ieee80211_crypt.h

[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h

2006-01-03 13:11:21 -08:00

ieee80211_radiotap.h

…

ieee80211.h

[PATCH] fix wrong comments in ieee80211.h

2006-01-12 16:39:45 -05:00

if_inet6.h

…

inet6_connection_sock.h

[IPV6]: Generalise some functions

2006-01-03 13:10:46 -08:00

inet6_hashtables.h

[IPV6]: Introduce inet6_timewait_sock

2006-01-03 13:10:47 -08:00

inet_common.h

[NET]: move struct proto_ops to const

2006-01-03 13:11:15 -08:00

inet_connection_sock.h

[INET]: congestion and af_ops can be const

2006-01-10 12:54:26 -08:00

inet_ecn.h

[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h

2006-01-03 13:11:21 -08:00

inet_hashtables.h

[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h

2006-01-03 13:11:21 -08:00

inet_sock.h

[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h

2006-01-03 13:11:21 -08:00

inet_timewait_sock.h

[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h

2006-01-03 13:11:21 -08:00

inetpeer.h

[IPV4]: Safer reassembly

2006-01-03 13:10:31 -08:00

ip6_checksum.h

…

ip6_fib.h

…

ip6_route.h

…

ip6_tunnel.h

…

ip_fib.h

[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h

2006-01-03 13:11:21 -08:00

ip_mp_alg.h

…

ip_vs.h

[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h

2006-01-03 13:11:21 -08:00

ip.h

[IPV4]: make ip_fragment() static

2006-01-07 13:23:39 -08:00

ipcomp.h

…

ipconfig.h

…

ipip.h

…

ipv6.h

[IPV4/6]: Netfilter IPsec input hooks

2006-01-07 12:57:31 -08:00

ipx.h

…

iw_handler.h

…

lapb.h

…

llc_c_ac.h

…

llc_c_ev.h

…

llc_c_st.h

…

llc_conn.h

…

llc_if.h

…

llc_pdu.h

…

llc_s_ac.h

…

llc_s_ev.h

…

llc_s_st.h

…

llc_sap.h

…

llc.h

…

ndisc.h

[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h

2006-01-03 13:11:21 -08:00

neighbour.h

[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h

2006-01-03 13:11:21 -08:00

netlink.h

…

netrom.h

…

p8022.h

…

pkt_act.h

[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h

2006-01-03 13:11:21 -08:00

pkt_cls.h

…

pkt_sched.h

[PKT_SCHED]: Use USEC_PER_SEC

2006-01-09 14:16:05 -08:00

protocol.h

[IPV6]: Move nextheader offset to the IP6CB

2006-01-07 12:57:29 -08:00

psnap.h

…

raw.h

[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h

2006-01-03 13:11:21 -08:00

rawv6.h

…

red.h

…

request_sock.h

[IPV6]: Generalise tcp_v6_search_req & tcp_v6_synq_add

2006-01-03 13:10:36 -08:00

rose.h

…

route.h

…

sch_generic.h

…

scm.h

…

slhc_vj.h

…

snmp.h

…

sock.h

[NET]: Change sk_run_filter()'s return type in net/core/filter.c

2006-01-06 13:08:20 -08:00

syncppp.h

…

tcp_ecn.h

…

tcp_states.h

[TCP]: Move the TCPF_ enum to tcp_states.h

2006-01-03 13:10:57 -08:00

tcp.h

[TCP]: less inline's

2006-01-03 16:03:49 -08:00

timewait_sock.h

[TWSK]: Introduce struct timewait_sock_ops

2006-01-03 13:10:54 -08:00

transp_v6.h

[ICSK]: Rename struct tcp_func to struct inet_connection_sock_af_ops

2006-01-03 13:10:38 -08:00

udp.h

[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h

2006-01-03 13:11:21 -08:00

x25.h

…

x25device.h

…

xfrm.h

[NETFILTER]: Redo policy lookups after NAT when neccessary

2006-01-07 12:57:35 -08:00