1. 25 Jun, 2013 7 commits
  2. 24 Jun, 2013 16 commits
  3. 22 Jun, 2013 1 commit
  4. 20 Jun, 2013 12 commits
  5. 19 Jun, 2013 4 commits
    • Guenter Roeck's avatar
      net: fec: Fix build for MCF5272 · d1391930
      Guenter Roeck authored
      Commits 4c09eed9 (net: fec: Enable imx6 enet checksum acceleration) and
      baa70a5c (net: fec: enable pause frame to improve rx prefomance for 1G
      network) introduced functionality into the FEC driver which is not
      supported on MCF5272. The registers used to implement this functionality
      do not exist on MCF5272. Since register defines for MCF5272 are separate
      from register defines for other chips, building images for MCF5272 fails
      as follows.
      
      fec_main.c: In function 'fec_restart':
      fec_main.c:520:8: error: 'FEC_RACC' undeclared (first use in this function)
      fec_main.c:585:3: error: 'FEC_R_FIFO_RSEM' undeclared (first use in this function)
      fec_main.c:586:3: error: 'FEC_R_FIFO_RSFL' undeclared (first use in this function)
      fec_main.c:587:3: error: 'FEC_R_FIFO_RAEM' undeclared (first use in this function)
      fec_main.c:588:3: error: 'FEC_R_FIFO_RAFL' undeclared (first use in this function)
      fec_main.c:591:3: error: 'FEC_OPD' undeclared (first use in this function)
      
      Adding the missing register defines is not an option, since the registers
      do not exist on MCF5272. Disable the added functionality for MCF5272 builds.
      
      Cc: Frank Li <Frank.Li@freescale.com>
      Cc: Jim Baxter <jim_baxter@mentor.com>
      Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d1391930
    • John W. Linville's avatar
      Merge branch 'master' of... · 4067c666
      John W. Linville authored
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
      4067c666
    • John W. Linville's avatar
    • Johannes Berg's avatar
      nl80211: fix attrbuf access race by allocating a separate one · 3a5a423b
      Johannes Berg authored
      Since my commit 3713b4e3 ("nl80211: allow splitting wiphy
      information in dumps"), nl80211_dump_wiphy() uses the global
      nl80211_fam.attrbuf for parsing the incoming data. This wouldn't
      be a problem if it only did so on the first dump iteration which
      is locked against other commands in generic netlink, but due to
      space constraints in cb->args (the needed state doesn't fit) I
      decided to always parse the original message. That's racy though
      since nl80211_fam.attrbuf could be used by some other parsing in
      generic netlink concurrently.
      
      For now, fix this by allocating a separate parse buffer (it's a
      bit too big for the stack, currently 1448 bytes on 64-bit). For
      -next, I'll change the code to parse into the global buffer in
      the first round only and then allocate a smaller buffer to keep
      the data in cb->args.
      Reported-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
      Acked-by: default avatarJohn W. Linville <linville@tuxdriver.com>
      Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
      3a5a423b