Home Explore Help
Register Sign In
wareck
/
openwrt_chaos_calmer
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Branch: master
Branches Tags
openwrt_chaos_c...
/
package
/
kernel
/
mac80211
/
patches
/
351-0008-brcmfmac-support-get_channel-cfg80211-callback.patch

351-0008-brcmfmac-support-get_channel-cfg80211-callback.patch 2.7 KB
Permalink History Raw

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394 
  1. From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
    2. 

  2. Date: Fri, 20 May 2016 13:38:58 +0200
    3. 

  3. Subject: [PATCH] brcmfmac: support get_channel cfg80211 callback
    4. 

  4. MIME-Version: 1.0
    5. 

  5. Content-Type: text/plain; charset=UTF-8
    6. 

  6. Content-Transfer-Encoding: 8bit
    7. 

  7. 

  8. This is important for brcmfmac as some of released firmwares (e.g.
    9. 

  9. brcmfmac4366b-pcie.bin) may pick different channel than requested. This
    10. 

  10. has been tested with BCM4366B1 in D-Link DIR-885L.
    11. 

  11. 

  12. Signed-off-by: Rafał Miłecki <zajec5@gmail.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. @@ -4847,6 +4847,68 @@ exit:
    19. 

  19.  	return err;
    20. 

  20.  }
    21. 

  21.  
    22. 

  22. +static int brcmf_cfg80211_get_channel(struct wiphy *wiphy,
    23. 

  23. +				      struct wireless_dev *wdev,
    24. 

  24. +				      struct cfg80211_chan_def *chandef)
    25. 

  25. +{
    26. 

  26. +	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
    27. 

  27. +	struct net_device *ndev = wdev->netdev;
    28. 

  28. +	struct brcmf_if *ifp;
    29. 

  29. +	struct brcmu_chan ch;
    30. 

  30. +	enum nl80211_band band = 0;
    31. 

  31. +	enum nl80211_chan_width width = 0;
    32. 

  32. +	u32 chanspec;
    33. 

  33. +	int freq, err;
    34. 

  34. +
    35. 

  35. +	if (!ndev)
    36. 

  36. +		return -ENODEV;
    37. 

  37. +	ifp = netdev_priv(ndev);
    38. 

  38. +
    39. 

  39. +	err = brcmf_fil_iovar_int_get(ifp, "chanspec", &chanspec);
    40. 

  40. +	if (err) {
    41. 

  41. +		brcmf_err("chanspec failed (%d)\n", err);
    42. 

  42. +		return err;
    43. 

  43. +	}
    44. 

  44. +
    45. 

  45. +	ch.chspec = chanspec;
    46. 

  46. +	cfg->d11inf.decchspec(&ch);
    47. 

  47. +
    48. 

  48. +	switch (ch.band) {
    49. 

  49. +	case BRCMU_CHAN_BAND_2G:
    50. 

  50. +		band = NL80211_BAND_2GHZ;
    51. 

  51. +		break;
    52. 

  52. +	case BRCMU_CHAN_BAND_5G:
    53. 

  53. +		band = NL80211_BAND_5GHZ;
    54. 

  54. +		break;
    55. 

  55. +	}
    56. 

  56. +
    57. 

  57. +	switch (ch.bw) {
    58. 

  58. +	case BRCMU_CHAN_BW_80:
    59. 

  59. +		width = NL80211_CHAN_WIDTH_80;
    60. 

  60. +		break;
    61. 

  61. +	case BRCMU_CHAN_BW_40:
    62. 

  62. +		width = NL80211_CHAN_WIDTH_40;
    63. 

  63. +		break;
    64. 

  64. +	case BRCMU_CHAN_BW_20:
    65. 

  65. +		width = NL80211_CHAN_WIDTH_20;
    66. 

  66. +		break;
    67. 

  67. +	case BRCMU_CHAN_BW_80P80:
    68. 

  68. +		width = NL80211_CHAN_WIDTH_80P80;
    69. 

  69. +		break;
    70. 

  70. +	case BRCMU_CHAN_BW_160:
    71. 

  71. +		width = NL80211_CHAN_WIDTH_160;
    72. 

  72. +		break;
    73. 

  73. +	}
    74. 

  74. +
    75. 

  75. +	freq = ieee80211_channel_to_frequency(ch.control_ch_num, band);
    76. 

  76. +	chandef->chan = ieee80211_get_channel(wiphy, freq);
    77. 

  77. +	chandef->width = width;
    78. 

  78. +	chandef->center_freq1 = ieee80211_channel_to_frequency(ch.chnum, band);
    79. 

  79. +	chandef->center_freq2 = 0;
    80. 

  80. +
    81. 

  81. +	return 0;
    82. 

  82. +}
    83. 

  83. +
    84. 

  84.  static int brcmf_cfg80211_crit_proto_start(struct wiphy *wiphy,
    85. 

  85.  					   struct wireless_dev *wdev,
    86. 

  86.  					   enum nl80211_crit_proto_id proto,
    87. 

  87. @@ -5009,6 +5071,7 @@ static struct cfg80211_ops brcmf_cfg8021
    88. 

  88.  	.mgmt_tx = brcmf_cfg80211_mgmt_tx,
    89. 

  89.  	.remain_on_channel = brcmf_p2p_remain_on_channel,
    90. 

  90.  	.cancel_remain_on_channel = brcmf_cfg80211_cancel_remain_on_channel,
    91. 

  91. +	.get_channel = brcmf_cfg80211_get_channel,
    92. 

  92.  	.start_p2p_device = brcmf_p2p_start_device,
    93. 

  93.  	.stop_p2p_device = brcmf_p2p_stop_device,
    94. 

  94.  	.crit_proto_start = brcmf_cfg80211_crit_proto_start,
    95.