dst: Add __skb_dst_copy() variation

joestringer · davem330 · commit e79e259588a4 · 2015-08-27T11:40:42.000-07:00
This variation on skb_dst_copy() doesn't require two skbs.

Signed-off-by: Joe Stringer &lt;joestringer@nicira.com&gt;
Acked-by: Pravin B Shelar &lt;pshelar@nicira.com&gt;
Acked-by: Thomas Graf &lt;tgraf@suug.ch&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/include/net/dst.h b/include/net/dst.h
@@ -289,13 +289,18 @@ static inline void skb_dst_drop(struct sk_buff *skb)
 	}
 }
 
-static inline void skb_dst_copy(struct sk_buff *nskb, const struct sk_buff *oskb)
+static inline void __skb_dst_copy(struct sk_buff *nskb, unsigned long refdst)
 {
-	nskb->_skb_refdst = oskb->_skb_refdst;
+	nskb->_skb_refdst = refdst;
 	if (!(nskb->_skb_refdst & SKB_DST_NOREF))
 		dst_clone(skb_dst(nskb));
 }
 
+static inline void skb_dst_copy(struct sk_buff *nskb, const struct sk_buff *oskb)
+{
+	__skb_dst_copy(nskb, oskb->_skb_refdst);
+}
+
 /**
  * skb_dst_force - makes sure skb dst is refcounted
  * @skb: buffer

Original file line number	Diff line number	Diff line change
`@@ -289,13 +289,18 @@ static inline void skb_dst_drop(struct sk_buff *skb)`
`289`	`289`	`}`
`290`	`290`	`}`
`291`	`291`
`292`		`-static inline void skb_dst_copy(struct sk_buff nskb, const struct sk_buff oskb)`
	`292`	`+static inline void __skb_dst_copy(struct sk_buff *nskb, unsigned long refdst)`
`293`	`293`	`{`
`294`		`- nskb->_skb_refdst = oskb->_skb_refdst;`
	`294`	`+ nskb->_skb_refdst = refdst;`
`295`	`295`	`if (!(nskb->_skb_refdst & SKB_DST_NOREF))`
`296`	`296`	`dst_clone(skb_dst(nskb));`
`297`	`297`	`}`
`298`	`298`
	`299`	`+static inline void skb_dst_copy(struct sk_buff nskb, const struct sk_buff oskb)`
	`300`	`+{`
	`301`	`+ __skb_dst_copy(nskb, oskb->_skb_refdst);`
	`302`	`+}`
	`303`	`+`
`299`	`304`	`/**`
`300`	`305`	`* skb_dst_force - makes sure skb dst is refcounted`
`301`	`306`	`* @skb: buffer`