diff options
5 files changed, 12 insertions, 12 deletions
diff --git a/patches/collateral-evolutions/drm/04-revert-prime-support.patch b/patches/collateral-evolutions/drm/04-revert-prime-support.patch index 1dbfa456..d2373e07 100644 --- a/patches/collateral-evolutions/drm/04-revert-prime-support.patch +++ b/patches/collateral-evolutions/drm/04-revert-prime-support.patch @@ -97,7 +97,7 @@ not < 3.3.0. #include <drm/drmP.h> #include "nouveau_drm.h" -@@ -224,4 +225,4 @@ fail_detach: +@@ -225,4 +226,4 @@ fail_detach: dma_buf_detach(dma_buf, attach); return ERR_PTR(ret); } @@ -113,7 +113,7 @@ not < 3.3.0. #include <drm/drmP.h> #include "radeon.h" -@@ -225,3 +226,4 @@ fail_detach: +@@ -226,3 +227,4 @@ fail_detach: dma_buf_detach(dma_buf, attach); return ERR_PTR(ret); } @@ -344,7 +344,7 @@ not < 3.3.0. #include <drm/drmP.h> #include "i915_drv.h" #include <linux/dma-buf.h> -@@ -302,3 +303,4 @@ fail_detach: +@@ -307,3 +308,4 @@ fail_detach: dma_buf_detach(dma_buf, attach); return ERR_PTR(ret); } diff --git a/patches/collateral-evolutions/network/0001-netdev_ops.patch b/patches/collateral-evolutions/network/0001-netdev_ops.patch index 189c2ad0..7a92a53d 100644 --- a/patches/collateral-evolutions/network/0001-netdev_ops.patch +++ b/patches/collateral-evolutions/network/0001-netdev_ops.patch @@ -157,7 +157,7 @@ Date: Wed Nov 19 21:32:24 2008 -0800 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c -@@ -1628,7 +1628,7 @@ static const struct net_device_ops hwsim +@@ -1667,7 +1667,7 @@ static const struct net_device_ops hwsim static void hwsim_mon_setup(struct net_device *dev) { diff --git a/patches/collateral-evolutions/network/0005-netlink-portid.patch b/patches/collateral-evolutions/network/0005-netlink-portid.patch index 9713eca9..4a3b8886 100644 --- a/patches/collateral-evolutions/network/0005-netlink-portid.patch +++ b/patches/collateral-evolutions/network/0005-netlink-portid.patch @@ -42,7 +42,7 @@ this one should other drivers / subsystem need this change. --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c -@@ -1952,10 +1952,10 @@ static int hwsim_register_received_nl(st +@@ -1991,10 +1991,10 @@ static int hwsim_register_received_nl(st if (info == NULL) goto out; @@ -55,7 +55,7 @@ this one should other drivers / subsystem need this change. return 0; out: -@@ -1992,7 +1992,7 @@ static int mac80211_hwsim_netlink_notify +@@ -2031,7 +2031,7 @@ static int mac80211_hwsim_netlink_notify if (state != NETLINK_URELEASE) return NOTIFY_DONE; diff --git a/patches/collateral-evolutions/network/08-rename-config-options.patch b/patches/collateral-evolutions/network/08-rename-config-options.patch index 2c0e4800..23d55ea4 100644 --- a/patches/collateral-evolutions/network/08-rename-config-options.patch +++ b/patches/collateral-evolutions/network/08-rename-config-options.patch @@ -124,7 +124,7 @@ CONFIG_BT_HIDP does not build with older kernel versions. ath9k-$(CONFIG_ATH9K_DEBUGFS) += debug.o --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c -@@ -804,7 +804,7 @@ void ath9k_set_hw_capab(struct ath_softc +@@ -805,7 +805,7 @@ void ath9k_set_hw_capab(struct ath_softc sc->ant_rx = hw->wiphy->available_antennas_rx; sc->ant_tx = hw->wiphy->available_antennas_tx; diff --git a/patches/collateral-evolutions/network/25-multicast-list_head.patch b/patches/collateral-evolutions/network/25-multicast-list_head.patch index c1a5a85e..e6454b0d 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head.patch +++ b/patches/collateral-evolutions/network/25-multicast-list_head.patch @@ -321,7 +321,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 p += sprintf(p, "num_tx_bytes = %lu\n", priv->stats.tx_bytes); --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c -@@ -2612,15 +2612,21 @@ struct mwl8k_cmd_mac_multicast_adr { +@@ -2613,15 +2613,21 @@ struct mwl8k_cmd_mac_multicast_adr { static struct mwl8k_cmd_pkt * __mwl8k_cmd_mac_multicast_adr(struct ieee80211_hw *hw, int allmulti, @@ -343,7 +343,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 if (allmulti || mc_count > priv->num_mcaddrs) { allmulti = 1; -@@ -2641,13 +2647,27 @@ __mwl8k_cmd_mac_multicast_adr(struct iee +@@ -2642,13 +2648,27 @@ __mwl8k_cmd_mac_multicast_adr(struct iee if (allmulti) { cmd->action |= cpu_to_le16(MWL8K_ENABLE_RX_ALL_MULTICAST); } else if (mc_count) { @@ -371,7 +371,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 } } -@@ -4901,7 +4921,11 @@ mwl8k_bss_info_changed(struct ieee80211_ +@@ -4927,7 +4947,11 @@ mwl8k_bss_info_changed(struct ieee80211_ } static u64 mwl8k_prepare_multicast(struct ieee80211_hw *hw, @@ -383,7 +383,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 { struct mwl8k_cmd_pkt *cmd; -@@ -4912,7 +4936,11 @@ static u64 mwl8k_prepare_multicast(struc +@@ -4938,7 +4962,11 @@ static u64 mwl8k_prepare_multicast(struc * we'll end up throwing this packet away and creating a new * one in mwl8k_configure_filter(). */ @@ -395,7 +395,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 return (unsigned long)cmd; } -@@ -5034,7 +5062,11 @@ static void mwl8k_configure_filter(struc +@@ -5060,7 +5088,11 @@ static void mwl8k_configure_filter(struc */ if (*total_flags & FIF_ALLMULTI) { kfree(cmd); |