Linus Torvalds 3d412f60b7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (21 commits) [PKT_SCHED]: vlan tag match [NET]: Add if_addrlabel.h to sanitized headers. [NET] rtnetlink.c: remove no longer used functions [ICMP]: Restore pskb_pull calls in receive function [INET]: Fix accidentally broken inet(6)_hash_connect's port offset calculations. [NET]: Remove further references to net-modules.txt bluetooth rfcomm tty: destroy before tty_close() bluetooth: blacklist another Broadcom BCM2035 device drivers/bluetooth/btsdio.c: fix double-free drivers/bluetooth/bpa10x.c: fix memleak bluetooth: uninlining bluetooth: hidp_process_hid_control remove unnecessary parameter dealing tun: impossible to deassert IFF_ONE_QUEUE or IFF_NO_PI hamradio: fix dmascc section mismatch [SCTP]: Fix kernel panic while received AUTH chunk with BAD shared key identifier [SCTP]: Fix kernel panic while received AUTH chunk while enabled auth [IPV4]: Formatting fix for /proc/net/fib_trie. [IPV6]: Fix sysctl compilation error. [NET_SCHED]: Add #ifdef CONFIG_NET_EMATCH in net/sched/cls_flow.c (latest git broken build) [IPV4]: Fix compile error building without CONFIG_FS_PROC ...		2008-02-05 10:09:07 -08:00
..
9p
bluetooth	[NET]: Remove FASTCALL macro	2008-01-28 14:57:23 -08:00
irda	[IrDA]: Irport removal - part 1	2008-01-28 15:08:10 -08:00
iucv
netfilter	[NETFILTER]: nf_conntrack: annotate l3protos with const	2008-01-31 19:28:13 -08:00
netns	[NETFILTER]: arp_tables: per-netns arp_tables FILTER	2008-01-31 19:27:41 -08:00
sctp	[NET] CORE: Introducing new memory accounting interface.	2008-01-28 15:00:18 -08:00
tc_act
tipc
act_api.h	[NET_SCHED]: act_api: use PTR_ERR in tcf_action_init/tcf_action_get	2008-01-28 15:11:17 -08:00
addrconf.h	[IPV4]: Enable use of 240/4 address space.	2008-01-28 15:08:44 -08:00
af_rxrpc.h
af_unix.h	[AF_UNIX]: Remove unused declaration of sysctl_unix_max_dgram_qlen.	2008-01-28 14:57:13 -08:00
ah.h
arp.h	[NETFILTER]: ebtables: remove casts, use consts	2008-01-31 19:27:33 -08:00
atmclip.h
ax25.h
ax88796.h
cfg80211.h	cfg80211/nl80211: implement station attribute retrieval	2008-01-28 14:59:52 -08:00
checksum.h	[NET]: Move netfilter checksum helpers to net/core/utils.c	2008-01-28 14:55:14 -08:00
cipso_ipv4.h
compat.h
datalink.h
dn_dev.h
dn_fib.h
dn_neigh.h
dn_nsp.h
dn_route.h
dn.h
dsfield.h	[NET]: Constify include/net/dsfield.h	2008-01-28 14:55:58 -08:00
dst.h	[DST]: shrinks sizeof(struct rtable) by 64 bytes on x86_64	2008-01-28 15:10:41 -08:00
esp.h	[IPSEC]: Use crypto_aead and authenc in ESP	2008-01-31 19:27:02 -08:00
fib_rules.h	[NETNS]: Process FIB rule action in the context of the namespace.	2008-01-28 15:08:14 -08:00
flow.h	[IPV4]: Remove unused multipath cached routing defintion in net/flow.h	2008-01-28 15:00:20 -08:00
gen_stats.h	[NET_SCHED]: Convert packet schedulers from rtnetlink to new netlink API	2008-01-28 15:11:10 -08:00
genetlink.h
icmp.h
ieee80211_crypt.h
ieee80211_radiotap.h
ieee80211.h	ieee80211: fix misannotations	2008-01-28 15:08:48 -08:00
ieee80211softmac_wx.h
ieee80211softmac.h
if_inet6.h	[IPV6]: Reorg struct ifmcaddr6 to save some bytes	2008-02-03 04:28:54 -08:00
inet6_connection_sock.h
inet6_hashtables.h	[SOCK] proto: Add hashinfo member to struct proto	2008-02-03 04:28:52 -08:00
inet_common.h
inet_connection_sock.h	[SOCK] proto: Add hashinfo member to struct proto	2008-02-03 04:28:52 -08:00
inet_ecn.h
inet_frag.h	[NETNS][FRAGS]: Make the pernet subsystem for fragments.	2008-01-28 15:10:40 -08:00
inet_hashtables.h	[INET]: Fix accidentally broken inet(6)_hash_connect's port offset calculations.	2008-02-05 03:14:44 -08:00
inet_sock.h
inet_timewait_sock.h	[INET_TIMEWAIT_SOCK]: Reorganize struct inet_timewait_sock to save some bytes	2008-02-03 04:28:54 -08:00
inetpeer.h
ip6_checksum.h
ip6_fib.h	[XFRM] IPv6: Fix dst/routing check at transformation.	2008-01-28 14:59:36 -08:00
ip6_route.h	[NETNS][IPV6]: Make sysctls route per namespace.	2008-01-28 15:01:20 -08:00
ip6_tunnel.h
ip_fib.h	[IPV4]: Fix compile error building without CONFIG_FS_PROC	2008-02-05 02:54:16 -08:00
ip_vs.h	[IPVS]: Switch to using ctl_paths.	2008-01-28 15:01:08 -08:00
ip.h	[NETNS][FRAGS]: Make the mem counter per-namespace.	2008-01-28 15:10:36 -08:00
ipcomp.h
ipconfig.h
ipip.h
ipv6.h	[IPV6]: Fix sysctl compilation error.	2008-02-05 02:57:59 -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
mac80211.h	mac80211: add unified BSS configuration	2008-01-28 15:09:43 -08:00
mip6.h
ndisc.h
neighbour.h	[ARP]: neigh_parms_put(destroy) are essentially local to core/neighbour.c.	2008-01-28 15:02:11 -08:00
net_namespace.h	[NETFILTER]: x_tables: per-netns xt_tables	2008-01-31 19:27:35 -08:00
netdma.h
netevent.h
netlabel.h	NetLabel: introduce a new kernel configuration API for NetLabel	2008-02-05 09:44:20 -08:00
netlink.h	[NETLINK]: Add nla_append()	2008-01-28 15:11:09 -08:00
netrom.h
nexthop.h
p8022.h
pkt_cls.h	[NET_SCHED]: Constify struct tcf_ext_map	2008-01-31 19:28:34 -08:00
pkt_sched.h	[NET_SCHED]: Convert packet schedulers from rtnetlink to new netlink API	2008-01-28 15:11:10 -08:00
protocol.h	[IPV6]: make inet6_register_protosw to return an error code	2008-01-28 14:57:12 -08:00
psnap.h
raw.h	[RAW]: Wrong content of the /proc/net/raw6.	2008-01-31 19:27:26 -08:00
rawv6.h
red.h
request_sock.h
rose.h
route.h	[IPV4] route cache: Introduce rt_genid for smooth cache invalidation	2008-01-31 19:28:27 -08:00
rtnetlink.h
sch_generic.h	[NET_SCHED]: Convert classifiers from rtnetlink to new netlink API	2008-01-28 15:11:11 -08:00
scm.h
slhc_vj.h
snmp.h	[XFRM]: Define packet dropping statistics.	2008-01-28 14:59:38 -08:00
sock.h	[SOCK] proto: Add hashinfo member to struct proto	2008-02-03 04:28:52 -08:00
syncppp.h
tcp_states.h
tcp.h	[TCP]: Uninline tcp_is_cwnd_limited	2008-01-28 15:01:48 -08:00
timewait_sock.h
transp_v6.h	[IPV6]: make the protocol initialization to return an error code	2008-01-28 14:57:13 -08:00
udp.h	[NET]: prot_inuse cleanups and optimizations	2008-01-28 15:00:36 -08:00
udplite.h	[UDP]: Restore missing inDatagrams increments	2008-01-28 14:56:33 -08:00
wext.h
wireless.h
x25.h
x25device.h
xfrm.h	[XFRM]: constify 'struct xfrm_type'	2008-01-31 19:27:20 -08:00