Commit 4598c955 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [RTNETLINK]: Remove remains of wireless extensions over rtnetlink
  [RTNETLINK]: Allow changing of subsets of netdevice flags in rtnl_setlink
  [AF_RXRPC]: Make call state names available if CONFIG_PROC_FS=n
  [AF_RXRPC]: AF_RXRPC depends on IPv4
  [IPSEC]: Fix warnings with casting int to pointer
parents 641e22e0 575c3e2a

net/core/rtnetlink.c

+19 −19
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ static void copy_rtnl_link_stats(struct rtnl_link_stats *a, 
	a->tx_compressed = b->tx_compressed;

};



static inline size_t if_nlmsg_size(int iwbuflen)

static inline size_t if_nlmsg_size(void)

{

	return NLMSG_ALIGN(sizeof(struct ifinfomsg))

	       + nla_total_size(IFNAMSIZ) /* IFLA_IFNAME */
@@ -452,13 +452,12 @@ static inline size_t if_nlmsg_size(int iwbuflen) 
	       + nla_total_size(4) /* IFLA_LINK */

	       + nla_total_size(4) /* IFLA_MASTER */

	       + nla_total_size(1) /* IFLA_OPERSTATE */

	       + nla_total_size(1) /* IFLA_LINKMODE */

	       + nla_total_size(iwbuflen);

	       + nla_total_size(1); /* IFLA_LINKMODE */

}



static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,

			    void *iwbuf, int iwbuflen, int type, u32 pid,

			    u32 seq, u32 change, unsigned int flags)

			    int type, u32 pid, u32 seq, u32 change,

			    unsigned int flags)

{

	struct ifinfomsg *ifm;

	struct nlmsghdr *nlh;
@@ -523,9 +522,6 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev, 
		}

	}



	if (iwbuf)

		NLA_PUT(skb, IFLA_WIRELESS, iwbuflen, iwbuf);



	return nlmsg_end(skb, nlh);



nla_put_failure:
@@ -543,7 +539,7 @@ static int rtnl_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb) 
	for_each_netdev(dev) {

		if (idx < s_idx)

			goto cont;

		if (rtnl_fill_ifinfo(skb, dev, NULL, 0, RTM_NEWLINK,

		if (rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK,

				     NETLINK_CB(cb->skb).pid,

				     cb->nlh->nlmsg_seq, 0, NLM_F_MULTI) <= 0)

			break;
@@ -689,8 +685,15 @@ static int rtnl_setlink(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) 
	}





	if (ifm->ifi_flags)

		dev_change_flags(dev, ifm->ifi_flags);

	if (ifm->ifi_flags || ifm->ifi_change) {

		unsigned int flags = ifm->ifi_flags;



		/* bugwards compatibility: ifi_change == 0 is treated as ~0 */

		if (ifm->ifi_change)

			flags = (flags & ifm->ifi_change) |

				(dev->flags & ~ifm->ifi_change);

		dev_change_flags(dev, flags);

	}



	if (tb[IFLA_TXQLEN])

		dev->tx_queue_len = nla_get_u32(tb[IFLA_TXQLEN]);
@@ -730,8 +733,6 @@ static int rtnl_getlink(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg) 
	struct nlattr *tb[IFLA_MAX+1];

	struct net_device *dev = NULL;

	struct sk_buff *nskb;

	char *iw_buf = NULL, *iw = NULL;

	int iw_buf_len = 0;

	int err;



	err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFLA_MAX, ifla_policy);
@@ -746,14 +747,14 @@ static int rtnl_getlink(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg) 
	} else

		return -EINVAL;



	nskb = nlmsg_new(if_nlmsg_size(iw_buf_len), GFP_KERNEL);

	nskb = nlmsg_new(if_nlmsg_size(), GFP_KERNEL);

	if (nskb == NULL) {

		err = -ENOBUFS;

		goto errout;

	}



	err = rtnl_fill_ifinfo(nskb, dev, iw, iw_buf_len, RTM_NEWLINK,

			       NETLINK_CB(skb).pid, nlh->nlmsg_seq, 0, 0);

	err = rtnl_fill_ifinfo(nskb, dev, RTM_NEWLINK, NETLINK_CB(skb).pid,

			       nlh->nlmsg_seq, 0, 0);

	if (err < 0) {

		/* -EMSGSIZE implies BUG in if_nlmsg_size */

		WARN_ON(err == -EMSGSIZE);
@@ -762,7 +763,6 @@ static int rtnl_getlink(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg) 
	}

	err = rtnl_unicast(nskb, NETLINK_CB(skb).pid);

errout:

	kfree(iw_buf);

	dev_put(dev);



	return err;
