Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25: (1470 commits)
  [IPV6] ADDRLABEL: Fix double free on label deletion.
  [PPP]: Sparse warning fixes.
  [IPV4] fib_trie: remove unneeded NULL check
  [IPV4] fib_trie: More whitespace cleanup.
  [NET_SCHED]: Use nla_policy for attribute validation in ematches
  [NET_SCHED]: Use nla_policy for attribute validation in actions
  [NET_SCHED]: Use nla_policy for attribute validation in classifiers
  [NET_SCHED]: Use nla_policy for attribute validation in packet schedulers
  [NET_SCHED]: sch_api: introduce constant for rate table size
  [NET_SCHED]: Use typeful attribute parsing helpers
  [NET_SCHED]: Use typeful attribute construction helpers
  [NET_SCHED]: Use NLA_PUT_STRING for string dumping
  [NET_SCHED]: Use nla_nest_start/nla_nest_end
  [NET_SCHED]: Propagate nla_parse return value
  [NET_SCHED]: act_api: use PTR_ERR in tcf_action_init/tcf_action_get
  [NET_SCHED]: act_api: use nlmsg_parse
  [NET_SCHED]: act_api: fix netlink API conversion bug
  [NET_SCHED]: sch_netem: use nla_parse_nested_compat
  [NET_SCHED]: sch_atm: fix format string warning
  [NETNS]: Add namespace for ICMP replying code.
  ...

1 files changed, 0 insertions, 51 deletions

diff --git a/include/linux/if_shaper.h b/include/linux/if_shaper.h
deleted file mode 100644
index 3b1b7ba19825..000000000000
--- a/include/linux/if_shaper.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef __LINUX_SHAPER_H
-#define __LINUX_SHAPER_H
-
-#ifdef __KERNEL__
-
-#define SHAPER_QLEN     10
-/*
- *      This is a bit speed dependent (read it shouldn't be a constant!)
- *
- *      5 is about right for 28.8 upwards. Below that double for every
- *      halving of speed or so. - ie about 20 for 9600 baud.
- */
-#define SHAPER_LATENCY  (5*HZ)
-#define SHAPER_MAXSLIP  2
-#define SHAPER_BURST    (HZ/50)         /* Good for >128K then */
-
-struct shaper
-{
-        struct sk_buff_head sendq;
-        __u32 bytespertick;
-        __u32 bitspersec;
-        __u32 shapelatency;
-        __u32 shapeclock;
-        unsigned long recovery; /* Time we can next clock a packet out on
-                                   an empty queue */
-        spinlock_t lock;
-        struct net_device *dev;
-        struct net_device_stats* (*get_stats)(struct net_device *dev);
-        struct timer_list timer;
-};
-
-#endif
-
-#define SHAPER_SET_DEV          0x0001
-#define SHAPER_SET_SPEED        0x0002
-#define SHAPER_GET_DEV          0x0003
-#define SHAPER_GET_SPEED        0x0004
-
-struct shaperconf
-{
-        __u16   ss_cmd;
-        union
-        {
-                char    ssu_name[14];
-                __u32   ssu_speed;
-        } ss_u;
-#define ss_speed ss_u.ssu_speed
-#define ss_name ss_u.ssu_name
-};
-
-#endif