From 679a07be79f1f7424f481aea318a0899f6f2c205 Mon Sep 17 00:00:00 2001 From: Thomas Graf Date: Wed, 13 Jun 2012 02:55:01 +0000 Subject: [PATCH] --- yaml --- r: 314263 b: refs/heads/master c: 7a282bc37f8a1e7b46907d78724177d20214b137 h: refs/heads/master i: 314261: c636b1e66dc18723d0a3a1b9132c361c957a7eba 314259: 88028cf6fa9e167c6aee8a943ec94ceded48968c 314255: b1f269900049ccc7656e14f700889c45e4d831d6 v: v3 --- [refs] | 2 +- trunk/net/dcb/dcbnl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bb41e001b7e9..e9d23008324d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4e4f2f69704be0ae218d91fb827e5a6987fe262f +refs/heads/master: 7a282bc37f8a1e7b46907d78724177d20214b137 diff --git a/trunk/net/dcb/dcbnl.c b/trunk/net/dcb/dcbnl.c index 6e1c32468236..70bba3eb4ae9 100644 --- a/trunk/net/dcb/dcbnl.c +++ b/trunk/net/dcb/dcbnl.c @@ -1659,7 +1659,7 @@ static int dcb_doit(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) { struct net *net = sock_net(skb->sk); struct net_device *netdev; - struct dcbmsg *dcb = (struct dcbmsg *)NLMSG_DATA(nlh); + struct dcbmsg *dcb = nlmsg_data(nlh); struct nlattr *tb[DCB_ATTR_MAX + 1]; u32 pid = skb ? NETLINK_CB(skb).pid : 0; int ret = -EINVAL;