xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	drivers/net/wireless/libertas/host.h
This commit is contained in:
David S. Miller
2010-07-01 17:34:14 -07:00
parent ea812ca1b0 88c1f4f6df
commit 05318bc905
111 changed files with 3633 additions and 7660 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/rtl818x/rtl8180_dev.c
View File

@@ -671,7 +671,7 @@ static u64 rtl8180_get_tsf(struct ieee80211_hw *dev)
(u64)(rtl818x_ioread32(priv, &priv->map->TSFT[1])) << 32;
}
void rtl8180_beacon_work(struct work_struct *work)
static void rtl8180_beacon_work(struct work_struct *work)
{
struct rtl8180_vif *vif_priv =
container_of(work, struct rtl8180_vif, beacon_work.work);