projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
[cascardo/linux.git]
/
net
/
sched
/
sch_generic.c
diff --git
a/net/sched/sch_generic.c
b/net/sched/sch_generic.c
index
7fc899a
..
922a094
100644
(file)
--- a/
net/sched/sch_generic.c
+++ b/
net/sched/sch_generic.c
@@
-126,7
+126,7
@@
int sch_direct_xmit(struct sk_buff *skb, struct Qdisc *q,
HARD_TX_LOCK(dev, txq, smp_processor_id());
if (!netif_xmit_frozen_or_stopped(txq))
- ret = dev_hard_start_xmit(skb, dev, txq);
+ ret = dev_hard_start_xmit(skb, dev, txq
, NULL
);
HARD_TX_UNLOCK(dev, txq);