compat-drivers: fix patches/network/25-multicast-list_head.patch
authorLuis R. Rodriguez <mcgrof@do-not-panic.com>
Tue, 2 Oct 2012 20:12:01 +0000 (13:12 -0700)
committerLuis R. Rodriguez <mcgrof@do-not-panic.com>
Tue, 2 Oct 2012 20:12:01 +0000 (13:12 -0700)
Hunk offsets differences required manual intervention.

Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
patches/network/25-multicast-list_head.patch

index fff76786d4cfa4876938c9ef62d20c19c396f1ec..2955a531cea06f5145ce6747ff335ee844c6a301 100644 (file)
@@ -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 */