This is a note to let you know that I've just added the patch titled
net: dst: provide accessor function to dst->xfrm
to the 3.11-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net-dst-provide-accessor-function-to-dst-xfrm.patch
and it can be found in the queue-3.11 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 803490b7c577add0b976aa08e4bbfdd95f505270 Mon Sep 17 00:00:00 2001
From: Vlad Yasevich <vyasevich@xxxxxxxxx>
Date: Tue, 15 Oct 2013 22:01:29 -0400
Subject: net: dst: provide accessor function to dst->xfrm
From: Vlad Yasevich <vyasevich@xxxxxxxxx>
[ Upstream commit e87b3998d795123b4139bc3f25490dd236f68212 ]
dst->xfrm is conditionally defined. Provide accessor funtion that
is always available.
Signed-off-by: Vlad Yasevich <vyasevich@xxxxxxxxx>
Acked-by: Neil Horman <nhorman@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
include/net/dst.h | 12 ++++++++++++
1 file changed, 12 insertions(+)
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -477,10 +477,22 @@ static inline struct dst_entry *xfrm_loo
{
return dst_orig;
}
+
+static inline struct xfrm_state *dst_xfrm(const struct dst_entry *dst)
+{
+ return NULL;
+}
+
#else
extern struct dst_entry *xfrm_lookup(struct net *net, struct dst_entry *dst_orig,
const struct flowi *fl, struct sock *sk,
int flags);
+
+/* skb attached with this dst needs transformation if dst->xfrm is valid */
+static inline struct xfrm_state *dst_xfrm(const struct dst_entry *dst)
+{
+ return dst->xfrm;
+}
#endif
#endif /* _NET_DST_H */
Patches currently in stable-queue which might be from vyasevich@xxxxxxxxx are
queue-3.11/net-dst-provide-accessor-function-to-dst-xfrm.patch
queue-3.11/sctp-use-software-crc32-checksum-when-xfrm-transform-will-happen.patch
queue-3.11/revert-bridge-only-expire-the-mdb-entry-when-query-is-received.patch
queue-3.11/sctp-perform-software-checksum-if-packet-has-to-be-fragmented.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html