Commit 271c1dfa authored Jun 04, 2010 by jamal Committed by David S. Miller Jun 07, 2010

net: Remove unnecessary net action assertion



The extra assertion to allow packet munging only when there are
no other ptypes listening which may have worked around an old bug
is unnecessary. It is sufficient to check if the skb is cloned before
trampling on it. Thanks to Herbert Xu for being persistent and patient
in getting this across.
[Note that cloning checks and assertions are the general rule used
by tc actions (documentation/networking/tc-actions-env-rules.txt)].

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

parent 9dacaf17

net/core/dev.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -2663,9 +2663,6 @@ static inline struct sk_buff handle_ing(struct sk_buff skb,
		if (*pt_prev) {
		ret = deliver_skb(skb, pt_prev, orig_dev);
		*pt_prev = NULL;
		} else {
		/* Huh? Why does turning on AF_PACKET affect this? */
		skb->tc_verd = SET_TC_OK2MUNGE(skb->tc_verd);
		}

		switch (ing_filter(skb)) {

Admin message