[net-next-2.6] net: Remove unnecessary net action assertion

Message ID 1275653182.3445.58.camel@bigi
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

jamal June 4, 2010, 12:06 p.m.
I will followup with another (independent) change on pedit.

commit 45c644796fe2aa834918b15d7b41e57ccf86c1b3
Author: Jamal Hadi Salim <hadi@cyberus.ca>
Date:   Fri Jun 4 06:16:30 2010 -0400

    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>


diff --git a/net/core/dev.c b/net/core/dev.c
index ec01a59..b272752 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2662,9 +2662,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)) {