1. 05 1月, 2014 11 次提交
    • L
      macvlan: unify macvlan_pcpu_stats and vlan_pcpu_stats · cdf3e274
      Li RongQing 提交于
      They are same, so unify them as one; since macvlan is a kind of vlan,
      vlan_pcpu_stats should be a proper name for vlan and macvlan.
      Signed-off-by: NLi RongQing <roy.qing.li@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      cdf3e274
    • L
      net: unify the pcpu_tstats and br_cpu_netstats as one · 8f84985f
      Li RongQing 提交于
      They are same, so unify them as one, pcpu_sw_netstats.
      
      Define pcpu_sw_netstat in netdevice.h, remove pcpu_tstats
      from if_tunnel and remove br_cpu_netstats from br_private.h
      
      Cc: Cong Wang <xiyou.wangcong@gmail.com>
      Cc: Stephen Hemminger <stephen@networkplumber.org>
      Signed-off-by: NLi RongQing <roy.qing.li@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      8f84985f
    • D
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next · 653864d9
      David S. Miller 提交于
      Jeff Kirsher says:
      
      ====================
      Intel Wired LAN Driver Updates
      
      This series contains updates to i40e and pci_regs.h.
      
      Anjali provides a patch to prevent messages from stray HMC events, except
      at interrupt message level, and refactors the HMC error handling.
      
      Catherine adds routines in probe to populate/check PCI bus speed and width,
      then verify we are in a 8GT/s x8 PCIe slot and warn when we are not.
      
      Shannon adds Wake-on-LAN support for i40e, fixes curly brace use as well as
      return type for i40e_vsi_clear_rings().
      
      Joseph implements receive offload for VXLAN for i40e, where the hardware
      supports checksum offload/verification of the inner/outer header.
      
      Mitch provides the bulk of the changes, where he refactors the VF reset
      code so that it works on real hardware.  Then does code cleanup by
      calling existing functions to enable and disable queues for VFs and
      remove unused functions.  Removes a unnecessary log messages that are
      seen at every VF reset, for example complaining about disabling queues
      that are already disabled.  Fixes an error return when the VF asks to
      add an invalid MAC address and if the VF sends a bad message, make it
      more informative about what is actually going on.
      
      Jesse refactors the LED function to flash LED lights correctly.
      
      v2:
       - removed patch 5 "i40e: add set settings and pauseparam" based on
         feedback from Ben Hutchings, will re-work that patch for later
         submission
       - Added patch "i40e: Implementation of vxlan ndo's" from Joseph to
         address Or Gerlitz's questions and concerns.  This patch adds the
         implementation for the VXLAN ndo's and allows the hardware to do
         receive checksum offload for inner packets on the UDP ports that
         VXLAN notifies us about.
       - Added patch "i40e: using for_each_set_bit to simplify the code"
         from Wei Yongjun.  This patch uses for_each_set_bit() to simply
         the code.
      
      v3:
       - fixed indentation issue in patch 11 based on feedback from
         Sergei Shtylyov.
      
      Sorry for the delayed release of v4, it was delayed to the holidays.
      
      v4:
       - Addressed Or Gerlitz's concerns about trying to get a hold of a mutex
         while holding a spin lock in patch 6 by executing the AQ commands from
         a subtask.
       - Addressed David Miller's Kconfig concerns by creating a Kconfig VXLAN
         option for i40e and wrapped appropriate code with the config option in
         patch 6.
       - Updated patch 7 based on the changes made in patch 6 in the above two
         bullets.
      
      v5:
       - Added the patch to pci_regs.h based on David Miller's feedback to add
         PCI defines for speed and width
       - Updated patch 3 description to better explain the changes based on
         feedback from David Miller
       - Updated patch 4 to use the newly added defines to pci_regs.h instead
         of local defines
       - Updated patch 7 to use <net/vxlan.h> in the #include based on feedback
         from David Miller
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      653864d9
    • S
      phylib: make phy_scan_fixups() static · fbfcec63
      Sergei Shtylyov 提交于
      phy_scan_fixups()  isn't and shouldn't be called by the drivers directly, so
      unexport it. And since Florian Fainelli's recent patches, the function is only
      called locally, so we can make it static as well.
      Signed-off-by: NSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      fbfcec63
    • S
      phylib: remove unused adjust_state() callback · 29935aeb
      Sergei Shtylyov 提交于
      Remove adjust_state() callback from 'struct phy_device' since it seems to have
      never been really used from the inception: phy_start_machine() has been always
      called with 2nd argument equal to NULL.
      Signed-off-by: NSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      29935aeb
    • S
      phy: kill excess empty lines · 77051ed8
      Sergei Shtylyov 提交于
      Remove excess empty lines such as those between a function call and its result
      check and just duplicate ones between functions.
      Signed-off-by: NSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      77051ed8
    • S
      phy: kill excess code · 553fe92b
      Sergei Shtylyov 提交于
      Remove some excess code:
      
      - convert assignments to initializers;
      
      - kill useless assignments before *return*.
      Signed-off-by: NSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      553fe92b
    • S
      phy: kill useless local variables · e62a768f
      Sergei Shtylyov 提交于
      A number of functions (especially in phy.c) has local variables that were hardly
      needed in the first place -- remove them.
      Signed-off-by: NSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e62a768f
    • S
      <linux/phy.h>: coding style fixes · 4017b4d3
      Sergei Shtylyov 提交于
      Running 'checkpatch.pl' gives some errors and warnings:
      
      - no spaces around =;
      
      - * separated by space from the function name;
      
      - { in function definition not on a separate line;
      
      - line over 80 characters.
      
      While fixing these, also fix the following style issues:
      
      - file name in the heading comment;
      
      - alignment not matching open paren.
      Signed-off-by: NSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      4017b4d3
    • S
      mdio_bus: coding style fixes · 02d320c3
      Sergei Shtylyov 提交于
      The recent patch from Florian Fainelli fixed all 'checkpatch.pl' errors but left
      some warnings like:
      
      - including <asm/io.h> instead of <linux/io.h>;
      
      - including <asm/uaccess.h> instead of <linux/uaccess.h>;
      
      - block comments using empty /* line;
      
      - 'struct dev_pm_ops' variable not being *const*.
      
      While fixing these, also fix the following style issues (some of which were
      found running 'checkpatch.pl --strict'):
      
      - alignment not matching open paren;
      
      - file name in the heading comment.
      Signed-off-by: NSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      02d320c3
    • S
      phy: coding style fixes · 2f53e904
      Sergei Shtylyov 提交于
      The recent patch from Florian Fainelli fixed all 'checkpatch.pl' errors but left
      the numerous warnings:
      
      - including <asm/io.h> instead of <linux/io.h>;
      
      - including <asm/uaccess.h> instead of <linux/uaccess.h>;
      
      - *extern* declaration in .c file;
      
      - block comments using empty /* line;
      
      - block comments not starting with * on the middle lines;
      
      - block comments not having trailing */ on a separate line;
      
      - EXPORT_SYMBOL() not immediately following its function;
      
      - unnecessary {} for signle statement block;
      
      - spaces before tabs.
      
      While fixing these, also fix the following style issues (some of which were
      found running 'checkpatch.pl --strict'):
      
      - alignment not matching open paren;
      
      - missing {} on one of the *if* arms where another has them;
      
      - use of sizeof(struct structure) instead of sizeof(*variable);
      
      - multiple assignments on one line;
      
      - empty line before };
      
      - file names in the heading comments;
      
      - missing spaces around operators;
      
      - no {} around multi-line *if* operator's arm;
      
      - unneeded () around subexpressions;
      
      - incomplete kernel-doc comment style;
      
      - comment line exceeding 80 characters;
      
      - missing empty line after declarations.
      Signed-off-by: NSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      2f53e904
  2. 04 1月, 2014 29 次提交