projects / packages / wl.git / blame
| Commit | Line | Data |
|---|---|---|
| a9fbf14c JR |
1 | --- wl-6.30.223.271/wl/src/wl/sys/wl_cfg80211_hybrid.c~ 2022-12-17 19:19:31.000000000 +0100 |
| 2 | +++ wl-6.30.223.271/wl/src/wl/sys/wl_cfg80211_hybrid.c 2022-12-17 19:25:07.419529697 +0100 | |
| 3 | @@ -112,13 +112,27 @@ | |
| 4 | #endif | |
| 5 | ||
| 6 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38) | |
| 7 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) | |
| 8 | +static s32 wl_cfg80211_config_default_key(struct wiphy *wiphy, | |
| 9 | + struct net_device *dev, int link_id, u8 key_idx, bool unicast, bool multicast); | |
| 10 | +#else | |
| 11 | static s32 wl_cfg80211_config_default_key(struct wiphy *wiphy, | |
| 12 | struct net_device *dev, u8 key_idx, bool unicast, bool multicast); | |
| 13 | +#endif | |
| 14 | #else | |
| 15 | static s32 wl_cfg80211_config_default_key(struct wiphy *wiphy, | |
| 16 | struct net_device *dev, u8 key_idx); | |
| 17 | #endif | |
| 18 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) | |
| 19 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) | |
| 20 | +static s32 wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, int link_id, | |
| 21 | + u8 key_idx, bool pairwise, const u8 *mac_addr, struct key_params *params); | |
| 22 | +static s32 wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev, int link_id, | |
| 23 | + u8 key_idx, bool pairwise, const u8 *mac_addr); | |
| 24 | +static s32 wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev, int link_id, | |
| 25 | + u8 key_idx, bool pairwise, const u8 *mac_addr, | |
| 26 | + void *cookie, void (*callback) (void *cookie, struct key_params *params)); | |
| 27 | +#else | |
| 28 | static s32 wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, | |
| 29 | u8 key_idx, bool pairwise, const u8 *mac_addr, struct key_params *params); | |
| 30 | static s32 wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev, | |
| 31 | @@ -126,6 +140,7 @@ | |
| 32 | static s32 wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev, | |
| 33 | u8 key_idx, bool pairwise, const u8 *mac_addr, | |
| 34 | void *cookie, void (*callback) (void *cookie, struct key_params *params)); | |
| 35 | +#endif | |
| 36 | #else | |
| 37 | static s32 wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, | |
| 38 | u8 key_idx, const u8 *mac_addr, struct key_params *params); | |
| 39 | @@ -1185,9 +1185,15 @@ | |
| 40 | } | |
| 41 | ||
| 42 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38) | |
| 43 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) | |
| 44 | +static s32 | |
| 45 | +wl_cfg80211_config_default_key(struct wiphy *wiphy, | |
| 46 | + struct net_device *dev, int link_id, u8 key_idx, bool unicast, bool multicast) | |
| 47 | +#else | |
| 48 | static s32 | |
| 49 | wl_cfg80211_config_default_key(struct wiphy *wiphy, | |
| 50 | struct net_device *dev, u8 key_idx, bool unicast, bool multicast) | |
| 51 | +#endif | |
| 52 | #else | |
| 53 | static s32 | |
| 54 | wl_cfg80211_config_default_key(struct wiphy *wiphy, | |
| 55 | @@ -1210,9 +1216,15 @@ | |
| 56 | } | |
| 57 | ||
| 58 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) | |
| 59 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) | |
| 60 | +static s32 | |
| 61 | +wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, int link_id, | |
| 62 | + u8 key_idx, bool pairwise, const u8 *mac_addr, struct key_params *params) | |
| 63 | +#else | |
| 64 | static s32 | |
| 65 | wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, | |
| 66 | u8 key_idx, bool pairwise, const u8 *mac_addr, struct key_params *params) | |
| 67 | +#endif | |
| 68 | #else | |
| 69 | static s32 | |
| 70 | wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, | |
| 71 | @@ -1331,9 +1343,15 @@ | |
| 72 | } | |
| 73 | ||
| 74 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) | |
| 75 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) | |
| 76 | +static s32 | |
| 77 | +wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev, int link_id, | |
| 78 | + u8 key_idx, bool pairwise, const u8 *mac_addr) | |
| 79 | +#else | |
| 80 | static s32 | |
| 81 | wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev, | |
| 82 | u8 key_idx, bool pairwise, const u8 *mac_addr) | |
| 83 | +#endif | |
| 84 | #else | |
| 85 | static s32 | |
| 86 | wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev, | |
| 87 | @@ -1374,10 +1392,17 @@ | |
| 88 | } | |
| 89 | ||
| 90 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) | |
| 91 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) | |
| 92 | +static s32 | |
| 93 | +wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev, int link_id, | |
| 94 | + u8 key_idx, bool pairwise, const u8 *mac_addr, void *cookie, | |
| 95 | + void (*callback) (void *cookie, struct key_params * params)) | |
| 96 | +#else | |
| 97 | static s32 | |
| 98 | wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev, | |
| 99 | u8 key_idx, bool pairwise, const u8 *mac_addr, void *cookie, | |
| 100 | void (*callback) (void *cookie, struct key_params * params)) | |
| 101 | +#endif | |
| 102 | #else | |
| 103 | static s32 | |
| 104 | wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev, |