Merge branch 'smack-for-3.20-rebased' of git://git.gitorious.org/smack-next/kernel...

[linux-2.6-block.git] / net / sched / sch_teql.c

diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c
index 6ada42396a242123fd7738309b79720d0b46b38e..e02687185a594116b125fdbfc7db49bf8a929797 100644 (file)
--- a/net/sched/sch_teql.c
+++ b/net/sched/sch_teql.c
@@ -122,13 +122,6 @@ teql_peek(struct Qdisc *sch)
        return NULL;
 }
 
-static inline void
-teql_neigh_release(struct neighbour *n)
-{
-       if (n)
-               neigh_release(n);
-}
-
 static void
 teql_reset(struct Qdisc *sch)
 {
@@ -249,8 +242,8 @@ __teql_resolve(struct sk_buff *skb, struct sk_buff *skb_res,
                char haddr[MAX_ADDR_LEN];
 
                neigh_ha_snapshot(haddr, n, dev);
-               err = dev_hard_header(skb, dev, ntohs(skb->protocol), haddr,
-                                     NULL, skb->len);
+               err = dev_hard_header(skb, dev, ntohs(tc_skb_protocol(skb)),
+                                     haddr, NULL, skb->len);
 
                if (err < 0)
                        err = -EINVAL;