summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-05-03 14:18:53 -0700
committerDavid S. Miller <davem@davemloft.net>2009-05-03 14:18:53 -0700
commit698960a081bfcc3e2e0f556342d86405346d2edc (patch)
treee20e99c6720437b88690e355d24c597a989e9f15 /net
parentd252a5e7b73026b3ba3c49940724292099e634f0 (diff)
parent379b026ecc20c4657d37e40ead789f7f28f1a1c1 (diff)
downloadlinux-698960a081bfcc3e2e0f556342d86405346d2edc.tar.gz
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net')
-rw-r--r--net/atm/br2684.c1
-rw-r--r--net/sched/cls_api.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/net/atm/br2684.c b/net/atm/br2684.c
index 334fcd4a4ea4..3100a8940afc 100644
--- a/net/atm/br2684.c
+++ b/net/atm/br2684.c
@@ -549,6 +549,7 @@ static void br2684_setup(struct net_device *netdev)
struct br2684_dev *brdev = BRPRIV(netdev);
ether_setup(netdev);
+ brdev->net_dev = netdev;
netdev->netdev_ops = &br2684_netdev_ops;
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 173fcc4b050d..0759f32e9dca 100644
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -254,7 +254,7 @@ replay:
}
tp->ops = tp_ops;
tp->protocol = protocol;
- tp->prio = nprio ? : tcf_auto_prio(*back);
+ tp->prio = nprio ? : TC_H_MAJ(tcf_auto_prio(*back));
tp->q = q;
tp->classify = tp_ops->classify;
tp->classid = parent;