Commit 6051e2f4 authored by Thomas Graf's avatar Thomas Graf Committed by David S. Miller
Browse files

[IPv6] prefix: Convert RTM_NEWPREFIX notifications to use the new netlink api 



RTM_GETPREFIX is completely unused and is thus removed.

Signed-off-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 04561c1f

include/linux/rtnetlink.h

+0 −2
Original line number Diff line number Diff line
@@ -81,8 +81,6 @@ enum { 


	RTM_NEWPREFIX	= 52,

#define RTM_NEWPREFIX	RTM_NEWPREFIX

	RTM_GETPREFIX	= 54,

#define RTM_GETPREFIX	RTM_GETPREFIX



	RTM_GETMULTICAST = 58,

#define RTM_GETMULTICAST RTM_GETMULTICAST

net/core/rtnetlink.c

+0 −1
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ static const int rtm_min[RTM_NR_FAMILIES] = 
	[RTM_FAM(RTM_NEWTCLASS)]    = NLMSG_LENGTH(sizeof(struct tcmsg)),

	[RTM_FAM(RTM_NEWTFILTER)]   = NLMSG_LENGTH(sizeof(struct tcmsg)),

	[RTM_FAM(RTM_NEWACTION)]    = NLMSG_LENGTH(sizeof(struct tcamsg)),

	[RTM_FAM(RTM_NEWPREFIX)]    = NLMSG_LENGTH(sizeof(struct rtgenmsg)),

	[RTM_FAM(RTM_GETMULTICAST)] = NLMSG_LENGTH(sizeof(struct rtgenmsg)),

	[RTM_FAM(RTM_GETANYCAST)]   = NLMSG_LENGTH(sizeof(struct rtgenmsg)),

};

net/ipv6/addrconf.c

+14 −16
Original line number Diff line number Diff line
@@ -3523,11 +3523,13 @@ static int inet6_fill_prefix(struct sk_buff *skb, struct inet6_dev *idev, 
{

	struct prefixmsg *pmsg;

	struct nlmsghdr *nlh;

	unsigned char		*b = skb->tail;

	struct prefix_cacheinfo	ci;



	nlh = NLMSG_NEW(skb, pid, seq, event, sizeof(*pmsg), flags);

	pmsg = NLMSG_DATA(nlh);

	nlh = nlmsg_put(skb, pid, seq, event, sizeof(*pmsg), flags);

	if (nlh == NULL)

		return -ENOBUFS;



	pmsg = nlmsg_data(nlh);

	pmsg->prefix_family = AF_INET6;

	pmsg->prefix_pad1 = 0;

	pmsg->prefix_pad2 = 0;
@@ -3535,26 +3537,22 @@ static int inet6_fill_prefix(struct sk_buff *skb, struct inet6_dev *idev, 
	pmsg->prefix_len = pinfo->prefix_len;

	pmsg->prefix_type = pinfo->type;

	pmsg->prefix_pad3 = 0;

	

	pmsg->prefix_flags = 0;

	if (pinfo->onlink)

		pmsg->prefix_flags |= IF_PREFIX_ONLINK;

	if (pinfo->autoconf)

		pmsg->prefix_flags |= IF_PREFIX_AUTOCONF;



	RTA_PUT(skb, PREFIX_ADDRESS, sizeof(pinfo->prefix), &pinfo->prefix);

	NLA_PUT(skb, PREFIX_ADDRESS, sizeof(pinfo->prefix), &pinfo->prefix);



	ci.preferred_time = ntohl(pinfo->prefered);

	ci.valid_time = ntohl(pinfo->valid);

	RTA_PUT(skb, PREFIX_CACHEINFO, sizeof(ci), &ci);

	NLA_PUT(skb, PREFIX_CACHEINFO, sizeof(ci), &ci);



	nlh->nlmsg_len = skb->tail - b;

	return skb->len;

	return nlmsg_end(skb, nlh);



nlmsg_failure:

rtattr_failure:

	skb_trim(skb, b - skb->data);

	return -1;

nla_put_failure:

	return nlmsg_cancel(skb, nlh);

}



static void inet6_prefix_notify(int event, struct inet6_dev *idev,

security/selinux/nlmsgtab.c

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ static struct nlmsg_perm nlmsg_route_perms[] = 
	{ RTM_DELACTION,	NETLINK_ROUTE_SOCKET__NLMSG_WRITE },

	{ RTM_GETACTION,	NETLINK_ROUTE_SOCKET__NLMSG_READ  },

	{ RTM_NEWPREFIX,	NETLINK_ROUTE_SOCKET__NLMSG_WRITE },

	{ RTM_GETPREFIX,	NETLINK_ROUTE_SOCKET__NLMSG_READ  },

	{ RTM_GETMULTICAST,	NETLINK_ROUTE_SOCKET__NLMSG_READ  },

	{ RTM_GETANYCAST,	NETLINK_ROUTE_SOCKET__NLMSG_READ  },

	{ RTM_GETNEIGHTBL,	NETLINK_ROUTE_SOCKET__NLMSG_READ  },