config ATH79_MACH_UBNT_XM
bool "Ubiquiti Networks XM/UniFi boards"
-@@ -83,6 +1056,97 @@ config ATH79_MACH_UBNT_XM
+@@ -83,6 +1065,97 @@ config ATH79_MACH_UBNT_XM
Say 'Y' here if you want your kernel to support the
Ubiquiti Networks XM (rev 1.0) board.
endmenu
config SOC_AR71XX
-@@ -124,7 +1188,10 @@ config ATH79_DEV_DSA
+@@ -124,7 +1197,10 @@ config ATH79_DEV_DSA
config ATH79_DEV_ETH
def_bool n
def_bool n
config ATH79_DEV_GPIO_BUTTONS
-@@ -156,4 +1223,7 @@ config ATH79_PCI_ATH9K_FIXUP
+@@ -156,4 +1232,7 @@ config ATH79_PCI_ATH9K_FIXUP
config ATH79_ROUTERBOOT
def_bool n
--- a/arch/mips/ath79/Kconfig
+++ b/arch/mips/ath79/Kconfig
-@@ -1168,6 +1168,10 @@ config SOC_AR934X
+@@ -1178,6 +1178,10 @@ config SOC_AR934X
select PCI_AR724X if PCI
def_bool n
config SOC_QCA955X
select HW_HAS_PCI
select PCI_AR724X if PCI
-@@ -1210,7 +1214,7 @@ config ATH79_DEV_USB
+@@ -1220,7 +1224,7 @@ config ATH79_DEV_USB
def_bool n
config ATH79_DEV_WMAC
}
--- a/arch/mips/ath79/Kconfig
+++ b/arch/mips/ath79/Kconfig
-@@ -1177,6 +1177,12 @@ config SOC_QCA955X
+@@ -1187,6 +1187,12 @@ config SOC_QCA955X
select PCI_AR724X if PCI
def_bool n
config ATH79_DEV_M25P80
select ATH79_DEV_SPI
def_bool n
-@@ -1214,7 +1220,7 @@ config ATH79_DEV_USB
+@@ -1224,7 +1230,7 @@ config ATH79_DEV_USB
def_bool n
config ATH79_DEV_WMAC
--- a/arch/mips/ath79/Kconfig
+++ b/arch/mips/ath79/Kconfig
-@@ -514,6 +514,16 @@ config ATH79_MACH_R6100
+@@ -524,6 +524,16 @@ config ATH79_MACH_R6100
select ATH79_DEV_USB
select ATH79_DEV_WMAC
&sin->sin6_addr);
sin->sin6_scope_id = 0;
}
-@@ -712,12 +712,12 @@ int ip6_datagram_send_ctl(struct net *ne
+@@ -708,12 +708,12 @@ int ip6_datagram_send_ctl(struct net *ne
}
if (fl6->flowlabel&IPV6_FLOWINFO_MASK) {