kybaaz/linux-xiaomi-chiron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

Browse source 
Conflicts:
	drivers/net/wireless/ath/ath9k/recv.c
This commit is contained in:
John W. Linville 2014-03-13 14:21:43 -04:00
commit 42775a34d2
314 changed files with 30435 additions and 4694 deletions
Download patch file Download diff file Expand all files Collapse all files

36
include/linux/ieee80211.h
View file

@ -2307,42 +2307,6 @@ static inline bool ieee80211_is_public_action(struct ieee80211_hdr *hdr,
return mgmt->u.action.category == WLAN_CATEGORY_PUBLIC;
}
/**
* ieee80211_dsss_chan_to_freq - get channel center frequency
* @channel: the DSSS channel
*
* Convert IEEE802.11 DSSS channel to the center frequency (MHz).
* Ref IEEE 802.11-2007 section 15.6
*/
static inline int ieee80211_dsss_chan_to_freq(int channel)
{
if ((channel > 0) && (channel < 14))
return 2407 + (channel * 5);
else if (channel == 14)
return 2484;
else
return -1;
}
/**
* ieee80211_freq_to_dsss_chan - get channel
* @freq: the frequency
*
* Convert frequency (MHz) to IEEE802.11 DSSS channel
* Ref IEEE 802.11-2007 section 15.6
*
* This routine selects the channel with the closest center frequency.
*/
static inline int ieee80211_freq_to_dsss_chan(int freq)
{
if ((freq >= 2410) && (freq < 2475))
return (freq - 2405) / 5;
else if ((freq >= 2482) && (freq < 2487))
return 14;
else
return -1;
}
/**
* ieee80211_tu_to_usec - convert time units (TU) to microseconds
* @tu: the TUs

1
include/linux/miscdevice.h
View file

@ -23,6 +23,7 @@
#define TEMP_MINOR 131 /* Temperature Sensor */
#define RTC_MINOR 135
#define EFI_RTC_MINOR 136 /* EFI Time services */
#define VHCI_MINOR 137
#define SUN_OPENPROM_MINOR 139
#define DMAPI_MINOR 140 /* DMAPI */
#define NVRAM_MINOR 144

6
include/linux/tty.h
View file

@ -518,9 +518,9 @@ extern void tty_port_put(struct tty_port *port);
static inline struct tty_port *tty_port_get(struct tty_port *port)
{
if (port)
kref_get(&port->kref);
return port;
if (port && kref_get_unless_zero(&port->kref))
return port;
return NULL;
}
/* If the cts flow control is enabled, return true. */

24
include/linux/wl12xx.h
View file

@ -48,11 +48,15 @@ enum {
WL12XX_TCXOCLOCK_33_6 = 7, /* 33.6 MHz */
};
struct wl12xx_platform_data {
void (*set_power)(bool enable);
struct wl1251_platform_data {
int power_gpio;
/* SDIO only: IRQ number if WLAN_IRQ line is used, 0 for SDIO IRQs */
int irq;
bool use_eeprom;
};
struct wl12xx_platform_data {
int irq;
int board_ref_clock;
int board_tcxo_clock;
unsigned long platform_quirks;
@ -68,6 +72,10 @@ int wl12xx_set_platform_data(const struct wl12xx_platform_data *data);
struct wl12xx_platform_data *wl12xx_get_platform_data(void);
int wl1251_set_platform_data(const struct wl1251_platform_data *data);
struct wl1251_platform_data *wl1251_get_platform_data(void);
#else
static inline
@ -82,6 +90,18 @@ struct wl12xx_platform_data *wl12xx_get_platform_data(void)
return ERR_PTR(-ENODATA);
}
static inline
int wl1251_set_platform_data(const struct wl1251_platform_data *data)
{
return -ENOSYS;
}
static inline
struct wl1251_platform_data *wl1251_get_platform_data(void)
{
return ERR_PTR(-ENODATA);
}
#endif
#endif