From 25b3f2029e59c28e4b1833c848fc7e97272ba20d Mon Sep 17 00:00:00 2001 From: Thomas Graf Date: Wed, 13 Jun 2012 02:54:56 +0000 Subject: [PATCH] --- yaml --- r: 314258 b: refs/heads/master c: 77c6849d7aca31a0743be51412853079fcea03e0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/dcb/dcbnl.c | 37 ------------------------------------- 2 files changed, 1 insertion(+), 38 deletions(-) diff --git a/[refs] b/[refs] index 4293a4f5ce18..7459840c22a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7be994138b188387691322921c08e19bddf6d3c5 +refs/heads/master: 77c6849d7aca31a0743be51412853079fcea03e0 diff --git a/trunk/net/dcb/dcbnl.c b/trunk/net/dcb/dcbnl.c index 5e392b85d48d..5ed71674a4a1 100644 --- a/trunk/net/dcb/dcbnl.c +++ b/trunk/net/dcb/dcbnl.c @@ -224,43 +224,6 @@ static struct sk_buff *dcbnl_newmsg(int type, u8 cmd, u32 port, u32 seq, return skb; } -/* standard netlink reply call */ -static int dcbnl_reply(u8 value, u8 event, u8 cmd, u8 attr, u32 pid, - u32 seq, u16 flags) -{ - struct sk_buff *dcbnl_skb; - struct dcbmsg *dcb; - struct nlmsghdr *nlh; - int ret = -EINVAL; - - dcbnl_skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL); - if (!dcbnl_skb) - return ret; - - nlh = NLMSG_NEW(dcbnl_skb, pid, seq, event, sizeof(*dcb), flags); - - dcb = NLMSG_DATA(nlh); - dcb->dcb_family = AF_UNSPEC; - dcb->cmd = cmd; - dcb->dcb_pad = 0; - - ret = nla_put_u8(dcbnl_skb, attr, value); - if (ret) - goto err; - - /* end the message, assign the nlmsg_len. */ - nlmsg_end(dcbnl_skb, nlh); - ret = rtnl_unicast(dcbnl_skb, &init_net, pid); - if (ret) - return -EINVAL; - - return 0; -nlmsg_failure: -err: - kfree_skb(dcbnl_skb); - return ret; -} - static int dcbnl_getstate(struct net_device *netdev, struct nlmsghdr *nlh, u32 seq, struct nlattr **tb, struct sk_buff *skb) {