[PKT_SCHED]: Fix qdisc return code.

The mapping between TC_ACTION_SHOT and the qdisc return codes is better
suited to NET_XMIT_BYPASS so as not to confuse TCP

Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc net/sched/sch_cbq.c
Simple merge

diff --cc net/sched/sch_hfsc.c
Simple merge

diff --cc net/sched/sch_htb.c
Simple merge

diff --cc net/sched/sch_prio.c
Simple merge