From 95dc7b9199537be614ef4e26f9ada19d5b399103 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Tue, 2 Oct 2012 13:12:01 -0700 Subject: [PATCH] compat-drivers: fix patches/network/25-multicast-list_head.patch Hunk offsets differences required manual intervention. Signed-off-by: Luis R. Rodriguez --- patches/network/25-multicast-list_head.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/network/25-multicast-list_head.patch b/patches/network/25-multicast-list_head.patch index fff76786d4cf..2955a531cea0 100644 --- a/patches/network/25-multicast-list_head.patch +++ b/patches/network/25-multicast-list_head.patch @@ -536,7 +536,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 static void rtl8187_configure_filter(struct ieee80211_hw *dev, --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c -@@ -2801,11 +2801,20 @@ struct wl1271_filter_params { +@@ -2786,11 +2786,20 @@ struct wl1271_filter_params { u8 mc_list[ACX_MC_ADDRESS_GROUP_MAX][ETH_ALEN]; }; @@ -554,10 +554,10 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 +#else + int i; +#endif - struct wl1271 *wl = hw->priv; - if (unlikely(wl->state == WL1271_STATE_OFF)) -@@ -2818,16 +2827,40 @@ static u64 wl1271_op_prepare_multicast(s + fp = kzalloc(sizeof(*fp), GFP_ATOMIC); + if (!fp) { +@@ -2799,16 +2808,40 @@ static u64 wl1271_op_prepare_multicast(s } /* update multicast filtering parameters */ -- 2.30.2