diff options
author | Johannes Berg <johannes.berg@intel.com> | 2013-04-06 01:06:03 +0200 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-04-06 01:06:34 +0200 |
commit | 3ee5050684013c5f8dab210cc89227db369f46dc (patch) | |
tree | 37b2e48ef9ecaf196ea29975ce56da05a426936b /patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_driver-ops.patch | |
parent | 70509201684b72faad3e7609fd05a5705b097452 (diff) |
backports: rename all patches to *.patch
Also combine some that would otherwise have
the same names (where .c and .h files with
the same name exist)
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_driver-ops.patch')
-rw-r--r-- | patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_driver-ops.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_driver-ops.patch b/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_driver-ops.patch new file mode 100644 index 00000000..97dff3f7 --- /dev/null +++ b/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_driver-ops.patch @@ -0,0 +1,62 @@ +--- a/net/mac80211/driver-ops.h ++++ b/net/mac80211/driver-ops.h +@@ -227,20 +227,35 @@ static inline void drv_bss_info_changed( + } + + static inline u64 drv_prepare_multicast(struct ieee80211_local *local, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + struct netdev_hw_addr_list *mc_list) ++#else ++ int mc_count, ++ struct dev_addr_list *mc_list) ++#endif + { + u64 ret = 0; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + trace_drv_prepare_multicast(local, mc_list->count); ++#else ++ trace_drv_prepare_multicast(local, mc_count); ++#endif + + if (local->ops->prepare_multicast) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + ret = local->ops->prepare_multicast(&local->hw, mc_list); ++#else ++ ret = local->ops->prepare_multicast(&local->hw, mc_count, ++ mc_list); ++#endif + + trace_drv_return_u64(local, ret); + + return ret; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + static inline void drv_set_multicast_list(struct ieee80211_local *local, + struct ieee80211_sub_if_data *sdata, + struct netdev_hw_addr_list *mc_list) +@@ -256,6 +271,23 @@ static inline void drv_set_multicast_lis + allmulti, mc_list); + trace_drv_return_void(local); + } ++#else ++static inline void drv_set_multicast_list(struct ieee80211_local *local, ++ struct ieee80211_sub_if_data *sdata, ++ int mc_count, struct dev_addr_list *ha) ++{ ++ bool allmulti = sdata->flags & IEEE80211_SDATA_ALLMULTI; ++ ++ trace_drv_set_multicast_list(local, sdata, mc_count); ++ ++ check_sdata_in_driver(sdata); ++ ++ if (local->ops->set_multicast_list) ++ local->ops->set_multicast_list(&local->hw, &sdata->vif, ++ allmulti, mc_count, ha); ++ trace_drv_return_void(local); ++} ++#endif + + static inline void drv_configure_filter(struct ieee80211_local *local, + unsigned int changed_flags, |