A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-24 13:44:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Conflicts:
	net/wireless/nl80211.c
This commit is contained in:
John W. Linville 2013-06-21 15:42:30 -04:00
commit 7d2a47aab2
210 changed files with 27577 additions and 2842 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/linux/ieee80211.h
View file

@ -146,6 +146,7 @@ static inline u16 ieee80211_sn_sub(u16 sn1, u16 sn2)
#define IEEE80211_MAX_RTS_THRESHOLD 2353
#define IEEE80211_MAX_AID 2007
#define IEEE80211_MAX_TIM_LEN 251
#define IEEE80211_MAX_MESH_PEERINGS 63
/* Maximum size for the MA-UNITDATA primitive, 802.11 standard section
6.2.1.1.2.

15
include/linux/ssb/ssb_driver_mips.h
View file

@ -20,6 +20,18 @@ struct ssb_pflash {
u32 window_size;
};
#ifdef CONFIG_SSB_SFLASH
struct ssb_sflash {
bool present;
u32 window;
u32 blocksize;
u16 numblocks;
u32 size;
void *priv;
};
#endif
struct ssb_mipscore {
struct ssb_device *dev;
@ -27,6 +39,9 @@ struct ssb_mipscore {
struct ssb_serial_port serial_ports[4];
struct ssb_pflash pflash;
#ifdef CONFIG_SSB_SFLASH
struct ssb_sflash sflash;
#endif
};
extern void ssb_mipscore_init(struct ssb_mipscore *mcore);