diff options
| author | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-07-19 01:24:11 +0000 |
|---|---|---|
| committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-07-19 15:05:32 -0700 |
| commit | e2d5a26742e025ec4e24129c132589ec3b491eb4 (patch) | |
| tree | 4090b9226dedf973f3ca627e093574c53635a2bd /patches/collateral-evolutions/network/25-multicast-list_head | |
| parent | d7608058240bc8bba1b4ee9f3cc59029184d0545 (diff) | |
backports: refresh patches for next-20130627
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'patches/collateral-evolutions/network/25-multicast-list_head')
2 files changed, 3 insertions, 3 deletions
diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_ti_wlcore_main.patch b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_ti_wlcore_main.patch index 38c2b1aa..7ea5d158 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_ti_wlcore_main.patch +++ b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_ti_wlcore_main.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c -@@ -2952,11 +2952,20 @@ struct wl1271_filter_params { +@@ -2939,11 +2939,20 @@ struct wl1271_filter_params { u8 mc_list[ACX_MC_ADDRESS_GROUP_MAX][ETH_ALEN]; }; @@ -21,7 +21,7 @@ fp = kzalloc(sizeof(*fp), GFP_ATOMIC); if (!fp) { -@@ -2965,16 +2974,40 @@ static u64 wl1271_op_prepare_multicast(s +@@ -2952,16 +2961,40 @@ static u64 wl1271_op_prepare_multicast(s } /* update multicast filtering parameters */ diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/include_net_mac80211.patch b/patches/collateral-evolutions/network/25-multicast-list_head/include_net_mac80211.patch index 40c73e1b..fb22de20 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head/include_net_mac80211.patch +++ b/patches/collateral-evolutions/network/25-multicast-list_head/include_net_mac80211.patch @@ -1,6 +1,6 @@ --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -2660,14 +2660,24 @@ struct ieee80211_ops { +@@ -2662,14 +2662,24 @@ struct ieee80211_ops { void (*stop_ap)(struct ieee80211_hw *hw, struct ieee80211_vif *vif); u64 (*prepare_multicast)(struct ieee80211_hw *hw, |