Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdf51894 authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller
Browse files

[WEXT]: Reduce inline abuse. 



This patch removes a bunch of inline abuse from wext. Most functions
that were marked inline are only used once so the compiler will inline
them anyway, others are used multiple times but there's no requirement
for them to be inline since they aren't in any fast paths.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7a9df167

net/wireless/wext.c

+10 −19
Original line number Original line Diff line number Diff line
@@ -440,10 +440,8 @@ static const int event_type_pk_size[] = { 
/* ---------------------------------------------------------------- */

/* ---------------------------------------------------------------- */

/*

/*

 * Return the driver handler associated with a specific Wireless Extension.

 * Return the driver handler associated with a specific Wireless Extension.

 * Called from various place, so make sure it remains efficient.

 */

 */

static inline iw_handler get_handler(struct net_device *dev,

static iw_handler get_handler(struct net_device *dev, unsigned int cmd)

				     unsigned int cmd)

{

{

	/* Don't "optimise" the following variable, it will crash */

	/* Don't "optimise" the following variable, it will crash */

	unsigned int	index;		/* *MUST* be unsigned */

	unsigned int	index;		/* *MUST* be unsigned */
@@ -470,7 +468,7 @@ static inline iw_handler get_handler(struct net_device *dev, 
/*

/*

 * Get statistics out of the driver

 * Get statistics out of the driver

 */

 */

static inline struct iw_statistics *get_wireless_stats(struct net_device *dev)

static struct iw_statistics *get_wireless_stats(struct net_device *dev)

{

{

	/* New location */

	/* New location */

	if ((dev->wireless_handlers != NULL) &&

	if ((dev->wireless_handlers != NULL) &&
@@ -500,7 +498,7 @@ static inline struct iw_statistics *get_wireless_stats(struct net_device *dev) 
 * netif_running(dev) test. I'm open on that one...

 * netif_running(dev) test. I'm open on that one...

 * Hopefully, the driver will remember to do a commit in "open()" ;-)

 * Hopefully, the driver will remember to do a commit in "open()" ;-)

 */

 */

static inline int call_commit_handler(struct net_device *	dev)

static int call_commit_handler(struct net_device *dev)

{

{

	if ((netif_running(dev)) &&

	if ((netif_running(dev)) &&

	   (dev->wireless_handlers->standard[0] != NULL)) {

	   (dev->wireless_handlers->standard[0] != NULL)) {
@@ -622,7 +620,7 @@ static int iw_handler_get_private(struct net_device * dev, 
/*

/*

 * Print one entry (line) of /proc/net/wireless

 * Print one entry (line) of /proc/net/wireless

 */

 */

static __inline__ void wireless_seq_printf_stats(struct seq_file *seq,

static void wireless_seq_printf_stats(struct seq_file *seq,

				      struct net_device *dev)

				      struct net_device *dev)

{

{

	/* Get stats from the driver */

	/* Get stats from the driver */
@@ -892,10 +890,8 @@ static int ioctl_standard_call(struct net_device * dev, 
 * a iw_handler but process it in your ioctl handler (i.e. use the

 * a iw_handler but process it in your ioctl handler (i.e. use the

 * old driver API).

 * old driver API).

 */

 */

static inline int ioctl_private_call(struct net_device *	dev,

static int ioctl_private_call(struct net_device *dev, struct ifreq *ifr,

				     struct ifreq *		ifr,

			      unsigned int cmd, iw_handler handler)

				     unsigned int		cmd,

				     iw_handler		handler)

{

{

	struct iwreq *			iwr = (struct iwreq *) ifr;

	struct iwreq *			iwr = (struct iwreq *) ifr;

	const struct iw_priv_args *	descr = NULL;

	const struct iw_priv_args *	descr = NULL;
@@ -1134,11 +1130,8 @@ static DECLARE_TASKLET(wireless_nlevent_tasklet, wireless_nlevent_process, 0); 
 * current wireless config. Dumping the wireless config is far too

 * current wireless config. Dumping the wireless config is far too

 * expensive (for each parameter, the driver need to query the hardware).

 * expensive (for each parameter, the driver need to query the hardware).

 */

 */

static inline int rtnetlink_fill_iwinfo(struct sk_buff *	skb,

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

					struct net_device *	dev,

				 int type, char *event, int event_len)

					int			type,

					char *			event,

					int			event_len)

{

{

	struct ifinfomsg *r;

	struct ifinfomsg *r;

	struct nlmsghdr  *nlh;

	struct nlmsghdr  *nlh;
@@ -1172,9 +1165,7 @@ static inline int rtnetlink_fill_iwinfo(struct sk_buff * skb, 
 * Andrzej Krzysztofowicz mandated that I used a IFLA_XXX field

 * Andrzej Krzysztofowicz mandated that I used a IFLA_XXX field

 * within a RTM_NEWLINK event.

 * within a RTM_NEWLINK event.

 */

 */

static inline void rtmsg_iwinfo(struct net_device *	dev,

static void rtmsg_iwinfo(struct net_device *dev, char *event, int event_len)

				char *			event,

				int			event_len)

{

{

	struct sk_buff *skb;

	struct sk_buff *skb;

	int size = NLMSG_GOODSIZE;

	int size = NLMSG_GOODSIZE;