diff --git a/[refs] b/[refs] index be180885e695..f799845640ba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd24c4af6e82231391fa09875ae6378fa1399f0f +refs/heads/master: c3ee84163e5bc0dc2e1ccf1d3fc412debca73bab diff --git a/trunk/net/sched/sch_generic.c b/trunk/net/sched/sch_generic.c index 0ddf69286f92..09dead335805 100644 --- a/trunk/net/sched/sch_generic.c +++ b/trunk/net/sched/sch_generic.c @@ -576,7 +576,6 @@ static void dev_deactivate_queue(struct net_device *dev, void *_qdisc_default) { struct Qdisc *qdisc_default = _qdisc_default; - struct sk_buff *skb = NULL; struct Qdisc *qdisc; qdisc = dev_queue->qdisc; @@ -588,8 +587,6 @@ static void dev_deactivate_queue(struct net_device *dev, spin_unlock_bh(qdisc_lock(qdisc)); } - - kfree_skb(skb); } static bool some_qdisc_is_running(struct net_device *dev, int lock)