diff --git a/[refs] b/[refs] index f1fdedf3d844..a139992f0008 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 879e9304134bb6214fb52377ac1e01e1910f4916 +refs/heads/master: ad61df918c44316940404891d5082c63e79c256a diff --git a/trunk/net/sched/cls_api.c b/trunk/net/sched/cls_api.c index 6a536949cdc0..7cf6c0fbc7a6 100644 --- a/trunk/net/sched/cls_api.c +++ b/trunk/net/sched/cls_api.c @@ -350,7 +350,7 @@ static int tcf_fill_node(struct sk_buff *skb, struct tcf_proto *tp, tcm = NLMSG_DATA(nlh); tcm->tcm_family = AF_UNSPEC; tcm->tcm__pad1 = 0; - tcm->tcm__pad1 = 0; + tcm->tcm__pad2 = 0; tcm->tcm_ifindex = qdisc_dev(tp->q)->ifindex; tcm->tcm_parent = tp->classid; tcm->tcm_info = TC_H_MAKE(tp->prio, tp->protocol);