summaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorjamal <hadi@cyberus.ca>2010-06-04 02:06:22 +0000
committerDavid S. Miller <davem@davemloft.net>2010-06-07 01:10:44 -0700
commit271c1dfa61bc90a57648ff96f3eb92d4b4d4f11e (patch)
tree4c49a74ec730279a6aa0fe05eeedb1f652f73a03 /net/core
parent9dacaf17a60101a55d456cc7b00e269d8145aa0d (diff)
downloadblackbird-op-linux-271c1dfa61bc90a57648ff96f3eb92d4b4d4f11e.tar.gz
blackbird-op-linux-271c1dfa61bc90a57648ff96f3eb92d4b4d4f11e.zip
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>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/dev.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index b65347c2cf2a..c8d127718ff1 100644
--- a/net/core/dev.c
+++ b/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)) {
OpenPOWER on IntegriCloud