diff options
| author | David S. Miller | 2010-07-28 06:01:35 +0200 |
|---|---|---|
| committer | David S. Miller | 2010-07-28 06:01:35 +0200 |
| commit | bb7e95c8fd859922c6cf3ebbb3a8546007df1748 (patch) | |
| tree | 58b54c6306ba168b76f25cc6dc9a2d1d2eb830a7 /include/net | |
| parent | ixgbe: potential null dereference (diff) | |
| parent | s2io: fixing DBG_PRINT() macro (diff) | |
| download | kernel-qcow2-linux-bb7e95c8fd859922c6cf3ebbb3a8546007df1748.tar.gz kernel-qcow2-linux-bb7e95c8fd859922c6cf3ebbb3a8546007df1748.tar.xz kernel-qcow2-linux-bb7e95c8fd859922c6cf3ebbb3a8546007df1748.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x_main.c
Merge bnx2x bug fixes in by hand... :-/
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/tc_act/tc_mirred.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/tc_act/tc_mirred.h b/include/net/tc_act/tc_mirred.h index ceac661cdfd5..cfe2943690ff 100644 --- a/include/net/tc_act/tc_mirred.h +++ b/include/net/tc_act/tc_mirred.h @@ -9,6 +9,7 @@ struct tcf_mirred { int tcfm_ifindex; int tcfm_ok_push; struct net_device *tcfm_dev; + struct list_head tcfm_list; }; #define to_mirred(pc) \ container_of(pc, struct tcf_mirred, common) |