0004-Fix-compile-errors-with-gcc5.patch 5.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121
  1. From ef34609395c72a1e777ef9c3fb6ce60aa92976bb Mon Sep 17 00:00:00 2001
  2. From: Marco Franceschetti <vonfritz1@gmail.com>
  3. Date: Sun, 13 Mar 2016 09:44:54 +0100
  4. Subject: [PATCH] Fix compile errors with gcc5
  5. (cherry picked from commit e824d45043efd49607f66c89c921b07c1523bf9e)
  6. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
  7. ---
  8. drivers/net/wireless/actions/rtl8188etv/include/ieee80211.h | 6 +++---
  9. drivers/net/wireless/actions/rtl8723bs/include/ieee80211.h | 6 +++---
  10. drivers/net/wireless/actions/rtl8723bs_vq0/include/ieee80211.h | 6 +++---
  11. drivers/net/wireless/actions/rtl8723bu/include/ieee80211.h | 6 +++---
  12. 4 files changed, 12 insertions(+), 12 deletions(-)
  13. diff --git a/drivers/net/wireless/actions/rtl8188etv/include/ieee80211.h b/drivers/net/wireless/actions/rtl8188etv/include/ieee80211.h
  14. index fc293c4..0898cd4 100755
  15. --- a/drivers/net/wireless/actions/rtl8188etv/include/ieee80211.h
  16. +++ b/drivers/net/wireless/actions/rtl8188etv/include/ieee80211.h
  17. @@ -1314,18 +1314,18 @@ enum ieee80211_state {
  18. (((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \
  19. (((Addr[5]) & 0xff) == 0xff))
  20. #else
  21. -extern __inline int is_multicast_mac_addr(const u8 *addr)
  22. +static __inline int is_multicast_mac_addr(const u8 *addr)
  23. {
  24. return ((addr[0] != 0xff) && (0x01 & addr[0]));
  25. }
  26. -extern __inline int is_broadcast_mac_addr(const u8 *addr)
  27. +static __inline int is_broadcast_mac_addr(const u8 *addr)
  28. {
  29. return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \
  30. (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff));
  31. }
  32. -extern __inline int is_zero_mac_addr(const u8 *addr)
  33. +static __inline int is_zero_mac_addr(const u8 *addr)
  34. {
  35. return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) && \
  36. (addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00));
  37. diff --git a/drivers/net/wireless/actions/rtl8723bs/include/ieee80211.h b/drivers/net/wireless/actions/rtl8723bs/include/ieee80211.h
  38. index 09475ef..56e0f5a 100755
  39. --- a/drivers/net/wireless/actions/rtl8723bs/include/ieee80211.h
  40. +++ b/drivers/net/wireless/actions/rtl8723bs/include/ieee80211.h
  41. @@ -1318,18 +1318,18 @@ enum ieee80211_state {
  42. (((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \
  43. (((Addr[5]) & 0xff) == 0xff))
  44. #else
  45. -extern __inline int is_multicast_mac_addr(const u8 *addr)
  46. +static __inline int is_multicast_mac_addr(const u8 *addr)
  47. {
  48. return ((addr[0] != 0xff) && (0x01 & addr[0]));
  49. }
  50. -extern __inline int is_broadcast_mac_addr(const u8 *addr)
  51. +static __inline int is_broadcast_mac_addr(const u8 *addr)
  52. {
  53. return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \
  54. (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff));
  55. }
  56. -extern __inline int is_zero_mac_addr(const u8 *addr)
  57. +static __inline int is_zero_mac_addr(const u8 *addr)
  58. {
  59. return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) && \
  60. (addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00));
  61. diff --git a/drivers/net/wireless/actions/rtl8723bs_vq0/include/ieee80211.h b/drivers/net/wireless/actions/rtl8723bs_vq0/include/ieee80211.h
  62. index 5dfc421..95144b6 100755
  63. --- a/drivers/net/wireless/actions/rtl8723bs_vq0/include/ieee80211.h
  64. +++ b/drivers/net/wireless/actions/rtl8723bs_vq0/include/ieee80211.h
  65. @@ -1314,18 +1314,18 @@ enum ieee80211_state {
  66. (((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \
  67. (((Addr[5]) & 0xff) == 0xff))
  68. #else
  69. -extern __inline int is_multicast_mac_addr(const u8 *addr)
  70. +static __inline int is_multicast_mac_addr(const u8 *addr)
  71. {
  72. return ((addr[0] != 0xff) && (0x01 & addr[0]));
  73. }
  74. -extern __inline int is_broadcast_mac_addr(const u8 *addr)
  75. +static __inline int is_broadcast_mac_addr(const u8 *addr)
  76. {
  77. return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \
  78. (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff));
  79. }
  80. -extern __inline int is_zero_mac_addr(const u8 *addr)
  81. +static __inline int is_zero_mac_addr(const u8 *addr)
  82. {
  83. return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) && \
  84. (addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00));
  85. diff --git a/drivers/net/wireless/actions/rtl8723bu/include/ieee80211.h b/drivers/net/wireless/actions/rtl8723bu/include/ieee80211.h
  86. index 09475ef..56e0f5a 100755
  87. --- a/drivers/net/wireless/actions/rtl8723bu/include/ieee80211.h
  88. +++ b/drivers/net/wireless/actions/rtl8723bu/include/ieee80211.h
  89. @@ -1318,18 +1318,18 @@ enum ieee80211_state {
  90. (((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \
  91. (((Addr[5]) & 0xff) == 0xff))
  92. #else
  93. -extern __inline int is_multicast_mac_addr(const u8 *addr)
  94. +static __inline int is_multicast_mac_addr(const u8 *addr)
  95. {
  96. return ((addr[0] != 0xff) && (0x01 & addr[0]));
  97. }
  98. -extern __inline int is_broadcast_mac_addr(const u8 *addr)
  99. +static __inline int is_broadcast_mac_addr(const u8 *addr)
  100. {
  101. return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \
  102. (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff));
  103. }
  104. -extern __inline int is_zero_mac_addr(const u8 *addr)
  105. +static __inline int is_zero_mac_addr(const u8 *addr)
  106. {
  107. return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) && \
  108. (addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00));
  109. --
  110. 2.10.2