diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-08-30 14:33:26 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-08-30 14:33:26 -0400 |
| commit | 2016ef789a9ded2e169ad1c028ae3deb5302571f (patch) | |
| tree | 601359f15b42d4d9868b4eadfe909a7bef6435c5 /net/sched/simple.c | |
| parent | 7f57356b70dda014ef269135942426e4a852023e (diff) | |
| parent | 6b39374a27eb4be7e9d82145ae270ba02ea90dc8 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'net/sched/simple.c')
| -rw-r--r-- | net/sched/simple.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/simple.c b/net/sched/simple.c index 3ab4c675ab5d..8a6ae4f491e8 100644 --- a/net/sched/simple.c +++ b/net/sched/simple.c | |||
| @@ -44,7 +44,7 @@ static DEFINE_RWLOCK(simp_lock); | |||
| 44 | #include <net/pkt_act.h> | 44 | #include <net/pkt_act.h> |
| 45 | #include <net/act_generic.h> | 45 | #include <net/act_generic.h> |
| 46 | 46 | ||
| 47 | static int tcf_simp(struct sk_buff **pskb, struct tc_action *a) | 47 | static int tcf_simp(struct sk_buff **pskb, struct tc_action *a, struct tcf_result *res) |
| 48 | { | 48 | { |
| 49 | struct sk_buff *skb = *pskb; | 49 | struct sk_buff *skb = *pskb; |
| 50 | struct tcf_defact *p = PRIV(a, defact); | 50 | struct tcf_defact *p = PRIV(a, defact); |