320-optional_rfkill.patch 1.3 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061
  1. --- a/src/drivers/drivers.mak
  2. +++ b/src/drivers/drivers.mak
  3. @@ -54,7 +54,6 @@ NEED_SME=y
  4. NEED_AP_MLME=y
  5. NEED_NETLINK=y
  6. NEED_LINUX_IOCTL=y
  7. -NEED_RFKILL=y
  8. NEED_RADIOTAP=y
  9. NEED_LIBNL=y
  10. endif
  11. @@ -111,7 +110,6 @@ DRV_WPA_CFLAGS += -DCONFIG_DRIVER_WEXT
  12. CONFIG_WIRELESS_EXTENSION=y
  13. NEED_NETLINK=y
  14. NEED_LINUX_IOCTL=y
  15. -NEED_RFKILL=y
  16. endif
  17. ifdef CONFIG_DRIVER_NDIS
  18. @@ -137,7 +135,6 @@ endif
  19. ifdef CONFIG_WIRELESS_EXTENSION
  20. DRV_WPA_CFLAGS += -DCONFIG_WIRELESS_EXTENSION
  21. DRV_WPA_OBJS += ../src/drivers/driver_wext.o
  22. -NEED_RFKILL=y
  23. endif
  24. ifdef NEED_NETLINK
  25. @@ -146,6 +143,7 @@ endif
  26. ifdef NEED_RFKILL
  27. DRV_OBJS += ../src/drivers/rfkill.o
  28. +DRV_WPA_CFLAGS += -DCONFIG_RFKILL
  29. endif
  30. ifdef NEED_RADIOTAP
  31. --- a/src/drivers/rfkill.h
  32. +++ b/src/drivers/rfkill.h
  33. @@ -18,8 +18,24 @@ struct rfkill_config {
  34. void (*unblocked_cb)(void *ctx);
  35. };
  36. +#ifdef CONFIG_RFKILL
  37. struct rfkill_data * rfkill_init(struct rfkill_config *cfg);
  38. void rfkill_deinit(struct rfkill_data *rfkill);
  39. int rfkill_is_blocked(struct rfkill_data *rfkill);
  40. +#else
  41. +static inline struct rfkill_data * rfkill_init(struct rfkill_config *cfg)
  42. +{
  43. + return (void *) 1;
  44. +}
  45. +
  46. +static inline void rfkill_deinit(struct rfkill_data *rfkill)
  47. +{
  48. +}
  49. +
  50. +static inline int rfkill_is_blocked(struct rfkill_data *rfkill)
  51. +{
  52. + return 0;
  53. +}
  54. +#endif
  55. #endif /* RFKILL_H */