David S. Miller e1ec1b8ccd Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:

	drivers/net/s2io.c

2008-04-02 22:35:23 -07:00

..

act_api.c

[NET] NETNS: Omit sock->sk_net without CONFIG_NET_NS.

2008-03-26 04:39:55 +09:00

act_gact.c

[NET_SCHED]: Use nla_policy for attribute validation in actions

2008-01-28 15:11:23 -08:00

act_ipt.c

[NET_SCHED]: Use nla_policy for attribute validation in actions

2008-01-28 15:11:23 -08:00

act_mirred.c

[NET_SCHED]: Use nla_policy for attribute validation in actions

2008-01-28 15:11:23 -08:00

act_nat.c

[NET_SCHED]: Use nla_policy for attribute validation in actions

2008-01-28 15:11:23 -08:00

act_pedit.c

[NET_SCHED]: Use nla_policy for attribute validation in actions

2008-01-28 15:11:23 -08:00

act_police.c

[NET_SCHED]: Use nla_policy for attribute validation in actions

2008-01-28 15:11:23 -08:00

act_simple.c

[NET_SCHED]: Use nla_policy for attribute validation in actions

2008-01-28 15:11:23 -08:00

cls_api.c

[NET] NETNS: Omit sock->sk_net without CONFIG_NET_NS.

2008-03-26 04:39:55 +09:00

cls_basic.c

[NET_SCHED]: Constify struct tcf_ext_map

2008-01-31 19:28:34 -08:00

cls_flow.c

[NET_SCHED]: cls_flow: support classification based on VLAN tag

2008-02-05 16:21:04 -08:00

cls_fw.c

[NET_SCHED]: Constify struct tcf_ext_map

2008-01-31 19:28:34 -08:00

cls_route.c

[NET_SCHED]: Constify struct tcf_ext_map

2008-01-31 19:28:34 -08:00

cls_rsvp6.c

[NET_SCHED]: Remove unnecessary includes

2007-07-10 22:16:41 -07:00

cls_rsvp.c

[NET_SCHED]: Remove unnecessary includes

2007-07-10 22:16:41 -07:00

cls_rsvp.h

[NET_SCHED]: Use nla_policy for attribute validation in classifiers

2008-01-28 15:11:23 -08:00

cls_tcindex.c

[NET_SCHED]: Constify struct tcf_ext_map

2008-01-31 19:28:34 -08:00

cls_u32.c

[PKT_SCHED]: annotate cls_u32

2008-03-17 22:46:46 -07:00

em_cmp.c

[NET_SCHED]: ematch: module autoloading

2007-07-11 19:46:26 -07:00

em_meta.c

[IPV4]: Add 'rtable' field in struct sk_buff to alias 'dst' and avoid casts

2008-03-05 18:30:47 -08:00

em_nbyte.c

[NET_SCHED]: ematch: module autoloading

2007-07-11 19:46:26 -07:00

em_text.c

[NET_SCHED]: Convert classifiers from rtnetlink to new netlink API

2008-01-28 15:11:11 -08:00

em_u32.c

[PKT_SCHED]: annotate cls_u32

2008-03-17 22:46:46 -07:00

ematch.c

[PKT_SCHED] ematch: Fix build warning.

2008-02-10 03:48:15 -08:00

Kconfig

[NET_SCHED]: Add flow classifier

2008-01-31 19:28:36 -08:00

Makefile

[NET_SCHED]: Add flow classifier

2008-01-31 19:28:36 -08:00

sch_api.c

[NET] NETNS: Omit sock->sk_net without CONFIG_NET_NS.

2008-03-26 04:39:55 +09:00

sch_atm.c

[NET_SCHED]: Use nla_policy for attribute validation in packet schedulers

2008-01-28 15:11:22 -08:00

sch_blackhole.c

[NET]: Move Qdisc_class_ops and Qdisc_ops in appropriate sections.

2008-01-28 14:53:58 -08:00

sch_cbq.c

[NET_SCHED]: Use nla_policy for attribute validation in packet schedulers

2008-01-28 15:11:22 -08:00

sch_dsmark.c

[NET_SCHED]: Use nla_policy for attribute validation in packet schedulers

2008-01-28 15:11:22 -08:00

sch_fifo.c

[NET_SCHED]: Convert packet schedulers from rtnetlink to new netlink API

2008-01-28 15:11:10 -08:00

sch_generic.c

[NET]: Add preemption point in qdisc_run

2008-03-28 16:25:26 -07:00

sch_gred.c

[NET_SCHED]: Use nla_policy for attribute validation in packet schedulers

2008-01-28 15:11:22 -08:00

sch_hfsc.c

[NET_SCHED]: Use nla_policy for attribute validation in packet schedulers

2008-01-28 15:11:22 -08:00

sch_htb.c

sch_htb: fix "too many events" situation

2008-03-23 22:00:38 -07:00

sch_ingress.c

[NET_SCHED]: sch_ingress: remove netfilter support

2008-01-31 19:28:25 -08:00

sch_netem.c

[NET_SCHED]: Use nla_policy for attribute validation in packet schedulers

2008-01-28 15:11:22 -08:00

sch_prio.c

[NET_SCHED]: Propagate nla_parse return value

2008-01-28 15:11:18 -08:00

sch_red.c

[NET_SCHED]: Use nla_policy for attribute validation in packet schedulers

2008-01-28 15:11:22 -08:00

sch_sfq.c

[NET_SCHED]: sch_sfq: make internal queues visible as classes

2008-01-31 19:28:35 -08:00

sch_tbf.c

[NET_SCHED]: Use nla_policy for attribute validation in packet schedulers

2008-01-28 15:11:22 -08:00

sch_teql.c

[PKT_SCHED] sch_teql.c: Duplicate IFF_BROADCAST in FMASK, remove 2nd.

2008-01-31 19:28:29 -08:00