kernel: update linux 3.9 patches to rc8
Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36469 3c298f89-4303-0410-b956-a3cf2f4a3e73master
parent
aef5e526c7
commit
9aa9b6b482
|
@ -1,50 +1,3 @@
|
||||||
--- a/drivers/net/wireless/b43/phy_n.c
|
|
||||||
+++ b/drivers/net/wireless/b43/phy_n.c
|
|
||||||
@@ -5165,7 +5165,8 @@ static void b43_nphy_pmu_spur_avoid(stru
|
|
||||||
#endif
|
|
||||||
#ifdef CONFIG_B43_SSB
|
|
||||||
case B43_BUS_SSB:
|
|
||||||
- /* FIXME */
|
|
||||||
+ ssb_pmu_spuravoid_pllupdate(&dev->dev->sdev->bus->chipco,
|
|
||||||
+ avoid);
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
--- a/drivers/ssb/driver_chipcommon_pmu.c
|
|
||||||
+++ b/drivers/ssb/driver_chipcommon_pmu.c
|
|
||||||
@@ -675,3 +675,32 @@ u32 ssb_pmu_get_controlclock(struct ssb_
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+void ssb_pmu_spuravoid_pllupdate(struct ssb_chipcommon *cc, int spuravoid)
|
|
||||||
+{
|
|
||||||
+ u32 pmu_ctl = 0;
|
|
||||||
+
|
|
||||||
+ switch (cc->dev->bus->chip_id) {
|
|
||||||
+ case 0x4322:
|
|
||||||
+ ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL0, 0x11100070);
|
|
||||||
+ ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL1, 0x1014140a);
|
|
||||||
+ ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL5, 0x88888854);
|
|
||||||
+ if (spuravoid == 1)
|
|
||||||
+ ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL2, 0x05201828);
|
|
||||||
+ else
|
|
||||||
+ ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL2, 0x05001828);
|
|
||||||
+ pmu_ctl = SSB_CHIPCO_PMU_CTL_PLL_UPD;
|
|
||||||
+ break;
|
|
||||||
+ case 43222:
|
|
||||||
+ /* TODO: BCM43222 requires updating PLLs too */
|
|
||||||
+ return;
|
|
||||||
+ default:
|
|
||||||
+ ssb_printk(KERN_ERR PFX
|
|
||||||
+ "Unknown spuravoidance settings for chip 0x%04X, not changing PLL\n",
|
|
||||||
+ cc->dev->bus->chip_id);
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ chipco_set32(cc, SSB_CHIPCO_PMU_CTL, pmu_ctl);
|
|
||||||
+}
|
|
||||||
+EXPORT_SYMBOL_GPL(ssb_pmu_spuravoid_pllupdate);
|
|
||||||
--- a/drivers/ssb/pci.c
|
--- a/drivers/ssb/pci.c
|
||||||
+++ b/drivers/ssb/pci.c
|
+++ b/drivers/ssb/pci.c
|
||||||
@@ -339,6 +339,21 @@ static s8 r123_extract_antgain(u8 sprom_
|
@@ -339,6 +339,21 @@ static s8 r123_extract_antgain(u8 sprom_
|
||||||
|
@ -88,23 +41,6 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Revs 4 5 and 8 have partially shared layout */
|
/* Revs 4 5 and 8 have partially shared layout */
|
||||||
--- a/include/linux/ssb/ssb_driver_chipcommon.h
|
|
||||||
+++ b/include/linux/ssb/ssb_driver_chipcommon.h
|
|
||||||
@@ -219,6 +219,7 @@
|
|
||||||
#define SSB_CHIPCO_PMU_CTL 0x0600 /* PMU control */
|
|
||||||
#define SSB_CHIPCO_PMU_CTL_ILP_DIV 0xFFFF0000 /* ILP div mask */
|
|
||||||
#define SSB_CHIPCO_PMU_CTL_ILP_DIV_SHIFT 16
|
|
||||||
+#define SSB_CHIPCO_PMU_CTL_PLL_UPD 0x00000400
|
|
||||||
#define SSB_CHIPCO_PMU_CTL_NOILPONW 0x00000200 /* No ILP on wait */
|
|
||||||
#define SSB_CHIPCO_PMU_CTL_HTREQEN 0x00000100 /* HT req enable */
|
|
||||||
#define SSB_CHIPCO_PMU_CTL_ALPREQEN 0x00000080 /* ALP req enable */
|
|
||||||
@@ -667,5 +668,6 @@ enum ssb_pmu_ldo_volt_id {
|
|
||||||
void ssb_pmu_set_ldo_voltage(struct ssb_chipcommon *cc,
|
|
||||||
enum ssb_pmu_ldo_volt_id id, u32 voltage);
|
|
||||||
void ssb_pmu_set_ldo_paref(struct ssb_chipcommon *cc, bool on);
|
|
||||||
+void ssb_pmu_spuravoid_pllupdate(struct ssb_chipcommon *cc, int spuravoid);
|
|
||||||
|
|
||||||
#endif /* LINUX_SSB_CHIPCO_H_ */
|
|
||||||
--- a/include/linux/ssb/ssb_regs.h
|
--- a/include/linux/ssb/ssb_regs.h
|
||||||
+++ b/include/linux/ssb/ssb_regs.h
|
+++ b/include/linux/ssb/ssb_regs.h
|
||||||
@@ -289,11 +289,11 @@
|
@@ -289,11 +289,11 @@
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/Makefile
|
--- a/Makefile
|
||||||
+++ b/Makefile
|
+++ b/Makefile
|
||||||
@@ -570,9 +570,9 @@ endif # $(dot-config)
|
@@ -571,9 +571,9 @@ endif # $(dot-config)
|
||||||
all: vmlinux
|
all: vmlinux
|
||||||
|
|
||||||
ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
|
ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
|
||||||
|
@ -12,7 +12,7 @@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
include $(srctree)/arch/$(SRCARCH)/Makefile
|
include $(srctree)/arch/$(SRCARCH)/Makefile
|
||||||
@@ -646,6 +646,9 @@ endif
|
@@ -647,6 +647,9 @@ endif
|
||||||
NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
|
NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
|
||||||
CHECKFLAGS += $(NOSTDINC_FLAGS)
|
CHECKFLAGS += $(NOSTDINC_FLAGS)
|
||||||
|
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
--- a/net/bridge/br_private.h
|
--- a/net/bridge/br_private.h
|
||||||
+++ b/net/bridge/br_private.h
|
+++ b/net/bridge/br_private.h
|
||||||
@@ -156,6 +156,7 @@ struct net_bridge_port
|
@@ -157,6 +157,7 @@ struct net_bridge_port
|
||||||
#define BR_BPDU_GUARD 0x00000002
|
|
||||||
#define BR_ROOT_BLOCK 0x00000004
|
#define BR_ROOT_BLOCK 0x00000004
|
||||||
#define BR_MULTICAST_FAST_LEAVE 0x00000008
|
#define BR_MULTICAST_FAST_LEAVE 0x00000008
|
||||||
+#define BR_ISOLATE_MODE 0x00000010
|
#define BR_ADMIN_COST 0x00000010
|
||||||
|
+#define BR_ISOLATE_MODE 0x00000020
|
||||||
|
|
||||||
#ifdef CONFIG_BRIDGE_IGMP_SNOOPING
|
#ifdef CONFIG_BRIDGE_IGMP_SNOOPING
|
||||||
u32 multicast_startup_queries_sent;
|
u32 multicast_startup_queries_sent;
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
+obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_stubs.o
|
+obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_stubs.o
|
||||||
--- a/net/ipv6/addrconf.c
|
--- a/net/ipv6/addrconf.c
|
||||||
+++ b/net/ipv6/addrconf.c
|
+++ b/net/ipv6/addrconf.c
|
||||||
@@ -1250,7 +1250,7 @@ out:
|
@@ -1248,7 +1248,7 @@ out:
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -41,7 +41,7 @@
|
||||||
const struct in6_addr *daddr, unsigned int prefs,
|
const struct in6_addr *daddr, unsigned int prefs,
|
||||||
struct in6_addr *saddr)
|
struct in6_addr *saddr)
|
||||||
{
|
{
|
||||||
@@ -1375,7 +1375,6 @@ try_nextdev:
|
@@ -1373,7 +1373,6 @@ try_nextdev:
|
||||||
in6_ifa_put(hiscore->ifa);
|
in6_ifa_put(hiscore->ifa);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -49,7 +49,7 @@
|
||||||
|
|
||||||
int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr,
|
int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr,
|
||||||
unsigned char banned_flags)
|
unsigned char banned_flags)
|
||||||
@@ -4965,6 +4964,9 @@ int __init addrconf_init(void)
|
@@ -4947,6 +4946,9 @@ int __init addrconf_init(void)
|
||||||
|
|
||||||
ipv6_addr_label_rtnl_register();
|
ipv6_addr_label_rtnl_register();
|
||||||
|
|
||||||
|
@ -59,7 +59,7 @@
|
||||||
return 0;
|
return 0;
|
||||||
errout:
|
errout:
|
||||||
rtnl_af_unregister(&inet6_ops);
|
rtnl_af_unregister(&inet6_ops);
|
||||||
@@ -4983,6 +4985,9 @@ void addrconf_cleanup(void)
|
@@ -4965,6 +4967,9 @@ void addrconf_cleanup(void)
|
||||||
struct net_device *dev;
|
struct net_device *dev;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
|
|
@ -87,7 +87,7 @@
|
||||||
if (vlan_tx_tag_present(skb))
|
if (vlan_tx_tag_present(skb))
|
||||||
--- a/net/bridge/br_private.h
|
--- a/net/bridge/br_private.h
|
||||||
+++ b/net/bridge/br_private.h
|
+++ b/net/bridge/br_private.h
|
||||||
@@ -698,15 +698,29 @@ static inline u16 br_get_pvid(const stru
|
@@ -699,15 +699,29 @@ static inline u16 br_get_pvid(const stru
|
||||||
|
|
||||||
/* br_netfilter.c */
|
/* br_netfilter.c */
|
||||||
#ifdef CONFIG_BRIDGE_NETFILTER
|
#ifdef CONFIG_BRIDGE_NETFILTER
|
||||||
|
|
|
@ -79,7 +79,7 @@
|
||||||
help
|
help
|
||||||
--- a/net/core/dev.c
|
--- a/net/core/dev.c
|
||||||
+++ b/net/core/dev.c
|
+++ b/net/core/dev.c
|
||||||
@@ -2529,9 +2529,19 @@ int dev_hard_start_xmit(struct sk_buff *
|
@@ -2532,9 +2532,19 @@ int dev_hard_start_xmit(struct sk_buff *
|
||||||
if (!list_empty(&ptype_all))
|
if (!list_empty(&ptype_all))
|
||||||
dev_queue_xmit_nit(skb, dev);
|
dev_queue_xmit_nit(skb, dev);
|
||||||
|
|
||||||
|
@ -102,7 +102,7 @@
|
||||||
if (rc == NETDEV_TX_OK)
|
if (rc == NETDEV_TX_OK)
|
||||||
txq_trans_update(txq);
|
txq_trans_update(txq);
|
||||||
return rc;
|
return rc;
|
||||||
@@ -2554,9 +2564,19 @@ gso:
|
@@ -2557,9 +2567,19 @@ gso:
|
||||||
if (!list_empty(&ptype_all))
|
if (!list_empty(&ptype_all))
|
||||||
dev_queue_xmit_nit(nskb, dev);
|
dev_queue_xmit_nit(nskb, dev);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue