1. 05 Feb, 2013 4 commits
    • Tom Parkin's avatar
      l2tp: put tunnel socket release on a workqueue · f8ccac0e
      Tom Parkin authored
      
      
      To allow l2tp_tunnel_delete to be called from an atomic context, place the
      tunnel socket release calls on a workqueue for asynchronous execution.
      
      Tunnel memory is eventually freed in the tunnel socket destructor.
      Signed-off-by: default avatarTom Parkin <tparkin@katalix.com>
      Signed-off-by: default avatarJames Chapman <jchapman@katalix.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f8ccac0e
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 188d1f76
      David S. Miller authored
      
      
      Conflicts:
      	drivers/net/ethernet/intel/e1000e/ethtool.c
      	drivers/net/vmxnet3/vmxnet3_drv.c
      	drivers/net/wireless/iwlwifi/dvm/tx.c
      	net/ipv6/route.c
      
      The ipv6 route.c conflict is simple, just ignore the 'net' side change
      as we fixed the same problem in 'net-next' by eliminating cached
      neighbours from ipv6 routes.
      
      The e1000e conflict is an addition of a new statistic in the ethtool
      code, trivial.
      
      The vmxnet3 conflict is about one change in 'net' removing a guarding
      conditional, whilst in 'net-next' we had a netdev_info() conversion.
      
      The iwlwifi conflict is dealing with a WARN_ON() conversion in
      'net-next' vs. a revert happening in 'net'.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      188d1f76
    • Jitendra Kalsaria's avatar
      qlcnic: Updating copyright information. · 577ae39d
      Jitendra Kalsaria authored
      
      
      We recently refactored the driver source, this patch will take care of
      updating copyright date and adding it to newly added files.
      Signed-off-by: default avatarJitendra Kalsaria <jitendra.kalsaria@qlogic.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      577ae39d
    • Paul Gortmaker's avatar
      gianfar: dont conditionally alloc Rx/Err irq structs · 7c1e7e99
      Paul Gortmaker authored
      Commit ee873fda
      
      
      
          "gianfar: Pack struct gfar_priv_grp into three cachelines"
      
      causes the following null dereference at driver init on sbc8548:
      
         libphy: Freescale PowerQUICC MII Bus: probed
         Unable to handle kernel paging request for data at address 0x00000000
         Faulting instruction address: 0xc01d6a38
         Oops: Kernel access of bad area, sig: 11 [#1]
         [...]
         NIP [c01d6a38] gfar_parse_group+0x228/0x280
         LR [c01d6a34] gfar_parse_group+0x224/0x280
         Call Trace:
         [ef82dd60] [c01d6a34] gfar_parse_group+0x224/0x280 (unreliable)
         [ef82dd90] [c01d73a4] gfar_probe+0x284/0xfe0
      
      The reason is that the commit also changed the allocation of the
      Rx and error handling irq structs to be skipped for !MQ_MG_MODE.
      In the !MQ_MG_MODE case, only the Tx irq struct is allocated.
      
      Digging further, we see that MQ_MG_MODE is set only if we find
      the OF compatible string "fsl,etsec2".
      
      A quick grep in the dts directory shows lots of boards that support
      Rx/Tx/Err, but without this specific compat string.  And hence they
      go after the unallocated Rx/Error structs and cause the above oops.
      
      Hence such a change can not be deployed until all the dts files
      are updated and sufficiently deployed.  Further, the optimization
      is of limited value, since the kmalloc'd struct in question has only
      a single unsigned int, and an (IFNAMSIZ + 6) sized string.
      
      Note that no changes to the freeing code are needed here, as it
      already did an unconditional free of Rx/Tx/Error gfar_irqinfo.
      
      Cc: Claudiu Manoil <claudiu.manoil@freescale.com>
      Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7c1e7e99
  2. 04 Feb, 2013 28 commits
  3. 03 Feb, 2013 8 commits