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

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (53 commits)
  [TCP]: Verify the presence of RETRANS bit when leaving FRTO
  [IPV6]: Call inet6addr_chain notifiers on link down
  [NET_SCHED]: Kill CONFIG_NET_CLS_POLICE
  [NET_SCHED]: act_api: qdisc internal reclassify support
  [NET_SCHED]: sch_dsmark: act_api support
  [NET_SCHED]: sch_atm: act_api support
  [NET_SCHED]: sch_atm: Lindent
  [IPV6]: MSG_ERRQUEUE messages do not pass to connected raw sockets
  [IPV4]: Cleanup call to __neigh_lookup()
  [NET_SCHED]: Revert "avoid transmit softirq on watchdog wakeup" optimization
  [NETFILTER]: nf_conntrack: UDPLITE support
  [NETFILTER]: nf_conntrack: mark protocols __read_mostly
  [NETFILTER]: x_tables: add connlimit match
  [NETFILTER]: Lower *tables printk severity
  [NETFILTER]: nf_conntrack: Don't track locally generated special ICMP error
  [NETFILTER]: nf_conntrack: Introduces nf_ct_get_tuplepr and uses it
  [NETFILTER]: nf_conntrack: make l3proto->prepare() generic and renames it
  [NETFILTER]: nf_conntrack: Increment error count on parsing IPv4 header
  [NET]: Add ethtool support for NETIF_F_IPV6_CSUM devices.
  [AF_IUCV]: Add lock when updating accept_q
  ...

1 files changed, 0 insertions, 19 deletions

diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c
index cd0aab6a2a7c..51f16b0af198 100644
--- a/net/sched/sch_ingress.c
+++ b/net/sched/sch_ingress.c
@@ -164,31 +164,12 @@ static int ingress_enqueue(struct sk_buff *skb,struct Qdisc *sch)
                         result = TC_ACT_OK;
                         break;
         }
-/* backward compat */
-#else
-#ifdef  CONFIG_NET_CLS_POLICE
-        switch (result) {
-                case TC_POLICE_SHOT:
-                result = NF_DROP;
-                sch->qstats.drops++;
-                break;
-                case TC_POLICE_RECLASSIFY: /* DSCP remarking here ? */
-                case TC_POLICE_OK:
-                case TC_POLICE_UNSPEC:
-                default:
-                sch->bstats.packets++;
-                sch->bstats.bytes += skb->len;
-                result = NF_ACCEPT;
-                break;
-        }
-
 #else
         D2PRINTK("Overriding result to ACCEPT\n");
         result = NF_ACCEPT;
         sch->bstats.packets++;
         sch->bstats.bytes += skb->len;
 #endif
-#endif
 
         return result;
 }