kernel: backport upstream bridge multicast snooping fixes

[oweals/openwrt.git] / target / linux / generic / patches-3.3 / 621-sched_act_connmark.patch

diff --git a/target/linux/generic/patches-3.3/621-sched_act_connmark.patch b/target/linux/generic/patches-3.3/621-sched_act_connmark.patch
index eceec0a1e47ef9937e2fca8aeeb8b5eaed261e50..b6adce1febd0979cbdad8b022ee9b5dbfb92a765 100644 (file)
--- a/target/linux/generic/patches-3.3/621-sched_act_connmark.patch
+++ b/target/linux/generic/patches-3.3/621-sched_act_connmark.patch
@@ -46,7 +46,7 @@
 +      .lock   =       &connmark_lock,
 +};
 +
-+static int tcf_connmark(struct sk_buff *skb, struct tc_action *a,
++static int tcf_connmark(struct sk_buff *skb, const struct tc_action *a,
 +                     struct tcf_result *res)
 +{
 +      struct nf_conn *c;