1. 16 11月, 2018 4 次提交
  2. 15 11月, 2018 21 次提交
  3. 14 11月, 2018 5 次提交
  4. 13 11月, 2018 5 次提交
    • C
      net: phy: check if advertising is zero using linkmode_empty · 3e536cff
      Colin Ian King 提交于
      A recent change modified variable advertising from a u32 to a link mode
      array and left the u32 zero comparison, so essential we now have an array
      being compared to null which is not the intention. Fix this by using the
      call to linkmode_empty to check if advertising is all zero.
      
      Detected by CoverityScan, CID#1475424 ("Array compared against 0")
      
      Fixes: 3c1bcc86 ("net: ethernet: Convert phydev advertize and supported from u32 to link mode")
      Signed-off-by: NColin Ian King <colin.king@canonical.com>
      Reviewed-by: NAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3e536cff
    • D
      Merge branch 'sctp-add-support-for-sk_reuseport' · 261501d9
      David S. Miller 提交于
      Xin Long says:
      
      ====================
      sctp: add support for sk_reuseport
      
      sctp sk_reuseport allows multiple socks to listen on the same port and
      addresses, as long as these socks have the same uid. This works pretty
      much as TCP/UDP does, the only difference is that sctp is multi-homing
      and all the bind_addrs in these socks will have to completely matched,
      otherwise listen() will return err.
      
      The below is when 5 sockets are listening on 172.16.254.254:6400 on a
      server, 26 sockets on a client connect to 172.16.254.254:6400 and each
      may be processed by a different socket on the server which is selected
      by hash(lport, pport, paddr) in reuseport_select_sock():
      
       # ss --sctp -nn
         State      Recv-Q Send-Q        Local Address:Port     Peer Address:Port
         LISTEN     0      10           172.16.254.254:6400                *:*
         `- ESTAB   0      0       172.16.254.254%eth1:6400       172.16.2.1:1234
         `- ESTAB   0      0       172.16.254.254%eth1:6400       172.16.2.4:1234
         `- ESTAB   0      0       172.16.254.254%eth1:6400       172.16.3.3:1234
         `- ESTAB   0      0       172.16.254.254%eth1:6400       172.16.3.4:1234
         `- ESTAB   0      0       172.16.254.254%eth1:6400       172.16.5.2:1234
         `- ESTAB   0      0       172.16.254.254%eth1:6400       172.16.5.3:1234
         LISTEN     0      10           172.16.254.254:6400                *:*
         `- ESTAB   0      0       172.16.254.254%eth1:6400       172.16.1.3:1234
         `- ESTAB   0      0       172.16.254.254%eth1:6400       172.16.1.4:1234
         `- ESTAB   0      0       172.16.254.254%eth1:6400       172.16.3.2:1234
         `- ESTAB   0      0       172.16.254.254%eth1:6400       172.16.4.1:1234
         `- ESTAB   0      0       172.16.254.254%eth1:6400       172.16.4.2:1234
         `- ESTAB   0      0       172.16.254.254%eth1:6400       172.16.4.3:1234
         `- ESTAB   0      0       172.16.254.254%eth1:6400       172.16.4.4:1234
         LISTEN     0      10           172.16.254.254:6400                *:*
         `- ESTAB   0      0       172.16.254.254%eth1:6400       172.16.1.2:1234
         `- ESTAB   0      0       172.16.254.254%eth1:6400       172.16.3.5:1234
         `- ESTAB   0      0       172.16.254.254%eth1:6400       172.16.4.5:1234
         `- ESTAB   0      0       172.16.254.254%eth1:6400   172.16.253.253:1234
         LISTEN     0      10           172.16.254.254:6400                *:*
         `- ESTAB   0      0       172.16.254.254%eth1:6400       172.16.2.2:1234
         `- ESTAB   0      0       172.16.254.254%eth1:6400       172.16.2.3:1234
         `- ESTAB   0      0       172.16.254.254%eth1:6400       172.16.5.4:1234
         `- ESTAB   0      0       172.16.254.254%eth1:6400       172.16.5.5:1234
         LISTEN     0      10           172.16.254.254:6400                *:*
         `- ESTAB   0      0       172.16.254.254%eth1:6400       172.16.1.1:1234
         `- ESTAB   0      0       172.16.254.254%eth1:6400       172.16.1.5:1234
         `- ESTAB   0      0       172.16.254.254%eth1:6400       172.16.2.5:1234
         `- ESTAB   0      0       172.16.254.254%eth1:6400       172.16.3.1:1234
         `- ESTAB   0      0       172.16.254.254%eth1:6400       172.16.5.1:1234
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      261501d9
    • X
      sctp: process sk_reuseport in sctp_get_port_local · 6ba84574
      Xin Long 提交于
      When socks' sk_reuseport is set, the same port and address are allowed
      to be bound into these socks who have the same uid.
      
      Note that the difference from sk_reuse is that it allows multiple socks
      to listen on the same port and address.
      Acked-by: NNeil Horman <nhorman@tuxdriver.com>
      Signed-off-by: NXin Long <lucien.xin@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      6ba84574
    • X
      sctp: add sock_reuseport for the sock in __sctp_hash_endpoint · 76c6d988
      Xin Long 提交于
      This is a part of sk_reuseport support for sctp. It defines a helper
      sctp_bind_addrs_check() to check if the bind_addrs in two socks are
      matched. It will add sock_reuseport if they are completely matched,
      and return err if they are partly matched, and alloc sock_reuseport
      if all socks are not matched at all.
      
      It will work until sk_reuseport support is added in
      sctp_get_port_local() in the next patch.
      
      v1->v2:
        - use 'laddr->valid && laddr2->valid' check instead as Marcelo
          pointed in sctp_bind_addrs_check().
      Acked-by: NNeil Horman <nhorman@tuxdriver.com>
      Signed-off-by: NXin Long <lucien.xin@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      76c6d988
    • X
      sctp: do reuseport_select_sock in __sctp_rcv_lookup_endpoint · 532ae2f1
      Xin Long 提交于
      This is a part of sk_reuseport support for sctp, and it selects a
      sock by the hashkey of lport, paddr and dport by default. It will
      work until sk_reuseport support is added in sctp_get_port_local()
      in the next patch.
      
      v1->v2:
        - define lport as __be16 instead of __be32 as Marcelo pointed in
          __sctp_rcv_lookup_endpoint().
      Acked-by: NNeil Horman <nhorman@tuxdriver.com>
      Signed-off-by: NXin Long <lucien.xin@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      532ae2f1
  5. 12 11月, 2018 5 次提交
    • Y
      net: phy: marvell: remove set but not used variable 'pause' · 30beabb3
      YueHaibing 提交于
      Fixes gcc '-Wunused-but-set-variable' warning:
      
      drivers/net/phy/marvell.c: In function 'm88e1510_config_init':
      drivers/net/phy/marvell.c:850:7: warning:
       variable 'pause' set but not used [-Wunused-but-set-variable]
      
      It not used any more after commit 3c1bcc86 ("net: ethernet: Convert phydev
      advertize and supported from u32 to link mode")
      Signed-off-by: NYueHaibing <yuehaibing@huawei.com>
      Reviewed-by: NAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      30beabb3
    • D
      2b9b7502
    • L
      Linux 4.20-rc2 · ccda4af0
      Linus Torvalds 提交于
      ccda4af0
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 7a3765ed
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
       "One last pull request before heading to Vancouver for LPC, here we have:
      
         1) Don't forget to free VSI contexts during ice driver unload, from
            Victor Raj.
      
         2) Don't forget napi delete calls during device remove in ice driver,
            from Dave Ertman.
      
         3) Don't request VLAN tag insertion of ibmvnic device when SKB
            doesn't have VLAN tags at all.
      
         4) IPV4 frag handling code has to accomodate the situation where two
            threads try to insert the same fragment into the hash table at the
            same time. From Eric Dumazet.
      
         5) Relatedly, don't flow separate on protocol ports for fragmented
            frames, also from Eric Dumazet.
      
         6) Memory leaks in qed driver, from Denis Bolotin.
      
         7) Correct valid MTU range in smsc95xx driver, from Stefan Wahren.
      
         8) Validate cls_flower nested policies properly, from Jakub Kicinski.
      
         9) Clearing of stats counters in mc88e6xxx driver doesn't retain
            important bits in the G1_STATS_OP register causing the chip to
            hang. Fix from Andrew Lunn"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (41 commits)
        act_mirred: clear skb->tstamp on redirect
        net: dsa: mv88e6xxx: Fix clearing of stats counters
        tipc: fix link re-establish failure
        net: sched: cls_flower: validate nested enc_opts_policy to avoid warning
        net: mvneta: correct typo
        flow_dissector: do not dissect l4 ports for fragments
        net: qualcomm: rmnet: Fix incorrect assignment of real_dev
        net: aquantia: allow rx checksum offload configuration
        net: aquantia: invalid checksumm offload implementation
        net: aquantia: fixed enable unicast on 32 macvlan
        net: aquantia: fix potential IOMMU fault after driver unbind
        net: aquantia: synchronized flow control between mac/phy
        net: smsc95xx: Fix MTU range
        net: stmmac: Fix RX packet size > 8191
        qed: Fix potential memory corruption
        qed: Fix SPQ entries not returned to pool in error flows
        qed: Fix blocking/unlimited SPQ entries leak
        qed: Fix memory/entry leak in qed_init_sp_request()
        inet: frags: better deal with smp races
        net: hns3: bugfix for not checking return value
        ...
      7a3765ed
    • L
      Merge tag 'kbuild-fixes-v4.20' of... · e12e00e3
      Linus Torvalds 提交于
      Merge tag 'kbuild-fixes-v4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
      
      Pull Kbuild fixes from Masahiro Yamada:
      
       - fix build errors in binrpm-pkg and bindeb-pkg targets
      
       - fix false positive matches in merge_config.sh
      
       - fix build version mismatch in deb-pkg target
      
       - fix dtbs_install handling in (bin)deb-pkg target
      
       - revert a commit that allows setlocalversion to write to source tree
      
      * tag 'kbuild-fixes-v4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
        builddeb: Fix inclusion of dtbs in debian package
        Revert "scripts/setlocalversion: git: Make -dirty check more robust"
        kbuild: deb-pkg: fix too low build version number
        kconfig: merge_config: avoid false positive matches from comment lines
        kbuild: deb-pkg: fix bindeb-pkg breakage when O= is used
        kbuild: rpm-pkg: fix binrpm-pkg breakage when O= is used
      e12e00e3