diff options
| author | Michael Young <m.a.young@durham.ac.uk> | 2010-11-29 22:17:14 +0000 |
|---|---|---|
| committer | Michael Young <m.a.young@durham.ac.uk> | 2010-11-29 22:17:14 +0000 |
| commit | 2279d902a9a53b54c7532be1aa2ea69865140f06 (patch) | |
| tree | 2d642afbe08133cf4f446867d1e47c9d3c99e885 /netlink-make-nlmsg_find_attr-take-a-const-ptr.patch | |
| parent | ba5342c1b103befdf6ccba59d1ec1e6400947f56 (diff) | |
| parent | b3e99df1c8efe575a715e62dea0c5d66ceaf52c4 (diff) | |
| download | dom0-kernel-2279d902a9a53b54c7532be1aa2ea69865140f06.tar.gz dom0-kernel-2279d902a9a53b54c7532be1aa2ea69865140f06.tar.xz dom0-kernel-2279d902a9a53b54c7532be1aa2ea69865140f06.zip | |
Merge branch 'f12/master' into f12/user/myoung/xendom0
Conflicts:
kernel.spec
Diffstat (limited to 'netlink-make-nlmsg_find_attr-take-a-const-ptr.patch')
| -rw-r--r-- | netlink-make-nlmsg_find_attr-take-a-const-ptr.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/netlink-make-nlmsg_find_attr-take-a-const-ptr.patch b/netlink-make-nlmsg_find_attr-take-a-const-ptr.patch new file mode 100644 index 0000000..5b75ca4 --- /dev/null +++ b/netlink-make-nlmsg_find_attr-take-a-const-ptr.patch @@ -0,0 +1,29 @@ +From 38f1f0db010ac5b981ae06f1fe2fd64095ebb171 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*. + +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> +--- + include/net/netlink.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/include/net/netlink.h b/include/net/netlink.h +index a63b219..c344646 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.3.2 + |