| Message ID | 1380463645-4633-1-git-send-email-kda@linux-powerpc.org |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Denis Kirjanov <kda@linux-powerpc.org> Date: Sun, 29 Sep 2013 18:07:25 +0400 > And thus we have only one function definition > > Signed-off-by: Denis Kirjanov <kda@linux-powerpc.org> This does not apply cleanly to the current net-next tree. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
No problem, I'll respin. Thanks! On 10/1/13, David Miller <davem@davemloft.net> wrote: > From: Denis Kirjanov <kda@linux-powerpc.org> > Date: Sun, 29 Sep 2013 18:07:25 +0400 > >> And thus we have only one function definition >> >> Signed-off-by: Denis Kirjanov <kda@linux-powerpc.org> > > This does not apply cleanly to the current net-next tree. > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 2ddb48d..7399045 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -2736,17 +2736,14 @@ extern u16 __skb_tx_hash(const struct net_device *dev, const struct sk_buff *skb, unsigned int num_tx_queues); -#ifdef CONFIG_XFRM static inline struct sec_path *skb_sec_path(struct sk_buff *skb) { +#ifdef CONFIG_XFRM return skb->sp; -} #else -static inline struct sec_path *skb_sec_path(struct sk_buff *skb) -{ return NULL; -} #endif +} /* Keeps track of mac header offset relative to skb->head. * It is useful for TSO of Tunneling protocol. e.g. GRE.
And thus we have only one function definition Signed-off-by: Denis Kirjanov <kda@linux-powerpc.org> --- include/linux/skbuff.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)