summaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2005-08-09 19:36:29 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2005-08-29 15:33:26 -0700
commit86e65da9c1fc6fb421b9f796b597b3eced6b55ab (patch)
tree69ae9d0c30afe54cea3e4c6119791c1318c2198d /net/core
parent0742fd53a3774781255bd1e471e7aa2e4a82d5f7 (diff)
downloadlinux-86e65da9c1fc6fb421b9f796b597b3eced6b55ab.tar.gz
linux-86e65da9c1fc6fb421b9f796b597b3eced6b55ab.tar.bz2
linux-86e65da9c1fc6fb421b9f796b597b3eced6b55ab.zip
[NET]: Remove explicit initializations of skb->input_dev
Instead, set it in one place, namely the beginning of netif_receive_skb(). Based upon suggestions from Jamal Hadi Salim. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/dev.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index e1cc162bf295..9d153eb1e8cf 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1536,17 +1536,14 @@ static int ing_filter(struct sk_buff *skb)
__u32 ttl = (__u32) G_TC_RTTL(skb->tc_verd);
if (MAX_RED_LOOP < ttl++) {
printk("Redir loop detected Dropping packet (%s->%s)\n",
- skb->input_dev?skb->input_dev->name:"??",skb->dev->name);
+ skb->input_dev->name, skb->dev->name);
return TC_ACT_SHOT;
}
skb->tc_verd = SET_TC_RTTL(skb->tc_verd,ttl);
skb->tc_verd = SET_TC_AT(skb->tc_verd,AT_INGRESS);
- if (NULL == skb->input_dev) {
- skb->input_dev = skb->dev;
- printk("ing_filter: fixed %s out %s\n",skb->input_dev->name,skb->dev->name);
- }
+
spin_lock(&dev->ingress_lock);
if ((q = dev->qdisc_ingress) != NULL)
result = q->enqueue(skb, q);
@@ -1572,6 +1569,9 @@ int netif_receive_skb(struct sk_buff *skb)
if (!skb->stamp.tv_sec)
net_timestamp(&skb->stamp);
+ if (!skb->input_dev)
+ skb->input_dev = skb->dev;
+
orig_dev = skb_bond(skb);
__get_cpu_var(netdev_rx_stat).total++;