netfilter: ip6table_raw: fix table priority

[safe/jmp/linux-2.6] / net / sched / sch_teql.c

diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c
index 12434b6..db69637 100644 (file)
--- a/net/sched/sch_teql.c
+++ b/net/sched/sch_teql.c
@@ -190,10 +190,13 @@ static int teql_qdisc_init(struct Qdisc *sch, struct nlattr *opt)
 
        if (m->slaves) {
                if (m->dev->flags & IFF_UP) {
-                       if ((m->dev->flags&IFF_POINTOPOINT && !(dev->flags&IFF_POINTOPOINT))
-                           || (m->dev->flags&IFF_BROADCAST && !(dev->flags&IFF_BROADCAST))
-                           || (m->dev->flags&IFF_MULTICAST && !(dev->flags&IFF_MULTICAST))
-                           || dev->mtu < m->dev->mtu)
+                       if ((m->dev->flags & IFF_POINTOPOINT &&
+                            !(dev->flags & IFF_POINTOPOINT)) ||
+                           (m->dev->flags & IFF_BROADCAST &&
+                            !(dev->flags & IFF_BROADCAST)) ||
+                           (m->dev->flags & IFF_MULTICAST &&
+                            !(dev->flags & IFF_MULTICAST)) ||
+                           dev->mtu < m->dev->mtu)
                                return -EINVAL;
                } else {
                        if (!(dev->flags&IFF_POINTOPOINT))
@@ -268,7 +271,7 @@ static inline int teql_resolve(struct sk_buff *skb,
        return __teql_resolve(skb, skb_res, dev);
 }
 
-static int teql_master_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t teql_master_xmit(struct sk_buff *skb, struct net_device *dev)
 {
        struct teql_master *master = netdev_priv(dev);
        struct netdev_queue *txq = netdev_get_tx_queue(dev, 0);
@@ -307,7 +310,7 @@ restart:
 
                                if (!netif_tx_queue_stopped(slave_txq) &&
                                    !netif_tx_queue_frozen(slave_txq) &&
-                                   slave_ops->ndo_start_xmit(skb, slave) == 0) {
+                                   slave_ops->ndo_start_xmit(skb, slave) == NETDEV_TX_OK) {
                                        txq_trans_update(slave_txq);
                                        __netif_tx_unlock(slave_txq);
                                        master->slaves = NEXT_SLAVE(q);