1. 24 6月, 2014 4 次提交
  2. 23 6月, 2014 11 次提交
  3. 22 6月, 2014 3 次提交
    • D
      net: em_canid: remove useless statements from em_canid_change · 2b74e2ca
      Duan Jiong 提交于
      tcf_ematch is allocated by kzalloc in function tcf_em_tree_validate(),
      so cm_old is always NULL.
      Signed-off-by: NDuan Jiong <duanj.fnst@cn.fujitsu.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      2b74e2ca
    • L
      bridge: use list_for_each_entry_continue_reverse · a3f5ee71
      Li RongQing 提交于
      use list_for_each_entry_continue_reverse to rollback in fdb_add_hw
      when add address failed
      Signed-off-by: NLi RongQing <roy.qing.li@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a3f5ee71
    • D
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next · 545a112b
      David S. Miller 提交于
      Jeff Kirsher says:
      
      ====================
      Intel Wired LAN Driver Updates 2014-06-20
      
      This series contains updates to i40e and i40evf.
      
      Anjali provides an update to the registers to handle the updates from the
      hardware.  Also provides a fix so that we do not try to access the rings
      through the qvectors at the time of freeing the qvectors.
      
      Jesse provides a workaround for some older NVM versions where the NVM
      was not filling in the GLQF_HKEY register, so made sure that the
      critical register is initialized.
      
      Michal provides a fix to reset the head and tail on admin queue
      initialization where head and tail are not reset by the hardware.
      
      Neerav adds a helper routine that would wait for the Rx/Tx queue to reach
      the enable or disable state that is requested.  Also provides a fix
      to the debugfs command "lldp get remote" which was dumping the local
      LLDPDU instead of the peer's LLDPDU.  Fixed a bug when all the Tx hang
      recovery mechanisms have failed and the driver tries to bring down the
      interface in the interrupt context.
      
      Shannon provides a patch to clear the Virtual Ethernet Bridge (VEB) stats
      when the PF stats are cleared.  Also cleans the service tasks so that
      they do not run while a reset is in progress.
      
      Mitch fixes an issue in i40evf_get_rxfh() where only fifteen registers
      were being read instead of all sixteen.
      
      Carolyn provides a change to the RSS configuration to set table size and
      write to the hardware to confirm the RSS table size being used.
      
      Kamil makes a change to the admin queue debug prints so that they will not
      cause segmentation faults in some of our tool applications.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      545a112b
  4. 20 6月, 2014 16 次提交
  5. 18 6月, 2014 3 次提交
  6. 16 6月, 2014 3 次提交
    • L
      Linux 3.16-rc1 · 7171511e
      Linus Torvalds 提交于
      7171511e
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · a9be2242
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
      
       1) Fix checksumming regressions, from Tom Herbert.
      
       2) Undo unintentional permissions changes for SCTP rto_alpha and
          rto_beta sysfs knobs, from Denial Borkmann.
      
       3) VXLAN, like other IP tunnels, should advertize it's encapsulation
          size using dev->needed_headroom instead of dev->hard_header_len.
          From Cong Wang.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        net: sctp: fix permissions for rto_alpha and rto_beta knobs
        vxlan: Checksum fixes
        net: add skb_pop_rcv_encapsulation
        udp: call __skb_checksum_complete when doing full checksum
        net: Fix save software checksum complete
        net: Fix GSO constants to match NETIF flags
        udp: ipv4: do not waste time in __udp4_lib_mcast_demux_lookup
        vxlan: use dev->needed_headroom instead of dev->hard_header_len
        MAINTAINERS: update cxgb4 maintainer
      a9be2242
    • L
      Merge tag 'clk-for-linus-3.16-part2' of git://git.linaro.org/people/mike.turquette/linux · dd1845af
      Linus Torvalds 提交于
      Pull more clock framework updates from Mike Turquette:
       "This contains the second half the of the clk changes for 3.16.
      
        They are simply fixes and code refactoring for the OMAP clock drivers.
        The sunxi clock driver changes include splitting out the one
        mega-driver into several smaller pieces and adding support for the A31
        SoC clocks"
      
      * tag 'clk-for-linus-3.16-part2' of git://git.linaro.org/people/mike.turquette/linux: (25 commits)
        clk: sunxi: document PRCM clock compatible strings
        clk: sunxi: add PRCM (Power/Reset/Clock Management) clks support
        clk: sun6i: Protect SDRAM gating bit
        clk: sun6i: Protect CPU clock
        clk: sunxi: Rework clock protection code
        clk: sunxi: Move the GMAC clock to a file of its own
        clk: sunxi: Move the 24M oscillator to a file of its own
        clk: sunxi: Remove calls to clk_put
        clk: sunxi: document new A31 USB clock compatible
        clk: sunxi: Implement A31 USB clock
        ARM: dts: OMAP5/DRA7: use omap5-mpu-dpll-clock capable of dealing with higher frequencies
        CLK: TI: dpll: support OMAP5 MPU DPLL that need special handling for higher frequencies
        ARM: OMAP5+: dpll: support Duty Cycle Correction(DCC)
        CLK: TI: clk-54xx: Set the rate for dpll_abe_m2x2_ck
        CLK: TI: Driver for DRA7 ATL (Audio Tracking Logic)
        dt:/bindings: DRA7 ATL (Audio Tracking Logic) clock bindings
        ARM: dts: dra7xx-clocks: Correct name for atl clkin3 clock
        CLK: TI: gate: add composite interface clock to OMAP2 only build
        ARM: OMAP2: clock: add DT boot support for cpufreq_ck
        CLK: TI: OMAP2: add clock init support
        ...
      dd1845af