Accueil Explorer Aide
S'inscrire Connexion
wareck
/
openwrt_chaos_calmer
1
0
Fork 0
Fichiers Tickets 0 Pull Requests 0 Wiki
Branche: master
Branches Tags
openwrt_chaos_c...
/
package
/
kernel
/
mac80211
/
patches
/
344-0001-brcmfmac-change-function-name-for-brcmf_cfg80211_wai.patch

344-0001-brcmfmac-change-function-name-for-brcmf_cfg80211_wai.patch 3.8 KB
Lien permanent Historique Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899 
  1. From: Arend van Spriel <arend@broadcom.com>
    2. 

  2. Date: Wed, 17 Feb 2016 11:26:50 +0100
    3. 

  3. Subject: [PATCH] brcmfmac: change function name for
    4. 

  4.  brcmf_cfg80211_wait_vif_event_timeout()
    5. 

  5. 

  6. Dropping the '_timeout' from the function name as the fact that a timeout
    7. 

  7. value is passed makes it obvious a timeout is used. Also helps to keep code
    8. 

  8. lines a bit shorter and easier to stick to 80 char boundary.
    9. 

  9. 

  10. Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
    11. 

  11. Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
    12. 

  12. Signed-off-by: Arend van Spriel <arend@broadcom.com>
    13. 

  13. Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    14. 

  14. ---
    15. 

  15. 

  16. --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
    17. 

  17. +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
    18. 

  18. @@ -564,8 +564,8 @@ struct wireless_dev *brcmf_ap_add_vif(st
    19. 

  19.  	}
    20. 

  20.  
    21. 

  21.  	/* wait for firmware event */
    22. 

  22. -	err = brcmf_cfg80211_wait_vif_event_timeout(cfg, BRCMF_E_IF_ADD,
    23. 

  23. -						    BRCMF_VIF_EVENT_TIMEOUT);
    24. 

  24. +	err = brcmf_cfg80211_wait_vif_event(cfg, BRCMF_E_IF_ADD,
    25. 

  25. +					    BRCMF_VIF_EVENT_TIMEOUT);
    26. 

  26.  	brcmf_cfg80211_arm_vif_event(cfg, NULL);
    27. 

  27.  	if (!err) {
    28. 

  28.  		brcmf_err("timeout occurred\n");
    29. 

  29. @@ -6395,8 +6395,9 @@ bool brcmf_cfg80211_vif_event_armed(stru
    30. 

  30.  
    31. 

  31.  	return armed;
    32. 

  32.  }
    33. 

  33. -int brcmf_cfg80211_wait_vif_event_timeout(struct brcmf_cfg80211_info *cfg,
    34. 

  34. -					  u8 action, ulong timeout)
    35. 

  35. +
    36. 

  36. +int brcmf_cfg80211_wait_vif_event(struct brcmf_cfg80211_info *cfg,
    37. 

  37. +				  u8 action, ulong timeout)
    38. 

  38.  {
    39. 

  39.  	struct brcmf_cfg80211_vif_event *event = &cfg->vif_event;
    40. 

  40.  
    41. 

  41. --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
    42. 

  42. +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
    43. 

  43. @@ -402,8 +402,8 @@ bool brcmf_get_vif_state_any(struct brcm
    44. 

  44.  void brcmf_cfg80211_arm_vif_event(struct brcmf_cfg80211_info *cfg,
    45. 

  45.  				  struct brcmf_cfg80211_vif *vif);
    46. 

  46.  bool brcmf_cfg80211_vif_event_armed(struct brcmf_cfg80211_info *cfg);
    47. 

  47. -int brcmf_cfg80211_wait_vif_event_timeout(struct brcmf_cfg80211_info *cfg,
    48. 

  48. -					  u8 action, ulong timeout);
    49. 

  49. +int brcmf_cfg80211_wait_vif_event(struct brcmf_cfg80211_info *cfg,
    50. 

  50. +				  u8 action, ulong timeout);
    51. 

  51.  s32 brcmf_notify_escan_complete(struct brcmf_cfg80211_info *cfg,
    52. 

  52.  				struct brcmf_if *ifp, bool aborted,
    53. 

  53.  				bool fw_abort);
    54. 

  54. --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
    55. 

  55. +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
    56. 

  56. @@ -1988,8 +1988,8 @@ int brcmf_p2p_ifchange(struct brcmf_cfg8
    57. 

  57.  		brcmf_cfg80211_arm_vif_event(cfg, NULL);
    58. 

  58.  		return err;
    59. 

  59.  	}
    60. 

  60. -	err = brcmf_cfg80211_wait_vif_event_timeout(cfg, BRCMF_E_IF_CHANGE,
    61. 

  61. -						    BRCMF_VIF_EVENT_TIMEOUT);
    62. 

  62. +	err = brcmf_cfg80211_wait_vif_event(cfg, BRCMF_E_IF_CHANGE,
    63. 

  63. +					    BRCMF_VIF_EVENT_TIMEOUT);
    64. 

  64.  	brcmf_cfg80211_arm_vif_event(cfg, NULL);
    65. 

  65.  	if (!err)  {
    66. 

  66.  		brcmf_err("No BRCMF_E_IF_CHANGE event received\n");
    67. 

  67. @@ -2090,8 +2090,8 @@ static struct wireless_dev *brcmf_p2p_cr
    68. 

  68.  	}
    69. 

  69.  
    70. 

  70.  	/* wait for firmware event */
    71. 

  71. -	err = brcmf_cfg80211_wait_vif_event_timeout(p2p->cfg, BRCMF_E_IF_ADD,
    72. 

  72. -						    BRCMF_VIF_EVENT_TIMEOUT);
    73. 

  73. +	err = brcmf_cfg80211_wait_vif_event(p2p->cfg, BRCMF_E_IF_ADD,
    74. 

  74. +					    BRCMF_VIF_EVENT_TIMEOUT);
    75. 

  75.  	brcmf_cfg80211_arm_vif_event(p2p->cfg, NULL);
    76. 

  76.  	brcmf_fweh_p2pdev_setup(pri_ifp, false);
    77. 

  77.  	if (!err) {
    78. 

  78. @@ -2180,8 +2180,8 @@ struct wireless_dev *brcmf_p2p_add_vif(s
    79. 

  79.  	}
    80. 

  80.  
    81. 

  81.  	/* wait for firmware event */
    82. 

  82. -	err = brcmf_cfg80211_wait_vif_event_timeout(cfg, BRCMF_E_IF_ADD,
    83. 

  83. -						    BRCMF_VIF_EVENT_TIMEOUT);
    84. 

  84. +	err = brcmf_cfg80211_wait_vif_event(cfg, BRCMF_E_IF_ADD,
    85. 

  85. +					    BRCMF_VIF_EVENT_TIMEOUT);
    86. 

  86.  	brcmf_cfg80211_arm_vif_event(cfg, NULL);
    87. 

  87.  	if (!err) {
    88. 

  88.  		brcmf_err("timeout occurred\n");
    89. 

  89. @@ -2274,8 +2274,8 @@ int brcmf_p2p_del_vif(struct wiphy *wiph
    90. 

  90.  	}
    91. 

  91.  	if (!err) {
    92. 

  92.  		/* wait for firmware event */
    93. 

  93. -		err = brcmf_cfg80211_wait_vif_event_timeout(cfg, BRCMF_E_IF_DEL,
    94. 

  94. -							BRCMF_VIF_EVENT_TIMEOUT);
    95. 

  95. +		err = brcmf_cfg80211_wait_vif_event(cfg, BRCMF_E_IF_DEL,
    96. 

  96. +						    BRCMF_VIF_EVENT_TIMEOUT);
    97. 

  97.  		if (!err)
    98. 

  98.  			err = -EIO;
    99. 

  99.  		else
    100.