1. 25 Mar, 2014 30 commits
  2. 24 Mar, 2014 10 commits
    • Eric W. Biederman's avatar
      bfin_mac: Call dev_consume_skb_any instead of dev_kfree_skb. · 21534d20
      Eric W. Biederman authored
      Replace dev_kfree_skb with dev_consume_skb_any in _tx_reclaim_skb that
      can be called in hard irq and other contexts.
      
      dev_consume_skb is used as _tx_reclaim_skb is called after a packet
      has been successfully transmitted.
      Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
      21534d20
    • Eric W. Biederman's avatar
      8390: Call dev_consume_skb_any instead of dev_kfree_skb. · e05b3101
      Eric W. Biederman authored
      Replace dev_kfree_skb with dev_consume_skb_any in __ei_start_xmit that
      can be called in hard irq and other contexts.
      
      dev_consume_skb is used as in this simple driver the skb is always
      immediately consumed, there are no drops.
      Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
      e05b3101
    • Eric W. Biederman's avatar
      3c59x: Call dev_consume_skb_any instead of dev_kfree_skb. · e5ddf351
      Eric W. Biederman authored
      Replace dev_kfree_skb with dev_consume_skb_any in vortex_start_xmit
      as it can be called in hard irq and other contexts.
      
      dev_consume_skb_any is used when vortext_start_xmit directly consumes
      the packet instead of dmaing it to the device.
      Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
      e5ddf351
    • Eric W. Biederman's avatar
      3c509: Call dev_consume_skb_any instead of dev_kfree_skb. · 8fa9524d
      Eric W. Biederman authored
      Replace dev_kfree_skb with dev_consume_skb_any in el3_start_xmit
      as it can be called in hard irq and other contexts.
      
      dev_consume_skb_any is used as on this simple hardware the
      skb is consumed directly by the start_xmit function.
      Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
      8fa9524d
    • Eric W. Biederman's avatar
      uml/net_kern: Call dev_consume_skb_any instead of dev_kfree_skb. · fabfb91d
      Eric W. Biederman authored
      Replace dev_kfree_skb with dev_consume_skb_any in uml_net_start_xmit
      as it can be called in hard irq and other contexts.
      
      dev_consume_skb_any is used as uml_net_start_xmit typically
      consumes (not drops) packets.
      Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
      fabfb91d
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next · 35d499ee
      David S. Miller authored
      Jeff Kirsher says:
      
      ====================
      Intel Wired LAN Driver Updates
      
      This series contains updates to igb, ixgbe, ixgbevf, i40e and i40evf.
      
      Anjali provides a i40e/i40evf patch to add Energy Efficient Ethernet
      Low Power Idle stats and a fix for i40e to change the string
      "Side Band" to "Sideband" for consistency.
      
      Mitch provides 2 patches for i40evf to fix if the driver encounters
      an error while communicating with the PF driver, do not shut down the
      admin queue unconditionally.  Add an error message when the admin
      queue message never completes and fix formatting on another message
      that was unnecessarily wrapped.
      
      Mark provides a ixgbe patch and five ixgbevf patches.  Fix a possible
      infinite recursion when an adapter is removed and registers all read
      as all one's in ixgbe_clear_vmdq_generic() and ixgbe_clear_rar_generic().
      Converts macros to static inline functions to align kernel coding standard
      and prepare for adding Live Error Recovery (LER) to ixgbevf.  Change the
      ethtool register test to use the normal register accessor functions and
      eliminate macors used for calling register test functions to make error
      exits more clear.  Checks all register reads for adapter removal by checking
      the status register after any register read that returns all F's since the
      status register will never return 0xFFFFFFFF unless the adapter is removed.
      
      Jacob implements SIOCGHWTSTAMP ioctl for igb which enables user processes
      to read the current hardware stamp config settings non-destructively.
      
      Todd adds the initial register read and write for surprise removal (LER)
      for igb.
      
      Christian Engelmayer fixes an igb memory leak in the igb_get_module_eeprom()
      error handling path.
      
      Ken Ichikawa provides a fix for igb, specifically for 82575 hardware to
      specify -1 to the phc_index for ethtool's get_ts_info, otherwise a wrong
      value will be set to the phc_index.
      
      Christopher Paasch fixes a null pointer dereference in igb and makes sure
      to unset the HAS_MSIX flag when the driver falls back to MSI only.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      35d499ee
    • Li RongQing's avatar
      ipv4: remove ip_rt_dump from route.c · 0b8c7f6f
      Li RongQing authored
      ip_rt_dump do nothing after IPv4 route caches removal, so we can remove it.
      Signed-off-by: default avatarLi RongQing <roy.qing.li@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0b8c7f6f
    • wangweidong's avatar
      atheros/atlx: use SET_ETHTOOL_OPS directly · dffe278f
      wangweidong authored
      As commit a6e28b34("staging/et131x: use SET_ETHTOOL_OPS
      directly"), using a wrapper around SET_ETHTOOL_OPS macro is
      not actually required, remove and use SET_ETHTOOL_OPS directly.
      Signed-off-by: default avatarWang Weidong <wangweidong1@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      dffe278f
    • Vince Bridgers's avatar
      Altera TSE: Correct two typos in original submission · 80175f93
      Vince Bridgers authored
      This patch addresses two typos in the original driver submission. One derived
      from a cut & paste error, and another is a misspelling.
      Signed-off-by: default avatarVince Bridgers <vbridgers2013@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      80175f93
    • Vince Bridgers's avatar
      Altera TSE: Correct typecast issue detected by kbuild test robot · a804ad0e
      Vince Bridgers authored
      This patch addresses a portable pointer arithmetic issue in the
      original submission found by the kbuild test robot.
      
      config: make ARCH=i386 allyesconfig
      
         altera_sgdma.c: In function 'sgdma_txphysaddr':
      >> altera_sgdma.c:393:33: warning: cast from
      >> pointer to integer of different size [-Wpointer-to-int-cast]
           dma_addr_t offs = (dma_addr_t)((dma_addr_t)desc -
                                          ^
      >> altera_sgdma.c:394:5: warning: cast from
      >> pointer to integer of different size [-Wpointer-to-int-cast]
              (dma_addr_t)priv->tx_dma_desc);
              ^
         altera_sgdma.c: In function 'sgdma_rxphysaddr':
      >> altera_sgdma.c:403:33: warning: cast from
      >> pointer to integer of different size [-Wpointer-to-int-cast]
           dma_addr_t offs = (dma_addr_t)((dma_addr_t)desc -
                                          ^
      >> altera_sgdma.c:404:5: warning: cast from
      >> pointer to integer of different size [-Wpointer-to-int-cast]
              (dma_addr_t)priv->rx_dma_desc);
              ^
      Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
      Signed-off-by: default avatarVince Bridgers <vbridgers2013@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a804ad0e