diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-06-20 15:19:29 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-06-20 15:19:29 -0400 |
| commit | 844b50d299ec101c6789600c85c15b96859eacef (patch) | |
| tree | 11a4ea5982955352a5c885e44c3e1aeaac3cfe3f | |
| parent | 826903bbb721bd267fab8d3b915147b5d6fcb31f (diff) | |
| download | longterm-queue-2.6.34-844b50d299ec101c6789600c85c15b96859eacef.tar.gz | |
fix warning introduced by CP of 22e76c849d505d
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/netlink-Make-nlmsg_find_attr-take-a-const-nlmsghdr.patch | 28 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 29 insertions, 0 deletions
diff --git a/queue/netlink-Make-nlmsg_find_attr-take-a-const-nlmsghdr.patch b/queue/netlink-Make-nlmsg_find_attr-take-a-const-nlmsghdr.patch new file mode 100644 index 0000000..c21d57e --- /dev/null +++ b/queue/netlink-Make-nlmsg_find_attr-take-a-const-nlmsghdr.patch @@ -0,0 +1,28 @@ +From baec7f958670eaa406367dbd01045419380acec2 Mon Sep 17 00:00:00 2001 +From: Nelson Elhage <nelhage@ksplice.com> +Date: Wed, 3 Nov 2010 16:35:40 +0000 +Subject: [PATCH] netlink: Make nlmsg_find_attr take a const nlmsghdr*. + +commit 6b8c92ba07287578718335ce409de8e8d7217e40 upstream. + +This will let us use it on a nlmsghdr stored inside a netlink_callback. + +Signed-off-by: Nelson Elhage <nelhage@ksplice.com> +Signed-off-by: David S. Miller <davem@davemloft.net> + +diff --git a/include/net/netlink.h b/include/net/netlink.h +index 4fc05b5..28c27d1 100644 +--- a/include/net/netlink.h ++++ b/include/net/netlink.h +@@ -384,7 +384,7 @@ static inline int nlmsg_parse(const struct nlmsghdr *nlh, int hdrlen, + * + * Returns the first attribute which matches the specified type. + */ +-static inline struct nlattr *nlmsg_find_attr(struct nlmsghdr *nlh, ++static inline struct nlattr *nlmsg_find_attr(const struct nlmsghdr *nlh, + int hdrlen, int attrtype) + { + return nla_find(nlmsg_attrdata(nlh, hdrlen), +-- +1.7.4.4 + diff --git a/queue/series b/queue/series index 1fec6b5..57af984 100644 --- a/queue/series +++ b/queue/series @@ -249,6 +249,7 @@ dcdbas-force-SMI-to-happen-when-expected.patch net-ax25-fix-information-leak-to-userland.patch net-tipc-fix-information-leak-to-userland.patch inet_diag-Make-sure-we-actually-run-the-same-bytecod.patch +netlink-Make-nlmsg_find_attr-take-a-const-nlmsghdr.patch irda-prevent-integer-underflow-in-IRLMP_ENUMDEVICES.patch CAN-Use-inode-instead-of-kernel-address-for-proc-fil.patch xfs-prevent-leaking-uninitialized-stack-memory-in-FS.patch |