Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc6533e9 authored by David S. Miller's avatar David S. Miller
Browse files

net: Kill plain NET_XMIT_BYPASS. 



dst_input() was doing something completely absurd, looping
on skb->dst->input() if NET_XMIT_BYPASS was seen, but these
functions never return such an error.

And as a result plain ole' NET_XMIT_BYPASS has no more
references and can be completely killed off.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c27f339a

include/linux/netdevice.h

+0 −3
Original line number Diff line number Diff line
@@ -61,9 +61,6 @@ struct wireless_dev; 
#define NET_XMIT_DROP		1	/* skb dropped			*/

#define NET_XMIT_CN		2	/* congestion notification	*/

#define NET_XMIT_POLICED	3	/* skb is shot by police	*/

#define NET_XMIT_BYPASS		4	/* packet does not leave via dequeue;

					   (TC use only - dev_queue_xmit

					   returns this as NET_XMIT_SUCCESS) */

#define NET_XMIT_MASK		0xFFFF	/* qdisc flags in net/sch_generic.h */



/* Backlog congestion levels */

include/net/dst.h

+1 −11
Original line number Diff line number Diff line
@@ -252,17 +252,7 @@ static inline int dst_output(struct sk_buff *skb) 
/* Input packet from network to transport.  */

static inline int dst_input(struct sk_buff *skb)

{

	int err;



	for (;;) {

		err = skb->dst->input(skb);



		if (likely(err == 0))

			return err;

		/* Oh, Jamal... Seems, I will not forgive you this mess. :-) */

		if (unlikely(err != NET_XMIT_BYPASS))

			return err;

	}

	return skb->dst->input(skb);

}



static inline struct dst_entry *dst_check(struct dst_entry *dst, u32 cookie)