diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-20 03:06:15 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-20 03:06:15 -0500 |
| commit | a07aa004c8d814a975b1a68afdb7baaa8f1b91d5 (patch) | |
| tree | 652edc2dce9732a64780b9e332034b6567631a8b /net/sched/cls_flow.c | |
| parent | cc7ec456f82da7f89a5b376e613b3ac4311b3e9a (diff) | |
| parent | 5d8449286456659cdd0998e62d80df2d9e77e9e3 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'net/sched/cls_flow.c')
| -rw-r--r-- | net/sched/cls_flow.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/cls_flow.c b/net/sched/cls_flow.c index 5eec16e516b9..8ec01391d988 100644 --- a/net/sched/cls_flow.c +++ b/net/sched/cls_flow.c | |||
| @@ -276,7 +276,7 @@ fallback: | |||
| 276 | 276 | ||
| 277 | static u32 flow_get_rtclassid(const struct sk_buff *skb) | 277 | static u32 flow_get_rtclassid(const struct sk_buff *skb) |
| 278 | { | 278 | { |
| 279 | #ifdef CONFIG_NET_CLS_ROUTE | 279 | #ifdef CONFIG_IP_ROUTE_CLASSID |
| 280 | if (skb_dst(skb)) | 280 | if (skb_dst(skb)) |
| 281 | return skb_dst(skb)->tclassid; | 281 | return skb_dst(skb)->tclassid; |
| 282 | #endif | 282 | #endif |