Hi John,

On Wed, 26 Feb 2014 07:47:38 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Tue, 25 Feb 2014 14:07:16 -0500 "John W. Linville" <linville@tuxdriver.com> wrote:
> >
> > On Tue, Feb 25, 2014 at 01:35:37PM +1100, Stephen Rothwell wrote:
> > > 
> > > After merging the wireless-next tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > > 
> > > drivers/staging/rtl8821ae/rc.c:289:2: error: unknown field 'module' specified in initializer
> > >   .module = NULL,
> > >   ^
> > > 
> > > Caused by commit 161d78555435 ("Revert "Staging: rtl8812ae: remove
> > > modules field of rate_control_ops"").
> > > 
> > > The commit "Staging: rtl8812ae: remove modules field of rate_control_ops"
> > > was needed in the wireless-next tree - I said so at the time of reporting
> > > the original breakage: 
> > > 
> > > > Actually, your tree is based on -rc2, so you need this patch already (it
> > > > should have bee included in the merge commit 841577c3d33b ("Merge branch
> > > > 'for-john' of
> > > > git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next").
> > > 
> > > And now that part of the wireless-next tree has migrated to the net-next tree.
> > > 
> > > I have no idea why you thought you should revert the fix.
> > > 
> > > I have used the wireless tree from next-20140224 for today.
> > 
> > The fix should go through Greg's tree.  I shouldn't have merged it at all.
> 
> No, the fix was only required in your tree (since it was a patch in your
> tree that caused the breakage).  And that fix is now in Dave's tree, so
> reverting it in your tree just rebreaks stuff in your tree (and in Dave's
> tree if your tree is merged by Dave again).

Your tree is still broken.  I just did some test x86_64 allmodconfig
builds of your tree alone. Current top of tree (wireless-next/master
997bc71a3601 "iwl4965: disable 8K A-MSDU by default") fails like above.

If I revert commit 161d78555435 "Revert "Staging: rtl8812ae: remove
modules field of rate_control_ops"", it fails differently:

In file included from drivers/staging/wlan-ng/p80211netdev.c:91:0:
drivers/staging/wlan-ng/cfg80211.c: In function 'prism2_scan':
drivers/staging/wlan-ng/cfg80211.c:419:10: error: implicit declaration of function 'ieee80211_dsss_chan_to_freq' [-Werror=implicit-function-declaration]
          ieee80211_dsss_chan_to_freq(msg2.dschannel.data)),
          ^
drivers/staging/rtl8821ae/rtl8821ae/trx.c: In function 'rtl8821ae_rx_query_desc':
drivers/staging/rtl8821ae/rtl8821ae/trx.c:619:3: warning: passing argument 1 of 'ieee80211_is_robust_mgmt_frame' from incompatible pointer type [enabled by default]
   if ((ieee80211_is_robust_mgmt_frame(hdr)) &&
   ^
In file included from include/net/mac80211.h:20:0,
                 from drivers/staging/rtl8821ae/rtl8821ae/../wifi.h:38,
                 from drivers/staging/rtl8821ae/rtl8821ae/trx.c:30:
include/linux/ieee80211.h:2286:20: note: expected 'struct sk_buff *' but argument is of type 'struct ieee80211_hdr *'
 static inline bool ieee80211_is_robust_mgmt_frame(struct sk_buff *skb)
                    ^
drivers/staging/rtl8821ae/rtl8821ae/dm.c: In function 'rtl8821ae_dm_clear_txpower_tracking_state':
drivers/staging/rtl8821ae/rtl8821ae/dm.c:487:31: warning: iteration 2u invokes undefined behavior [-Waggressive-loop-optimizations]
   rtldm->bb_swing_idx_ofdm[p] = rtldm->default_ofdm_index;
                               ^
drivers/staging/rtl8821ae/rtl8821ae/dm.c:485:2: note: containing loop
  for (p = RF90_PATH_A; p < MAX_RF_PATH; ++p) {
  ^

So please revert 161d78555435, and then fix this other error.

I am still using the version of wireless-next from next-20140224.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au