projects
/
openwrt
/
staging
/
lynxis.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mac80211: update to backports-4.14-rc2
[openwrt/staging/lynxis.git]
/
package
/
kernel
/
mac80211
/
patches
/
060-no_local_ssb_bcma.patch
diff --git
a/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch
b/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch
index 527938f0158f4f96f293eca922fcf416a0d42e77..1fc52f9ab0f67197c69b747dd400779499d7e0ee 100644
(file)
--- a/
package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch
+++ b/
package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch
@@
-1,6
+1,6
@@
---- a/
.
local-symbols
-+++ b/
.
local-symbols
-@@ -
482,45 +482
,6 @@ USB_IPHETH=
+--- a/local-symbols
++++ b/local-symbols
+@@ -
383,45 +383
,6 @@ USB_IPHETH=
USB_SIERRA_NET=
USB_VL600=
USB_NET_CH9200=
USB_SIERRA_NET=
USB_VL600=
USB_NET_CH9200=
@@
-48,7
+48,7
@@
NFC_NCI=
--- a/drivers/net/wireless/broadcom/b43/main.c
+++ b/drivers/net/wireless/broadcom/b43/main.c
NFC_NCI=
--- a/drivers/net/wireless/broadcom/b43/main.c
+++ b/drivers/net/wireless/broadcom/b43/main.c
-@@ -28
66,7 +286
6,7 @@ static struct ssb_device *b43_ssb_gpio_d
+@@ -28
76,7 +287
6,7 @@ static struct ssb_device *b43_ssb_gpio_d
{
struct ssb_bus *bus = dev->dev->sdev->bus;
{
struct ssb_bus *bus = dev->dev->sdev->bus;
@@
-57,7
+57,7
@@
return (bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev);
#else
return bus->chipco.dev;
return (bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev);
#else
return bus->chipco.dev;
-@@ -48
83,7 +488
3,7 @@ static int b43_wireless_core_init(struct
+@@ -48
93,7 +489
3,7 @@ static int b43_wireless_core_init(struct
}
if (sprom->boardflags_lo & B43_BFL_XTAL_NOSLOW)
hf |= B43_HF_DSCRQ; /* Disable slowclock requests from ucode. */
}
if (sprom->boardflags_lo & B43_BFL_XTAL_NOSLOW)
hf |= B43_HF_DSCRQ; /* Disable slowclock requests from ucode. */
@@
-110,7
+110,7
@@
--- a/Kconfig.sources
+++ b/Kconfig.sources
@@ -9,9 +9,6 @@ source "$BACKPORT_DIR/drivers/net/wirele
--- a/Kconfig.sources
+++ b/Kconfig.sources
@@ -9,9 +9,6 @@ source "$BACKPORT_DIR/drivers/net/wirele
- source "$BACKPORT_DIR/drivers/net/ethernet/Kconfig"
+
#
source "$BACKPORT_DIR/drivers/net/ethernet/Kconfig"
source "$BACKPORT_DIR/drivers/net/usb/Kconfig"
-source "$BACKPORT_DIR/drivers/ssb/Kconfig"
source "$BACKPORT_DIR/drivers/net/usb/Kconfig"
-source "$BACKPORT_DIR/drivers/ssb/Kconfig"
@@
-118,15
+118,15
@@
-
source "$BACKPORT_DIR/net/nfc/Kconfig"
-
source "$BACKPORT_DIR/net/nfc/Kconfig"
- source "$BACKPORT_DIR/drivers/media/Kconfig"
+
#
source "$BACKPORT_DIR/drivers/media/Kconfig"
--- a/Makefile.kernel
+++ b/Makefile.kernel
--- a/Makefile.kernel
+++ b/Makefile.kernel
-@@ -3
8,8 +38
,6 @@ obj-$(CPTCFG_MAC80211) += net/mac80211/
+@@ -3
9,8 +39
,6 @@ obj-$(CPTCFG_MAC80211) += net/mac80211/
obj-$(CPTCFG_WLAN) += drivers/net/wireless/
obj-$(CPTCFG_WLAN) += drivers/net/wireless/
- obj-$(CPTCFG_BT) += net/bluetooth/
- obj-$(CPTCFG_BT) += drivers/bluetooth/
+
#
obj-$(CPTCFG_BT) += net/bluetooth/
+
#
obj-$(CPTCFG_BT) += drivers/bluetooth/
-obj-$(CPTCFG_SSB) += drivers/ssb/
-obj-$(CPTCFG_BCMA) += drivers/bcma/
-obj-$(CPTCFG_SSB) += drivers/ssb/
-obj-$(CPTCFG_BCMA) += drivers/bcma/
- obj-$(CPTCFG_ETHERNET) += drivers/net/ethernet/
+
#
obj-$(CPTCFG_ETHERNET) += drivers/net/ethernet/
obj-$(CPTCFG_USB_NET_RNDIS_WLAN) += drivers/net/usb/
obj-$(CPTCFG_NFC) += net/nfc/
obj-$(CPTCFG_USB_NET_RNDIS_WLAN) += drivers/net/usb/
obj-$(CPTCFG_NFC) += net/nfc/