tree 8e2c35636aeb016e46a5113cedb56761c521ee22
parent 61593f02176862f4880ddefcb1f54cb5f5d9f043
author Dmitry Shmidt <dimitrysh@google.com> 1398447996 -0700
committer Dmitry Shmidt <dimitrysh@google.com> 1398447996 -0700

Cumulative patch from commit d0df64373561a8804c35e1900e5857096f5b73d8

d0df643 wpa_supplicant: Call frequency conflict handling during auth
0cf24fd scan: Reset normal scan counter when a connection succeeds
dcdce14 radiotap: Fix compilation for systems without le16toh/le32toh
9176ec0 Android: Disable unused parameter warnings
2aa82e5 Interworking: Don't filter probe requests when interworking is disabled
13f6a07 Add SIM identifier to the network profile and cred block

Change-Id: I9135d23aea91ca2950b5eeefa9f81c38ab1ff4d1
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>