Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory
Arend van Spriel writes: I prefer to keep it as brcmsmac and brcmfmac rely on brcmutil module so I want to keep them together under brcm80211. So does this patch go in before or after the patches I submitted before the merge window. I hope after :-p >>> >>> Sorry, the vendor patches go in first :) It's much safer that way. >>> >>> But I think that git should be smart enough and your patchset from >>> before the merge window should still apply without issues. >> >> Will see if that is true when I merge it in our internal repo. :-p > > Just applied the pending patches using 'git am -3' and that works > fine. So when told to be smart, git is indeed smart ;-) Git is awesome :) Thanks for checking. -- Kalle Valo -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory
On 11/23/2015 11:28 AM, Arend van Spriel wrote: On 11/22/2015 06:23 PM, Kalle Valo wrote: Arend van Spriel writes: On 11/19/2015 08:48 AM, Kalle Valo wrote: Hauke Mehrtens writes: On 11/18/2015 03:45 PM, Kalle Valo wrote: Part of reorganising wireless drivers directory and Kconfig. Note that I had to edit Makefiles from subdirectories to use the new location. Signed-off-by: Kalle Valo --- I would prefer to remove the brcm80211 directory in this process and create: drivers/net/wireless/broadcom/brcmfmac drivers/net/wireless/broadcom/brcmsmac drivers/net/wireless/broadcom/brcmutil drivers/net/wireless/broadcom/include This way we have one directory less. I think this could be done separately. This patchset is big enough already, I would not like to make it anymore complicated. And I actually like the brcm80211 directory, I would not mind keeping it still. I prefer to keep it as brcmsmac and brcmfmac rely on brcmutil module so I want to keep them together under brcm80211. So does this patch go in before or after the patches I submitted before the merge window. I hope after :-p Sorry, the vendor patches go in first :) It's much safer that way. But I think that git should be smart enough and your patchset from before the merge window should still apply without issues. Will see if that is true when I merge it in our internal repo. :-p Just applied the pending patches using 'git am -3' and that works fine. So when told to be smart, git is indeed smart ;-) Regards, Arend -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory
On 11/22/2015 06:23 PM, Kalle Valo wrote: Arend van Spriel writes: On 11/19/2015 08:48 AM, Kalle Valo wrote: Hauke Mehrtens writes: On 11/18/2015 03:45 PM, Kalle Valo wrote: Part of reorganising wireless drivers directory and Kconfig. Note that I had to edit Makefiles from subdirectories to use the new location. Signed-off-by: Kalle Valo --- I would prefer to remove the brcm80211 directory in this process and create: drivers/net/wireless/broadcom/brcmfmac drivers/net/wireless/broadcom/brcmsmac drivers/net/wireless/broadcom/brcmutil drivers/net/wireless/broadcom/include This way we have one directory less. I think this could be done separately. This patchset is big enough already, I would not like to make it anymore complicated. And I actually like the brcm80211 directory, I would not mind keeping it still. I prefer to keep it as brcmsmac and brcmfmac rely on brcmutil module so I want to keep them together under brcm80211. So does this patch go in before or after the patches I submitted before the merge window. I hope after :-p Sorry, the vendor patches go in first :) It's much safer that way. But I think that git should be smart enough and your patchset from before the merge window should still apply without issues. Will see if that is true when I merge it in our internal repo. :-p Thanks, Arend -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory
Arend van Spriel writes: > On 11/19/2015 08:48 AM, Kalle Valo wrote: >> Hauke Mehrtens writes: >> >>> On 11/18/2015 03:45 PM, Kalle Valo wrote: Part of reorganising wireless drivers directory and Kconfig. Note that I had to edit Makefiles from subdirectories to use the new location. Signed-off-by: Kalle Valo --- >>> >>> I would prefer to remove the brcm80211 directory in this process and create: >>> drivers/net/wireless/broadcom/brcmfmac >>> drivers/net/wireless/broadcom/brcmsmac >>> drivers/net/wireless/broadcom/brcmutil >>> drivers/net/wireless/broadcom/include >>> >>> This way we have one directory less. >> >> I think this could be done separately. This patchset is big enough >> already, I would not like to make it anymore complicated. >> >> And I actually like the brcm80211 directory, I would not mind keeping it >> still. > > I prefer to keep it as brcmsmac and brcmfmac rely on brcmutil module > so I want to keep them together under brcm80211. > > So does this patch go in before or after the patches I submitted > before the merge window. I hope after :-p Sorry, the vendor patches go in first :) It's much safer that way. But I think that git should be smart enough and your patchset from before the merge window should still apply without issues. -- Kalle Valo -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory
On 11/20/2015 10:53 PM, Arend van Spriel wrote: > On 11/19/2015 08:48 AM, Kalle Valo wrote: >> Hauke Mehrtens writes: >> >>> On 11/18/2015 03:45 PM, Kalle Valo wrote: Part of reorganising wireless drivers directory and Kconfig. Note that I had to edit Makefiles from subdirectories to use the new location. Signed-off-by: Kalle Valo --- >>> >>> I would prefer to remove the brcm80211 directory in this process and >>> create: >>> drivers/net/wireless/broadcom/brcmfmac >>> drivers/net/wireless/broadcom/brcmsmac >>> drivers/net/wireless/broadcom/brcmutil >>> drivers/net/wireless/broadcom/include >>> >>> This way we have one directory less. >> >> I think this could be done separately. This patchset is big enough >> already, I would not like to make it anymore complicated. >> >> And I actually like the brcm80211 directory, I would not mind keeping it >> still. > > I prefer to keep it as brcmsmac and brcmfmac rely on brcmutil module so > I want to keep them together under brcm80211. > > So does this patch go in before or after the patches I submitted before > the merge window. I hope after :-p Ok, then leave it like Kalle proposed. backports should work with both versions. Hauke -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory
On 11/19/2015 08:48 AM, Kalle Valo wrote: Hauke Mehrtens writes: On 11/18/2015 03:45 PM, Kalle Valo wrote: Part of reorganising wireless drivers directory and Kconfig. Note that I had to edit Makefiles from subdirectories to use the new location. Signed-off-by: Kalle Valo --- I would prefer to remove the brcm80211 directory in this process and create: drivers/net/wireless/broadcom/brcmfmac drivers/net/wireless/broadcom/brcmsmac drivers/net/wireless/broadcom/brcmutil drivers/net/wireless/broadcom/include This way we have one directory less. I think this could be done separately. This patchset is big enough already, I would not like to make it anymore complicated. And I actually like the brcm80211 directory, I would not mind keeping it still. I prefer to keep it as brcmsmac and brcmfmac rely on brcmutil module so I want to keep them together under brcm80211. So does this patch go in before or after the patches I submitted before the merge window. I hope after :-p Regards, Arend -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory
On 11/19/2015 08:54 AM, Kalle Valo wrote: Florian Fainelli writes: On 18/11/15 11:19, Hauke Mehrtens wrote: On 11/18/2015 03:45 PM, Kalle Valo wrote: Part of reorganising wireless drivers directory and Kconfig. Note that I had to edit Makefiles from subdirectories to use the new location. Signed-off-by: Kalle Valo --- I would prefer to remove the brcm80211 directory in this process and create: drivers/net/wireless/broadcom/brcmfmac drivers/net/wireless/broadcom/brcmsmac drivers/net/wireless/broadcom/brcmutil drivers/net/wireless/broadcom/include This way we have one directory less. Would not that make keeping track of the previous and future history harder for people contributing to these drivers? I could imagine that for Arend and other Broadcom engineers, dealing with a simple level move would be manageable, but having to account for a different directory hierarchy could be a pain. What is the impact on compat-wireless after/before these changes by the way? It's called backports nowadays :) But I understood that as long as we have a separate kconfig option for the vendor directories (CONFIG_WLAN_VENDOR_*) it should be ok. For 4.3 we didn't have that for realtek directory and that caused pain for backports. That is my understanding as well. Regards, Arend -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory
Florian Fainelli writes: > On 18/11/15 11:19, Hauke Mehrtens wrote: >> On 11/18/2015 03:45 PM, Kalle Valo wrote: >>> Part of reorganising wireless drivers directory and Kconfig. Note that I >>> had to >>> edit Makefiles from subdirectories to use the new location. >>> >>> Signed-off-by: Kalle Valo >>> --- >> >> I would prefer to remove the brcm80211 directory in this process and create: >> drivers/net/wireless/broadcom/brcmfmac >> drivers/net/wireless/broadcom/brcmsmac >> drivers/net/wireless/broadcom/brcmutil >> drivers/net/wireless/broadcom/include >> >> This way we have one directory less. > > Would not that make keeping track of the previous and future history > harder for people contributing to these drivers? I could imagine that > for Arend and other Broadcom engineers, dealing with a simple level move > would be manageable, but having to account for a different directory > hierarchy could be a pain. > > What is the impact on compat-wireless after/before these changes by the way? It's called backports nowadays :) But I understood that as long as we have a separate kconfig option for the vendor directories (CONFIG_WLAN_VENDOR_*) it should be ok. For 4.3 we didn't have that for realtek directory and that caused pain for backports. -- Kalle Valo -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory
Hauke Mehrtens writes: > On 11/18/2015 03:45 PM, Kalle Valo wrote: >> Part of reorganising wireless drivers directory and Kconfig. Note that I had >> to >> edit Makefiles from subdirectories to use the new location. >> >> Signed-off-by: Kalle Valo >> --- > > I would prefer to remove the brcm80211 directory in this process and create: > drivers/net/wireless/broadcom/brcmfmac > drivers/net/wireless/broadcom/brcmsmac > drivers/net/wireless/broadcom/brcmutil > drivers/net/wireless/broadcom/include > > This way we have one directory less. I think this could be done separately. This patchset is big enough already, I would not like to make it anymore complicated. And I actually like the brcm80211 directory, I would not mind keeping it still. -- Kalle Valo -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory
On 18/11/15 11:19, Hauke Mehrtens wrote: > On 11/18/2015 03:45 PM, Kalle Valo wrote: >> Part of reorganising wireless drivers directory and Kconfig. Note that I had >> to >> edit Makefiles from subdirectories to use the new location. >> >> Signed-off-by: Kalle Valo >> --- > > I would prefer to remove the brcm80211 directory in this process and create: > drivers/net/wireless/broadcom/brcmfmac > drivers/net/wireless/broadcom/brcmsmac > drivers/net/wireless/broadcom/brcmutil > drivers/net/wireless/broadcom/include > > This way we have one directory less. Would not that make keeping track of the previous and future history harder for people contributing to these drivers? I could imagine that for Arend and other Broadcom engineers, dealing with a simple level move would be manageable, but having to account for a different directory hierarchy could be a pain. What is the impact on compat-wireless after/before these changes by the way? -- Florian -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory
On 11/18/2015 03:45 PM, Kalle Valo wrote: > Part of reorganising wireless drivers directory and Kconfig. Note that I had > to > edit Makefiles from subdirectories to use the new location. > > Signed-off-by: Kalle Valo > --- I would prefer to remove the brcm80211 directory in this process and create: drivers/net/wireless/broadcom/brcmfmac drivers/net/wireless/broadcom/brcmsmac drivers/net/wireless/broadcom/brcmutil drivers/net/wireless/broadcom/include This way we have one directory less. Hauke -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2 06/27] brcm80211: move under broadcom vendor directory
Part of reorganising wireless drivers directory and Kconfig. Note that I had to
edit Makefiles from subdirectories to use the new location.
Signed-off-by: Kalle Valo
---
MAINTAINERS|2 +-
drivers/net/wireless/Kconfig |1 -
drivers/net/wireless/Makefile |3 ---
drivers/net/wireless/broadcom/Kconfig |1 +
drivers/net/wireless/broadcom/Makefile |3 +++
.../net/wireless/{ => broadcom}/brcm80211/Kconfig |0
.../net/wireless/{ => broadcom}/brcm80211/Makefile |0
.../{ => broadcom}/brcm80211/brcmfmac/Makefile |4 ++--
.../{ => broadcom}/brcm80211/brcmfmac/bcdc.c |0
.../{ => broadcom}/brcm80211/brcmfmac/bcdc.h |0
.../{ => broadcom}/brcm80211/brcmfmac/bcmsdh.c |0
.../{ => broadcom}/brcm80211/brcmfmac/btcoex.c |0
.../{ => broadcom}/brcm80211/brcmfmac/btcoex.h |0
.../{ => broadcom}/brcm80211/brcmfmac/bus.h|0
.../{ => broadcom}/brcm80211/brcmfmac/cfg80211.c |0
.../{ => broadcom}/brcm80211/brcmfmac/cfg80211.h |0
.../{ => broadcom}/brcm80211/brcmfmac/chip.c |0
.../{ => broadcom}/brcm80211/brcmfmac/chip.h |0
.../{ => broadcom}/brcm80211/brcmfmac/common.c |0
.../{ => broadcom}/brcm80211/brcmfmac/common.h |0
.../{ => broadcom}/brcm80211/brcmfmac/commonring.c |0
.../{ => broadcom}/brcm80211/brcmfmac/commonring.h |0
.../{ => broadcom}/brcm80211/brcmfmac/core.c |0
.../{ => broadcom}/brcm80211/brcmfmac/core.h |0
.../{ => broadcom}/brcm80211/brcmfmac/debug.c |0
.../{ => broadcom}/brcm80211/brcmfmac/debug.h |0
.../{ => broadcom}/brcm80211/brcmfmac/feature.c|0
.../{ => broadcom}/brcm80211/brcmfmac/feature.h|0
.../{ => broadcom}/brcm80211/brcmfmac/firmware.c |0
.../{ => broadcom}/brcm80211/brcmfmac/firmware.h |0
.../{ => broadcom}/brcm80211/brcmfmac/flowring.c |0
.../{ => broadcom}/brcm80211/brcmfmac/flowring.h |0
.../{ => broadcom}/brcm80211/brcmfmac/fweh.c |0
.../{ => broadcom}/brcm80211/brcmfmac/fweh.h |0
.../{ => broadcom}/brcm80211/brcmfmac/fwil.c |0
.../{ => broadcom}/brcm80211/brcmfmac/fwil.h |0
.../{ => broadcom}/brcm80211/brcmfmac/fwil_types.h |0
.../{ => broadcom}/brcm80211/brcmfmac/fwsignal.c |0
.../{ => broadcom}/brcm80211/brcmfmac/fwsignal.h |0
.../{ => broadcom}/brcm80211/brcmfmac/msgbuf.c |0
.../{ => broadcom}/brcm80211/brcmfmac/msgbuf.h |0
.../{ => broadcom}/brcm80211/brcmfmac/of.c |0
.../{ => broadcom}/brcm80211/brcmfmac/of.h |0
.../{ => broadcom}/brcm80211/brcmfmac/p2p.c|0
.../{ => broadcom}/brcm80211/brcmfmac/p2p.h|0
.../{ => broadcom}/brcm80211/brcmfmac/pcie.c |0
.../{ => broadcom}/brcm80211/brcmfmac/pcie.h |0
.../{ => broadcom}/brcm80211/brcmfmac/proto.c |0
.../{ => broadcom}/brcm80211/brcmfmac/proto.h |0
.../{ => broadcom}/brcm80211/brcmfmac/sdio.c |0
.../{ => broadcom}/brcm80211/brcmfmac/sdio.h |0
.../{ => broadcom}/brcm80211/brcmfmac/tracepoint.c |0
.../{ => broadcom}/brcm80211/brcmfmac/tracepoint.h |0
.../{ => broadcom}/brcm80211/brcmfmac/usb.c|0
.../{ => broadcom}/brcm80211/brcmfmac/usb.h|0
.../{ => broadcom}/brcm80211/brcmfmac/vendor.c |0
.../{ => broadcom}/brcm80211/brcmfmac/vendor.h |0
.../{ => broadcom}/brcm80211/brcmsmac/Makefile |6 +++---
.../{ => broadcom}/brcm80211/brcmsmac/aiutils.c|0
.../{ => broadcom}/brcm80211/brcmsmac/aiutils.h|0
.../{ => broadcom}/brcm80211/brcmsmac/ampdu.c |0
.../{ => broadcom}/brcm80211/brcmsmac/ampdu.h |0
.../{ => broadcom}/brcm80211/brcmsmac/antsel.c |0
.../{ => broadcom}/brcm80211/brcmsmac/antsel.h |0
.../brcm80211/brcmsmac/brcms_trace_brcmsmac.h |0
.../brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h |0
.../brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h |0
.../brcm80211/brcmsmac/brcms_trace_events.c|0
.../brcm80211/brcmsmac/brcms_trace_events.h|0
.../{ => broadcom}/brcm80211/brcmsmac/channel.c|0
.../{ => broadcom}/brcm80211/brcmsmac/channel.h|0
.../{ => broadcom}/brcm80211/brcmsmac/d11.h|0
.../{ => broadcom}/brcm80211/brcmsmac/debug.c |0
.../{ => broadcom}/brcm80211/brcmsmac/debug.h |0
.../{ => broadcom}/brcm80211/brcmsmac/dma.c|0
.../{ => broadcom}/brcm80211/brcmsmac/dma.h|0
.../{ => broadcom}/brcm80211/brcmsmac/led.c|0
.../{ => broadcom}/brcm80211/brcmsmac/led.h|0
.../brcm80211/brcmsmac/mac80211_if.c |0
.../brcm80211/brcmsmac/mac80211_if.h |0
.../{ => broadcom}/brcm80211/brcmsmac/main.c |0
.../{ => broadcom}/b
