1. 17 7月, 2012 5 次提交
    • J
      etherdevice: Rename random_ether_addr to eth_random_addr · 0a4dd594
      Joe Perches 提交于
      Add some API symmetry to eth_broadcast_addr and
      add a #define to the old name for backward compatibility.
      Signed-off-by: NJoe Perches <joe@perches.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      0a4dd594
    • D
      Merge branch 'tipc_net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux · 07689b0a
      David S. Miller 提交于
      Paul Gortmaker says:
      
      ====================
      This is the same eight commits as sent for review last week[1],
      with just the incorporation of the pr_fmt change as suggested
      by JoeP.  There was no additional change requests, so unless you
      can see something else you'd like me to change, please pull.
       ...
      Erik Hugne (5):
            tipc: use standard printk shortcut macros (pr_err etc.)
            tipc: remove TIPC packet debugging functions and macros
            tipc: simplify print buffer handling in tipc_printf
            tipc: phase out most of the struct print_buf usage
            tipc: remove print_buf and deprecated log buffer code
      
      Paul Gortmaker (3):
            tipc: factor stats struct out of the larger link struct
            tipc: limit error messages relating to memory leak to one line
            tipc: simplify link_print by divorcing it from using tipc_printf
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      07689b0a
    • A
      net: make sock diag per-namespace · 51d7cccf
      Andrey Vagin 提交于
      Before this patch sock_diag works for init_net only and dumps
      information about sockets from all namespaces.
      
      This patch expands sock_diag for all name-spaces.
      It creates a netlink kernel socket for each netns and filters
      data during dumping.
      
      v2: filter accoding with netns in all places
          remove an unused variable.
      
      Cc: "David S. Miller" <davem@davemloft.net>
      Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
      Cc: James Morris <jmorris@namei.org>
      Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
      Cc: Patrick McHardy <kaber@trash.net>
      Cc: Pavel Emelyanov <xemul@parallels.com>
      CC: Eric Dumazet <eric.dumazet@gmail.com>
      Cc: linux-kernel@vger.kernel.org
      Cc: netdev@vger.kernel.org
      Signed-off-by: NAndrew Vagin <avagin@openvz.org>
      Acked-by: NPavel Emelyanov <xemul@parallels.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      51d7cccf
    • D
      lpc_eth: remove duplicated include · cbc89c8c
      Duan Jiong 提交于
      Remove duplicated #include <linux/delay.h> in
      drivers/net/ethernet/nxp/lpc_eth.c
      
      Signed-off-by: Duan Jiong<djduanjiong@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      cbc89c8c
    • E
      tcp: add OFO snmp counters · a6df1ae9
      Eric Dumazet 提交于
      Add three SNMP TCP counters, to better track TCP behavior
      at global stage (netstat -s), when packets are received
      Out Of Order (OFO)
      
      TCPOFOQueue : Number of packets queued in OFO queue
      
      TCPOFODrop  : Number of packets meant to be queued in OFO
                    but dropped because socket rcvbuf limit hit.
      
      TCPOFOMerge : Number of packets in OFO that were merged with
                    other packets.
      Signed-off-by: NEric Dumazet <edumazet@google.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a6df1ae9
  2. 14 7月, 2012 9 次提交
    • S
      xfrm: Initialize the struct xfrm_dst behind the dst_enty field · 141e369d
      Steffen Klassert 提交于
      We start initializing the struct xfrm_dst at the first field
      behind the struct dst_enty. This is error prone because it
      might leave a new field uninitialized. So start initializing
      the struct xfrm_dst right behind the dst_entry.
      Suggested-by: NEric Dumazet <eric.dumazet@gmail.com>
      Signed-off-by: NSteffen Klassert <steffen.klassert@secunet.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      141e369d
    • S
      ipv6: Initialize the struct rt6_info behind the dst_enty field · 8104891b
      Steffen Klassert 提交于
      We start initializing the struct rt6_info at the first field
      behind the struct dst_enty. This is error prone because it
      might leave a new field uninitialized. So start initializing
      the struct rt6_info right behind the dst_entry.
      Suggested-by: NEric Dumazet <eric.dumazet@gmail.com>
      Signed-off-by: NSteffen Klassert <steffen.klassert@secunet.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      8104891b
    • D
      Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next · 921a678c
      David S. Miller 提交于
      John Linville says:
      
      ====================
      Several drivers see updates: mwifiex, ath9k, iwlwifi, brcmsmac,
      wlcore/wl12xx/wl18xx, and a handful of others.  The bcma bus got a
      lot of attention from Hauke Mehrtens.  The cfg80211 component gets
      a flurry of patches for multi-channel support, and the mac80211
      component gets the first few VHT (11ac) and 60GHz (11ad) patches.
      This also includes the removal of the iwmc3200 drivers, since the
      hardware never became available to normal people.
      
      Additionally, the NFC subsystem gets a series of updates.  According to
      Samuel, "Here are the interesting bits:
      
      - A better error management for the HCI stack.
      - An LLCP "late" binding implementation for a better NFC SAP usage. SAPs are
        now reserved only when there's a client for it.
      - Support for Sony RC-S360 (a.k.a. PaSoRi) pn533 based dongle. We can read and
        write NFC tags and also establish a p2p link with this dongle now.
      - A few LLCP fixes."
      
      Finally, this includes another pull of the fixes from the wireless
      tree in order to resolve some merge issues.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      921a678c
    • E
      tipc: remove print_buf and deprecated log buffer code · 869dd466
      Erik Hugne 提交于
      The internal log buffer handling functions can now safely be
      removed since there is no code using it anymore.  Requests to
      interact with the internal tipc log buffer over netlink (in
      config.c) will report 'obsolete command'.
      
      This represents the final removal of any references to a
      struct print_buf, and the removal of the struct itself.
      We also get rid of a TIPC specific Kconfig in the process.
      
      Finally, log.h is removed since it is not needed anymore.
      Signed-off-by: NErik Hugne <erik.hugne@ericsson.com>
      Signed-off-by: NJon Maloy <jon.maloy@ericsson.com>
      Signed-off-by: NPaul Gortmaker <paul.gortmaker@windriver.com>
      869dd466
    • E
      tipc: phase out most of the struct print_buf usage · dc1aed37
      Erik Hugne 提交于
      The tipc_printf is renamed to tipc_snprintf, as the new name
      describes more what the function actually does.  It is also
      changed to take a buffer and length parameter and return
      number of characters written to the buffer.  All callers of
      this function that used to pass a print_buf are updated.
      
      Final removal of the struct print_buf itself will be done
      synchronously with the pending removal of the deprecated
      logging code that also was using it.
      
      Functions that build up a response message with a list of
      ports, nametable contents etc. are changed to return the number
      of characters written to the output buffer. This information
      was previously hidden in a field of the print_buf struct, and
      the number of chars written was fetched with a call to
      tipc_printbuf_validate.  This function is removed since it
      is no longer referenced nor needed.
      
      A generic max size ULTRA_STRING_MAX_LEN is defined, named
      in keeping with the existing TIPC_TLV_ULTRA_STRING, and the
      various definitions in port, link and nametable code that
      largely duplicated this information are removed.  This means
      that amount of link statistics that can be returned is now
      increased from 2k to 32k.
      
      The buffer overflow check is now done just before the reply
      message is passed over netlink or TIPC to a remote node and
      the message indicating a truncated buffer is changed to a less
      dramatic one (less CAPS), placed at the end of the message.
      Signed-off-by: NErik Hugne <erik.hugne@ericsson.com>
      Signed-off-by: NJon Maloy <jon.maloy@ericsson.com>
      Signed-off-by: NPaul Gortmaker <paul.gortmaker@windriver.com>
      dc1aed37
    • E
      tipc: simplify print buffer handling in tipc_printf · e2dbd601
      Erik Hugne 提交于
      tipc_printf was previously used both to construct debug traces
      and to append data to buffers that should be sent over netlink
      to the tipc-config application.  A global print_buffer was
      used to format the string before it was copied to the actual
      output buffer.  This could lead to concurrent access of the
      global print_buffer, which then had to be lock protected.
      This is simplified by changing tipc_printf to append data
      directly to the output buffer using vscnprintf.
      
      With the new implementation of tipc_printf, there is no longer
      any risk of concurrent access to the internal log buffer, so
      the lock (and the comments describing it) are no longer
      strictly necessary.  However, there are still a few functions
      that do grab this lock before resizing/dumping the log
      buffer.  We leave the lock, and these functions untouched since
      they will be removed with a subsequent commit that drops the
      deprecated log buffer handling code
      Signed-off-by: NErik Hugne <erik.hugne@ericsson.com>
      Signed-off-by: NJon Maloy <jon.maloy@ericsson.com>
      Signed-off-by: NPaul Gortmaker <paul.gortmaker@windriver.com>
      e2dbd601
    • P
      tipc: simplify link_print by divorcing it from using tipc_printf · 5deedde9
      Paul Gortmaker 提交于
      To pave the way for a pending cleanup of tipc_printf, and
      removal of struct print_buf entirely, we make that task simpler
      by converting link_print to issue its messages with standard
      printk infrastructure.  [Original idea separated from a larger
      patch from Erik Hugne <erik.hugne@ericsson.com>]
      
      Cc: Erik Hugne <erik.hugne@ericsson.com>
      Signed-off-by: NPaul Gortmaker <paul.gortmaker@windriver.com>
      5deedde9
    • E
      tipc: remove TIPC packet debugging functions and macros · 568fc588
      Erik Hugne 提交于
      The link queue traces and packet level debug functions served
      a purpose during early development, but are now redundant
      since there are other, more capable tools available for
      debugging at the packet level.
      
      The TIPC_DEBUG Kconfig option is removed since it does not
      provide any extra debugging features anymore.
      
      This gets rid of a lot of tipc_printf usages, which will
      make the pending cleanup work of that function easier.
      Signed-off-by: NErik Hugne <erik.hugne@ericsson.com>
      Signed-off-by: NJon Maloy <jon.maloy@ericsson.com>
      Signed-off-by: NPaul Gortmaker <paul.gortmaker@windriver.com>
      568fc588
    • E
      tipc: use standard printk shortcut macros (pr_err etc.) · 2cf8aa19
      Erik Hugne 提交于
      All messages should go directly to the kernel log.  The TIPC
      specific error, warning, info and debug trace macro's are
      removed and all references replaced with pr_err, pr_warn,
      pr_info and pr_debug.
      
      Commonly used sub-strings are explicitly declared as a const
      char to reduce .text size.
      
      Note that this means the debug messages (changed to pr_debug),
      are now enabled through dynamic debugging, instead of a TIPC
      specific Kconfig option (TIPC_DEBUG).  The latter will be
      phased out completely
      Signed-off-by: NErik Hugne <erik.hugne@ericsson.com>
      Signed-off-by: NJon Maloy <jon.maloy@ericsson.com>
      [PG: use pr_fmt as suggested by Joe Perches <joe@perches.com>]
      Signed-off-by: NPaul Gortmaker <paul.gortmaker@windriver.com>
      2cf8aa19
  3. 13 7月, 2012 6 次提交
  4. 12 7月, 2012 20 次提交