OSDN Git Service

net: rename dev to orig_dev in deliver_ptype_list_skb
authorJiri Pirko <jiri@resnulli.us>
Mon, 30 Mar 2015 14:56:01 +0000 (16:56 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 31 Mar 2015 20:37:43 +0000 (16:37 -0400)
Unlike other places, this function uses name "dev" for what should be
"orig_dev", which might be a bit confusing. So fix this.

Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/dev.c

index 3a06003..65492b0 100644 (file)
@@ -1740,7 +1740,8 @@ static inline int deliver_skb(struct sk_buff *skb,
 
 static inline void deliver_ptype_list_skb(struct sk_buff *skb,
                                          struct packet_type **pt,
-                                         struct net_device *dev, __be16 type,
+                                         struct net_device *orig_dev,
+                                         __be16 type,
                                          struct list_head *ptype_list)
 {
        struct packet_type *ptype, *pt_prev = *pt;
@@ -1749,7 +1750,7 @@ static inline void deliver_ptype_list_skb(struct sk_buff *skb,
                if (ptype->type != type)
                        continue;
                if (pt_prev)
-                       deliver_skb(skb, pt_prev, dev);
+                       deliver_skb(skb, pt_prev, orig_dev);
                pt_prev = ptype;
        }
        *pt = pt_prev;