1. 12 3月, 2015 18 次提交
  2. 11 3月, 2015 10 次提交
  3. 10 3月, 2015 12 次提交
    • P
      netfilter: bridge: use rcu hook to resolve br_netfilter dependency · 1a4ba64d
      Pablo Neira Ayuso 提交于
      e5de75bf ("netfilter: bridge: move DNAT helper to br_netfilter") results
      in the following link problem:
      
      net/bridge/br_device.c:29: undefined reference to `br_nf_prerouting_finish_bridge`
      
      Moreover it creates a hard dependency between br_netfilter and the
      bridge core, which is what we've been trying to avoid so far.
      
      Resolve this problem by using a hook structure so we reduce #ifdef
      pollution and keep bridge netfilter specific code under br_netfilter.c
      which was the original intention.
      Reported-by: NSimon Horman <simon.horman@netronome.com>
      Signed-off-by: NPablo Neira Ayuso <pablo@netfilter.org>
      1a4ba64d
    • F
      netfilter: fix sparse warnings in reject handling · a03a8dbe
      Florian Westphal 提交于
      make C=1 CF=-D__CHECK_ENDIAN__ shows following:
      
      net/bridge/netfilter/nft_reject_bridge.c:65:50: warning: incorrect type in argument 3 (different base types)
      net/bridge/netfilter/nft_reject_bridge.c:65:50:    expected restricted __be16 [usertype] protocol [..]
      net/bridge/netfilter/nft_reject_bridge.c:102:37: warning: cast from restricted __be16
      net/bridge/netfilter/nft_reject_bridge.c:102:37: warning: incorrect type in argument 1 (different base types) [..]
      net/bridge/netfilter/nft_reject_bridge.c:121:50: warning: incorrect type in argument 3 (different base types) [..]
      net/bridge/netfilter/nft_reject_bridge.c:168:52: warning: incorrect type in argument 3 (different base types) [..]
      net/bridge/netfilter/nft_reject_bridge.c:233:52: warning: incorrect type in argument 3 (different base types) [..]
      
      Caused by two (harmless) errors:
      1. htons() instead of ntohs()
      2. __be16 for protocol in nf_reject_ipXhdr_put API, use u8 instead.
      Reported-by: Nkbuild test robot <fengguang.wu@intel.com>
      Signed-off-by: NFlorian Westphal <fw@strlen.de>
      Signed-off-by: NPablo Neira Ayuso <pablo@netfilter.org>
      a03a8dbe
    • F
      net: phy: bcm7xxx: add alternate id for 7439 · 59e33c2b
      Florian Fainelli 提交于
      BCM7439 has an alternate PHY OUI: 0xae025080 which is to be found in
      some variants of this chip.
      Signed-off-by: NFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      59e33c2b
    • S
      switchdev: add netlink flags to IPv4 FIB add op · f8f21471
      Scott Feldman 提交于
      Pass in the netlink flags (NLM_F_*) into switchdev driver for IPv4 FIB add op
      to allow driver to 1) optimize hardware updates, 2) handle ip route prepend
      and append commands correctly.
      Suggested-by: NJamal Hadi Salim <jhs@mojatatu.com>
      Suggested-by: NRoopa Prabhu <roopa@cumulusnetworks.com>
      Signed-off-by: NScott Feldman <sfeldma@gmail.com>
      Reviewed-by: NSimon Horman <simon.horman@netronome.com>
      Acked-by: NRoopa Prabhu <roopa@cumulusnetworks.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f8f21471
    • D
      Merge branch 'dsa-next' · bf0b2112
      David S. Miller 提交于
      Florian Fainelli says:
      
      ====================
      net: dsa: remove restriction on platform_device
      
      This patch series removes the restriction in DSA to operate exclusively with
      platform_device Ethernet MAC drivers when using Device Tree. This basically
      allows arbitrary Ethernet MAC drivers to be used now in conjunction with
      Device Tree.
      
      The reason was that DSA was using a of_find_device_by_node() which limits
      the device_node to device pointer search exclusively to platform_device,
      in our case, we are interested in doing a "class" research and lookup the
      net_device.
      
      Thanks to Chris Packham for testing this on his platform.
      
      Changes in v2:
      
      - fix build for !CONFIG_OF_NET
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      bf0b2112
    • F
      net: dsa: utilize of_find_net_device_by_node · 769a0202
      Florian Fainelli 提交于
      Using of_find_device_by_node() restricts the search to platform_device that
      match the specified device_node pointer. This is not even remotely true for
      network devices backed by a pci_device for instance.
      
      of_find_net_device_by_node() allows us to do a more thorough lookup to find the
      struct net_device corresponding to a particular device_node pointer.
      
      For symetry with the non-OF code path, we hold the net_device pointer in
      dsa_probe() just like what dev_to_net_dev() does when we call this
      function.
      Signed-off-by: NFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      769a0202
    • F
      net: core: add of_find_net_device_by_node() · aa836df9
      Florian Fainelli 提交于
      Add a helper function which allows getting the struct net_device pointer
      associated with a given struct device_node pointer. This is useful for
      instance for DSA Ethernet devices not backed by a platform_device, but a PCI
      device.
      
      Since we need to access net_class which is not accessible outside of
      net/core/net-sysfs.c, this helper function is also added here and gated
      with CONFIG_OF_NET.
      
      Network devices initialized with SET_NETDEV_DEV() are also taken into
      account by checking for dev->parent first and then falling back to
      checking the device pointer within struct net_device.
      Signed-off-by: NFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      aa836df9
    • D
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 3cef5c5b
      David S. Miller 提交于
      Conflicts:
      	drivers/net/ethernet/cadence/macb.c
      
      Overlapping changes in macb driver, mostly fixes and cleanups
      in 'net' overlapping with the integration of at91_ether into
      macb in 'net-next'.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3cef5c5b
    • P
      net: bcmgenet: core changes for supporting multiple Rx queues · 8ac467e8
      Petri Gynther 提交于
      1. Add struct bcmgenet_rx_ring to hold all necessary information
         for a single Rx queue.
      2. Add bcmgenet_init_rx_queues() to initialize all Rx queues.
      3. Modify bcmgenet_init_rx_ring() to initialize a single Rx queue.
      4. Modify Rx interrupt path code to use per-queue data.
      5. Modify bcmgenet_rx_refill() to use RxCB->bd_addr.
      Signed-off-by: NPetri Gynther <pgynther@google.com>
      Reviewed-by: NFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      8ac467e8
    • L
      Merge git://git.kernel.org/pub/scm/virt/kvm/kvm · affb8172
      Linus Torvalds 提交于
      Pull kvm/s390 bugfixes from Marcelo Tosatti.
      
      * git://git.kernel.org/pub/scm/virt/kvm/kvm:
        KVM: s390: non-LPAR case obsolete during facilities mask init
        KVM: s390: include guest facilities in kvm facility test
        KVM: s390: fix in memory copy of facility lists
        KVM: s390/cpacf: Fix kernel bug under z/VM
        KVM: s390/cpacf: Enable key wrapping by default
      affb8172
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · ec0e6bd3
      Linus Torvalds 提交于
      Pull s390 fixes from Martin Schwidefsky:
       "One performance optimization for page_clear and a couple of bug fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390/mm: fix incorrect ASCE after crst_table_downgrade
        s390/ftrace: fix crashes when switching tracers / add notrace to cpu_relax()
        s390/pci: unify pci_iomap symbol exports
        s390/pci: fix [un]map_resources sequence
        s390: let the compiler do page clearing
        s390/pci: fix possible information leak in mmio syscall
        s390/dcss: array index 'i' is used before limits check.
        s390/scm_block: fix off by one during cluster reservation
        s390/jump label: improve and fix sanity check
        s390/jump label: add missing jump_label_apply_nops() call
      ec0e6bd3
    • L
      Merge tag 'trace-fixes-v4.0-rc2-2' of... · e7901af1
      Linus Torvalds 提交于
      Merge tag 'trace-fixes-v4.0-rc2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
      
      Pull seq-buf/ftrace fixes from Steven Rostedt:
       "This includes fixes for seq_buf_bprintf() truncation issue.  It also
        contains fixes to ftrace when /proc/sys/kernel/ftrace_enabled and
        function tracing are started.  Doing the following causes some issues:
      
          # echo 0 > /proc/sys/kernel/ftrace_enabled
          # echo function_graph > /sys/kernel/debug/tracing/current_tracer
          # echo 1 > /proc/sys/kernel/ftrace_enabled
          # echo nop > /sys/kernel/debug/tracing/current_tracer
          # echo function_graph > /sys/kernel/debug/tracing/current_tracer
      
        As well as with function tracing too.  Pratyush Anand first reported
        this issue to me and supplied a patch.  When I tested this on my x86
        test box, it caused thousands of backtraces and warnings to appear in
        dmesg, which also caused a denial of service (a warning for every
        function that was listed).  I applied Pratyush's patch but it did not
        fix the issue for me.  I looked into it and found a slight problem
        with trampoline accounting.  I fixed it and sent Pratyush a patch, but
        he said that it did not fix the issue for him.
      
        I later learned tha Pratyush was using an ARM64 server, and when I
        tested on my ARM board, I was able to reproduce the same issue as
        Pratyush.  After applying his patch, it fixed the problem.  The above
        test uncovered two different bugs, one in x86 and one in ARM and
        ARM64.  As this looked like it would affect PowerPC, I tested it on my
        PPC64 box.  It too broke, but neither the patch that fixed ARM or x86
        fixed this box (the changes were all in generic code!).  The above
        test, uncovered two more bugs that affected PowerPC.  Again, the
        changes were only done to generic code.  It's the way the arch code
        expected things to be done that was different between the archs.  Some
        where more sensitive than others.
      
        The rest of this series fixes the PPC bugs as well"
      
      * tag 'trace-fixes-v4.0-rc2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        ftrace: Fix ftrace enable ordering of sysctl ftrace_enabled
        ftrace: Fix en(dis)able graph caller when en(dis)abling record via sysctl
        ftrace: Clear REGS_EN and TRAMP_EN flags on disabling record via sysctl
        seq_buf: Fix seq_buf_bprintf() truncation
        seq_buf: Fix seq_buf_vprintf() truncation
      e7901af1
反馈
建议
客服 返回
顶部