1. 18 10月, 2013 25 次提交
    • J
      net: typhoon: remove unnecessary pci_set_drvdata() · 559e3114
      Jingoo Han 提交于
      The driver core clears the driver data to NULL after device_release
      or on probe failure. Thus, it is not needed to manually clear the
      device driver data to NULL.
      Signed-off-by: NJingoo Han <jg1.han@samsung.com>
      Acked-by: NDavid Dillow <dave@thedillows.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      559e3114
    • D
      Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next · 5cda73b6
      David S. Miller 提交于
      John W. Linville says:
      
      ====================
      This is a batch of updates intended for the 3.13 stream...
      
      The biggest item of interest in here is wcn36xx, the new mac80211
      driver for Qualcomm WCN3660/WCN3680 hardware.
      
      Regarding the mac80211 bits, Johannes says:
      
      "We have an assortment of cleanups and new features, of which the
      biggest one is probably the channel-switch support in IBSS. Nothing
      else really stands out much."
      
      On top of that, the ath9k and rt2x00 get a lot of update action from
      Felix Fietkau and Gabor Juhos, respectively.  There are a handful of
      updates to other drivers here and there as well.
      
      Please let me know if there are problems!
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      5cda73b6
    • E
      ipv4: shrink rt_cache_stat · 0baf2b35
      Eric Dumazet 提交于
      Half of the rt_cache_stat fields are no longer used after IP
      route cache removal, lets shrink this per cpu area.
      Signed-off-by: NEric Dumazet <edumazet@google.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      0baf2b35
    • R
      netdev: inet_timewait_sock.h missing semi-colon when KMEMCHECK is enabled · a5bb202b
      Randy Dunlap 提交于
      Fix (a few hundred) build errors due to missing semi-colon when
      KMEMCHECK is enabled:
      
        include/net/inet_timewait_sock.h:139:2: error: expected ',', ';' or '}' before 'int'
        include/net/inet_timewait_sock.h:148:28: error: 'const struct inet_timewait_sock' has no member named 'tw_death_node'
      Signed-off-by: NRandy Dunlap <rdunlap@infradead.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a5bb202b
    • D
      Merge branch 'xen_netback' · 206f3985
      David S. Miller 提交于
      xen-netback: IPv6 offload support
      
      ====================
      This patch series adds support for checksum and large packet offloads
      into xen-netback.  Testing has mainly been done using the Microsoft
      network hardware certification suite running in Server 2008R2 VMs with
      Citrix PV frontends.
      
      v2:
      - Fixed Wei's email address in Cc lines
      
      v3:
      - Responded to Wei's comments:
       - netif.h now updated with comments and a definition of
         XEN_NETIF_GSO_TYPE_NONE.
       - limited number of pullups
      - Responded to Annie's comments:
       - New GSO_BIT macro
      
      v4:
      - Responded to more of Wei's comments
      - Remove parsing of IPv6 fragment header and added warning
      
      v5:
      - Added comment concerning the value chosen for PKT_PROT_LEN
      - Dropped deprecation of feature-no-csum-offload
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      206f3985
    • P
      xen-netback: enable IPv6 TCP GSO to the guest · 82cada22
      Paul Durrant 提交于
      This patch adds code to handle SKB_GSO_TCPV6 skbs and construct appropriate
      extra or prefix segments to pass the large packet to the frontend. New
      xenstore flags, feature-gso-tcpv6 and feature-gso-tcpv6-prefix, are sampled
      to determine if the frontend is capable of handling such packets.
      Signed-off-by: NPaul Durrant <paul.durrant@citrix.com>
      Cc: Wei Liu <wei.liu2@citrix.com>
      Cc: David Vrabel <david.vrabel@citrix.com>
      Cc: Ian Campbell <ian.campbell@citrix.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      82cada22
    • P
      xen-netback: handle IPv6 TCP GSO packets from the guest · a9468587
      Paul Durrant 提交于
      This patch adds a xenstore feature flag, festure-gso-tcpv6, to advertise
      that netback can handle IPv6 TCP GSO packets. It creates SKB_GSO_TCPV6 skbs
      if the frontend passes an extra segment with the new type
      XEN_NETIF_GSO_TYPE_TCPV6 added to netif.h.
      Signed-off-by: NPaul Durrant <paul.durrant@citrix.com>
      Cc: Wei Liu <wei.liu2@citrix.com>
      Cc: David Vrabel <david.vrabel@citrix.com>
      Acked-by: NIan Campbell <ian.campbell@citrix.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a9468587
    • P
      xen-netback: Unconditionally set NETIF_F_RXCSUM · 7365bcfa
      Paul Durrant 提交于
      There is no mechanism to insist that a guest always generates a packet
      with good checksum (at least for IPv4) so we must handle checksum
      offloading from the guest and hence should set NETIF_F_RXCSUM.
      Signed-off-by: NPaul Durrant <paul.durrant@citrix.com>
      Cc: Wei Liu <wei.liu2@citrix.com>
      Cc: David Vrabel <david.vrabel@citrix.com>
      Cc: Ian Campbell <ian.campbell@citrix.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      7365bcfa
    • P
      xen-netback: add support for IPv6 checksum offload from guest · 2eba61d5
      Paul Durrant 提交于
      For performance of VM to VM traffic on a single host it is better to avoid
      calculation of TCP/UDP checksum in the sending frontend. To allow this this
      patch adds the code necessary to set up partial checksum for IPv6 packets
      and xenstore flag feature-ipv6-csum-offload to advertise that fact to
      frontends.
      Signed-off-by: NPaul Durrant <paul.durrant@citrix.com>
      Cc: Wei Liu <wei.liu2@citrix.com>
      Cc: David Vrabel <david.vrabel@citrix.com>
      Cc: Ian Campbell <ian.campbell@citrix.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      2eba61d5
    • P
      xen-netback: add support for IPv6 checksum offload to guest · 146c8a77
      Paul Durrant 提交于
      Check xenstore flag feature-ipv6-csum-offload to determine if a
      guest is happy to accept IPv6 packets with only partial checksum.
      Signed-off-by: NPaul Durrant <paul.durrant@citrix.com>
      Cc: Wei Liu <wei.liu2@citrix.com>
      Cc: David Vrabel <david.vrabel@citrix.com>
      Cc: Ian Campbell <ian.campbell@citrix.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      146c8a77
    • D
      Merge branch 'bonding_rcu' · c0f4ace7
      David S. Miller 提交于
      bonding: patchset for rcu use in bonding
      
      ====================
      The Patch Set convert the xmit of 3ad and alb mode to use rcu lock.
      dd rtnl lock and remove read lock for bond sysfs.
      
      v2 because the bond_for_each_slave_rcu without rcu_read_lock() will occurs one warming, so
      add new function for alb xmit path to avoid warming.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      c0f4ace7
    • D
      bonding: add rtnl lock and remove read lock for bond sysfs · 4d1ae5fb
      dingtianhong 提交于
      The bond_for_each_slave() will not be protected by read_lock(),
      only protected by rtnl_lock(), so need to replace read_lock()
      with rtnl_lock().
      Signed-off-by: NDing Tianhong <dingtianhong@huawei.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      4d1ae5fb
    • D
      bonding: use RCU protection for alb xmit path · 28c71926
      dingtianhong 提交于
      The commit 278b2083
      (bonding: initial RCU conversion) has convert the roundrobin,
      active-backup, broadcast and xor xmit path to rcu protection,
      the performance will be better for these mode, so this time,
      convert xmit path for alb mode.
      Signed-off-by: NDing Tianhong <dingtianhong@huawei.com>
      Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
      Cc: Nikolay Aleksandrov <nikolay@redhat.com>
      Cc: Veaceslav Falico <vfalico@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      28c71926
    • D
      bonding: use RCU protection for 3ad xmit path · 47e91f56
      dingtianhong 提交于
      The commit 278b2083
      (bonding: initial RCU conversion) has convert the roundrobin,
      active-backup, broadcast and xor xmit path to rcu protection,
      the performance will be better for these mode, so this time,
      convert xmit path for 3ad mode.
      Suggested-by: NNikolay Aleksandrov <nikolay@redhat.com>
      Suggested-by: NVeaceslav Falico <vfalico@redhat.com>
      Signed-off-by: NDing Tianhong <dingtianhong@huawei.com>
      Signed-off-by: NWang Yufen <wangyufen@huawei.com>
      Cc: Nikolay Aleksandrov <nikolay@redhat.com>
      Cc: Veaceslav Falico <vfalico@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      47e91f56
    • D
      Merge branch 'net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nftables · da33edcc
      David S. Miller 提交于
      Pablo Neira Ayuso says:
      
      ====================
      netfilter updates: nf_tables pull request
      
      The following patchset contains the current original nf_tables tree
      condensed in 17 patches. I have organized them by chronogical order
      since the original nf_tables code was released in 2009 and by
      dependencies between the different patches.
      
      The patches are:
      
      1) Adapt all existing hooks in the tree to pass hook ops to the
         hook callback function, required by nf_tables, from Patrick McHardy.
      
      2) Move alloc_null_binding to nf_nat_core, as it is now also needed by
         nf_tables and ip_tables, original patch from Patrick McHardy but
         required major changes to adapt it to the current tree that I made.
      
      3) Add nf_tables core, including the netlink API, the packet filtering
         engine, expressions and built-in tables, from Patrick McHardy. This
         patch includes accumulated fixes since 2009 and minor enhancements.
         The patch description contains a list of references to the original
         patches for the record. For those that are not familiar to the
         original work, see [1], [2] and [3].
      
      4) Add netlink set API, this replaces the original set infrastructure
         to introduce a netlink API to add/delete sets and to add/delete
         set elements. This includes two set types: the hash and the rb-tree
         sets (used for interval based matching). The main difference with
         ipset is that this infrastructure is data type agnostic. Patch from
         Patrick McHardy.
      
      5) Allow expression operation overload, this API change allows us to
         provide define expression subtypes depending on the configuration
         that is received from user-space via Netlink. It is used by follow
         up patches to provide optimized versions of the payload and cmp
         expressions and the x_tables compatibility layer, from Patrick
         McHardy.
      
      6) Add optimized data comparison operation, it requires the previous
         patch, from Patrick McHardy.
      
      7) Add optimized payload implementation, it requires patch 5, from
         Patrick McHardy.
      
      8) Convert built-in tables to chain types. Each chain type have special
         semantics (filter, route and nat) that are used by userspace to
         configure the chain behaviour. The main chain regarding iptables
         is that tables become containers of chain, with no specific semantics.
         However, you may still configure your tables and chains to retain
         iptables like semantics, patch from me.
      
      9) Add compatibility layer for x_tables. This patch adds support to
         use all existing x_tables extensions from nf_tables, this is used
         to provide a userspace utility that accepts iptables syntax but
         used internally the nf_tables kernel core. This patch includes
         missing features in the nf_tables core such as the per-chain
         stats, default chain policy and number of chain references, which
         are required by the iptables compatibility userspace tool. Patch
         from me.
      
      10) Fix transport protocol matching, this fix is a side effect of the
          x_tables compatibility layer, which now provides a pointer to the
          transport header, from me.
      
      11) Add support for dormant tables, this feature allows you to disable
          all chains and rules that are contained in one table, from me.
      
      12) Add IPv6 NAT support. At the time nf_tables was made, there was no
          NAT IPv6 support yet, from Tomasz Bursztyka.
      
      13) Complete net namespace support. This patch register the protocol
          family per net namespace, so tables (thus, other objects contained
          in tables such as sets, chains and rules) are only visible from the
          corresponding net namespace, from me.
      
      14) Add the insert operation to the nf_tables netlink API, this requires
          adding a new position attribute that allow us to locate where in the
          ruleset a rule needs to be inserted, from Eric Leblond.
      
      15) Add rule batching support, including atomic rule-set updates by
          using rule-set generations. This patch includes a change to nfnetlink
          to include two new control messages to indicate the beginning and
          the end of a batch. The end message is interpreted as the commit
          message, if it's missing, then the rule-set updates contained in the
          batch are aborted, from me.
      
      16) Add trace support to the nf_tables packet filtering core, from me.
      
      17) Add ARP filtering support, original patch from Patrick McHardy, but
          adapted to fit into the chain type infrastructure. This was recovered
          to be used by nft userspace tool and our compatibility arptables
          userspace tool.
      
      There is still work to do to fully replace x_tables [4] [5] but that can
      be done incrementally by extending our netlink API. Moreover, looking at
      netfilter-devel and the amount of contributions to nf_tables we've been
      getting, I think it would be good to have it mainstream to avoid accumulating
      large patchsets skip continuous rebases.
      
      I tried to provide a reasonable patchset, we have more than 100 accumulated
      patches in the original nf_tables tree, so I collapsed many of the small
      fixes to the main patch we had since 2009 and provide a small batch for
      review to netdev, while trying to retain part of the history.
      
      For those who didn't give a try to nf_tables yet, there's a quick howto
      available from Eric Leblond that describes how to get things working [6].
      
      Comments/reviews welcome.
      
      Thanks!
      
      [1] http://lwn.net/Articles/324251/
      [2] http://workshop.netfilter.org/2013/wiki/images/e/ee/Nftables-osd-2013-developer.pdf
      [3] http://lwn.net/Articles/564095/
      [4] http://people.netfilter.org/pablo/map-pending-work.txt
      [4] http://people.netfilter.org/pablo/nftables-todo.txt
      [5] https://home.regit.org/netfilter-en/nftables-quick-howto/
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      da33edcc
    • M
      irda: update comment mentioning IRQF_DISABLED · 78dea8cc
      Michael Opdenacker 提交于
      This patch removes a comment mentioning IRQF_DISABLED,
      which is deprecated.
      Signed-off-by: NMichael Opdenacker <michael.opdenacker@free-electrons.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      78dea8cc
    • M
      isdn: remove deprecated IRQF_DISABLED · 33235ca4
      Michael Opdenacker 提交于
      This patch proposes to remove the use of the IRQF_DISABLED flag
      
      It's a NOOP since 2.6.35 and it will be removed one day.
      Signed-off-by: NMichael Opdenacker <michael.opdenacker@free-electrons.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      33235ca4
    • D
      Merge branch 'mlx4' · 3a14aede
      David S. Miller 提交于
      Amir Vadai says:
      
      ====================
      net/mlx4: Mellanox driver update 15-10-2013
      
      This patchset contains small code cleaning patches, and a patch to make
      mlx4_core use module_request() in order to load the relevant link layer module
      (mlx4_en or mlx4_ib) according to the port type.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3a14aede
    • E
      net/mlx4_core: Load higher level modules according to ports type · b046ffe5
      Eyal Perry 提交于
      Mellanox ConnectX architecture is:  mlx4_core is the lower level
      PCI driver which register on the PCI id, and protocol specific drivers
      are depended on it: mlx4_en - for Ethernet and mlx4_ib for Infiniband.
      NIC could have multiple ports which can change their type dynamically.
      We use the request_module() call to load the relevant protocol driver
      when needed: on loading time or at port type change event.
      Signed-off-by: NEyal Perry <eyalpe@mellanox.com>
      Signed-off-by: NAmir Vadai <amirv@mellanox.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      b046ffe5
    • A
      net/mlx4: Unused local variable in mlx4_opreq_action · 39e210fd
      Amir Vadai 提交于
      Clean up warning added by commit fe6f700d "net/mlx4_core: Respond to
      operation request by firmware".
      Signed-off-by: NAmir Vadai <amirv@mellanox.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      39e210fd
    • O
      net/mlx4: Fix typo, move similar defs to same location · 5930e8d0
      Or Gerlitz 提交于
      Small code cleanup:
      
      1. change MLX4_DEV_CAP_FLAGS2_REASSIGN_MAC_EN to MLX4_DEV_CAP_FLAG2_REASSIGN_MAC_EN
      
      2. put MLX4_SET_PORT_PRIO2TC and MLX4_SET_PORT_SCHEDULER in the same union with the
         other MLX4_SET_PORT_yyy
      Signed-off-by: NOr Gerlitz <ogerlitz@mellanox.com>
      Signed-off-by: NAmir Vadai <amirv@mellanox.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      5930e8d0
    • O
      net/mlx4: Clean the code to eliminate trivial build warnings · fe66bb2d
      Or Gerlitz 提交于
      Remove code that triggers trivial build warnings.
      
      drivers/net/ethernet/mellanox/mlx4/cmd.c: In function ‘mlx4_set_vf_vlan’:
      drivers/net/ethernet/mellanox/mlx4/cmd.c:2256: warning: variable ‘vf_oper’ set but not used
      drivers/net/ethernet/mellanox/mlx4/mcg.c: In function ‘mlx4_map_sw_to_hw_steering_mode’:
      drivers/net/ethernet/mellanox/mlx4/mcg.c:648: warning: comparison of unsigned expression < 0 is always false
      drivers/net/ethernet/mellanox/mlx4/mcg.c: In function ‘mlx4_map_sw_to_hw_steering_id’:
      drivers/net/ethernet/mellanox/mlx4/mcg.c:685: warning: comparison of unsigned expression < 0 is always false
      drivers/net/ethernet/mellanox/mlx4/mcg.c: In function ‘mlx4_hw_rule_sz’:
      drivers/net/ethernet/mellanox/mlx4/mcg.c:712: warning: comparison of unsigned expression < 0 is always false
      drivers/net/ethernet/mellanox/mlx4/fw.c: In function ‘mlx4_opreq_action’:
      drivers/net/ethernet/mellanox/mlx4/fw.c:1732: warning: variable ‘type_m’ set but not used
      drivers/net/ethernet/mellanox/mlx4/srq.c:302: warning: no previous prototype for ‘mlx4_srq_lookup’
      Signed-off-by: NOr Gerlitz <ogerlitz@mellanox.com>
      Signed-off-by: NAmir Vadai <amirv@mellanox.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      fe66bb2d
    • E
      inet_diag: use sock_gen_put() · c1d607cc
      Eric Dumazet 提交于
      TCP listener refactoring, part 6 :
      
      Use sock_gen_put() from inet_diag_dump_one_icsk() for future
      SYN_RECV support.
      Signed-off-by: NEric Dumazet <edumazet@google.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      c1d607cc
    • D
      Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge · d7a20c86
      David S. Miller 提交于
      Included changes:
      - ensure RecordRoute information is added to BAT_ICMP echo_request/reply only
      - use VLAN_ETH_HLEN when possible
      - use htons when possible
      - substitute old fragmentation code with a new improved implementation by
        Martin Hundebøll
      - create common header for BAT_ICMP packets to improve extendibility
      - consider the network coding overhead when computing the overall room needed by
        batman headers
      - add dummy soft-interface rx mode handler
      - minor code refactoring and cleanups
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d7a20c86
    • J
      Merge branch 'master' of... · 9f96da4d
      John W. Linville 提交于
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
      9f96da4d
  2. 15 10月, 2013 15 次提交