projects
/
GitHub
/
LineageOS
/
android_kernel_motorola_exynos9610.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
769162e
36eb22e
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
author
John W. Linville
<linville@tuxdriver.com>
Fri, 20 Jul 2012 16:30:48 +0000
(12:30 -0400)
committer
John W. Linville
<linville@tuxdriver.com>
Fri, 20 Jul 2012 16:30:48 +0000
(12:30 -0400)
15 files changed:
1
2
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/b43/main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/brcm80211/brcmsmac/main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlwifi/pcie/trans.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/libertas/if_usb.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/mac80211_hwsim.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/mwifiex/cfg80211.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/mwifiex/sta_cmd.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/mwifiex/sta_cmdresp.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/rtlwifi/base.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/rtlwifi/pci.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/ti/wlcore/tx.c
patch
|
diff1
|
diff2
|
blob
|
history
net/mac80211/rx.c
patch
|
diff1
|
diff2
|
blob
|
history
net/mac80211/scan.c
patch
|
diff1
|
diff2
|
blob
|
history
net/wireless/nl80211.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
Simple merge
diff --cc
drivers/net/wireless/b43/main.c
Simple merge
diff --cc
drivers/net/wireless/brcm80211/brcmsmac/main.c
Simple merge
diff --cc
drivers/net/wireless/iwlwifi/pcie/trans.c
Simple merge
diff --cc
drivers/net/wireless/libertas/if_usb.c
Simple merge
diff --cc
drivers/net/wireless/mac80211_hwsim.c
Simple merge
diff --cc
drivers/net/wireless/mwifiex/cfg80211.c
Simple merge
diff --cc
drivers/net/wireless/mwifiex/sta_cmd.c
Simple merge
diff --cc
drivers/net/wireless/mwifiex/sta_cmdresp.c
index 97715dfbdf58a786de59c887781ddf9b08cfeb09,e0178c0829d7ffbd12d547762d374cead3db06de..0b09004ebb25a3eebf6f5fe8f85bfd9c196f351c
---
1
/
drivers/net/wireless/mwifiex/sta_cmdresp.c
---
2
/
drivers/net/wireless/mwifiex/sta_cmdresp.c
+++ b/
drivers/net/wireless/mwifiex/sta_cmdresp.c
@@@
-280,9
-278,8
+278,8
@@@
static int mwifiex_ret_tx_rate_cfg(stru
u16 tlv, tlv_buf_len;
u8 *tlv_buf;
u32 i;
- int ret = 0;
- tlv_buf = (
u8 *) ((u8 *)
rate_cfg) +
+ tlv_buf = (
(u8 *)
rate_cfg) +
sizeof(struct host_cmd_ds_tx_rate_cfg);
tlv_buf_len = *(u16 *) (tlv_buf + sizeof(u16));
diff --cc
drivers/net/wireless/rtlwifi/base.c
Simple merge
diff --cc
drivers/net/wireless/rtlwifi/pci.c
Simple merge
diff --cc
drivers/net/wireless/ti/wlcore/tx.c
Simple merge
diff --cc
net/mac80211/rx.c
Simple merge
diff --cc
net/mac80211/scan.c
Simple merge
diff --cc
net/wireless/nl80211.c
Simple merge