1. 27 1月, 2015 4 次提交
  2. 26 1月, 2015 28 次提交
  3. 25 1月, 2015 8 次提交
    • A
      cxgb3: re-use native hex2bin() · 7aee42c6
      Andy Shevchenko 提交于
      Call hex2bin() library function instead of doing conversion here.
      Signed-off-by: NAndy Shevchenko <andy.shevchenko@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      7aee42c6
    • A
      usbnet: re-use native hex2bin() · 51487ae7
      Andy Shevchenko 提交于
      Call hex2bin() library function, instead of doing conversion here.
      Signed-off-by: NAndy Shevchenko <andy.shevchenko@gmail.com>
      Acked-by: NOliver Neukum <oneukum@suse.de>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      51487ae7
    • D
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next · bc0247a4
      David S. Miller 提交于
      Jeff Kirsher says:
      
      ====================
      Intel Wired LAN Driver Updates 2015-01-22
      
      This series contains updates to e1000, e1000e, igb, fm10k and virtio_net.
      
      Asaf Vertz provides a fix for e1000 to future-proof the time comparisons
      by using time_after_eq() instead of plain math.
      
      Mathias Koehrer provides a fix for e1000e to add a check to e1000_xmit_frame()
      to ensure a work queue will not be scheduled that has not been initialized.
      
      Jacob adds the use of software timestamping via the virtio_net driver.
      
      Alex Duyck cleans up page reuse code in igb and fm10k.  Cleans up the
      page reuse code from getting into a state where all the workarounds
      needed are in place as well as cleaning up oversights, such as using
      __free_pages instead of put_page to drop a locally allocated page.
      
      Richard Cochran provides 4 patches for igb dealing with time sync.
      First provides a helper function since the code that handles the time
      sync interrupt is repeated in three different places.  Then serializes
      the access to the time sync interrupt since the registers may be
      manipulated from different contexts.  Enables the use of i210 device
      interrupt to generate an internal PPS event for adjusting the kernel
      system time.  The i210 device offers a number of special PTP hardware
      clock features on the Software Defined Pins (SDPs), so added support for
      two of the possible functions (time stamping external events and
      periodic output signals).
      
      Or Gerlitz fixes fm10k from double setting of NETIF_F_SG since the
      networking core does it for the driver during registration time.
      
      Joe Stringer adds support for up to 104 bytes of inner+outer headers in
      fm10k and adds an initial check to fail encapsulation offload if these
      are too large.
      
      Matthew increases the timeout for the data path reset based on feedback
      from the hardware team, since 100us is too short of a time to wait for
      the data path reset to complete.
      
      Alexander Graf provides a fix for igb to indicate failure on VF reset
      for an empty MAC address, to mirror the behavior of ixgbe.
      
      Florian Westphal updates e1000 and e1000e to support txtd update delay
      via xmit_more, this way we won't update the Tx tail descriptor if the
      queue has not been stopped and we know at least one more skb will be
      sent right away.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      bc0247a4
    • D
      Merge branch 'vxlan_tx' · 86b368b4
      David S. Miller 提交于
      Tom Herbert says:
      
      ====================
      vxlan: Don't use UDP socket for transmit
      
      UDP socket is not pertinent to transmit for UDP tunnels, checksum
      enablement can be done without a socket. This patch set eliminates
      reference to a socket in udp_tunnel_xmit functions and in VXLAN
      transmit.
      
      Also, make GBP, RCO, can CSUM6_RX flags visible to receive socket
      and only match these for shareable socket.
      
      v2: Fix geneve to call udp_tunnel_xmit with good arguments.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      86b368b4
    • T
      vxlan: Eliminate dependency on UDP socket in transmit path · af33c1ad
      Tom Herbert 提交于
      In the vxlan transmit path there is no need to reference the socket
      for a tunnel which is needed for the receive side. We do, however,
      need the vxlan_dev flags. This patch eliminate references
      to the socket in the transmit path, and changes VXLAN_F_UNSHAREABLE
      to be VXLAN_F_RCV_FLAGS. This mask is used to store the flags
      applicable to receive (GBP, CSUM6_RX, and REMCSUM_RX) in the
      vxlan_sock flags.
      Signed-off-by: NTom Herbert <therbert@google.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      af33c1ad
    • T
      udp: Do not require sock in udp_tunnel_xmit_skb · d998f8ef
      Tom Herbert 提交于
      The UDP tunnel transmit functions udp_tunnel_xmit_skb and
      udp_tunnel6_xmit_skb include a socket argument. The socket being
      passed to the functions (from VXLAN) is a UDP created for receive
      side. The only thing that the socket is used for in the transmit
      functions is to get the setting for checksum (enabled or zero).
      This patch removes the argument and and adds a nocheck argument
      for checksum setting. This eliminates the unnecessary dependency
      on a UDP socket for UDP tunnel transmit.
      Signed-off-by: NTom Herbert <therbert@google.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d998f8ef
    • N
      net: fec: fix the warning found by dma debug · 2b995f63
      Nimrod Andy 提交于
      Enable kernel config "CONFIG_HAVE_DMA_API_DEBUG", FEC have kernel warning:
      [    6.650444] fec 2188000.ethernet: DMA-API: device driver tries to free DMA memory it has not allocated
      [    6.664289] Modules linked in:
      [    6.667378] CPU: 0 PID: 3 Comm: ksoftirqd/0 Not tainted 3.19.0-rc4-00688-g88340160-dirty #150
      [    6.675841] Hardware name: Freescale i.MX6 SoloX (Device Tree)
      [    6.681698] Backtrace:
      [    6.684189] [<80011e3c>] (dump_backtrace) from [<80011fdc>] (show_stack+0x18/0x1c)
      [    6.691789]  r6:80890154 r5:00000000 r4:00000000 r3:00000000
      [    6.697533] [<80011fc4>] (show_stack) from [<806d2d88>] (dump_stack+0x80/0x9c)
      [    6.704799] [<806d2d08>] (dump_stack) from [<8002a4e4>] (warn_slowpath_common+0x7c/0xb4)
      [    6.712917]  r5:00000445 r4:00000000
      [    6.716544] [<8002a468>] (warn_slowpath_common) from [<8002a5c0>] (warn_slowpath_fmt+0x38/0x40)
      [    6.725265]  r8:809a2ee8 r7:00000000 r6:00000000 r5:00000000 r4:00000042
      [    6.732087] [<8002a58c>] (warn_slowpath_fmt) from [<802d6268>] (check_unmap+0x86c/0x98c)
      [    6.740202]  r3:808c79bc r2:8089060c
      [    6.743826] [<802d59fc>] (check_unmap) from [<802d65e4>] (debug_dma_unmap_page+0x80/0x88)
      [    6.752029]  r10:00000000 r9:00000000 r8:00000000 r7:00000001 r6:be12a410 r5:00000000
      [    6.759967]  r4:00000042
      [    6.762538] [<802d6564>] (debug_dma_unmap_page) from [<80440248>] (fec_enet_rx_napi+0x7ec/0xb9c)
      [    6.771345]  r7:00000400 r6:be3e4000 r5:bf08fa20 r4:be036000
      [    6.777094] [<8043fa5c>] (fec_enet_rx_napi) from [<8056ae24>] (net_rx_action+0x134/0x324)
      [    6.785297]  r10:be089e60 r9:80998180 r8:ffff8d68 r7:0000012c r6:00000040 r5:00000001
      [    6.793239]  r4:be036718
      [    6.795801] [<8056acf0>] (net_rx_action) from [<8002db24>] (__do_softirq+0x138/0x2d0)
      [    6.803655]  r10:00000003 r9:00000003 r8:80996378 r7:8099c080 r6:00000100 r5:8099c08c
      [    6.811593]  r4:00000000
      [    6.814157] [<8002d9ec>] (__do_softirq) from [<8002dd00>] (run_ksoftirqd+0x44/0x5c)
      [    6.821836]  r10:00000000 r9:00000000 r8:809b133c r7:00000000 r6:00000001 r5:00000000
      [    6.829775]  r4:be027e80
      [    6.832346] [<8002dcbc>] (run_ksoftirqd) from [<80048290>] (smpboot_thread_fn+0x154/0x1c4)
      [    6.840649] [<8004813c>] (smpboot_thread_fn) from [<80044780>] (kthread+0xdc/0xf8)
      [    6.848224]  r10:00000000 r8:00000000 r7:8004813c r6:be027e80 r5:be027ec0 r4:00000000
      [    6.856179] [<800446a4>] (kthread) from [<8000ebc8>] (ret_from_fork+0x14/0x2c)
      [    6.863425]  r7:00000000 r6:00000000 r5:800446a4 r4:be027ec0
      [    6.869156] ---[ end trace 861cf914d2461a8b ]---
      
      There have one bug in .fec_enet_tx_queue() function to unmap the DMA memory:
      For SG or TSO, get one buffer descriptor and then unmap the related DMA memory, and then
      get the next buffer descriptor, loop to while() to check "TX_READY". If "TX_READY" bit
      still __IS__ existed in the BD (The next fraglist or next TSO packet is not transmited
      complitely), exit the current clean work. When the next work is triggered, it still repeat
      above step with the same BD. The potential issue is that unmap the same DMA memory for
      multiple times.
      
      The patch fix the clean work for SG and TSO packet.
      Reported-by: NAnand Moon <moon.linux@yahoo.com>
      Reported-by: NChristian Gmeiner <christian.gmeiner@gmail.com>
      Signed-off-by: NFugang Duan <B38611@freescale.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      2b995f63
    • D
      Merge branch 'be2net-next' · 58d94227
      David S. Miller 提交于
      Sathya Perla says:
      
      ====================
      be2net: patch set
      
      Hi David, as the below patch-set includes minor bug fixes and some
      code re-org, pls consider applying it to the "net-next" tree. Thanks!
      
      Patch 1 fixes a bit of code duplication involving interface object
      creation code.
      
      Patch 2 ensures that when a flow-control FW cmd fails, the adapter state
      continues to reflect the old values. This allows for correct reporting
      on subsequent ethtool "get".
      
      Patch 3 returns proper error for link config change on BE3/Lancer
      
      Patch 4 adds a kernel log message for FW boot error on Lancer
      
      Patch 5 adds a function reset on Lancer as a part of the function init
      sequence.
      
      Patch 6 moves some FW-cmd definitions that belong in be_cmds.h, but
      were placed in be_hw.h
      
      Patch 7 resets the "bw_min" field while configuring "bw_max" needed
      for TX rate limiting config.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      58d94227