diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-12 16:31:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-12 16:31:22 -0400 |
| commit | e1bd2ac5a6b7a8b625e40c9e9f8b6dea4cf22f85 (patch) | |
| tree | 9366e9fb481da2c7195ca3f2bafeffebbf001363 /net/sched/act_mirred.c | |
| parent | 0b9062f6b57a87f22309c6b920a51aaa66ce2a13 (diff) | |
| parent | 15028aad00ddf241581fbe74a02ec89cbb28d35d (diff) | |
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: (183 commits)
[TG3]: Update version to 3.78.
[TG3]: Add missing NVRAM strapping.
[TG3]: Enable auto MDI.
[TG3]: Fix the polarity bit.
[TG3]: Fix irq_sync race condition.
[NET_SCHED]: ematch: module autoloading
[TCP]: tcp probe wraparound handling and other changes
[RTNETLINK]: rtnl_link: allow specifying initial device address
[RTNETLINK]: rtnl_link API simplification
[VLAN]: Fix MAC address handling
[ETH]: Validate address in eth_mac_addr
[NET]: Fix races in net_rx_action vs netpoll.
[AF_UNIX]: Rewrite garbage collector, fixes race.
[NETFILTER]: {ip, nf}_conntrack_sctp: fix remotely triggerable NULL ptr dereference (CVE-2007-2876)
[NET]: Make all initialized struct seq_operations const.
[UDP]: Fix length check.
[IPV6]: Remove unneeded pointer idev from addrconf_cleanup().
[DECNET]: Another unnecessary net/tcp.h inclusion in net/dn.h
[IPV6]: Make IPV6_{RECV,2292}RTHDR boolean options.
[IPV6]: Do not send RH0 anymore.
...
Fixed up trivial conflict in Documentation/feature-removal-schedule.txt
manually.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'net/sched/act_mirred.c')
| -rw-r--r-- | net/sched/act_mirred.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c index de21c92faaa2..579578944ae7 100644 --- a/net/sched/act_mirred.c +++ b/net/sched/act_mirred.c | |||
| @@ -12,31 +12,19 @@ | |||
| 12 | * | 12 | * |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <asm/uaccess.h> | ||
| 16 | #include <asm/system.h> | ||
| 17 | #include <asm/bitops.h> | ||
| 18 | #include <linux/types.h> | 15 | #include <linux/types.h> |
| 19 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 20 | #include <linux/string.h> | 17 | #include <linux/string.h> |
| 21 | #include <linux/mm.h> | ||
| 22 | #include <linux/socket.h> | ||
| 23 | #include <linux/sockios.h> | ||
| 24 | #include <linux/in.h> | ||
| 25 | #include <linux/errno.h> | 18 | #include <linux/errno.h> |
| 26 | #include <linux/interrupt.h> | ||
| 27 | #include <linux/netdevice.h> | ||
| 28 | #include <linux/skbuff.h> | 19 | #include <linux/skbuff.h> |
| 29 | #include <linux/rtnetlink.h> | 20 | #include <linux/rtnetlink.h> |
| 30 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 31 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 32 | #include <linux/proc_fs.h> | ||
| 33 | #include <net/netlink.h> | 23 | #include <net/netlink.h> |
| 34 | #include <net/sock.h> | ||
| 35 | #include <net/pkt_sched.h> | 24 | #include <net/pkt_sched.h> |
| 36 | #include <linux/tc_act/tc_mirred.h> | 25 | #include <linux/tc_act/tc_mirred.h> |
| 37 | #include <net/tc_act/tc_mirred.h> | 26 | #include <net/tc_act/tc_mirred.h> |
| 38 | 27 | ||
| 39 | #include <linux/etherdevice.h> | ||
| 40 | #include <linux/if_arp.h> | 28 | #include <linux/if_arp.h> |
| 41 | 29 | ||
| 42 | #define MIRRED_TAB_MASK 7 | 30 | #define MIRRED_TAB_MASK 7 |