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

Commit bbeec90b authored by Jeff Garzik's avatar Jeff Garzik
Browse files

[wireless] build fixes after merging WE-19

parent e345d5ef

drivers/net/wireless/airo.c

+1 −1
Original line number Diff line number Diff line
@@ -6867,7 +6867,7 @@ static inline char *airo_translate_scan(struct net_device *dev, 
	} else {

		iwe.u.qual.level = (bss->dBm + 321) / 2;

		iwe.u.qual.qual = 0;

		iwe.u.qual.updated = IW_QUAL_QUAL_INVALID;

		iwe.u.qual.updated = IW_QUAL_QUAL_INVALID

				| IW_QUAL_LEVEL_UPDATED

				| IW_QUAL_DBM;

	}

drivers/net/wireless/ray_cs.c

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
#include <pcmcia/ds.h>

#include <pcmcia/mem_op.h>



#include <net/ieee80211.h>

#include <linux/wireless.h>



#include <asm/io.h>

include/linux/wireless.h

+3 −6
Original line number Diff line number Diff line
@@ -69,12 +69,9 @@ 


/***************************** INCLUDES *****************************/



/* Do not put any header in this file, this creates a mess when

 * exported to user space. Most users have included all the

 * relevant headers anyway... Jean II */

/*#include <linux/types.h>*/		/* for "caddr_t" et al		*/

/*#include <linux/socket.h>*/		/* for "struct sockaddr" et al	*/

/*#include <linux/if.h>*/		/* for IFNAMSIZ and co... */

#include <linux/types.h>		/* for "caddr_t" et al		*/

#include <linux/socket.h>		/* for "struct sockaddr" et al	*/

#include <linux/if.h>			/* for IFNAMSIZ and co... */



/***************************** VERSION *****************************/

/*

net/ieee80211/ieee80211_wx.c

+3 −2
Original line number Diff line number Diff line
@@ -29,12 +29,13 @@ 
  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497



******************************************************************************/

#include <linux/wireless.h>

#include <linux/version.h>



#include <linux/kmod.h>

#include <linux/module.h>



#include <net/ieee80211.h>

#include <linux/wireless.h>



static const char *ieee80211_modes[] = {

	"?", "a", "b", "ab", "g", "ag", "bg", "abg"

};