1. 12 8月, 2014 8 次提交
    • H
      ethernet: amd: Remove typedef local_info_t · f8653464
      Himangi Saraogi 提交于
      The Linux kernel coding style guidelines suggest not using typedefs
      for structure types. This patch gets rid of the typedef for local_info_t.
      Also, the name of the struct is changed to drop the _t, to make the
      name look less typedef-like.
      
      The following Coccinelle semantic patch detects the case:
      
      @tn@
      identifier i;
      type td;
      @@
      
      -typedef
       struct i { ... }
      -td
       ;
      
      @@
      type tn.td;
      identifier tn.i;
      @@
      
      -td
      + struct i
      Signed-off-by: NHimangi Saraogi <himangi774@gmail.com>
      Acked-by: NJulia Lawall <julia.lawall@lip6.fr>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f8653464
    • V
      net: Always untag vlan-tagged traffic on input. · 0d5501c1
      Vlad Yasevich 提交于
      Currently the functionality to untag traffic on input resides
      as part of the vlan module and is build only when VLAN support
      is enabled in the kernel.  When VLAN is disabled, the function
      vlan_untag() turns into a stub and doesn't really untag the
      packets.  This seems to create an interesting interaction
      between VMs supporting checksum offloading and some network drivers.
      
      There are some drivers that do not allow the user to change
      tx-vlan-offload feature of the driver.  These drivers also seem
      to assume that any VLAN-tagged traffic they transmit will
      have the vlan information in the vlan_tci and not in the vlan
      header already in the skb.  When transmitting skbs that already
      have tagged data with partial checksum set, the checksum doesn't
      appear to be updated correctly by the card thus resulting in a
      failure to establish TCP connections.
      
      The following is a packet trace taken on the receiver where a
      sender is a VM with a VLAN configued.  The host VM is running on
      doest not have VLAN support and the outging interface on the
      host is tg3:
      10:12:43.503055 52:54:00:ae:42:3f > 28:d2:44:7d:c2:de, ethertype 802.1Q
      (0x8100), length 78: vlan 100, p 0, ethertype IPv4, (tos 0x0, ttl 64, id 27243,
      offset 0, flags [DF], proto TCP (6), length 60)
          10.0.100.1.58545 > 10.0.100.10.ircu-2: Flags [S], cksum 0xdc39 (incorrect
      -> 0x48d9), seq 1069378582, win 29200, options [mss 1460,sackOK,TS val
      4294837885 ecr 0,nop,wscale 7], length 0
      10:12:44.505556 52:54:00:ae:42:3f > 28:d2:44:7d:c2:de, ethertype 802.1Q
      (0x8100), length 78: vlan 100, p 0, ethertype IPv4, (tos 0x0, ttl 64, id 27244,
      offset 0, flags [DF], proto TCP (6), length 60)
          10.0.100.1.58545 > 10.0.100.10.ircu-2: Flags [S], cksum 0xdc39 (incorrect
      -> 0x44ee), seq 1069378582, win 29200, options [mss 1460,sackOK,TS val
      4294838888 ecr 0,nop,wscale 7], length 0
      
      This connection finally times out.
      
      I've only access to the TG3 hardware in this configuration thus have
      only tested this with TG3 driver.  There are a lot of other drivers
      that do not permit user changes to vlan acceleration features, and
      I don't know if they all suffere from a similar issue.
      
      The patch attempt to fix this another way.  It moves the vlan header
      stipping code out of the vlan module and always builds it into the
      kernel network core.  This way, even if vlan is not supported on
      a virtualizatoin host, the virtual machines running on top of such
      host will still work with VLANs enabled.
      
      CC: Patrick McHardy <kaber@trash.net>
      CC: Nithin Nayak Sujir <nsujir@broadcom.com>
      CC: Michael Chan <mchan@broadcom.com>
      CC: Jiri Pirko <jiri@resnulli.us>
      Signed-off-by: NVladislav Yasevich <vyasevic@redhat.com>
      Acked-by: NJiri Pirko <jiri@resnulli.us>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      0d5501c1
    • D
      Merge branch 'apm_xgene' · 217e606b
      David S. Miller 提交于
      Iyappan Subramanian says:
      
      ====================
      net: Add APM X-Gene SoC Ethernet driver support
      
      Adding APM X-Gene SoC Ethernet driver.
      
      v10: Address comments from v9 review
      * Documentation: aligned descriptions
      * simplified struct platform_driver initialization
      * fixed xgene_enet_mdio_config error path
      * fixed xgene_enet_init_hw error path
      * removed statistics spin_lock as it is not required
      * changed raw_desc fields to type __le64
      * defined helper macros for set/get raw_descriptor fields
      
      v9: Address comments from v8 review
      * changed to direct read/write, byteswap into raw descriptor
      * fixed xgene_enet_create_desc_ring() error handling
      * removed references to IS_ERR_OR_NULL
      * disabled half duplex on phy_devce supported/advertising
      * simplified xgene_enet_adjust_link() function
      * fixed sparse tool compilation warnings
      
      v8: Address comments from v7 review
      * changed angle bracket to double quotes in header file include.
      
      v7: Address comments from v6 review
      * fixed skb memory leak when dma_map_single fails in xmit.
      
      v6: Address comments from v5 review
      * added basic ethtool support
      * added ndo_get_stats64 call back
      * deleted priting Rx error messages
      * renamed set_bits to xgene_set_bits to fix kbuild error (make ARCH=powerpc)
      
      v5: Address comments from v4 review
      * Documentation: Added phy-handle, reg-names and changed mdio part
      * dtb: Added reg-names supplemental property
      * changed platform_get_resource to platform_get_resource_byname
      * added separate tx/rx set_desc/get_desc functions to do raw_write/raw_read
      * removed set_desc/get_desc table lookup logic
      * added error handling logic based on per packet descriptor bits
      * added software managed Rx packet and error counters
      * added busy wait for register read/writes
      * changed mdio_bus->id to avoid conflict
      * fixed mdio_bus leak in case of mdio_config error
      * changed phy reg hard coded value to MII_BMSR
      * changed phy addr hard coded value to phy_device->addr
      * added paranthesis around macro arguments
      * converted helper macros to inline functions
      * changed use of goto's only to common work such as cleanup
      
      v4: Address comments from v3 review
      * MAINTAINERS: changed status to supported
      * Kconfig: made default to no
      * changed to bool data type wherever applicable
      * cleaned up single bit set and masking code
      * removed statistics counters masking
      * removed unnecessary OOM message printing
      * fixed dma_map_single and dma_unmap_single size parameter
      * changed set bits macro body using new set_bits function
      
      v3: Address comments from v2 review
      * cleaned up set_desc and get_desc functions
      * added dtb mdio node and phy-handle subnode
      * renamed dtb phy-mode to phy-connection-type
      * added of_phy_connect call to connec to PHY
      * added empty line after last local variable declaration
      * removed type casting when not required
      * removed inline keyword from source files
      * removed CONFIG_CPU_BIG_ENDIAN ifdef
      
      v2
      * Completely redesigned ethernet driver
      * Added support to work with big endian kernel
      * Renamed dtb phyid entry to phy_addr
      * Changed dtb local-mac-address entry to byte string format
      * Renamed dtb eth8clk entry to menetclk
      
      v1
      * Initial version
      ====================
      Signed-off-by: NIyappan Subramanian <isubramanian@apm.com>
      Signed-off-by: NRavi Patel <rapatel@apm.com>
      Signed-off-by: NKeyur Chudgar <kchudgar@apm.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      217e606b
    • I
      drivers: net: Add APM X-Gene SoC ethernet driver support. · e6ad7673
      Iyappan Subramanian 提交于
      This patch adds network driver for APM X-Gene SoC ethernet.
      Signed-off-by: NIyappan Subramanian <isubramanian@apm.com>
      Signed-off-by: NRavi Patel <rapatel@apm.com>
      Signed-off-by: NKeyur Chudgar <kchudgar@apm.com>
      Signed-off-by: NDean Nelson <dnelson@redhat.com>
      Reviewed-by: NTobias Klauser <tklauser@distanz.ch>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e6ad7673
    • I
      dts: Add bindings for APM X-Gene SoC ethernet driver · 3d390425
      Iyappan Subramanian 提交于
      This patch adds bindings for APM X-Gene SoC ethernet driver.
      Signed-off-by: NIyappan Subramanian <isubramanian@apm.com>
      Signed-off-by: NRavi Patel <rapatel@apm.com>
      Signed-off-by: NKeyur Chudgar <kchudgar@apm.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3d390425
    • I
      Documentation: dts: Add bindings for APM X-Gene SoC ethernet driver · ff4ee1ab
      Iyappan Subramanian 提交于
      This patch adds documentation for APM X-Gene SoC ethernet DTS binding.
      Signed-off-by: NIyappan Subramanian <isubramanian@apm.com>
      Signed-off-by: NRavi Patel <rapatel@apm.com>
      Signed-off-by: NKeyur Chudgar <kchudgar@apm.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ff4ee1ab
    • I
      MAINTAINERS: Add entry for APM X-Gene SoC ethernet driver · 24299502
      Iyappan Subramanian 提交于
      This patch adds a MAINTAINERS entry for APM X-Gene SoC
      ethernet driver.
      Signed-off-by: NIyappan Subramanian <isubramanian@apm.com>
      Signed-off-by: NRavi Patel <rapatel@apm.com>
      Signed-off-by: NKeyur Chudgar <kchudgar@apm.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      24299502
    • D
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf · f00439e2
      David S. Miller 提交于
      Pablo Neira Ayuso says:
      
      ====================
      Netfilter fixes for net
      
      The following patchset contains fixes for your net tree, they are:
      
      1) Unitialize the set element key and data from the commit path,
         otherwise this leaks chain refcount if the transaction is aborted,
         reported by Thomas Graf.
      
      2) Fix crash when updating chains without no counters in nf_tables,
         this slipped through in the new transaction infrastructure, reported
         by Matteo Croce.
      
      3) Replace all mutex_lock_interruptible() by mutex_lock() in the Netfilter
         tree, suggested by Patrick McHardy. This implicitly fixes the problem
         that Eric Dumazet reported in: http://patchwork.ozlabs.org/patch/373076/
      
      4) Fix error return code in nf_tables when deleting set element in
         nf_tables if the transaction cannot be allocated, from Julia Lawall.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f00439e2
  2. 11 8月, 2014 1 次提交
  3. 09 8月, 2014 6 次提交
  4. 08 8月, 2014 25 次提交