@@ -797,11 +797,11 @@ void rtmsg_ifinfo(int type, struct net_device *dev, unsigned change) 
	struct sk_buff *skb;

	int err = -ENOBUFS;



	skb = nlmsg_new(if_nlmsg_size(0), GFP_KERNEL);

	skb = nlmsg_new(if_nlmsg_size(), GFP_KERNEL);

	if (skb == NULL)

		goto errout;



	err = rtnl_fill_ifinfo(skb, dev, NULL, 0, type, 0, 0, change, 0);

	err = rtnl_fill_ifinfo(skb, dev, type, 0, 0, change, 0);

	if (err < 0) {

		/* -EMSGSIZE implies BUG in if_nlmsg_size() */

		WARN_ON(err == -EMSGSIZE);

net/rxrpc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


config AF_RXRPC

	tristate "RxRPC session sockets"

	depends on EXPERIMENTAL

	depends on INET && EXPERIMENTAL

	select KEYS

	help

	  Say Y or M here to include support for RxRPC session sockets (just

net/rxrpc/ar-call.c

+19 −0
Original line number Diff line number Diff line
@@ -15,6 +15,25 @@ 
#include <net/af_rxrpc.h>

#include "ar-internal.h"



const char *rxrpc_call_states[] = {

	[RXRPC_CALL_CLIENT_SEND_REQUEST]	= "ClSndReq",

	[RXRPC_CALL_CLIENT_AWAIT_REPLY]		= "ClAwtRpl",

	[RXRPC_CALL_CLIENT_RECV_REPLY]		= "ClRcvRpl",

	[RXRPC_CALL_CLIENT_FINAL_ACK]		= "ClFnlACK",

	[RXRPC_CALL_SERVER_SECURING]		= "SvSecure",

	[RXRPC_CALL_SERVER_ACCEPTING]		= "SvAccept",

	[RXRPC_CALL_SERVER_RECV_REQUEST]	= "SvRcvReq",

	[RXRPC_CALL_SERVER_ACK_REQUEST]		= "SvAckReq",

	[RXRPC_CALL_SERVER_SEND_REPLY]		= "SvSndRpl",

	[RXRPC_CALL_SERVER_AWAIT_ACK]		= "SvAwtACK",

	[RXRPC_CALL_COMPLETE]			= "Complete",

	[RXRPC_CALL_SERVER_BUSY]		= "SvBusy  ",

	[RXRPC_CALL_REMOTELY_ABORTED]		= "RmtAbort",

	[RXRPC_CALL_LOCALLY_ABORTED]		= "LocAbort",

	[RXRPC_CALL_NETWORK_ERROR]		= "NetError",

	[RXRPC_CALL_DEAD]			= "Dead    ",

};



struct kmem_cache *rxrpc_call_jar;

LIST_HEAD(rxrpc_calls);

DEFINE_RWLOCK(rxrpc_call_lock);

net/rxrpc/ar-proc.c

+0 −19
Original line number Diff line number Diff line
@@ -25,25 +25,6 @@ static const char *rxrpc_conn_states[] = { 
	[RXRPC_CONN_NETWORK_ERROR]	= "NetError",

};



const char *rxrpc_call_states[] = {

	[RXRPC_CALL_CLIENT_SEND_REQUEST]	= "ClSndReq",

	[RXRPC_CALL_CLIENT_AWAIT_REPLY]		= "ClAwtRpl",

	[RXRPC_CALL_CLIENT_RECV_REPLY]		= "ClRcvRpl",

	[RXRPC_CALL_CLIENT_FINAL_ACK]		= "ClFnlACK",

	[RXRPC_CALL_SERVER_SECURING]		= "SvSecure",

	[RXRPC_CALL_SERVER_ACCEPTING]		= "SvAccept",

	[RXRPC_CALL_SERVER_RECV_REQUEST]	= "SvRcvReq",

	[RXRPC_CALL_SERVER_ACK_REQUEST]		= "SvAckReq",

	[RXRPC_CALL_SERVER_SEND_REPLY]		= "SvSndRpl",

	[RXRPC_CALL_SERVER_AWAIT_ACK]		= "SvAwtACK",

	[RXRPC_CALL_COMPLETE]			= "Complete",

	[RXRPC_CALL_SERVER_BUSY]		= "SvBusy  ",

	[RXRPC_CALL_REMOTELY_ABORTED]		= "RmtAbort",

	[RXRPC_CALL_LOCALLY_ABORTED]		= "LocAbort",

	[RXRPC_CALL_NETWORK_ERROR]		= "NetError",

	[RXRPC_CALL_DEAD]			= "Dead    ",

};



/*

 * generate a list of extant and dead calls in /proc/net/rxrpc_calls

 */

net/xfrm/xfrm_algo.c

+4 −4
Original line number Diff line number Diff line
@@ -407,27 +407,27 @@ static struct xfrm_algo_desc *xfrm_find_algo( 
static int xfrm_alg_id_match(const struct xfrm_algo_desc *entry,

			     const void *data)

{

	return entry->desc.sadb_alg_id == (int)data;

	return entry->desc.sadb_alg_id == (unsigned long)data;

}



struct xfrm_algo_desc *xfrm_aalg_get_byid(int alg_id)

{

	return xfrm_find_algo(&xfrm_aalg_list, xfrm_alg_id_match,

			      (void *)alg_id, 1);

			      (void *)(unsigned long)alg_id, 1);

}

EXPORT_SYMBOL_GPL(xfrm_aalg_get_byid);



struct xfrm_algo_desc *xfrm_ealg_get_byid(int alg_id)

{

	return xfrm_find_algo(&xfrm_ealg_list, xfrm_alg_id_match,

			      (void *)alg_id, 1);

			      (void *)(unsigned long)alg_id, 1);

}

EXPORT_SYMBOL_GPL(xfrm_ealg_get_byid);



struct xfrm_algo_desc *xfrm_calg_get_byid(int alg_id)

{

	return xfrm_find_algo(&xfrm_calg_list, xfrm_alg_id_match,

			      (void *)alg_id, 1);

			      (void *)(unsigned long)alg_id, 1);

}

EXPORT_SYMBOL_GPL(xfrm_calg_get_byid);

CRA Git | Maintained and supported by SUSTech CRA and CCSE