diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-08 12:59:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-08 12:59:10 -0700 |
| commit | e46dc1dab969550d4136e9be0e7919ca09e49573 (patch) | |
| tree | 86dbc21796b402c895fd96d5197bf38d8d060545 /net/sched/cls_u32.c | |
| parent | 87e2831c3fa39cbf6f7ab676bb5aef039b9659e2 (diff) | |
| parent | bf0b48dfc368c07c42b5a3a5658c8ee81b4283ac (diff) | |
| download | linux-e46dc1dab969550d4136e9be0e7919ca09e49573.tar.bz2 | |
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:
[IPv6]: Fix ICMPv6 redirect handling with target multicast address
[PKT_SCHED] cls_u32: error code isn't been propogated properly
[ROSE]: Fix rose.ko oops on unload
[TCP]: Fix fastpath_cnt_hint when GSO skb is partially ACKed
Diffstat (limited to 'net/sched/cls_u32.c')
| -rw-r--r-- | net/sched/cls_u32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c index 8dbe36912ecb..d4d5d2f271d2 100644 --- a/net/sched/cls_u32.c +++ b/net/sched/cls_u32.c @@ -502,7 +502,7 @@ static int u32_set_parms(struct tcf_proto *tp, unsigned long base, #ifdef CONFIG_NET_CLS_IND if (tb[TCA_U32_INDEV-1]) { - int err = tcf_change_indev(tp, n->indev, tb[TCA_U32_INDEV-1]); + err = tcf_change_indev(tp, n->indev, tb[TCA_U32_INDEV-1]); if (err < 0) goto errout; } |