summaryrefslogtreecommitdiff
path: root/net/core/dev.c
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@osdl.org>2004-08-24 03:10:20 -0700
committerDavid S. Miller <davem@nuts.davemloft.net>2004-08-24 03:10:20 -0700
commitedf361abb612ac1fcc6cd9bb8f3e2357f3fb7c95 (patch)
tree6ab9343867daebee37821551204dfed76e35104a /net/core/dev.c
parent9fb9e414938e4c5586225a6c6371cc29ec8872b8 (diff)
[NET]: Another cleanup in netif_receive_skb()
Move rcu_read_lock up a little, since it needs to be done in both branches anyway. Also whitespace fix. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: David S. Miller <davem@redhat.com>
Diffstat (limited to 'net/core/dev.c')
-rw-r--r--net/core/dev.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index e16ebfdd5e9a..f26ec6038652 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1773,15 +1773,16 @@ int netif_receive_skb(struct sk_buff *skb)
skb->mac_len = skb->nh.raw - skb->mac.raw;
pt_prev = NULL;
+
+ rcu_read_lock();
+
#ifdef CONFIG_NET_CLS_ACT
if (skb->tc_verd & TC_NCLS) {
skb->tc_verd = CLR_TC_NCLS(skb->tc_verd);
- rcu_read_lock();
goto ncls;
}
- #endif
+#endif
- rcu_read_lock();
list_for_each_entry_rcu(ptype, &ptype_all, list) {
if (!ptype->dev || ptype->dev == skb->dev) {
if (pt_prev)