diff --git a/[refs] b/[refs] index ef62b6beb3c7..f082fc777fc2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9dacaf17a60101a55d456cc7b00e269d8145aa0d +refs/heads/master: 271c1dfa61bc90a57648ff96f3eb92d4b4d4f11e diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index b65347c2cf2a..c8d127718ff1 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -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)) {